[Monodevelop-patches-list] r1669 - in trunk/MonoDevelop: build/data/options help src/Main/Base src/Main/Base/Commands src/Main/Base/Services/ParserService

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

Author: tberman
Date: 2004-05-30 15:56:39 -0400 (Sun, 30 May 2004)
New Revision: 1669

Modified:
   trunk/MonoDevelop/build/data/options/MonoDevelopProperties.xml
   trunk/MonoDevelop/help/
   trunk/MonoDevelop/src/Main/Base/ChangeLog
   trunk/MonoDevelop/src/Main/Base/Commands/AutostartCommands.cs
   trunk/MonoDevelop/src/Main/Base/Services/ParserService/DefaultParserService.cs
Log:
fix a bug where an install without a valid settings file would try and write code completion dbs into /, remove some dead code, svn:ignore some files.


Modified: trunk/MonoDevelop/build/data/options/MonoDevelopProperties.xml
===================================================================
--- trunk/MonoDevelop/build/data/options/MonoDevelopProperties.xml	2004-05-30 18:20:09 UTC (rev 1668)
+++ trunk/MonoDevelop/build/data/options/MonoDevelopProperties.xml	2004-05-30 19:56:39 UTC (rev 1669)
@@ -51,7 +51,7 @@
       </RECENT>
     </XmlConvertableProperty>
     <XmlConvertableProperty key="SharpDevelop.Gui.MainWindow.WindowState">
-      <WINDOWSTATE FULLSCREEN="False" STATE="Maximized">523|21|640|480</WINDOWSTATE>
+      <WINDOWSTATE FULLSCREEN="False" STATE="Maximized">0|0|640|480</WINDOWSTATE>
     </XmlConvertableProperty>
     <Property key="SharpDevelop.Gui.HelpFileGenerator.HtmlHelpCompilerFilename" value="C:\Program Files\HTML Help Workshop\hhc.exe" />
     <XmlConvertableProperty key="SharpDevelop.Workbench.WorkbenchMemento">


Property changes on: trunk/MonoDevelop/help
___________________________________________________________________
Name: svn:ignore
   + Makefile
Makefile.in
omf_timestamp
monodevelop.omf.out


Modified: trunk/MonoDevelop/src/Main/Base/ChangeLog
===================================================================
--- trunk/MonoDevelop/src/Main/Base/ChangeLog	2004-05-30 18:20:09 UTC (rev 1668)
+++ trunk/MonoDevelop/src/Main/Base/ChangeLog	2004-05-30 19:56:39 UTC (rev 1669)
@@ -1,3 +1,9 @@
+2004-05-30  Todd Berman  <tberman at sevenl.net>
+
+	* Commands/AutostartCommands: Remove some dead code.
+	* Services/ParserService/DefaultParserService.cs: Properly setup
+	the pathing so it works without an existing setup.
+
 2004-05-30  Lluis Sanchez Gual  <lluis at ximian.com>
 
 	* Services/ParserService/DefaultParserService.cs: Don't use the "Gac:"

Modified: trunk/MonoDevelop/src/Main/Base/Commands/AutostartCommands.cs
===================================================================
--- trunk/MonoDevelop/src/Main/Base/Commands/AutostartCommands.cs	2004-05-30 18:20:09 UTC (rev 1668)
+++ trunk/MonoDevelop/src/Main/Base/Commands/AutostartCommands.cs	2004-05-30 19:56:39 UTC (rev 1669)
@@ -38,7 +38,6 @@
 			DefaultWorkbench w = new DefaultWorkbench();
 			WorkbenchSingleton.Workbench = w;
 			w.InitializeWorkspace();
-			PropertyService propertyService = (PropertyService)ServiceManager.Services.GetService(typeof(PropertyService));
 			w.UpdateViews(null, null);
 			WorkbenchSingleton.CreateWorkspace();
 			((Gtk.Window)w).Visible = false;
@@ -145,8 +144,6 @@
 				return;
 			}
 		
-			ReflectionClass reflectionClass = new ReflectionClass(typeof(object));
-			
 			// register string tag provider (TODO: move to add-in tree :)
 			StringParserService stringParserService = (StringParserService)ServiceManager.Services.GetService(typeof(StringParserService));
 			stringParserService.RegisterStringTagProvider(new MonoDevelop.Commands.SharpDevelopStringTagProvider());

Modified: trunk/MonoDevelop/src/Main/Base/Services/ParserService/DefaultParserService.cs
===================================================================
--- trunk/MonoDevelop/src/Main/Base/Services/ParserService/DefaultParserService.cs	2004-05-30 18:20:09 UTC (rev 1668)
+++ trunk/MonoDevelop/src/Main/Base/Services/ParserService/DefaultParserService.cs	2004-05-30 19:56:39 UTC (rev 1669)
@@ -226,12 +226,17 @@
 		void SetDefaultCompletionFileLocation()
 		{
 			PropertyService propertyService = (PropertyService)ServiceManager.Services.GetService(typeof(PropertyService));
-			string path = (propertyService.GetProperty("SharpDevelop.CodeCompletion.DataDirectory", String.Empty).ToString());
-			FileUtilityService fileUtilityService = (FileUtilityService)ServiceManager.Services.GetService(typeof(FileUtilityService));
+			FileUtilityService fileUtilityService = (FileUtilityService)ServiceManager.Services.GetService (typeof (FileUtilityService));
+			string path = propertyService.GetProperty("SharpDevelop.CodeCompletion.DataDirectory", String.Empty).ToString();
+			if (path == String.Empty) {
+                        	path = Path.Combine (fileUtilityService.GetDirectoryNameWithSeparator(propertyService.ConfigDirectory), "CodeCompletionData");
+				propertyService.SetProperty ("SharpDevelop.CodeCompletion.DataDirectory", path);
+				propertyService.SaveProperties ();
+			}
+                        if (!Directory.Exists (path))
+                                Directory.CreateDirectory (path);
+
 			codeCompletionPath = fileUtilityService.GetDirectoryNameWithSeparator(path);
-			if (!Directory.Exists (codeCompletionPath)) {
-				Directory.CreateDirectory (codeCompletionPath);
-			}
 		}
 
 		public override void InitializeService()