[Monodevelop-patches-list] r1536 - in trunk/MonoDevelop/src/Main/Base: . Internal/Project/Project

[commit-watcher at mono-cvs.ximian.com]

Author: tberman
Date: 2004-04-28 05:41:58 -0400 (Wed, 28 Apr 2004)
New Revision: 1536

Modified:
   trunk/MonoDevelop/src/Main/Base/ChangeLog
   trunk/MonoDevelop/src/Main/Base/Internal/Project/Project/AbstractProject.cs
Log:
fixy fixy


Modified: trunk/MonoDevelop/src/Main/Base/ChangeLog
===================================================================
--- trunk/MonoDevelop/src/Main/Base/ChangeLog	2004-04-28 09:15:53 UTC (rev 1535)
+++ trunk/MonoDevelop/src/Main/Base/ChangeLog	2004-04-28 09:41:58 UTC (rev 1536)
@@ -1,5 +1,10 @@
 2004-04-28  Todd Berman  <tberman at sevenl.net>
 
+	* Internal/Project/Project/AbstractProject.cs: Actually make that check
+	and the others like it work.
+
+2004-04-28  Todd Berman  <tberman at sevenl.net>
+
 	* Internal/Project/Project/AbstractProject.cs: For now, dont ask
 	to add new Makefiles.
 

Modified: trunk/MonoDevelop/src/Main/Base/Internal/Project/Project/AbstractProject.cs
===================================================================
--- trunk/MonoDevelop/src/Main/Base/Internal/Project/Project/AbstractProject.cs	2004-04-28 09:15:53 UTC (rev 1535)
+++ trunk/MonoDevelop/src/Main/Base/Internal/Project/Project/AbstractProject.cs	2004-04-28 09:41:58 UTC (rev 1536)
@@ -201,10 +201,11 @@
 			StringCollection newFiles   = new StringCollection();
 			StringCollection collection = fileUtilityService.SearchDirectory(basedirectory, "*");
 
-			foreach (string file in collection) {
-				string extension = Path.GetExtension(file).ToUpper();
+			foreach (string sfile in collection) {
+				string extension = Path.GetExtension(sfile).ToUpper();
+				string file = Path.GetFileName (sfile);
 
-				if (!IsFileInProject(file) &&
+				if (!IsFileInProject(sfile) &&
 				     extension != ".SCC" &&  // source safe control files -- Svante Lidmans
 				     extension != ".DLL" &&
 				     extension != ".PDB" &&
@@ -216,10 +217,10 @@
 				     !file.StartsWith (".") &&
 				     !Path.GetDirectoryName(file).EndsWith("CVS") &&
 				     !Path.GetDirectoryName(file).EndsWith(".svn") &&
-					 !file.StartsWith ("Makefile") &&
+				     !file.StartsWith ("Makefile") &&
 				     !Path.GetDirectoryName(file).EndsWith("ProjectDocumentation")) {
 
-					newFiles.Add(file);
+					newFiles.Add(sfile);
 				}
 			}