[Monodevelop-patches-list] r1654 - in trunk/MonoDevelop/src/Main/Base: . Commands/ProjectBrowserCommands Gui/Pads/ClassScout Internal/Project/Project

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

Author: tberman
Date: 2004-05-27 12:11:46 -0400 (Thu, 27 May 2004)
New Revision: 1654

Modified:
   trunk/MonoDevelop/src/Main/Base/ChangeLog
   trunk/MonoDevelop/src/Main/Base/Commands/ProjectBrowserCommands/FolderNodeCommands.cs
   trunk/MonoDevelop/src/Main/Base/Gui/Pads/ClassScout/ClassScout.cs
   trunk/MonoDevelop/src/Main/Base/Internal/Project/Project/AbstractProject.cs
Log:
misc fixes, one bug, one bad feature, and one proper exception catch


Modified: trunk/MonoDevelop/src/Main/Base/ChangeLog
===================================================================
--- trunk/MonoDevelop/src/Main/Base/ChangeLog	2004-05-27 12:38:23 UTC (rev 1653)
+++ trunk/MonoDevelop/src/Main/Base/ChangeLog	2004-05-27 16:11:46 UTC (rev 1654)
@@ -1,3 +1,12 @@
+2004-05-27  Todd Berman  <tberman at sevenl.net>
+
+	* Internal/Project/Project/AbstractProject.cs: Properly ignore
+	.svn and CVS directories.
+	* Gui/Pads/ClassScout/ClassScout.cs: Properly work around potential
+	exceptions until we figure out why they are happening.
+	* Commands/ProjectBrowserCommands/FolderNodeCommands.cs: start
+	the add file dialog in the proper place.
+
 2004-05-26  Todd Berman  <tberman at sevenl.net>
 
 	* Internal/Project/Combine/Combine.cs: fix nullref when you dont

Modified: trunk/MonoDevelop/src/Main/Base/Commands/ProjectBrowserCommands/FolderNodeCommands.cs
===================================================================
--- trunk/MonoDevelop/src/Main/Base/Commands/ProjectBrowserCommands/FolderNodeCommands.cs	2004-05-27 12:38:23 UTC (rev 1653)
+++ trunk/MonoDevelop/src/Main/Base/Commands/ProjectBrowserCommands/FolderNodeCommands.cs	2004-05-27 16:11:46 UTC (rev 1654)
@@ -40,12 +40,11 @@
 			}
 			
 			AbstractBrowserNode node = (AbstractBrowserNode)browser.SelectedNode;
-			PropertyService props = (PropertyService)ServiceManager.Services.GetService (typeof (PropertyService));
 			
 			using (FileSelection fdiag  = new FileSelection (GettextCatalog.GetString ("Add a file"))) {
 				fdiag.SelectMultiple = true;
 				
-				string defaultPath = props.GetProperty ("MonoDevelop.Project.AddFilePath", node.Project.BaseDirectory);
+				string defaultPath = node.Project.BaseDirectory;
 				
 				fdiag.Complete(defaultPath);
 				
@@ -83,7 +82,6 @@
 								}
 							}
 						}
-						props.SetProperty ("MonoDevelop.Project.AddFilePath", System.IO.Path.GetDirectoryName (file));
 					}
 				} finally {
 					fdiag.Hide ();

Modified: trunk/MonoDevelop/src/Main/Base/Gui/Pads/ClassScout/ClassScout.cs
===================================================================
--- trunk/MonoDevelop/src/Main/Base/Gui/Pads/ClassScout/ClassScout.cs	2004-05-27 12:38:23 UTC (rev 1653)
+++ trunk/MonoDevelop/src/Main/Base/Gui/Pads/ClassScout/ClassScout.cs	2004-05-27 16:11:46 UTC (rev 1654)
@@ -396,11 +396,13 @@
 		
 		public bool Run ()
 		{
-			if (_cb == null) {
-				Console.WriteLine ("We would have crashed here");
-				return false;
+			try {
+				return _cb (_data);
 			}
-			return _cb (_data);
+			catch (Exception e) {
+				Console.WriteLine ("Caught an exception in IdleWork.Run: " + e.ToString ());
+			}
+			return false;
 		}
 	}
 }

Modified: trunk/MonoDevelop/src/Main/Base/Internal/Project/Project/AbstractProject.cs
===================================================================
--- trunk/MonoDevelop/src/Main/Base/Internal/Project/Project/AbstractProject.cs	2004-05-27 12:38:23 UTC (rev 1653)
+++ trunk/MonoDevelop/src/Main/Base/Internal/Project/Project/AbstractProject.cs	2004-05-27 16:11:46 UTC (rev 1654)
@@ -219,8 +219,8 @@
 					!file.EndsWith ("make.sh") &&
 					!file.EndsWith ("~") &&
 					!file.StartsWith (".") &&
-					!Path.GetDirectoryName(file).EndsWith("CVS") &&
-					!Path.GetDirectoryName(file).EndsWith(".svn") &&
+					!(Path.GetDirectoryName(sfile).IndexOf("CVS") != -1) &&
+					!(Path.GetDirectoryName(sfile).IndexOf(".svn") != -1) &&
 					!file.StartsWith ("Makefile") &&
 					!Path.GetDirectoryName(file).EndsWith("ProjectDocumentation")) {