[Monodevelop-patches-list] r1815 - in trunk/MonoDevelop: . build/AddIns src/AddIns/BackendBindings/CSharpBinding src/AddIns/BackendBindings/CSharpBinding/Gui src/AddIns/BackendBindings/ILAsmBinding src/AddIns/BackendBindings/JavaBinding src/AddIns/BackendBindings/JavaBinding/ProjectTreeBuilder src/AddIns/BackendBindings/NemerleBinding src/AddIns/DebuggerAddIn src/AddIns/DebuggerAddIn/Gui src/AddIns/DisplayBindings/SourceEditor/CodeCompletion src/AddIns/DisplayBindings/SourceEditor/Commands src/AddIns/DisplayBindings/SourceEditor/Gui src/AddIns/DisplayBindings/SourceEditor/Gui/Dialogs src/AddIns/DisplayBindings/SourceEditor/Gui/OptionPanels src/AddIns/DisplayBindings/SourceEditor/Gui/Pads src/AddIns/DisplayBindings/SourceEditor/InsightWindow src/AddIns/DisplayBindings/SourceEditor/Properties src/AddIns/DisplayBindings/SourceEditor/Search src/AddIns/DisplayBindings/SourceEditor/Search/DocumentIterator src/AddIns/Misc/StartPage src/AddIns/prj2make-sharp-lib src/Libraries/MonoDevelop.Core src/Libr aries/MonoDevelop.Core/AddIns src/Libraries/MonoDevelop.Core/AddIns/Conditions src/Libraries/MonoDevelop.Core/Services src/Libraries/MonoDevelop.Gui.Widgets/FileBrowser src/Libraries/MonoDevelop.Gui.Widgets/FileSelector src/Main/Base src/Main/Base/Commands src/Main/Base/Commands/ClassBrowserCommands src/Main/Base/Commands/ProjectBrowserCommands src/Main/Base/Commands/VBConverter src/Main/Base/Gui src/Main/Base/Gui/BrowserDisplayBinding src/Main/Base/Gui/Components src/Main/Base/Gui/Components/LocalizedPropertyGrid src/Main/Base/Gui/Components/SideBar src/Main/Base/Gui/Dialogs src/Main/Base/Gui/Dialogs/CombineConfiguration src/Main/Base/Gui/Dialogs/OptionPanels src/Main/Base/Gui/Dialogs/OptionPanels/IDEOptions src/Main/Base/Gui/Dialogs/OptionPanels/ProjectOptions src/Main/Base/Gui/Dialogs/ReferenceDialog src/Main/Base/Gui/Dialogs/Wizard src/Main/Base/Gui/ErrorHandlers src/Main/Base/Gui/Pads src/Main/Base/Gui/Pads/ClassScout src/Main/Base/Gui/Pads/ClassScout/NodeBuilder src/Ma in/Base/Gui/Pads/FileScout src/Main/Base/Gui/Pads/HelpBrowser src/Main/Base/Gui/Pads/ProjectBrowser src/Main/Base/Gui/Pads/ProjectBrowser/BrowserNode src/Main/Base/Gui/Pads/ProjectBrowser/NodeBuilder src/Main/Base/Gui/Workbench src/Main/Base/Gui/Workbench/Layouts src/Main/Base/Internal/Codons src/Main/Base/Internal/Codons/LanguageBinding src/Main/Base/Internal/Codons/MenuItems src/Main/Base/Internal/Conditions src/Main/Base/Internal/ExternalTool src/Main/Base/Internal/Parser/ReflectionLayer src/Main/Base/Internal/Project/Combine src/Main/Base/Internal/Project/Project src/Main/Base/Internal/Project/Project/Deployment src/Main/Base/Internal/Templates src/Main/Base/Internal/Templates/ProjectTemplates src/Main/Base/Services src/Main/Base/Services/AmbienceService src/Main/Base/Services/File src/Main/Base/Services/Language src/Main/Base/Services/MenuService src/Main/Base/Services/ParserService src/Main/Base/Services/Project src/Main/Base/Services/StatusBar src/Main/Base/Services/T asks src/Main/Base/Services/Toolbar src/Main/StartUp src/Main/StartUp/Dialogs src/Tools/dbgen/src
commit-watcher at mono-cvs.ximian.com
commit-watcher at mono-cvs.ximian.com
Wed Jun 23 22:05:42 EDT 2004
Author: tberman
Date: 2004-06-23 22:05:41 -0400 (Wed, 23 Jun 2004)
New Revision: 1815
Removed:
trunk/MonoDevelop/src/Main/Base/Gui/CompletionDatabaseWizard/
Modified:
trunk/MonoDevelop/ChangeLog
trunk/MonoDevelop/build/AddIns/SharpDevelopCore.addin.xml
trunk/MonoDevelop/src/AddIns/BackendBindings/CSharpBinding/CSharpBindingCompilerManager.cs
trunk/MonoDevelop/src/AddIns/BackendBindings/CSharpBinding/CSharpBindingExecutionManager.cs
trunk/MonoDevelop/src/AddIns/BackendBindings/CSharpBinding/Gui/CodeGenerationPanel.cs
trunk/MonoDevelop/src/AddIns/BackendBindings/CSharpBinding/Gui/OutputOptionsPanel.cs
trunk/MonoDevelop/src/AddIns/BackendBindings/ILAsmBinding/ILAsmCompilerManager.cs
trunk/MonoDevelop/src/AddIns/BackendBindings/ILAsmBinding/ILAsmExecutionManager.cs
trunk/MonoDevelop/src/AddIns/BackendBindings/JavaBinding/JavaBindingCompilerServices.cs
trunk/MonoDevelop/src/AddIns/BackendBindings/JavaBinding/JavaBindingExecutionServices.cs
trunk/MonoDevelop/src/AddIns/BackendBindings/JavaBinding/ProjectTreeBuilder/JavaNodeBuilder.cs
trunk/MonoDevelop/src/AddIns/BackendBindings/NemerleBinding/NemerleBindingCompilerServices.cs
trunk/MonoDevelop/src/AddIns/BackendBindings/NemerleBinding/NemerleBindingExecutionServices.cs
trunk/MonoDevelop/src/AddIns/DebuggerAddIn/DebuggerCommands.cs
trunk/MonoDevelop/src/AddIns/DebuggerAddIn/Gui/DebuggerVariablePad.cs
trunk/MonoDevelop/src/AddIns/DisplayBindings/SourceEditor/CodeCompletion/CodeCompletionData.cs
trunk/MonoDevelop/src/AddIns/DisplayBindings/SourceEditor/CodeCompletion/CodeCompletionDataProvider.cs
trunk/MonoDevelop/src/AddIns/DisplayBindings/SourceEditor/CodeCompletion/CommentCompletionDataProvider.cs
trunk/MonoDevelop/src/AddIns/DisplayBindings/SourceEditor/Commands/FormatCommands.cs
trunk/MonoDevelop/src/AddIns/DisplayBindings/SourceEditor/Commands/ProjectCommands.cs
trunk/MonoDevelop/src/AddIns/DisplayBindings/SourceEditor/Gui/Dialogs/EditTemplateGroupDialog.cs
trunk/MonoDevelop/src/AddIns/DisplayBindings/SourceEditor/Gui/Dialogs/ExportProjectToHtmlDialog.cs
trunk/MonoDevelop/src/AddIns/DisplayBindings/SourceEditor/Gui/Dialogs/ReplaceDialog.cs
trunk/MonoDevelop/src/AddIns/DisplayBindings/SourceEditor/Gui/Dialogs/ReplaceInFilesDialog.cs
trunk/MonoDevelop/src/AddIns/DisplayBindings/SourceEditor/Gui/OptionPanels/BehaviorTextEditorPanel.cs
trunk/MonoDevelop/src/AddIns/DisplayBindings/SourceEditor/Gui/OptionPanels/CodeTemplatePanel.cs
trunk/MonoDevelop/src/AddIns/DisplayBindings/SourceEditor/Gui/OptionPanels/GeneralTextEditorPanel.cs
trunk/MonoDevelop/src/AddIns/DisplayBindings/SourceEditor/Gui/OptionPanels/MarkersTextEditorPanel.cs
trunk/MonoDevelop/src/AddIns/DisplayBindings/SourceEditor/Gui/Pads/CompilerMessageView.cs
trunk/MonoDevelop/src/AddIns/DisplayBindings/SourceEditor/Gui/SourceEditorBuffer.cs
trunk/MonoDevelop/src/AddIns/DisplayBindings/SourceEditor/Gui/SourceEditorDisplayBinding.cs
trunk/MonoDevelop/src/AddIns/DisplayBindings/SourceEditor/Gui/SourceEditorView.cs
trunk/MonoDevelop/src/AddIns/DisplayBindings/SourceEditor/InsightWindow/IndexerInsightDataProvider.cs
trunk/MonoDevelop/src/AddIns/DisplayBindings/SourceEditor/InsightWindow/InsightWindow.cs
trunk/MonoDevelop/src/AddIns/DisplayBindings/SourceEditor/InsightWindow/MethodInsightDataProvider.cs
trunk/MonoDevelop/src/AddIns/DisplayBindings/SourceEditor/Properties/TextEditorProperties.cs
trunk/MonoDevelop/src/AddIns/DisplayBindings/SourceEditor/Search/DocumentIterator/DirectoryDocumentIterator.cs
trunk/MonoDevelop/src/AddIns/DisplayBindings/SourceEditor/Search/DocumentIterator/WholeProjectDocumentIterator.cs
trunk/MonoDevelop/src/AddIns/DisplayBindings/SourceEditor/Search/SearchOptions.cs
trunk/MonoDevelop/src/AddIns/DisplayBindings/SourceEditor/Search/SearchReplaceInFilesManager.cs
trunk/MonoDevelop/src/AddIns/DisplayBindings/SourceEditor/Search/SearchReplaceManager.cs
trunk/MonoDevelop/src/AddIns/Misc/StartPage/ICSharpCodePage.cs
trunk/MonoDevelop/src/AddIns/Misc/StartPage/StartPage.cs
trunk/MonoDevelop/src/AddIns/prj2make-sharp-lib/prj2make-sharp-lib-Commands.cs
trunk/MonoDevelop/src/Libraries/MonoDevelop.Core/AddIns/AddIn.cs
trunk/MonoDevelop/src/Libraries/MonoDevelop.Core/AddIns/AddInTreeSingleton.cs
trunk/MonoDevelop/src/Libraries/MonoDevelop.Core/AddIns/Conditions/CompareCondition.cs
trunk/MonoDevelop/src/Libraries/MonoDevelop.Core/ChangeLog
trunk/MonoDevelop/src/Libraries/MonoDevelop.Core/Services/FileUtilityService.cs
trunk/MonoDevelop/src/Libraries/MonoDevelop.Core/Services/PropertyService.cs
trunk/MonoDevelop/src/Libraries/MonoDevelop.Core/Services/ServiceManager.cs
trunk/MonoDevelop/src/Libraries/MonoDevelop.Core/Services/StringParserService.cs
trunk/MonoDevelop/src/Libraries/MonoDevelop.Gui.Widgets/FileBrowser/FileBrowser.cs
trunk/MonoDevelop/src/Libraries/MonoDevelop.Gui.Widgets/FileSelector/FileSelector.cs
trunk/MonoDevelop/src/Main/Base/ChangeLog
trunk/MonoDevelop/src/Main/Base/Commands/AutostartCommands.cs
trunk/MonoDevelop/src/Main/Base/Commands/ClassBrowserCommands/ClassBrowserCommands.cs
trunk/MonoDevelop/src/Main/Base/Commands/CustomStringTagProvider.cs
trunk/MonoDevelop/src/Main/Base/Commands/FileCommands.cs
trunk/MonoDevelop/src/Main/Base/Commands/HelpCommands.cs
trunk/MonoDevelop/src/Main/Base/Commands/MenuItemBuilders.cs
trunk/MonoDevelop/src/Main/Base/Commands/ProjectBrowserCommands/CombineNodeCommands.cs
trunk/MonoDevelop/src/Main/Base/Commands/ProjectBrowserCommands/FolderNodeCommands.cs
trunk/MonoDevelop/src/Main/Base/Commands/ProjectBrowserCommands/GeneralNodeCommands.cs
trunk/MonoDevelop/src/Main/Base/Commands/ProjectBrowserCommands/ProjectNodeCommands.cs
trunk/MonoDevelop/src/Main/Base/Commands/ProjectBrowserCommands/ReferenceFolderNodeCommands.cs
trunk/MonoDevelop/src/Main/Base/Commands/ProjectBrowserCommands/ResourceFolderNodeCommands.cs
trunk/MonoDevelop/src/Main/Base/Commands/ProjectCommands.cs
trunk/MonoDevelop/src/Main/Base/Commands/RunCommands.cs
trunk/MonoDevelop/src/Main/Base/Commands/ToolsCommands.cs
trunk/MonoDevelop/src/Main/Base/Commands/VBConverter/ConvertBuffer.cs
trunk/MonoDevelop/src/Main/Base/Commands/VBConverter/ConvertProject.cs
trunk/MonoDevelop/src/Main/Base/Gui/BrowserDisplayBinding/HtmlViewPane.cs
trunk/MonoDevelop/src/Main/Base/Gui/Components/LocalizedPropertyGrid/LocalizedPropertyDescriptor.cs
trunk/MonoDevelop/src/Main/Base/Gui/Components/SdMenu.cs
trunk/MonoDevelop/src/Main/Base/Gui/Components/SdMenuCheckBox.cs
trunk/MonoDevelop/src/Main/Base/Gui/Components/SdMenuCommand.cs
trunk/MonoDevelop/src/Main/Base/Gui/Components/SdToolbarCommand.cs
trunk/MonoDevelop/src/Main/Base/Gui/Components/SideBar/SharpDevelopSideTabItem.cs
trunk/MonoDevelop/src/Main/Base/Gui/Dialogs/CombineConfiguration/CombineBuildOptions.cs
trunk/MonoDevelop/src/Main/Base/Gui/Dialogs/CombineConfiguration/CombineStartupPanel.cs
trunk/MonoDevelop/src/Main/Base/Gui/Dialogs/CommonAboutDialog.cs
trunk/MonoDevelop/src/Main/Base/Gui/Dialogs/NewFileDialog.cs
trunk/MonoDevelop/src/Main/Base/Gui/Dialogs/NewProjectDialog.cs
trunk/MonoDevelop/src/Main/Base/Gui/Dialogs/OptionPanels/EditTemplateDialog.cs
trunk/MonoDevelop/src/Main/Base/Gui/Dialogs/OptionPanels/ExternalToolPanel.cs
trunk/MonoDevelop/src/Main/Base/Gui/Dialogs/OptionPanels/IDEOptions/BuildPanel.cs
trunk/MonoDevelop/src/Main/Base/Gui/Dialogs/OptionPanels/IDEOptions/CodeGenerationPanel.cs
trunk/MonoDevelop/src/Main/Base/Gui/Dialogs/OptionPanels/IDEOptions/LoadSavePanel.cs
trunk/MonoDevelop/src/Main/Base/Gui/Dialogs/OptionPanels/IDEOptions/SelectCulturePanel.cs
trunk/MonoDevelop/src/Main/Base/Gui/Dialogs/OptionPanels/IDEOptions/SelectStylePanel.cs
trunk/MonoDevelop/src/Main/Base/Gui/Dialogs/OptionPanels/ProjectOptions/CompileFileProjectOptions.cs
trunk/MonoDevelop/src/Main/Base/Gui/Dialogs/OptionPanels/ProjectOptions/DeployFileOptions.cs
trunk/MonoDevelop/src/Main/Base/Gui/Dialogs/OptionPanels/ProjectOptions/GeneralProjectOptions.cs
trunk/MonoDevelop/src/Main/Base/Gui/Dialogs/ProjectOptionsDialog.cs
trunk/MonoDevelop/src/Main/Base/Gui/Dialogs/ReferenceDialog/AssemblyReferencePanel.cs
trunk/MonoDevelop/src/Main/Base/Gui/Dialogs/ReferenceDialog/GacReferencePanel.cs
trunk/MonoDevelop/src/Main/Base/Gui/Dialogs/ReferenceDialog/ProjectReferencePanel.cs
trunk/MonoDevelop/src/Main/Base/Gui/Dialogs/ReferenceDialog/SelectReferenceDialog.cs
trunk/MonoDevelop/src/Main/Base/Gui/Dialogs/ReferenceDialog/WebReference.cs
trunk/MonoDevelop/src/Main/Base/Gui/Dialogs/SharpDevelopAboutPanels.cs
trunk/MonoDevelop/src/Main/Base/Gui/Dialogs/TipOfTheDay.cs
trunk/MonoDevelop/src/Main/Base/Gui/Dialogs/TreeViewOptions.cs
trunk/MonoDevelop/src/Main/Base/Gui/Dialogs/ViewGPLDialog.cs
trunk/MonoDevelop/src/Main/Base/Gui/Dialogs/Wizard/CurrentPanelPanel.cs
trunk/MonoDevelop/src/Main/Base/Gui/Dialogs/Wizard/StatusPanel.cs
trunk/MonoDevelop/src/Main/Base/Gui/Dialogs/Wizard/WizardDialog.cs
trunk/MonoDevelop/src/Main/Base/Gui/Dialogs/WordCountDialog.cs
trunk/MonoDevelop/src/Main/Base/Gui/ErrorHandlers/GenericError.cs
trunk/MonoDevelop/src/Main/Base/Gui/Pads/ClassScout/ClassScout.cs
trunk/MonoDevelop/src/Main/Base/Gui/Pads/ClassScout/NodeBuilder/DefaultDotNetClassScoutNodeBuilder.cs
trunk/MonoDevelop/src/Main/Base/Gui/Pads/FileScout/FileList.cs
trunk/MonoDevelop/src/Main/Base/Gui/Pads/FileScout/FileScout.cs
trunk/MonoDevelop/src/Main/Base/Gui/Pads/HelpBrowser/HelpViewer.cs
trunk/MonoDevelop/src/Main/Base/Gui/Pads/HelpBrowser/MonodocTreePad.cs
trunk/MonoDevelop/src/Main/Base/Gui/Pads/OpenTaskView.cs
trunk/MonoDevelop/src/Main/Base/Gui/Pads/ProjectBrowser/BrowserNode/AbstractBrowserNode.cs
trunk/MonoDevelop/src/Main/Base/Gui/Pads/ProjectBrowser/BrowserNode/CombineBrowserNode.cs
trunk/MonoDevelop/src/Main/Base/Gui/Pads/ProjectBrowser/BrowserNode/DirectoryNode.cs
trunk/MonoDevelop/src/Main/Base/Gui/Pads/ProjectBrowser/BrowserNode/FileNode.cs
trunk/MonoDevelop/src/Main/Base/Gui/Pads/ProjectBrowser/BrowserNode/ProjectBrowserNode.cs
trunk/MonoDevelop/src/Main/Base/Gui/Pads/ProjectBrowser/BrowserNode/ReferenceNode.cs
trunk/MonoDevelop/src/Main/Base/Gui/Pads/ProjectBrowser/NodeBuilder/DefaultDotNetNodeBuilder.cs
trunk/MonoDevelop/src/Main/Base/Gui/Pads/ProjectBrowser/ProjectBrowserView.cs
trunk/MonoDevelop/src/Main/Base/Gui/Pads/SideBarView.cs
trunk/MonoDevelop/src/Main/Base/Gui/PixbufList.cs
trunk/MonoDevelop/src/Main/Base/Gui/Workbench/DefaultWorkbench.cs
trunk/MonoDevelop/src/Main/Base/Gui/Workbench/Layouts/SdiWorkspaceLayout.cs
trunk/MonoDevelop/src/Main/Base/Gui/Workbench/Layouts/SdiWorkspaceWindow.cs
trunk/MonoDevelop/src/Main/Base/Gui/WorkbenchSingleton.cs
trunk/MonoDevelop/src/Main/Base/Internal/Codons/DialogPanelCodon.cs
trunk/MonoDevelop/src/Main/Base/Internal/Codons/LanguageBinding/FileFilterCodon.cs
trunk/MonoDevelop/src/Main/Base/Internal/Codons/MenuItems/MenuItemCodon.cs
trunk/MonoDevelop/src/Main/Base/Internal/Conditions/CombineOpenCondition.cs
trunk/MonoDevelop/src/Main/Base/Internal/Conditions/ProjectActiveCondition.cs
trunk/MonoDevelop/src/Main/Base/Internal/Conditions/ProjectOpenCondition.cs
trunk/MonoDevelop/src/Main/Base/Internal/ExternalTool/ToolLoader.cs
trunk/MonoDevelop/src/Main/Base/Internal/Parser/ReflectionLayer/ReflectionClass.cs
trunk/MonoDevelop/src/Main/Base/Internal/Project/Combine/Combine.cs
trunk/MonoDevelop/src/Main/Base/Internal/Project/Combine/CombineEntry.cs
trunk/MonoDevelop/src/Main/Base/Internal/Project/Project/AbstractProject.cs
trunk/MonoDevelop/src/Main/Base/Internal/Project/Project/Deployment/AssemblyDeploy.cs
trunk/MonoDevelop/src/Main/Base/Internal/Project/Project/Deployment/FileDeploy.cs
trunk/MonoDevelop/src/Main/Base/Internal/Project/Project/Deployment/ScriptDeploy.cs
trunk/MonoDevelop/src/Main/Base/Internal/Project/Project/IncludeFilesDialog.cs
trunk/MonoDevelop/src/Main/Base/Internal/Project/Project/ProjectReference.cs
trunk/MonoDevelop/src/Main/Base/Internal/Templates/CodeTemplateLoader.cs
trunk/MonoDevelop/src/Main/Base/Internal/Templates/FileTemplate.cs
trunk/MonoDevelop/src/Main/Base/Internal/Templates/ProjectTemplates/CombineDescriptor.cs
trunk/MonoDevelop/src/Main/Base/Internal/Templates/ProjectTemplates/ProjectDescriptor.cs
trunk/MonoDevelop/src/Main/Base/Internal/Templates/ProjectTemplates/ProjectTemplate.cs
trunk/MonoDevelop/src/Main/Base/Internal/Templates/TextTemplate.cs
trunk/MonoDevelop/src/Main/Base/Makefile.am
trunk/MonoDevelop/src/Main/Base/Services/AmbienceService/AmbienceService.cs
trunk/MonoDevelop/src/Main/Base/Services/AmbienceService/CodeDOMGeneratorUtility.cs
trunk/MonoDevelop/src/Main/Base/Services/File/DefaultFileService.cs
trunk/MonoDevelop/src/Main/Base/Services/Language/LanguageService.cs
trunk/MonoDevelop/src/Main/Base/Services/MenuService/MenuService.cs
trunk/MonoDevelop/src/Main/Base/Services/MessageService.cs
trunk/MonoDevelop/src/Main/Base/Services/ParserService/DefaultParserService.cs
trunk/MonoDevelop/src/Main/Base/Services/Project/DefaultProjectService.cs
trunk/MonoDevelop/src/Main/Base/Services/ResourceService.cs
trunk/MonoDevelop/src/Main/Base/Services/StatusBar/DefaultStatusBarService.cs
trunk/MonoDevelop/src/Main/Base/Services/Tasks/Task.cs
trunk/MonoDevelop/src/Main/Base/Services/Tasks/TaskService.cs
trunk/MonoDevelop/src/Main/Base/Services/Toolbar/ToolbarService.cs
trunk/MonoDevelop/src/Main/StartUp/Dialogs/ExceptionBox.cs
trunk/MonoDevelop/src/Main/StartUp/MonoDevelopMain.cs
trunk/MonoDevelop/src/Tools/dbgen/src/dbgen.cs
Log:
changes out the ass, for a tiny api change.
Modified: trunk/MonoDevelop/ChangeLog
===================================================================
--- trunk/MonoDevelop/ChangeLog 2004-06-23 23:08:38 UTC (rev 1814)
+++ trunk/MonoDevelop/ChangeLog 2004-06-24 02:05:41 UTC (rev 1815)
@@ -1,3 +1,7 @@
+2004-06-23 Todd Berman <tberman at off.net>
+
+ * *.cs: Lots of changes to reflect the ServiceManager change.
+
2004-06-18 Todd Berman <tberman at off.net>
* configure.in: change how we reference the debugger stuff, to make
Modified: trunk/MonoDevelop/build/AddIns/SharpDevelopCore.addin.xml
===================================================================
--- trunk/MonoDevelop/build/AddIns/SharpDevelopCore.addin.xml 2004-06-23 23:08:38 UTC (rev 1814)
+++ trunk/MonoDevelop/build/AddIns/SharpDevelopCore.addin.xml 2004-06-24 02:05:41 UTC (rev 1815)
@@ -18,8 +18,8 @@
<Extension path = "/Workspace/Autostart">
<Class id = "InitializeWorkbenchCommand"
class = "MonoDevelop.Commands.InitializeWorkbenchCommand"/>
- <Class id = "StartCodeCompletionWizard"
- class = "MonoDevelop.Commands.StartCodeCompletionWizard"/>
+ <!--<Class id = "StartCodeCompletionWizard"
+ class = "MonoDevelop.Commands.StartCodeCompletionWizard"/>-->
<Class id = "StartParserServiceThread"
class = "MonoDevelop.Commands.StartParserServiceThread"/>
<!-- #assembly preload -->
Modified: trunk/MonoDevelop/src/AddIns/BackendBindings/CSharpBinding/CSharpBindingCompilerManager.cs
===================================================================
--- trunk/MonoDevelop/src/AddIns/BackendBindings/CSharpBinding/CSharpBindingCompilerManager.cs 2004-06-23 23:08:38 UTC (rev 1814)
+++ trunk/MonoDevelop/src/AddIns/BackendBindings/CSharpBinding/CSharpBindingCompilerManager.cs 2004-06-24 02:05:41 UTC (rev 1815)
@@ -27,7 +27,7 @@
/// </summary>
public class CSharpBindingCompilerManager
{
- FileUtilityService fileUtilityService = (FileUtilityService)ServiceManager.Services.GetService(typeof(FileUtilityService));
+ FileUtilityService fileUtilityService = (FileUtilityService)ServiceManager.GetService(typeof(FileUtilityService));
public string GetCompiledOutputName(string fileName)
{
@@ -143,7 +143,7 @@
if (compilerparameters.CsharpCompiler == CsharpCompiler.Csc) {
writer.WriteLine("\"/out:" + exe + '"');
- IProjectService projectService = (IProjectService)MonoDevelop.Core.Services.ServiceManager.Services.GetService(typeof(IProjectService));
+ IProjectService projectService = (IProjectService)MonoDevelop.Core.Services.ServiceManager.GetService(typeof(IProjectService));
ArrayList allProjects = Combine.GetAllProjects(projectService.CurrentOpenCombine);
foreach (ProjectReference lib in p.ProjectReferences) {
@@ -221,7 +221,7 @@
}
writer.WriteLine("--wlevel " + compilerparameters.WarningLevel);
- IProjectService projectService = (IProjectService)MonoDevelop.Core.Services.ServiceManager.Services.GetService(typeof(IProjectService));
+ IProjectService projectService = (IProjectService)MonoDevelop.Core.Services.ServiceManager.GetService(typeof(IProjectService));
ArrayList allProjects = Combine.GetAllProjects(projectService.CurrentOpenCombine);
foreach (ProjectReference lib in p.ProjectReferences) {
@@ -325,7 +325,7 @@
}
}
- SystemAssemblyService sas = (SystemAssemblyService)ServiceManager.Services.GetService (typeof (SystemAssemblyService));
+ SystemAssemblyService sas = (SystemAssemblyService)ServiceManager.GetService (typeof (SystemAssemblyService));
foreach (ProjectReference lib in project.ProjectReferences) {
switch (lib.ReferenceType) {
case ReferenceType.Gac:
@@ -343,7 +343,7 @@
break;
case ReferenceType.Project:
string project_fileName = lib.GetReferencedFileName (project);
- IProjectService prjService = (IProjectService)ServiceManager.Services.GetService (typeof (IProjectService));
+ IProjectService prjService = (IProjectService)ServiceManager.GetService (typeof (IProjectService));
ArrayList allProjects = Combine.GetAllProjects(prjService.CurrentOpenCombine);
foreach (ProjectCombineEntry projectEntry in allProjects) {
@@ -610,19 +610,19 @@
bool setmsg ()
{
- ((IStatusBarService)ServiceManager.Services.GetService (typeof (IStatusBarService))).SetMessage ("Compiling...");
+ ((IStatusBarService)ServiceManager.GetService (typeof (IStatusBarService))).SetMessage ("Compiling...");
return false;
}
bool done ()
{
- ((SdStatusBar)((IStatusBarService)ServiceManager.Services.GetService (typeof (IStatusBarService))).ProgressMonitor).Done ();
+ ((SdStatusBar)((IStatusBarService)ServiceManager.GetService (typeof (IStatusBarService))).ProgressMonitor).Done ();
return false;
}
bool pulse ()
{
- ((SdStatusBar)((IStatusBarService)ServiceManager.Services.GetService (typeof (IStatusBarService))).ProgressMonitor).Pulse ();
+ ((SdStatusBar)((IStatusBarService)ServiceManager.GetService (typeof (IStatusBarService))).ProgressMonitor).Pulse ();
while (Gtk.Application.EventsPending ())
Gtk.Application.RunIteration ();
return false;
Modified: trunk/MonoDevelop/src/AddIns/BackendBindings/CSharpBinding/CSharpBindingExecutionManager.cs
===================================================================
--- trunk/MonoDevelop/src/AddIns/BackendBindings/CSharpBinding/CSharpBindingExecutionManager.cs 2004-06-23 23:08:38 UTC (rev 1814)
+++ trunk/MonoDevelop/src/AddIns/BackendBindings/CSharpBinding/CSharpBindingExecutionManager.cs 2004-06-24 02:05:41 UTC (rev 1815)
@@ -29,11 +29,11 @@
{
public void Debug (IProject project)
{
- FileUtilityService fileUtilityService = (FileUtilityService) ServiceManager.Services.GetService (typeof (FileUtilityService));
+ FileUtilityService fileUtilityService = (FileUtilityService) ServiceManager.GetService (typeof (FileUtilityService));
string directory = fileUtilityService.GetDirectoryNameWithSeparator(((CSharpCompilerParameters)project.ActiveConfiguration).OutputDirectory);
string exe = ((CSharpCompilerParameters)project.ActiveConfiguration).OutputAssembly + ".exe";
- IDebuggingService dbgr = (IDebuggingService) ServiceManager.Services.GetService (typeof (IDebuggingService));
+ IDebuggingService dbgr = (IDebuggingService) ServiceManager.GetService (typeof (IDebuggingService));
if (dbgr != null)
dbgr.Run (new string[] { Path.Combine (directory, exe) } );
}
@@ -56,7 +56,7 @@
public void Execute(IProject project)
{
CSharpCompilerParameters parameters = (CSharpCompilerParameters)project.ActiveConfiguration;
- FileUtilityService fileUtilityService = (FileUtilityService)ServiceManager.Services.GetService(typeof(FileUtilityService));
+ FileUtilityService fileUtilityService = (FileUtilityService)ServiceManager.GetService(typeof(FileUtilityService));
string directory = fileUtilityService.GetDirectoryNameWithSeparator(((CSharpCompilerParameters)project.ActiveConfiguration).OutputDirectory);
string exe = ((CSharpCompilerParameters)project.ActiveConfiguration).OutputAssembly + ".exe";
Modified: trunk/MonoDevelop/src/AddIns/BackendBindings/CSharpBinding/Gui/CodeGenerationPanel.cs
===================================================================
--- trunk/MonoDevelop/src/AddIns/BackendBindings/CSharpBinding/Gui/CodeGenerationPanel.cs 2004-06-23 23:08:38 UTC (rev 1814)
+++ trunk/MonoDevelop/src/AddIns/BackendBindings/CSharpBinding/Gui/CodeGenerationPanel.cs 2004-06-24 02:05:41 UTC (rev 1815)
@@ -47,7 +47,7 @@
//
// services needed
//
- StringParserService StringParserService = (StringParserService)ServiceManager.Services.GetService (
+ StringParserService StringParserService = (StringParserService)ServiceManager.GetService (
typeof (StringParserService));
CSharpCompilerParameters compilerParameters = null;
Modified: trunk/MonoDevelop/src/AddIns/BackendBindings/CSharpBinding/Gui/OutputOptionsPanel.cs
===================================================================
--- trunk/MonoDevelop/src/AddIns/BackendBindings/CSharpBinding/Gui/OutputOptionsPanel.cs 2004-06-23 23:08:38 UTC (rev 1814)
+++ trunk/MonoDevelop/src/AddIns/BackendBindings/CSharpBinding/Gui/OutputOptionsPanel.cs 2004-06-24 02:05:41 UTC (rev 1815)
@@ -73,7 +73,7 @@
return true;
}
- FileUtilityService fileUtilityService = (FileUtilityService)ServiceManager.Services.GetService(
+ FileUtilityService fileUtilityService = (FileUtilityService)ServiceManager.GetService(
typeof(FileUtilityService));
if (!fileUtilityService.IsValidFileName(assemblyNameEntry.Text)) {
//MessageService.ShowError("Invalid assembly name specified");
@@ -97,7 +97,7 @@
void SelectFolder(object sender, EventArgs e)
{
- ResourceService res = (ResourceService)ServiceManager.Services.GetService (typeof (ResourceService));
+ ResourceService res = (ResourceService)ServiceManager.GetService (typeof (ResourceService));
using (FileSelector fdiag = new FileSelector (GettextCatalog.GetString ("Select the directory in which the assembly will be created"))) {
if (fdiag.Run () == (int) ResponseType.Ok) {
outputDirectoryEntry.Text = fdiag.Filename;
Modified: trunk/MonoDevelop/src/AddIns/BackendBindings/ILAsmBinding/ILAsmCompilerManager.cs
===================================================================
--- trunk/MonoDevelop/src/AddIns/BackendBindings/ILAsmBinding/ILAsmCompilerManager.cs 2004-06-23 23:08:38 UTC (rev 1814)
+++ trunk/MonoDevelop/src/AddIns/BackendBindings/ILAsmBinding/ILAsmCompilerManager.cs 2004-06-24 02:05:41 UTC (rev 1815)
@@ -27,7 +27,7 @@
/// </summary>
public class ILAsmCompilerManager
{
- FileUtilityService fileUtilityService = (FileUtilityService)ServiceManager.Services.GetService(typeof(FileUtilityService));
+ FileUtilityService fileUtilityService = (FileUtilityService)ServiceManager.GetService(typeof(FileUtilityService));
public string GetCompiledOutputName(string fileName)
{
@@ -83,7 +83,7 @@
p.StartInfo = si;
p.Start ();
- IStatusBarService sbs = (IStatusBarService)ServiceManager.Services.GetService (typeof (IStatusBarService));
+ IStatusBarService sbs = (IStatusBarService)ServiceManager.GetService (typeof (IStatusBarService));
sbs.SetMessage ("Compiling...");
while (!p.HasExited) {
Modified: trunk/MonoDevelop/src/AddIns/BackendBindings/ILAsmBinding/ILAsmExecutionManager.cs
===================================================================
--- trunk/MonoDevelop/src/AddIns/BackendBindings/ILAsmBinding/ILAsmExecutionManager.cs 2004-06-23 23:08:38 UTC (rev 1814)
+++ trunk/MonoDevelop/src/AddIns/BackendBindings/ILAsmBinding/ILAsmExecutionManager.cs 2004-06-24 02:05:41 UTC (rev 1815)
@@ -42,7 +42,7 @@
public void Execute(IProject project, bool debug)
{
ILAsmCompilerParameters parameters = (ILAsmCompilerParameters)project.ActiveConfiguration;
- FileUtilityService fileUtilityService = (FileUtilityService)ServiceManager.Services.GetService(typeof(FileUtilityService));
+ FileUtilityService fileUtilityService = (FileUtilityService)ServiceManager.GetService(typeof(FileUtilityService));
string exe = Path.GetFullPath(Path.Combine(parameters.OutputDirectory, parameters.OutputAssembly) + ".exe");
string fullCommand = String.Format ("-e \"mono {0};read -p 'press any key to continue...' -n1\"", exe);
Modified: trunk/MonoDevelop/src/AddIns/BackendBindings/JavaBinding/JavaBindingCompilerServices.cs
===================================================================
--- trunk/MonoDevelop/src/AddIns/BackendBindings/JavaBinding/JavaBindingCompilerServices.cs 2004-06-23 23:08:38 UTC (rev 1814)
+++ trunk/MonoDevelop/src/AddIns/BackendBindings/JavaBinding/JavaBindingCompilerServices.cs 2004-06-24 02:05:41 UTC (rev 1815)
@@ -65,7 +65,7 @@
return Path.ChangeExtension(fileName, ".class");
}
- FileUtilityService fileUtilityService = (FileUtilityService)ServiceManager.Services.GetService(typeof(FileUtilityService));
+ FileUtilityService fileUtilityService = (FileUtilityService)ServiceManager.GetService(typeof(FileUtilityService));
public string GetCompiledOutputName(IProject project)
{
@@ -165,7 +165,7 @@
p.StartInfo = si;
p.Start ();
- IStatusBarService sbs = (IStatusBarService)ServiceManager.Services.GetService (typeof (IStatusBarService));
+ IStatusBarService sbs = (IStatusBarService)ServiceManager.GetService (typeof (IStatusBarService));
sbs.SetMessage ("Compiling...");
while (!p.HasExited) {
Modified: trunk/MonoDevelop/src/AddIns/BackendBindings/JavaBinding/JavaBindingExecutionServices.cs
===================================================================
--- trunk/MonoDevelop/src/AddIns/BackendBindings/JavaBinding/JavaBindingExecutionServices.cs 2004-06-23 23:08:38 UTC (rev 1814)
+++ trunk/MonoDevelop/src/AddIns/BackendBindings/JavaBinding/JavaBindingExecutionServices.cs 2004-06-24 02:05:41 UTC (rev 1815)
@@ -41,7 +41,7 @@
public void Execute(IProject project)
{
JavaCompilerParameters parameters = (JavaCompilerParameters)project.ActiveConfiguration;
- FileUtilityService fileUtilityService = (FileUtilityService)ServiceManager.Services.GetService(typeof(FileUtilityService));
+ FileUtilityService fileUtilityService = (FileUtilityService)ServiceManager.GetService(typeof(FileUtilityService));
string directory = fileUtilityService.GetDirectoryNameWithSeparator(((JavaCompilerParameters)project.ActiveConfiguration).OutputDirectory);
string mainClass = ((JavaCompilerParameters) project.ActiveConfiguration).MainClass;
Modified: trunk/MonoDevelop/src/AddIns/BackendBindings/JavaBinding/ProjectTreeBuilder/JavaNodeBuilder.cs
===================================================================
--- trunk/MonoDevelop/src/AddIns/BackendBindings/JavaBinding/ProjectTreeBuilder/JavaNodeBuilder.cs 2004-06-23 23:08:38 UTC (rev 1814)
+++ trunk/MonoDevelop/src/AddIns/BackendBindings/JavaBinding/ProjectTreeBuilder/JavaNodeBuilder.cs 2004-06-24 02:05:41 UTC (rev 1815)
@@ -24,9 +24,9 @@
{
public class JavaNodeBuilder : IProjectNodeBuilder
{
- FileUtilityService fileUtilityService = (FileUtilityService)ServiceManager.Services.GetService(typeof(FileUtilityService));
- ResourceService resourceService = (ResourceService)ServiceManager.Services.GetService(typeof(IResourceService));
- IconService iconService = (IconService)ServiceManager.Services.GetService(typeof(IconService));
+ FileUtilityService fileUtilityService = (FileUtilityService)ServiceManager.GetService(typeof(FileUtilityService));
+ ResourceService resourceService = (ResourceService)ServiceManager.GetService(typeof(IResourceService));
+ IconService iconService = (IconService)ServiceManager.GetService(typeof(IconService));
public bool CanBuildProjectTree(IProject project)
{
Modified: trunk/MonoDevelop/src/AddIns/BackendBindings/NemerleBinding/NemerleBindingCompilerServices.cs
===================================================================
--- trunk/MonoDevelop/src/AddIns/BackendBindings/NemerleBinding/NemerleBindingCompilerServices.cs 2004-06-23 23:08:38 UTC (rev 1814)
+++ trunk/MonoDevelop/src/AddIns/BackendBindings/NemerleBinding/NemerleBindingCompilerServices.cs 2004-06-24 02:05:41 UTC (rev 1815)
@@ -76,7 +76,7 @@
}
}
- FileUtilityService fileUtilityService = (FileUtilityService)ServiceManager.Services.GetService(typeof(FileUtilityService));
+ FileUtilityService fileUtilityService = (FileUtilityService)ServiceManager.GetService(typeof(FileUtilityService));
static string ncc = "ncc";
private string GetOptionsString(NemerleParameters cp)
@@ -179,7 +179,7 @@
p.StartInfo = si;
p.Start();
- IStatusBarService sbs = (IStatusBarService)ServiceManager.Services.GetService (typeof (IStatusBarService));
+ IStatusBarService sbs = (IStatusBarService)ServiceManager.GetService (typeof (IStatusBarService));
sbs.SetMessage ("Compiling...");
p.OutWatch();
Modified: trunk/MonoDevelop/src/AddIns/BackendBindings/NemerleBinding/NemerleBindingExecutionServices.cs
===================================================================
--- trunk/MonoDevelop/src/AddIns/BackendBindings/NemerleBinding/NemerleBindingExecutionServices.cs 2004-06-23 23:08:38 UTC (rev 1814)
+++ trunk/MonoDevelop/src/AddIns/BackendBindings/NemerleBinding/NemerleBindingExecutionServices.cs 2004-06-24 02:05:41 UTC (rev 1815)
@@ -26,7 +26,7 @@
{
NemerleParameters p = (NemerleParameters)project.ActiveConfiguration;
- FileUtilityService fus = (FileUtilityService)ServiceManager.Services.GetService(typeof(FileUtilityService));
+ FileUtilityService fus = (FileUtilityService)ServiceManager.GetService(typeof(FileUtilityService));
string exe;
if (p.ExecuteScript == String.Empty)
Modified: trunk/MonoDevelop/src/AddIns/DebuggerAddIn/DebuggerCommands.cs
===================================================================
--- trunk/MonoDevelop/src/AddIns/DebuggerAddIn/DebuggerCommands.cs 2004-06-23 23:08:38 UTC (rev 1814)
+++ trunk/MonoDevelop/src/AddIns/DebuggerAddIn/DebuggerCommands.cs 2004-06-24 02:05:41 UTC (rev 1815)
@@ -11,7 +11,7 @@
{
public override void Run ()
{
- DebuggingService dbgr = (DebuggingService)ServiceManager.Services.GetService (typeof (DebuggingService));
+ DebuggingService dbgr = (DebuggingService)ServiceManager.GetService (typeof (DebuggingService));
if (dbgr.IsRunning)
dbgr.Pause ();
else
@@ -23,7 +23,7 @@
{
public override void Run ()
{
- DebuggingService dbgr = (DebuggingService)ServiceManager.Services.GetService (typeof (DebuggingService));
+ DebuggingService dbgr = (DebuggingService)ServiceManager.GetService (typeof (DebuggingService));
dbgr.Stop ();
}
@@ -33,7 +33,7 @@
{
public override void Run ()
{
- DebuggingService dbgr = (DebuggingService)ServiceManager.Services.GetService (typeof (DebuggingService));
+ DebuggingService dbgr = (DebuggingService)ServiceManager.GetService (typeof (DebuggingService));
dbgr.StepOver ();
}
@@ -43,7 +43,7 @@
{
public override void Run ()
{
- DebuggingService dbgr = (DebuggingService)ServiceManager.Services.GetService (typeof (DebuggingService));
+ DebuggingService dbgr = (DebuggingService)ServiceManager.GetService (typeof (DebuggingService));
dbgr.StepInto ();
}
@@ -55,7 +55,7 @@
public override void Run ()
{
- IProjectService projServ = (IProjectService)ServiceManager.Services.GetService (typeof (IProjectService));
+ IProjectService projServ = (IProjectService)ServiceManager.GetService (typeof (IProjectService));
if (projServ.CurrentOpenCombine != null) {
//try {
Modified: trunk/MonoDevelop/src/AddIns/DebuggerAddIn/Gui/DebuggerVariablePad.cs
===================================================================
--- trunk/MonoDevelop/src/AddIns/DebuggerAddIn/Gui/DebuggerVariablePad.cs 2004-06-23 23:08:38 UTC (rev 1814)
+++ trunk/MonoDevelop/src/AddIns/DebuggerAddIn/Gui/DebuggerVariablePad.cs 2004-06-24 02:05:41 UTC (rev 1815)
@@ -68,7 +68,7 @@
Add (tree);
ShowAll ();
- DebuggingService dbgr = (DebuggingService)ServiceManager.Services.GetService (typeof (DebuggingService));
+ DebuggingService dbgr = (DebuggingService)ServiceManager.GetService (typeof (DebuggingService));
dbgr.PausedEvent += new EventHandler (OnPausedEvent);
dbgr.ResumedEvent += new EventHandler (OnResumedEvent);
dbgr.StoppedEvent += new EventHandler (OnStoppedEvent);
@@ -200,7 +200,7 @@
void add_object (ITargetObject obj, string name, TreeIter iter)
{
- AmbienceService amb = (AmbienceService)MonoDevelop.Core.Services.ServiceManager.Services.GetService (typeof (AmbienceService));
+ AmbienceService amb = (AmbienceService)MonoDevelop.Core.Services.ServiceManager.GetService (typeof (AmbienceService));
store.SetValue (iter, 0, new GLib.Value (name));
store.SetValue (iter, 1, new GLib.Value (amb.CurrentAmbience.GetIntrinsicTypeName (obj.Type.Name)));
@@ -280,7 +280,7 @@
protected void OnPausedEvent (object o, EventArgs args)
{
- DebuggingService dbgr = (DebuggingService)ServiceManager.Services.GetService (typeof (DebuggingService));
+ DebuggingService dbgr = (DebuggingService)ServiceManager.GetService (typeof (DebuggingService));
current_frame = (StackFrame)dbgr.CurrentFrame;
UpdateDisplay ();
}
Modified: trunk/MonoDevelop/src/AddIns/DisplayBindings/SourceEditor/CodeCompletion/CodeCompletionData.cs
===================================================================
--- trunk/MonoDevelop/src/AddIns/DisplayBindings/SourceEditor/CodeCompletion/CodeCompletionData.cs 2004-06-23 23:08:38 UTC (rev 1814)
+++ trunk/MonoDevelop/src/AddIns/DisplayBindings/SourceEditor/CodeCompletion/CodeCompletionData.cs 2004-06-24 02:05:41 UTC (rev 1815)
@@ -20,9 +20,9 @@
{
class CodeCompletionData : ICompletionDataWithMarkup
{
- ClassBrowserIconsService classBrowserIconService = (ClassBrowserIconsService) ServiceManager.Services.GetService (typeof (ClassBrowserIconsService));
- IParserService parserService = (IParserService) MonoDevelop.Core.Services.ServiceManager.Services.GetService (typeof (IParserService));
- static AmbienceService ambienceService = (AmbienceService) ServiceManager.Services.GetService (typeof (AmbienceService));
+ ClassBrowserIconsService classBrowserIconService = (ClassBrowserIconsService) ServiceManager.GetService (typeof (ClassBrowserIconsService));
+ IParserService parserService = (IParserService) MonoDevelop.Core.Services.ServiceManager.GetService (typeof (IParserService));
+ static AmbienceService ambienceService = (AmbienceService) ServiceManager.GetService (typeof (AmbienceService));
string image;
int overloads;
Modified: trunk/MonoDevelop/src/AddIns/DisplayBindings/SourceEditor/CodeCompletion/CodeCompletionDataProvider.cs
===================================================================
--- trunk/MonoDevelop/src/AddIns/DisplayBindings/SourceEditor/CodeCompletion/CodeCompletionDataProvider.cs 2004-06-23 23:08:38 UTC (rev 1814)
+++ trunk/MonoDevelop/src/AddIns/DisplayBindings/SourceEditor/CodeCompletion/CodeCompletionDataProvider.cs 2004-06-24 02:05:41 UTC (rev 1815)
@@ -33,7 +33,7 @@
/// </summary>
public class CodeCompletionDataProvider : ICompletionDataProvider
{
- static ClassBrowserIconsService classBrowserIconService = (ClassBrowserIconsService)ServiceManager.Services.GetService(typeof(ClassBrowserIconsService));
+ static ClassBrowserIconsService classBrowserIconService = (ClassBrowserIconsService)ServiceManager.GetService(typeof(ClassBrowserIconsService));
// static AmbienceService ambienceService = (AmbienceService)ServiceManager.Services.GetService(typeof(AmbienceService));
Hashtable insertedElements = new Hashtable();
Hashtable insertedPropertiesElements = new Hashtable();
@@ -69,7 +69,7 @@
//string expression = TextUtilities.GetExpressionBeforeOffset (textArea, insertIter.Offset);
ResolveResult results;
- IParserService parserService = (IParserService)MonoDevelop.Core.Services.ServiceManager.Services.GetService(typeof(IParserService));
+ IParserService parserService = (IParserService)MonoDevelop.Core.Services.ServiceManager.GetService(typeof(IParserService));
IExpressionFinder expressionFinder = parserService.GetExpressionFinder(fileName);
string expression = expressionFinder == null ? TextUtilities.GetExpressionBeforeOffset(textArea, insertIter.Offset) : expressionFinder.FindExpression(textArea.Buffer.GetText(textArea.Buffer.StartIter, insertIter, true), insertIter.Offset - 2);
if (expression == null) return null;
Modified: trunk/MonoDevelop/src/AddIns/DisplayBindings/SourceEditor/CodeCompletion/CommentCompletionDataProvider.cs
===================================================================
--- trunk/MonoDevelop/src/AddIns/DisplayBindings/SourceEditor/CodeCompletion/CommentCompletionDataProvider.cs 2004-06-23 23:08:38 UTC (rev 1814)
+++ trunk/MonoDevelop/src/AddIns/DisplayBindings/SourceEditor/CodeCompletion/CommentCompletionDataProvider.cs 2004-06-24 02:05:41 UTC (rev 1815)
@@ -28,8 +28,8 @@
/// </summary>
public class CommentCompletionDataProvider : ICompletionDataProvider
{
- static ClassBrowserIconsService classBrowserIconService = (ClassBrowserIconsService)ServiceManager.Services.GetService(typeof(ClassBrowserIconsService));
- static IParserService parserService = (IParserService)MonoDevelop.Core.Services.ServiceManager.Services.GetService(typeof(IParserService));
+ static ClassBrowserIconsService classBrowserIconService = (ClassBrowserIconsService)ServiceManager.GetService(typeof(ClassBrowserIconsService));
+ static IParserService parserService = (IParserService)MonoDevelop.Core.Services.ServiceManager.GetService(typeof(IParserService));
int caretLineNumber;
int caretColumn;
Modified: trunk/MonoDevelop/src/AddIns/DisplayBindings/SourceEditor/Commands/FormatCommands.cs
===================================================================
--- trunk/MonoDevelop/src/AddIns/DisplayBindings/SourceEditor/Commands/FormatCommands.cs 2004-06-23 23:08:38 UTC (rev 1814)
+++ trunk/MonoDevelop/src/AddIns/DisplayBindings/SourceEditor/Commands/FormatCommands.cs 2004-06-24 02:05:41 UTC (rev 1815)
@@ -152,7 +152,7 @@
/// </summary>
public class SortSelection : AbstractMenuCommand
{
- static PropertyService propertyService = (PropertyService)ServiceManager.Services.GetService(typeof(PropertyService));
+ static PropertyService propertyService = (PropertyService)ServiceManager.GetService(typeof(PropertyService));
class SortComparer : IComparer
{
Modified: trunk/MonoDevelop/src/AddIns/DisplayBindings/SourceEditor/Commands/ProjectCommands.cs
===================================================================
--- trunk/MonoDevelop/src/AddIns/DisplayBindings/SourceEditor/Commands/ProjectCommands.cs 2004-06-23 23:08:38 UTC (rev 1814)
+++ trunk/MonoDevelop/src/AddIns/DisplayBindings/SourceEditor/Commands/ProjectCommands.cs 2004-06-24 02:05:41 UTC (rev 1815)
@@ -19,7 +19,7 @@
{
public override void Run()
{
- IProjectService projectService = (IProjectService) MonoDevelop.Core.Services.ServiceManager.Services.GetService (typeof (IProjectService));
+ IProjectService projectService = (IProjectService) MonoDevelop.Core.Services.ServiceManager.GetService (typeof (IProjectService));
if (projectService.CurrentSelectedProject != null) {
using (ExportProjectToHtmlDialog ephd = new ExportProjectToHtmlDialog (projectService.CurrentSelectedProject)) {
Modified: trunk/MonoDevelop/src/AddIns/DisplayBindings/SourceEditor/Gui/Dialogs/EditTemplateGroupDialog.cs
===================================================================
--- trunk/MonoDevelop/src/AddIns/DisplayBindings/SourceEditor/Gui/Dialogs/EditTemplateGroupDialog.cs 2004-06-23 23:08:38 UTC (rev 1814)
+++ trunk/MonoDevelop/src/AddIns/DisplayBindings/SourceEditor/Gui/Dialogs/EditTemplateGroupDialog.cs 2004-06-24 02:05:41 UTC (rev 1815)
@@ -24,7 +24,7 @@
Gtk.Entry templateExtensionsTextBox;
// Services
- StringParserService StringParserService = (StringParserService)ServiceManager.Services.GetService (typeof (StringParserService));
+ StringParserService StringParserService = (StringParserService)ServiceManager.GetService (typeof (StringParserService));
public CodeTemplateGroup CodeTemplateGroup {
get {
Modified: trunk/MonoDevelop/src/AddIns/DisplayBindings/SourceEditor/Gui/Dialogs/ExportProjectToHtmlDialog.cs
===================================================================
--- trunk/MonoDevelop/src/AddIns/DisplayBindings/SourceEditor/Gui/Dialogs/ExportProjectToHtmlDialog.cs 2004-06-23 23:08:38 UTC (rev 1814)
+++ trunk/MonoDevelop/src/AddIns/DisplayBindings/SourceEditor/Gui/Dialogs/ExportProjectToHtmlDialog.cs 2004-06-24 02:05:41 UTC (rev 1815)
@@ -34,9 +34,9 @@
Button browseButton = new Button ();
ProgressBar progressBar = new ProgressBar ();
- FileUtilityService fileUtilityService = (FileUtilityService) ServiceManager.Services.GetService(typeof(FileUtilityService));
- IconService iconService = (IconService) ServiceManager.Services.GetService(typeof(IconService));
- ResourceService resourceService = (ResourceService) ServiceManager.Services.GetService(typeof(IResourceService));
+ FileUtilityService fileUtilityService = (FileUtilityService) ServiceManager.GetService(typeof(FileUtilityService));
+ IconService iconService = (IconService) ServiceManager.GetService(typeof(IconService));
+ ResourceService resourceService = (ResourceService) ServiceManager.GetService(typeof(IResourceService));
IProject project;
int filesExported = 0;
@@ -59,7 +59,7 @@
public ExportProjectToHtmlDialog (IProject project)
{
- PropertyService propertyService = (PropertyService) ServiceManager.Services.GetService (typeof (PropertyService));
+ PropertyService propertyService = (PropertyService) ServiceManager.GetService (typeof (PropertyService));
this.project = project;
pathLabel.Text = resourceService.GetString ("Dialog.ExportProjectToHtml.FolderLabel");
Modified: trunk/MonoDevelop/src/AddIns/DisplayBindings/SourceEditor/Gui/Dialogs/ReplaceDialog.cs
===================================================================
--- trunk/MonoDevelop/src/AddIns/DisplayBindings/SourceEditor/Gui/Dialogs/ReplaceDialog.cs 2004-06-23 23:08:38 UTC (rev 1814)
+++ trunk/MonoDevelop/src/AddIns/DisplayBindings/SourceEditor/Gui/Dialogs/ReplaceDialog.cs 2004-06-24 02:05:41 UTC (rev 1815)
@@ -35,10 +35,10 @@
StringCollection replaceHistory = new StringCollection();
// services
- ResourceService resourceService = (ResourceService)ServiceManager.Services.GetService(typeof(IResourceService));
- static PropertyService propertyService = (PropertyService)ServiceManager.Services.GetService(typeof(PropertyService));
- static FileUtilityService fileUtilityService = (FileUtilityService)ServiceManager.Services.GetService(typeof(FileUtilityService));
- StringParserService stringParserService = (StringParserService)ServiceManager.Services.GetService (typeof (StringParserService));
+ ResourceService resourceService = (ResourceService)ServiceManager.GetService(typeof(IResourceService));
+ static PropertyService propertyService = (PropertyService)ServiceManager.GetService(typeof(PropertyService));
+ static FileUtilityService fileUtilityService = (FileUtilityService)ServiceManager.GetService(typeof(FileUtilityService));
+ StringParserService stringParserService = (StringParserService)ServiceManager.GetService (typeof (StringParserService));
// gtk widgets
[Glade.Widget] Gnome.Entry searchPatternEntry;
Modified: trunk/MonoDevelop/src/AddIns/DisplayBindings/SourceEditor/Gui/Dialogs/ReplaceInFilesDialog.cs
===================================================================
--- trunk/MonoDevelop/src/AddIns/DisplayBindings/SourceEditor/Gui/Dialogs/ReplaceInFilesDialog.cs 2004-06-23 23:08:38 UTC (rev 1814)
+++ trunk/MonoDevelop/src/AddIns/DisplayBindings/SourceEditor/Gui/Dialogs/ReplaceInFilesDialog.cs 2004-06-24 02:05:41 UTC (rev 1815)
@@ -27,10 +27,10 @@
{
public class ReplaceInFilesDialog
{
- ResourceService resourceService = (ResourceService)ServiceManager.Services.GetService(typeof(IResourceService));
- IMessageService messageService = (IMessageService)ServiceManager.Services.GetService(typeof(IMessageService));
- StringParserService stringParserService = (StringParserService)ServiceManager.Services.GetService (typeof (StringParserService));
- static PropertyService propertyService = (PropertyService)ServiceManager.Services.GetService(typeof(PropertyService));
+ ResourceService resourceService = (ResourceService)ServiceManager.GetService(typeof(IResourceService));
+ IMessageService messageService = (IMessageService)ServiceManager.GetService(typeof(IMessageService));
+ StringParserService stringParserService = (StringParserService)ServiceManager.GetService (typeof (StringParserService));
+ static PropertyService propertyService = (PropertyService)ServiceManager.GetService(typeof(PropertyService));
public bool replaceMode;
[Glade.Widget] Gnome.Entry searchPatternEntry;
@@ -153,7 +153,7 @@
public ReplaceInFilesDialog(bool replaceMode)
{
this.replaceMode = replaceMode;
- FileUtilityService fileUtilityService = (FileUtilityService)ServiceManager.Services.GetService(typeof(FileUtilityService));
+ FileUtilityService fileUtilityService = (FileUtilityService)ServiceManager.GetService(typeof(FileUtilityService));
string dialogName = (replaceMode) ? "ReplaceInFilesDialogWidget" : "FindInFilesDialogWidget";
Glade.XML glade = new XML (null, "texteditoraddin.glade", dialogName, null);
glade.Autoconnect (this);
@@ -254,7 +254,7 @@
void BrowseDirectoryEvent(object sender, EventArgs e)
{
- PropertyService PropertyService = (PropertyService)ServiceManager.Services.GetService (typeof (PropertyService));
+ PropertyService PropertyService = (PropertyService)ServiceManager.GetService (typeof (PropertyService));
FolderDialog fd = new FolderDialog(GettextCatalog.GetString ("Select directory"));
// set up the dialog to point to currently selected folder, or the default projects folder
@@ -295,7 +295,7 @@
bool SetupSearchReplaceInFilesManager()
{
- FileUtilityService fileUtilityService = (FileUtilityService)ServiceManager.Services.GetService(typeof(FileUtilityService));
+ FileUtilityService fileUtilityService = (FileUtilityService)ServiceManager.GetService(typeof(FileUtilityService));
string directoryName = directoryTextBox.Text;
string fileMask = fileMaskTextBox.Text;
Modified: trunk/MonoDevelop/src/AddIns/DisplayBindings/SourceEditor/Gui/OptionPanels/BehaviorTextEditorPanel.cs
===================================================================
--- trunk/MonoDevelop/src/AddIns/DisplayBindings/SourceEditor/Gui/OptionPanels/BehaviorTextEditorPanel.cs 2004-06-23 23:08:38 UTC (rev 1814)
+++ trunk/MonoDevelop/src/AddIns/DisplayBindings/SourceEditor/Gui/OptionPanels/BehaviorTextEditorPanel.cs 2004-06-24 02:05:41 UTC (rev 1815)
@@ -46,7 +46,7 @@
{
// Services
StringParserService StringParserService = (
- StringParserService)ServiceManager.Services.GetService (typeof (StringParserService));
+ StringParserService)ServiceManager.GetService (typeof (StringParserService));
// GTK controls
[Glade.Widget] Label tabsGroupBoxLabel;
Modified: trunk/MonoDevelop/src/AddIns/DisplayBindings/SourceEditor/Gui/OptionPanels/CodeTemplatePanel.cs
===================================================================
--- trunk/MonoDevelop/src/AddIns/DisplayBindings/SourceEditor/Gui/OptionPanels/CodeTemplatePanel.cs 2004-06-23 23:08:38 UTC (rev 1814)
+++ trunk/MonoDevelop/src/AddIns/DisplayBindings/SourceEditor/Gui/OptionPanels/CodeTemplatePanel.cs 2004-06-24 02:05:41 UTC (rev 1815)
@@ -32,9 +32,9 @@
int currentSelectedGroup = -1;
// Services
- StringParserService StringParserService = (StringParserService)ServiceManager.Services.GetService (typeof (StringParserService));
- PropertyService PropertyService = (PropertyService)ServiceManager.Services.GetService(typeof(PropertyService));
- MessageService MessageService = (MessageService)ServiceManager.Services.GetService(typeof(MessageService));
+ StringParserService StringParserService = (StringParserService)ServiceManager.GetService (typeof (StringParserService));
+ PropertyService PropertyService = (PropertyService)ServiceManager.GetService(typeof(PropertyService));
+ MessageService MessageService = (MessageService)ServiceManager.GetService(typeof(MessageService));
// Gtk widgets
[Glade.Widget] Label extensionLabel;
Modified: trunk/MonoDevelop/src/AddIns/DisplayBindings/SourceEditor/Gui/OptionPanels/GeneralTextEditorPanel.cs
===================================================================
--- trunk/MonoDevelop/src/AddIns/DisplayBindings/SourceEditor/Gui/OptionPanels/GeneralTextEditorPanel.cs 2004-06-23 23:08:38 UTC (rev 1814)
+++ trunk/MonoDevelop/src/AddIns/DisplayBindings/SourceEditor/Gui/OptionPanels/GeneralTextEditorPanel.cs 2004-06-24 02:05:41 UTC (rev 1815)
@@ -45,7 +45,7 @@
class GeneralTextEditorPanelWidget : GladeWidgetExtract
{
StringParserService StringParserService = (
- StringParserService)ServiceManager.Services.GetService (typeof (StringParserService));
+ StringParserService)ServiceManager.GetService (typeof (StringParserService));
// int encoding = Encoding.UTF8.CodePage;
// int selectedIndex = 0;
Modified: trunk/MonoDevelop/src/AddIns/DisplayBindings/SourceEditor/Gui/OptionPanels/MarkersTextEditorPanel.cs
===================================================================
--- trunk/MonoDevelop/src/AddIns/DisplayBindings/SourceEditor/Gui/OptionPanels/MarkersTextEditorPanel.cs 2004-06-23 23:08:38 UTC (rev 1814)
+++ trunk/MonoDevelop/src/AddIns/DisplayBindings/SourceEditor/Gui/OptionPanels/MarkersTextEditorPanel.cs 2004-06-24 02:05:41 UTC (rev 1815)
@@ -45,11 +45,11 @@
{
// Services
FileUtilityService FileUtilityService = (
- FileUtilityService)ServiceManager.Services.GetService(typeof(FileUtilityService));
+ FileUtilityService)ServiceManager.GetService(typeof(FileUtilityService));
StringParserService StringParserService = (
- StringParserService)ServiceManager.Services.GetService (typeof (StringParserService));
+ StringParserService)ServiceManager.GetService (typeof (StringParserService));
ResourceService ResourceService = (
- ResourceService)ServiceManager.Services.GetService(typeof(IResourceService));
+ ResourceService)ServiceManager.GetService(typeof(IResourceService));
// Gtk Controls
[Glade.Widget] Label markersLabel;
Modified: trunk/MonoDevelop/src/AddIns/DisplayBindings/SourceEditor/Gui/Pads/CompilerMessageView.cs
===================================================================
--- trunk/MonoDevelop/src/AddIns/DisplayBindings/SourceEditor/Gui/Pads/CompilerMessageView.cs 2004-06-23 23:08:38 UTC (rev 1814)
+++ trunk/MonoDevelop/src/AddIns/DisplayBindings/SourceEditor/Gui/Pads/CompilerMessageView.cs 2004-06-24 02:05:41 UTC (rev 1815)
@@ -32,7 +32,7 @@
Gtk.TextView textEditorControl;
Gtk.ScrolledWindow scroller;
//Panel myPanel = new Panel();
- ResourceService resourceService = (ResourceService)ServiceManager.Services.GetService(typeof(IResourceService));
+ ResourceService resourceService = (ResourceService)ServiceManager.GetService(typeof(IResourceService));
public Gtk.Widget Control {
get {
@@ -70,10 +70,10 @@
scroller = new Gtk.ScrolledWindow ();
scroller.ShadowType = ShadowType.In;
scroller.Add (textEditorControl);
- ResourceService resourceService = (ResourceService)ServiceManager.Services.GetService(typeof(IResourceService));
+ ResourceService resourceService = (ResourceService)ServiceManager.GetService(typeof(IResourceService));
- TaskService taskService = (TaskService)MonoDevelop.Core.Services.ServiceManager.Services.GetService(typeof(TaskService));
- IProjectService projectService = (IProjectService) ServiceManager.Services.GetService (typeof(IProjectService));
+ TaskService taskService = (TaskService)MonoDevelop.Core.Services.ServiceManager.GetService(typeof(TaskService));
+ IProjectService projectService = (IProjectService) ServiceManager.GetService (typeof(IProjectService));
taskService.CompilerOutputChanged += new EventHandler(SetOutput);
projectService.StartBuild += new EventHandler (SelectMessageView);
@@ -93,7 +93,7 @@
void SelectMessageView(object sender, EventArgs e)
{
- PropertyService propertyService = (PropertyService)ServiceManager.Services.GetService(typeof(PropertyService));
+ PropertyService propertyService = (PropertyService)ServiceManager.GetService(typeof(PropertyService));
if (WorkbenchSingleton.Workbench.WorkbenchLayout.IsVisible(this)) {
WorkbenchSingleton.Workbench.WorkbenchLayout.ActivatePad(this);
@@ -108,7 +108,7 @@
void SetOutput2()
{
- TaskService taskService = (TaskService)MonoDevelop.Core.Services.ServiceManager.Services.GetService(typeof(TaskService));
+ TaskService taskService = (TaskService)MonoDevelop.Core.Services.ServiceManager.GetService(typeof(TaskService));
try {
buffer.Text = taskService.CompilerOutput;
UpdateTextArea();
@@ -132,7 +132,7 @@
SetOutput2();
outputText = null;
} else {
- TaskService taskService = (TaskService)MonoDevelop.Core.Services.ServiceManager.Services.GetService(typeof(TaskService));
+ TaskService taskService = (TaskService)MonoDevelop.Core.Services.ServiceManager.GetService(typeof(TaskService));
outputText = taskService.CompilerOutput;
UpdateTextArea();
}
Modified: trunk/MonoDevelop/src/AddIns/DisplayBindings/SourceEditor/Gui/SourceEditorBuffer.cs
===================================================================
--- trunk/MonoDevelop/src/AddIns/DisplayBindings/SourceEditor/Gui/SourceEditorBuffer.cs 2004-06-23 23:08:38 UTC (rev 1814)
+++ trunk/MonoDevelop/src/AddIns/DisplayBindings/SourceEditor/Gui/SourceEditorBuffer.cs 2004-06-24 02:05:41 UTC (rev 1815)
@@ -83,7 +83,7 @@
}
- IParserService ps = (IParserService)ServiceManager.Services.GetService (typeof (IParserService));
+ IParserService ps = (IParserService)ServiceManager.GetService (typeof (IParserService));
public SourceEditorBuffer (SourceEditorView view) : this ()
{
Modified: trunk/MonoDevelop/src/AddIns/DisplayBindings/SourceEditor/Gui/SourceEditorDisplayBinding.cs
===================================================================
--- trunk/MonoDevelop/src/AddIns/DisplayBindings/SourceEditor/Gui/SourceEditorDisplayBinding.cs 2004-06-23 23:08:38 UTC (rev 1814)
+++ trunk/MonoDevelop/src/AddIns/DisplayBindings/SourceEditor/Gui/SourceEditorDisplayBinding.cs 2004-06-24 02:05:41 UTC (rev 1815)
@@ -20,7 +20,7 @@
{
public class SourceEditorDisplayBinding : IDisplayBinding
{
- StringParserService sps = (StringParserService) ServiceManager.Services.GetService (typeof (StringParserService));
+ StringParserService sps = (StringParserService) ServiceManager.GetService (typeof (StringParserService));
static SourceEditorDisplayBinding ()
{
@@ -126,7 +126,7 @@
CaretModeChanged (null, null);
PropertiesChanged (null, null);
- PropertyService propertyService = (PropertyService) ServiceManager.Services.GetService (typeof (PropertyService));
+ PropertyService propertyService = (PropertyService) ServiceManager.GetService (typeof (PropertyService));
IProperties properties2 = ((IProperties) propertyService.GetProperty("MonoDevelop.TextEditor.Document.Document.DefaultDocumentAggregatorProperties", new DefaultProperties()));
properties2.PropertyChanged += new PropertyEventHandler (PropertiesChanged);
}
@@ -265,7 +265,7 @@
#endregion
#region Status Bar Handling
- IStatusBarService statusBarService = (IStatusBarService) ServiceManager.Services.GetService (typeof (IStatusBarService));
+ IStatusBarService statusBarService = (IStatusBarService) ServiceManager.GetService (typeof (IStatusBarService));
void OnMarkSet (object o, MarkSetArgs args)
{
Modified: trunk/MonoDevelop/src/AddIns/DisplayBindings/SourceEditor/Gui/SourceEditorView.cs
===================================================================
--- trunk/MonoDevelop/src/AddIns/DisplayBindings/SourceEditor/Gui/SourceEditorView.cs 2004-06-23 23:08:38 UTC (rev 1814)
+++ trunk/MonoDevelop/src/AddIns/DisplayBindings/SourceEditor/Gui/SourceEditorView.cs 2004-06-24 02:05:41 UTC (rev 1815)
@@ -106,7 +106,7 @@
public void breakpointToggled (object o, EventArgs e)
{
if (lineToMark == -1) return;
- IDebuggingService dbgr = (IDebuggingService)ServiceManager.Services.GetService (typeof (IDebuggingService));
+ IDebuggingService dbgr = (IDebuggingService)ServiceManager.GetService (typeof (IDebuggingService));
if (dbgr != null) {
bool canToggle = dbgr.ToggleBreakpoint (ParentEditor.DisplayBinding.ContentName, lineToMark + 1);
if (canToggle)
@@ -197,7 +197,7 @@
return false;
}
insertIter = triggerIter;
- IParserService parser = (IParserService)ServiceManager.Services.GetService (typeof (IParserService));
+ IParserService parser = (IParserService)ServiceManager.GetService (typeof (IParserService));
string fileName = ParentEditor.DisplayBinding.ContentName;
IExpressionFinder expressionFinder = parser.GetExpressionFinder(fileName);
string expression = expressionFinder == null ? TextUtilities.GetExpressionBeforeOffset(this, insertIter.Offset) : expressionFinder.FindExpression(buf.GetText(buf.StartIter, insertIter, true), insertIter.Offset - 2);
Modified: trunk/MonoDevelop/src/AddIns/DisplayBindings/SourceEditor/InsightWindow/IndexerInsightDataProvider.cs
===================================================================
--- trunk/MonoDevelop/src/AddIns/DisplayBindings/SourceEditor/InsightWindow/IndexerInsightDataProvider.cs 2004-06-23 23:08:38 UTC (rev 1814)
+++ trunk/MonoDevelop/src/AddIns/DisplayBindings/SourceEditor/InsightWindow/IndexerInsightDataProvider.cs 2004-06-24 02:05:41 UTC (rev 1815)
@@ -24,8 +24,8 @@
{
public class IndexerInsightDataProvider : IInsightDataProvider
{
- ClassBrowserIconsService classBrowserIconService = (ClassBrowserIconsService)ServiceManager.Services.GetService(typeof(ClassBrowserIconsService));
- AmbienceService ambienceService = (AmbienceService)ServiceManager.Services.GetService(typeof(AmbienceService));
+ ClassBrowserIconsService classBrowserIconService = (ClassBrowserIconsService)ServiceManager.GetService(typeof(ClassBrowserIconsService));
+ AmbienceService ambienceService = (AmbienceService)ServiceManager.GetService(typeof(AmbienceService));
string fileName = null;
SourceEditorView textArea;
@@ -61,7 +61,7 @@
// the parser works with 1 based coordinates
int caretLineNumber = initialIter.Line + 1;
int caretColumn = initialIter.LineOffset + 1;
- IParserService parserService = (IParserService)ServiceManager.Services.GetService(typeof(IParserService));
+ IParserService parserService = (IParserService)ServiceManager.GetService(typeof(IParserService));
ResolveResult results = parserService.Resolve(project, methodObject, caretLineNumber, caretColumn, fileName, textArea.Buffer.Text);
if (results != null && results.Type != null) {
Modified: trunk/MonoDevelop/src/AddIns/DisplayBindings/SourceEditor/InsightWindow/InsightWindow.cs
===================================================================
--- trunk/MonoDevelop/src/AddIns/DisplayBindings/SourceEditor/InsightWindow/InsightWindow.cs 2004-06-23 23:08:38 UTC (rev 1814)
+++ trunk/MonoDevelop/src/AddIns/DisplayBindings/SourceEditor/InsightWindow/InsightWindow.cs 2004-06-24 02:05:41 UTC (rev 1815)
@@ -32,7 +32,7 @@
string fileName;
IProject project;
- StringParserService StringParserService = (StringParserService)ServiceManager.Services.GetService (typeof (StringParserService));
+ StringParserService StringParserService = (StringParserService)ServiceManager.GetService (typeof (StringParserService));
class InsightDataProviderStackElement
{
@@ -242,7 +242,7 @@
description = "Unknown Method";
} else {
if (DataProvider.InsightDataCount > 1) {
- StringParserService stringParserService = (StringParserService)ServiceManager.Services.GetService(typeof(StringParserService));
+ StringParserService stringParserService = (StringParserService)ServiceManager.GetService(typeof(StringParserService));
stringParserService.Properties["CurrentMethodNumber"] = (CurrentData + 1).ToString();
stringParserService.Properties["NumberOfTotalMethods"] = DataProvider.InsightDataCount.ToString();
methodCountMessage = stringParserService.Parse("${res:MonoDevelop.DefaultEditor.Gui.Editor.InsightWindow.NumberOfText}");
Modified: trunk/MonoDevelop/src/AddIns/DisplayBindings/SourceEditor/InsightWindow/MethodInsightDataProvider.cs
===================================================================
--- trunk/MonoDevelop/src/AddIns/DisplayBindings/SourceEditor/InsightWindow/MethodInsightDataProvider.cs 2004-06-23 23:08:38 UTC (rev 1814)
+++ trunk/MonoDevelop/src/AddIns/DisplayBindings/SourceEditor/InsightWindow/MethodInsightDataProvider.cs 2004-06-24 02:05:41 UTC (rev 1815)
@@ -24,8 +24,8 @@
{
public class MethodInsightDataProvider : IInsightDataProvider
{
- ClassBrowserIconsService classBrowserIconService = (ClassBrowserIconsService)ServiceManager.Services.GetService(typeof(ClassBrowserIconsService));
- AmbienceService ambienceService = (AmbienceService)ServiceManager.Services.GetService(typeof(AmbienceService));
+ ClassBrowserIconsService classBrowserIconService = (ClassBrowserIconsService)ServiceManager.GetService(typeof(ClassBrowserIconsService));
+ AmbienceService ambienceService = (AmbienceService)ServiceManager.GetService(typeof(AmbienceService));
string fileName = null;
SourceEditorView textArea = null;
@@ -87,7 +87,7 @@
methodObject = words[words.Length - 1];
}
}
- IParserService parserService = (IParserService)ServiceManager.Services.GetService(typeof(IParserService));
+ IParserService parserService = (IParserService)ServiceManager.GetService(typeof(IParserService));
ResolveResult results = parserService.Resolve(project, methodObject, caretLineNumber, caretColumn, fileName, text);
if (results != null && results.Type != null) {
Modified: trunk/MonoDevelop/src/AddIns/DisplayBindings/SourceEditor/Properties/TextEditorProperties.cs
===================================================================
--- trunk/MonoDevelop/src/AddIns/DisplayBindings/SourceEditor/Properties/TextEditorProperties.cs 2004-06-23 23:08:38 UTC (rev 1814)
+++ trunk/MonoDevelop/src/AddIns/DisplayBindings/SourceEditor/Properties/TextEditorProperties.cs 2004-06-24 02:05:41 UTC (rev 1815)
@@ -42,7 +42,7 @@
}
public class TextEditorProperties {
- static PropertyService propertyService = (PropertyService)ServiceManager.Services.GetService(typeof(PropertyService));
+ static PropertyService propertyService = (PropertyService)ServiceManager.GetService(typeof(PropertyService));
static IProperties properties = ((IProperties) propertyService.GetProperty (
"MonoDevelop.TextEditor.Document.Document.DefaultDocumentAggregatorProperties",
new DefaultProperties()));
Modified: trunk/MonoDevelop/src/AddIns/DisplayBindings/SourceEditor/Search/DocumentIterator/DirectoryDocumentIterator.cs
===================================================================
--- trunk/MonoDevelop/src/AddIns/DisplayBindings/SourceEditor/Search/DocumentIterator/DirectoryDocumentIterator.cs 2004-06-23 23:08:38 UTC (rev 1814)
+++ trunk/MonoDevelop/src/AddIns/DisplayBindings/SourceEditor/Search/DocumentIterator/DirectoryDocumentIterator.cs 2004-06-24 02:05:41 UTC (rev 1815)
@@ -72,7 +72,7 @@
try {
strategy = SourceEditorBuffer.CreateTextBufferFromFile(fileName);
} catch (Exception) {
- TaskService taskService = (TaskService)MonoDevelop.Core.Services.ServiceManager.Services.GetService(typeof(TaskService));
+ TaskService taskService = (TaskService)MonoDevelop.Core.Services.ServiceManager.GetService(typeof(TaskService));
taskService.Tasks.Add(new Task(String.Empty, "can't access " + fileName, -1, -1));
return null;
}
@@ -85,7 +85,7 @@
public bool MoveForward()
{
if (curIndex == -1) {
- FileUtilityService fileUtilityService = (FileUtilityService)ServiceManager.Services.GetService(typeof(FileUtilityService));
+ FileUtilityService fileUtilityService = (FileUtilityService)ServiceManager.GetService(typeof(FileUtilityService));
files = fileUtilityService.SearchDirectory(this.searchDirectory, this.fileMask, this.searchSubdirectories);
}
return ++curIndex < files.Count;
Modified: trunk/MonoDevelop/src/AddIns/DisplayBindings/SourceEditor/Search/DocumentIterator/WholeProjectDocumentIterator.cs
===================================================================
--- trunk/MonoDevelop/src/AddIns/DisplayBindings/SourceEditor/Search/DocumentIterator/WholeProjectDocumentIterator.cs 2004-06-23 23:08:38 UTC (rev 1814)
+++ trunk/MonoDevelop/src/AddIns/DisplayBindings/SourceEditor/Search/DocumentIterator/WholeProjectDocumentIterator.cs 2004-06-24 02:05:41 UTC (rev 1815)
@@ -63,7 +63,7 @@
try {
strategy = SourceEditorBuffer.CreateTextBufferFromFile (fileName);
} catch (Exception) {
- TaskService taskService = (TaskService)MonoDevelop.Core.Services.ServiceManager.Services.GetService(typeof(TaskService));
+ TaskService taskService = (TaskService)MonoDevelop.Core.Services.ServiceManager.GetService(typeof(TaskService));
taskService.Tasks.Add(new Task(String.Empty, "can't access " + fileName, -1, -1));
return null;
}
@@ -112,7 +112,7 @@
public void Reset()
{
files.Clear();
- IProjectService projectService = (IProjectService)MonoDevelop.Core.Services.ServiceManager.Services.GetService(typeof(IProjectService));
+ IProjectService projectService = (IProjectService)MonoDevelop.Core.Services.ServiceManager.GetService(typeof(IProjectService));
if (projectService.CurrentOpenCombine != null) {
AddFiles(projectService.CurrentOpenCombine);
}
Modified: trunk/MonoDevelop/src/AddIns/DisplayBindings/SourceEditor/Search/SearchOptions.cs
===================================================================
--- trunk/MonoDevelop/src/AddIns/DisplayBindings/SourceEditor/Search/SearchOptions.cs 2004-06-23 23:08:38 UTC (rev 1814)
+++ trunk/MonoDevelop/src/AddIns/DisplayBindings/SourceEditor/Search/SearchOptions.cs 2004-06-24 02:05:41 UTC (rev 1815)
@@ -17,7 +17,7 @@
{
public class SearchOptions
{
- static PropertyService propertyService = (PropertyService)ServiceManager.Services.GetService(typeof(PropertyService));
+ static PropertyService propertyService = (PropertyService)ServiceManager.GetService(typeof(PropertyService));
IProperties properties;
public bool IgnoreCase {
Modified: trunk/MonoDevelop/src/AddIns/DisplayBindings/SourceEditor/Search/SearchReplaceInFilesManager.cs
===================================================================
--- trunk/MonoDevelop/src/AddIns/DisplayBindings/SourceEditor/Search/SearchReplaceInFilesManager.cs 2004-06-23 23:08:38 UTC (rev 1814)
+++ trunk/MonoDevelop/src/AddIns/DisplayBindings/SourceEditor/Search/SearchReplaceInFilesManager.cs 2004-06-24 02:05:41 UTC (rev 1815)
@@ -29,7 +29,7 @@
static IFind find = new DefaultFind();
static SearchOptions searchOptions = new SearchOptions("SharpDevelop.SearchAndReplace.SearchAndReplaceInFilesProperties");
- static PropertyService propertyService = (PropertyService)ServiceManager.Services.GetService(typeof(PropertyService));
+ static PropertyService propertyService = (PropertyService)ServiceManager.GetService(typeof(PropertyService));
static string currentFileName = String.Empty;
static SourceEditorBuffer currentDocument = null;
@@ -64,7 +64,7 @@
/// </remarks>
static void DisplaySearchResult(ISearchResult result)
{
- TaskService taskService = (TaskService)MonoDevelop.Core.Services.ServiceManager.Services.GetService(typeof(TaskService));
+ TaskService taskService = (TaskService)MonoDevelop.Core.Services.ServiceManager.GetService(typeof(TaskService));
// check if the current document is up to date
//if (currentFileName != result.FileName) {
@@ -87,7 +87,7 @@
{
Debug.Assert(searchOptions != null);
- TaskService taskService = (TaskService)MonoDevelop.Core.Services.ServiceManager.Services.GetService(typeof(TaskService));
+ TaskService taskService = (TaskService)MonoDevelop.Core.Services.ServiceManager.GetService(typeof(TaskService));
taskService.Tasks.Clear();
InitializeDocumentIterator(null, null);
@@ -103,7 +103,7 @@
static void FinishSearchInFiles()
{
- TaskService taskService = (TaskService)MonoDevelop.Core.Services.ServiceManager.Services.GetService(typeof(TaskService));
+ TaskService taskService = (TaskService)MonoDevelop.Core.Services.ServiceManager.GetService(typeof(TaskService));
taskService.NotifyTaskChange();
// present the taskview to show the search results
@@ -113,7 +113,7 @@
}
// tell the user search is done.
- MessageService MessageService = (MessageService)ServiceManager.Services.GetService (typeof (MessageService));
+ MessageService MessageService = (MessageService)ServiceManager.GetService (typeof (MessageService));
MessageService.ShowMessage (GettextCatalog.GetString ("Search completed"));
}
Modified: trunk/MonoDevelop/src/AddIns/DisplayBindings/SourceEditor/Search/SearchReplaceManager.cs
===================================================================
--- trunk/MonoDevelop/src/AddIns/DisplayBindings/SourceEditor/Search/SearchReplaceManager.cs 2004-06-23 23:08:38 UTC (rev 1814)
+++ trunk/MonoDevelop/src/AddIns/DisplayBindings/SourceEditor/Search/SearchReplaceManager.cs 2004-06-24 02:05:41 UTC (rev 1815)
@@ -42,7 +42,7 @@
static IFind find = new DefaultFind();
static SearchOptions searchOptions = new SearchOptions("SharpDevelop.SearchAndReplace.SearchAndReplaceProperties");
- static MessageService MessageService = (MessageService)ServiceManager.Services.GetService (typeof (MessageService));
+ static MessageService MessageService = (MessageService)ServiceManager.GetService (typeof (MessageService));
public static SearchOptions SearchOptions {
get {
@@ -163,7 +163,7 @@
ISearchResult result = find.FindNext(searchOptions);
if (result == null) {
- ResourceService resourceService = (ResourceService)ServiceManager.Services.GetService(typeof(IResourceService));
+ ResourceService resourceService = (ResourceService)ServiceManager.GetService(typeof(IResourceService));
MessageService.ShowMessage (GettextCatalog.GetString ("Not Found"));
find.Reset();
} else {
@@ -185,7 +185,7 @@
static SourceEditor OpenTextArea(string fileName)
{
if (fileName != null) {
- IFileService fileService = (IFileService)MonoDevelop.Core.Services.ServiceManager.Services.GetService(typeof(IFileService));
+ IFileService fileService = (IFileService)MonoDevelop.Core.Services.ServiceManager.GetService(typeof(IFileService));
fileService.OpenFile(fileName);
}
Modified: trunk/MonoDevelop/src/AddIns/Misc/StartPage/ICSharpCodePage.cs
===================================================================
--- trunk/MonoDevelop/src/AddIns/Misc/StartPage/ICSharpCodePage.cs 2004-06-23 23:08:38 UTC (rev 1814)
+++ trunk/MonoDevelop/src/AddIns/Misc/StartPage/ICSharpCodePage.cs 2004-06-24 02:05:41 UTC (rev 1815)
@@ -130,7 +130,7 @@
public virtual void PopulateTopMenu()
{
- StringParserService stringParserService = (StringParserService)ServiceManager.Services.GetService(typeof(StringParserService));
+ StringParserService stringParserService = (StringParserService)ServiceManager.GetService(typeof(StringParserService));
TopMenu.Add(new MenuItem(stringParserService.Parse("${res:StartPage.StartMenu.Name}"), "/Start/opensection"));
TopMenu.Add(new MenuItem(stringParserService.Parse("${res:StartPage.ChangeLogMenu.Name}"), "/ChangeLog/opensection"));
@@ -502,7 +502,7 @@
StringBuilder projectSection = null;
public void RenderSectionStartBody(StringBuilder builder)
{
- StringParserService stringParserService = (StringParserService)ServiceManager.Services.GetService(typeof(StringParserService));
+ StringParserService stringParserService = (StringParserService)ServiceManager.GetService(typeof(StringParserService));
if (projectSection == null) {
projectSection = new StringBuilder();
projectSection.Append("<DIV class='tablediv'><TABLE CLASS='dtTABLE' CELLSPACING='0'>\n");
@@ -514,7 +514,7 @@
try {
// Get the recent projects
- Core.Properties.DefaultProperties svc = (Core.Properties.DefaultProperties)Core.Services.ServiceManager.Services.GetService(typeof(Core.Services.PropertyService));
+ Core.Properties.DefaultProperties svc = (Core.Properties.DefaultProperties)Core.Services.ServiceManager.GetService(typeof(Core.Services.PropertyService));
object recentOpenObj = svc.GetProperty("MonoDevelop.Gui.MainWindow.RecentOpen");
if (recentOpenObj is MonoDevelop.Services.RecentOpen) {
MonoDevelop.Services.RecentOpen recOpen = (MonoDevelop.Services.RecentOpen)recentOpenObj;
@@ -555,8 +555,8 @@
public void RenderSectionAuthorBody(StringBuilder builder)
{
try {
- FileUtilityService fileUtilityService = (FileUtilityService)ServiceManager.Services.GetService(typeof(FileUtilityService));
- PropertyService propertyService = (PropertyService)ServiceManager.Services.GetService(typeof(PropertyService));
+ FileUtilityService fileUtilityService = (FileUtilityService)ServiceManager.GetService(typeof(FileUtilityService));
+ PropertyService propertyService = (PropertyService)ServiceManager.GetService(typeof(PropertyService));
string html = ConvertXml.ConvertToString(propertyService.DataDirectory +
Path.DirectorySeparatorChar + ".." +
@@ -576,8 +576,8 @@
public void RenderSectionChangeLogBody(StringBuilder builder)
{
try {
- PropertyService ps = (PropertyService) ServiceManager.Services.GetService (typeof(PropertyService));
- FileUtilityService fileUtilityService = (FileUtilityService)ServiceManager.Services.GetService(typeof(FileUtilityService));
+ PropertyService ps = (PropertyService) ServiceManager.GetService (typeof(PropertyService));
+ FileUtilityService fileUtilityService = (FileUtilityService)ServiceManager.GetService(typeof(FileUtilityService));
string html = ConvertXml.ConvertToString(ps.DataDirectory +
Path.DirectorySeparatorChar + ".." +
Path.DirectorySeparatorChar + "doc" +
@@ -598,8 +598,8 @@
public void RenderSectionHelpWantedBody(StringBuilder builder)
{
try {
- PropertyService ps = (PropertyService)ServiceManager.Services.GetService (typeof(PropertyService));
- FileUtilityService fileUtilityService = (FileUtilityService)ServiceManager.Services.GetService(typeof(FileUtilityService));
+ PropertyService ps = (PropertyService)ServiceManager.GetService (typeof(PropertyService));
+ FileUtilityService fileUtilityService = (FileUtilityService)ServiceManager.GetService(typeof(FileUtilityService));
string html = ConvertXml.ConvertToString(ps.DataDirectory +
Path.DirectorySeparatorChar + ".." +
Path.DirectorySeparatorChar + "doc" +
@@ -632,13 +632,13 @@
public string Render(string section)
{
- PropertyService ps = (PropertyService) ServiceManager.Services.GetService (typeof(PropertyService));
+ PropertyService ps = (PropertyService) ServiceManager.GetService (typeof(PropertyService));
startPageLocation = ps.DataDirectory + Path.DirectorySeparatorChar +
".." + Path.DirectorySeparatorChar +
"data" + Path.DirectorySeparatorChar +
"resources" + Path.DirectorySeparatorChar +
"startpage";
- StringParserService stringParserService = (StringParserService)ServiceManager.Services.GetService(typeof(StringParserService));
+ StringParserService stringParserService = (StringParserService)ServiceManager.GetService(typeof(StringParserService));
switch (section) {
case "Start":
Modified: trunk/MonoDevelop/src/AddIns/Misc/StartPage/StartPage.cs
===================================================================
--- trunk/MonoDevelop/src/AddIns/Misc/StartPage/StartPage.cs 2004-06-23 23:08:38 UTC (rev 1814)
+++ trunk/MonoDevelop/src/AddIns/Misc/StartPage/StartPage.cs 2004-06-24 02:05:41 UTC (rev 1815)
@@ -73,7 +73,7 @@
public StartPageView()
{
htmlControl = new MozillaControl ();
- PropertyService propertyService = (PropertyService)ServiceManager.Services.GetService(typeof(PropertyService));
+ PropertyService propertyService = (PropertyService)ServiceManager.GetService(typeof(PropertyService));
//htmlControl.Css = propertyService.DataDirectory + Path.DirectorySeparatorChar +
// "resources" + Path.DirectorySeparatorChar +
// "startpage" + Path.DirectorySeparatorChar +
@@ -84,11 +84,11 @@
htmlControl.ShowAll ();
htmlControl.OpenUri += new OpenUriHandler (HtmlControlBeforeNavigate);
- StringParserService stringParserService = (StringParserService)ServiceManager.Services.GetService(typeof(StringParserService));
+ StringParserService stringParserService = (StringParserService)ServiceManager.GetService(typeof(StringParserService));
// Description of the tab shown in #develop
ContentName = stringParserService.Parse("${res:StartPage.StartPageContentName}");
- IProjectService projectService = (IProjectService)MonoDevelop.Core.Services.ServiceManager.Services.GetService(typeof(IProjectService));
+ IProjectService projectService = (IProjectService)MonoDevelop.Core.Services.ServiceManager.GetService(typeof(IProjectService));
projectService.CombineOpened += new CombineEventHandler(HandleCombineOpened);
}
@@ -108,12 +108,12 @@
e.RetVal = true;
if (e.AURI.StartsWith("project://")) {
try {
- Core.Properties.DefaultProperties svc = (Core.Properties.DefaultProperties)Core.Services.ServiceManager.Services.GetService(typeof(Core.Services.PropertyService));
+ Core.Properties.DefaultProperties svc = (Core.Properties.DefaultProperties)Core.Services.ServiceManager.GetService(typeof(Core.Services.PropertyService));
object recentOpenObj = svc.GetProperty("MonoDevelop.Gui.MainWindow.RecentOpen");
if (recentOpenObj is MonoDevelop.Services.RecentOpen) {
MonoDevelop.Services.RecentOpen recOpen = (MonoDevelop.Services.RecentOpen)recentOpenObj;
- IProjectService projectService = (IProjectService)MonoDevelop.Core.Services.ServiceManager.Services.GetService(typeof(IProjectService));
+ IProjectService projectService = (IProjectService)MonoDevelop.Core.Services.ServiceManager.GetService(typeof(IProjectService));
string prjNumber = e.AURI.Substring("project://".Length);
// wrong (jluke)
Modified: trunk/MonoDevelop/src/AddIns/prj2make-sharp-lib/prj2make-sharp-lib-Commands.cs
===================================================================
--- trunk/MonoDevelop/src/AddIns/prj2make-sharp-lib/prj2make-sharp-lib-Commands.cs 2004-06-23 23:08:38 UTC (rev 1814)
+++ trunk/MonoDevelop/src/AddIns/prj2make-sharp-lib/prj2make-sharp-lib-Commands.cs 2004-06-24 02:05:41 UTC (rev 1815)
@@ -13,7 +13,7 @@
{
public class ImportPrj : AbstractMenuCommand
{
- static PropertyService PropertyService = (PropertyService)ServiceManager.Services.GetService (typeof (PropertyService));
+ static PropertyService PropertyService = (PropertyService)ServiceManager.GetService (typeof (PropertyService));
public override void Run()
{
@@ -42,13 +42,13 @@
name = slnMkObj.PrjxFileName;
break;
default:
- IMessageService messageService =(IMessageService)ServiceManager.Services.GetService(typeof(IMessageService));
+ IMessageService messageService =(IMessageService)ServiceManager.GetService(typeof(IMessageService));
messageService.ShowError(String.Format (GettextCatalog.GetString ("Can't open file {0} as project"), name));
break;
}
if (conversionSuccessfull == true) {
try {
- proj = (IProjectService)ServiceManager.Services.GetService (typeof (IProjectService));
+ proj = (IProjectService)ServiceManager.GetService (typeof (IProjectService));
proj.OpenCombine(name);
} catch (Exception ex) {
Console.WriteLine(ex.Message);
Modified: trunk/MonoDevelop/src/Libraries/MonoDevelop.Core/AddIns/AddIn.cs
===================================================================
--- trunk/MonoDevelop/src/Libraries/MonoDevelop.Core/AddIns/AddIn.cs 2004-06-23 23:08:38 UTC (rev 1814)
+++ trunk/MonoDevelop/src/Libraries/MonoDevelop.Core/AddIns/AddIn.cs 2004-06-24 02:05:41 UTC (rev 1815)
@@ -42,7 +42,7 @@
ArrayList extensions = new ArrayList();
- FileUtilityService fileUtilityService = (FileUtilityService)ServiceManager.Services.GetService(typeof(FileUtilityService));
+ FileUtilityService fileUtilityService = (FileUtilityService)ServiceManager.GetService(typeof(FileUtilityService));
/// <summary>
/// returns the filename of the xml definition in which
Modified: trunk/MonoDevelop/src/Libraries/MonoDevelop.Core/AddIns/AddInTreeSingleton.cs
===================================================================
--- trunk/MonoDevelop/src/Libraries/MonoDevelop.Core/AddIns/AddInTreeSingleton.cs 2004-06-23 23:08:38 UTC (rev 1814)
+++ trunk/MonoDevelop/src/Libraries/MonoDevelop.Core/AddIns/AddInTreeSingleton.cs 2004-06-24 02:05:41 UTC (rev 1815)
@@ -79,7 +79,7 @@
{
addInTree = new DefaultAddInTree();
- FileUtilityService fileUtilityService = (FileUtilityService)ServiceManager.Services.GetService(typeof(FileUtilityService));
+ FileUtilityService fileUtilityService = (FileUtilityService)ServiceManager.GetService(typeof(FileUtilityService));
StringCollection addInFiles = null;
StringCollection retryList = null;
Modified: trunk/MonoDevelop/src/Libraries/MonoDevelop.Core/AddIns/Conditions/CompareCondition.cs
===================================================================
--- trunk/MonoDevelop/src/Libraries/MonoDevelop.Core/AddIns/Conditions/CompareCondition.cs 2004-06-23 23:08:38 UTC (rev 1814)
+++ trunk/MonoDevelop/src/Libraries/MonoDevelop.Core/AddIns/Conditions/CompareCondition.cs 2004-06-24 02:05:41 UTC (rev 1815)
@@ -54,7 +54,7 @@
/// </summary>
public override bool IsValid(object owner)
{
- StringParserService stringParserService = (StringParserService)ServiceManager.Services.GetService(typeof(StringParserService));
+ StringParserService stringParserService = (StringParserService)ServiceManager.GetService(typeof(StringParserService));
return stringParserService.Parse(s1) == stringParserService.Parse(s2);
}
}
Modified: trunk/MonoDevelop/src/Libraries/MonoDevelop.Core/ChangeLog
===================================================================
--- trunk/MonoDevelop/src/Libraries/MonoDevelop.Core/ChangeLog 2004-06-23 23:08:38 UTC (rev 1814)
+++ trunk/MonoDevelop/src/Libraries/MonoDevelop.Core/ChangeLog 2004-06-24 02:05:41 UTC (rev 1815)
@@ -1,3 +1,8 @@
+2004-06-23 Todd Berman <tberman at off.net>
+
+ * Services/ServiceManager.cs: make GetService a static method, hide
+ the instance everywhere.
+
2004-05-29 Vladimir Vukicevic <vladimir at pobox.com>
* Services/GettextCatalog.cs: fix marshalling issues and gettext
Modified: trunk/MonoDevelop/src/Libraries/MonoDevelop.Core/Services/FileUtilityService.cs
===================================================================
--- trunk/MonoDevelop/src/Libraries/MonoDevelop.Core/Services/FileUtilityService.cs 2004-06-23 23:08:38 UTC (rev 1814)
+++ trunk/MonoDevelop/src/Libraries/MonoDevelop.Core/Services/FileUtilityService.cs 2004-06-24 02:05:41 UTC (rev 1815)
@@ -100,7 +100,7 @@
}
}
} catch (Exception e) {
- IMessageService messageService =(IMessageService)ServiceManager.Services.GetService(typeof(IMessageService));
+ IMessageService messageService =(IMessageService)ServiceManager.GetService(typeof(IMessageService));
messageService.ShowError(e, "Can't access directory " + directory);
}
}
@@ -197,10 +197,10 @@
public bool TestFileExists(string filename)
{
if (!File.Exists(filename)) {
- IResourceService resourceService = (IResourceService)ServiceManager.Services.GetService(typeof(IResourceService));
- StringParserService stringParserService = (StringParserService)ServiceManager.Services.GetService(typeof(StringParserService));
+ IResourceService resourceService = (IResourceService)ServiceManager.GetService(typeof(IResourceService));
+ StringParserService stringParserService = (StringParserService)ServiceManager.GetService(typeof(StringParserService));
- IMessageService messageService =(IMessageService)ServiceManager.Services.GetService(typeof(IMessageService));
+ IMessageService messageService =(IMessageService)ServiceManager.GetService(typeof(IMessageService));
messageService.ShowWarning(stringParserService.Parse(resourceService.GetString("Fileutility.CantFindFileError"), new string[,] { {"FILE", filename} }));
return false;
}
@@ -273,7 +273,7 @@
public FileOperationResult ObservedSave(FileOperationDelegate saveFile, string fileName, FileErrorPolicy policy)
{
- IResourceService resourceService = (IResourceService)ServiceManager.Services.GetService(typeof(IResourceService));
+ IResourceService resourceService = (IResourceService)ServiceManager.GetService(typeof(IResourceService));
return ObservedSave(saveFile,
fileName,
resourceService.GetString("ICSharpCode.Services.FileUtilityService.CantSaveFileStandardText"),
@@ -340,7 +340,7 @@
public FileOperationResult ObservedSave(NamedFileOperationDelegate saveFileAs, string fileName, FileErrorPolicy policy)
{
- IResourceService resourceService = (IResourceService)ServiceManager.Services.GetService(typeof(IResourceService));
+ IResourceService resourceService = (IResourceService)ServiceManager.GetService(typeof(IResourceService));
return ObservedSave(saveFileAs,
fileName,
resourceService.GetString("ICSharpCode.Services.FileUtilityService.CantSaveFileStandardText"),
@@ -394,7 +394,7 @@
public FileOperationResult ObservedLoad(FileOperationDelegate saveFile, string fileName, FileErrorPolicy policy)
{
- IResourceService resourceService = (IResourceService)ServiceManager.Services.GetService(typeof(IResourceService));
+ IResourceService resourceService = (IResourceService)ServiceManager.GetService(typeof(IResourceService));
return ObservedLoad(saveFile,
fileName,
resourceService.GetString("ICSharpCode.Services.FileUtilityService.CantLoadFileStandardText"),
@@ -430,7 +430,7 @@
public FileOperationResult ObservedLoad(NamedFileOperationDelegate saveFileAs, string fileName, FileErrorPolicy policy)
{
- IResourceService resourceService = (IResourceService)ServiceManager.Services.GetService(typeof(IResourceService));
+ IResourceService resourceService = (IResourceService)ServiceManager.GetService(typeof(IResourceService));
return ObservedLoad(saveFileAs,
fileName,
resourceService.GetString("ICSharpCode.Services.FileUtilityService.CantLoadFileStandardText"),
Modified: trunk/MonoDevelop/src/Libraries/MonoDevelop.Core/Services/PropertyService.cs
===================================================================
--- trunk/MonoDevelop/src/Libraries/MonoDevelop.Core/Services/PropertyService.cs 2004-06-23 23:08:38 UTC (rev 1814)
+++ trunk/MonoDevelop/src/Libraries/MonoDevelop.Core/Services/PropertyService.cs 2004-06-24 02:05:41 UTC (rev 1815)
@@ -82,7 +82,7 @@
doc.DocumentElement.AppendChild(ToXmlElement(doc));
- FileUtilityService fileUtilityService = (FileUtilityService)ServiceManager.Services.GetService(typeof(FileUtilityService));
+ FileUtilityService fileUtilityService = (FileUtilityService)ServiceManager.GetService(typeof(FileUtilityService));
fileUtilityService.ObservedSave(new NamedFileOperationDelegate(doc.Save), fileName, FileErrorPolicy.ProvideAlternative);
}
Modified: trunk/MonoDevelop/src/Libraries/MonoDevelop.Core/Services/ServiceManager.cs
===================================================================
--- trunk/MonoDevelop/src/Libraries/MonoDevelop.Core/Services/ServiceManager.cs 2004-06-23 23:08:38 UTC (rev 1814)
+++ trunk/MonoDevelop/src/Libraries/MonoDevelop.Core/Services/ServiceManager.cs 2004-06-24 02:05:41 UTC (rev 1815)
@@ -29,20 +29,21 @@
Hashtable servicesHashtable = new Hashtable();
static ServiceManager defaultServiceManager = new ServiceManager();
-
- /// <summary>
- /// Gets the default ServiceManager
- /// </summary>
- public static ServiceManager Services {
+ public static IService GetService (Type serviceType) {
+ return defaultServiceManager.FetchService (serviceType);
+ }
+
+
+ public IService this [Type index] {
get {
- return defaultServiceManager;
+ return FetchService (index);
}
}
/// <summary>
/// Don't create ServiceManager objects, only have ONE per application.
/// </summary>
- private ServiceManager()
+ static ServiceManager()
{
// add 'core' services
AddService(new PropertyService());
@@ -54,14 +55,13 @@
/// This method initializes the service system to a path inside the add-in tree.
/// This method must be called ONCE.
/// </remarks>
- public void InitializeServicesSubsystem(string servicesPath)
+ public static void InitializeServicesSubsystem(string servicesPath)
{
// add add-in tree services
- AddServices((IService[])AddInTreeSingleton.AddInTree.GetTreeNode(servicesPath).BuildChildItems(this).ToArray(typeof(IService)));
+ AddServices((IService[])AddInTreeSingleton.AddInTree.GetTreeNode(servicesPath).BuildChildItems(defaultServiceManager).ToArray(typeof(IService)));
// initialize all services
- foreach (IService service in serviceList) {
- DateTime now = DateTime.Now;
+ foreach (IService service in defaultServiceManager.serviceList) {
service.InitializeService();
}
}
@@ -69,19 +69,19 @@
/// <remarks>
/// Calls UnloadService on all services. This method must be called ONCE.
/// </remarks>
- public void UnloadAllServices()
+ public static void UnloadAllServices()
{
- foreach (IService service in serviceList) {
+ foreach (IService service in defaultServiceManager.serviceList) {
service.UnloadService();
}
}
- public void AddService(IService service)
+ public static void AddService(IService service)
{
- serviceList.Add(service);
+ defaultServiceManager.serviceList.Add(service);
}
- public void AddServices(IService[] services)
+ public static void AddServices(IService[] services)
{
foreach (IService service in services) {
AddService(service);
@@ -112,7 +112,7 @@
/// <remarks>
/// Requestes a specific service, may return null if this service is not found.
/// </remarks>
- public IService GetService(Type serviceType)
+ IService FetchService(Type serviceType)
{
IService s = (IService)servicesHashtable[serviceType];
if (s != null) {
Modified: trunk/MonoDevelop/src/Libraries/MonoDevelop.Core/Services/StringParserService.cs
===================================================================
--- trunk/MonoDevelop/src/Libraries/MonoDevelop.Core/Services/StringParserService.cs 2004-06-23 23:08:38 UTC (rev 1814)
+++ trunk/MonoDevelop/src/Libraries/MonoDevelop.Core/Services/StringParserService.cs 2004-06-24 02:05:41 UTC (rev 1815)
@@ -98,13 +98,13 @@
if (k > 0) {
switch (propertyName.Substring(0, k).ToUpper()) {
case "RES":
- IResourceService resourceService = (IResourceService)ServiceManager.Services.GetService(typeof(IResourceService));
+ IResourceService resourceService = (IResourceService)ServiceManager.GetService(typeof(IResourceService));
if (resourceService != null) {
propertyValue = Parse(resourceService.GetString(propertyName.Substring(k + 1)), customTags);
}
break;
case "PROPERTY":
- PropertyService propertyService = (PropertyService)ServiceManager.Services.GetService(typeof(PropertyService));
+ PropertyService propertyService = (PropertyService)ServiceManager.GetService(typeof(PropertyService));
propertyValue = propertyService.GetProperty(propertyName.Substring(k + 1)).ToString();
break;
}
Modified: trunk/MonoDevelop/src/Libraries/MonoDevelop.Gui.Widgets/FileBrowser/FileBrowser.cs
===================================================================
--- trunk/MonoDevelop/src/Libraries/MonoDevelop.Gui.Widgets/FileBrowser/FileBrowser.cs 2004-06-23 23:08:38 UTC (rev 1814)
+++ trunk/MonoDevelop/src/Libraries/MonoDevelop.Gui.Widgets/FileBrowser/FileBrowser.cs 2004-06-24 02:05:41 UTC (rev 1815)
@@ -48,7 +48,7 @@
private ArrayList files = new ArrayList ();
private Hashtable hiddenfolders = new Hashtable ();
- PropertyService PropertyService = (PropertyService) ServiceManager.Services.GetService (typeof (PropertyService));
+ PropertyService PropertyService = (PropertyService) ServiceManager.GetService (typeof (PropertyService));
public FileBrowser () : base (GType)
{
@@ -56,7 +56,7 @@
Vfs.Init ();
}
- messageService = (IMessageService) ServiceManager.Services.GetService (typeof (IMessageService));
+ messageService = (IMessageService) ServiceManager.GetService (typeof (IMessageService));
scrolledwindow = new ScrolledWindow ();
scrolledwindow.VscrollbarPolicy = PolicyType.Automatic;
Modified: trunk/MonoDevelop/src/Libraries/MonoDevelop.Gui.Widgets/FileSelector/FileSelector.cs
===================================================================
--- trunk/MonoDevelop/src/Libraries/MonoDevelop.Gui.Widgets/FileSelector/FileSelector.cs 2004-06-23 23:08:38 UTC (rev 1814)
+++ trunk/MonoDevelop/src/Libraries/MonoDevelop.Gui.Widgets/FileSelector/FileSelector.cs 2004-06-24 02:05:41 UTC (rev 1815)
@@ -14,7 +14,7 @@
{
const string LastPathProperty = "MonoDevelop.FileSelector.LastPath";
string lastPath;
- PropertyService propertyService = (PropertyService) ServiceManager.Services.GetService (typeof (PropertyService));
+ PropertyService propertyService = (PropertyService) ServiceManager.GetService (typeof (PropertyService));
public FileSelector () : base (GettextCatalog.GetString ("Open file ..."))
{
Modified: trunk/MonoDevelop/src/Main/Base/ChangeLog
===================================================================
--- trunk/MonoDevelop/src/Main/Base/ChangeLog 2004-06-23 23:08:38 UTC (rev 1814)
+++ trunk/MonoDevelop/src/Main/Base/ChangeLog 2004-06-24 02:05:41 UTC (rev 1815)
@@ -1,5 +1,10 @@
2004-06-23 Todd Berman <tberman at off.net>
+ * Gui/CompletionDatabaseWizard: removed directory, as its unused.
+ * Makefile.am: updated to reflect above.
+
+2004-06-23 Todd Berman <tberman at off.net>
+
* Services/Project/DefaultProjectService.cs: make solution loading take
place without any gui locks.
* Service/File/DefaultFileService.cs: proxy OpenFile to a real method
Modified: trunk/MonoDevelop/src/Main/Base/Commands/AutostartCommands.cs
===================================================================
--- trunk/MonoDevelop/src/Main/Base/Commands/AutostartCommands.cs 2004-06-23 23:08:38 UTC (rev 1814)
+++ trunk/MonoDevelop/src/Main/Base/Commands/AutostartCommands.cs 2004-06-24 02:05:41 UTC (rev 1815)
@@ -21,7 +21,6 @@
using MonoDevelop.Services;
using MonoDevelop.Gui;
using MonoDevelop.Gui.Dialogs;
-using MonoDevelop.Gui.Dialogs.OptionPanels.CompletionDatabaseWizard;
using MonoDevelop.Gui.ErrorHandlers;
using SA = MonoDevelop.SharpAssembly.Assembly;
@@ -51,7 +50,7 @@
public override void Run()
{
- PropertyService propertyService = (PropertyService)ServiceManager.Services.GetService(typeof(PropertyService));
+ PropertyService propertyService = (PropertyService)ServiceManager.GetService(typeof(PropertyService));
string path = propertyService.GetProperty ("SharpDevelop.CodeCompletion.DataDirectory", null);
string codeCompletionProxyFile = Path.Combine (path, "mscorlib.pidb");
//Console.WriteLine("checking for existence of {0}", codeCompletionProxyFile);
@@ -62,21 +61,21 @@
}
*/ }
- void RunWizard()
+ /*void RunWizard()
{
if (SplashScreenForm.SplashScreen.Visible) {
SplashScreenForm.SplashScreen.Hide();
}
(new GenerateDatabase()).Start();
- }
+ }*/
}
public class StartParserServiceThread : AbstractCommand
{
public override void Run()
{
- DefaultParserService parserService = (DefaultParserService)ServiceManager.Services.GetService(typeof(DefaultParserService));
+ DefaultParserService parserService = (DefaultParserService)ServiceManager.GetService(typeof(DefaultParserService));
parserService.StartParserThread();
}
}
@@ -129,7 +128,7 @@
}
isCalled = true;
// show tip of the day
- PropertyService propertyService = (PropertyService)ServiceManager.Services.GetService(typeof(PropertyService));
+ PropertyService propertyService = (PropertyService)ServiceManager.GetService(typeof(PropertyService));
if (propertyService.GetProperty("MonoDevelop.Gui.Dialog.TipOfTheDayView.ShowTipsAtStartup", false)) {
ViewTipOfTheDay dview = new ViewTipOfTheDay();
dview.Run();
@@ -145,15 +144,15 @@
}
// register string tag provider (TODO: move to add-in tree :)
- StringParserService stringParserService = (StringParserService)ServiceManager.Services.GetService(typeof(StringParserService));
+ StringParserService stringParserService = (StringParserService)ServiceManager.GetService(typeof(StringParserService));
stringParserService.RegisterStringTagProvider(new MonoDevelop.Commands.SharpDevelopStringTagProvider());
- PropertyService propertyService = (PropertyService)ServiceManager.Services.GetService(typeof(PropertyService));
+ PropertyService propertyService = (PropertyService)ServiceManager.GetService(typeof(PropertyService));
//idleEventHandler = new EventHandler(ShowTipOfTheDay);
//Application.Idle += idleEventHandler;
- IProjectService projectService = (IProjectService)MonoDevelop.Core.Services.ServiceManager.Services.GetService(typeof(IProjectService));
+ IProjectService projectService = (IProjectService)MonoDevelop.Core.Services.ServiceManager.GetService(typeof(IProjectService));
// load previous combine
if ((bool)propertyService.GetProperty("SharpDevelop.LoadPrevProjectOnStartup", false)) {
@@ -180,7 +179,7 @@
break;
default:
try {
- IFileService fileService = (IFileService)MonoDevelop.Core.Services.ServiceManager.Services.GetService(typeof(IFileService));
+ IFileService fileService = (IFileService)MonoDevelop.Core.Services.ServiceManager.GetService(typeof(IFileService));
fileService.OpenFile(file);
} catch (Exception e) {
Modified: trunk/MonoDevelop/src/Main/Base/Commands/ClassBrowserCommands/ClassBrowserCommands.cs
===================================================================
--- trunk/MonoDevelop/src/Main/Base/Commands/ClassBrowserCommands/ClassBrowserCommands.cs 2004-06-23 23:08:38 UTC (rev 1814)
+++ trunk/MonoDevelop/src/Main/Base/Commands/ClassBrowserCommands/ClassBrowserCommands.cs 2004-06-24 02:05:41 UTC (rev 1815)
@@ -40,7 +40,7 @@
AbstractClassScoutNode node = browser.SelectedNode as AbstractClassScoutNode;
if (node != null) {
- IMessageService messageService =(IMessageService)ServiceManager.Services.GetService(typeof(IMessageService));
+ IMessageService messageService =(IMessageService)ServiceManager.GetService(typeof(IMessageService));
messageService.ShowWarning(GettextCatalog.GetString ("Not implemented"));
}
}
Modified: trunk/MonoDevelop/src/Main/Base/Commands/CustomStringTagProvider.cs
===================================================================
--- trunk/MonoDevelop/src/Main/Base/Commands/CustomStringTagProvider.cs 2004-06-23 23:08:38 UTC (rev 1814)
+++ trunk/MonoDevelop/src/Main/Base/Commands/CustomStringTagProvider.cs 2004-06-24 02:05:41 UTC (rev 1815)
@@ -28,7 +28,7 @@
{
public class SharpDevelopStringTagProvider : IStringTagProvider
{
- IProjectService projectService = (IProjectService)MonoDevelop.Core.Services.ServiceManager.Services.GetService(typeof(IProjectService));
+ IProjectService projectService = (IProjectService)MonoDevelop.Core.Services.ServiceManager.GetService(typeof(IProjectService));
public string[] Tags {
get {
Modified: trunk/MonoDevelop/src/Main/Base/Commands/FileCommands.cs
===================================================================
--- trunk/MonoDevelop/src/Main/Base/Commands/FileCommands.cs 2004-06-23 23:08:38 UTC (rev 1814)
+++ trunk/MonoDevelop/src/Main/Base/Commands/FileCommands.cs 2004-06-24 02:05:41 UTC (rev 1815)
@@ -26,7 +26,7 @@
{
public override void Run()
{
- IProjectService projectService = (IProjectService)MonoDevelop.Core.Services.ServiceManager.Services.GetService(typeof(IProjectService));
+ IProjectService projectService = (IProjectService)MonoDevelop.Core.Services.ServiceManager.GetService(typeof(IProjectService));
NewProjectDialog npdlg = new NewProjectDialog(true);
npdlg.Run ();
@@ -53,7 +53,7 @@
public class SaveFile : AbstractMenuCommand
{
- static PropertyService PropertyService = (PropertyService)ServiceManager.Services.GetService (typeof (PropertyService));
+ static PropertyService PropertyService = (PropertyService)ServiceManager.GetService (typeof (PropertyService));
public override void Run()
{
@@ -78,8 +78,8 @@
SaveFileAs sfa = new SaveFileAs();
sfa.Run();
} else {
- IProjectService projectService = (IProjectService)MonoDevelop.Core.Services.ServiceManager.Services.GetService(typeof(IProjectService));
- FileUtilityService fileUtilityService = (FileUtilityService)ServiceManager.Services.GetService(typeof(FileUtilityService));
+ IProjectService projectService = (IProjectService)MonoDevelop.Core.Services.ServiceManager.GetService(typeof(IProjectService));
+ FileUtilityService fileUtilityService = (FileUtilityService)ServiceManager.GetService(typeof(FileUtilityService));
projectService.MarkFileDirty(window.ViewContent.ContentName);
string fileName = window.ViewContent.ContentName;
// save backup first
@@ -100,7 +100,7 @@
IWorkbenchWindow window = WorkbenchSingleton.Workbench.ActiveWorkbenchWindow;
if (window != null && window.ViewContent.ContentName != null && !window.ViewContent.IsViewOnly) {
- IMessageService messageService =(IMessageService)ServiceManager.Services.GetService(typeof(IMessageService));
+ IMessageService messageService =(IMessageService)ServiceManager.GetService(typeof(IMessageService));
if (messageService.AskQuestion(GettextCatalog.GetString ("Are you sure that you want to reload the file?"))) {
IXmlConvertable memento = null;
if (window.ViewContent is IMementoCapable) {
@@ -117,7 +117,7 @@
public class SaveFileAs : AbstractMenuCommand
{
- static PropertyService PropertyService = (PropertyService)ServiceManager.Services.GetService (typeof (PropertyService));
+ static PropertyService PropertyService = (PropertyService)ServiceManager.GetService (typeof (PropertyService));
public override void Run()
{
@@ -154,10 +154,10 @@
if (response == (int)Gtk.ResponseType.Ok) {
- IFileService fileService = (IFileService)MonoDevelop.Core.Services.ServiceManager.Services.GetService(typeof(IFileService));
- FileUtilityService fileUtilityService = (FileUtilityService)ServiceManager.Services.GetService(typeof(FileUtilityService));
+ IFileService fileService = (IFileService)MonoDevelop.Core.Services.ServiceManager.GetService(typeof(IFileService));
+ FileUtilityService fileUtilityService = (FileUtilityService)ServiceManager.GetService(typeof(FileUtilityService));
if (!fileUtilityService.IsValidFileName(filename)) {
- IMessageService messageService =(IMessageService)ServiceManager.Services.GetService(typeof(IMessageService));
+ IMessageService messageService =(IMessageService)ServiceManager.GetService(typeof(IMessageService));
messageService.ShowMessage(String.Format (GettextCatalog.GetString ("File name {0} is invalid"), filename));
return;
}
@@ -181,7 +181,7 @@
{
public override void Run()
{
- FileUtilityService fileUtilityService = (FileUtilityService)ServiceManager.Services.GetService(typeof(FileUtilityService));
+ FileUtilityService fileUtilityService = (FileUtilityService)ServiceManager.GetService(typeof(FileUtilityService));
foreach (IViewContent content in WorkbenchSingleton.Workbench.ViewContentCollection) {
if (content.IsViewOnly) {
@@ -205,7 +205,7 @@
if (fileUtilityService.ObservedSave(new NamedFileOperationDelegate(content.Save), fileName) == FileOperationResult.OK)
{
- IMessageService messageService =(IMessageService)ServiceManager.Services.GetService(typeof(IMessageService));
+ IMessageService messageService =(IMessageService)ServiceManager.GetService(typeof(IMessageService));
messageService.ShowMessage(fileName, GettextCatalog.GetString ("File saved"));
}
}
@@ -223,7 +223,7 @@
public class OpenCombine : AbstractMenuCommand
{
- static PropertyService PropertyService = (PropertyService)ServiceManager.Services.GetService (typeof (PropertyService));
+ static PropertyService PropertyService = (PropertyService)ServiceManager.GetService (typeof (PropertyService));
public override void Run()
{
@@ -236,18 +236,18 @@
switch (Path.GetExtension(name).ToUpper()) {
case ".CMBX": // Don't forget the 'recent' projects if you chance something here
case ".PRJX":
- IProjectService projectService = (IProjectService)MonoDevelop.Core.Services.ServiceManager.Services.GetService(typeof(IProjectService));
+ IProjectService projectService = (IProjectService)MonoDevelop.Core.Services.ServiceManager.GetService(typeof(IProjectService));
try {
//projectService.OpenCombine(name);
- IFileService fileService = (IFileService)MonoDevelop.Core.Services.ServiceManager.Services.GetService(typeof(IFileService));
+ IFileService fileService = (IFileService)MonoDevelop.Core.Services.ServiceManager.GetService(typeof(IFileService));
fileService.OpenFile(name);
} catch (Exception ex) {
CombineLoadError.HandleError(ex, name);
}
break;
default:
- IMessageService messageService =(IMessageService)ServiceManager.Services.GetService(typeof(IMessageService));
+ IMessageService messageService =(IMessageService)ServiceManager.GetService(typeof(IMessageService));
messageService.ShowError(String.Format (GettextCatalog.GetString ("Can't open file {0} as project"), name));
break;
}
@@ -258,7 +258,7 @@
public class OpenFile : AbstractMenuCommand
{
- static PropertyService PropertyService = (PropertyService)ServiceManager.Services.GetService (typeof (PropertyService));
+ static PropertyService PropertyService = (PropertyService)ServiceManager.GetService (typeof (PropertyService));
public override void Run()
{
@@ -266,10 +266,10 @@
bool foundFilter = false;
// search filter like in the current selected project
- IProjectService projectService = (IProjectService)MonoDevelop.Core.Services.ServiceManager.Services.GetService(typeof(IProjectService));
+ IProjectService projectService = (IProjectService)MonoDevelop.Core.Services.ServiceManager.GetService(typeof(IProjectService));
if (projectService.CurrentSelectedProject != null) {
- LanguageBindingService languageBindingService = (LanguageBindingService)MonoDevelop.Core.Services.ServiceManager.Services.GetService(typeof(LanguageBindingService));
+ LanguageBindingService languageBindingService = (LanguageBindingService)MonoDevelop.Core.Services.ServiceManager.GetService(typeof(LanguageBindingService));
LanguageBindingCodon languageCodon = languageBindingService.GetCodonPerLanguageName(projectService.CurrentSelectedProject.ProjectType);
@@ -300,8 +300,8 @@
string name = fs.Filename;
if (response == (int)Gtk.ResponseType.Ok) {
- IFileService fileService = (IFileService)MonoDevelop.Core.Services.ServiceManager.Services.GetService(typeof(IFileService));
- IProjectService proj = (IProjectService)ServiceManager.Services.GetService (typeof (IProjectService));
+ IFileService fileService = (IFileService)MonoDevelop.Core.Services.ServiceManager.GetService(typeof(IFileService));
+ IProjectService proj = (IProjectService)ServiceManager.GetService (typeof (IProjectService));
switch (System.IO.Path.GetExtension (name).ToUpper()) {
case ".PRJX":
case ".CMBX":
@@ -320,7 +320,7 @@
{
public override void Run()
{
- IProjectService projectService = (IProjectService)MonoDevelop.Core.Services.ServiceManager.Services.GetService(typeof(IProjectService));
+ IProjectService projectService = (IProjectService)MonoDevelop.Core.Services.ServiceManager.GetService(typeof(IProjectService));
projectService.CloseCombine();
}
@@ -398,8 +398,8 @@
public override void Run()
{
try {
- IFileService fileService = (IFileService)MonoDevelop.Core.Services.ServiceManager.Services.GetService(typeof(IFileService));
- IMessageService messageService = (IMessageService) MonoDevelop.Core.Services.ServiceManager.Services.GetService(typeof(IMessageService));
+ IFileService fileService = (IFileService)MonoDevelop.Core.Services.ServiceManager.GetService(typeof(IFileService));
+ IMessageService messageService = (IMessageService) MonoDevelop.Core.Services.ServiceManager.GetService(typeof(IMessageService));
if (fileService.RecentOpen.RecentFile != null && fileService.RecentOpen.RecentFile.Count > 0 && messageService.AskQuestion(GettextCatalog.GetString ("Are you sure you want to clear recent files list?"), GettextCatalog.GetString ("Clear recent files")))
{
@@ -414,8 +414,8 @@
public override void Run()
{
try {
- IFileService fileService = (IFileService)MonoDevelop.Core.Services.ServiceManager.Services.GetService(typeof(IFileService));
- IMessageService messageService = (IMessageService) MonoDevelop.Core.Services.ServiceManager.Services.GetService(typeof(IMessageService));
+ IFileService fileService = (IFileService)MonoDevelop.Core.Services.ServiceManager.GetService(typeof(IFileService));
+ IMessageService messageService = (IMessageService) MonoDevelop.Core.Services.ServiceManager.GetService(typeof(IMessageService));
if (fileService.RecentOpen.RecentProject != null && fileService.RecentOpen.RecentProject.Count > 0 && messageService.AskQuestion(GettextCatalog.GetString ("Are you sure you want to clear recent projects list?"), GettextCatalog.GetString ("Clear recent projects")))
{
Modified: trunk/MonoDevelop/src/Main/Base/Commands/HelpCommands.cs
===================================================================
--- trunk/MonoDevelop/src/Main/Base/Commands/HelpCommands.cs 2004-06-23 23:08:38 UTC (rev 1814)
+++ trunk/MonoDevelop/src/Main/Base/Commands/HelpCommands.cs 2004-06-24 02:05:41 UTC (rev 1815)
@@ -24,7 +24,7 @@
{
public override void Run()
{
- FileUtilityService fileUtilityService = (FileUtilityService)ServiceManager.Services.GetService(typeof(FileUtilityService));
+ FileUtilityService fileUtilityService = (FileUtilityService)ServiceManager.GetService(typeof(FileUtilityService));
string fileName = fileUtilityService.SharpDevelopRootPath +
Path.DirectorySeparatorChar + "doc" +
Path.DirectorySeparatorChar + "help" +
@@ -54,7 +54,7 @@
public override void Run()
{
- IFileService fileService = (IFileService)MonoDevelop.Core.Services.ServiceManager.Services.GetService(typeof(IFileService));
+ IFileService fileService = (IFileService)MonoDevelop.Core.Services.ServiceManager.GetService(typeof(IFileService));
fileService.OpenFile(site);
}
}
@@ -71,12 +71,12 @@
public override void Run()
{
- FileUtilityService fileUtilityService = (FileUtilityService)ServiceManager.Services.GetService(typeof(FileUtilityService));
+ FileUtilityService fileUtilityService = (FileUtilityService)ServiceManager.GetService(typeof(FileUtilityService));
string file = site.StartsWith("home://") ? fileUtilityService.GetDirectoryNameWithSeparator(fileUtilityService.SharpDevelopRootPath) + "bin" + Path.DirectorySeparatorChar + site.Substring(7).Replace('/', Path.DirectorySeparatorChar) : site;
try {
Process.Start(file);
} catch (Exception) {
- IMessageService messageService =(IMessageService)ServiceManager.Services.GetService(typeof(IMessageService));
+ IMessageService messageService =(IMessageService)ServiceManager.GetService(typeof(IMessageService));
messageService.ShowError(String.Format (GettextCatalog.GetString ("Can not execute or view {0}\n Please check that the file exists and that you can open this file."), file));
}
}
Modified: trunk/MonoDevelop/src/Main/Base/Commands/MenuItemBuilders.cs
===================================================================
--- trunk/MonoDevelop/src/Main/Base/Commands/MenuItemBuilders.cs 2004-06-23 23:08:38 UTC (rev 1814)
+++ trunk/MonoDevelop/src/Main/Base/Commands/MenuItemBuilders.cs 2004-06-24 02:05:41 UTC (rev 1815)
@@ -47,9 +47,9 @@
public Gtk.MenuItem[] BuildSubmenu(ConditionCollection conditionCollection, object owner)
{
- IFileService fileService = (IFileService)MonoDevelop.Core.Services.ServiceManager.Services.GetService(typeof(IFileService));
- ResourceService resourceService = (ResourceService)ServiceManager.Services.GetService(typeof(IResourceService));
- StringParserService stringParserService = (StringParserService)ServiceManager.Services.GetService(typeof(StringParserService));
+ IFileService fileService = (IFileService)MonoDevelop.Core.Services.ServiceManager.GetService(typeof(IFileService));
+ ResourceService resourceService = (ResourceService)ServiceManager.GetService(typeof(IResourceService));
+ StringParserService stringParserService = (StringParserService)ServiceManager.GetService(typeof(StringParserService));
RecentOpen recentOpen = fileService.RecentOpen;
@@ -75,7 +75,7 @@
void LoadRecentFile(object sender, EventArgs e)
{
SdMenuCommand item = (SdMenuCommand)sender;
- IFileService fileService = (IFileService)MonoDevelop.Core.Services.ServiceManager.Services.GetService(typeof(IFileService));
+ IFileService fileService = (IFileService)MonoDevelop.Core.Services.ServiceManager.GetService(typeof(IFileService));
fileService.OpenFile(item.Tag.ToString());
}
}
@@ -91,9 +91,9 @@
public Gtk.MenuItem[] BuildSubmenu(ConditionCollection conditionCollection, object owner)
{
- IFileService fileService = (IFileService)MonoDevelop.Core.Services.ServiceManager.Services.GetService(typeof(IFileService));
- ResourceService resourceService = (ResourceService)ServiceManager.Services.GetService(typeof(IResourceService));
- StringParserService stringParserService = (StringParserService)ServiceManager.Services.GetService(typeof(StringParserService));
+ IFileService fileService = (IFileService)MonoDevelop.Core.Services.ServiceManager.GetService(typeof(IFileService));
+ ResourceService resourceService = (ResourceService)ServiceManager.GetService(typeof(IResourceService));
+ StringParserService stringParserService = (StringParserService)ServiceManager.GetService(typeof(StringParserService));
RecentOpen recentOpen = fileService.RecentOpen;
@@ -116,7 +116,7 @@
void LoadRecentProject(object sender, EventArgs e)
{
SdMenuCommand item = (SdMenuCommand)sender;
- IProjectService projectService = (IProjectService)MonoDevelop.Core.Services.ServiceManager.Services.GetService(typeof(IProjectService));
+ IProjectService projectService = (IProjectService)MonoDevelop.Core.Services.ServiceManager.GetService(typeof(IProjectService));
//FIXME:THIS IS BROKEN!!
@@ -152,10 +152,10 @@
void ToolEvt(object sender, EventArgs e)
{
SdMenuCommand item = (SdMenuCommand)sender;
- IProjectService projectService = (IProjectService)MonoDevelop.Core.Services.ServiceManager.Services.GetService(typeof(IProjectService));
- StringParserService stringParserService = (StringParserService)ServiceManager.Services.GetService(typeof(StringParserService));
- FileUtilityService fileUtilityService = (FileUtilityService)ServiceManager.Services.GetService(typeof(FileUtilityService));
- MessageService messageService =(MessageService)ServiceManager.Services.GetService(typeof(MessageService));
+ IProjectService projectService = (IProjectService)MonoDevelop.Core.Services.ServiceManager.GetService(typeof(IProjectService));
+ StringParserService stringParserService = (StringParserService)ServiceManager.GetService(typeof(StringParserService));
+ FileUtilityService fileUtilityService = (FileUtilityService)ServiceManager.GetService(typeof(FileUtilityService));
+ MessageService messageService =(MessageService)ServiceManager.GetService(typeof(MessageService));
for (int i = 0; i < ToolLoader.Tool.Count; ++i) {
if (item.Text == ToolLoader.Tool[i].ToString()) {
@@ -322,7 +322,7 @@
finfo.BuildAction = BuildAction.Compile;
}
}
- IProjectService projectService = (IProjectService)MonoDevelop.Core.Services.ServiceManager.Services.GetService(typeof(IProjectService));
+ IProjectService projectService = (IProjectService)MonoDevelop.Core.Services.ServiceManager.GetService(typeof(IProjectService));
projectService.SaveCombine();
}
@@ -342,7 +342,7 @@
node.Project.DeployInformation.AddExcludedFile(finfo.Name);
}
}
- IProjectService projectService = (IProjectService)MonoDevelop.Core.Services.ServiceManager.Services.GetService(typeof(IProjectService));
+ IProjectService projectService = (IProjectService)MonoDevelop.Core.Services.ServiceManager.GetService(typeof(IProjectService));
projectService.SaveCombine();
}
}
Modified: trunk/MonoDevelop/src/Main/Base/Commands/ProjectBrowserCommands/CombineNodeCommands.cs
===================================================================
--- trunk/MonoDevelop/src/Main/Base/Commands/ProjectBrowserCommands/CombineNodeCommands.cs 2004-06-23 23:08:38 UTC (rev 1814)
+++ trunk/MonoDevelop/src/Main/Base/Commands/ProjectBrowserCommands/CombineNodeCommands.cs 2004-06-24 02:05:41 UTC (rev 1815)
@@ -32,10 +32,10 @@
{
public override void Run()
{
- IProjectService projectService = (IProjectService)ServiceManager.Services.GetService(typeof(IProjectService));
+ IProjectService projectService = (IProjectService)ServiceManager.GetService(typeof(IProjectService));
ProjectBrowserView browser = (ProjectBrowserView)Owner;
CombineBrowserNode node = browser.SelectedNode as CombineBrowserNode;
- MessageService msg = (MessageService)ServiceManager.Services.GetService (typeof (MessageService));
+ MessageService msg = (MessageService)ServiceManager.GetService (typeof (MessageService));
if (node != null) {
NewProjectDialog npdlg = new NewProjectDialog(false);
@@ -62,10 +62,10 @@
{
public override void Run()
{
- IProjectService projectService = (IProjectService)MonoDevelop.Core.Services.ServiceManager.Services.GetService(typeof(IProjectService));
+ IProjectService projectService = (IProjectService)MonoDevelop.Core.Services.ServiceManager.GetService(typeof(IProjectService));
ProjectBrowserView browser = (ProjectBrowserView)Owner;
CombineBrowserNode node = browser.SelectedNode as CombineBrowserNode;
- MessageService msg = (MessageService)ServiceManager.Services.GetService (typeof (MessageService));
+ MessageService msg = (MessageService)ServiceManager.GetService (typeof (MessageService));
if (node != null) {
NewProjectDialog npdlg = new NewProjectDialog(false);
@@ -91,14 +91,14 @@
{
public override void Run()
{
- IProjectService projectService = (IProjectService)MonoDevelop.Core.Services.ServiceManager.Services.GetService(typeof(IProjectService));
+ IProjectService projectService = (IProjectService)MonoDevelop.Core.Services.ServiceManager.GetService(typeof(IProjectService));
ProjectBrowserView browser = (ProjectBrowserView)Owner;
CombineBrowserNode node = browser.SelectedNode as CombineBrowserNode;
- PropertyService propertyService = (PropertyService)ServiceManager.Services.GetService (typeof (PropertyService));
+ PropertyService propertyService = (PropertyService)ServiceManager.GetService (typeof (PropertyService));
if (node != null) {
using (FileSelector fdiag = new FileSelector (GettextCatalog.GetString ("Add a Project"))) {
- StringParserService stringParserService = (StringParserService)ServiceManager.Services.GetService(typeof(StringParserService));
+ StringParserService stringParserService = (StringParserService)ServiceManager.GetService(typeof(StringParserService));
fdiag.SelectMultiple = false;
if (fdiag.Run () == (int) Gtk.ResponseType.Ok) {
try {
@@ -118,7 +118,7 @@
}
catch
{
- ((MessageService)ServiceManager.Services.GetService (typeof (MessageService))).ShowError (GettextCatalog.GetString ("Invalid Project File"));
+ ((MessageService)ServiceManager.GetService (typeof (MessageService))).ShowError (GettextCatalog.GetString ("Invalid Project File"));
}
}
@@ -132,14 +132,14 @@
{
public override void Run()
{
- IProjectService projectService = (IProjectService)MonoDevelop.Core.Services.ServiceManager.Services.GetService(typeof(IProjectService));
+ IProjectService projectService = (IProjectService)MonoDevelop.Core.Services.ServiceManager.GetService(typeof(IProjectService));
ProjectBrowserView browser = (ProjectBrowserView)Owner;
CombineBrowserNode node = browser.SelectedNode as CombineBrowserNode;
- PropertyService propertyService = (PropertyService)ServiceManager.Services.GetService (typeof (PropertyService));
+ PropertyService propertyService = (PropertyService)ServiceManager.GetService (typeof (PropertyService));
if (node != null) {
using (FileSelector fdiag = new FileSelector (GettextCatalog.GetString ("Add a Combine"))) {
- StringParserService stringParserService = (StringParserService)ServiceManager.Services.GetService(typeof(StringParserService));
+ StringParserService stringParserService = (StringParserService)ServiceManager.GetService(typeof(StringParserService));
fdiag.SelectMultiple = false;
if (fdiag.Run () == (int) Gtk.ResponseType.Ok) {
@@ -160,7 +160,7 @@
}
catch
{
- ((MessageService)ServiceManager.Services.GetService (typeof (MessageService))).ShowError (GettextCatalog.GetString ("Invalid Solution File"));
+ ((MessageService)ServiceManager.GetService (typeof (MessageService))).ShowError (GettextCatalog.GetString ("Invalid Solution File"));
}
}
@@ -174,7 +174,7 @@
{
public override void Run()
{
- IProjectService projectService = (IProjectService)MonoDevelop.Core.Services.ServiceManager.Services.GetService(typeof(IProjectService));
+ IProjectService projectService = (IProjectService)MonoDevelop.Core.Services.ServiceManager.GetService(typeof(IProjectService));
ProjectBrowserView browser = (ProjectBrowserView)Owner;
CombineBrowserNode node = browser.SelectedNode as CombineBrowserNode;
Modified: trunk/MonoDevelop/src/Main/Base/Commands/ProjectBrowserCommands/FolderNodeCommands.cs
===================================================================
--- trunk/MonoDevelop/src/Main/Base/Commands/ProjectBrowserCommands/FolderNodeCommands.cs 2004-06-23 23:08:38 UTC (rev 1814)
+++ trunk/MonoDevelop/src/Main/Base/Commands/ProjectBrowserCommands/FolderNodeCommands.cs 2004-06-24 02:05:41 UTC (rev 1815)
@@ -79,7 +79,7 @@
}
catch
{
- ((MessageService)ServiceManager.Services.GetService (typeof (MessageService))).ShowError (GettextCatalog.GetString ("An error occurred while attempt to move/copy that file. Please check your permissions."));
+ ((MessageService)ServiceManager.GetService (typeof (MessageService))).ShowError (GettextCatalog.GetString ("An error occurred while attempt to move/copy that file. Please check your permissions."));
}
}
}
@@ -117,7 +117,7 @@
string extension = Path.GetExtension(window.ViewContent.UntitledName);
// first try the default untitled name of the viewcontent filename
- FileUtilityService fileUtilityService = (FileUtilityService)ServiceManager.Services.GetService(typeof(FileUtilityService));
+ FileUtilityService fileUtilityService = (FileUtilityService)ServiceManager.GetService(typeof(FileUtilityService));
string fileName = fileUtilityService.GetDirectoryNameWithSeparator(baseFolderPath) + baseName + extension;
// if it is already in the project, or it does exists we try to get a name that is
@@ -152,7 +152,7 @@
browser.SelectedNode = newNode;
browser.StartLabelEdit();
- IProjectService projectService = (IProjectService)MonoDevelop.Core.Services.ServiceManager.Services.GetService(typeof(IProjectService));
+ IProjectService projectService = (IProjectService)MonoDevelop.Core.Services.ServiceManager.GetService(typeof(IProjectService));
projectService.SaveCombine();
}
}
@@ -185,8 +185,8 @@
string baseFolderPath = SearchBasePath(selectedNode);
if (baseFolderPath != null && baseFolderPath.Length > 0) {
- FileUtilityService fileUtilityService = (FileUtilityService)ServiceManager.Services.GetService(typeof(FileUtilityService));
- ResourceService resourceService = (ResourceService)ServiceManager.Services.GetService(typeof(IResourceService));
+ FileUtilityService fileUtilityService = (FileUtilityService)ServiceManager.GetService(typeof(FileUtilityService));
+ ResourceService resourceService = (ResourceService)ServiceManager.GetService(typeof(IResourceService));
string directoryName = fileUtilityService.GetDirectoryNameWithSeparator(baseFolderPath) + GettextCatalog.GetString("New Folder");
int index = -1;
Modified: trunk/MonoDevelop/src/Main/Base/Commands/ProjectBrowserCommands/GeneralNodeCommands.cs
===================================================================
--- trunk/MonoDevelop/src/Main/Base/Commands/ProjectBrowserCommands/GeneralNodeCommands.cs 2004-06-23 23:08:38 UTC (rev 1814)
+++ trunk/MonoDevelop/src/Main/Base/Commands/ProjectBrowserCommands/GeneralNodeCommands.cs 2004-06-24 02:05:41 UTC (rev 1815)
@@ -33,7 +33,7 @@
{
ProjectBrowserView browser = (ProjectBrowserView)Owner;
AbstractBrowserNode node = browser.SelectedNode as AbstractBrowserNode;
- IProjectService projectService = (IProjectService)MonoDevelop.Core.Services.ServiceManager.Services.GetService(typeof(IProjectService));
+ IProjectService projectService = (IProjectService)MonoDevelop.Core.Services.ServiceManager.GetService(typeof(IProjectService));
if (node.IsEditing) { // TODO : throw remove key to the browser component.
return;
Modified: trunk/MonoDevelop/src/Main/Base/Commands/ProjectBrowserCommands/ProjectNodeCommands.cs
===================================================================
--- trunk/MonoDevelop/src/Main/Base/Commands/ProjectBrowserCommands/ProjectNodeCommands.cs 2004-06-23 23:08:38 UTC (rev 1814)
+++ trunk/MonoDevelop/src/Main/Base/Commands/ProjectBrowserCommands/ProjectNodeCommands.cs 2004-06-24 02:05:41 UTC (rev 1815)
@@ -37,7 +37,7 @@
Combine combine = node.Combine;
combine.SingleStartProjectName = node.Project.Name;
combine.SingleStartupProject = true;
- IProjectService projectService = (IProjectService)MonoDevelop.Core.Services.ServiceManager.Services.GetService(typeof(IProjectService));
+ IProjectService projectService = (IProjectService)MonoDevelop.Core.Services.ServiceManager.GetService(typeof(IProjectService));
projectService.SaveCombine();
}
}
Modified: trunk/MonoDevelop/src/Main/Base/Commands/ProjectBrowserCommands/ReferenceFolderNodeCommands.cs
===================================================================
--- trunk/MonoDevelop/src/Main/Base/Commands/ProjectBrowserCommands/ReferenceFolderNodeCommands.cs 2004-06-23 23:08:38 UTC (rev 1814)
+++ trunk/MonoDevelop/src/Main/Base/Commands/ProjectBrowserCommands/ReferenceFolderNodeCommands.cs 2004-06-24 02:05:41 UTC (rev 1815)
@@ -47,7 +47,7 @@
}
DefaultDotNetNodeBuilder.InitializeReferences(node, project);
- IProjectService projectService = (IProjectService)MonoDevelop.Core.Services.ServiceManager.Services.GetService(typeof(IProjectService));
+ IProjectService projectService = (IProjectService)MonoDevelop.Core.Services.ServiceManager.GetService(typeof(IProjectService));
projectService.SaveCombine();
}
selDialog.Hide ();
@@ -85,9 +85,9 @@
if (node != null) {
IProject project = ((ProjectBrowserNode)node.Parent).Project;
- FileUtilityService fileUtilityService = (FileUtilityService)ServiceManager.Services.GetService(typeof(FileUtilityService));
- IProjectService projectService = (IProjectService)MonoDevelop.Core.Services.ServiceManager.Services.GetService(typeof(IProjectService));
- IParserService parserService = (IParserService)MonoDevelop.Core.Services.ServiceManager.Services.GetService(typeof(IParserService));
+ FileUtilityService fileUtilityService = (FileUtilityService)ServiceManager.GetService(typeof(FileUtilityService));
+ IProjectService projectService = (IProjectService)MonoDevelop.Core.Services.ServiceManager.GetService(typeof(IProjectService));
+ IParserService parserService = (IParserService)MonoDevelop.Core.Services.ServiceManager.GetService(typeof(IParserService));
/* using (AddWebReferenceDialog refDialog = new AddWebReferenceDialog(project)) {
if (refDialog.ShowDialog() == DialogResult.OK) {
Modified: trunk/MonoDevelop/src/Main/Base/Commands/ProjectBrowserCommands/ResourceFolderNodeCommands.cs
===================================================================
--- trunk/MonoDevelop/src/Main/Base/Commands/ProjectBrowserCommands/ResourceFolderNodeCommands.cs 2004-06-23 23:08:38 UTC (rev 1814)
+++ trunk/MonoDevelop/src/Main/Base/Commands/ProjectBrowserCommands/ResourceFolderNodeCommands.cs 2004-06-24 02:05:41 UTC (rev 1815)
@@ -57,14 +57,14 @@
foreach (string file in files) {
if (!System.IO.File.Exists (file)) {
- IMessageService messageService = (IMessageService) ServiceManager.Services.GetService (typeof (IMessageService));
+ IMessageService messageService = (IMessageService) ServiceManager.GetService (typeof (IMessageService));
messageService.ShowError (String.Format (GettextCatalog.GetString ("Resource file '{0}' does not exist"), file));
goto show_dialog;
}
}
- IProjectService projectService = (IProjectService)MonoDevelop.Core.Services.ServiceManager.Services.GetService(typeof(IProjectService));
- ResourceService resourceService = (ResourceService)ServiceManager.Services.GetService(typeof(IResourceService));
+ IProjectService projectService = (IProjectService)MonoDevelop.Core.Services.ServiceManager.GetService(typeof(IProjectService));
+ ResourceService resourceService = (ResourceService)ServiceManager.GetService(typeof(IResourceService));
foreach (string fileName in files) {
ProjectFile fileInformation = projectService.AddFileToProject(project, fileName, BuildAction.EmbedAsResource);
Modified: trunk/MonoDevelop/src/Main/Base/Commands/ProjectCommands.cs
===================================================================
--- trunk/MonoDevelop/src/Main/Base/Commands/ProjectCommands.cs 2004-06-23 23:08:38 UTC (rev 1814)
+++ trunk/MonoDevelop/src/Main/Base/Commands/ProjectCommands.cs 2004-06-24 02:05:41 UTC (rev 1815)
@@ -25,18 +25,18 @@
{
public override void Run()
{
- IProjectService projectService = (IProjectService)MonoDevelop.Core.Services.ServiceManager.Services.GetService(typeof(IProjectService));
+ IProjectService projectService = (IProjectService)MonoDevelop.Core.Services.ServiceManager.GetService(typeof(IProjectService));
if (projectService.CurrentSelectedProject != null) {
- LanguageBindingService languageBindingService = (LanguageBindingService)MonoDevelop.Core.Services.ServiceManager.Services.GetService(typeof(LanguageBindingService));
+ LanguageBindingService languageBindingService = (LanguageBindingService)MonoDevelop.Core.Services.ServiceManager.GetService(typeof(LanguageBindingService));
ILanguageBinding csc = languageBindingService.GetBindingPerLanguageName(projectService.CurrentSelectedProject.ProjectType);
string assembly = csc.GetCompiledOutputName(projectService.CurrentSelectedProject);
if (!File.Exists(assembly)) {
- IMessageService messageService =(IMessageService)ServiceManager.Services.GetService(typeof(IMessageService));
+ IMessageService messageService =(IMessageService)ServiceManager.GetService(typeof(IMessageService));
messageService.ShowError(GettextCatalog.GetString ("Assembly not Found (Compile the project first)"));
} else {
- FileUtilityService fileUtilityService = (FileUtilityService)ServiceManager.Services.GetService(typeof(FileUtilityService));
+ FileUtilityService fileUtilityService = (FileUtilityService)ServiceManager.GetService(typeof(FileUtilityService));
string command = fileUtilityService.SharpDevelopRootPath +
Path.DirectorySeparatorChar + "bin" +
Path.DirectorySeparatorChar + "nunit" +
@@ -52,7 +52,7 @@
{
public override void Run()
{
- IProjectService projectService = (IProjectService)MonoDevelop.Core.Services.ServiceManager.Services.GetService(typeof(IProjectService));
+ IProjectService projectService = (IProjectService)MonoDevelop.Core.Services.ServiceManager.GetService(typeof(IProjectService));
IProject selectedProject = projectService.CurrentSelectedProject;
if (selectedProject == null) {
return;
@@ -74,7 +74,7 @@
{
public override void Run()
{
- IProjectService projectService = (IProjectService)MonoDevelop.Core.Services.ServiceManager.Services.GetService(typeof(IProjectService));
+ IProjectService projectService = (IProjectService)MonoDevelop.Core.Services.ServiceManager.GetService(typeof(IProjectService));
foreach (IViewContent viewContent in WorkbenchSingleton.Workbench.ViewContentCollection) {
if (viewContent.IsDirty) {
viewContent.Save();
@@ -91,10 +91,10 @@
public override void Run()
{
try {
- IProjectService projectService = (IProjectService)MonoDevelop.Core.Services.ServiceManager.Services.GetService(typeof(IProjectService));
+ IProjectService projectService = (IProjectService)MonoDevelop.Core.Services.ServiceManager.GetService(typeof(IProjectService));
if (projectService.CurrentSelectedProject != null) {
- LanguageBindingService languageBindingService = (LanguageBindingService)MonoDevelop.Core.Services.ServiceManager.Services.GetService(typeof(LanguageBindingService));
+ LanguageBindingService languageBindingService = (LanguageBindingService)MonoDevelop.Core.Services.ServiceManager.GetService(typeof(LanguageBindingService));
ILanguageBinding csc = languageBindingService.GetBindingPerLanguageName(projectService.CurrentSelectedProject.ProjectType);
string assembly = csc.GetCompiledOutputName(projectService.CurrentSelectedProject);
@@ -163,7 +163,7 @@
sw.WriteLine(" </project>");
sw.Close();
}
- FileUtilityService fileUtilityService = (FileUtilityService)ServiceManager.Services.GetService(typeof(FileUtilityService));
+ FileUtilityService fileUtilityService = (FileUtilityService)ServiceManager.GetService(typeof(FileUtilityService));
string command = fileUtilityService.SharpDevelopRootPath +
Path.DirectorySeparatorChar + "bin" +
Path.DirectorySeparatorChar + "ndoc" +
Modified: trunk/MonoDevelop/src/Main/Base/Commands/RunCommands.cs
===================================================================
--- trunk/MonoDevelop/src/Main/Base/Commands/RunCommands.cs 2004-06-23 23:08:38 UTC (rev 1814)
+++ trunk/MonoDevelop/src/Main/Base/Commands/RunCommands.cs 2004-06-24 02:05:41 UTC (rev 1815)
@@ -40,12 +40,12 @@
public static void ShowAfterCompileStatus()
{
- TaskService taskService = (TaskService)MonoDevelop.Core.Services.ServiceManager.Services.GetService(typeof(TaskService));
- IStatusBarService statusBarService = (IStatusBarService)MonoDevelop.Core.Services.ServiceManager.Services.GetService(typeof(IStatusBarService));
+ TaskService taskService = (TaskService)MonoDevelop.Core.Services.ServiceManager.GetService(typeof(TaskService));
+ IStatusBarService statusBarService = (IStatusBarService)MonoDevelop.Core.Services.ServiceManager.GetService(typeof(IStatusBarService));
if (!taskService.SomethingWentWrong) {
statusBarService.SetMessage(GettextCatalog.GetString ("Successful"));
} else {
- StringParserService stringParserService = (StringParserService)ServiceManager.Services.GetService(typeof(StringParserService));
+ StringParserService stringParserService = (StringParserService)ServiceManager.GetService(typeof(StringParserService));
statusBarService.SetMessage(String.Format (GettextCatalog.GetString ("{0} errors, {1} warnings"), taskService.Errors.ToString (), taskService.Warnings.ToString ()));
}
}
@@ -56,22 +56,22 @@
CombineEntry.BuildProjects = 0;
CombineEntry.BuildErrors = 0;
- TaskService taskService = (TaskService)MonoDevelop.Core.Services.ServiceManager.Services.GetService(typeof(TaskService));
- IProjectService projectService = (IProjectService)MonoDevelop.Core.Services.ServiceManager.Services.GetService(typeof(IProjectService));
- ResourceService resourceService = (ResourceService)ServiceManager.Services.GetService(typeof(IResourceService));
- StringParserService stringParserService = (StringParserService)ServiceManager.Services.GetService(typeof(StringParserService));
+ TaskService taskService = (TaskService)MonoDevelop.Core.Services.ServiceManager.GetService(typeof(TaskService));
+ IProjectService projectService = (IProjectService)MonoDevelop.Core.Services.ServiceManager.GetService(typeof(IProjectService));
+ ResourceService resourceService = (ResourceService)ServiceManager.GetService(typeof(IResourceService));
+ StringParserService stringParserService = (StringParserService)ServiceManager.GetService(typeof(StringParserService));
try {
if (projectService.CurrentOpenCombine != null) {
projectService.CompileCombine();
ShowAfterCompileStatus();
} else {
if (WorkbenchSingleton.Workbench.ActiveWorkbenchWindow != null) {
- LanguageBindingService languageBindingService = (LanguageBindingService)MonoDevelop.Core.Services.ServiceManager.Services.GetService(typeof(LanguageBindingService));
+ LanguageBindingService languageBindingService = (LanguageBindingService)MonoDevelop.Core.Services.ServiceManager.GetService(typeof(LanguageBindingService));
ILanguageBinding binding = languageBindingService.GetBindingPerFileName(WorkbenchSingleton.Workbench.ActiveWorkbenchWindow.ViewContent.ContentName);
if (binding != null) {
if (binding == null || !binding.CanCompile(WorkbenchSingleton.Workbench.ActiveWorkbenchWindow.ViewContent.ContentName)) {
- IMessageService messageService =(IMessageService)ServiceManager.Services.GetService(typeof(IMessageService));
+ IMessageService messageService =(IMessageService)ServiceManager.GetService(typeof(IMessageService));
messageService.ShowError(String.Format (GettextCatalog.GetString ("Language binding {0} can't compile {1}"), binding.Language, WorkbenchSingleton.Workbench.ActiveWorkbenchWindow.ViewContent.ContentName));
} else {
new SaveFile().Run();
@@ -85,7 +85,7 @@
ShowAfterCompileStatus();
}
} else {
- IMessageService messageService =(IMessageService)ServiceManager.Services.GetService(typeof(IMessageService));
+ IMessageService messageService =(IMessageService)ServiceManager.GetService(typeof(IMessageService));
messageService.ShowError(GettextCatalog.GetString ("No source file for compilation found. Please save unsaved files"));
}
}
@@ -93,7 +93,7 @@
taskService.CompilerOutput += String.Format (GettextCatalog.GetString ("---------------------- Done ----------------------\n\nBuild: {0} succeeded, {1} failed\n"), CombineEntry.BuildProjects.ToString (), CombineEntry.BuildErrors.ToString ());
} catch (Exception e) {
Console.WriteLine (e);
- IMessageService messageService =(IMessageService)ServiceManager.Services.GetService(typeof(IMessageService));
+ IMessageService messageService =(IMessageService)ServiceManager.GetService(typeof(IMessageService));
messageService.ShowError(e, GettextCatalog.GetString ("Error while compiling"));
}
projectService.OnEndBuild();
@@ -108,8 +108,8 @@
public override void Run()
{
lock (CompileLockObject) {
- TaskService taskService = (TaskService)MonoDevelop.Core.Services.ServiceManager.Services.GetService(typeof(TaskService));
- IProjectService projectService = (IProjectService)MonoDevelop.Core.Services.ServiceManager.Services.GetService(typeof(IProjectService));
+ TaskService taskService = (TaskService)MonoDevelop.Core.Services.ServiceManager.GetService(typeof(TaskService));
+ IProjectService projectService = (IProjectService)MonoDevelop.Core.Services.ServiceManager.GetService(typeof(IProjectService));
if (projectService.CurrentOpenCombine != null) {
taskService.CompilerOutput = String.Empty;
@@ -130,10 +130,10 @@
lock (Compile.CompileLockObject) {
CombineEntry.BuildProjects = 0;
CombineEntry.BuildErrors = 0;
- TaskService taskService = (TaskService)MonoDevelop.Core.Services.ServiceManager.Services.GetService(typeof(TaskService));
- IProjectService projectService = (IProjectService)MonoDevelop.Core.Services.ServiceManager.Services.GetService(typeof(IProjectService));
- ResourceService resourceService = (ResourceService)ServiceManager.Services.GetService(typeof(IResourceService));
- StringParserService stringParserService = (StringParserService)ServiceManager.Services.GetService(typeof(StringParserService));
+ TaskService taskService = (TaskService)MonoDevelop.Core.Services.ServiceManager.GetService(typeof(TaskService));
+ IProjectService projectService = (IProjectService)MonoDevelop.Core.Services.ServiceManager.GetService(typeof(IProjectService));
+ ResourceService resourceService = (ResourceService)ServiceManager.GetService(typeof(IResourceService));
+ StringParserService stringParserService = (StringParserService)ServiceManager.GetService(typeof(StringParserService));
try {
if (projectService.CurrentOpenCombine != null) {
@@ -141,12 +141,12 @@
Compile.ShowAfterCompileStatus();
} else {
if (WorkbenchSingleton.Workbench.ActiveWorkbenchWindow != null) {
- LanguageBindingService languageBindingService = (LanguageBindingService)MonoDevelop.Core.Services.ServiceManager.Services.GetService(typeof(LanguageBindingService));
+ LanguageBindingService languageBindingService = (LanguageBindingService)MonoDevelop.Core.Services.ServiceManager.GetService(typeof(LanguageBindingService));
ILanguageBinding binding = languageBindingService.GetBindingPerFileName(WorkbenchSingleton.Workbench.ActiveWorkbenchWindow.ViewContent.ContentName);
if (binding != null) {
if (binding == null || !binding.CanCompile(WorkbenchSingleton.Workbench.ActiveWorkbenchWindow.ViewContent.ContentName)) {
- IMessageService messageService =(IMessageService)ServiceManager.Services.GetService(typeof(IMessageService));
+ IMessageService messageService =(IMessageService)ServiceManager.GetService(typeof(IMessageService));
messageService.ShowError(String.Format (GettextCatalog.GetString ("Language binding {0} can't compile {1}"), binding.Language, WorkbenchSingleton.Workbench.ActiveWorkbenchWindow.ViewContent.ContentName));
} else {
new SaveFile().Run();
@@ -160,7 +160,7 @@
Compile.ShowAfterCompileStatus();
}
} else {
- IMessageService messageService =(IMessageService)ServiceManager.Services.GetService(typeof(IMessageService));
+ IMessageService messageService =(IMessageService)ServiceManager.GetService(typeof(IMessageService));
messageService.ShowError(GettextCatalog.GetString ("No source file for compilation found. Please save unsaved files"));
}
}
@@ -168,7 +168,7 @@
taskService.CompilerOutput += String.Format (GettextCatalog.GetString ("---------------------- Done ----------------------\n\nBuild: {0} succeeded, {1} failed\n"), CombineEntry.BuildProjects.ToString(), CombineEntry.BuildErrors.ToString());
} catch (Exception e) {
Console.WriteLine (e);
- IMessageService messageService =(IMessageService)ServiceManager.Services.GetService(typeof(IMessageService));
+ IMessageService messageService =(IMessageService)ServiceManager.GetService(typeof(IMessageService));
messageService.ShowError(e, GettextCatalog.GetString ("Error while compiling"));
}
projectService.OnEndBuild();
@@ -178,8 +178,8 @@
public override void Run()
{
// if (Monitor.TryEnter(Compile.CompileLockObject)) {
- TaskService taskService = (TaskService)MonoDevelop.Core.Services.ServiceManager.Services.GetService(typeof(TaskService));
- IProjectService projectService = (IProjectService)MonoDevelop.Core.Services.ServiceManager.Services.GetService(typeof(IProjectService));
+ TaskService taskService = (TaskService)MonoDevelop.Core.Services.ServiceManager.GetService(typeof(TaskService));
+ IProjectService projectService = (IProjectService)MonoDevelop.Core.Services.ServiceManager.GetService(typeof(IProjectService));
if (projectService.CurrentOpenCombine != null) {
taskService.CompilerOutput = String.Empty;
@@ -200,9 +200,9 @@
bool RunThread()
{
lock (Compile.CompileLockObject) {
- TaskService taskService = (TaskService)MonoDevelop.Core.Services.ServiceManager.Services.GetService(typeof(TaskService));
- IProjectService projectService = (IProjectService)MonoDevelop.Core.Services.ServiceManager.Services.GetService(typeof(IProjectService));
- IStatusBarService statusBarService = (IStatusBarService)MonoDevelop.Core.Services.ServiceManager.Services.GetService(typeof(IStatusBarService));
+ TaskService taskService = (TaskService)MonoDevelop.Core.Services.ServiceManager.GetService(typeof(TaskService));
+ IProjectService projectService = (IProjectService)MonoDevelop.Core.Services.ServiceManager.GetService(typeof(IProjectService));
+ IStatusBarService statusBarService = (IStatusBarService)MonoDevelop.Core.Services.ServiceManager.GetService(typeof(IStatusBarService));
try {
statusBarService.SetMessage(GettextCatalog.GetString ("Executing"));
if (projectService.CurrentOpenCombine != null) {
@@ -216,27 +216,27 @@
}
} catch (NoStartupCombineDefinedException) {
- IMessageService messageService =(IMessageService)ServiceManager.Services.GetService(typeof(IMessageService));
+ IMessageService messageService =(IMessageService)ServiceManager.GetService(typeof(IMessageService));
messageService.ShowError(GettextCatalog.GetString ("Cannot execute Run command, cannot find startup project.\nPlease define a startup project for the combine in the combine properties."));
}
} else {
if (WorkbenchSingleton.Workbench.ActiveWorkbenchWindow != null) {
new Compile().RunWithWait();
if (taskService.Errors == 0) {
- LanguageBindingService languageBindingService = (LanguageBindingService)MonoDevelop.Core.Services.ServiceManager.Services.GetService(typeof(LanguageBindingService));
+ LanguageBindingService languageBindingService = (LanguageBindingService)MonoDevelop.Core.Services.ServiceManager.GetService(typeof(LanguageBindingService));
ILanguageBinding binding = languageBindingService.GetBindingPerFileName(WorkbenchSingleton.Workbench.ActiveWorkbenchWindow.ViewContent.ContentName);
if (binding != null) {
projectService.OnBeforeStartProject();
binding.Execute(WorkbenchSingleton.Workbench.ActiveWorkbenchWindow.ViewContent.ContentName);
} else {
- IMessageService messageService =(IMessageService)ServiceManager.Services.GetService(typeof(IMessageService));
+ IMessageService messageService =(IMessageService)ServiceManager.GetService(typeof(IMessageService));
messageService.ShowError(GettextCatalog.GetString ("No runnable executable found."));
}
}
}
}
} catch (Exception e) {
- IMessageService messageService =(IMessageService)ServiceManager.Services.GetService(typeof(IMessageService));
+ IMessageService messageService =(IMessageService)ServiceManager.GetService(typeof(IMessageService));
messageService.ShowError(e, GettextCatalog.GetString ("Error while running"));
}
statusBarService.SetMessage(GettextCatalog.GetString ("Ready"));
@@ -246,7 +246,7 @@
public override void Run()
{
- IProjectService projectService = (IProjectService)MonoDevelop.Core.Services.ServiceManager.Services.GetService(typeof(IProjectService));
+ IProjectService projectService = (IProjectService)MonoDevelop.Core.Services.ServiceManager.GetService(typeof(IProjectService));
if (projectService.CurrentOpenCombine != null) {
RunThread(); // TODO FIXME PEDRO
@@ -262,14 +262,14 @@
public override void Run()
{
lock (Compile.CompileLockObject) {
- TaskService taskService = (TaskService)MonoDevelop.Core.Services.ServiceManager.Services.GetService(typeof(TaskService));
- IProjectService projectService = (IProjectService)MonoDevelop.Core.Services.ServiceManager.Services.GetService(typeof(IProjectService));
- ResourceService resourceService = (ResourceService)ServiceManager.Services.GetService(typeof(IResourceService));
- IStatusBarService statusBarService = (IStatusBarService)MonoDevelop.Core.Services.ServiceManager.Services.GetService(typeof(IStatusBarService));
+ TaskService taskService = (TaskService)MonoDevelop.Core.Services.ServiceManager.GetService(typeof(TaskService));
+ IProjectService projectService = (IProjectService)MonoDevelop.Core.Services.ServiceManager.GetService(typeof(IProjectService));
+ ResourceService resourceService = (ResourceService)ServiceManager.GetService(typeof(IResourceService));
+ IStatusBarService statusBarService = (IStatusBarService)MonoDevelop.Core.Services.ServiceManager.GetService(typeof(IStatusBarService));
if (projectService.CurrentSelectedProject != null) {
try {
- StringParserService stringParserService = (StringParserService)ServiceManager.Services.GetService(typeof(StringParserService));
+ StringParserService stringParserService = (StringParserService)ServiceManager.GetService(typeof(StringParserService));
CombineEntry.BuildProjects = 0;
CombineEntry.BuildErrors = 0;
@@ -281,7 +281,7 @@
projectService.CompileProject(projectService.CurrentSelectedProject);
taskService.CompilerOutput += String.Format (GettextCatalog.GetString ("---------------------- Done ----------------------\n\nBuild: {0} succeeded, {1} failed\n"), CombineEntry.BuildProjects.ToString(), CombineEntry.BuildErrors.ToString());
} catch (Exception e) {
- IMessageService messageService =(IMessageService)ServiceManager.Services.GetService(typeof(IMessageService));
+ IMessageService messageService =(IMessageService)ServiceManager.GetService(typeof(IMessageService));
messageService.ShowError(e, String.Format (GettextCatalog.GetString ("Error while compiling project {0}"), projectService.CurrentSelectedProject.Name));
}
projectService.OnEndBuild();
@@ -296,14 +296,14 @@
public override void Run()
{
lock (Compile.CompileLockObject) {
- TaskService taskService = (TaskService)MonoDevelop.Core.Services.ServiceManager.Services.GetService(typeof(TaskService));
- IProjectService projectService = (IProjectService)MonoDevelop.Core.Services.ServiceManager.Services.GetService(typeof(IProjectService));
- ResourceService resourceService = (ResourceService)ServiceManager.Services.GetService(typeof(IResourceService));
- IStatusBarService statusBarService = (IStatusBarService)MonoDevelop.Core.Services.ServiceManager.Services.GetService(typeof(IStatusBarService));
+ TaskService taskService = (TaskService)MonoDevelop.Core.Services.ServiceManager.GetService(typeof(TaskService));
+ IProjectService projectService = (IProjectService)MonoDevelop.Core.Services.ServiceManager.GetService(typeof(IProjectService));
+ ResourceService resourceService = (ResourceService)ServiceManager.GetService(typeof(IResourceService));
+ IStatusBarService statusBarService = (IStatusBarService)MonoDevelop.Core.Services.ServiceManager.GetService(typeof(IStatusBarService));
if (projectService.CurrentSelectedProject != null) {
try {
- StringParserService stringParserService = (StringParserService)ServiceManager.Services.GetService(typeof(StringParserService));
+ StringParserService stringParserService = (StringParserService)ServiceManager.GetService(typeof(StringParserService));
CombineEntry.BuildProjects = 0;
CombineEntry.BuildErrors = 0;
@@ -315,7 +315,7 @@
projectService.RecompileProject(projectService.CurrentSelectedProject);
taskService.CompilerOutput += String.Format (GettextCatalog.GetString ("---------------------- Done ----------------------\n\nBuild: {0} succeeded, {1} failed\n"), CombineEntry.BuildProjects.ToString(), CombineEntry.BuildErrors.ToString());
} catch (Exception e) {
- IMessageService messageService =(IMessageService)ServiceManager.Services.GetService(typeof(IMessageService));
+ IMessageService messageService =(IMessageService)ServiceManager.GetService(typeof(IMessageService));
messageService.ShowError(e, String.Format (GettextCatalog.GetString ("Error while compiling project {0}"), projectService.CurrentSelectedProject.Name));
}
projectService.OnEndBuild();
@@ -329,7 +329,7 @@
public override void Run ()
{
- IProjectService projectservice = (IProjectService)ServiceManager.Services.GetService (typeof (IProjectService));
+ IProjectService projectservice = (IProjectService)ServiceManager.GetService (typeof (IProjectService));
if (projectservice.CurrentOpenCombine != null) {
projectservice.GenerateMakefiles ();
}
Modified: trunk/MonoDevelop/src/Main/Base/Commands/ToolsCommands.cs
===================================================================
--- trunk/MonoDevelop/src/Main/Base/Commands/ToolsCommands.cs 2004-06-23 23:08:38 UTC (rev 1814)
+++ trunk/MonoDevelop/src/Main/Base/Commands/ToolsCommands.cs 2004-06-24 02:05:41 UTC (rev 1815)
@@ -23,7 +23,7 @@
{
public override void Run()
{
- PropertyService propertyService = (PropertyService)ServiceManager.Services.GetService(typeof(PropertyService));
+ PropertyService propertyService = (PropertyService)ServiceManager.GetService(typeof(PropertyService));
TreeViewOptions optionsDialog = new TreeViewOptions((IProperties)propertyService.GetProperty("MonoDevelop.TextEditor.Document.Document.DefaultDocumentAggregatorProperties", new DefaultProperties()),
AddInTreeSingleton.AddInTree.GetTreeNode("/SharpDevelop/Dialogs/OptionsDialog"));
//optionsDialog.ShowAll ();
Modified: trunk/MonoDevelop/src/Main/Base/Commands/VBConverter/ConvertBuffer.cs
===================================================================
--- trunk/MonoDevelop/src/Main/Base/Commands/VBConverter/ConvertBuffer.cs 2004-06-23 23:08:38 UTC (rev 1814)
+++ trunk/MonoDevelop/src/Main/Base/Commands/VBConverter/ConvertBuffer.cs 2004-06-24 02:05:41 UTC (rev 1815)
@@ -43,14 +43,14 @@
p.Parse(new Lexer(new ICSharpCode.SharpRefactory.Parser.StringReader(((IEditable)window.ViewContent).Text)));
if (p.Errors.count > 0) {
- IMessageService messageService =(IMessageService)ServiceManager.Services.GetService(typeof(IMessageService));
+ IMessageService messageService =(IMessageService)ServiceManager.GetService(typeof(IMessageService));
messageService.ShowError("Correct source code errors first (only compileable C# source code would convert).");
return;
}
VBNetVisitor vbv = new VBNetVisitor();
vbv.Visit(p.compilationUnit, null);
- IFileService fileService = (IFileService)MonoDevelop.Core.Services.ServiceManager.Services.GetService(typeof(IFileService));
+ IFileService fileService = (IFileService)MonoDevelop.Core.Services.ServiceManager.GetService(typeof(IFileService));
Console.WriteLine(vbv.SourceText.ToString());
fileService.NewFile("Generated.VB", "VBNET", vbv.SourceText.ToString());
}
Modified: trunk/MonoDevelop/src/Main/Base/Commands/VBConverter/ConvertProject.cs
===================================================================
--- trunk/MonoDevelop/src/Main/Base/Commands/VBConverter/ConvertProject.cs 2004-06-23 23:08:38 UTC (rev 1814)
+++ trunk/MonoDevelop/src/Main/Base/Commands/VBConverter/ConvertProject.cs 2004-06-24 02:05:41 UTC (rev 1815)
@@ -52,7 +52,7 @@
public override void Run()
{
- IProjectService projectService = (IProjectService)MonoDevelop.Core.Services.ServiceManager.Services.GetService(typeof(IProjectService));
+ IProjectService projectService = (IProjectService)MonoDevelop.Core.Services.ServiceManager.GetService(typeof(IProjectService));
if (projectService.CurrentSelectedProject != null) {
foreach (ProjectFile file in projectService.CurrentSelectedProject.ProjectFiles) {
Modified: trunk/MonoDevelop/src/Main/Base/Gui/BrowserDisplayBinding/HtmlViewPane.cs
===================================================================
--- trunk/MonoDevelop/src/Main/Base/Gui/BrowserDisplayBinding/HtmlViewPane.cs 2004-06-23 23:08:38 UTC (rev 1814)
+++ trunk/MonoDevelop/src/Main/Base/Gui/BrowserDisplayBinding/HtmlViewPane.cs 2004-06-24 02:05:41 UTC (rev 1815)
@@ -135,7 +135,7 @@
public class HtmlViewPane : Gtk.Frame
{
MozillaControl htmlControl = null;
- IStatusBarService statusbarService = (IStatusBarService) ServiceManager.Services.GetService (typeof (IStatusBarService));
+ IStatusBarService statusbarService = (IStatusBarService) ServiceManager.GetService (typeof (IStatusBarService));
SdStatusBar status;
VBox topPanel = new VBox (false, 2);
Modified: trunk/MonoDevelop/src/Main/Base/Gui/Components/LocalizedPropertyGrid/LocalizedPropertyDescriptor.cs
===================================================================
--- trunk/MonoDevelop/src/Main/Base/Gui/Components/LocalizedPropertyGrid/LocalizedPropertyDescriptor.cs 2004-06-23 23:08:38 UTC (rev 1814)
+++ trunk/MonoDevelop/src/Main/Base/Gui/Components/LocalizedPropertyGrid/LocalizedPropertyDescriptor.cs 2004-06-24 02:05:41 UTC (rev 1815)
@@ -14,7 +14,7 @@
/// </summary>
public class LocalizedPropertyDescriptor : PropertyDescriptor
{
- static StringParserService stringParserService = (StringParserService)ServiceManager.Services.GetService(typeof(StringParserService));
+ static StringParserService stringParserService = (StringParserService)ServiceManager.GetService(typeof(StringParserService));
PropertyDescriptor basePropertyDescriptor;
Modified: trunk/MonoDevelop/src/Main/Base/Gui/Components/SdMenu.cs
===================================================================
--- trunk/MonoDevelop/src/Main/Base/Gui/Components/SdMenu.cs 2004-06-23 23:08:38 UTC (rev 1814)
+++ trunk/MonoDevelop/src/Main/Base/Gui/Components/SdMenu.cs 2004-06-24 02:05:41 UTC (rev 1815)
@@ -27,7 +27,7 @@
public class SdMenu : Gtk.ImageMenuItem, IStatusUpdate
{
- static StringParserService stringParserService = (StringParserService)ServiceManager.Services.GetService(typeof(StringParserService));
+ static StringParserService stringParserService = (StringParserService)ServiceManager.GetService(typeof(StringParserService));
ConditionCollection conditionCollection;
object caller;
@@ -42,7 +42,7 @@
this.subMenu = new Gtk.Menu ();
this.Submenu = subMenu;
- ResourceService resourceService = (ResourceService)ServiceManager.Services.GetService (typeof (IResourceService));
+ ResourceService resourceService = (ResourceService)ServiceManager.GetService (typeof (IResourceService));
if (text.StartsWith("${")) {
Modified: trunk/MonoDevelop/src/Main/Base/Gui/Components/SdMenuCheckBox.cs
===================================================================
--- trunk/MonoDevelop/src/Main/Base/Gui/Components/SdMenuCheckBox.cs 2004-06-23 23:08:38 UTC (rev 1814)
+++ trunk/MonoDevelop/src/Main/Base/Gui/Components/SdMenuCheckBox.cs 2004-06-24 02:05:41 UTC (rev 1815)
@@ -18,7 +18,7 @@
{
public class SdMenuCheckBox : Gtk.CheckMenuItem, IStatusUpdate
{
- static StringParserService stringParserService = (StringParserService)ServiceManager.Services.GetService(typeof(StringParserService));
+ static StringParserService stringParserService = (StringParserService)ServiceManager.GetService(typeof(StringParserService));
object caller;
ConditionCollection conditionCollection;
Modified: trunk/MonoDevelop/src/Main/Base/Gui/Components/SdMenuCommand.cs
===================================================================
--- trunk/MonoDevelop/src/Main/Base/Gui/Components/SdMenuCommand.cs 2004-06-23 23:08:38 UTC (rev 1814)
+++ trunk/MonoDevelop/src/Main/Base/Gui/Components/SdMenuCommand.cs 2004-06-24 02:05:41 UTC (rev 1815)
@@ -20,7 +20,7 @@
{
public class SdMenuCommand : Gtk.ImageMenuItem, IStatusUpdate
{
- static StringParserService stringParserService = (StringParserService)ServiceManager.Services.GetService(typeof(StringParserService));
+ static StringParserService stringParserService = (StringParserService)ServiceManager.GetService(typeof(StringParserService));
object caller;
ConditionCollection conditionCollection;
Modified: trunk/MonoDevelop/src/Main/Base/Gui/Components/SdToolbarCommand.cs
===================================================================
--- trunk/MonoDevelop/src/Main/Base/Gui/Components/SdToolbarCommand.cs 2004-06-23 23:08:38 UTC (rev 1814)
+++ trunk/MonoDevelop/src/Main/Base/Gui/Components/SdToolbarCommand.cs 2004-06-24 02:05:41 UTC (rev 1815)
@@ -20,7 +20,7 @@
{
public class SdToolbarCommand : Gtk.Button, IStatusUpdate
{
- static StringParserService stringParserService = (StringParserService)ServiceManager.Services.GetService(typeof(StringParserService));
+ static StringParserService stringParserService = (StringParserService)ServiceManager.GetService(typeof(StringParserService));
object caller;
ConditionCollection conditionCollection;
@@ -55,7 +55,7 @@
public SdToolbarCommand (string text) : base ()
{
- ResourceService resourceService = (ResourceService)ServiceManager.Services.GetService (typeof(IResourceService));
+ ResourceService resourceService = (ResourceService)ServiceManager.GetService (typeof(IResourceService));
if (text.StartsWith ("${")) {
localizedText = resourceService.GetString (text);
Modified: trunk/MonoDevelop/src/Main/Base/Gui/Components/SideBar/SharpDevelopSideTabItem.cs
===================================================================
--- trunk/MonoDevelop/src/Main/Base/Gui/Components/SideBar/SharpDevelopSideTabItem.cs 2004-06-23 23:08:38 UTC (rev 1814)
+++ trunk/MonoDevelop/src/Main/Base/Gui/Components/SideBar/SharpDevelopSideTabItem.cs 2004-06-24 02:05:41 UTC (rev 1815)
@@ -19,7 +19,7 @@
{
public class SharpDevelopSideTabItem : AxSideTabItem
{
- ResourceService resourceService = (ResourceService)ServiceManager.Services.GetService(typeof(IResourceService));
+ ResourceService resourceService = (ResourceService)ServiceManager.GetService(typeof(IResourceService));
public SharpDevelopSideTabItem(string name) : base(name)
{
Modified: trunk/MonoDevelop/src/Main/Base/Gui/Dialogs/CombineConfiguration/CombineBuildOptions.cs
===================================================================
--- trunk/MonoDevelop/src/Main/Base/Gui/Dialogs/CombineConfiguration/CombineBuildOptions.cs 2004-06-23 23:08:38 UTC (rev 1814)
+++ trunk/MonoDevelop/src/Main/Base/Gui/Dialogs/CombineConfiguration/CombineBuildOptions.cs 2004-06-24 02:05:41 UTC (rev 1815)
@@ -30,13 +30,13 @@
[Glade.WidgetAttribute] Button OutputDirBrowse;
// Services
- StringParserService StringParserService = (StringParserService)ServiceManager.Services.GetService (
+ StringParserService StringParserService = (StringParserService)ServiceManager.GetService (
typeof (StringParserService));
- static ResourceService resourceService = (ResourceService)ServiceManager.Services.GetService(
+ static ResourceService resourceService = (ResourceService)ServiceManager.GetService(
typeof(IResourceService));
- static PropertyService propertyService = (PropertyService)ServiceManager.Services.GetService(
+ static PropertyService propertyService = (PropertyService)ServiceManager.GetService(
typeof(PropertyService));
- FileUtilityService fileUtilityService = (FileUtilityService)ServiceManager.Services.GetService (typeof (FileUtilityService));
+ FileUtilityService fileUtilityService = (FileUtilityService)ServiceManager.GetService (typeof (FileUtilityService));
Combine combine;
Modified: trunk/MonoDevelop/src/Main/Base/Gui/Dialogs/CombineConfiguration/CombineStartupPanel.cs
===================================================================
--- trunk/MonoDevelop/src/Main/Base/Gui/Dialogs/CombineConfiguration/CombineStartupPanel.cs 2004-06-23 23:08:38 UTC (rev 1814)
+++ trunk/MonoDevelop/src/Main/Base/Gui/Dialogs/CombineConfiguration/CombineStartupPanel.cs 2004-06-24 02:05:41 UTC (rev 1815)
@@ -38,11 +38,11 @@
public ListStore store;
// Services
- StringParserService StringParserService = (StringParserService)ServiceManager.Services.GetService (
+ StringParserService StringParserService = (StringParserService)ServiceManager.GetService (
typeof (StringParserService));
- static ResourceService resourceService = (ResourceService)ServiceManager.Services.GetService(
+ static ResourceService resourceService = (ResourceService)ServiceManager.GetService(
typeof(IResourceService));
- static PropertyService propertyService = (PropertyService)ServiceManager.Services.GetService(
+ static PropertyService propertyService = (PropertyService)ServiceManager.GetService(
typeof(PropertyService));
Combine combine;
@@ -120,7 +120,7 @@
}
// tell the user we encountered and worked around an issue
- IMessageService messageService =(IMessageService)ServiceManager.Services.GetService(typeof(IMessageService));
+ IMessageService messageService =(IMessageService)ServiceManager.GetService(typeof(IMessageService));
// FIXME: il8n this
messageService.ShowError(
"The Combine Execute Definitions for this Combine were invalid. A new empty set of Execute Definitions has been created.");
Modified: trunk/MonoDevelop/src/Main/Base/Gui/Dialogs/CommonAboutDialog.cs
===================================================================
--- trunk/MonoDevelop/src/Main/Base/Gui/Dialogs/CommonAboutDialog.cs 2004-06-23 23:08:38 UTC (rev 1814)
+++ trunk/MonoDevelop/src/Main/Base/Gui/Dialogs/CommonAboutDialog.cs 2004-06-24 02:05:41 UTC (rev 1815)
@@ -51,7 +51,7 @@
this.Realized += new EventHandler (OnRealized);
this.ExposeEvent += new ExposeEventHandler (OnExposed);
- ResourceService resourceService = (ResourceService)ServiceManager.Services.GetService(typeof(IResourceService));
+ ResourceService resourceService = (ResourceService)ServiceManager.GetService(typeof(IResourceService));
image = resourceService.GetBitmap ("Icons.AboutImage");
string trans = GettextCatalog.GetString ("translator-credits");
@@ -119,7 +119,7 @@
public class CommonAboutDialog : Dialog
{
static GLib.GType gtype;
- static FileUtilityService fileUtilityService = (FileUtilityService)ServiceManager.Services.GetService(typeof(FileUtilityService));
+ static FileUtilityService fileUtilityService = (FileUtilityService)ServiceManager.GetService(typeof(FileUtilityService));
AuthorAboutTabPage aatp;
//ChangeLogTabPage changelog;
Modified: trunk/MonoDevelop/src/Main/Base/Gui/Dialogs/NewFileDialog.cs
===================================================================
--- trunk/MonoDevelop/src/Main/Base/Gui/Dialogs/NewFileDialog.cs 2004-06-23 23:08:38 UTC (rev 1814)
+++ trunk/MonoDevelop/src/Main/Base/Gui/Dialogs/NewFileDialog.cs 2004-06-24 02:05:41 UTC (rev 1815)
@@ -43,8 +43,8 @@
Button cancelButton;
Label infoLabel;
- ResourceService iconService = (ResourceService)ServiceManager.Services.GetService (typeof(IResourceService));
- DispatchService dispatcher = (DispatchService)ServiceManager.Services.GetService (typeof (DispatchService));
+ ResourceService iconService = (ResourceService)ServiceManager.GetService (typeof(IResourceService));
+ DispatchService dispatcher = (DispatchService)ServiceManager.GetService (typeof (DispatchService));
public NewFileDialog () : base ()
{
@@ -164,7 +164,7 @@
if (item != null)
{
- ResourceService resourceService = (ResourceService)ServiceManager.Services.GetService (typeof (IResourceService));
+ ResourceService resourceService = (ResourceService)ServiceManager.GetService (typeof (IResourceService));
if (item.Description.StartsWith("${")) {
infoLabel.Text = resourceService.GetString (item.Description);
} else {
@@ -188,7 +188,7 @@
public void SaveFile(string filename, string content, string languageName, bool showFile)
{
- IFileService fileService = (IFileService)MonoDevelop.Core.Services.ServiceManager.Services.GetService(typeof(IFileService));
+ IFileService fileService = (IFileService)MonoDevelop.Core.Services.ServiceManager.GetService(typeof(IFileService));
fileService.NewFile(filename, languageName, content);
}
@@ -271,7 +271,7 @@
public TemplateItem(FileTemplate template)
{
this.template = template;
- StringParserService sps = (StringParserService)ServiceManager.Services.GetService (typeof(StringParserService));
+ StringParserService sps = (StringParserService)ServiceManager.GetService (typeof(StringParserService));
this.name = sps.Parse(template.Name);
}
Modified: trunk/MonoDevelop/src/Main/Base/Gui/Dialogs/NewProjectDialog.cs
===================================================================
--- trunk/MonoDevelop/src/Main/Base/Gui/Dialogs/NewProjectDialog.cs 2004-06-23 23:08:38 UTC (rev 1814)
+++ trunk/MonoDevelop/src/Main/Base/Gui/Dialogs/NewProjectDialog.cs 2004-06-24 02:05:41 UTC (rev 1815)
@@ -49,11 +49,11 @@
[Glade.Widget] Gtk.TreeView lst_template_types;
[Glade.Widget] HBox hbox_template, hbox_for_browser;
- ResourceService resourceService = (ResourceService)ServiceManager.Services.GetService(typeof(IResourceService));
- FileUtilityService fileUtilityService = (FileUtilityService)ServiceManager.Services.GetService(typeof(FileUtilityService));
- StringParserService stringParserService = (StringParserService)ServiceManager.Services.GetService(typeof(StringParserService));
- PropertyService propertyService = (PropertyService)ServiceManager.Services.GetService(typeof(PropertyService));
- MessageService messageService = (MessageService)ServiceManager.Services.GetService(typeof(MessageService));
+ ResourceService resourceService = (ResourceService)ServiceManager.GetService(typeof(IResourceService));
+ FileUtilityService fileUtilityService = (FileUtilityService)ServiceManager.GetService(typeof(FileUtilityService));
+ StringParserService stringParserService = (StringParserService)ServiceManager.GetService(typeof(StringParserService));
+ PropertyService propertyService = (PropertyService)ServiceManager.GetService(typeof(PropertyService));
+ MessageService messageService = (MessageService)ServiceManager.GetService(typeof(MessageService));
bool openCombine;
public NewProjectDialog (bool openCombine)
@@ -178,7 +178,7 @@
if (showFile) {
string longfilename = fileUtilityService.GetDirectoryNameWithSeparator (ProjectSolution) + stringParserService.Parse(filename, new string[,] { {"PROJECT", txt_name.Text}});
- IFileService fileService = (IFileService) MonoDevelop.Core.Services.ServiceManager.Services.GetService(typeof(IFileService));
+ IFileService fileService = (IFileService) MonoDevelop.Core.Services.ServiceManager.GetService(typeof(IFileService));
fileService.OpenFile (longfilename);
}
}
@@ -188,18 +188,18 @@
void OpenEvent(object sender, EventArgs e)
{
- PropertyService propertyService = (PropertyService)ServiceManager.Services.GetService(typeof(PropertyService));
+ PropertyService propertyService = (PropertyService)ServiceManager.GetService(typeof(PropertyService));
if (TemplateView.CurrentlySelected != null) {
propertyService.SetProperty("Dialogs.NewProjectDialog.LastSelectedCategory", ((ProjectTemplate)TemplateView.CurrentlySelected).Name);
//propertyService.SetProperty("Dialogs.NewProjectDialog.LargeImages", ((RadioButton)ControlDictionary["largeIconsRadioButton"]).Checked);
}
- FileUtilityService fileUtilityService = (FileUtilityService)ServiceManager.Services.GetService(typeof(FileUtilityService));
+ FileUtilityService fileUtilityService = (FileUtilityService)ServiceManager.GetService(typeof(FileUtilityService));
string solution = txt_subdirectory.Text;
string name = txt_name.Text;
string location = entry_location.Path;
- IProjectService projService = (IProjectService)ServiceManager.Services.GetService(typeof(IProjectService));
+ IProjectService projService = (IProjectService)ServiceManager.GetService(typeof(IProjectService));
if(solution.Equals("")) solution = name; //This was empty when adding after first combine
@@ -408,7 +408,7 @@
public TemplateItem(ProjectTemplate template)
{
- name = ((StringParserService)ServiceManager.Services.GetService(typeof(StringParserService))).Parse(template.Name);
+ name = ((StringParserService)ServiceManager.GetService(typeof(StringParserService))).Parse(template.Name);
this.template = template;
}
Modified: trunk/MonoDevelop/src/Main/Base/Gui/Dialogs/OptionPanels/EditTemplateDialog.cs
===================================================================
--- trunk/MonoDevelop/src/Main/Base/Gui/Dialogs/OptionPanels/EditTemplateDialog.cs 2004-06-23 23:08:38 UTC (rev 1814)
+++ trunk/MonoDevelop/src/Main/Base/Gui/Dialogs/OptionPanels/EditTemplateDialog.cs 2004-06-24 02:05:41 UTC (rev 1815)
@@ -23,7 +23,7 @@
Gtk.Entry descriptionTextBox;
// Services
- StringParserService StringParserService = (StringParserService)ServiceManager.Services.GetService (typeof (StringParserService));
+ StringParserService StringParserService = (StringParserService)ServiceManager.GetService (typeof (StringParserService));
public CodeTemplate CodeTemplate {
get {
Modified: trunk/MonoDevelop/src/Main/Base/Gui/Dialogs/OptionPanels/ExternalToolPanel.cs
===================================================================
--- trunk/MonoDevelop/src/Main/Base/Gui/Dialogs/OptionPanels/ExternalToolPanel.cs 2004-06-23 23:08:38 UTC (rev 1814)
+++ trunk/MonoDevelop/src/Main/Base/Gui/Dialogs/OptionPanels/ExternalToolPanel.cs 2004-06-24 02:05:41 UTC (rev 1815)
@@ -77,15 +77,15 @@
};
// Services
- FileUtilityService FileUtilityService = (FileUtilityService) ServiceManager.Services.GetService(
+ FileUtilityService FileUtilityService = (FileUtilityService) ServiceManager.GetService(
typeof (FileUtilityService));
- StringParserService StringParserService = (StringParserService) ServiceManager.Services.GetService (
+ StringParserService StringParserService = (StringParserService) ServiceManager.GetService (
typeof (StringParserService));
- PropertyService PropertyService = (PropertyService) ServiceManager.Services.GetService(
+ PropertyService PropertyService = (PropertyService) ServiceManager.GetService(
typeof (PropertyService));
- MessageService MessageService = (MessageService) ServiceManager.Services.GetService(
+ MessageService MessageService = (MessageService) ServiceManager.GetService(
typeof (MessageService));
- MenuService MenuService = (MenuService) ServiceManager.Services.GetService(
+ MenuService MenuService = (MenuService) ServiceManager.GetService(
typeof (MenuService));
// gtk controls
Modified: trunk/MonoDevelop/src/Main/Base/Gui/Dialogs/OptionPanels/IDEOptions/BuildPanel.cs
===================================================================
--- trunk/MonoDevelop/src/Main/Base/Gui/Dialogs/OptionPanels/IDEOptions/BuildPanel.cs 2004-06-23 23:08:38 UTC (rev 1814)
+++ trunk/MonoDevelop/src/Main/Base/Gui/Dialogs/OptionPanels/IDEOptions/BuildPanel.cs 2004-06-24 02:05:41 UTC (rev 1815)
@@ -18,7 +18,6 @@
using MonoDevelop.Core.AddIns;
using MonoDevelop.Services;
-//using System.Windows.Forms;
using Gtk;
using MonoDevelop.Gui.Widgets;
@@ -28,7 +27,7 @@
{
// service instances needed
- PropertyService PropertyService = (PropertyService)ServiceManager.Services.GetService (typeof (PropertyService));
+ PropertyService PropertyService = (PropertyService)ServiceManager.GetService (typeof (PropertyService));
BuildPanelWidget widget;
const string projectAndCombineProperty = "SharpDevelop.UI.ProjectAndCombineOptions";
@@ -58,9 +57,9 @@
[Glade.Widget] public Gtk.Label buildAndRunOptionsLabel;
// service instances needed
- StringParserService StringParserService = (StringParserService)ServiceManager.Services.GetService (
+ StringParserService StringParserService = (StringParserService)ServiceManager.GetService (
typeof (StringParserService));
- PropertyService PropertyService = (PropertyService)ServiceManager.Services.GetService (
+ PropertyService PropertyService = (PropertyService)ServiceManager.GetService (
typeof (PropertyService));
public BuildPanelWidget () : base ("Base.glade", "BuildPanel")
Modified: trunk/MonoDevelop/src/Main/Base/Gui/Dialogs/OptionPanels/IDEOptions/CodeGenerationPanel.cs
===================================================================
--- trunk/MonoDevelop/src/Main/Base/Gui/Dialogs/OptionPanels/IDEOptions/CodeGenerationPanel.cs 2004-06-23 23:08:38 UTC (rev 1814)
+++ trunk/MonoDevelop/src/Main/Base/Gui/Dialogs/OptionPanels/IDEOptions/CodeGenerationPanel.cs 2004-06-24 02:05:41 UTC (rev 1815)
@@ -24,8 +24,8 @@
public class CodeGenerationPanel : AbstractOptionPanel {
class CodeGenerationPanelWidget : GladeWidgetExtract {
- PropertyService p = (PropertyService)ServiceManager.Services.GetService (typeof (PropertyService));
- StringParserService StringParserService = (StringParserService)ServiceManager.Services.GetService (typeof (StringParserService));
+ PropertyService p = (PropertyService)ServiceManager.GetService (typeof (PropertyService));
+ StringParserService StringParserService = (StringParserService)ServiceManager.GetService (typeof (StringParserService));
[Glade.Widget] Label hdr_code_generation_options;
@@ -73,7 +73,7 @@
CodeGenerationPanelWidget widget;
- PropertyService PropertyService = (PropertyService)ServiceManager.Services.GetService (typeof (PropertyService));
+ PropertyService PropertyService = (PropertyService)ServiceManager.GetService (typeof (PropertyService));
const string codeGenerationProperty = "SharpDevelop.UI.CodeGenerationOptions";
public override void LoadPanelContents ()
Modified: trunk/MonoDevelop/src/Main/Base/Gui/Dialogs/OptionPanels/IDEOptions/LoadSavePanel.cs
===================================================================
--- trunk/MonoDevelop/src/Main/Base/Gui/Dialogs/OptionPanels/IDEOptions/LoadSavePanel.cs 2004-06-23 23:08:38 UTC (rev 1814)
+++ trunk/MonoDevelop/src/Main/Base/Gui/Dialogs/OptionPanels/IDEOptions/LoadSavePanel.cs 2004-06-24 02:05:41 UTC (rev 1815)
@@ -58,13 +58,13 @@
[Glade.Widget] public Gtk.Label locationLabel;
// services needed
- StringParserService StringParserService = (StringParserService)ServiceManager.Services.GetService (
+ StringParserService StringParserService = (StringParserService)ServiceManager.GetService (
typeof (StringParserService));
- PropertyService PropertyService = (PropertyService)ServiceManager.Services.GetService (
+ PropertyService PropertyService = (PropertyService)ServiceManager.GetService (
typeof (PropertyService));
- FileUtilityService FileUtilityService = (FileUtilityService)ServiceManager.Services.GetService (
+ FileUtilityService FileUtilityService = (FileUtilityService)ServiceManager.GetService (
typeof (FileUtilityService));
- MessageService MessageService = (MessageService)ServiceManager.Services.GetService (
+ MessageService MessageService = (MessageService)ServiceManager.GetService (
typeof (MessageService));
public enum LineTerminatorStyle {
Modified: trunk/MonoDevelop/src/Main/Base/Gui/Dialogs/OptionPanels/IDEOptions/SelectCulturePanel.cs
===================================================================
--- trunk/MonoDevelop/src/Main/Base/Gui/Dialogs/OptionPanels/IDEOptions/SelectCulturePanel.cs 2004-06-23 23:08:38 UTC (rev 1814)
+++ trunk/MonoDevelop/src/Main/Base/Gui/Dialogs/OptionPanels/IDEOptions/SelectCulturePanel.cs 2004-06-24 02:05:41 UTC (rev 1815)
@@ -27,8 +27,8 @@
Gtk.Label culture;
Gtk.Label descr;
- ResourceService resourceService = (ResourceService)ServiceManager.Services.GetService(typeof(IResourceService));
- PropertyService propertyService = (PropertyService)ServiceManager.Services.GetService(typeof(PropertyService));
+ ResourceService resourceService = (ResourceService)ServiceManager.GetService(typeof(IResourceService));
+ PropertyService propertyService = (PropertyService)ServiceManager.GetService(typeof(PropertyService));
string SelectedCulture {
get {
@@ -69,7 +69,7 @@
string GetCulture(string languageCode)
{
- LanguageService languageService = (LanguageService)ServiceManager.Services.GetService(typeof(LanguageService));
+ LanguageService languageService = (LanguageService)ServiceManager.GetService(typeof(LanguageService));
foreach (Language language in languageService.Languages) {
if (languageCode.StartsWith(language.Code)) {
return language.Name;
@@ -80,7 +80,7 @@
public IDEOptionPanel() : base ()
{
- LanguageService languageService = (LanguageService)ServiceManager.Services.GetService(typeof(LanguageService));
+ LanguageService languageService = (LanguageService)ServiceManager.GetService(typeof(LanguageService));
Gtk.VBox mainbox = new Gtk.VBox (false, 2);
Modified: trunk/MonoDevelop/src/Main/Base/Gui/Dialogs/OptionPanels/IDEOptions/SelectStylePanel.cs
===================================================================
--- trunk/MonoDevelop/src/Main/Base/Gui/Dialogs/OptionPanels/IDEOptions/SelectStylePanel.cs 2004-06-23 23:08:38 UTC (rev 1814)
+++ trunk/MonoDevelop/src/Main/Base/Gui/Dialogs/OptionPanels/IDEOptions/SelectStylePanel.cs 2004-06-24 02:05:41 UTC (rev 1815)
@@ -22,7 +22,7 @@
{
public class SelectStylePanel : AbstractOptionPanel
{
- PropertyService PropertyService = (PropertyService)ServiceManager.Services.GetService (typeof (PropertyService));
+ PropertyService PropertyService = (PropertyService)ServiceManager.GetService (typeof (PropertyService));
SelectStylePanelWidget widget;
const string selectStyleProperty = "SharpDevelop.UI.SelectStyleOptions";
@@ -40,7 +40,7 @@
class SelectStylePanelWidget : GladeWidgetExtract
{
- PropertyService p = (PropertyService)ServiceManager.Services.GetService (typeof (PropertyService));
+ PropertyService p = (PropertyService)ServiceManager.GetService (typeof (PropertyService));
//FIXME: Hashtables are wrong here.
//FIXME: Yes, this is a dirty hack.
//FIXME: Lets use something else.
Modified: trunk/MonoDevelop/src/Main/Base/Gui/Dialogs/OptionPanels/ProjectOptions/CompileFileProjectOptions.cs
===================================================================
--- trunk/MonoDevelop/src/Main/Base/Gui/Dialogs/OptionPanels/ProjectOptions/CompileFileProjectOptions.cs 2004-06-23 23:08:38 UTC (rev 1814)
+++ trunk/MonoDevelop/src/Main/Base/Gui/Dialogs/OptionPanels/ProjectOptions/CompileFileProjectOptions.cs 2004-06-24 02:05:41 UTC (rev 1815)
@@ -25,7 +25,7 @@
{
public class CompileFileProjectOptions : AbstractOptionPanel
{
- static MessageService messageService = (MessageService) ServiceManager.Services.GetService (typeof (MessageService));
+ static MessageService messageService = (MessageService) ServiceManager.GetService (typeof (MessageService));
class CompileFileOptionsWidget : GladeWidgetExtract
{
@@ -35,8 +35,8 @@
public ListStore store;
// Services
- StringParserService StringParserService = (StringParserService) ServiceManager.Services.GetService (typeof (StringParserService));
- FileUtilityService fileUtilityService = (FileUtilityService) ServiceManager.Services.GetService (typeof (FileUtilityService));
+ StringParserService StringParserService = (StringParserService) ServiceManager.GetService (typeof (StringParserService));
+ FileUtilityService fileUtilityService = (FileUtilityService) ServiceManager.GetService (typeof (FileUtilityService));
IProject project;
Modified: trunk/MonoDevelop/src/Main/Base/Gui/Dialogs/OptionPanels/ProjectOptions/DeployFileOptions.cs
===================================================================
--- trunk/MonoDevelop/src/Main/Base/Gui/Dialogs/OptionPanels/ProjectOptions/DeployFileOptions.cs 2004-06-23 23:08:38 UTC (rev 1814)
+++ trunk/MonoDevelop/src/Main/Base/Gui/Dialogs/OptionPanels/ProjectOptions/DeployFileOptions.cs 2004-06-24 02:05:41 UTC (rev 1815)
@@ -52,8 +52,8 @@
// Services
IProject project;
- static FileUtilityService fileUtilityService = (FileUtilityService) ServiceManager.Services.GetService(typeof(FileUtilityService));
- StringParserService StringParserService = (StringParserService)ServiceManager.Services.GetService (typeof (StringParserService));
+ static FileUtilityService fileUtilityService = (FileUtilityService) ServiceManager.GetService(typeof(FileUtilityService));
+ StringParserService StringParserService = (StringParserService)ServiceManager.GetService (typeof (StringParserService));
public DeployFileOptionsWidget (IProperties CustomizationObject) :
base ("Base.glade", "DeployFileOptionsPanel")
{
@@ -203,7 +203,7 @@
}
DeployFileOptionsWidget widget;
- ResourceService resourceService = (ResourceService)ServiceManager.Services.GetService(typeof(IResourceService));
+ ResourceService resourceService = (ResourceService)ServiceManager.GetService(typeof(IResourceService));
public override void LoadPanelContents()
{
Modified: trunk/MonoDevelop/src/Main/Base/Gui/Dialogs/OptionPanels/ProjectOptions/GeneralProjectOptions.cs
===================================================================
--- trunk/MonoDevelop/src/Main/Base/Gui/Dialogs/OptionPanels/ProjectOptions/GeneralProjectOptions.cs 2004-06-23 23:08:38 UTC (rev 1814)
+++ trunk/MonoDevelop/src/Main/Base/Gui/Dialogs/OptionPanels/ProjectOptions/GeneralProjectOptions.cs 2004-06-24 02:05:41 UTC (rev 1815)
@@ -44,7 +44,7 @@
[Glade.Widget] CheckButton enableViewStateCheckButton;
// Services
- StringParserService StringParserService = (StringParserService)ServiceManager.Services.GetService (
+ StringParserService StringParserService = (StringParserService)ServiceManager.GetService (
typeof (StringParserService));
IProject project;
Modified: trunk/MonoDevelop/src/Main/Base/Gui/Dialogs/ProjectOptionsDialog.cs
===================================================================
--- trunk/MonoDevelop/src/Main/Base/Gui/Dialogs/ProjectOptionsDialog.cs 2004-06-23 23:08:38 UTC (rev 1814)
+++ trunk/MonoDevelop/src/Main/Base/Gui/Dialogs/ProjectOptionsDialog.cs 2004-06-24 02:05:41 UTC (rev 1815)
@@ -31,7 +31,7 @@
Gtk.CellRendererText textRenderer; // used to set an editable node
Gtk.TreeViewColumn textColumn; // used to set an editable node
- StringParserService StringParserService = (StringParserService)ServiceManager.Services.GetService (typeof(StringParserService));
+ StringParserService StringParserService = (StringParserService)ServiceManager.GetService (typeof(StringParserService));
public ProjectOptionsDialog(IProject project, IAddInTreeNode node, IAddInTreeNode configurationNode) : base(null, null)
{
@@ -292,11 +292,11 @@
// now see if the iter is the configuration root node iter
if (iter.Equals(configurationTreeNode)) {
- MenuService menuService = (MenuService)MonoDevelop.Core.Services.ServiceManager.Services.GetService(typeof(MenuService));
+ MenuService menuService = (MenuService)MonoDevelop.Core.Services.ServiceManager.GetService(typeof(MenuService));
menuService.ShowContextMenu(this, configNodeMenu, TreeView);
} else if (path.Indices[0] == configPath.Indices[0] && (path.Depth - configPath.Depth) == 1) {
// now see if it's a specific configuration node (i.e. the configuration root node is it's parent
- MenuService menuService = (MenuService)MonoDevelop.Core.Services.ServiceManager.Services.GetService(typeof(MenuService));
+ MenuService menuService = (MenuService)MonoDevelop.Core.Services.ServiceManager.GetService(typeof(MenuService));
menuService.ShowContextMenu(this, selectConfigNodeMenu, TreeView);
}
Modified: trunk/MonoDevelop/src/Main/Base/Gui/Dialogs/ReferenceDialog/AssemblyReferencePanel.cs
===================================================================
--- trunk/MonoDevelop/src/Main/Base/Gui/Dialogs/ReferenceDialog/AssemblyReferencePanel.cs 2004-06-23 23:08:38 UTC (rev 1814)
+++ trunk/MonoDevelop/src/Main/Base/Gui/Dialogs/ReferenceDialog/AssemblyReferencePanel.cs 2004-06-24 02:05:41 UTC (rev 1815)
@@ -33,8 +33,7 @@
void SelectReferenceDialog(object sender, EventArgs e)
{
- // FIXME: il8n the dialog name
- StringParserService stringParserService = (StringParserService)ServiceManager.Services.GetService(typeof(StringParserService));
+ StringParserService stringParserService = (StringParserService)ServiceManager.GetService(typeof(StringParserService));
using (FileSelector fdiag = new FileSelector (GettextCatalog.GetString ("Find .Net Assembly"))) {
// FIXME: this should only allow dll's and exe's
// fdiag.Complete("*");
@@ -58,7 +57,7 @@
System.IO.Path.GetFileName(file),
file);
} else {
- IMessageService messageService =(IMessageService)ServiceManager.Services.GetService(typeof(IMessageService));
+ IMessageService messageService =(IMessageService)ServiceManager.GetService(typeof(IMessageService));
// FIXME: il8n this
messageService.ShowError(String.Format (GettextCatalog.GetString ("File {0} is not a valid .Net Assembly"), file));
}
Modified: trunk/MonoDevelop/src/Main/Base/Gui/Dialogs/ReferenceDialog/GacReferencePanel.cs
===================================================================
--- trunk/MonoDevelop/src/Main/Base/Gui/Dialogs/ReferenceDialog/GacReferencePanel.cs 2004-06-23 23:08:38 UTC (rev 1814)
+++ trunk/MonoDevelop/src/Main/Base/Gui/Dialogs/ReferenceDialog/GacReferencePanel.cs 2004-06-24 02:05:41 UTC (rev 1815)
@@ -25,7 +25,7 @@
public class GacReferencePanel : Frame, IReferencePanel
{
SelectReferenceDialog selectDialog;
- ResourceService resourceService = (ResourceService)ServiceManager.Services.GetService(typeof(IResourceService));
+ ResourceService resourceService = (ResourceService)ServiceManager.GetService(typeof(IResourceService));
TreeStore store;
TreeView treeView;
@@ -137,7 +137,7 @@
}
}
#endif
- SystemAssemblyService sas = (SystemAssemblyService)ServiceManager.Services.GetService (typeof (SystemAssemblyService));
+ SystemAssemblyService sas = (SystemAssemblyService)ServiceManager.GetService (typeof (SystemAssemblyService));
foreach (string assemblyPath in sas.AssemblyPaths) {
try {
System.Reflection.AssemblyName an = System.Reflection.AssemblyName.GetAssemblyName (assemblyPath);
Modified: trunk/MonoDevelop/src/Main/Base/Gui/Dialogs/ReferenceDialog/ProjectReferencePanel.cs
===================================================================
--- trunk/MonoDevelop/src/Main/Base/Gui/Dialogs/ReferenceDialog/ProjectReferencePanel.cs 2004-06-23 23:08:38 UTC (rev 1814)
+++ trunk/MonoDevelop/src/Main/Base/Gui/Dialogs/ReferenceDialog/ProjectReferencePanel.cs 2004-06-24 02:05:41 UTC (rev 1815)
@@ -19,7 +19,7 @@
public class ProjectReferencePanel : VBox, IReferencePanel {
SelectReferenceDialog selectDialog;
- ResourceService resourceService = (ResourceService)ServiceManager.Services.GetService(typeof(IResourceService));
+ ResourceService resourceService = (ResourceService)ServiceManager.GetService(typeof(IResourceService));
TreeStore store;
TreeView treeView;
@@ -49,7 +49,7 @@
void AddReference (TreeModel model, TreePath path, TreeIter iter)
{
IProject project = (IProject) model.GetValue (iter, 2);
- LanguageBindingService languageBindingService = (LanguageBindingService)MonoDevelop.Core.Services.ServiceManager.Services.GetService(typeof(LanguageBindingService));
+ LanguageBindingService languageBindingService = (LanguageBindingService)MonoDevelop.Core.Services.ServiceManager.GetService(typeof(LanguageBindingService));
ILanguageBinding binding = languageBindingService.GetBindingPerLanguageName(project.ProjectType);
selectDialog.AddReference(ReferenceType.Project,
@@ -64,7 +64,7 @@
void PopulateListView ()
{
- IProjectService projectService = (IProjectService)MonoDevelop.Core.Services.ServiceManager.Services.GetService(typeof(IProjectService));
+ IProjectService projectService = (IProjectService)MonoDevelop.Core.Services.ServiceManager.GetService(typeof(IProjectService));
Combine openCombine = projectService.CurrentOpenCombine;
Modified: trunk/MonoDevelop/src/Main/Base/Gui/Dialogs/ReferenceDialog/SelectReferenceDialog.cs
===================================================================
--- trunk/MonoDevelop/src/Main/Base/Gui/Dialogs/ReferenceDialog/SelectReferenceDialog.cs 2004-06-23 23:08:38 UTC (rev 1814)
+++ trunk/MonoDevelop/src/Main/Base/Gui/Dialogs/ReferenceDialog/SelectReferenceDialog.cs 2004-06-24 02:05:41 UTC (rev 1815)
@@ -35,7 +35,7 @@
[Glade.Widget] Gtk.Notebook mainBook;
GacReferencePanel gacRefPanel;
- ResourceService resourceService = (ResourceService)ServiceManager.Services.GetService(typeof(IResourceService));
+ ResourceService resourceService = (ResourceService)ServiceManager.GetService(typeof(IResourceService));
IProject configureProject;
public ArrayList ReferenceInformations {
Modified: trunk/MonoDevelop/src/Main/Base/Gui/Dialogs/ReferenceDialog/WebReference.cs
===================================================================
--- trunk/MonoDevelop/src/Main/Base/Gui/Dialogs/ReferenceDialog/WebReference.cs 2004-06-23 23:08:38 UTC (rev 1814)
+++ trunk/MonoDevelop/src/Main/Base/Gui/Dialogs/ReferenceDialog/WebReference.cs 2004-06-24 02:05:41 UTC (rev 1815)
@@ -148,7 +148,7 @@
public static ArrayList GenerateWebProxyCode(IProject project, ServiceDescription desc) {
ArrayList fileList = null;
- ResourceService resourceService = (ResourceService)ServiceManager.Services.GetService(typeof(IResourceService));
+ ResourceService resourceService = (ResourceService)ServiceManager.GetService(typeof(IResourceService));
string serviceName = String.Empty;
if(desc.Services.Count > 0) {
Modified: trunk/MonoDevelop/src/Main/Base/Gui/Dialogs/SharpDevelopAboutPanels.cs
===================================================================
--- trunk/MonoDevelop/src/Main/Base/Gui/Dialogs/SharpDevelopAboutPanels.cs 2004-06-23 23:08:38 UTC (rev 1814)
+++ trunk/MonoDevelop/src/Main/Base/Gui/Dialogs/SharpDevelopAboutPanels.cs 2004-06-24 02:05:41 UTC (rev 1815)
@@ -72,8 +72,8 @@
public AuthorAboutTabPage()
{
try {
- FileUtilityService fileUtilityService = (FileUtilityService)ServiceManager.Services.GetService(typeof(FileUtilityService));
- PropertyService propertyService = (PropertyService)ServiceManager.Services.GetService(typeof(PropertyService));
+ FileUtilityService fileUtilityService = (FileUtilityService)ServiceManager.GetService(typeof(FileUtilityService));
+ PropertyService propertyService = (PropertyService)ServiceManager.GetService(typeof(PropertyService));
string html = ConvertXml.ConvertToString(fileUtilityService.SharpDevelopRootPath +
System.IO.Path.DirectorySeparatorChar + "doc" +
@@ -90,7 +90,7 @@
"SharpDevelopStandard.css";
base.Html = html;
} catch (Exception e) {
- IMessageService messageService = (IMessageService)ServiceManager.Services.GetService(typeof(IMessageService));
+ IMessageService messageService = (IMessageService)ServiceManager.GetService(typeof(IMessageService));
messageService.ShowError(e);
}
}
@@ -101,8 +101,8 @@
public ChangeLogTabPage()
{
try {
- FileUtilityService fileUtilityService = (FileUtilityService)ServiceManager.Services.GetService(typeof(FileUtilityService));
- PropertyService propertyService = (PropertyService)ServiceManager.Services.GetService(typeof(PropertyService));
+ FileUtilityService fileUtilityService = (FileUtilityService)ServiceManager.GetService(typeof(FileUtilityService));
+ PropertyService propertyService = (PropertyService)ServiceManager.GetService(typeof(PropertyService));
string html = ConvertXml.ConvertToString(fileUtilityService.SharpDevelopRootPath +
System.IO.Path.DirectorySeparatorChar + "doc" +
@@ -134,7 +134,7 @@
+ "</ul></body></html>";*/
} catch (Exception e) {
- IMessageService messageService = (IMessageService)ServiceManager.Services.GetService(typeof(IMessageService));
+ IMessageService messageService = (IMessageService)ServiceManager.GetService(typeof(IMessageService));
messageService.ShowError(e);
}
}
@@ -161,7 +161,7 @@
public VersionInformationTabPage() : base (GType)
{
- ResourceService resourceService = (ResourceService)ServiceManager.Services.GetService(typeof(IResourceService));
+ ResourceService resourceService = (ResourceService)ServiceManager.GetService(typeof(IResourceService));
TreeView listView = new TreeView ();
listView.RulesHint = true;
Modified: trunk/MonoDevelop/src/Main/Base/Gui/Dialogs/TipOfTheDay.cs
===================================================================
--- trunk/MonoDevelop/src/Main/Base/Gui/Dialogs/TipOfTheDay.cs 2004-06-23 23:08:38 UTC (rev 1814)
+++ trunk/MonoDevelop/src/Main/Base/Gui/Dialogs/TipOfTheDay.cs 2004-06-24 02:05:41 UTC (rev 1815)
@@ -18,8 +18,8 @@
{
public class TipOfTheDayWindow
{
- ResourceService resourceService = (ResourceService)ServiceManager.Services.GetService (typeof (IResourceService));
- PropertyService propertyService = (PropertyService)ServiceManager.Services.GetService (typeof (PropertyService));
+ ResourceService resourceService = (ResourceService)ServiceManager.GetService (typeof (IResourceService));
+ PropertyService propertyService = (PropertyService)ServiceManager.GetService (typeof (PropertyService));
[Glade.Widget] Label categoryLabel;
[Glade.Widget] TextView tipTextview;
@@ -58,7 +58,7 @@
private void ParseTips (XmlElement el)
{
- StringParserService stringParserService = (StringParserService)ServiceManager.Services.GetService (typeof (StringParserService));
+ StringParserService stringParserService = (StringParserService)ServiceManager.GetService (typeof (StringParserService));
XmlNodeList nodes = el.ChildNodes;
tips = new string[nodes.Count];
Modified: trunk/MonoDevelop/src/Main/Base/Gui/Dialogs/TreeViewOptions.cs
===================================================================
--- trunk/MonoDevelop/src/Main/Base/Gui/Dialogs/TreeViewOptions.cs 2004-06-23 23:08:38 UTC (rev 1814)
+++ trunk/MonoDevelop/src/Main/Base/Gui/Dialogs/TreeViewOptions.cs 2004-06-24 02:05:41 UTC (rev 1815)
@@ -38,7 +38,7 @@
[Glade.Widget] Gtk.Image panelImage;
[Glade.Widget] Gtk.Dialog TreeViewOptionDialog;
- StringParserService StringParserService = (StringParserService) ServiceManager.Services.GetService (typeof (StringParserService));
+ StringParserService StringParserService = (StringParserService) ServiceManager.GetService (typeof (StringParserService));
public IProperties Properties {
get {
Modified: trunk/MonoDevelop/src/Main/Base/Gui/Dialogs/ViewGPLDialog.cs
===================================================================
--- trunk/MonoDevelop/src/Main/Base/Gui/Dialogs/ViewGPLDialog.cs 2004-06-23 23:08:38 UTC (rev 1814)
+++ trunk/MonoDevelop/src/Main/Base/Gui/Dialogs/ViewGPLDialog.cs 2004-06-24 02:05:41 UTC (rev 1815)
@@ -21,7 +21,7 @@
public ViewGPLDialog ()
{
- FileUtilityService fileUtilityService = (FileUtilityService)ServiceManager.Services.GetService(typeof(FileUtilityService));
+ FileUtilityService fileUtilityService = (FileUtilityService)ServiceManager.GetService(typeof(FileUtilityService));
string filename = fileUtilityService.SharpDevelopRootPath +
System.IO.Path.DirectorySeparatorChar + "doc" +
System.IO.Path.DirectorySeparatorChar + "license.txt";
Modified: trunk/MonoDevelop/src/Main/Base/Gui/Dialogs/Wizard/CurrentPanelPanel.cs
===================================================================
--- trunk/MonoDevelop/src/Main/Base/Gui/Dialogs/Wizard/CurrentPanelPanel.cs 2004-06-23 23:08:38 UTC (rev 1814)
+++ trunk/MonoDevelop/src/Main/Base/Gui/Dialogs/Wizard/CurrentPanelPanel.cs 2004-06-24 02:05:41 UTC (rev 1815)
@@ -29,7 +29,7 @@
Pixbuf backGround = null;
FontDescription normalFont;
- ResourceService resourceService = (ResourceService)ServiceManager.Services.GetService(typeof(IResourceService));
+ ResourceService resourceService = (ResourceService)ServiceManager.GetService(typeof(IResourceService));
public CurrentPanelPanel(WizardDialog wizard)
{
Modified: trunk/MonoDevelop/src/Main/Base/Gui/Dialogs/Wizard/StatusPanel.cs
===================================================================
--- trunk/MonoDevelop/src/Main/Base/Gui/Dialogs/Wizard/StatusPanel.cs 2004-06-23 23:08:38 UTC (rev 1814)
+++ trunk/MonoDevelop/src/Main/Base/Gui/Dialogs/Wizard/StatusPanel.cs 2004-06-24 02:05:41 UTC (rev 1815)
@@ -33,7 +33,7 @@
Pango.FontDescription smallFont;
Pango.FontDescription normalFont;
Pango.FontDescription boldFont;
- ResourceService resourceService = (ResourceService)ServiceManager.Services.GetService(typeof(IResourceService));
+ ResourceService resourceService = (ResourceService)ServiceManager.GetService(typeof(IResourceService));
public StatusPanel(WizardDialog wizard)
{
Modified: trunk/MonoDevelop/src/Main/Base/Gui/Dialogs/Wizard/WizardDialog.cs
===================================================================
--- trunk/MonoDevelop/src/Main/Base/Gui/Dialogs/Wizard/WizardDialog.cs 2004-06-23 23:08:38 UTC (rev 1814)
+++ trunk/MonoDevelop/src/Main/Base/Gui/Dialogs/Wizard/WizardDialog.cs 2004-06-24 02:05:41 UTC (rev 1815)
@@ -279,8 +279,8 @@
void InitializeComponents()
{
- PropertyService propertyService = (PropertyService)ServiceManager.Services.GetService(typeof(PropertyService));
- ResourceService resourceService = (ResourceService)ServiceManager.Services.GetService(typeof(IResourceService));
+ PropertyService propertyService = (PropertyService)ServiceManager.GetService(typeof(PropertyService));
+ ResourceService resourceService = (ResourceService)ServiceManager.GetService(typeof(IResourceService));
dialogPanel.Shadow = Gtk.ShadowType.None;
Modified: trunk/MonoDevelop/src/Main/Base/Gui/Dialogs/WordCountDialog.cs
===================================================================
--- trunk/MonoDevelop/src/Main/Base/Gui/Dialogs/WordCountDialog.cs 2004-06-23 23:08:38 UTC (rev 1814)
+++ trunk/MonoDevelop/src/Main/Base/Gui/Dialogs/WordCountDialog.cs 2004-06-24 02:05:41 UTC (rev 1815)
@@ -29,8 +29,8 @@
Report total;
int selectedIndex = 0;
- StringParserService stringParserService = (StringParserService)MonoDevelop.Core.Services.ServiceManager.Services.GetService(typeof(StringParserService));
- MessageService messageService = (MessageService)MonoDevelop.Core.Services.ServiceManager.Services.GetService (typeof(MessageService));
+ StringParserService stringParserService = (StringParserService)MonoDevelop.Core.Services.ServiceManager.GetService(typeof(StringParserService));
+ MessageService messageService = (MessageService)MonoDevelop.Core.Services.ServiceManager.GetService (typeof(MessageService));
internal class Report
{
@@ -54,7 +54,7 @@
public static Report operator+(Report r, Report s)
{
- ResourceService resourceService = (ResourceService)ServiceManager.Services.GetService(typeof(IResourceService));
+ ResourceService resourceService = (ResourceService)ServiceManager.GetService(typeof(IResourceService));
Report tmpReport = new Report (GettextCatalog.GetString("total"), s.chars, s.words, s.lines);
tmpReport.chars += r.chars;
@@ -139,7 +139,7 @@
break;
}
case 2: {// whole project
- IProjectService projectService = (IProjectService)MonoDevelop.Core.Services.ServiceManager.Services.GetService(typeof(IProjectService));
+ IProjectService projectService = (IProjectService)MonoDevelop.Core.Services.ServiceManager.GetService(typeof(IProjectService));
if (projectService.CurrentOpenCombine == null) {
messageService.ShowError (GettextCatalog.GetString ("You must be in project mode"));
@@ -326,7 +326,7 @@
store.AppendValues ("", "", "", "");
resultListView.Model = store;
- ResourceService resourceService = (ResourceService) ServiceManager.Services.GetService(typeof(IResourceService));
+ ResourceService resourceService = (ResourceService) ServiceManager.GetService(typeof(IResourceService));
this.Icon = resourceService.GetIcon ("Icons.16x16.FindIcon");
this.TransientFor = (Window) WorkbenchSingleton.Workbench;
Modified: trunk/MonoDevelop/src/Main/Base/Gui/ErrorHandlers/GenericError.cs
===================================================================
--- trunk/MonoDevelop/src/Main/Base/Gui/ErrorHandlers/GenericError.cs 2004-06-23 23:08:38 UTC (rev 1814)
+++ trunk/MonoDevelop/src/Main/Base/Gui/ErrorHandlers/GenericError.cs 2004-06-24 02:05:41 UTC (rev 1815)
@@ -18,7 +18,7 @@
public static void DisplayError(string message)
{
- IMessageService messageService =(IMessageService)ServiceManager.Services.GetService(typeof(IMessageService));
+ IMessageService messageService =(IMessageService)ServiceManager.GetService(typeof(IMessageService));
messageService.ShowError(message);
}
}
Modified: trunk/MonoDevelop/src/Main/Base/Gui/Pads/ClassScout/ClassScout.cs
===================================================================
--- trunk/MonoDevelop/src/Main/Base/Gui/Pads/ClassScout/ClassScout.cs 2004-06-23 23:08:38 UTC (rev 1814)
+++ trunk/MonoDevelop/src/Main/Base/Gui/Pads/ClassScout/ClassScout.cs 2004-06-24 02:05:41 UTC (rev 1815)
@@ -59,7 +59,7 @@
//Panel contentPanel = new Panel();
Gtk.Frame contentPanel;
- ResourceService resourceService = (ResourceService)ServiceManager.Services.GetService(typeof(IResourceService));
+ ResourceService resourceService = (ResourceService)ServiceManager.GetService(typeof(IResourceService));
ClassInformationEventHandler changeClassInformationHandler = null;
Combine parseCombine;
ArrayList ImageList;
@@ -100,11 +100,11 @@
{
changeClassInformationHandler = new ClassInformationEventHandler(OnClassInformationChanged);
- FileUtilityService fileUtilityService = (FileUtilityService)ServiceManager.Services.GetService(typeof(FileUtilityService));
+ FileUtilityService fileUtilityService = (FileUtilityService)ServiceManager.GetService(typeof(FileUtilityService));
LabelEdit = false;
- IProjectService projectService = (IProjectService)MonoDevelop.Core.Services.ServiceManager.Services.GetService(typeof(IProjectService));
+ IProjectService projectService = (IProjectService)MonoDevelop.Core.Services.ServiceManager.GetService(typeof(IProjectService));
projectService.CombineOpened += new CombineEventHandler(OnCombineOpen);
projectService.CombineClosed += new CombineEventHandler(OnCombineClosed);
@@ -114,7 +114,7 @@
contentPanel = new Gtk.Frame();
contentPanel.Add(sw);
- AmbienceService ambienceService = (AmbienceService)ServiceManager.Services.GetService(typeof(AmbienceService));
+ AmbienceService ambienceService = (AmbienceService)ServiceManager.GetService(typeof(AmbienceService));
ambienceService.AmbienceChanged += new EventHandler(AmbienceChangedEvent);
RowActivated += new Gtk.RowActivatedHandler(OnNodeActivated);
@@ -142,14 +142,14 @@
void OnCombineClosed(object sender, CombineEventArgs e)
{
- IParserService parserService = (IParserService)MonoDevelop.Core.Services.ServiceManager.Services.GetService(typeof(IParserService));
+ IParserService parserService = (IParserService)MonoDevelop.Core.Services.ServiceManager.GetService(typeof(IParserService));
parserService.ClassInformationChanged -= changeClassInformationHandler;
Nodes.Clear();
}
void OnClassInformationChanged(object sender, ClassInformationEventArgs e)
{
- DispatchService dispatcher = (DispatchService)ServiceManager.Services.GetService (typeof (DispatchService));
+ DispatchService dispatcher = (DispatchService)ServiceManager.GetService (typeof (DispatchService));
dispatcher.GuiDispatch (new StatefulMessageHandler (ChangeClassInfo), e);
}
@@ -166,7 +166,7 @@
if (node != null) {
ClassScoutTag tag = node.Tag as ClassScoutTag;
if (tag != null) {
- IFileService fileService = (IFileService)MonoDevelop.Core.Services.ServiceManager.Services.GetService(typeof(IFileService));
+ IFileService fileService = (IFileService)MonoDevelop.Core.Services.ServiceManager.GetService(typeof(IFileService));
fileService.OpenFile(tag.FileName);
IViewContent content = fileService.GetOpenFile(tag.FileName).ViewContent;
@@ -230,7 +230,7 @@
{
AbstractClassScoutNode selectedBrowserNode = (AbstractClassScoutNode) SelectedNode;
if (selectedBrowserNode.ContextmenuAddinTreePath != null && selectedBrowserNode.ContextmenuAddinTreePath.Length > 0) {
- MenuService menuService = (MenuService) MonoDevelop.Core.Services.ServiceManager.Services.GetService (typeof (MenuService));
+ MenuService menuService = (MenuService) MonoDevelop.Core.Services.ServiceManager.GetService (typeof (MenuService));
menuService.ShowContextMenu(this, selectedBrowserNode.ContextmenuAddinTreePath, this);
}
}
@@ -265,7 +265,7 @@
Gdk.Threads.Enter();
DoPopulate();
Gdk.Threads.Leave();
- IParserService parserService = (IParserService)MonoDevelop.Core.Services.ServiceManager.Services.GetService(typeof(IParserService));
+ IParserService parserService = (IParserService)MonoDevelop.Core.Services.ServiceManager.GetService(typeof(IParserService));
parserService.ClassInformationChanged += changeClassInformationHandler;
}
@@ -285,7 +285,7 @@
if (p.ProjectType == "C#") {
foreach (ProjectFile finfo in p.ProjectFiles) {
if (finfo.BuildAction == BuildAction.Compile) {
- IParserService parserService = (IParserService)MonoDevelop.Core.Services.ServiceManager.Services.GetService(typeof(IParserService));
+ IParserService parserService = (IParserService)MonoDevelop.Core.Services.ServiceManager.GetService(typeof(IParserService));
parserService.ParseFile(finfo.Name);
}
}
@@ -311,7 +311,7 @@
public void Populate(Combine combine, TreeNodeCollection nodes)
{
- ClassBrowserIconsService classBrowserIconService = (ClassBrowserIconsService)ServiceManager.Services.GetService(typeof(ClassBrowserIconsService));
+ ClassBrowserIconsService classBrowserIconService = (ClassBrowserIconsService)ServiceManager.GetService(typeof(ClassBrowserIconsService));
TreeNode combineNode = new TreeNode(combine.Name);
//combineNode.SelectedImageIndex = combineNode.ImageIndex = classBrowserIconService.CombineIndex;
combineNode.Image = Stock.CombineIcon;
@@ -346,8 +346,8 @@
// no builder found -> create 'dummy' node
if (!builderFound) {
TreeNode prjNode = new TreeNode(p.Name);
- FileUtilityService fileUtilityService = (FileUtilityService)ServiceManager.Services.GetService(typeof(FileUtilityService));
- IconService iconService = (IconService)ServiceManager.Services.GetService(typeof(IconService));
+ FileUtilityService fileUtilityService = (FileUtilityService)ServiceManager.GetService(typeof(FileUtilityService));
+ IconService iconService = (IconService)ServiceManager.GetService(typeof(IconService));
//prjNode.SelectedImageIndex = prjNode.ImageIndex = imageIndexOffset + iconService.GetImageIndexForProjectType(p.ProjectType);
prjNode.Image = iconService.GetImageForProjectType(p.ProjectType);
prjNode.Nodes.Add(new TreeNode(GettextCatalog.GetString ("No class builder found")));
Modified: trunk/MonoDevelop/src/Main/Base/Gui/Pads/ClassScout/NodeBuilder/DefaultDotNetClassScoutNodeBuilder.cs
===================================================================
--- trunk/MonoDevelop/src/Main/Base/Gui/Pads/ClassScout/NodeBuilder/DefaultDotNetClassScoutNodeBuilder.cs 2004-06-23 23:08:38 UTC (rev 1814)
+++ trunk/MonoDevelop/src/Main/Base/Gui/Pads/ClassScout/NodeBuilder/DefaultDotNetClassScoutNodeBuilder.cs 2004-06-24 02:05:41 UTC (rev 1815)
@@ -41,8 +41,8 @@
void GetCurrentAmbience()
{
- ClassBrowserIconsService classBrowserIconService = (ClassBrowserIconsService)ServiceManager.Services.GetService(typeof(ClassBrowserIconsService));
- AmbienceService ambienceService = (AmbienceService)ServiceManager.Services.GetService(typeof(AmbienceService));
+ ClassBrowserIconsService classBrowserIconService = (ClassBrowserIconsService)ServiceManager.GetService(typeof(ClassBrowserIconsService));
+ AmbienceService ambienceService = (AmbienceService)ServiceManager.GetService(typeof(AmbienceService));
languageConversion = ambienceService.CurrentAmbience;
languageConversion.ConversionFlags = ConversionFlags.None;
@@ -60,7 +60,7 @@
}
public void RemoveFromClassTree (TreeNode parentNode, ClassCollection removed) {
- ClassBrowserIconsService classBrowserIconService = (ClassBrowserIconsService)ServiceManager.Services.GetService(typeof(ClassBrowserIconsService));
+ ClassBrowserIconsService classBrowserIconService = (ClassBrowserIconsService)ServiceManager.GetService(typeof(ClassBrowserIconsService));
TreeNode classNode = new TreeNode();
@@ -95,10 +95,10 @@
public TreeNode BuildClassTreeNode(IProject p)
{
Type fus = typeof (FileUtilityService);
- FileUtilityService fileUtilityService = (FileUtilityService)ServiceManager.Services.GetService(fus);
+ FileUtilityService fileUtilityService = (FileUtilityService)ServiceManager.GetService(fus);
Type iconserv = typeof (IconService);
- IconService iconService = (IconService)ServiceManager.Services.GetService(iconserv);
+ IconService iconService = (IconService)ServiceManager.GetService(iconserv);
GetCurrentAmbience();
TreeNode prjNode = new AbstractClassScoutNode(p.Name);
@@ -135,7 +135,7 @@
if (!NeedsExpansion (node)) return;
node.Nodes.Clear ();
- IParserService parserService = (IParserService)MonoDevelop.Core.Services.ServiceManager.Services.GetService(typeof(IParserService));
+ IParserService parserService = (IParserService)MonoDevelop.Core.Services.ServiceManager.GetService(typeof(IParserService));
ArrayList contents = parserService.GetNamespaceContents (project, ns, false);
foreach (object item in contents)
{
@@ -183,7 +183,7 @@
TreeNode BuildClassNode (IClass c)
{
- ClassBrowserIconsService classBrowserIconService = (ClassBrowserIconsService)ServiceManager.Services.GetService(typeof(ClassBrowserIconsService));
+ ClassBrowserIconsService classBrowserIconService = (ClassBrowserIconsService)ServiceManager.GetService(typeof(ClassBrowserIconsService));
AbstractClassScoutNode classNode = new AbstractClassScoutNode(c.Name);
string file = c.Region.FileName;
@@ -260,7 +260,7 @@
static public TreeNode GetNodeByPath(string directory, TreeNode parentNode, bool create)
{
- ClassBrowserIconsService classBrowserIconService = (ClassBrowserIconsService)ServiceManager.Services.GetService(typeof(ClassBrowserIconsService));
+ ClassBrowserIconsService classBrowserIconService = (ClassBrowserIconsService)ServiceManager.GetService(typeof(ClassBrowserIconsService));
string[] treepath = directory.Split(new char[] { '.' });
TreeNode curnode = parentNode;
Modified: trunk/MonoDevelop/src/Main/Base/Gui/Pads/FileScout/FileList.cs
===================================================================
--- trunk/MonoDevelop/src/Main/Base/Gui/Pads/FileScout/FileList.cs 2004-06-23 23:08:38 UTC (rev 1814)
+++ trunk/MonoDevelop/src/Main/Base/Gui/Pads/FileScout/FileList.cs 2004-06-24 02:05:41 UTC (rev 1815)
@@ -40,7 +40,7 @@
public FileList() : base (GType)
{
Items = new ArrayList ();
- FileUtilityService fileUtilityService = (FileUtilityService)ServiceManager.Services.GetService(typeof(FileUtilityService));
+ FileUtilityService fileUtilityService = (FileUtilityService)ServiceManager.GetService(typeof(FileUtilityService));
store = new Gtk.TreeStore (typeof (string), typeof (string), typeof(string), typeof(FileListItem), typeof (Gdk.Pixbuf));
Model = store;
@@ -166,7 +166,7 @@
private void OnDeleteFiles (object sender, EventArgs e)
{
- IMessageService messageService =(IMessageService)ServiceManager.Services.GetService(typeof(IMessageService));
+ IMessageService messageService =(IMessageService)ServiceManager.GetService(typeof(IMessageService));
if (messageService.AskQuestion(GettextCatalog.GetString ("Are you sure you want to delete this file?"), GettextCatalog.GetString ("Delete files")))
{
Modified: trunk/MonoDevelop/src/Main/Base/Gui/Pads/FileScout/FileScout.cs
===================================================================
--- trunk/MonoDevelop/src/Main/Base/Gui/Pads/FileScout/FileScout.cs 2004-06-23 23:08:38 UTC (rev 1814)
+++ trunk/MonoDevelop/src/Main/Base/Gui/Pads/FileScout/FileScout.cs 2004-06-24 02:05:41 UTC (rev 1815)
@@ -62,7 +62,7 @@
{
filelister.Clear ();
- PropertyService p = (PropertyService)ServiceManager.Services.GetService(typeof(PropertyService));
+ PropertyService p = (PropertyService)ServiceManager.GetService(typeof(PropertyService));
bool ignoreHidden = !p.GetProperty ("MonoDevelop.Gui.FileScout.ShowHidden", false);
fb.IgnoreHidden = ignoreHidden;
@@ -87,9 +87,9 @@
void FileSelected (object sender, Gtk.RowActivatedArgs e)
{
- IProjectService projectService = (IProjectService)MonoDevelop.Core.Services.ServiceManager.Services.GetService(typeof(IProjectService));
- IFileService fileService = (IFileService)MonoDevelop.Core.Services.ServiceManager.Services.GetService(typeof(IFileService));
- FileUtilityService fileUtilityService = (FileUtilityService)ServiceManager.Services.GetService(typeof(FileUtilityService));
+ IProjectService projectService = (IProjectService)MonoDevelop.Core.Services.ServiceManager.GetService(typeof(IProjectService));
+ IFileService fileService = (IFileService)MonoDevelop.Core.Services.ServiceManager.GetService(typeof(IFileService));
+ FileUtilityService fileUtilityService = (FileUtilityService)ServiceManager.GetService(typeof(FileUtilityService));
Gtk.TreeIter iter;
Gtk.TreeModel model;
Modified: trunk/MonoDevelop/src/Main/Base/Gui/Pads/HelpBrowser/HelpViewer.cs
===================================================================
--- trunk/MonoDevelop/src/Main/Base/Gui/Pads/HelpBrowser/HelpViewer.cs 2004-06-23 23:08:38 UTC (rev 1814)
+++ trunk/MonoDevelop/src/Main/Base/Gui/Pads/HelpBrowser/HelpViewer.cs 2004-06-24 02:05:41 UTC (rev 1815)
@@ -20,7 +20,7 @@
ScrolledWindow scroller = new ScrolledWindow ();
MonodocService mds;
- IStatusBarService statusBarService = (IStatusBarService) MonoDevelop.Core.Services.ServiceManager.Services.GetService(typeof(IStatusBarService));
+ IStatusBarService statusBarService = (IStatusBarService) MonoDevelop.Core.Services.ServiceManager.GetService(typeof(IStatusBarService));
public override bool IsViewOnly {
get { return true; }
@@ -36,7 +36,7 @@
public HelpViewer ()
{
- mds = (MonodocService)ServiceManager.Services.GetService (typeof (MonodocService));
+ mds = (MonodocService)ServiceManager.GetService (typeof (MonodocService));
html_viewer.LinkClicked += new LinkClickedHandler (LinkClicked);
html_viewer.UrlRequested += new UrlRequestedHandler (UrlRequested);
Modified: trunk/MonoDevelop/src/Main/Base/Gui/Pads/HelpBrowser/MonodocTreePad.cs
===================================================================
--- trunk/MonoDevelop/src/Main/Base/Gui/Pads/HelpBrowser/MonodocTreePad.cs 2004-06-23 23:08:38 UTC (rev 1814)
+++ trunk/MonoDevelop/src/Main/Base/Gui/Pads/HelpBrowser/MonodocTreePad.cs 2004-06-24 02:05:41 UTC (rev 1815)
@@ -29,7 +29,7 @@
public HelpTree () : base (GettextCatalog.GetString ("Help"), Gtk.Stock.Help)
{
- mds = (MonodocService)ServiceManager.Services.GetService (typeof (MonodocService));
+ mds = (MonodocService)ServiceManager.GetService (typeof (MonodocService));
tree_view = new TreeView ();
tree_view.AppendColumn ("name_col", new CellRendererText (), "text", 0);
Modified: trunk/MonoDevelop/src/Main/Base/Gui/Pads/OpenTaskView.cs
===================================================================
--- trunk/MonoDevelop/src/Main/Base/Gui/Pads/OpenTaskView.cs 2004-06-23 23:08:38 UTC (rev 1814)
+++ trunk/MonoDevelop/src/Main/Base/Gui/Pads/OpenTaskView.cs 2004-06-24 02:05:41 UTC (rev 1815)
@@ -22,7 +22,7 @@
{
public class OpenTaskView : IPadContent
{
- ResourceService resourceService = (ResourceService) ServiceManager.Services.GetService (typeof (IResourceService));
+ ResourceService resourceService = (ResourceService) ServiceManager.GetService (typeof (IResourceService));
ScrolledWindow sw;
Gtk.TreeView view;
@@ -56,8 +56,8 @@
public OpenTaskView()
{
- TaskService taskService = (TaskService) ServiceManager.Services.GetService (typeof(TaskService));
- IProjectService projectService = (IProjectService) ServiceManager.Services.GetService (typeof(IProjectService));
+ TaskService taskService = (TaskService) ServiceManager.GetService (typeof(TaskService));
+ IProjectService projectService = (IProjectService) ServiceManager.GetService (typeof(IProjectService));
store = new Gtk.ListStore (
typeof (Gdk.Pixbuf), // image
@@ -170,10 +170,10 @@
void SelectTaskView (object sender, EventArgs e)
{
- TaskService taskService = (TaskService) ServiceManager.Services.GetService (typeof (TaskService));
+ TaskService taskService = (TaskService) ServiceManager.GetService (typeof (TaskService));
if (taskService.Tasks.Count > 0) {
try {
- PropertyService propertyService = (PropertyService) ServiceManager.Services.GetService (typeof (PropertyService));
+ PropertyService propertyService = (PropertyService) ServiceManager.GetService (typeof (PropertyService));
if (WorkbenchSingleton.Workbench.WorkbenchLayout.IsVisible (this)) {
WorkbenchSingleton.Workbench.WorkbenchLayout.ActivatePad (this);
} else if ((bool) propertyService.GetProperty ("SharpDevelop.ShowTaskListAfterBuild", true)) {
@@ -200,8 +200,8 @@
public void ShowResults(object sender, EventArgs e)
{
store.Clear ();
- FileUtilityService fileUtilityService = (FileUtilityService) ServiceManager.Services.GetService (typeof (FileUtilityService));
- TaskService taskService = (TaskService) ServiceManager.Services.GetService (typeof (TaskService));
+ FileUtilityService fileUtilityService = (FileUtilityService) ServiceManager.GetService (typeof (FileUtilityService));
+ TaskService taskService = (TaskService) ServiceManager.GetService (typeof (TaskService));
foreach (Task t in taskService.Tasks) {
Gdk.Pixbuf stock;
Modified: trunk/MonoDevelop/src/Main/Base/Gui/Pads/ProjectBrowser/BrowserNode/AbstractBrowserNode.cs
===================================================================
--- trunk/MonoDevelop/src/Main/Base/Gui/Pads/ProjectBrowser/BrowserNode/AbstractBrowserNode.cs 2004-06-23 23:08:38 UTC (rev 1814)
+++ trunk/MonoDevelop/src/Main/Base/Gui/Pads/ProjectBrowser/BrowserNode/AbstractBrowserNode.cs 2004-06-24 02:05:41 UTC (rev 1815)
@@ -28,7 +28,7 @@
public abstract class AbstractBrowserNode : TreeNode, IDisposable
{
//Gdk.Pixbuf iconImage = null;
- public static bool ShowExtensions = ((PropertyService)ServiceManager.Services.GetService (typeof(PropertyService))).GetProperty ("MonoDevelop.Gui.ProjectBrowser.ShowExtensions", true);
+ public static bool ShowExtensions = ((PropertyService)ServiceManager.GetService (typeof(PropertyService))).GetProperty ("MonoDevelop.Gui.ProjectBrowser.ShowExtensions", true);
protected bool canLabelEdited = true;
protected object userData = null;
Modified: trunk/MonoDevelop/src/Main/Base/Gui/Pads/ProjectBrowser/BrowserNode/CombineBrowserNode.cs
===================================================================
--- trunk/MonoDevelop/src/Main/Base/Gui/Pads/ProjectBrowser/BrowserNode/CombineBrowserNode.cs 2004-06-23 23:08:38 UTC (rev 1814)
+++ trunk/MonoDevelop/src/Main/Base/Gui/Pads/ProjectBrowser/BrowserNode/CombineBrowserNode.cs 2004-06-24 02:05:41 UTC (rev 1815)
@@ -36,7 +36,7 @@
return combine;
}
}
- ResourceService resourceService = (ResourceService)ServiceManager.Services.GetService(typeof(IResourceService));
+ ResourceService resourceService = (ResourceService)ServiceManager.GetService(typeof(IResourceService));
public CombineBrowserNode(Combine combine)
{
UserData = combine;
@@ -64,7 +64,7 @@
bool ContainsNoInvalidChars (string name)
{
if (name.IndexOfAny (new char [] { '\'', '(', ')', '"', '{', '}', '|' } ) != -1) {
- ((MessageService)ServiceManager.Services.GetService (typeof (MessageService))).ShowError (String.Format (GettextCatalog.GetString ("Solution name may not contain any of the following characters: {0}"), "', (, ), \", {, }, |"));
+ ((MessageService)ServiceManager.GetService (typeof (MessageService))).ShowError (String.Format (GettextCatalog.GetString ("Solution name may not contain any of the following characters: {0}"), "', (, ), \", {, }, |"));
return false;
}
return true;
@@ -78,7 +78,7 @@
public void UpdateCombineName(object sender, EventArgs e)
{
- StringParserService stringParserService = (StringParserService)ServiceManager.Services.GetService(typeof(StringParserService));
+ StringParserService stringParserService = (StringParserService)ServiceManager.GetService(typeof(StringParserService));
switch (combine.Entries.Count) {
case 0:
Text = String.Format (GettextCatalog.GetString ("Solution {0}"), combine.Name);
@@ -104,7 +104,7 @@
}
CombineBrowserNode cmbNode = (CombineBrowserNode)Parent;
- StringParserService stringParserService = (StringParserService)ServiceManager.Services.GetService(typeof(StringParserService));
+ StringParserService stringParserService = (StringParserService)ServiceManager.GetService(typeof(StringParserService));
Gtk.MessageDialog dialog = new Gtk.MessageDialog ((Gtk.Window)WorkbenchSingleton.Workbench, Gtk.DialogFlags.DestroyWithParent, Gtk.MessageType.Question, Gtk.ButtonsType.OkCancel, String.Format (GettextCatalog.GetString ("Do you really want to remove solution {0} from solution {1}?"), combine.Name, cmbNode.Combine.Name));
Modified: trunk/MonoDevelop/src/Main/Base/Gui/Pads/ProjectBrowser/BrowserNode/DirectoryNode.cs
===================================================================
--- trunk/MonoDevelop/src/Main/Base/Gui/Pads/ProjectBrowser/BrowserNode/DirectoryNode.cs 2004-06-23 23:08:38 UTC (rev 1814)
+++ trunk/MonoDevelop/src/Main/Base/Gui/Pads/ProjectBrowser/BrowserNode/DirectoryNode.cs 2004-06-24 02:05:41 UTC (rev 1815)
@@ -93,23 +93,23 @@
string oldFoldername = folderName;
string newFoldername = Path.GetDirectoryName(oldFoldername) + Path.DirectorySeparatorChar + newName;
- ResourceService resourceService = (ResourceService)ServiceManager.Services.GetService(typeof(IResourceService));
+ ResourceService resourceService = (ResourceService)ServiceManager.GetService(typeof(IResourceService));
if (oldFoldername != newFoldername) {
try {
- IFileService fileService = (IFileService)MonoDevelop.Core.Services.ServiceManager.Services.GetService(typeof(IFileService));
- FileUtilityService fileUtilityService = (FileUtilityService)MonoDevelop.Core.Services.ServiceManager.Services.GetService(typeof(FileUtilityService));
+ IFileService fileService = (IFileService)MonoDevelop.Core.Services.ServiceManager.GetService(typeof(IFileService));
+ FileUtilityService fileUtilityService = (FileUtilityService)MonoDevelop.Core.Services.ServiceManager.GetService(typeof(FileUtilityService));
if (fileUtilityService.IsValidFileName(newFoldername)) {
fileService.RenameFile(oldFoldername, newFoldername);
Text = newName;
folderName = newFoldername;
}
} catch (System.IO.IOException) { // assume duplicate file
- IMessageService messageService =(IMessageService)ServiceManager.Services.GetService(typeof(IMessageService));
+ IMessageService messageService =(IMessageService)ServiceManager.GetService(typeof(IMessageService));
messageService.ShowError(GettextCatalog.GetString ("File or directory name is already in use, choose a different one."));
} catch (System.ArgumentException) { // new file name with wildcard (*, ?) characters in it
- IMessageService messageService =(IMessageService)ServiceManager.Services.GetService(typeof(IMessageService));
+ IMessageService messageService =(IMessageService)ServiceManager.GetService(typeof(IMessageService));
messageService.ShowError(GettextCatalog.GetString ("The file name you have chosen contains illegal characters. Please choose a different file name."));
}
}
@@ -125,8 +125,8 @@
if (FolderName != null && FolderName.Length == 0) {
return false;
}
- ResourceService resourceService = (ResourceService)ServiceManager.Services.GetService(typeof(IResourceService));
- StringParserService stringParserService = (StringParserService)ServiceManager.Services.GetService(typeof(StringParserService));
+ ResourceService resourceService = (ResourceService)ServiceManager.GetService(typeof(IResourceService));
+ StringParserService stringParserService = (StringParserService)ServiceManager.GetService(typeof(StringParserService));
Gtk.MessageDialog dialog = new Gtk.MessageDialog ((Gtk.Window)WorkbenchSingleton.Workbench, Gtk.DialogFlags.DestroyWithParent, Gtk.MessageType.Question, Gtk.ButtonsType.OkCancel, String.Format (GettextCatalog.GetString ("Do you want to remove folder {0} from project {1}?"), Text, Project.Name));
@@ -136,8 +136,8 @@
}
dialog.Destroy ();
- IFileService fileService = (IFileService)MonoDevelop.Core.Services.ServiceManager.Services.GetService(typeof(IFileService));
- IProjectService projectService = (IProjectService)MonoDevelop.Core.Services.ServiceManager.Services.GetService(typeof(IProjectService));
+ IFileService fileService = (IFileService)MonoDevelop.Core.Services.ServiceManager.GetService(typeof(IFileService));
+ IProjectService projectService = (IProjectService)MonoDevelop.Core.Services.ServiceManager.GetService(typeof(IProjectService));
//switch (ret) {
//case 0:
projectService.RemoveFileFromProject(FolderName);
Modified: trunk/MonoDevelop/src/Main/Base/Gui/Pads/ProjectBrowser/BrowserNode/FileNode.cs
===================================================================
--- trunk/MonoDevelop/src/Main/Base/Gui/Pads/ProjectBrowser/BrowserNode/FileNode.cs 2004-06-23 23:08:38 UTC (rev 1814)
+++ trunk/MonoDevelop/src/Main/Base/Gui/Pads/ProjectBrowser/BrowserNode/FileNode.cs 2004-06-24 02:05:41 UTC (rev 1815)
@@ -64,7 +64,7 @@
protected virtual void SetNodeIcon()
{
- IconService iconService = (IconService)ServiceManager.Services.GetService(typeof(IconService));
+ IconService iconService = (IconService)ServiceManager.GetService(typeof(IconService));
Image = iconService.GetImageForFile(((ProjectFile)userData).Name);
}
@@ -90,7 +90,7 @@
public override void ActivateItem()
{
if (userData != null && userData is ProjectFile) {
- IFileService fileService = (IFileService)MonoDevelop.Core.Services.ServiceManager.Services.GetService(typeof(IFileService));
+ IFileService fileService = (IFileService)MonoDevelop.Core.Services.ServiceManager.GetService(typeof(IFileService));
fileService.OpenFile (((ProjectFile)userData).Name);
}
@@ -113,10 +113,10 @@
string newname = Path.GetDirectoryName(oldname) + Path.DirectorySeparatorChar + newName;
if (oldname != newname) {
- ResourceService resourceService = (ResourceService)ServiceManager.Services.GetService(typeof(IResourceService));
+ ResourceService resourceService = (ResourceService)ServiceManager.GetService(typeof(IResourceService));
try {
- IFileService fileService = (IFileService)MonoDevelop.Core.Services.ServiceManager.Services.GetService(typeof(IFileService));
- FileUtilityService fileUtilityService = (FileUtilityService)MonoDevelop.Core.Services.ServiceManager.Services.GetService(typeof(FileUtilityService));
+ IFileService fileService = (IFileService)MonoDevelop.Core.Services.ServiceManager.GetService(typeof(IFileService));
+ FileUtilityService fileUtilityService = (FileUtilityService)MonoDevelop.Core.Services.ServiceManager.GetService(typeof(FileUtilityService));
if (fileUtilityService.IsValidFileName(newname)) {
fileService.RenameFile(oldname, newname);
SetNodeLabel();
@@ -124,10 +124,10 @@
UpdateBacking ();
}
} catch (System.IO.IOException) { // assume duplicate file
- IMessageService messageService =(IMessageService)ServiceManager.Services.GetService(typeof(IMessageService));
+ IMessageService messageService =(IMessageService)ServiceManager.GetService(typeof(IMessageService));
messageService.ShowError(GettextCatalog.GetString ("File or directory name is already in use, choose a different one."));
} catch (System.ArgumentException) { // new file name with wildcard (*, ?) characters in it
- IMessageService messageService =(IMessageService)ServiceManager.Services.GetService(typeof(IMessageService));
+ IMessageService messageService =(IMessageService)ServiceManager.GetService(typeof(IMessageService));
messageService.ShowError(GettextCatalog.GetString ("The file name you have chosen contains illegal characters. Please choose a different file name."));
}
}
@@ -140,8 +140,8 @@
public override bool RemoveNode()
{
DateTime old = DateTime.Now;
- ResourceService resourceService = (ResourceService)ServiceManager.Services.GetService(typeof(IResourceService));
- StringParserService stringParserService = (StringParserService)ServiceManager.Services.GetService(typeof(StringParserService));
+ ResourceService resourceService = (ResourceService)ServiceManager.GetService(typeof(IResourceService));
+ StringParserService stringParserService = (StringParserService)ServiceManager.GetService(typeof(StringParserService));
using (MessageDialog dialog = new Gtk.MessageDialog ((Window) WorkbenchSingleton.Workbench, DialogFlags.DestroyWithParent, MessageType.Question, ButtonsType.YesNo, String.Format (GettextCatalog.GetString ("Are you sure you want to remove file {0} from project {1}?"), Path.GetFileName (((ProjectFile)userData).Name), Project.Name))) {
@@ -157,7 +157,7 @@
// case 2:
// return false;
// case 0:
- IProjectService projectService = (IProjectService)MonoDevelop.Core.Services.ServiceManager.Services.GetService(typeof(IProjectService));
+ IProjectService projectService = (IProjectService)MonoDevelop.Core.Services.ServiceManager.GetService(typeof(IProjectService));
projectService.RemoveFileFromProject(((ProjectFile)userData).Name);
// break;
// case 1:
Modified: trunk/MonoDevelop/src/Main/Base/Gui/Pads/ProjectBrowser/BrowserNode/ProjectBrowserNode.cs
===================================================================
--- trunk/MonoDevelop/src/Main/Base/Gui/Pads/ProjectBrowser/BrowserNode/ProjectBrowserNode.cs 2004-06-23 23:08:38 UTC (rev 1814)
+++ trunk/MonoDevelop/src/Main/Base/Gui/Pads/ProjectBrowser/BrowserNode/ProjectBrowserNode.cs 2004-06-24 02:05:41 UTC (rev 1815)
@@ -27,7 +27,7 @@
{
readonly static string defaultContextMenuPath = "/SharpDevelop/Views/ProjectBrowser/ContextMenu/ProjectBrowserNode";
IProject project;
- ResourceService resourceService = (ResourceService)ServiceManager.Services.GetService(typeof(IResourceService));
+ ResourceService resourceService = (ResourceService)ServiceManager.GetService(typeof(IResourceService));
public override IProject Project {
get {
@@ -105,7 +105,7 @@
Combine cmb = Combine;
IProject prj = project;
CombineEntry removeEntry = null;
- StringParserService stringParserService = (StringParserService)ServiceManager.Services.GetService(typeof(StringParserService));
+ StringParserService stringParserService = (StringParserService)ServiceManager.GetService(typeof(StringParserService));
Gtk.MessageDialog dialog = new Gtk.MessageDialog ((Gtk.Window)WorkbenchSingleton.Workbench, Gtk.DialogFlags.DestroyWithParent, Gtk.MessageType.Question, Gtk.ButtonsType.OkCancel, String.Format (GettextCatalog.GetString ("Do you really want to remove project {0} from solution {1}"), project.Name, cmb.Name));
if (dialog.Run() != (int)Gtk.ResponseType.Ok) {
Modified: trunk/MonoDevelop/src/Main/Base/Gui/Pads/ProjectBrowser/BrowserNode/ReferenceNode.cs
===================================================================
--- trunk/MonoDevelop/src/Main/Base/Gui/Pads/ProjectBrowser/BrowserNode/ReferenceNode.cs 2004-06-23 23:08:38 UTC (rev 1814)
+++ trunk/MonoDevelop/src/Main/Base/Gui/Pads/ProjectBrowser/BrowserNode/ReferenceNode.cs 2004-06-24 02:05:41 UTC (rev 1815)
@@ -76,7 +76,7 @@
public override void ActivateItem()
{
if (userData != null && userData is ProjectReference) {
- IFileService fileService = (IFileService)MonoDevelop.Core.Services.ServiceManager.Services.GetService(typeof(IFileService));
+ IFileService fileService = (IFileService)MonoDevelop.Core.Services.ServiceManager.GetService(typeof(IFileService));
fileService.OpenFile(((ProjectReference)userData).GetReferencedFileName(Project));
}
}
Modified: trunk/MonoDevelop/src/Main/Base/Gui/Pads/ProjectBrowser/NodeBuilder/DefaultDotNetNodeBuilder.cs
===================================================================
--- trunk/MonoDevelop/src/Main/Base/Gui/Pads/ProjectBrowser/NodeBuilder/DefaultDotNetNodeBuilder.cs 2004-06-23 23:08:38 UTC (rev 1814)
+++ trunk/MonoDevelop/src/Main/Base/Gui/Pads/ProjectBrowser/NodeBuilder/DefaultDotNetNodeBuilder.cs 2004-06-24 02:05:41 UTC (rev 1815)
@@ -28,7 +28,7 @@
{
public class DefaultDotNetNodeBuilder : IProjectNodeBuilder
{
- static FileUtilityService fileUtilityService = (FileUtilityService)ServiceManager.Services.GetService(typeof(FileUtilityService));
+ static FileUtilityService fileUtilityService = (FileUtilityService)ServiceManager.GetService(typeof(FileUtilityService));
public bool CanBuildProjectTree(IProject project)
{
@@ -50,8 +50,8 @@
public AbstractBrowserNode BuildProjectTreeNode(IProject project)
{
- ResourceService resourceService = (ResourceService)ServiceManager.Services.GetService(typeof(IResourceService));
- IconService iconService = (IconService)ServiceManager.Services.GetService(typeof(IconService));
+ ResourceService resourceService = (ResourceService)ServiceManager.GetService(typeof(IResourceService));
+ IconService iconService = (IconService)ServiceManager.GetService(typeof(IconService));
ProjectBrowserNode projectNode = new ProjectBrowserNode(project);
projectNode.Image = iconService.GetImageForProjectType (project.ProjectType);
@@ -216,7 +216,7 @@
AbstractBrowserNode parentNode = null;
string relativeFile = fileUtilityService.AbsoluteToRelativePath(project.BaseDirectory, projectFile.Name);
string fileName = Path.GetFileName(projectFile.Name);
- ResourceService resourceService = (ResourceService)ServiceManager.Services.GetService(typeof(IResourceService));
+ ResourceService resourceService = (ResourceService)ServiceManager.GetService(typeof(IResourceService));
parentNode = projectNode;
Modified: trunk/MonoDevelop/src/Main/Base/Gui/Pads/ProjectBrowser/ProjectBrowserView.cs
===================================================================
--- trunk/MonoDevelop/src/Main/Base/Gui/Pads/ProjectBrowser/ProjectBrowserView.cs 2004-06-23 23:08:38 UTC (rev 1814)
+++ trunk/MonoDevelop/src/Main/Base/Gui/Pads/ProjectBrowser/ProjectBrowserView.cs 2004-06-24 02:05:41 UTC (rev 1815)
@@ -40,9 +40,9 @@
Font boldFont = null;
//Panel contentPanel = new Panel();
Gtk.Frame contentPanel = new Gtk.Frame();
- static ResourceService resourceService = (ResourceService)ServiceManager.Services.GetService(typeof(IResourceService));
- static FileUtilityService fileUtilityService = (FileUtilityService)ServiceManager.Services.GetService(typeof(FileUtilityService));
- static PropertyService propertyService = (PropertyService)ServiceManager.Services.GetService(typeof(PropertyService));
+ static ResourceService resourceService = (ResourceService)ServiceManager.GetService(typeof(IResourceService));
+ static FileUtilityService fileUtilityService = (FileUtilityService)ServiceManager.GetService(typeof(FileUtilityService));
+ static PropertyService propertyService = (PropertyService)ServiceManager.GetService(typeof(PropertyService));
public Gtk.Widget Control {
get {
@@ -79,7 +79,7 @@
public ProjectBrowserView() : base (true, TreeNodeComparer.GtkProjectNode)
{
WorkbenchSingleton.Workbench.ActiveWorkbenchWindowChanged += new EventHandler(ActiveWindowChanged);
- IProjectService projectService = (IProjectService)MonoDevelop.Core.Services.ServiceManager.Services.GetService(typeof(IProjectService));
+ IProjectService projectService = (IProjectService)MonoDevelop.Core.Services.ServiceManager.GetService(typeof(IProjectService));
projectService.CombineOpened += new CombineEventHandler(OpenCombine);
projectService.CombineClosed += new CombineEventHandler(CloseCombine);
@@ -171,7 +171,7 @@
((AbstractBrowserNode) node).AfterLabelEdit (new_text);
// save changes
- IProjectService projectService = (IProjectService) ServiceManager.Services.GetService (typeof(IProjectService));
+ IProjectService projectService = (IProjectService) ServiceManager.GetService (typeof(IProjectService));
projectService.SaveCombine();
}
@@ -268,7 +268,7 @@
public void UpdateCombineTree()
{
XmlElement storedTree = new TreeViewMemento(this).ToXmlElement(new XmlDocument());
- IProjectService projectService = (IProjectService)MonoDevelop.Core.Services.ServiceManager.Services.GetService(typeof(IProjectService));
+ IProjectService projectService = (IProjectService)MonoDevelop.Core.Services.ServiceManager.GetService(typeof(IProjectService));
CloseCombine(this,new CombineEventArgs(projectService.CurrentOpenCombine));
OpenCombine(this, new CombineEventArgs(projectService.CurrentOpenCombine));
((TreeViewMemento)new TreeViewMemento().FromXmlElement(storedTree)).Restore(this);
@@ -331,10 +331,10 @@
void ShowPopup ()
{
AbstractBrowserNode node = (AbstractBrowserNode) SelectedNode;
- IProjectService projectService = (IProjectService)MonoDevelop.Core.Services.ServiceManager.Services.GetService(typeof(IProjectService));
+ IProjectService projectService = (IProjectService)MonoDevelop.Core.Services.ServiceManager.GetService(typeof(IProjectService));
projectService.CurrentSelectedProject = node.Project;
projectService.CurrentSelectedCombine = node.Combine;
- MenuService menuService = (MenuService)MonoDevelop.Core.Services.ServiceManager.Services.GetService(typeof(MenuService));
+ MenuService menuService = (MenuService)MonoDevelop.Core.Services.ServiceManager.GetService(typeof(MenuService));
menuService.ShowContextMenu(this, node.ContextmenuAddinTreePath, this);
}
@@ -557,7 +557,7 @@
if (move) {
if (filename != newfilename) {
File.Copy(filename, newfilename);
- IFileService fileService = (IFileService)MonoDevelop.Core.Services.ServiceManager.Services.GetService(typeof(IFileService));
+ IFileService fileService = (IFileService)MonoDevelop.Core.Services.ServiceManager.GetService(typeof(IFileService));
fileService.RemoveFile(filename);
}
if (oldnode != null) {
@@ -570,7 +570,7 @@
}
ProjectFile fInfo;
- IProjectService projectService = (IProjectService)MonoDevelop.Core.Services.ServiceManager.Services.GetService(typeof(IProjectService));
+ IProjectService projectService = (IProjectService)MonoDevelop.Core.Services.ServiceManager.GetService(typeof(IProjectService));
if (newparent.Project.IsCompileable(newfilename)) {
fInfo = projectService.AddFileToProject(newparent.Project, newfilename, BuildAction.Compile);
Modified: trunk/MonoDevelop/src/Main/Base/Gui/Pads/SideBarView.cs
===================================================================
--- trunk/MonoDevelop/src/Main/Base/Gui/Pads/SideBarView.cs 2004-06-23 23:08:38 UTC (rev 1814)
+++ trunk/MonoDevelop/src/Main/Base/Gui/Pads/SideBarView.cs 2004-06-24 02:05:41 UTC (rev 1815)
@@ -19,7 +19,7 @@
{
public class SideBarView : IPadContent, IDisposable
{
- ResourceService resourceService = (ResourceService)ServiceManager.Services.GetService(typeof(IResourceService));
+ ResourceService resourceService = (ResourceService)ServiceManager.GetService(typeof(IResourceService));
public Gtk.Widget Control {
get {
return null;
@@ -57,7 +57,7 @@
{
try {
XmlDocument doc = new XmlDocument();
- PropertyService propertyService = (PropertyService)ServiceManager.Services.GetService(typeof(PropertyService));
+ PropertyService propertyService = (PropertyService)ServiceManager.GetService(typeof(PropertyService));
doc.Load(propertyService.ConfigDirectory + "SideBarConfig.xml");
if (doc.DocumentElement.Attributes["version"] == null || doc.DocumentElement.Attributes["version"].InnerText != "1.0") {
GenerateStandardSideBar();
Modified: trunk/MonoDevelop/src/Main/Base/Gui/PixbufList.cs
===================================================================
--- trunk/MonoDevelop/src/Main/Base/Gui/PixbufList.cs 2004-06-23 23:08:38 UTC (rev 1814)
+++ trunk/MonoDevelop/src/Main/Base/Gui/PixbufList.cs 2004-06-24 02:05:41 UTC (rev 1815)
@@ -8,7 +8,7 @@
{
public PixbufList (params string [] resIcons) : base (resIcons.Length)
{
- ResourceService rs = (ResourceService) ServiceManager.Services.GetService (typeof (IResourceService));
+ ResourceService rs = (ResourceService) ServiceManager.GetService (typeof (IResourceService));
foreach (string s in resIcons)
Add (rs.GetBitmap (s));
Modified: trunk/MonoDevelop/src/Main/Base/Gui/Workbench/DefaultWorkbench.cs
===================================================================
--- trunk/MonoDevelop/src/Main/Base/Gui/Workbench/DefaultWorkbench.cs 2004-06-23 23:08:38 UTC (rev 1814)
+++ trunk/MonoDevelop/src/Main/Base/Gui/Workbench/DefaultWorkbench.cs 2004-06-24 02:05:41 UTC (rev 1815)
@@ -50,7 +50,7 @@
static GType gtype;
- protected static PropertyService propertyService = (PropertyService)ServiceManager.Services.GetService(typeof(PropertyService));
+ protected static PropertyService propertyService = (PropertyService)ServiceManager.GetService(typeof(PropertyService));
public Gtk.MenuBar TopMenu = null;
@@ -135,7 +135,7 @@
{
Title = "MonoDevelop";
Console.WriteLine ("Creating DefaultWorkbench");
- ResourceService resourceService = (ResourceService)ServiceManager.Services.GetService(typeof(IResourceService));
+ ResourceService resourceService = (ResourceService)ServiceManager.GetService(typeof(IResourceService));
windowChangeEventHandler = new EventHandler(OnActiveWindowChanged);
@@ -146,7 +146,7 @@
this.Icon = resourceService.GetBitmap ("Icons.SharpDevelopIcon");
//this.WindowPosition = Gtk.WindowPosition.None;
- IDebuggingService dbgr = (IDebuggingService)ServiceManager.Services.GetService (typeof (IDebuggingService));
+ IDebuggingService dbgr = (IDebuggingService)ServiceManager.GetService (typeof (IDebuggingService));
if (dbgr != null) {
dbgr.StartedEvent += new EventHandler (onDebuggerStarted);
dbgr.PausedEvent += new EventHandler (onDebuggerPaused);
@@ -178,7 +178,7 @@
case ".CMBX":
case ".PRJX":
try {
- IProjectService projectService = (IProjectService)ServiceManager.Services.GetService (typeof (IProjectService));
+ IProjectService projectService = (IProjectService)ServiceManager.GetService (typeof (IProjectService));
projectService.OpenCombine(file);
} catch (Exception e) {
}
@@ -186,7 +186,7 @@
break;
default:
try {
- IFileService fileService = (IFileService)MonoDevelop.Core.Services.ServiceManager.Services.GetService(typeof(IFileService));
+ IFileService fileService = (IFileService)MonoDevelop.Core.Services.ServiceManager.GetService(typeof(IFileService));
fileService.OpenFile(file);
} catch (Exception e) {
@@ -200,12 +200,12 @@
void onDebuggerPaused (object o, EventArgs e)
{
- IDebuggingService dbgr = (IDebuggingService)ServiceManager.Services.GetService (typeof (IDebuggingService));
+ IDebuggingService dbgr = (IDebuggingService)ServiceManager.GetService (typeof (IDebuggingService));
if (dbgr != null) {
cur_dbgFilename = dbgr.CurrentFilename;
cur_dbgLineNumber = dbgr.CurrentLineNumber - 1;
- IFileService fs = (IFileService)ServiceManager.Services.GetService (typeof (IFileService));
+ IFileService fs = (IFileService)ServiceManager.GetService (typeof (IFileService));
fs.OpenFile (cur_dbgFilename);
if (ActiveWorkbenchWindow.ViewContent is IDebuggableEditor)
((IDebuggableEditor)ActiveWorkbenchWindow.ViewContent).ExecutingAt (cur_dbgLineNumber);
@@ -239,8 +239,8 @@
// FIXME: GTKize
ActiveWorkbenchWindowChanged += new EventHandler(UpdateMenu);
- IProjectService projectService = (IProjectService)MonoDevelop.Core.Services.ServiceManager.Services.GetService(typeof(IProjectService));
- IFileService fileService = (IFileService)MonoDevelop.Core.Services.ServiceManager.Services.GetService(typeof(IFileService));
+ IProjectService projectService = (IProjectService)MonoDevelop.Core.Services.ServiceManager.GetService(typeof(IProjectService));
+ IFileService fileService = (IFileService)MonoDevelop.Core.Services.ServiceManager.GetService(typeof(IFileService));
projectService.CurrentProjectChanged += new ProjectEventHandler(SetProjectTitle);
projectService.CombineOpened += new CombineEventHandler(CombineOpened);
@@ -370,7 +370,7 @@
public IXmlConvertable GetStoredMemento(IViewContent content)
{
if (content != null && content.ContentName != null) {
- PropertyService propertyService = (PropertyService)ServiceManager.Services.GetService(typeof(PropertyService));
+ PropertyService propertyService = (PropertyService)ServiceManager.GetService(typeof(PropertyService));
string directory = propertyService.ConfigDirectory + "temp";
if (!Directory.Exists(directory)) {
@@ -379,7 +379,7 @@
string fileName = content.ContentName.Substring(3).Replace('/', '.').Replace('\\', '.').Replace(System.IO.Path.DirectorySeparatorChar, '.');
string fullFileName = directory + System.IO.Path.DirectorySeparatorChar + fileName;
// check the file name length because it could be more than the maximum length of a file name
- FileUtilityService fileUtilityService = (FileUtilityService)ServiceManager.Services.GetService(typeof(FileUtilityService));
+ FileUtilityService fileUtilityService = (FileUtilityService)ServiceManager.GetService(typeof(FileUtilityService));
if (fileUtilityService.IsValidFileName(fullFileName) && File.Exists(fullFileName)) {
IXmlConvertable prototype = ((IMementoCapable)content).CreateMemento();
XmlDocument doc = new XmlDocument();
@@ -396,7 +396,7 @@
if (content.ContentName == null) {
return;
}
- PropertyService propertyService = (PropertyService)ServiceManager.Services.GetService(typeof(PropertyService));
+ PropertyService propertyService = (PropertyService)ServiceManager.GetService(typeof(PropertyService));
string directory = propertyService.ConfigDirectory + "temp";
if (!Directory.Exists(directory)) {
Directory.CreateDirectory(directory);
@@ -415,7 +415,7 @@
doc.DocumentElement.AppendChild(memento.ToXmlElement(doc));
string fileName = content.ContentName.Substring(3).Replace('/', '.').Replace('\\', '.').Replace(System.IO.Path.DirectorySeparatorChar, '.');
- FileUtilityService fileUtilityService = (FileUtilityService)ServiceManager.Services.GetService(typeof(FileUtilityService));
+ FileUtilityService fileUtilityService = (FileUtilityService)ServiceManager.GetService(typeof(FileUtilityService));
// check the file name length because it could be more than the maximum length of a file name
string fullFileName = directory + System.IO.Path.DirectorySeparatorChar + fileName;
if (fileUtilityService.IsValidFileName(fullFileName)) {
@@ -541,7 +541,7 @@
public bool Close()
{
- IProjectService projectService = (IProjectService)MonoDevelop.Core.Services.ServiceManager.Services.GetService(typeof(IProjectService));
+ IProjectService projectService = (IProjectService)MonoDevelop.Core.Services.ServiceManager.GetService(typeof(IProjectService));
if (projectService != null)
{
@@ -579,7 +579,7 @@
void SetProjectTitle(object sender, ProjectEventArgs e)
{
UpdateMenu(null, null);
- ResourceService resourceService = (ResourceService)ServiceManager.Services.GetService(typeof(IResourceService));
+ ResourceService resourceService = (ResourceService)ServiceManager.GetService(typeof(IResourceService));
if (e.Project != null) {
Title = String.Concat(e.Project.Name, " - ", "MonoDevelop");
} else {
@@ -589,7 +589,7 @@
void SetStandardStatusBar(object sender, EventArgs e)
{
- IStatusBarService statusBarService = (IStatusBarService)MonoDevelop.Core.Services.ServiceManager.Services.GetService(typeof(IStatusBarService));
+ IStatusBarService statusBarService = (IStatusBarService)MonoDevelop.Core.Services.ServiceManager.GetService(typeof(IStatusBarService));
statusBarService.SetMessage(GettextCatalog.GetString ("Ready"));
}
@@ -655,7 +655,7 @@
void CreateToolBars()
{
if (ToolBars == null) {
- ToolbarService toolBarService = (ToolbarService)MonoDevelop.Core.Services.ServiceManager.Services.GetService(typeof(ToolbarService));
+ ToolbarService toolBarService = (ToolbarService)MonoDevelop.Core.Services.ServiceManager.GetService(typeof(ToolbarService));
Gtk.Toolbar[] toolBars = toolBarService.CreateToolbars();
ToolBars = toolBars;
}
Modified: trunk/MonoDevelop/src/Main/Base/Gui/Workbench/Layouts/SdiWorkspaceLayout.cs
===================================================================
--- trunk/MonoDevelop/src/Main/Base/Gui/Workbench/Layouts/SdiWorkspaceLayout.cs 2004-06-23 23:08:38 UTC (rev 1814)
+++ trunk/MonoDevelop/src/Main/Base/Gui/Workbench/Layouts/SdiWorkspaceLayout.cs 2004-06-24 02:05:41 UTC (rev 1815)
@@ -27,7 +27,7 @@
/// </summary>
public class SdiWorkbenchLayout : IWorkbenchLayout
{
- static PropertyService propertyService = (PropertyService)ServiceManager.Services.GetService(typeof(PropertyService));
+ static PropertyService propertyService = (PropertyService)ServiceManager.GetService(typeof(PropertyService));
static string configFile = propertyService.ConfigDirectory + "DefaultEditingLayout.xml";
// contains the fully qualified name of the current layout (ie. Edit.Default)
@@ -107,7 +107,7 @@
workbench.Add (vbox);
- IStatusBarService statusBarService = (IStatusBarService) ServiceManager.Services.GetService (typeof (IStatusBarService));
+ IStatusBarService statusBarService = (IStatusBarService) ServiceManager.GetService (typeof (IStatusBarService));
vbox.PackEnd (statusBarService.Control, false, true, 0);
foreach (IViewContent content in workbench.ViewContentCollection)
@@ -158,7 +158,7 @@
void SwitchContext (WorkbenchContext ctxt)
{
PropertyService propertyService =
- (PropertyService) ServiceManager.Services.GetService (typeof (PropertyService));
+ (PropertyService) ServiceManager.GetService (typeof (PropertyService));
PadContentCollection old = activePadCollection;
// switch pad collections
@@ -233,7 +233,7 @@
// persist the selected layout for the current context
PropertyService propertyService =
- (PropertyService) ServiceManager.Services.GetService (typeof (PropertyService));
+ (PropertyService) ServiceManager.GetService (typeof (PropertyService));
propertyService.SetProperty ("MonoDevelop.Gui.SdiWorkbenchLayout." +
workbenchContext.ToString (), value);
}
Modified: trunk/MonoDevelop/src/Main/Base/Gui/Workbench/Layouts/SdiWorkspaceWindow.cs
===================================================================
--- trunk/MonoDevelop/src/Main/Base/Gui/Workbench/Layouts/SdiWorkspaceWindow.cs 2004-06-23 23:08:38 UTC (rev 1814)
+++ trunk/MonoDevelop/src/Main/Base/Gui/Workbench/Layouts/SdiWorkspaceWindow.cs 2004-06-24 02:05:41 UTC (rev 1815)
@@ -35,7 +35,7 @@
string myUntitledTitle = null;
string _titleHolder = "";
- static StringParserService stringParserService = (StringParserService)ServiceManager.Services.GetService(typeof(StringParserService));
+ static StringParserService stringParserService = (StringParserService)ServiceManager.GetService(typeof(StringParserService));
public Widget TabPage {
get {
@@ -183,7 +183,7 @@
if (content.IsDirty) {
newTitle += "*";
- IProjectService prj = (IProjectService)ServiceManager.Services.GetService (typeof (IProjectService));
+ IProjectService prj = (IProjectService)ServiceManager.GetService (typeof (IProjectService));
prj.MarkFileDirty (content.ContentName);
} else if (content.IsReadOnly) {
newTitle += "+";
@@ -216,8 +216,8 @@
public void CloseWindow(bool force, bool fromMenu, int pageNum)
{
if (!force && ViewContent != null && ViewContent.IsDirty) {
- ResourceService resourceService = (ResourceService)ServiceManager.Services.GetService(typeof(IResourceService));
- IMessageService messageService =(IMessageService)ServiceManager.Services.GetService(typeof(IMessageService));
+ ResourceService resourceService = (ResourceService)ServiceManager.GetService(typeof(IResourceService));
+ IMessageService messageService =(IMessageService)ServiceManager.GetService(typeof(IMessageService));
bool response = messageService.AskQuestion (GettextCatalog.GetString ("Do you want to save the current changes"));
switch (response) {
@@ -235,7 +235,7 @@
}
} else {
- FileUtilityService fileUtilityService = (FileUtilityService)ServiceManager.Services.GetService(typeof(FileUtilityService));
+ FileUtilityService fileUtilityService = (FileUtilityService)ServiceManager.GetService(typeof(FileUtilityService));
fileUtilityService.ObservedSave(new FileOperationDelegate(ViewContent.Save), ViewContent.ContentName , FileErrorPolicy.ProvideAlternative);
}
break;
Modified: trunk/MonoDevelop/src/Main/Base/Gui/WorkbenchSingleton.cs
===================================================================
--- trunk/MonoDevelop/src/Main/Base/Gui/WorkbenchSingleton.cs 2004-06-23 23:08:38 UTC (rev 1814)
+++ trunk/MonoDevelop/src/Main/Base/Gui/WorkbenchSingleton.cs 2004-06-24 02:05:41 UTC (rev 1815)
@@ -35,7 +35,7 @@
static WorkbenchSingleton()
{
- PropertyService propertyService = (PropertyService)ServiceManager.Services.GetService(typeof(PropertyService));
+ PropertyService propertyService = (PropertyService)ServiceManager.GetService(typeof(PropertyService));
propertyService.PropertyChanged += new PropertyEventHandler(TrackPropertyChanges);
}
Modified: trunk/MonoDevelop/src/Main/Base/Internal/Codons/DialogPanelCodon.cs
===================================================================
--- trunk/MonoDevelop/src/Main/Base/Internal/Codons/DialogPanelCodon.cs 2004-06-23 23:08:38 UTC (rev 1814)
+++ trunk/MonoDevelop/src/Main/Base/Internal/Codons/DialogPanelCodon.cs 2004-06-24 02:05:41 UTC (rev 1815)
@@ -37,7 +37,7 @@
public override object BuildItem(object owner, ArrayList subItems, ConditionCollection conditions)
{
IDialogPanelDescriptor newItem = null;
- StringParserService stringParserService = (StringParserService)ServiceManager.Services.GetService(typeof(StringParserService));
+ StringParserService stringParserService = (StringParserService)ServiceManager.GetService(typeof(StringParserService));
if (subItems == null || subItems.Count == 0) {
if (Class != null) {
Modified: trunk/MonoDevelop/src/Main/Base/Internal/Codons/LanguageBinding/FileFilterCodon.cs
===================================================================
--- trunk/MonoDevelop/src/Main/Base/Internal/Codons/LanguageBinding/FileFilterCodon.cs 2004-06-23 23:08:38 UTC (rev 1814)
+++ trunk/MonoDevelop/src/Main/Base/Internal/Codons/LanguageBinding/FileFilterCodon.cs 2004-06-24 02:05:41 UTC (rev 1815)
@@ -50,7 +50,7 @@
if (subItems.Count > 0) {
throw new ApplicationException("more than one level of file filters don't make sense!");
}
- StringParserService stringParserService = (StringParserService)ServiceManager.Services.GetService(typeof(StringParserService));
+ StringParserService stringParserService = (StringParserService)ServiceManager.GetService(typeof(StringParserService));
return stringParserService.Parse(filtername) + "|" + String.Join(";", extensions);
}
}
Modified: trunk/MonoDevelop/src/Main/Base/Internal/Codons/MenuItems/MenuItemCodon.cs
===================================================================
--- trunk/MonoDevelop/src/Main/Base/Internal/Codons/MenuItems/MenuItemCodon.cs 2004-06-23 23:08:38 UTC (rev 1814)
+++ trunk/MonoDevelop/src/Main/Base/Internal/Codons/MenuItems/MenuItemCodon.cs 2004-06-24 02:05:41 UTC (rev 1815)
@@ -138,7 +138,7 @@
Debug.Assert(newItem != null);
if (Icon != null && newItem is SdMenuCommand) {
- ResourceService resourceService = (ResourceService)ServiceManager.Services.GetService(typeof(IResourceService));
+ ResourceService resourceService = (ResourceService)ServiceManager.GetService(typeof(IResourceService));
((SdMenuCommand)newItem).Image = resourceService.GetImage(Icon, Gtk.IconSize.Menu);
}
Modified: trunk/MonoDevelop/src/Main/Base/Internal/Conditions/CombineOpenCondition.cs
===================================================================
--- trunk/MonoDevelop/src/Main/Base/Internal/Conditions/CombineOpenCondition.cs 2004-06-23 23:08:38 UTC (rev 1814)
+++ trunk/MonoDevelop/src/Main/Base/Internal/Conditions/CombineOpenCondition.cs 2004-06-24 02:05:41 UTC (rev 1815)
@@ -33,7 +33,7 @@
public override bool IsValid(object owner)
{
- IProjectService projectService = (IProjectService)MonoDevelop.Core.Services.ServiceManager.Services.GetService(typeof(IProjectService));
+ IProjectService projectService = (IProjectService)MonoDevelop.Core.Services.ServiceManager.GetService(typeof(IProjectService));
return projectService.CurrentOpenCombine != null || !isCombineOpen;
}
}
Modified: trunk/MonoDevelop/src/Main/Base/Internal/Conditions/ProjectActiveCondition.cs
===================================================================
--- trunk/MonoDevelop/src/Main/Base/Internal/Conditions/ProjectActiveCondition.cs 2004-06-23 23:08:38 UTC (rev 1814)
+++ trunk/MonoDevelop/src/Main/Base/Internal/Conditions/ProjectActiveCondition.cs 2004-06-24 02:05:41 UTC (rev 1815)
@@ -36,7 +36,7 @@
public override bool IsValid(object owner)
{
- IProjectService projectService = (IProjectService)MonoDevelop.Core.Services.ServiceManager.Services.GetService(typeof(IProjectService));
+ IProjectService projectService = (IProjectService)MonoDevelop.Core.Services.ServiceManager.GetService(typeof(IProjectService));
IProject project = projectService.CurrentSelectedProject;
if (activeproject == "*") {
Modified: trunk/MonoDevelop/src/Main/Base/Internal/Conditions/ProjectOpenCondition.cs
===================================================================
--- trunk/MonoDevelop/src/Main/Base/Internal/Conditions/ProjectOpenCondition.cs 2004-06-23 23:08:38 UTC (rev 1814)
+++ trunk/MonoDevelop/src/Main/Base/Internal/Conditions/ProjectOpenCondition.cs 2004-06-24 02:05:41 UTC (rev 1815)
@@ -36,7 +36,7 @@
public override bool IsValid(object owner)
{
- IProjectService projectService = (IProjectService)MonoDevelop.Core.Services.ServiceManager.Services.GetService(typeof(IProjectService));
+ IProjectService projectService = (IProjectService)MonoDevelop.Core.Services.ServiceManager.GetService(typeof(IProjectService));
IProject project = projectService.CurrentSelectedProject;
if (project == null && projectService.CurrentOpenCombine != null) {
Modified: trunk/MonoDevelop/src/Main/Base/Internal/ExternalTool/ToolLoader.cs
===================================================================
--- trunk/MonoDevelop/src/Main/Base/Internal/ExternalTool/ToolLoader.cs 2004-06-23 23:08:38 UTC (rev 1814)
+++ trunk/MonoDevelop/src/Main/Base/Internal/ExternalTool/ToolLoader.cs 2004-06-24 02:05:41 UTC (rev 1815)
@@ -67,7 +67,7 @@
doc.DocumentElement.AppendChild(et.ToXmlElement(doc));
}
- FileUtilityService fileUtilityService = (FileUtilityService)ServiceManager.Services.GetService(typeof(FileUtilityService));
+ FileUtilityService fileUtilityService = (FileUtilityService)ServiceManager.GetService(typeof(FileUtilityService));
fileUtilityService.ObservedSave(new NamedFileOperationDelegate(doc.Save), fileName, FileErrorPolicy.ProvideAlternative);
}
@@ -77,16 +77,16 @@
/// </summary>
static ToolLoader()
{
- PropertyService propertyService = (PropertyService)ServiceManager.Services.GetService(typeof(PropertyService));
- FileUtilityService fileUtilityService = (FileUtilityService)ServiceManager.Services.GetService(typeof(FileUtilityService));
+ PropertyService propertyService = (PropertyService)ServiceManager.GetService(typeof(PropertyService));
+ FileUtilityService fileUtilityService = (FileUtilityService)ServiceManager.GetService(typeof(FileUtilityService));
if (!LoadToolsFromStream(propertyService.ConfigDirectory + TOOLFILE)) {
//Console.WriteLine("Tools: can't load user defaults, reading system defaults");
if (!LoadToolsFromStream(propertyService.DataDirectory +
Path.DirectorySeparatorChar + "options" +
Path.DirectorySeparatorChar + TOOLFILE)) {
- IResourceService resourceService = (IResourceService)ServiceManager.Services.GetService(typeof(IResourceService));
- IMessageService messageService = (IMessageService)ServiceManager.Services.GetService(typeof(IMessageService));
+ IResourceService resourceService = (IResourceService)ServiceManager.GetService(typeof(IResourceService));
+ IMessageService messageService = (IMessageService)ServiceManager.GetService(typeof(IMessageService));
messageService.ShowWarning(GettextCatalog.GetString ("Can't load external tools configuration file"));
}
}
@@ -98,7 +98,7 @@
/// </summary>
public static void SaveTools()
{
- PropertyService propertyService = (PropertyService)ServiceManager.Services.GetService(typeof(PropertyService));
+ PropertyService propertyService = (PropertyService)ServiceManager.GetService(typeof(PropertyService));
WriteToolsToFile(propertyService.ConfigDirectory + TOOLFILE);
}
}
Modified: trunk/MonoDevelop/src/Main/Base/Internal/Parser/ReflectionLayer/ReflectionClass.cs
===================================================================
--- trunk/MonoDevelop/src/Main/Base/Internal/Parser/ReflectionLayer/ReflectionClass.cs 2004-06-23 23:08:38 UTC (rev 1814)
+++ trunk/MonoDevelop/src/Main/Base/Internal/Parser/ReflectionLayer/ReflectionClass.cs 2004-06-24 02:05:41 UTC (rev 1815)
@@ -47,12 +47,9 @@
type = Type.GetType ("System.Object");
- //FIXME: remove after doc changes are complete.
- Hashtable xmlComments = null;
-
FullyQualifiedName = type.FullName;
- MonodocService docservice = ((MonodocService)ServiceManager.Services.GetService (typeof (MonodocService)));
+ MonodocService docservice = ((MonodocService)ServiceManager.GetService (typeof (MonodocService)));
XmlDocument docs = docservice != null ? docservice.GetHelpXml (FullyQualifiedName) : null;
if (docs != null) {
XmlNode node = docs.SelectSingleNode ("/Type/Docs/summary");
Modified: trunk/MonoDevelop/src/Main/Base/Internal/Project/Combine/Combine.cs
===================================================================
--- trunk/MonoDevelop/src/Main/Base/Internal/Project/Combine/Combine.cs 2004-06-23 23:08:38 UTC (rev 1814)
+++ trunk/MonoDevelop/src/Main/Base/Internal/Project/Combine/Combine.cs 2004-06-24 02:05:41 UTC (rev 1815)
@@ -54,7 +54,7 @@
Hashtable configurations = new Hashtable();
ArrayList combineExecuteDefinitions = new ArrayList();
- IResourceService resourceService = (IResourceService)ServiceManager.Services.GetService(typeof(IResourceService));
+ IResourceService resourceService = (IResourceService)ServiceManager.GetService(typeof(IResourceService));
[LocalizedProperty("${res:MonoDevelop.Internal.Project.Combine.ActiveConfiguration}",
Description = "${res:MonoDevelop.Internal.Project.Combine.ActiveConfiguration.Description}")]
@@ -192,12 +192,12 @@
public IProject LoadProject(string filename)
{
- LanguageBindingService languageBindingService = (LanguageBindingService)MonoDevelop.Core.Services.ServiceManager.Services.GetService(typeof(LanguageBindingService));
- StringParserService stringParserService = (StringParserService)ServiceManager.Services.GetService(typeof(StringParserService));
+ LanguageBindingService languageBindingService = (LanguageBindingService)MonoDevelop.Core.Services.ServiceManager.GetService(typeof(LanguageBindingService));
+ StringParserService stringParserService = (StringParserService)ServiceManager.GetService(typeof(StringParserService));
ILanguageBinding binding = languageBindingService.GetBindingPerProjectFile(filename);
if (binding == null) {
- IMessageService messageService =(IMessageService)ServiceManager.Services.GetService(typeof(IMessageService));
+ IMessageService messageService =(IMessageService)ServiceManager.GetService(typeof(IMessageService));
messageService.ShowError(String.Format (GettextCatalog.GetString ("Can't find language binding for {0}"), filename));
return null;
}
@@ -223,7 +223,7 @@
XmlNodeList nodes = root["Entries"].ChildNodes;
entries.Clear();
- FileUtilityService fileUtilityService = (FileUtilityService)ServiceManager.Services.GetService(typeof(FileUtilityService));
+ FileUtilityService fileUtilityService = (FileUtilityService)ServiceManager.GetService(typeof(FileUtilityService));
eventsAllowed = false;
try {
foreach (XmlElement el in nodes) {
@@ -323,7 +323,7 @@
doc.DocumentElement.AppendChild(startupnode);
XmlElement projectsnode = doc.CreateElement("Entries");
- FileUtilityService fileUtilityService = (FileUtilityService)ServiceManager.Services.GetService(typeof(FileUtilityService));
+ FileUtilityService fileUtilityService = (FileUtilityService)ServiceManager.GetService(typeof(FileUtilityService));
foreach (CombineEntry entry in entries) {
XmlElement el = doc.CreateElement("Entry");
@@ -373,7 +373,7 @@
if (fdiag.Run() == (int)Gtk.ResponseType.Ok) {
string filename = fdiag.Filename;
SaveCombine(filename);
- IMessageService messageService =(IMessageService)ServiceManager.Services.GetService(typeof(IMessageService));
+ IMessageService messageService =(IMessageService)ServiceManager.GetService(typeof(IMessageService));
messageService.ShowMessage(filename, GettextCatalog.GetString ("Combine saved"));
}
@@ -615,11 +615,11 @@
try {
allProjects = TopologicalSort(allProjects);
} catch (CyclicBuildOrderException) {
- IMessageService messageService =(IMessageService)ServiceManager.Services.GetService(typeof(IMessageService));
+ IMessageService messageService =(IMessageService)ServiceManager.GetService(typeof(IMessageService));
messageService.ShowError(GettextCatalog.GetString ("Cyclic dependencies can not be built with this version.\nBut we are working on it."));
return;
}
- TaskService taskService = (TaskService)MonoDevelop.Core.Services.ServiceManager.Services.GetService(typeof(TaskService));
+ TaskService taskService = (TaskService)MonoDevelop.Core.Services.ServiceManager.GetService(typeof(TaskService));
foreach (ProjectCombineEntry entry in allProjects) {
entry.Build(doBuildAll);
if (taskService.Errors > 0) {
@@ -641,7 +641,7 @@
Console.WriteLine ("Dont know how to generate makefiles for " + entry);
}
- FileUtilityService fileUtilityService = (FileUtilityService)ServiceManager.Services.GetService(typeof(FileUtilityService));
+ FileUtilityService fileUtilityService = (FileUtilityService)ServiceManager.GetService(typeof(FileUtilityService));
string rel_outputdir = fileUtilityService.AbsoluteToRelativePath (path, outputdir);
StreamWriter buildstream = new StreamWriter (Path.Combine (path, "make.sh"));
Modified: trunk/MonoDevelop/src/Main/Base/Internal/Project/Combine/CombineEntry.cs
===================================================================
--- trunk/MonoDevelop/src/Main/Base/Internal/Project/Combine/CombineEntry.cs 2004-06-23 23:08:38 UTC (rev 1814)
+++ trunk/MonoDevelop/src/Main/Base/Internal/Project/Combine/CombineEntry.cs 2004-06-24 02:05:41 UTC (rev 1815)
@@ -106,15 +106,15 @@
public override void Build(bool doBuildAll)
{ // if you change something here look at the DefaultProjectService BeforeCompile method
if (doBuildAll || isDirty) {
- StringParserService stringParserService = (StringParserService)ServiceManager.Services.GetService(typeof(StringParserService));
+ StringParserService stringParserService = (StringParserService)ServiceManager.GetService(typeof(StringParserService));
stringParserService.Properties["Project"] = Name;
- IProjectService projectService = (IProjectService)MonoDevelop.Core.Services.ServiceManager.Services.GetService(typeof(IProjectService));
- IStatusBarService statusBarService = (IStatusBarService)MonoDevelop.Core.Services.ServiceManager.Services.GetService(typeof(IStatusBarService));
- TaskService taskService = (TaskService)MonoDevelop.Core.Services.ServiceManager.Services.GetService(typeof(TaskService));
- IResourceService resourceService = (IResourceService)ServiceManager.Services.GetService(typeof(IResourceService));
+ IProjectService projectService = (IProjectService)MonoDevelop.Core.Services.ServiceManager.GetService(typeof(IProjectService));
+ IStatusBarService statusBarService = (IStatusBarService)MonoDevelop.Core.Services.ServiceManager.GetService(typeof(IStatusBarService));
+ TaskService taskService = (TaskService)MonoDevelop.Core.Services.ServiceManager.GetService(typeof(TaskService));
+ IResourceService resourceService = (IResourceService)ServiceManager.GetService(typeof(IResourceService));
statusBarService.SetMessage(String.Format (GettextCatalog.GetString ("Compiling: {0}"), Project.Name));
- LanguageBindingService languageBindingService = (LanguageBindingService)MonoDevelop.Core.Services.ServiceManager.Services.GetService(typeof(LanguageBindingService));
+ LanguageBindingService languageBindingService = (LanguageBindingService)MonoDevelop.Core.Services.ServiceManager.GetService(typeof(LanguageBindingService));
// create output directory, if not exists
string outputDir = ((AbstractProjectConfiguration)project.ActiveConfiguration).OutputDirectory;
@@ -179,12 +179,12 @@
public override void Execute()
{
- LanguageBindingService languageBindingService = (LanguageBindingService)MonoDevelop.Core.Services.ServiceManager.Services.GetService(typeof(LanguageBindingService));
+ LanguageBindingService languageBindingService = (LanguageBindingService)MonoDevelop.Core.Services.ServiceManager.GetService(typeof(LanguageBindingService));
ILanguageBinding binding = languageBindingService.GetBindingPerLanguageName(project.ProjectType);
if (binding == null) {
throw new ApplicationException("can't find language binding for project ");
}
- TaskService taskService = (TaskService)MonoDevelop.Core.Services.ServiceManager.Services.GetService(typeof(TaskService));
+ TaskService taskService = (TaskService)MonoDevelop.Core.Services.ServiceManager.GetService(typeof(TaskService));
if (taskService.Errors == 0) {
if (taskService.Warnings == 0 || project.ActiveConfiguration != null && ((AbstractProjectConfiguration)project.ActiveConfiguration).RunWithWarnings) {
@@ -196,13 +196,13 @@
public override void Debug ()
{
- LanguageBindingService langBindingServ = (LanguageBindingService)MonoDevelop.Core.Services.ServiceManager.Services.GetService (typeof (LanguageBindingService));
+ LanguageBindingService langBindingServ = (LanguageBindingService)MonoDevelop.Core.Services.ServiceManager.GetService (typeof (LanguageBindingService));
ILanguageBinding binding = langBindingServ.GetBindingPerLanguageName (project.ProjectType);
if (binding == null) {
Console.WriteLine ("Language binding unknown");
return;
}
- TaskService taskService = (TaskService)MonoDevelop.Core.Services.ServiceManager.Services.GetService (typeof (TaskService));
+ TaskService taskService = (TaskService)MonoDevelop.Core.Services.ServiceManager.GetService (typeof (TaskService));
if (taskService.Errors == 0)
binding.DebugProject (project);
@@ -216,14 +216,14 @@
public override void GenerateMakefiles (Combine parentCombine)
{
Console.WriteLine ("Generating makefiles for " + Name);
- LanguageBindingService languageBindingService = (LanguageBindingService)ServiceManager.Services.GetService(typeof(LanguageBindingService));
+ LanguageBindingService languageBindingService = (LanguageBindingService)ServiceManager.GetService(typeof(LanguageBindingService));
ILanguageBinding langBinding = languageBindingService.GetBindingPerLanguageName(project.ProjectType);
langBinding.GenerateMakefile (project, parentCombine);
}
public override string GetOutputName ()
{
- LanguageBindingService lbs = (LanguageBindingService)ServiceManager.Services.GetService (typeof (LanguageBindingService));
+ LanguageBindingService lbs = (LanguageBindingService)ServiceManager.GetService (typeof (LanguageBindingService));
ILanguageBinding langBinding = lbs.GetBindingPerLanguageName (project.ProjectType);
return System.IO.Path.GetFileName (langBinding.GetCompiledOutputName (project));
}
Modified: trunk/MonoDevelop/src/Main/Base/Internal/Project/Project/AbstractProject.cs
===================================================================
--- trunk/MonoDevelop/src/Main/Base/Internal/Project/Project/AbstractProject.cs 2004-06-23 23:08:38 UTC (rev 1814)
+++ trunk/MonoDevelop/src/Main/Base/Internal/Project/Project/AbstractProject.cs 2004-06-24 02:05:41 UTC (rev 1815)
@@ -56,7 +56,7 @@
protected ProjectReferenceCollection projectReferences = new ProjectReferenceCollection();
protected DeployInformation deployInformation = new DeployInformation();
- FileUtilityService fileUtilityService = (FileUtilityService)ServiceManager.Services.GetService(typeof(FileUtilityService));
+ FileUtilityService fileUtilityService = (FileUtilityService)ServiceManager.GetService(typeof(FileUtilityService));
[Browsable(false)]
public string BaseDirectory {
@@ -73,7 +73,7 @@
}
set {
if (projectname != value && value != null && value.Length > 0) {
- IProjectService projectService = (IProjectService)MonoDevelop.Core.Services.ServiceManager.Services.GetService(typeof(IProjectService));
+ IProjectService projectService = (IProjectService)MonoDevelop.Core.Services.ServiceManager.GetService(typeof(IProjectService));
if (!projectService.ExistsEntryWithName(value)) {
string oldName = projectname;
projectname = value;
@@ -190,7 +190,7 @@
public bool IsCompileable(string fileName)
{
- LanguageBindingService languageBindingService = (LanguageBindingService)MonoDevelop.Core.Services.ServiceManager.Services.GetService(typeof(LanguageBindingService));
+ LanguageBindingService languageBindingService = (LanguageBindingService)MonoDevelop.Core.Services.ServiceManager.GetService(typeof(LanguageBindingService));
return languageBindingService.GetBindingPerLanguageName(ProjectType).CanCompile(fileName);
}
@@ -262,9 +262,9 @@
}
if (version == "1.0") {
string tempFile = Path.GetTempFileName();
- IMessageService messageService =(IMessageService)ServiceManager.Services.GetService(typeof(IMessageService));
+ IMessageService messageService =(IMessageService)ServiceManager.GetService(typeof(IMessageService));
messageService.ShowMessage(String.Format (GettextCatalog.GetString ("Old project file format found.\n It will be automatically converted to {0} information"), currentProjectFileVersion));
- PropertyService propertyService = (PropertyService)ServiceManager.Services.GetService(typeof(PropertyService));
+ PropertyService propertyService = (PropertyService)ServiceManager.GetService(typeof(PropertyService));
ConvertXml.Convert(fileName,
propertyService.DataDirectory + Path.DirectorySeparatorChar +
@@ -505,8 +505,8 @@
doc.DocumentElement.AppendChild(configurationElement);
- FileUtilityService fileUtilityService = (FileUtilityService)ServiceManager.Services.GetService(typeof(FileUtilityService));
- IResourceService resourceService = (IResourceService)ServiceManager.Services.GetService(typeof(IResourceService));
+ FileUtilityService fileUtilityService = (FileUtilityService)ServiceManager.GetService(typeof(FileUtilityService));
+ IResourceService resourceService = (IResourceService)ServiceManager.GetService(typeof(IResourceService));
fileUtilityService.ObservedSave(new NamedFileOperationDelegate(doc.Save),
fileName,
GettextCatalog.GetString ("Can't save solution\nPlease check your file and directory permissions."),
@@ -530,8 +530,8 @@
if (fdiag.Run() == (int)Gtk.ResponseType.Ok) {
string filename = fdiag.Filename;
SaveProject(filename);
- IResourceService resourceService = (IResourceService)ServiceManager.Services.GetService(typeof(IResourceService));
- IMessageService messageService =(IMessageService)ServiceManager.Services.GetService(typeof(IMessageService));
+ IResourceService resourceService = (IResourceService)ServiceManager.GetService(typeof(IResourceService));
+ IMessageService messageService =(IMessageService)ServiceManager.GetService(typeof(IMessageService));
messageService.ShowMessage(filename, GettextCatalog.GetString ("Project saved"));
}
Modified: trunk/MonoDevelop/src/Main/Base/Internal/Project/Project/Deployment/AssemblyDeploy.cs
===================================================================
--- trunk/MonoDevelop/src/Main/Base/Internal/Project/Project/Deployment/AssemblyDeploy.cs 2004-06-23 23:08:38 UTC (rev 1814)
+++ trunk/MonoDevelop/src/Main/Base/Internal/Project/Project/Deployment/AssemblyDeploy.cs 2004-06-24 02:05:41 UTC (rev 1815)
@@ -23,15 +23,15 @@
public void DeployProject(IProject project)
{
- IResourceService resourceService = (IResourceService)ServiceManager.Services.GetService(typeof(IResourceService));
+ IResourceService resourceService = (IResourceService)ServiceManager.GetService(typeof(IResourceService));
if (project.DeployInformation.DeployTarget.Length == 0) {
- IMessageService messageService =(IMessageService)ServiceManager.Services.GetService(typeof(IMessageService));
+ IMessageService messageService =(IMessageService)ServiceManager.GetService(typeof(IMessageService));
messageService.ShowError(GettextCatalog.GetString ("Can't deploy: no deployment target set"));
return;
}
try {
AbstractProjectConfiguration config = (AbstractProjectConfiguration)project.ActiveConfiguration;
- FileUtilityService fileUtilityService = (FileUtilityService)ServiceManager.Services.GetService(typeof(FileUtilityService));
+ FileUtilityService fileUtilityService = (FileUtilityService)ServiceManager.GetService(typeof(FileUtilityService));
string assembly = fileUtilityService.GetDirectoryNameWithSeparator(config.OutputDirectory) + config.OutputAssembly;
foreach (string ext in extensions) {
@@ -42,7 +42,7 @@
}
throw new Exception("Assembly not found.");
} catch (Exception e) {
- IMessageService messageService =(IMessageService)ServiceManager.Services.GetService(typeof(IMessageService));
+ IMessageService messageService =(IMessageService)ServiceManager.GetService(typeof(IMessageService));
messageService.ShowError(e);
}
}
Modified: trunk/MonoDevelop/src/Main/Base/Internal/Project/Project/Deployment/FileDeploy.cs
===================================================================
--- trunk/MonoDevelop/src/Main/Base/Internal/Project/Project/Deployment/FileDeploy.cs 2004-06-23 23:08:38 UTC (rev 1814)
+++ trunk/MonoDevelop/src/Main/Base/Internal/Project/Project/Deployment/FileDeploy.cs 2004-06-24 02:05:41 UTC (rev 1815)
@@ -18,15 +18,15 @@
{
public void DeployProject(IProject project)
{
- IResourceService resourceService = (IResourceService)ServiceManager.Services.GetService(typeof(IResourceService));
+ IResourceService resourceService = (IResourceService)ServiceManager.GetService(typeof(IResourceService));
if (project.DeployInformation.DeployTarget.Length == 0) {
- IMessageService messageService =(IMessageService)ServiceManager.Services.GetService(typeof(IMessageService));
+ IMessageService messageService =(IMessageService)ServiceManager.GetService(typeof(IMessageService));
messageService.ShowError(GettextCatalog.GetString ("Can't deploy: you forgot to specify a deployment script"));
return;
}
try {
- FileUtilityService fileUtilityService = (FileUtilityService)ServiceManager.Services.GetService(typeof(FileUtilityService));
+ FileUtilityService fileUtilityService = (FileUtilityService)ServiceManager.GetService(typeof(FileUtilityService));
foreach (ProjectFile fInfo in project.ProjectFiles) {
try {
if (!project.DeployInformation.IsFileExcluded(fInfo.Name)) {
@@ -41,7 +41,7 @@
}
}
} catch (Exception e) {
- IMessageService messageService =(IMessageService)ServiceManager.Services.GetService(typeof(IMessageService));
+ IMessageService messageService =(IMessageService)ServiceManager.GetService(typeof(IMessageService));
messageService.ShowError(e);
}
}
Modified: trunk/MonoDevelop/src/Main/Base/Internal/Project/Project/Deployment/ScriptDeploy.cs
===================================================================
--- trunk/MonoDevelop/src/Main/Base/Internal/Project/Project/Deployment/ScriptDeploy.cs 2004-06-23 23:08:38 UTC (rev 1814)
+++ trunk/MonoDevelop/src/Main/Base/Internal/Project/Project/Deployment/ScriptDeploy.cs 2004-06-24 02:05:41 UTC (rev 1815)
@@ -18,21 +18,21 @@
{
public void DeployProject(IProject project)
{
- IResourceService resourceService = (IResourceService)ServiceManager.Services.GetService(typeof(IResourceService));
+ IResourceService resourceService = (IResourceService)ServiceManager.GetService(typeof(IResourceService));
if (project.DeployInformation.DeployScript.Length == 0) {
- IMessageService messageService =(IMessageService)ServiceManager.Services.GetService(typeof(IMessageService));
+ IMessageService messageService =(IMessageService)ServiceManager.GetService(typeof(IMessageService));
messageService.ShowError(GettextCatalog.GetString ("Can't deploy: you forgot to specify a deployment script"));
return;
}
try {
- FileUtilityService fileUtilityService = (FileUtilityService)ServiceManager.Services.GetService(typeof(FileUtilityService));
+ FileUtilityService fileUtilityService = (FileUtilityService)ServiceManager.GetService(typeof(FileUtilityService));
if (fileUtilityService.TestFileExists(project.DeployInformation.DeployScript)) {
ProcessStartInfo pInfo = new ProcessStartInfo(project.DeployInformation.DeployScript);
pInfo.WorkingDirectory = Path.GetDirectoryName(project.DeployInformation.DeployScript);
Process.Start(pInfo);
}
} catch (Exception e) {
- IMessageService messageService =(IMessageService)ServiceManager.Services.GetService(typeof(IMessageService));
+ IMessageService messageService =(IMessageService)ServiceManager.GetService(typeof(IMessageService));
messageService.ShowError(e, GettextCatalog.GetString ("Error while executing deploy script"));
}
}
Modified: trunk/MonoDevelop/src/Main/Base/Internal/Project/Project/IncludeFilesDialog.cs
===================================================================
--- trunk/MonoDevelop/src/Main/Base/Internal/Project/Project/IncludeFilesDialog.cs 2004-06-23 23:08:38 UTC (rev 1814)
+++ trunk/MonoDevelop/src/Main/Base/Internal/Project/Project/IncludeFilesDialog.cs 2004-06-24 02:05:41 UTC (rev 1815)
@@ -42,8 +42,8 @@
// regular members
StringCollection newFiles;
IProject project;
- IResourceService resourceService = (IResourceService)ServiceManager.Services.GetService(typeof(IResourceService));
- FileUtilityService fileUtilityService = (FileUtilityService)ServiceManager.Services.GetService(typeof(FileUtilityService));
+ IResourceService resourceService = (IResourceService)ServiceManager.GetService(typeof(IResourceService));
+ FileUtilityService fileUtilityService = (FileUtilityService)ServiceManager.GetService(typeof(FileUtilityService));
public IncludeFilesDialog(IProject project, StringCollection newFiles)
{
@@ -52,7 +52,7 @@
glade.Autoconnect (this);
// set up dialog title
- StringParserService stringParserService = (StringParserService)ServiceManager.Services.GetService(typeof(StringParserService));
+ StringParserService stringParserService = (StringParserService)ServiceManager.GetService(typeof(StringParserService));
this.IncludeFilesDialogWidget.Title = String.Format (GettextCatalog.GetString ("Found new files in {0}"), project.Name);
newFilesOnlyRadioButton.Active = true;
Modified: trunk/MonoDevelop/src/Main/Base/Internal/Project/Project/ProjectReference.cs
===================================================================
--- trunk/MonoDevelop/src/Main/Base/Internal/Project/Project/ProjectReference.cs 2004-06-23 23:08:38 UTC (rev 1814)
+++ trunk/MonoDevelop/src/Main/Base/Internal/Project/Project/ProjectReference.cs 2004-06-24 02:05:41 UTC (rev 1815)
@@ -80,7 +80,7 @@
}
set {
localCopy = value;
- IProjectService projectService = (IProjectService)MonoDevelop.Core.Services.ServiceManager.Services.GetService(typeof(IProjectService));
+ IProjectService projectService = (IProjectService)MonoDevelop.Core.Services.ServiceManager.GetService(typeof(IProjectService));
projectService.SaveCombine();
}
}
@@ -98,10 +98,10 @@
return reference;
case ReferenceType.Gac:
- string file = ((IParserService)ServiceManager.Services.GetService (typeof (IParserService))).LoadAssemblyFromGac (GetPathToGACAssembly (this));
+ string file = ((IParserService)ServiceManager.GetService (typeof (IParserService))).LoadAssemblyFromGac (GetPathToGACAssembly (this));
return file == String.Empty ? reference : file;
case ReferenceType.Project:
- IProjectService projectService = (IProjectService)MonoDevelop.Core.Services.ServiceManager.Services.GetService(typeof(IProjectService));
+ IProjectService projectService = (IProjectService)MonoDevelop.Core.Services.ServiceManager.GetService(typeof(IProjectService));
string projectOutputLocation = projectService.GetOutputAssemblyName(reference);
return projectOutputLocation;
Modified: trunk/MonoDevelop/src/Main/Base/Internal/Templates/CodeTemplateLoader.cs
===================================================================
--- trunk/MonoDevelop/src/Main/Base/Internal/Templates/CodeTemplateLoader.cs 2004-06-23 23:08:38 UTC (rev 1814)
+++ trunk/MonoDevelop/src/Main/Base/Internal/Templates/CodeTemplateLoader.cs 2004-06-24 02:05:41 UTC (rev 1815)
@@ -86,7 +86,7 @@
doc.DocumentElement.AppendChild(codeTemplateGroup.ToXmlElement(doc));
}
- FileUtilityService fileUtilityService = (FileUtilityService)ServiceManager.Services.GetService(typeof(FileUtilityService));
+ FileUtilityService fileUtilityService = (FileUtilityService)ServiceManager.GetService(typeof(FileUtilityService));
fileUtilityService.ObservedSave(new NamedFileOperationDelegate(doc.Save), fileName, FileErrorPolicy.ProvideAlternative);
}
@@ -96,15 +96,15 @@
/// </summary>
static CodeTemplateLoader()
{
- PropertyService propertyService = (PropertyService)ServiceManager.Services.GetService(typeof(PropertyService));
- FileUtilityService fileUtilityService = (FileUtilityService)ServiceManager.Services.GetService(typeof(FileUtilityService));
+ PropertyService propertyService = (PropertyService)ServiceManager.GetService(typeof(PropertyService));
+ FileUtilityService fileUtilityService = (FileUtilityService)ServiceManager.GetService(typeof(FileUtilityService));
if (!LoadTemplatesFromStream(Path.Combine(propertyService.ConfigDirectory, TemplateFileName))) {
Console.WriteLine("Templates: can't load user defaults, reading system defaults");
if (!LoadTemplatesFromStream(propertyService.DataDirectory +
Path.DirectorySeparatorChar + "options" +
Path.DirectorySeparatorChar + TemplateFileName)) {
- IMessageService messageService = (IMessageService)ServiceManager.Services.GetService(typeof(IMessageService));
+ IMessageService messageService = (IMessageService)ServiceManager.GetService(typeof(IMessageService));
messageService.ShowWarning(GettextCatalog.GetString ("Can't load templates configuration file"));
}
}
@@ -116,7 +116,7 @@
/// </summary>
public static void SaveTemplates()
{
- PropertyService propertyService = (PropertyService)ServiceManager.Services.GetService(typeof(PropertyService));
+ PropertyService propertyService = (PropertyService)ServiceManager.GetService(typeof(PropertyService));
WriteTemplatesToFile(Path.Combine(propertyService.ConfigDirectory, TemplateFileName));
}
}
Modified: trunk/MonoDevelop/src/Main/Base/Internal/Templates/FileTemplate.cs
===================================================================
--- trunk/MonoDevelop/src/Main/Base/Internal/Templates/FileTemplate.cs 2004-06-23 23:08:38 UTC (rev 1814)
+++ trunk/MonoDevelop/src/Main/Base/Internal/Templates/FileTemplate.cs 2004-06-24 02:05:41 UTC (rev 1815)
@@ -151,9 +151,9 @@
static FileTemplate()
{
- FileUtilityService fileUtilityService = (FileUtilityService)ServiceManager.Services.GetService(typeof(FileUtilityService));
- PropertyService propertyService = (PropertyService)ServiceManager.Services.GetService(typeof(PropertyService));
- IMessageService messageService = (IMessageService)ServiceManager.Services.GetService(typeof(IMessageService));
+ FileUtilityService fileUtilityService = (FileUtilityService)ServiceManager.GetService(typeof(FileUtilityService));
+ PropertyService propertyService = (PropertyService)ServiceManager.GetService(typeof(PropertyService));
+ IMessageService messageService = (IMessageService)ServiceManager.GetService(typeof(IMessageService));
StringCollection files = fileUtilityService.SearchDirectory(propertyService.DataDirectory +
Path.DirectorySeparatorChar + "templates" +
Modified: trunk/MonoDevelop/src/Main/Base/Internal/Templates/ProjectTemplates/CombineDescriptor.cs
===================================================================
--- trunk/MonoDevelop/src/Main/Base/Internal/Templates/ProjectTemplates/CombineDescriptor.cs 2004-06-23 23:08:38 UTC (rev 1814)
+++ trunk/MonoDevelop/src/Main/Base/Internal/Templates/ProjectTemplates/CombineDescriptor.cs 2004-06-24 02:05:41 UTC (rev 1815)
@@ -56,8 +56,8 @@
public string CreateCombine(ProjectCreateInformation projectCreateInformation, string defaultLanguage)
{
- FileUtilityService fileUtilityService = (FileUtilityService)ServiceManager.Services.GetService(typeof(FileUtilityService));
- StringParserService stringParserService = (StringParserService)ServiceManager.Services.GetService(typeof(StringParserService));
+ FileUtilityService fileUtilityService = (FileUtilityService)ServiceManager.GetService(typeof(FileUtilityService));
+ StringParserService stringParserService = (StringParserService)ServiceManager.GetService(typeof(StringParserService));
Combine newCombine = new Combine();
string newCombineName = stringParserService.Parse(name, new string[,] {
@@ -96,7 +96,7 @@
string combineLocation = fileUtilityService.GetDirectoryNameWithSeparator(projectCreateInformation.CombinePath) + newCombineName + ".cmbx";
newCombine.OutputDirectory = Path.Combine (Path.Combine (Path.GetDirectoryName (combineLocation), "build"), "bin");
if (File.Exists(combineLocation)) {
- IMessageService messageService =(IMessageService)ServiceManager.Services.GetService(typeof(IMessageService));
+ IMessageService messageService =(IMessageService)ServiceManager.GetService(typeof(IMessageService));
if (messageService.AskQuestion(String.Format (GettextCatalog.GetString ("Solution file {0} already exists, do you want to overwrite\nthe existing file ?"), combineLocation))) {
newCombine.SaveCombine(combineLocation);
}
Modified: trunk/MonoDevelop/src/Main/Base/Internal/Templates/ProjectTemplates/ProjectDescriptor.cs
===================================================================
--- trunk/MonoDevelop/src/Main/Base/Internal/Templates/ProjectTemplates/ProjectDescriptor.cs 2004-06-23 23:08:38 UTC (rev 1814)
+++ trunk/MonoDevelop/src/Main/Base/Internal/Templates/ProjectTemplates/ProjectDescriptor.cs 2004-06-24 02:05:41 UTC (rev 1815)
@@ -74,16 +74,16 @@
public string CreateProject(ProjectCreateInformation projectCreateInformation, string defaultLanguage)
{
- LanguageBindingService languageBindingService = (LanguageBindingService)MonoDevelop.Core.Services.ServiceManager.Services.GetService(typeof(LanguageBindingService));
- StringParserService stringParserService = (StringParserService)ServiceManager.Services.GetService(typeof(StringParserService));
- FileUtilityService fileUtilityService = (FileUtilityService)ServiceManager.Services.GetService(typeof(FileUtilityService));
+ LanguageBindingService languageBindingService = (LanguageBindingService)MonoDevelop.Core.Services.ServiceManager.GetService(typeof(LanguageBindingService));
+ StringParserService stringParserService = (StringParserService)ServiceManager.GetService(typeof(StringParserService));
+ FileUtilityService fileUtilityService = (FileUtilityService)ServiceManager.GetService(typeof(FileUtilityService));
string language = languageName != null && languageName.Length > 0 ? languageName : defaultLanguage;
ILanguageBinding languageinfo = languageBindingService.GetBindingPerLanguageName(language);
if (languageinfo == null) {
- IMessageService messageService =(IMessageService)ServiceManager.Services.GetService(typeof(IMessageService));
+ IMessageService messageService =(IMessageService)ServiceManager.GetService(typeof(IMessageService));
messageService.ShowError(String.Format (GettextCatalog.GetString ("Can't create project with type : {0}"), language));
return String.Empty;
}
@@ -109,7 +109,7 @@
project.ProjectFiles.Add(resource);
if (File.Exists(fileName)) {
- IMessageService messageService =(IMessageService)ServiceManager.Services.GetService(typeof(IMessageService));
+ IMessageService messageService =(IMessageService)ServiceManager.GetService(typeof(IMessageService));
if (!messageService.AskQuestion(String.Format (GettextCatalog.GetString ("File {0} already exists, do you want to overwrite\nthe existing file ?"), fileName), GettextCatalog.GetString ("File already exists"))) {
continue;
}
@@ -123,7 +123,7 @@
sr.Write(stringParserService.Parse(file.Content, new string[,] { {"ProjectName", projectCreateInformation.ProjectName}, {"FileName", fileName}}));
sr.Close();
} catch (Exception ex) {
- IMessageService messageService =(IMessageService)ServiceManager.Services.GetService(typeof(IMessageService));
+ IMessageService messageService =(IMessageService)ServiceManager.GetService(typeof(IMessageService));
messageService.ShowError(ex, String.Format (GettextCatalog.GetString ("File {0} could not be written."), fileName));
}
}
@@ -135,7 +135,7 @@
project.ProjectFiles.Add(new ProjectFile(fileName));
if (File.Exists(fileName)) {
- IMessageService messageService =(IMessageService)ServiceManager.Services.GetService(typeof(IMessageService));
+ IMessageService messageService =(IMessageService)ServiceManager.GetService(typeof(IMessageService));
if (!messageService.AskQuestion(String.Format (GettextCatalog.GetString ("File {0} already exists, do you want to overwrite\nthe existing file ?"), fileName), GettextCatalog.GetString ("File already exists"))) {
continue;
}
@@ -149,7 +149,7 @@
sr.Write(stringParserService.Parse(file.Content, new string[,] { {"ProjectName", projectCreateInformation.ProjectName}, {"FileName", fileName}}));
sr.Close();
} catch (Exception ex) {
- IMessageService messageService =(IMessageService)ServiceManager.Services.GetService(typeof(IMessageService));
+ IMessageService messageService =(IMessageService)ServiceManager.GetService(typeof(IMessageService));
messageService.ShowError(ex, String.Format (GettextCatalog.GetString ("File {0} could not be written."), fileName));
}
}
@@ -158,7 +158,7 @@
string projectLocation = fileUtilityService.GetDirectoryNameWithSeparator(projectCreateInformation.ProjectBasePath) + newProjectName + ".prjx";
if (File.Exists(projectLocation)) {
- IMessageService messageService =(IMessageService)ServiceManager.Services.GetService(typeof(IMessageService));
+ IMessageService messageService =(IMessageService)ServiceManager.GetService(typeof(IMessageService));
if (messageService.AskQuestion(String.Format (GettextCatalog.GetString ("Project file {0} already exists, do you want to overwrite\nthe existing file ?"), projectLocation), GettextCatalog.GetString ("File already exists"))) {
project.SaveProject(projectLocation);
}
Modified: trunk/MonoDevelop/src/Main/Base/Internal/Templates/ProjectTemplates/ProjectTemplate.cs
===================================================================
--- trunk/MonoDevelop/src/Main/Base/Internal/Templates/ProjectTemplates/ProjectTemplate.cs 2004-06-23 23:08:38 UTC (rev 1814)
+++ trunk/MonoDevelop/src/Main/Base/Internal/Templates/ProjectTemplates/ProjectTemplate.cs 2004-06-24 02:05:41 UTC (rev 1815)
@@ -32,7 +32,7 @@
public void Run(ProjectCreateInformation projectCreateInformation)
{
- IFileService fileService = (IFileService)MonoDevelop.Core.Services.ServiceManager.Services.GetService(typeof(IFileService));
+ IFileService fileService = (IFileService)MonoDevelop.Core.Services.ServiceManager.GetService(typeof(IFileService));
fileService.OpenFile(projectCreateInformation.ProjectBasePath + Path.DirectorySeparatorChar + fileName);
}
}
@@ -190,7 +190,7 @@
public void OpenCreatedCombine()
{
- IProjectService projectService = (IProjectService)MonoDevelop.Core.Services.ServiceManager.Services.GetService(typeof(IProjectService));
+ IProjectService projectService = (IProjectService)MonoDevelop.Core.Services.ServiceManager.GetService(typeof(IProjectService));
projectService.OpenCombine(lastCombine);
foreach (OpenFileAction action in actions) {
@@ -209,8 +209,8 @@
static ProjectTemplate()
{
- FileUtilityService fileUtilityService = (FileUtilityService)ServiceManager.Services.GetService(typeof(FileUtilityService));
- PropertyService propertyService = (PropertyService)ServiceManager.Services.GetService(typeof(PropertyService));
+ FileUtilityService fileUtilityService = (FileUtilityService)ServiceManager.GetService(typeof(FileUtilityService));
+ PropertyService propertyService = (PropertyService)ServiceManager.GetService(typeof(PropertyService));
StringCollection files = fileUtilityService.SearchDirectory(propertyService.DataDirectory +
Path.DirectorySeparatorChar + "templates" +
Path.DirectorySeparatorChar + "project", "*.xpt");
@@ -218,8 +218,8 @@
try {
ProjectTemplates.Add(new ProjectTemplate(fileName));
} catch (Exception e) {
- IResourceService resourceService = (IResourceService)ServiceManager.Services.GetService(typeof(IResourceService));
- IMessageService messageService =(IMessageService)ServiceManager.Services.GetService(typeof(IMessageService));
+ IResourceService resourceService = (IResourceService)ServiceManager.GetService(typeof(IResourceService));
+ IMessageService messageService =(IMessageService)ServiceManager.GetService(typeof(IMessageService));
messageService.ShowError(e, resourceService.GetString("Internal.Templates.ProjectTemplate.LoadingError") + "\n(" + fileName + ")\n");
}
}
Modified: trunk/MonoDevelop/src/Main/Base/Internal/Templates/TextTemplate.cs
===================================================================
--- trunk/MonoDevelop/src/Main/Base/Internal/Templates/TextTemplate.cs 2004-06-23 23:08:38 UTC (rev 1814)
+++ trunk/MonoDevelop/src/Main/Base/Internal/Templates/TextTemplate.cs 2004-06-24 02:05:41 UTC (rev 1815)
@@ -81,8 +81,8 @@
static TextTemplate()
{
- FileUtilityService fileUtilityService = (FileUtilityService)ServiceManager.Services.GetService(typeof(FileUtilityService));
- PropertyService propertyService = (PropertyService)ServiceManager.Services.GetService(typeof(PropertyService));
+ FileUtilityService fileUtilityService = (FileUtilityService)ServiceManager.GetService(typeof(FileUtilityService));
+ PropertyService propertyService = (PropertyService)ServiceManager.GetService(typeof(PropertyService));
StringCollection files = fileUtilityService.SearchDirectory(propertyService.DataDirectory +
Path.DirectorySeparatorChar + "options" +
Modified: trunk/MonoDevelop/src/Main/Base/Makefile.am
===================================================================
--- trunk/MonoDevelop/src/Main/Base/Makefile.am 2004-06-23 23:08:38 UTC (rev 1814)
+++ trunk/MonoDevelop/src/Main/Base/Makefile.am 2004-06-24 02:05:41 UTC (rev 1815)
@@ -137,14 +137,6 @@
./Gui/PadContentCollection.cs \
./Gui/PixbufList.cs \
./Gui/AbstractSecondaryViewContent.cs \
-./Gui/CompletionDatabaseWizard/CreateDBGenerator.cs \
-./Gui/CompletionDatabaseWizard/DownloadGenerator.cs \
-./Gui/CompletionDatabaseWizard/CreatingGenerator.cs \
-./Gui/CompletionDatabaseWizard/GenerateDatabase.cs \
-./Gui/CompletionDatabaseWizard/druid.cs \
-./Gui/CompletionDatabaseWizard/Exceptions.cs \
-./Gui/CompletionDatabaseWizard/IDatabaseGenerator.cs \
-./Gui/CompletionDatabaseWizard/UseExistingGenerator.cs \
./Gui/ViewContentCollection.cs \
./Gui/IWorkbenchWindow.cs \
./Gui/HtmlControl/IHTMLDocument2.cs \
Modified: trunk/MonoDevelop/src/Main/Base/Services/AmbienceService/AmbienceService.cs
===================================================================
--- trunk/MonoDevelop/src/Main/Base/Services/AmbienceService/AmbienceService.cs 2004-06-23 23:08:38 UTC (rev 1814)
+++ trunk/MonoDevelop/src/Main/Base/Services/AmbienceService/AmbienceService.cs 2004-06-24 02:05:41 UTC (rev 1815)
@@ -20,7 +20,7 @@
public IProperties CodeGenerationProperties {
get {
- PropertyService propertyService = (PropertyService)ServiceManager.Services.GetService(typeof(PropertyService));
+ PropertyService propertyService = (PropertyService)ServiceManager.GetService(typeof(PropertyService));
return (IProperties)propertyService.GetProperty(codeGenerationProperty, new DefaultProperties());
}
}
@@ -45,7 +45,7 @@
public AmbienceReflectionDecorator CurrentAmbience {
get {
- PropertyService propertyService = (PropertyService)ServiceManager.Services.GetService(typeof(PropertyService));
+ PropertyService propertyService = (PropertyService)ServiceManager.GetService(typeof(PropertyService));
string language = propertyService.GetProperty(ambienceProperty, "CSharp");
return new AmbienceReflectionDecorator((IAmbience)AddInTreeSingleton.AddInTree.GetTreeNode("/SharpDevelop/Workbench/Ambiences").BuildChildItem(language, this));
}
@@ -60,7 +60,7 @@
public override void InitializeService()
{
- PropertyService propertyService = (PropertyService)ServiceManager.Services.GetService(typeof(PropertyService));
+ PropertyService propertyService = (PropertyService)ServiceManager.GetService(typeof(PropertyService));
propertyService.PropertyChanged += new PropertyEventHandler(PropertyChanged);
}
Modified: trunk/MonoDevelop/src/Main/Base/Services/AmbienceService/CodeDOMGeneratorUtility.cs
===================================================================
--- trunk/MonoDevelop/src/Main/Base/Services/AmbienceService/CodeDOMGeneratorUtility.cs 2004-06-23 23:08:38 UTC (rev 1814)
+++ trunk/MonoDevelop/src/Main/Base/Services/AmbienceService/CodeDOMGeneratorUtility.cs 2004-06-24 02:05:41 UTC (rev 1815)
@@ -18,7 +18,7 @@
{
public class CodeDOMGeneratorUtility
{
- AmbienceService ambienceService = (AmbienceService)MonoDevelop.Core.Services.ServiceManager.Services.GetService(typeof(AmbienceService));
+ AmbienceService ambienceService = (AmbienceService)MonoDevelop.Core.Services.ServiceManager.GetService(typeof(AmbienceService));
public CodeGeneratorOptions CreateCodeGeneratorOptions {
get {
@@ -27,7 +27,7 @@
options.BracingStyle = ambienceService.CodeGenerationProperties.GetProperty("StartBlockOnSameLine", true) ? "Block" : "C";
options.ElseOnClosing = ambienceService.CodeGenerationProperties.GetProperty("ElseOnClosing", true);
- PropertyService propertyService = (PropertyService)ServiceManager.Services.GetService(typeof(PropertyService));
+ PropertyService propertyService = (PropertyService)ServiceManager.GetService(typeof(PropertyService));
IProperties docProperties = ((IProperties)propertyService.GetProperty("MonoDevelop.TextEditor.Document.Document.DefaultDocumentAggregatorProperties", new DefaultProperties()));
if ((bool)docProperties.GetProperty("TabsToSpaces", false)) {
Modified: trunk/MonoDevelop/src/Main/Base/Services/File/DefaultFileService.cs
===================================================================
--- trunk/MonoDevelop/src/Main/Base/Services/File/DefaultFileService.cs 2004-06-23 23:08:38 UTC (rev 1814)
+++ trunk/MonoDevelop/src/Main/Base/Services/File/DefaultFileService.cs 2004-06-24 02:05:41 UTC (rev 1815)
@@ -27,12 +27,12 @@
{
string currentFile;
RecentOpen recentOpen = null;
- FileUtilityService fileUtilityService = (FileUtilityService)ServiceManager.Services.GetService(typeof(FileUtilityService));
+ FileUtilityService fileUtilityService = (FileUtilityService)ServiceManager.GetService(typeof(FileUtilityService));
public RecentOpen RecentOpen {
get {
if (recentOpen == null) {
- PropertyService propertyService = (PropertyService)ServiceManager.Services.GetService(typeof(PropertyService));
+ PropertyService propertyService = (PropertyService)ServiceManager.GetService(typeof(PropertyService));
recentOpen = (RecentOpen)propertyService.GetProperty("MonoDevelop.Gui.MainWindow.RecentOpen", new RecentOpen());
}
return recentOpen;
@@ -76,14 +76,14 @@
newContent.PathRelativeToProject = pathrelativetoproject;
}
WorkbenchSingleton.Workbench.ShowView(newContent);
- DisplayBindingService displayBindingService = (DisplayBindingService)MonoDevelop.Core.Services.ServiceManager.Services.GetService(typeof(DisplayBindingService));
+ DisplayBindingService displayBindingService = (DisplayBindingService)MonoDevelop.Core.Services.ServiceManager.GetService(typeof(DisplayBindingService));
displayBindingService.AttachSubWindows(newContent.WorkbenchWindow);
}
}
public void OpenFile (string fileName)
{
- DispatchService dispatcher = (DispatchService)ServiceManager.Services.GetService (typeof (DispatchService));
+ DispatchService dispatcher = (DispatchService)ServiceManager.GetService (typeof (DispatchService));
dispatcher.GuiDispatch (new StatefulMessageHandler (realOpenFile), fileName);
}
@@ -122,9 +122,9 @@
}
}
- DisplayBindingService displayBindingService = (DisplayBindingService)MonoDevelop.Core.Services.ServiceManager.Services.GetService(typeof(DisplayBindingService));
+ DisplayBindingService displayBindingService = (DisplayBindingService)MonoDevelop.Core.Services.ServiceManager.GetService(typeof(DisplayBindingService));
- IFileService fileService = (IFileService)MonoDevelop.Core.Services.ServiceManager.Services.GetService(typeof(IFileService));
+ IFileService fileService = (IFileService)MonoDevelop.Core.Services.ServiceManager.GetService(typeof(IFileService));
IDisplayBinding binding = displayBindingService.GetBindingPerFileName(fileName);
if (binding != null) {
@@ -164,7 +164,7 @@
protected void GetProjectAndCombineFromFile (string fileName, out IProject project, out Combine combine)
{
- IProjectService projectService = (IProjectService) ServiceManager.Services.GetService(typeof(IProjectService));
+ IProjectService projectService = (IProjectService) ServiceManager.GetService(typeof(IProjectService));
combine = projectService.CurrentOpenCombine;
project = null;
@@ -205,7 +205,7 @@
public void NewFile(string defaultName, string language, string content)
{
- DisplayBindingService displayBindingService = (DisplayBindingService)MonoDevelop.Core.Services.ServiceManager.Services.GetService(typeof(DisplayBindingService));
+ DisplayBindingService displayBindingService = (DisplayBindingService)MonoDevelop.Core.Services.ServiceManager.GetService(typeof(DisplayBindingService));
IDisplayBinding binding = displayBindingService.GetBindingPerLanguageName(language);
if (binding != null) {
@@ -251,7 +251,7 @@
try {
Directory.Delete(fileName);
} catch (Exception e) {
- IMessageService messageService = (IMessageService)ServiceManager.Services.GetService(typeof(IMessageService));
+ IMessageService messageService = (IMessageService)ServiceManager.GetService(typeof(IMessageService));
messageService.ShowError(e, String.Format (GettextCatalog.GetString ("Can't remove directory {0}"), fileName));
return;
}
@@ -260,7 +260,7 @@
try {
File.Delete(fileName);
} catch (Exception e) {
- IMessageService messageService = (IMessageService)ServiceManager.Services.GetService(typeof(IMessageService));
+ IMessageService messageService = (IMessageService)ServiceManager.GetService(typeof(IMessageService));
messageService.ShowError(e, String.Format (GettextCatalog.GetString ("Can't remove file {0}"), fileName));
return;
}
@@ -275,7 +275,7 @@
try {
Directory.Move(oldName, newName);
} catch (Exception e) {
- IMessageService messageService = (IMessageService)ServiceManager.Services.GetService(typeof(IMessageService));
+ IMessageService messageService = (IMessageService)ServiceManager.GetService(typeof(IMessageService));
messageService.ShowError(e, String.Format (GettextCatalog.GetString ("Can't rename directory {0}"), oldName));
return;
}
@@ -284,7 +284,7 @@
try {
File.Move(oldName, newName);
} catch (Exception e) {
- IMessageService messageService = (IMessageService)ServiceManager.Services.GetService(typeof(IMessageService));
+ IMessageService messageService = (IMessageService)ServiceManager.GetService(typeof(IMessageService));
messageService.ShowError(e, String.Format (GettextCatalog.GetString ("Can't rename file {0}"), oldName));
return;
}
Modified: trunk/MonoDevelop/src/Main/Base/Services/Language/LanguageService.cs
===================================================================
--- trunk/MonoDevelop/src/Main/Base/Services/Language/LanguageService.cs 2004-06-23 23:08:38 UTC (rev 1814)
+++ trunk/MonoDevelop/src/Main/Base/Services/Language/LanguageService.cs 2004-06-24 02:05:41 UTC (rev 1815)
@@ -66,7 +66,7 @@
public LanguageService()
{
- PropertyService propertyService = (PropertyService)ServiceManager.Services.GetService(typeof(PropertyService));
+ PropertyService propertyService = (PropertyService)ServiceManager.GetService(typeof(PropertyService));
languagePath = propertyService.DataDirectory +
Path.DirectorySeparatorChar + "resources" +
Path.DirectorySeparatorChar + "languages" +
Modified: trunk/MonoDevelop/src/Main/Base/Services/MenuService/MenuService.cs
===================================================================
--- trunk/MonoDevelop/src/Main/Base/Services/MenuService/MenuService.cs 2004-06-23 23:08:38 UTC (rev 1814)
+++ trunk/MonoDevelop/src/Main/Base/Services/MenuService/MenuService.cs 2004-06-24 02:05:41 UTC (rev 1815)
@@ -112,7 +112,7 @@
//public void CreateQuickInsertMenu(TextBoxBase targetControl, Control popupControl, string[,] quickInsertMenuItems)
public void CreateQuickInsertMenu(Gtk.Editable targetControl, Gtk.Button popupControl, string[,] quickInsertMenuItems)
{
- StringParserService stringParserService = (StringParserService)ServiceManager.Services.GetService(typeof(StringParserService));
+ StringParserService stringParserService = (StringParserService)ServiceManager.GetService(typeof(StringParserService));
//CommandBarContextMenu contextMenu = new CommandBarContextMenu();
Gtk.Menu contextMenu = new Gtk.Menu();
Modified: trunk/MonoDevelop/src/Main/Base/Services/MessageService.cs
===================================================================
--- trunk/MonoDevelop/src/Main/Base/Services/MessageService.cs 2004-06-23 23:08:38 UTC (rev 1814)
+++ trunk/MonoDevelop/src/Main/Base/Services/MessageService.cs 2004-06-24 02:05:41 UTC (rev 1815)
@@ -20,7 +20,7 @@
/// </summary>
public class MessageService : AbstractService, IMessageService
{
- StringParserService stringParserService = (StringParserService)ServiceManager.Services.GetService(typeof(StringParserService));
+ StringParserService stringParserService = (StringParserService)ServiceManager.GetService(typeof(StringParserService));
public void ShowError(Exception ex)
{
Modified: trunk/MonoDevelop/src/Main/Base/Services/ParserService/DefaultParserService.cs
===================================================================
--- trunk/MonoDevelop/src/Main/Base/Services/ParserService/DefaultParserService.cs 2004-06-23 23:08:38 UTC (rev 1814)
+++ trunk/MonoDevelop/src/Main/Base/Services/ParserService/DefaultParserService.cs 2004-06-24 02:05:41 UTC (rev 1815)
@@ -229,8 +229,8 @@
void SetDefaultCompletionFileLocation()
{
- PropertyService propertyService = (PropertyService)ServiceManager.Services.GetService(typeof(PropertyService));
- FileUtilityService fileUtilityService = (FileUtilityService)ServiceManager.Services.GetService (typeof (FileUtilityService));
+ PropertyService propertyService = (PropertyService)ServiceManager.GetService(typeof(PropertyService));
+ FileUtilityService fileUtilityService = (FileUtilityService)ServiceManager.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");
@@ -255,7 +255,7 @@
coreDatabase = new AssemblyCodeCompletionDatabase (codeCompletionPath, coreName, this);
databases [CoreDB] = coreDatabase;
- IProjectService projectService = (IProjectService)MonoDevelop.Core.Services.ServiceManager.Services.GetService(typeof(IProjectService));
+ IProjectService projectService = (IProjectService)MonoDevelop.Core.Services.ServiceManager.GetService(typeof(IProjectService));
projectService.CombineOpened += new CombineEventHandler(OnCombineOpened);
projectService.CombineClosed += new CombineEventHandler(OnCombineClosed);
projectService.FileRemovedFromProject += new ProjectFileEventHandler (OnProjectFilesChanged);
@@ -1048,7 +1048,7 @@
ICompilationUnitBase parserOutput = null;
if (fileContent == null) {
- IProjectService projectService = (IProjectService)MonoDevelop.Core.Services.ServiceManager.Services.GetService(typeof(IProjectService));
+ IProjectService projectService = (IProjectService)MonoDevelop.Core.Services.ServiceManager.GetService(typeof(IProjectService));
if (projectService.CurrentOpenCombine != null) {
ArrayList projects = Combine.GetAllProjects(projectService.CurrentOpenCombine);
foreach (ProjectCombineEntry entry in projects) {
Modified: trunk/MonoDevelop/src/Main/Base/Services/Project/DefaultProjectService.cs
===================================================================
--- trunk/MonoDevelop/src/Main/Base/Services/Project/DefaultProjectService.cs 2004-06-23 23:08:38 UTC (rev 1814)
+++ trunk/MonoDevelop/src/Main/Base/Services/Project/DefaultProjectService.cs 2004-06-24 02:05:41 UTC (rev 1815)
@@ -120,7 +120,7 @@
}
}
- FileUtilityService fileUtilityService = (FileUtilityService)ServiceManager.Services.GetService(typeof(FileUtilityService));
+ FileUtilityService fileUtilityService = (FileUtilityService)ServiceManager.GetService(typeof(FileUtilityService));
public void OpenCombine(string filename)
{
@@ -132,7 +132,7 @@
if (!fileUtilityService.TestFileExists(filename)) {
return;
}
- IStatusBarService statusBarService = (IStatusBarService)MonoDevelop.Core.Services.ServiceManager.Services.GetService(typeof(IStatusBarService));
+ IStatusBarService statusBarService = (IStatusBarService)MonoDevelop.Core.Services.ServiceManager.GetService(typeof(IStatusBarService));
statusBarService.SetMessage(GettextCatalog.GetString ("Opening Combine..."));
if (Path.GetExtension(filename).ToUpper() == ".PRJX") {
@@ -157,7 +157,7 @@
void LoadCombine(string filename)
{
- DispatchService dispatcher = (DispatchService)ServiceManager.Services.GetService (typeof (DispatchService));
+ DispatchService dispatcher = (DispatchService)ServiceManager.GetService (typeof (DispatchService));
dispatcher.BackgroundDispatch (new StatefulMessageHandler (backgroundLoadCombine), filename);
}
@@ -173,7 +173,7 @@
openCombine = loadingCombine;
openCombineFileName = filename;
- IFileService fileService = (IFileService)MonoDevelop.Core.Services.ServiceManager.Services.GetService(typeof(IFileService));
+ IFileService fileService = (IFileService)MonoDevelop.Core.Services.ServiceManager.GetService(typeof(IFileService));
fileService.RecentOpen.AddLastProject(filename);
OnCombineOpened(new CombineEventArgs(openCombine));
@@ -253,7 +253,7 @@
{
if (openCombine != null) {
DoBeforeCompileAction();
- TaskService taskService = (TaskService)MonoDevelop.Core.Services.ServiceManager.Services.GetService(typeof(TaskService));
+ TaskService taskService = (TaskService)MonoDevelop.Core.Services.ServiceManager.GetService(typeof(TaskService));
taskService.Tasks.Clear();
taskService.NotifyTaskChange();
@@ -265,7 +265,7 @@
{
if (openCombine != null) {
DoBeforeCompileAction();
- TaskService taskService = (TaskService)MonoDevelop.Core.Services.ServiceManager.Services.GetService(typeof(TaskService));
+ TaskService taskService = (TaskService)MonoDevelop.Core.Services.ServiceManager.GetService(typeof(TaskService));
taskService.Tasks.Clear();
taskService.NotifyTaskChange();
@@ -276,14 +276,14 @@
ILanguageBinding BeforeCompile(IProject project)
{
DoBeforeCompileAction();
- TaskService taskService = (TaskService)MonoDevelop.Core.Services.ServiceManager.Services.GetService(typeof(TaskService));
- StringParserService stringParserService = (StringParserService)ServiceManager.Services.GetService(typeof(StringParserService));
+ TaskService taskService = (TaskService)MonoDevelop.Core.Services.ServiceManager.GetService(typeof(TaskService));
+ StringParserService stringParserService = (StringParserService)ServiceManager.GetService(typeof(StringParserService));
taskService.NotifyTaskChange();
// cut&pasted from CombineEntry.cs
stringParserService.Properties["Project"] = project.Name;
- IStatusBarService statusBarService = (IStatusBarService)MonoDevelop.Core.Services.ServiceManager.Services.GetService(typeof(IStatusBarService));
+ IStatusBarService statusBarService = (IStatusBarService)MonoDevelop.Core.Services.ServiceManager.GetService(typeof(IStatusBarService));
statusBarService.SetMessage(String.Format (GettextCatalog.GetString ("Compiling {0}"), project.Name));
string outputDir = ((AbstractProjectConfiguration)project.ActiveConfiguration).OutputDirectory;
@@ -296,14 +296,14 @@
throw new ApplicationException("Can't create project output directory " + outputDir + " original exception:\n" + e.ToString());
}
// cut&paste EDND
- LanguageBindingService languageBindingService = (LanguageBindingService)MonoDevelop.Core.Services.ServiceManager.Services.GetService(typeof(LanguageBindingService));
+ LanguageBindingService languageBindingService = (LanguageBindingService)MonoDevelop.Core.Services.ServiceManager.GetService(typeof(LanguageBindingService));
return languageBindingService.GetBindingPerLanguageName(project.ProjectType);
}
void AfterCompile(IProject project, ICompilerResult res)
{
// cut&pasted from CombineEntry.cs
- TaskService taskService = (TaskService)MonoDevelop.Core.Services.ServiceManager.Services.GetService(typeof(TaskService));
+ TaskService taskService = (TaskService)MonoDevelop.Core.Services.ServiceManager.GetService(typeof(TaskService));
foreach (CompilerError err in res.CompilerResults.Errors) {
taskService.Tasks.Add(new Task(project, err));
}
@@ -330,7 +330,7 @@
void DoBeforeCompileAction()
{
- PropertyService propertyService = (PropertyService)ServiceManager.Services.GetService(typeof(PropertyService));
+ PropertyService propertyService = (PropertyService)ServiceManager.GetService(typeof(PropertyService));
BeforeCompileAction action = (BeforeCompileAction)propertyService.GetProperty("SharpDevelop.Services.DefaultParserService.BeforeCompileAction", BeforeCompileAction.SaveAllFiles);
switch (action) {
@@ -341,7 +341,7 @@
foreach (IViewContent content in WorkbenchSingleton.Workbench.ViewContentCollection) {
if (content.ContentName != null && content.IsDirty) {
if (!save) {
- IMessageService messageService =(IMessageService)ServiceManager.Services.GetService(typeof(IMessageService));
+ IMessageService messageService =(IMessageService)ServiceManager.GetService(typeof(IMessageService));
if (messageService.AskQuestion(GettextCatalog.GetString ("Save changed files?"))) {
save = true;
} else {
@@ -469,7 +469,7 @@
public override void InitializeService()
{
base.InitializeService();
- IFileService fileService = (IFileService)MonoDevelop.Core.Services.ServiceManager.Services.GetService(typeof(IFileService));
+ IFileService fileService = (IFileService)MonoDevelop.Core.Services.ServiceManager.GetService(typeof(IFileService));
fileService.FileRemoved += new FileEventHandler(CheckFileRemove);
fileService.FileRenamed += new FileEventHandler(CheckFileRename);
@@ -486,8 +486,8 @@
void RestoreCombinePreferences(Combine combine, string combinefilename)
{
- DispatchService dispatcher = (DispatchService)ServiceManager.Services.GetService (typeof (DispatchService));
- PropertyService propertyService = (PropertyService)ServiceManager.Services.GetService(typeof(PropertyService));
+ DispatchService dispatcher = (DispatchService)ServiceManager.GetService (typeof (DispatchService));
+ PropertyService propertyService = (PropertyService)ServiceManager.GetService(typeof(PropertyService));
string directory = propertyService.ConfigDirectory + "CombinePreferences";
if (!Directory.Exists(directory)) {
return;
@@ -501,7 +501,7 @@
XmlElement root = doc.DocumentElement;
string combinepath = Path.GetDirectoryName(combinefilename);
if (root["Files"] != null) {
- IFileService fileService = (IFileService)MonoDevelop.Core.Services.ServiceManager.Services.GetService(typeof(IFileService));
+ IFileService fileService = (IFileService)MonoDevelop.Core.Services.ServiceManager.GetService(typeof(IFileService));
foreach (XmlElement el in root["Files"].ChildNodes) {
string fileName = fileUtilityService.RelativeToAbsolutePath(combinepath, el.Attributes["filename"].InnerText);
if (File.Exists(fileName)) {
@@ -537,7 +537,7 @@
void SaveCombinePreferences(Combine combine, string combinefilename)
{
- PropertyService propertyService = (PropertyService)ServiceManager.Services.GetService(typeof(PropertyService));
+ PropertyService propertyService = (PropertyService)ServiceManager.GetService(typeof(PropertyService));
string directory = propertyService.ConfigDirectory + "CombinePreferences";
if (!Directory.Exists(directory)) {
Directory.CreateDirectory(directory);
@@ -597,7 +597,7 @@
//********* own events
protected virtual void OnCombineOpened(CombineEventArgs e)
{
- DispatchService dispatcher = (DispatchService)ServiceManager.Services.GetService (typeof (DispatchService));
+ DispatchService dispatcher = (DispatchService)ServiceManager.GetService (typeof (DispatchService));
GenerateMakefiles ();
if (CombineOpened != null) {
dispatcher.GuiDispatch (new StatefulMessageHandler (dispatchOpened), e);
@@ -627,7 +627,7 @@
protected virtual void OnCurrentProjectChanged(ProjectEventArgs e)
{
if (CurrentSelectedProject != null) {
- StringParserService stringParserService = (StringParserService)ServiceManager.Services.GetService(typeof(StringParserService));
+ StringParserService stringParserService = (StringParserService)ServiceManager.GetService(typeof(StringParserService));
stringParserService.Properties["PROJECTNAME"] = CurrentSelectedProject.Name;
}
if (CurrentProjectChanged != null) {
@@ -656,7 +656,7 @@
public string GetOutputAssemblyName(IProject project)
{
- LanguageBindingService languageBindingService = (LanguageBindingService)MonoDevelop.Core.Services.ServiceManager.Services.GetService(typeof(LanguageBindingService));
+ LanguageBindingService languageBindingService = (LanguageBindingService)MonoDevelop.Core.Services.ServiceManager.GetService(typeof(LanguageBindingService));
ILanguageBinding binding = languageBindingService.GetBindingPerLanguageName(project.ProjectType);
return binding.GetCompiledOutputName(project);
}
Modified: trunk/MonoDevelop/src/Main/Base/Services/ResourceService.cs
===================================================================
--- trunk/MonoDevelop/src/Main/Base/Services/ResourceService.cs 2004-06-23 23:08:38 UTC (rev 1814)
+++ trunk/MonoDevelop/src/Main/Base/Services/ResourceService.cs 2004-06-24 02:05:41 UTC (rev 1815)
@@ -46,7 +46,7 @@
static ResourceService()
{
- PropertyService propertyService = (PropertyService)ServiceManager.Services.GetService(typeof(PropertyService));
+ PropertyService propertyService = (PropertyService)ServiceManager.GetService(typeof(PropertyService));
resourceDirctory = propertyService.DataDirectory + Path.DirectorySeparatorChar + "resources";
iconFactory = new Gtk.IconFactory ();
@@ -76,7 +76,7 @@
void LoadLanguageResources()
{
- PropertyService propertyService = (PropertyService)ServiceManager.Services.GetService(typeof(PropertyService));
+ PropertyService propertyService = (PropertyService)ServiceManager.GetService(typeof(PropertyService));
string language = propertyService.GetProperty(uiLanguageProperty, Thread.CurrentThread.CurrentUICulture.Name);
localStrings = Load(stringResources, language);
@@ -93,7 +93,7 @@
public override void InitializeService()
{
base.InitializeService();
- PropertyService propertyService = (PropertyService)ServiceManager.Services.GetService(typeof(PropertyService));
+ PropertyService propertyService = (PropertyService)ServiceManager.GetService(typeof(PropertyService));
propertyService.PropertyChanged += new PropertyEventHandler(ChangeProperty);
LoadLanguageResources();
Modified: trunk/MonoDevelop/src/Main/Base/Services/StatusBar/DefaultStatusBarService.cs
===================================================================
--- trunk/MonoDevelop/src/Main/Base/Services/StatusBar/DefaultStatusBarService.cs 2004-06-23 23:08:38 UTC (rev 1814)
+++ trunk/MonoDevelop/src/Main/Base/Services/StatusBar/DefaultStatusBarService.cs 2004-06-24 02:05:41 UTC (rev 1815)
@@ -18,7 +18,7 @@
public class DefaultStatusBarService : AbstractService, IStatusBarService
{
SdStatusBar statusBar = null;
- StringParserService stringParserService = (StringParserService)ServiceManager.Services.GetService(typeof(StringParserService));
+ StringParserService stringParserService = (StringParserService)ServiceManager.GetService(typeof(StringParserService));
public DefaultStatusBarService()
{
@@ -64,7 +64,7 @@
public void SetInsertMode (bool insertMode)
{
- StringParserService stringParserService = (StringParserService)ServiceManager.Services.GetService(typeof(StringParserService));
+ StringParserService stringParserService = (StringParserService)ServiceManager.GetService(typeof(StringParserService));
statusBar.ModeStatusBarPanel.Push (1, insertMode ? GettextCatalog.GetString ("INS") : GettextCatalog.GetString ("OVR"));
}
Modified: trunk/MonoDevelop/src/Main/Base/Services/Tasks/Task.cs
===================================================================
--- trunk/MonoDevelop/src/Main/Base/Services/Tasks/Task.cs 2004-06-23 23:08:38 UTC (rev 1814)
+++ trunk/MonoDevelop/src/Main/Base/Services/Tasks/Task.cs 2004-06-24 02:05:41 UTC (rev 1815)
@@ -103,10 +103,10 @@
public void JumpToPosition()
{
if (fileName != null && fileName.Length > 0) {
- IFileService fileService = (IFileService)MonoDevelop.Core.Services.ServiceManager.Services.GetService(typeof(IFileService));
+ IFileService fileService = (IFileService)MonoDevelop.Core.Services.ServiceManager.GetService(typeof(IFileService));
fileService.OpenFile(fileName);
+ System.Threading.Thread.Sleep (50);
IWorkbenchWindow window = fileService.GetOpenFile(fileName);
- System.Threading.Thread.Sleep (50);
if (window == null) {
return;
}
Modified: trunk/MonoDevelop/src/Main/Base/Services/Tasks/TaskService.cs
===================================================================
--- trunk/MonoDevelop/src/Main/Base/Services/Tasks/TaskService.cs 2004-06-23 23:08:38 UTC (rev 1814)
+++ trunk/MonoDevelop/src/Main/Base/Services/Tasks/TaskService.cs 2004-06-24 02:05:41 UTC (rev 1815)
@@ -80,7 +80,7 @@
public override void InitializeService()
{
base.InitializeService();
- IFileService fileService = (IFileService)ServiceManager.Services.GetService(typeof(IFileService));
+ IFileService fileService = (IFileService)ServiceManager.GetService(typeof(IFileService));
fileService.FileRenamed += new FileEventHandler(CheckFileRename);
fileService.FileRemoved += new FileEventHandler(CheckFileRemove);
}
Modified: trunk/MonoDevelop/src/Main/Base/Services/Toolbar/ToolbarService.cs
===================================================================
--- trunk/MonoDevelop/src/Main/Base/Services/Toolbar/ToolbarService.cs 2004-06-23 23:08:38 UTC (rev 1814)
+++ trunk/MonoDevelop/src/Main/Base/Services/Toolbar/ToolbarService.cs 2004-06-24 02:05:41 UTC (rev 1815)
@@ -51,7 +51,7 @@
Gtk.Toolbar bar = new Gtk.Toolbar();
bar.ToolbarStyle = Gtk.ToolbarStyle.Icons;
- ResourceService resourceService = (ResourceService)ServiceManager.Services.GetService(typeof(IResourceService));
+ ResourceService resourceService = (ResourceService)ServiceManager.GetService(typeof(IResourceService));
foreach (ToolbarItemCodon childCodon in codon.SubItems) {
SdToolbarCommand item = null;
Modified: trunk/MonoDevelop/src/Main/StartUp/Dialogs/ExceptionBox.cs
===================================================================
--- trunk/MonoDevelop/src/Main/StartUp/Dialogs/ExceptionBox.cs 2004-06-23 23:08:38 UTC (rev 1814)
+++ trunk/MonoDevelop/src/Main/StartUp/Dialogs/ExceptionBox.cs 2004-06-24 02:05:41 UTC (rev 1815)
@@ -104,7 +104,7 @@
}
public void InitializeComponent() {
- ResourceService resourceService = (ResourceService)ServiceManager.Services.GetService(typeof(IResourceService));
+ ResourceService resourceService = (ResourceService)ServiceManager.GetService(typeof(IResourceService));
this.fixedcontainer = new Gtk.Fixed();
this.continueButton = new Gtk.Button();
Modified: trunk/MonoDevelop/src/Main/StartUp/MonoDevelopMain.cs
===================================================================
--- trunk/MonoDevelop/src/Main/StartUp/MonoDevelopMain.cs 2004-06-23 23:08:38 UTC (rev 1814)
+++ trunk/MonoDevelop/src/Main/StartUp/MonoDevelopMain.cs 2004-06-24 02:05:41 UTC (rev 1815)
@@ -103,10 +103,10 @@
ArrayList commands = null;
try {
- ServiceManager.Services.AddService(new IconService());
- ServiceManager.Services.AddService(new MessageService());
- ServiceManager.Services.AddService(new ResourceService());
- ServiceManager.Services.InitializeServicesSubsystem("/Workspace/Services");
+ ServiceManager.AddService(new IconService());
+ ServiceManager.AddService(new MessageService());
+ ServiceManager.AddService(new ResourceService());
+ ServiceManager.InitializeServicesSubsystem("/Workspace/Services");
commands = AddInTreeSingleton.AddInTree.GetTreeNode("/Workspace/Autostart").BuildChildItems(null);
RunMainLoop ();
@@ -142,7 +142,7 @@
// unloading services
File.Delete (socket_filename);
- ServiceManager.Services.UnloadAllServices();
+ ServiceManager.UnloadAllServices();
}
static string fileToOpen = String.Empty;
@@ -181,14 +181,14 @@
case ".CMBX":
case ".PRJX":
try {
- IProjectService projectService = (IProjectService)ServiceManager.Services.GetService (typeof (IProjectService));
+ IProjectService projectService = (IProjectService)ServiceManager.GetService (typeof (IProjectService));
projectService.OpenCombine(file);
} catch (Exception e) {
}
break;
default:
try {
- IFileService fileService = (IFileService)MonoDevelop.Core.Services.ServiceManager.Services.GetService(typeof(IFileService));
+ IFileService fileService = (IFileService)MonoDevelop.Core.Services.ServiceManager.GetService(typeof(IFileService));
fileService.OpenFile(file);
} catch (Exception e) {
}
Modified: trunk/MonoDevelop/src/Tools/dbgen/src/dbgen.cs
===================================================================
--- trunk/MonoDevelop/src/Tools/dbgen/src/dbgen.cs 2004-06-23 23:08:38 UTC (rev 1814)
+++ trunk/MonoDevelop/src/Tools/dbgen/src/dbgen.cs 2004-06-24 02:05:41 UTC (rev 1815)
@@ -13,7 +13,7 @@
Console.WriteLine ("Usage: dbgen <destDirectory> [<assemblyName> | <assemblyPath>]");
return 0;
}
- ServiceManager.Services.AddService (new MonodocService());
+ ServiceManager.AddService (new MonodocService());
DefaultParserService parserService = new DefaultParserService ();
parserService.GenerateAssemblyDatabase (args[0], args[1]);
return 0;
More information about the Monodevelop-patches-list
mailing list