[Monodevelop-patches-list] r1491 - in branches/MonoDevelop-generate-what: build/AddIns src/Main/Base src/Main/Base/Commands src/Main/Base/Gui/CompletionDatabaseWizard src/Main/Base/Gui/Dialogs/OptionPanels/IDEOptions src/Main/Base/Services/ParserService src/Main/Base/Services/Project

commit-watcher at mono-cvs.ximian.com commit-watcher at mono-cvs.ximian.com
Fri Apr 23 07:03:04 EDT 2004


Author: iainmc
Date: 2004-04-23 07:03:04 -0400 (Fri, 23 Apr 2004)
New Revision: 1491

Modified:
   branches/MonoDevelop-generate-what/build/AddIns/SharpDevelopCore.addin
   branches/MonoDevelop-generate-what/src/Main/Base/ChangeLog
   branches/MonoDevelop-generate-what/src/Main/Base/Commands/AutostartCommands.cs
   branches/MonoDevelop-generate-what/src/Main/Base/Gui/CompletionDatabaseWizard/CreateDBGenerator.cs
   branches/MonoDevelop-generate-what/src/Main/Base/Gui/Dialogs/OptionPanels/IDEOptions/BuildPanel.cs
   branches/MonoDevelop-generate-what/src/Main/Base/Gui/Dialogs/OptionPanels/IDEOptions/ProjectAndCombinePanel.cs
   branches/MonoDevelop-generate-what/src/Main/Base/Services/ParserService/DefaultParserService.cs
   branches/MonoDevelop-generate-what/src/Main/Base/Services/Project/DefaultProjectService.cs
Log:
* Base/Services/Project/DefaultProjectService.cs
* Commands/AutostartCommands.cs
* Gui/CompletionDatabaseWizard/CreateDBGenerator.cs
* Gui/Dialogs/OptionPanels/IDEOptions/BuildPanel.cs
* Gui/Dialogs/OptionPanels/IDEOptions/ProjectAndCombinePanel.cs
* Services/ParserService/DefaultParserService.cs:
rename DefaultParserService to DatabaseBackedParserService.
							


Modified: branches/MonoDevelop-generate-what/build/AddIns/SharpDevelopCore.addin
===================================================================
--- branches/MonoDevelop-generate-what/build/AddIns/SharpDevelopCore.addin	2004-04-23 09:07:39 UTC (rev 1490)
+++ branches/MonoDevelop-generate-what/build/AddIns/SharpDevelopCore.addin	2004-04-23 11:03:04 UTC (rev 1491)
@@ -37,7 +37,7 @@
 		<Class id    = "FileService"
 		       class = "MonoDevelop.Services.DefaultFileService"/>
 		<Class id    = "ParserService"
-		       class = "MonoDevelop.Services.DefaultParserService"/>
+		       class = "MonoDevelop.Services.DatabaseBackedParserService"/>
 		<Class id    = "TaskService"
 		       class = "MonoDevelop.Services.TaskService"/>
 		<Class id    = "StatusBarService"

Modified: branches/MonoDevelop-generate-what/src/Main/Base/ChangeLog
===================================================================
--- branches/MonoDevelop-generate-what/src/Main/Base/ChangeLog	2004-04-23 09:07:39 UTC (rev 1490)
+++ branches/MonoDevelop-generate-what/src/Main/Base/ChangeLog	2004-04-23 11:03:04 UTC (rev 1491)
@@ -1,3 +1,12 @@
+2004-04-23  Iain McCoy <iain at mccoy.id.au>
+	* Base/Services/Project/DefaultProjectService.cs
+	* Commands/AutostartCommands.cs
+	* Gui/CompletionDatabaseWizard/CreateDBGenerator.cs
+	* Gui/Dialogs/OptionPanels/IDEOptions/BuildPanel.cs
+	* Gui/Dialogs/OptionPanels/IDEOptions/ProjectAndCombinePanel.cs
+	* Services/ParserService/DefaultParserService.cs:
+	rename DefaultParserService to DatabaseBackedParserService.
+	
 2004-03-31  Todd Berman  <tberman at sevenl.net>
 
 	* Gui/Dialogs/CommonAboutDialog.cs: adding miguel :)

Modified: branches/MonoDevelop-generate-what/src/Main/Base/Commands/AutostartCommands.cs
===================================================================
--- branches/MonoDevelop-generate-what/src/Main/Base/Commands/AutostartCommands.cs	2004-04-23 09:07:39 UTC (rev 1490)
+++ branches/MonoDevelop-generate-what/src/Main/Base/Commands/AutostartCommands.cs	2004-04-23 11:03:04 UTC (rev 1491)
@@ -64,7 +64,7 @@
 			if (!File.Exists (codeCompletionProxyFile)) {
 				generatingCompletionData = true;
 				RunWizard();
-				DefaultParserService parserService = (DefaultParserService)ServiceManager.Services.GetService(typeof(IParserService));
+				DatabaseBackedParserService parserService = (DatabaseBackedParserService)ServiceManager.Services.GetService(typeof(IParserService));
 				parserService.LoadProxyDataFile();
 			}
 		}
@@ -83,7 +83,7 @@
 	{
 		public override void Run()
 		{
-			DefaultParserService parserService = (DefaultParserService)ServiceManager.Services.GetService(typeof(DefaultParserService));
+			DatabaseBackedParserService parserService = (DatabaseBackedParserService)ServiceManager.Services.GetService(typeof(DatabaseBackedParserService));
 			parserService.StartParserThread();
 		}
 	}

Modified: branches/MonoDevelop-generate-what/src/Main/Base/Gui/CompletionDatabaseWizard/CreateDBGenerator.cs
===================================================================
--- branches/MonoDevelop-generate-what/src/Main/Base/Gui/CompletionDatabaseWizard/CreateDBGenerator.cs	2004-04-23 09:07:39 UTC (rev 1490)
+++ branches/MonoDevelop-generate-what/src/Main/Base/Gui/CompletionDatabaseWizard/CreateDBGenerator.cs	2004-04-23 11:03:04 UTC (rev 1491)
@@ -18,7 +18,7 @@
 		public void Generate(IProgressMonitor progress)
 		{
 			string path = this.CreateCodeCompletionDir();
-			DefaultParserService parserService  = (DefaultParserService)MonoDevelop.Core.Services.ServiceManager.Services.GetService(typeof(DefaultParserService));
+			DatabaseBackedParserService parserService  = (DatabaseBackedParserService)MonoDevelop.Core.Services.ServiceManager.Services.GetService(typeof(DatabaseBackedParserService));
 			if (Fast) {
 				parserService.GenerateCodeCompletionDatabase (path, progress);
 			} else {

Modified: branches/MonoDevelop-generate-what/src/Main/Base/Gui/Dialogs/OptionPanels/IDEOptions/BuildPanel.cs
===================================================================
--- branches/MonoDevelop-generate-what/src/Main/Base/Gui/Dialogs/OptionPanels/IDEOptions/BuildPanel.cs	2004-04-23 09:07:39 UTC (rev 1490)
+++ branches/MonoDevelop-generate-what/src/Main/Base/Gui/Dialogs/OptionPanels/IDEOptions/BuildPanel.cs	2004-04-23 11:03:04 UTC (rev 1491)
@@ -84,7 +84,7 @@
 				// reading properties
 				//
 				BeforeCompileAction action = (BeforeCompileAction) PropertyService.GetProperty(
-					"SharpDevelop.Services.DefaultParserService.BeforeCompileAction", 
+					"SharpDevelop.Services.DatabaseBackedParserService.BeforeCompileAction", 
 					BeforeCompileAction.SaveAllFiles);
 				saveChangesRadioButton.Active = action.Equals(BeforeCompileAction.SaveAllFiles);
 				promptChangesRadioButton.Active = action.Equals(BeforeCompileAction.PromptForSave);
@@ -99,13 +99,13 @@
 			{
 				// set properties
 				if (saveChangesRadioButton.Active) {
-					PropertyService.SetProperty("SharpDevelop.Services.DefaultParserService.BeforeCompileAction", 
+					PropertyService.SetProperty("SharpDevelop.Services.DatabaseBackedParserService.BeforeCompileAction", 
 							BeforeCompileAction.SaveAllFiles);
 				} else if (promptChangesRadioButton.Active) {
-					PropertyService.SetProperty("SharpDevelop.Services.DefaultParserService.BeforeCompileAction", 
+					PropertyService.SetProperty("SharpDevelop.Services.DatabaseBackedParserService.BeforeCompileAction", 
 							BeforeCompileAction.PromptForSave);
 				} else if (noSaveRadioButton.Active) {
-					PropertyService.SetProperty("SharpDevelop.Services.DefaultParserService.BeforeCompileAction", 
+					PropertyService.SetProperty("SharpDevelop.Services.DatabaseBackedParserService.BeforeCompileAction", 
 							BeforeCompileAction.Nothing);
 				}
 				

Modified: branches/MonoDevelop-generate-what/src/Main/Base/Gui/Dialogs/OptionPanels/IDEOptions/ProjectAndCombinePanel.cs
===================================================================
--- branches/MonoDevelop-generate-what/src/Main/Base/Gui/Dialogs/OptionPanels/IDEOptions/ProjectAndCombinePanel.cs	2004-04-23 09:07:39 UTC (rev 1490)
+++ branches/MonoDevelop-generate-what/src/Main/Base/Gui/Dialogs/OptionPanels/IDEOptions/ProjectAndCombinePanel.cs	2004-04-23 11:03:04 UTC (rev 1491)
@@ -83,7 +83,7 @@
 				// reading properties
 				//
 				BeforeCompileAction action = (BeforeCompileAction) PropertyService.GetProperty(
-					"SharpDevelop.Services.DefaultParserService.BeforeCompileAction", 
+					"SharpDevelop.Services.DatabaseBackedParserService.BeforeCompileAction", 
 					BeforeCompileAction.SaveAllFiles);
 				saveChangesRadioButton.Active = action.Equals(BeforeCompileAction.SaveAllFiles);
 				promptChangesRadioButton.Active = action.Equals(BeforeCompileAction.PromptForSave);
@@ -98,13 +98,13 @@
 			{
 				// set properties
 				if (saveChangesRadioButton.Active) {
-					PropertyService.SetProperty("SharpDevelop.Services.DefaultParserService.BeforeCompileAction", 
+					PropertyService.SetProperty("SharpDevelop.Services.DatabaseBackedParserService.BeforeCompileAction", 
 							BeforeCompileAction.SaveAllFiles);
 				} else if (promptChangesRadioButton.Active) {
-					PropertyService.SetProperty("SharpDevelop.Services.DefaultParserService.BeforeCompileAction", 
+					PropertyService.SetProperty("SharpDevelop.Services.DatabaseBackedParserService.BeforeCompileAction", 
 							BeforeCompileAction.PromptForSave);
 				} else if (noSaveRadioButton.Active) {
-					PropertyService.SetProperty("SharpDevelop.Services.DefaultParserService.BeforeCompileAction", 
+					PropertyService.SetProperty("SharpDevelop.Services.DatabaseBackedParserService.BeforeCompileAction", 
 							BeforeCompileAction.Nothing);
 				}
 				

Modified: branches/MonoDevelop-generate-what/src/Main/Base/Services/ParserService/DefaultParserService.cs
===================================================================
--- branches/MonoDevelop-generate-what/src/Main/Base/Services/ParserService/DefaultParserService.cs	2004-04-23 09:07:39 UTC (rev 1490)
+++ branches/MonoDevelop-generate-what/src/Main/Base/Services/ParserService/DefaultParserService.cs	2004-04-23 11:03:04 UTC (rev 1491)
@@ -30,7 +30,7 @@
 
 namespace MonoDevelop.Services
 {
-	public class DefaultParserService : AbstractService, IParserService
+	public class DatabaseBackedParserService : AbstractService, IParserService
 	{
 		Hashtable classes                = new Hashtable();
 		Hashtable caseInsensitiveClasses = new Hashtable();
@@ -92,7 +92,7 @@
 			"gtkhtml-sharp",
 		};
 		
-		public DefaultParserService()
+		public DatabaseBackedParserService()
 		{
 			addedParseInformation.DirtyCompilationUnit = new DummyCompilationUnit();
 			removedParseInformation.DirtyCompilationUnit = new DummyCompilationUnit();
@@ -284,10 +284,10 @@
 		
 		class AssemblyLoader
 		{
-			DefaultParserService parserService;
+			DatabaseBackedParserService parserService;
 			string assemblyFileName;
 			
-			public AssemblyLoader(DefaultParserService parserService, string assemblyFileName)
+			public AssemblyLoader(DatabaseBackedParserService parserService, string assemblyFileName)
 			{
 				this.parserService    = parserService;
 				this.assemblyFileName = assemblyFileName;
@@ -347,11 +347,11 @@
 //        it is better than the old version you fixed 
 // !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
-//				lock(DefaultParserService.ParserPulse) {
-//					//Console.WriteLine("Pulse got: {0} entries",DefaultParserService.ParserPulse.Count);
-//					Monitor.Wait(DefaultParserService.ParserPulse);
-//					if (DefaultParserService.ParserPulse.Count>0) {
-//						fn = (string)DefaultParserService.ParserPulse.Dequeue();
+//				lock(DatabaseBackedParserService.ParserPulse) {
+//					//Console.WriteLine("Pulse got: {0} entries",DatabaseBackedParserService.ParserPulse.Count);
+//					Monitor.Wait(DatabaseBackedParserService.ParserPulse);
+//					if (DatabaseBackedParserService.ParserPulse.Count>0) {
+//						fn = (string)DatabaseBackedParserService.ParserPulse.Dequeue();
 //					}
 //				}
 				try {

Modified: branches/MonoDevelop-generate-what/src/Main/Base/Services/Project/DefaultProjectService.cs
===================================================================
--- branches/MonoDevelop-generate-what/src/Main/Base/Services/Project/DefaultProjectService.cs	2004-04-23 09:07:39 UTC (rev 1490)
+++ branches/MonoDevelop-generate-what/src/Main/Base/Services/Project/DefaultProjectService.cs	2004-04-23 11:03:04 UTC (rev 1491)
@@ -321,7 +321,7 @@
 		void DoBeforeCompileAction()
 		{
 			PropertyService propertyService = (PropertyService)ServiceManager.Services.GetService(typeof(PropertyService));
-			BeforeCompileAction action = (BeforeCompileAction)propertyService.GetProperty("SharpDevelop.Services.DefaultParserService.BeforeCompileAction", BeforeCompileAction.SaveAllFiles);
+			BeforeCompileAction action = (BeforeCompileAction)propertyService.GetProperty("SharpDevelop.Services.DatabaseBackedParserService.BeforeCompileAction", BeforeCompileAction.SaveAllFiles);
 			
 			switch (action) {
 				case BeforeCompileAction.Nothing:




More information about the Monodevelop-patches-list mailing list