Author: mkrueger
Date: 2007-08-31 10:02:08 -0400 (Fri, 31 Aug 2007)
New Revision: 85106

Modified:
   trunk/monodevelop/Core/src/MonoDevelop.Projects/ChangeLog
   trunk/monodevelop/Core/src/MonoDevelop.Projects/Makefile.am
   
trunk/monodevelop/Core/src/MonoDevelop.Projects/MonoDevelop.Projects.Ambience/AmbienceService.cs
   
trunk/monodevelop/Core/src/MonoDevelop.Projects/MonoDevelop.Projects.Ambience/CodeDOMGeneratorUtility.cs
   
trunk/monodevelop/Core/src/MonoDevelop.Projects/MonoDevelop.Projects.Ambience/IAmbience.cs
   
trunk/monodevelop/Core/src/MonoDevelop.Projects/MonoDevelop.Projects.Ambience/NetAmbience.cs
   
trunk/monodevelop/Core/src/MonoDevelop.Projects/MonoDevelop.Projects.Parser/CodeCompletionDatabase.cs
   
trunk/monodevelop/Core/src/MonoDevelop.Projects/MonoDevelop.Projects.Parser/DefaultParserService.cs
   
trunk/monodevelop/Core/src/MonoDevelop.Projects/MonoDevelop.Projects.Text/TextEncoding.cs
   
trunk/monodevelop/Core/src/MonoDevelop.Projects/MonoDevelop.Projects.Utility/Comparers.cs
   
trunk/monodevelop/Core/src/MonoDevelop.Projects/MonoDevelop.Projects/Combine.cs
   
trunk/monodevelop/Core/src/MonoDevelop.Projects/MonoDevelop.Projects/CombineConfiguration.cs
   
trunk/monodevelop/Core/src/MonoDevelop.Projects/MonoDevelop.Projects/CombineEntry.cs
   
trunk/monodevelop/Core/src/MonoDevelop.Projects/MonoDevelop.Projects/ConfigurationCollection.cs
   
trunk/monodevelop/Core/src/MonoDevelop.Projects/MonoDevelop.Projects/MonoDevelopFileFormat.cs
   
trunk/monodevelop/Core/src/MonoDevelop.Projects/MonoDevelop.Projects/PrjxFileFormat.cs
   
trunk/monodevelop/Core/src/MonoDevelop.Projects/MonoDevelop.Projects/Project.cs
   
trunk/monodevelop/Core/src/MonoDevelop.Projects/MonoDevelop.Projects/ProjectService.cs
Log:
* MonoDevelop.Projects/ConfigurationCollection.cs,
  MonoDevelop.Projects/ProjectService.cs,
  MonoDevelop.Projects/CombineEntry.cs,
  MonoDevelop.Projects/MonoDevelopFileFormat.cs,
  MonoDevelop.Projects/Combine.cs,
  MonoDevelop.Projects/PrjxFileFormat.cs,
  MonoDevelop.Projects/CombineConfiguration.cs,
  MonoDevelop.Projects/Project.cs,
  MonoDevelop.Projects.Ambience/IAmbience.cs,
  MonoDevelop.Projects.Ambience/AmbienceService.cs,
  MonoDevelop.Projects.Ambience/CodeDOMGeneratorUtility.cs,
  MonoDevelop.Projects.Ambience/NetAmbience.cs,
  MonoDevelop.Projects.Utility/Comparers.cs,
  MonoDevelop.Projects.Text/TextEncoding.cs,
  MonoDevelop.Projects.Parser/DefaultParserService.cs,
  MonoDevelop.Projects.Parser/CodeCompletionDatabase.cs: Changes due
  to new property infrastructure.

Modified: trunk/monodevelop/Core/src/MonoDevelop.Projects/ChangeLog
===================================================================
--- trunk/monodevelop/Core/src/MonoDevelop.Projects/ChangeLog   2007-08-31 
14:01:43 UTC (rev 85105)
+++ trunk/monodevelop/Core/src/MonoDevelop.Projects/ChangeLog   2007-08-31 
14:02:08 UTC (rev 85106)
@@ -1,3 +1,22 @@
+2007-08-31  Mike Krüger <[EMAIL PROTECTED]> 
+
+       * MonoDevelop.Projects/ConfigurationCollection.cs,
+         MonoDevelop.Projects/ProjectService.cs,
+         MonoDevelop.Projects/CombineEntry.cs,
+         MonoDevelop.Projects/MonoDevelopFileFormat.cs,
+         MonoDevelop.Projects/Combine.cs, 
MonoDevelop.Projects/PrjxFileFormat.cs,
+         MonoDevelop.Projects/CombineConfiguration.cs,
+         MonoDevelop.Projects/Project.cs,
+         MonoDevelop.Projects.Ambience/IAmbience.cs,
+         MonoDevelop.Projects.Ambience/AmbienceService.cs,
+         MonoDevelop.Projects.Ambience/CodeDOMGeneratorUtility.cs,
+         MonoDevelop.Projects.Ambience/NetAmbience.cs,
+         MonoDevelop.Projects.Utility/Comparers.cs,
+         MonoDevelop.Projects.Text/TextEncoding.cs,
+         MonoDevelop.Projects.Parser/DefaultParserService.cs,
+         MonoDevelop.Projects.Parser/CodeCompletionDatabase.cs: Changes due to
+         new property infrastructure.
+
 2007-08-23  Ankit Jain  <[EMAIL PROTECTED]>
 
        * MonoDevelop.Projects/DotNetProject.cs (OnClean): New. Clean .resources

Modified: trunk/monodevelop/Core/src/MonoDevelop.Projects/Makefile.am
===================================================================
--- trunk/monodevelop/Core/src/MonoDevelop.Projects/Makefile.am 2007-08-31 
14:01:43 UTC (rev 85105)
+++ trunk/monodevelop/Core/src/MonoDevelop.Projects/Makefile.am 2007-08-31 
14:02:08 UTC (rev 85106)
@@ -226,9 +226,9 @@
        MonoDevelop.Projects/ProjectReferenceCollection.cs \
        MonoDevelop.Projects/ProjectReferenceEventArgs.cs \
        MonoDevelop.Projects/ProjectRenameEventArgs.cs \
-       MonoDevelop.Projects/ProjectsServices.cs \
        MonoDevelop.Projects/ProjectService.cs \
        MonoDevelop.Projects/ProjectServiceExtension.cs \
+       MonoDevelop.Projects/ProjectsServices.cs \
        MonoDevelop.Projects/SharpDevelopFileFormat.cs \
        MonoDevelop.Projects/TypelibImporter.cs \
        MonoDevelop.Projects/UnknownCombineEntry.cs \

Modified: 
trunk/monodevelop/Core/src/MonoDevelop.Projects/MonoDevelop.Projects/Combine.cs
===================================================================
--- 
trunk/monodevelop/Core/src/MonoDevelop.Projects/MonoDevelop.Projects/Combine.cs 
    2007-08-31 14:01:43 UTC (rev 85105)
+++ 
trunk/monodevelop/Core/src/MonoDevelop.Projects/MonoDevelop.Projects/Combine.cs 
    2007-08-31 14:02:08 UTC (rev 85106)
@@ -20,7 +20,7 @@
 using FileMode = Mono.Unix.Native.FilePermissions;
 
 using MonoDevelop.Core;
-using MonoDevelop.Core.Properties;
+using MonoDevelop.Core;
 using MonoDevelop.Core.ProgressMonitoring;
 using MonoDevelop.Projects;
 using MonoDevelop.Projects.Serialization;

Modified: 
trunk/monodevelop/Core/src/MonoDevelop.Projects/MonoDevelop.Projects/CombineConfiguration.cs
===================================================================
--- 
trunk/monodevelop/Core/src/MonoDevelop.Projects/MonoDevelop.Projects/CombineConfiguration.cs
        2007-08-31 14:01:43 UTC (rev 85105)
+++ 
trunk/monodevelop/Core/src/MonoDevelop.Projects/MonoDevelop.Projects/CombineConfiguration.cs
        2007-08-31 14:02:08 UTC (rev 85106)
@@ -16,7 +16,7 @@
 using MonoDevelop.Projects;
 using MonoDevelop.Projects.Serialization;
 
-using MonoDevelop.Core.Properties;
+using MonoDevelop.Core;
 
 namespace MonoDevelop.Projects
 {

Modified: 
trunk/monodevelop/Core/src/MonoDevelop.Projects/MonoDevelop.Projects/CombineEntry.cs
===================================================================
--- 
trunk/monodevelop/Core/src/MonoDevelop.Projects/MonoDevelop.Projects/CombineEntry.cs
        2007-08-31 14:01:43 UTC (rev 85105)
+++ 
trunk/monodevelop/Core/src/MonoDevelop.Projects/MonoDevelop.Projects/CombineEntry.cs
        2007-08-31 14:02:08 UTC (rev 85106)
@@ -14,8 +14,8 @@
 using System.Diagnostics;
 using System.CodeDom.Compiler;
 
-using MonoDevelop.Core.Properties;
 using MonoDevelop.Core;
+using MonoDevelop.Core;
 using MonoDevelop.Projects;
 using MonoDevelop.Projects.Serialization;
 

Modified: 
trunk/monodevelop/Core/src/MonoDevelop.Projects/MonoDevelop.Projects/ConfigurationCollection.cs
===================================================================
--- 
trunk/monodevelop/Core/src/MonoDevelop.Projects/MonoDevelop.Projects/ConfigurationCollection.cs
     2007-08-31 14:01:43 UTC (rev 85105)
+++ 
trunk/monodevelop/Core/src/MonoDevelop.Projects/MonoDevelop.Projects/ConfigurationCollection.cs
     2007-08-31 14:02:08 UTC (rev 85106)
@@ -33,7 +33,7 @@
 using MonoDevelop.Projects;
 using MonoDevelop.Projects.Serialization;
 
-using MonoDevelop.Core.Properties;
+using MonoDevelop.Core;
 
 namespace MonoDevelop.Projects
 {

Modified: 
trunk/monodevelop/Core/src/MonoDevelop.Projects/MonoDevelop.Projects/MonoDevelopFileFormat.cs
===================================================================
--- 
trunk/monodevelop/Core/src/MonoDevelop.Projects/MonoDevelop.Projects/MonoDevelopFileFormat.cs
       2007-08-31 14:01:43 UTC (rev 85105)
+++ 
trunk/monodevelop/Core/src/MonoDevelop.Projects/MonoDevelop.Projects/MonoDevelopFileFormat.cs
       2007-08-31 14:02:08 UTC (rev 85106)
@@ -182,7 +182,7 @@
                                        string tempFile = 
Path.GetTempFileName();
                                        
                                        ConvertXml.Convert(fileName,
-                                                          
Runtime.Properties.DataDirectory + Path.DirectorySeparatorChar +
+                                                          
PropertyService.DataPath + Path.DirectorySeparatorChar +
                                                           
"ConversionStyleSheets" + Path.DirectorySeparatorChar +
                                                           
"ConvertPrjx10to11.xsl",
                                                           tempFile);

Modified: 
trunk/monodevelop/Core/src/MonoDevelop.Projects/MonoDevelop.Projects/PrjxFileFormat.cs
===================================================================
--- 
trunk/monodevelop/Core/src/MonoDevelop.Projects/MonoDevelop.Projects/PrjxFileFormat.cs
      2007-08-31 14:01:43 UTC (rev 85105)
+++ 
trunk/monodevelop/Core/src/MonoDevelop.Projects/MonoDevelop.Projects/PrjxFileFormat.cs
      2007-08-31 14:02:08 UTC (rev 85106)
@@ -71,7 +71,7 @@
                                string tempFile = Path.GetTempFileName();
                                
                                ConvertXml.Convert(fileName,
-                                                  
Runtime.Properties.DataDirectory + Path.DirectorySeparatorChar +
+                                                  PropertyService.DataPath + 
Path.DirectorySeparatorChar +
                                                   "ConversionStyleSheets" + 
Path.DirectorySeparatorChar +
                                                   "ConvertPrjx10to11.xsl",
                                                   tempFile);

Modified: 
trunk/monodevelop/Core/src/MonoDevelop.Projects/MonoDevelop.Projects/Project.cs
===================================================================
--- 
trunk/monodevelop/Core/src/MonoDevelop.Projects/MonoDevelop.Projects/Project.cs 
    2007-08-31 14:01:43 UTC (rev 85105)
+++ 
trunk/monodevelop/Core/src/MonoDevelop.Projects/MonoDevelop.Projects/Project.cs 
    2007-08-31 14:02:08 UTC (rev 85106)
@@ -18,7 +18,7 @@
 
 using MonoDevelop.Core;
 using MonoDevelop.Core.Execution;
-using MonoDevelop.Core.Properties;
+using MonoDevelop.Core;
 using Mono.Addins;
 using MonoDevelop.Projects.Ambience;
 using MonoDevelop.Projects.Serialization;

Modified: 
trunk/monodevelop/Core/src/MonoDevelop.Projects/MonoDevelop.Projects/ProjectService.cs
===================================================================
--- 
trunk/monodevelop/Core/src/MonoDevelop.Projects/MonoDevelop.Projects/ProjectService.cs
      2007-08-31 14:01:43 UTC (rev 85105)
+++ 
trunk/monodevelop/Core/src/MonoDevelop.Projects/MonoDevelop.Projects/ProjectService.cs
      2007-08-31 14:02:08 UTC (rev 85106)
@@ -18,8 +18,8 @@
 using MonoDevelop.Projects;
 using MonoDevelop.Projects.Serialization;
 
-using MonoDevelop.Core.Properties;
 using MonoDevelop.Core;
+using MonoDevelop.Core;
 using Mono.Addins;
 using MonoDevelop.Core.ProgressMonitoring;
 using MonoDevelop.Core.Execution;

Modified: 
trunk/monodevelop/Core/src/MonoDevelop.Projects/MonoDevelop.Projects.Ambience/AmbienceService.cs
===================================================================
--- 
trunk/monodevelop/Core/src/MonoDevelop.Projects/MonoDevelop.Projects.Ambience/AmbienceService.cs
    2007-08-31 14:01:43 UTC (rev 85105)
+++ 
trunk/monodevelop/Core/src/MonoDevelop.Projects/MonoDevelop.Projects.Ambience/AmbienceService.cs
    2007-08-31 14:02:08 UTC (rev 85106)
@@ -10,7 +10,7 @@
 
 using MonoDevelop.Core;
 using Mono.Addins;
-using MonoDevelop.Core.Properties;
+using MonoDevelop.Core;
 
 namespace MonoDevelop.Projects.Ambience
 {
@@ -21,27 +21,27 @@
                
                Hashtable ambiences = new Hashtable ();
 
-               public IProperties CodeGenerationProperties {
+               public Properties CodeGenerationProperties {
                        get {
-                               return (IProperties) 
Runtime.Properties.GetProperty (codeGenerationProperty, new 
DefaultProperties());
+                               return PropertyService.Get 
(codeGenerationProperty, new Properties());
                        }
                }
                
                public bool GenerateDocumentComments {
                        get {
-                               return 
CodeGenerationProperties.GetProperty("GenerateDocumentComments", true);
+                               return 
CodeGenerationProperties.Get("GenerateDocumentComments", true);
                        }
                }
                
                public bool GenerateAdditionalComments {
                        get {
-                               return 
CodeGenerationProperties.GetProperty("GenerateAdditionalComments", true);
+                               return 
CodeGenerationProperties.Get("GenerateAdditionalComments", true);
                        }
                }
                
                public bool UseFullyQualifiedNames {
                        get {
-                               return 
CodeGenerationProperties.GetProperty("UseFullyQualifiedNames", true);
+                               return 
CodeGenerationProperties.Get("UseFullyQualifiedNames", true);
                        }
                }
                
@@ -92,12 +92,12 @@
                
                public Ambience CurrentAmbience {
                        get {
-                               string language = 
Runtime.Properties.GetProperty(ambienceProperty, ".NET");
+                               string language = PropertyService.Get 
(ambienceProperty, ".NET");
                                return AmbienceFromName(language);
                        }
                }
                
-               /*void PropertyChanged(object sender, PropertyEventArgs e)
+               /*void PropertyChanged(object sender, PropertyChangedEventArgs 
e)
                {
                        if (e.Key == ambienceProperty) {
                                OnAmbienceChanged(EventArgs.Empty);
@@ -106,12 +106,12 @@
                
                public override void InitializeService()
                {
-                       Runtime.Properties.PropertyChanged += new 
PropertyEventHandler(PropertyChanged);
+                       PropertyService.PropertyChanged += new 
PropertyEventHandler(PropertyChanged);
                }
                
                public override void UnloadService()
                {
-                       Runtime.Properties.PropertyChanged -= new 
PropertyEventHandler(PropertyChanged);
+                       PropertyService.PropertyChanged -= new 
PropertyEventHandler(PropertyChanged);
                }
                
                protected virtual void OnAmbienceChanged(EventArgs e)

Modified: 
trunk/monodevelop/Core/src/MonoDevelop.Projects/MonoDevelop.Projects.Ambience/CodeDOMGeneratorUtility.cs
===================================================================
--- 
trunk/monodevelop/Core/src/MonoDevelop.Projects/MonoDevelop.Projects.Ambience/CodeDOMGeneratorUtility.cs
    2007-08-31 14:01:43 UTC (rev 85105)
+++ 
trunk/monodevelop/Core/src/MonoDevelop.Projects/MonoDevelop.Projects.Ambience/CodeDOMGeneratorUtility.cs
    2007-08-31 14:02:08 UTC (rev 85106)
@@ -12,7 +12,7 @@
 using System.Text;
 
 using MonoDevelop.Core;
-using MonoDevelop.Core.Properties;
+using MonoDevelop.Core;
 
 namespace MonoDevelop.Projects.Ambience
 {
@@ -23,15 +23,15 @@
                public static CodeGeneratorOptions CodeGeneratorOptions {
                        get {
                                CodeGeneratorOptions options = new 
CodeGeneratorOptions();
-                               options.BlankLinesBetweenMembers = 
ambienceService.CodeGenerationProperties.GetProperty("BlankLinesBetweenMembers",
 true);
-                               options.BracingStyle             = 
ambienceService.CodeGenerationProperties.GetProperty("StartBlockOnSameLine", 
true) ? "Block" : "C";
-                               options.ElseOnClosing            = 
ambienceService.CodeGenerationProperties.GetProperty("ElseOnClosing", true);
+                               options.BlankLinesBetweenMembers = 
ambienceService.CodeGenerationProperties.Get("BlankLinesBetweenMembers", true);
+                               options.BracingStyle             = 
ambienceService.CodeGenerationProperties.Get("StartBlockOnSameLine", true) ? 
"Block" : "C";
+                               options.ElseOnClosing            = 
ambienceService.CodeGenerationProperties.Get("ElseOnClosing", true);
                                
-                               IProperties docProperties = 
((IProperties)Runtime.Properties.GetProperty("MonoDevelop.TextEditor.Document.Document.DefaultDocumentAggregatorProperties",
 new DefaultProperties()));
+                               Properties docProperties = 
PropertyService.Get("MonoDevelop.TextEditor.Document.Document.DefaultDocumentAggregatorProperties",
 new Properties());
                                
-                               if 
((bool)docProperties.GetProperty("TabsToSpaces", false)) {
+                               if ((bool)docProperties.Get("TabsToSpaces", 
false)) {
                                        StringBuilder indentationString = new 
StringBuilder();
-                                       for (int i = 0; i < 
(int)docProperties.GetProperty("IndentationSize", 4); ++i) {
+                                       for (int i = 0; i < 
(int)docProperties.Get("IndentationSize", 4); ++i) {
                                                indentationString.Append(' ');
                                        }
                                        options.IndentString = 
indentationString.ToString();

Modified: 
trunk/monodevelop/Core/src/MonoDevelop.Projects/MonoDevelop.Projects.Ambience/IAmbience.cs
===================================================================
--- 
trunk/monodevelop/Core/src/MonoDevelop.Projects/MonoDevelop.Projects.Ambience/IAmbience.cs
  2007-08-31 14:01:43 UTC (rev 85105)
+++ 
trunk/monodevelop/Core/src/MonoDevelop.Projects/MonoDevelop.Projects.Ambience/IAmbience.cs
  2007-08-31 14:02:08 UTC (rev 85106)
@@ -9,8 +9,8 @@
 using System.Collections;
 
 using MonoDevelop.Projects.Parser;
-using MonoDevelop.Core.Properties;
 using MonoDevelop.Core;
+using MonoDevelop.Core;
 
 namespace MonoDevelop.Projects.Ambience
 {

Modified: 
trunk/monodevelop/Core/src/MonoDevelop.Projects/MonoDevelop.Projects.Ambience/NetAmbience.cs
===================================================================
--- 
trunk/monodevelop/Core/src/MonoDevelop.Projects/MonoDevelop.Projects.Ambience/NetAmbience.cs
        2007-08-31 14:01:43 UTC (rev 85105)
+++ 
trunk/monodevelop/Core/src/MonoDevelop.Projects/MonoDevelop.Projects.Ambience/NetAmbience.cs
        2007-08-31 14:02:08 UTC (rev 85106)
@@ -9,8 +9,8 @@
 using System.Text;
 
 using MonoDevelop.Projects.Parser;
-using MonoDevelop.Core.Properties;
 using MonoDevelop.Core;
+using MonoDevelop.Core;
 
 namespace MonoDevelop.Projects.Ambience
 {

Modified: 
trunk/monodevelop/Core/src/MonoDevelop.Projects/MonoDevelop.Projects.Parser/CodeCompletionDatabase.cs
===================================================================
--- 
trunk/monodevelop/Core/src/MonoDevelop.Projects/MonoDevelop.Projects.Parser/CodeCompletionDatabase.cs
       2007-08-31 14:01:43 UTC (rev 85105)
+++ 
trunk/monodevelop/Core/src/MonoDevelop.Projects/MonoDevelop.Projects.Parser/CodeCompletionDatabase.cs
       2007-08-31 14:02:08 UTC (rev 85106)
@@ -38,8 +38,8 @@
 using System.Runtime.Serialization;
 using System.Runtime.Serialization.Formatters.Binary;
 
-using MonoDevelop.Core.Properties;
 using MonoDevelop.Core;
+using MonoDevelop.Core;
 using Mono.Addins;
 using MonoDevelop.Projects;
 using MonoDevelop.Projects.Parser;
@@ -92,12 +92,12 @@
                        references = new ArrayList ();
                        headers = new Hashtable ();
                        
-                       Runtime.Properties.PropertyChanged += new 
EventHandler<PropertyEventArgs> (OnPropertyUpdated);  
+                       PropertyService.PropertyChanged += new 
EventHandler<PropertyChangedEventArgs> (OnPropertyUpdated);      
                }
                
                public virtual void Dispose ()
                {
-                       Runtime.Properties.PropertyChanged -= new 
EventHandler<PropertyEventArgs> (OnPropertyUpdated);
+                       PropertyService.PropertyChanged -= new 
EventHandler<PropertyChangedEventArgs> (OnPropertyUpdated);
                        disposed = true;
                }
                
@@ -202,7 +202,7 @@
                        }
                        
                        // Update comments if needed...
-                       PropertyEventArgs args = new PropertyEventArgs (null, 
"Monodevelop.TaskListTokens", LastValidTaskListTokens, 
Runtime.Properties.GetProperty ("Monodevelop.TaskListTokens", ""));
+                       PropertyChangedEventArgs args = new 
PropertyChangedEventArgs ("Monodevelop.TaskListTokens", 
LastValidTaskListTokens, PropertyService.Get ("Monodevelop.TaskListTokens", 
""));
                        this.OnPropertyUpdated (null, args);
                }
                
@@ -224,7 +224,7 @@
                                
                                modified = false;
                                headers["Version"] = FORMAT_VERSION;
-                               headers["LastValidTaskListTokens"] = 
(string)Runtime.Properties.GetProperty ("Monodevelop.TaskListTokens", "");
+                               headers["LastValidTaskListTokens"] = 
(string)PropertyService.Get ("Monodevelop.TaskListTokens", "");
 
                                Runtime.LoggingService.Debug ("Writing " + 
dataFile);
                                
@@ -491,7 +491,7 @@
                        }
                }
                
-               void OnPropertyUpdated (object sender, PropertyEventArgs e)
+               void OnPropertyUpdated (object sender, PropertyChangedEventArgs 
e)
                {
                        if (e.Key == "Monodevelop.TaskListTokens")
                        {

Modified: 
trunk/monodevelop/Core/src/MonoDevelop.Projects/MonoDevelop.Projects.Parser/DefaultParserService.cs
===================================================================
--- 
trunk/monodevelop/Core/src/MonoDevelop.Projects/MonoDevelop.Projects.Parser/DefaultParserService.cs
 2007-08-31 14:01:43 UTC (rev 85105)
+++ 
trunk/monodevelop/Core/src/MonoDevelop.Projects/MonoDevelop.Projects.Parser/DefaultParserService.cs
 2007-08-31 14:02:08 UTC (rev 85106)
@@ -21,7 +21,7 @@
 using System.Xml;
 
 using MonoDevelop.Core;
-using MonoDevelop.Core.Properties;
+using MonoDevelop.Core;
 using MonoDevelop.Core.ProgressMonitoring;
 using Mono.Addins;
 using MonoDevelop.Projects;
@@ -607,14 +607,13 @@
                
                void SetDefaultCompletionFileLocation()
                {
-                       PropertyService propertyService = Runtime.Properties;
-                       string path = 
propertyService.GetProperty("SharpDevelop.CodeCompletion.DataDirectory", 
String.Empty).ToString();
+                       string path = PropertyService.Get<string> 
("SharpDevelop.CodeCompletion.DataDirectory", String.Empty);
                        if (path == String.Empty) {
-                               path = Path.Combine 
(Runtime.FileService.GetDirectoryNameWithSeparator(propertyService.ConfigDirectory),
 "CodeCompletionData");
-                               propertyService.SetProperty 
("SharpDevelop.CodeCompletion.DataDirectory", path);
-                               propertyService.SaveProperties ();
+                               path = Path.Combine 
(PropertyService.ConfigPath, "CodeCompletionData");
+                               PropertyService.Set 
("SharpDevelop.CodeCompletion.DataDirectory", path);
+                               PropertyService.SaveProperties ();
                        }
-                       path = Path.Combine 
(Runtime.FileService.GetDirectoryNameWithSeparator(propertyService.ConfigDirectory),
 "CodeCompletionData");
+                       path = Path.Combine (PropertyService.ConfigPath, 
"CodeCompletionData");
                        if (!Directory.Exists (path))
                                Directory.CreateDirectory (path);
 
@@ -1612,10 +1611,10 @@
                                return null;
                        }
                        
-                       string rawTags = (string)Runtime.Properties.GetProperty 
("Monodevelop.TaskListTokens", "FIXME:2;TODO:1;HACK:1;UNDONE:0");
+                       string rawTags = (string)PropertyService.Get 
("Monodevelop.TaskListTokens", "FIXME:2;TODO:1;HACK:1;UNDONE:0");
                        if (String.IsNullOrEmpty (rawTags))
                        {
-                               Runtime.Properties.SetProperty 
("Monodevelop.TaskListTokens", "FIXME:2;TODO:1;HACK:1;UNDONE:0");
+                               PropertyService.Set 
("Monodevelop.TaskListTokens", "FIXME:2;TODO:1;HACK:1;UNDONE:0");
                                rawTags = "FIXME:2;TODO:1;HACK:1;UNDONE:0";
                        }
                        

Modified: 
trunk/monodevelop/Core/src/MonoDevelop.Projects/MonoDevelop.Projects.Text/TextEncoding.cs
===================================================================
--- 
trunk/monodevelop/Core/src/MonoDevelop.Projects/MonoDevelop.Projects.Text/TextEncoding.cs
   2007-08-31 14:01:43 UTC (rev 85105)
+++ 
trunk/monodevelop/Core/src/MonoDevelop.Projects/MonoDevelop.Projects.Text/TextEncoding.cs
   2007-08-31 14:02:08 UTC (rev 85106)
@@ -87,7 +87,7 @@
                public static TextEncoding[] ConversionEncodings {
                        get {
                                if (conversion == null) {
-                                       string str = 
Runtime.Properties.GetProperty 
("MonoDevelop.Projects.Text.ConversionEncodings", "");
+                                       string str = PropertyService.Get 
("MonoDevelop.Projects.Text.ConversionEncodings", "");
                                        if (str.Length == 0) {
                                                // Add some default encodings
                                                str = DefaultEncoding;
@@ -113,8 +113,8 @@
                                string s = "";
                                foreach (TextEncoding e in conversion)
                                        s += e.Id + " ";
-                               Runtime.Properties.SetProperty 
("MonoDevelop.Projects.Text.ConversionEncodings", s.Trim());
-                               Runtime.Properties.SaveProperties ();
+                               PropertyService.Set 
("MonoDevelop.Projects.Text.ConversionEncodings", s.Trim());
+                               PropertyService.SaveProperties ();
                        }
                }
                

Modified: 
trunk/monodevelop/Core/src/MonoDevelop.Projects/MonoDevelop.Projects.Utility/Comparers.cs
===================================================================
--- 
trunk/monodevelop/Core/src/MonoDevelop.Projects/MonoDevelop.Projects.Utility/Comparers.cs
   2007-08-31 14:01:43 UTC (rev 85105)
+++ 
trunk/monodevelop/Core/src/MonoDevelop.Projects/MonoDevelop.Projects.Utility/Comparers.cs
   2007-08-31 14:02:08 UTC (rev 85106)
@@ -32,8 +32,8 @@
                        
                        for(int i=0; i < Properties.Length; i++) {
                                string p = Properties[i];
-                               IComparable pvalx = 
(IComparable)(typex.GetProperty(p).GetValue(x, null));
-                               object pvaly = typey.GetProperty(p).GetValue(y, 
null);
+                               IComparable pvalx = 
(IComparable)(typex.GetProperty (p).GetValue(x, null));
+                               object pvaly = typey.GetProperty 
(p).GetValue(y, null);
                                cmp = pvalx.CompareTo(pvaly);
                                if (cmp != 0) {
                                        return cmp;

_______________________________________________
Mono-patches maillist  -  [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches

Reply via email to