Author: lluis
Date: 2006-12-17 12:32:57 -0500 (Sun, 17 Dec 2006)
New Revision: 69610

Modified:
   trunk/monodevelop/Core/src/MonoDevelop.Projects/ChangeLog
   
trunk/monodevelop/Core/src/MonoDevelop.Projects/MonoDevelop.Projects.Deployment/DirectoryDeployHandler.cs
   
trunk/monodevelop/Core/src/MonoDevelop.Projects/MonoDevelop.Projects.Parser/AssemblyCodeCompletionDatabase.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.mdp
   
trunk/monodevelop/Core/src/MonoDevelop.Projects/MonoDevelop.Projects/CmbxFileFormat.cs
   
trunk/monodevelop/Core/src/MonoDevelop.Projects/MonoDevelop.Projects/CombineEntry.cs
   
trunk/monodevelop/Core/src/MonoDevelop.Projects/MonoDevelop.Projects/DotNetProject.cs
   
trunk/monodevelop/Core/src/MonoDevelop.Projects/MonoDevelop.Projects/MdpFileFormat.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/ProjectPathItemPropertyAttribute.cs
   
trunk/monodevelop/Core/src/MonoDevelop.Projects/MonoDevelop.Projects/ProjectReference.cs
Log:
* MonoDevelop.Projects/ProjectReference.cs,
  MonoDevelop.Projects/MdpFileFormat.cs,
  MonoDevelop.Projects/ProjectPathItemPropertyAttribute.cs,
  MonoDevelop.Projects/CombineEntry.cs,
  MonoDevelop.Projects/DotNetProject.cs,
  MonoDevelop.Projects/PrjxFileFormat.cs,
  MonoDevelop.Projects/CmbxFileFormat.cs,
  MonoDevelop.Projects.Deployment/DirectoryDeployHandler.cs,
  MonoDevelop.Projects.Parser/AssemblyCodeCompletionDatabase.cs,
  MonoDevelop.Projects.Parser/DefaultParserService.cs: Track changes
  in FileService API.
* MonoDevelop.Projects/Project.cs: Use the file service for copying
  files.
* MonoDevelop.Projects.mdp: Updated.
* MonoDevelop.Projects.Parser/CodeCompletionDatabase.cs: Use the file
  service for file operations.

Modified: trunk/monodevelop/Core/src/MonoDevelop.Projects/ChangeLog
===================================================================
--- trunk/monodevelop/Core/src/MonoDevelop.Projects/ChangeLog   2006-12-17 
17:32:24 UTC (rev 69609)
+++ trunk/monodevelop/Core/src/MonoDevelop.Projects/ChangeLog   2006-12-17 
17:32:57 UTC (rev 69610)
@@ -1,3 +1,22 @@
+2006-12-17  Lluis Sanchez Gual <[EMAIL PROTECTED]> 
+
+       * MonoDevelop.Projects/ProjectReference.cs,
+         MonoDevelop.Projects/MdpFileFormat.cs,
+         MonoDevelop.Projects/ProjectPathItemPropertyAttribute.cs,
+         MonoDevelop.Projects/CombineEntry.cs,
+         MonoDevelop.Projects/DotNetProject.cs,
+         MonoDevelop.Projects/PrjxFileFormat.cs,
+         MonoDevelop.Projects/CmbxFileFormat.cs,
+         MonoDevelop.Projects.Deployment/DirectoryDeployHandler.cs,
+         MonoDevelop.Projects.Parser/AssemblyCodeCompletionDatabase.cs,
+         MonoDevelop.Projects.Parser/DefaultParserService.cs: Track changes
+         in FileService API.
+       * MonoDevelop.Projects/Project.cs: Use the file service for copying
+         files.
+       * MonoDevelop.Projects.mdp: Updated.
+       * MonoDevelop.Projects.Parser/CodeCompletionDatabase.cs: Use the file
+         service for file operations.
+
 2006-12-14  Lluis Sanchez Gual <[EMAIL PROTECTED]> 
 
        * MonoDevelop.Projects.Parser/AbstractDecoration.cs,

Modified: 
trunk/monodevelop/Core/src/MonoDevelop.Projects/MonoDevelop.Projects/CmbxFileFormat.cs
===================================================================
--- 
trunk/monodevelop/Core/src/MonoDevelop.Projects/MonoDevelop.Projects/CmbxFileFormat.cs
      2006-12-17 17:32:24 UTC (rev 69609)
+++ 
trunk/monodevelop/Core/src/MonoDevelop.Projects/MonoDevelop.Projects/CmbxFileFormat.cs
      2006-12-17 17:32:57 UTC (rev 69610)
@@ -138,7 +138,7 @@
                                doc.Load (mdCombineAddition);
                                string rop = 
doc.DocumentElement["RelativeOutputPath"].InnerText;
                                if (rop != "")
-                                       combine.OutputDirectory = 
Runtime.FileUtilityService.RelativeToAbsolutePath (combine.BaseDirectory, rop);
+                                       combine.OutputDirectory = 
Runtime.FileService.RelativeToAbsolutePath (combine.BaseDirectory, rop);
                        }
                        
                        return combine;
@@ -153,7 +153,7 @@
                                monitor.BeginTask (string.Format 
(GettextCatalog.GetString("Loading solution: {0}"), combine.FileName), 1);
                                while (MoveToNextElement (reader)) {
                                        string nodefile = reader.GetAttribute 
("filename");
-                                       nodefile = 
Runtime.FileUtilityService.RelativeToAbsolutePath (basePath, nodefile);
+                                       nodefile = 
Runtime.FileService.RelativeToAbsolutePath (basePath, nodefile);
                                        combine.Entries.Add ((CombineEntry) 
Services.ProjectService.ReadFile (nodefile, monitor));
                                        reader.Skip ();
                                }
@@ -216,7 +216,7 @@
                                ArrayList files = new ArrayList ();
                                while (MoveToNextElement (reader)) {
                                        string nodefile = reader.GetAttribute 
("filename");
-                                       nodefile = 
Runtime.FileUtilityService.RelativeToAbsolutePath (basePath, nodefile);
+                                       nodefile = 
Runtime.FileService.RelativeToAbsolutePath (basePath, nodefile);
                                        files.Add (nodefile);
                                        reader.Skip ();
                                }

Modified: 
trunk/monodevelop/Core/src/MonoDevelop.Projects/MonoDevelop.Projects/CombineEntry.cs
===================================================================
--- 
trunk/monodevelop/Core/src/MonoDevelop.Projects/MonoDevelop.Projects/CombineEntry.cs
        2006-12-17 17:32:24 UTC (rev 69609)
+++ 
trunk/monodevelop/Core/src/MonoDevelop.Projects/MonoDevelop.Projects/CombineEntry.cs
        2006-12-17 17:32:57 UTC (rev 69610)
@@ -141,6 +141,13 @@
                        get { return parentCombine != null ? 
parentCombine.RootCombine : this as Combine; }
                }
                
+               // Returns a path which can be used to store local data related 
to the combine entry
+               public string LocalDataPath {
+                       get {
+                               return Path.Combine (BaseDirectory, "." + 
Path.GetFileName (FileName) + ".local");
+                       }
+               }
+               
                public virtual void Save (string fileName, IProgressMonitor 
monitor)
                {
                        FileName = fileName;
@@ -252,12 +259,12 @@
                        if (Path.IsPathRooted (relPath))
                                return relPath;
                        else
-                               return 
Runtime.FileUtilityService.RelativeToAbsolutePath (BaseDirectory, relPath);
+                               return 
Runtime.FileService.RelativeToAbsolutePath (BaseDirectory, relPath);
                }
                
                public string GetRelativeChildPath (string absPath)
                {
-                       return 
Runtime.FileUtilityService.AbsoluteToRelativePath (BaseDirectory, absPath);
+                       return Runtime.FileService.AbsoluteToRelativePath 
(BaseDirectory, absPath);
                }
                
                public virtual void Dispose()

Modified: 
trunk/monodevelop/Core/src/MonoDevelop.Projects/MonoDevelop.Projects/DotNetProject.cs
===================================================================
--- 
trunk/monodevelop/Core/src/MonoDevelop.Projects/MonoDevelop.Projects/DotNetProject.cs
       2006-12-17 17:32:24 UTC (rev 69609)
+++ 
trunk/monodevelop/Core/src/MonoDevelop.Projects/MonoDevelop.Projects/DotNetProject.cs
       2006-12-17 17:32:57 UTC (rev 69610)
@@ -172,10 +172,10 @@
                                if (Path.GetFileName (finfo.Name).ToUpper () == 
"app.config".ToUpper() &&
                                        Path.GetDirectoryName (finfo.Name) == 
BaseDirectory)
                                {
-                                       File.Copy (finfo.Name, 
conf.CompiledOutputName + ".config",true);
+                                       Runtime.FileService.CopyFile 
(finfo.Name, conf.CompiledOutputName + ".config");
                                }
                                if (finfo.BuildAction == BuildAction.FileCopy) {
-                                       File.Copy (finfo.Name, Path.Combine 
(Path.GetDirectoryName (conf.CompiledOutputName), Path.GetFileName 
(finfo.Name)), true);
+                                       Runtime.FileService.CopyFile 
(finfo.Name, Path.Combine (Path.GetDirectoryName (conf.CompiledOutputName), 
Path.GetFileName (finfo.Name)));
                                }
                        }
 

Modified: 
trunk/monodevelop/Core/src/MonoDevelop.Projects/MonoDevelop.Projects/MdpFileFormat.cs
===================================================================
--- 
trunk/monodevelop/Core/src/MonoDevelop.Projects/MonoDevelop.Projects/MdpFileFormat.cs
       2006-12-17 17:32:24 UTC (rev 69609)
+++ 
trunk/monodevelop/Core/src/MonoDevelop.Projects/MonoDevelop.Projects/MdpFileFormat.cs
       2006-12-17 17:32:57 UTC (rev 69610)
@@ -100,7 +100,7 @@
                                        StreamReader sr = new StreamReader 
(tempFile);
                                        string fdata = sr.ReadToEnd ();
                                        sr.Close ();
-                                       File.Delete (tempFile);
+                                       Runtime.FileService.DeleteFile 
(tempFile);
                                        reader = new XmlTextReader (new 
StringReader (fdata));
                                        projectReader = new ProjectReaderV1 
(serializer);
                                }

Modified: 
trunk/monodevelop/Core/src/MonoDevelop.Projects/MonoDevelop.Projects/PrjxFileFormat.cs
===================================================================
--- 
trunk/monodevelop/Core/src/MonoDevelop.Projects/MonoDevelop.Projects/PrjxFileFormat.cs
      2006-12-17 17:32:24 UTC (rev 69609)
+++ 
trunk/monodevelop/Core/src/MonoDevelop.Projects/MonoDevelop.Projects/PrjxFileFormat.cs
      2006-12-17 17:32:57 UTC (rev 69610)
@@ -98,7 +98,7 @@
                                StreamReader sr = new StreamReader (tempFile);
                                string fdata = sr.ReadToEnd ();
                                sr.Close ();
-                               File.Delete (tempFile);
+                               Runtime.FileService.DeleteFile (tempFile);
                                reader = new XmlTextReader (new StringReader 
(fdata));
                                projectReader = new ProjectReaderV1 
(serializer);
                        }

Modified: 
trunk/monodevelop/Core/src/MonoDevelop.Projects/MonoDevelop.Projects/Project.cs
===================================================================
--- 
trunk/monodevelop/Core/src/MonoDevelop.Projects/MonoDevelop.Projects/Project.cs 
    2006-12-17 17:32:24 UTC (rev 69609)
+++ 
trunk/monodevelop/Core/src/MonoDevelop.Projects/MonoDevelop.Projects/Project.cs 
    2006-12-17 17:32:57 UTC (rev 69610)
@@ -219,9 +219,9 @@
                                                                if 
(!Directory.Exists (Path.GetDirectoryName (destinationFileName)))
                                                                        
Directory.CreateDirectory (Path.GetDirectoryName (destinationFileName));
                                                                // Copy the file
-                                                               
File.Copy(referenceFileName, destinationFileName, true);
+                                                               
Runtime.FileService.CopyFile(referenceFileName, destinationFileName);
                                                                if (File.Exists 
(referenceFileName + ".mdb"))
-                                                                       
File.Copy (referenceFileName + ".mdb", destinationFileName + ".mdb", true);
+                                                                       
Runtime.FileService.CopyFile (referenceFileName + ".mdb", destinationFileName + 
".mdb");
                                                        }
                                                } catch (Exception e) {
                                                        
Runtime.LoggingService.ErrorFormat ("Can't copy reference file from {0} to {1}: 
{2}", (object)referenceFileName, (object)destinationFileName, (object)e);
@@ -243,9 +243,9 @@
                                                string destinationFileName = 
Path.Combine (destPath, Path.GetFileName (referenceFileName));
                                                try {
                                                        if (destinationFileName 
!= referenceFileName) {
-                                                               File.Delete 
(destinationFileName);
+                                                               
Runtime.FileService.DeleteFile (destinationFileName);
                                                                if (File.Exists 
(destinationFileName + ".mdb"))
-                                                                       
File.Delete (destinationFileName + ".mdb");
+                                                                       
Runtime.FileService.DeleteFile (destinationFileName + ".mdb");
                                                        }
                                                } catch (Exception e) {
                                                        
Runtime.LoggingService.ErrorFormat ("Can't delete reference file {0}: {2}", 
destinationFileName, e);
@@ -304,9 +304,9 @@
                        string file = GetOutputFileName ();
                        if (file != null) {
                                if (File.Exists (file))
-                                       File.Delete (file);
+                                       Runtime.FileService.DeleteFile (file);
                                if (File.Exists (file + ".mdb"))
-                                       File.Delete (file + ".mdb");
+                                       Runtime.FileService.DeleteFile (file + 
".mdb");
                        }
 
                        // Delete referenced assemblies

Modified: 
trunk/monodevelop/Core/src/MonoDevelop.Projects/MonoDevelop.Projects/ProjectPathItemPropertyAttribute.cs
===================================================================
--- 
trunk/monodevelop/Core/src/MonoDevelop.Projects/MonoDevelop.Projects/ProjectPathItemPropertyAttribute.cs
    2006-12-17 17:32:24 UTC (rev 69609)
+++ 
trunk/monodevelop/Core/src/MonoDevelop.Projects/MonoDevelop.Projects/ProjectPathItemPropertyAttribute.cs
    2006-12-17 17:32:57 UTC (rev 69610)
@@ -56,7 +56,7 @@
                {
                        if (value == null || ((string)value).Length == 0) 
return null;
                        string basePath = Path.GetDirectoryName 
(serCtx.BaseFile);
-                       string file = 
Runtime.FileUtilityService.AbsoluteToRelativePath (basePath, value.ToString ());
+                       string file = 
Runtime.FileService.AbsoluteToRelativePath (basePath, value.ToString ());
                        return new DataValue (Name, file);
                }
                
@@ -65,7 +65,7 @@
                        string file = ((DataValue)data).Value;
                        if (file == "") return "";
                        string basePath = Path.GetDirectoryName 
(serCtx.BaseFile);
-                       return 
Runtime.FileUtilityService.RelativeToAbsolutePath (basePath, file);
+                       return Runtime.FileService.RelativeToAbsolutePath 
(basePath, file);
                }
        }
 }

Modified: 
trunk/monodevelop/Core/src/MonoDevelop.Projects/MonoDevelop.Projects/ProjectReference.cs
===================================================================
--- 
trunk/monodevelop/Core/src/MonoDevelop.Projects/MonoDevelop.Projects/ProjectReference.cs
    2006-12-17 17:32:24 UTC (rev 69609)
+++ 
trunk/monodevelop/Core/src/MonoDevelop.Projects/MonoDevelop.Projects/ProjectReference.cs
    2006-12-17 17:32:57 UTC (rev 69610)
@@ -139,7 +139,7 @@
                        string refto = reference;
                        if (referenceType == ReferenceType.Assembly) {
                                string basePath = Path.GetDirectoryName 
(handler.SerializationContext.BaseFile);
-                               refto = 
Runtime.FileUtilityService.AbsoluteToRelativePath (basePath, refto);
+                               refto = 
Runtime.FileService.AbsoluteToRelativePath (basePath, refto);
                        } else if (referenceType == ReferenceType.Gac && 
loadedReference != null)
                                refto = loadedReference;
 
@@ -156,7 +156,7 @@
                                UpdateGacReference ();
                                if (referenceType == ReferenceType.Assembly) {
                                        string basePath = Path.GetDirectoryName 
(handler.SerializationContext.BaseFile);
-                                       reference = 
Runtime.FileUtilityService.RelativeToAbsolutePath (basePath, reference);
+                                       reference = 
Runtime.FileService.RelativeToAbsolutePath (basePath, reference);
                                }
                        }
                }

Modified: 
trunk/monodevelop/Core/src/MonoDevelop.Projects/MonoDevelop.Projects.Deployment/DirectoryDeployHandler.cs
===================================================================
--- 
trunk/monodevelop/Core/src/MonoDevelop.Projects/MonoDevelop.Projects.Deployment/DirectoryDeployHandler.cs
   2006-12-17 17:32:24 UTC (rev 69609)
+++ 
trunk/monodevelop/Core/src/MonoDevelop.Projects/MonoDevelop.Projects.Deployment/DirectoryDeployHandler.cs
   2006-12-17 17:32:57 UTC (rev 69610)
@@ -93,7 +93,7 @@
                        string targetDir = Path.GetDirectoryName (dest);
                        if (!Directory.Exists (targetDir))
                                Directory.CreateDirectory (targetDir);
-                       File.Copy (src, dest, true);
+                       Runtime.FileService.CopyFile (src, dest);
                }
        }
 }

Modified: 
trunk/monodevelop/Core/src/MonoDevelop.Projects/MonoDevelop.Projects.Parser/AssemblyCodeCompletionDatabase.cs
===================================================================
--- 
trunk/monodevelop/Core/src/MonoDevelop.Projects/MonoDevelop.Projects.Parser/AssemblyCodeCompletionDatabase.cs
       2006-12-17 17:32:24 UTC (rev 69609)
+++ 
trunk/monodevelop/Core/src/MonoDevelop.Projects/MonoDevelop.Projects.Parser/AssemblyCodeCompletionDatabase.cs
       2006-12-17 17:32:57 UTC (rev 69610)
@@ -214,7 +214,7 @@
                        int version = (int) headers ["Version"];
                        if (!File.Exists (checkFile) || version != 
FORMAT_VERSION) {
                                string dataFile = Path.Combine (baseDir, name + 
".pidb");
-                               File.Delete (dataFile);
+                               Runtime.FileService.DeleteFile (dataFile);
                                Runtime.LoggingService.Info ("Deleted " + 
dataFile);
                        }
                }

Modified: 
trunk/monodevelop/Core/src/MonoDevelop.Projects/MonoDevelop.Projects.Parser/CodeCompletionDatabase.cs
===================================================================
--- 
trunk/monodevelop/Core/src/MonoDevelop.Projects/MonoDevelop.Projects.Parser/CodeCompletionDatabase.cs
       2006-12-17 17:32:24 UTC (rev 69609)
+++ 
trunk/monodevelop/Core/src/MonoDevelop.Projects/MonoDevelop.Projects.Parser/CodeCompletionDatabase.cs
       2006-12-17 17:32:57 UTC (rev 69610)
@@ -115,7 +115,7 @@
                                CloseReader ();
                                
                                if (File.Exists (oldDataFile))
-                                       File.Move (oldDataFile, dataFile);
+                                       Runtime.FileService.MoveFile 
(oldDataFile, dataFile);
                        }
                }
                
@@ -282,14 +282,14 @@
                                        CloseReader ();
                                        
                                        if (File.Exists (dataFile))
-                                               File.Delete (dataFile);
+                                               Runtime.FileService.DeleteFile 
(dataFile);
                                                
-                                       File.Move (tmpDataFile, dataFile);
+                                       Runtime.FileService.MoveFile 
(tmpDataFile, dataFile);
                                } catch {
                                        if (dfile != null)
                                                dfile.Close ();
                                        if (File.Exists (tmpDataFile))
-                                               File.Delete (tmpDataFile);
+                                               Runtime.FileService.DeleteFile 
(tmpDataFile);
                                }
                        }
                }

Modified: 
trunk/monodevelop/Core/src/MonoDevelop.Projects/MonoDevelop.Projects.Parser/DefaultParserService.cs
===================================================================
--- 
trunk/monodevelop/Core/src/MonoDevelop.Projects/MonoDevelop.Projects.Parser/DefaultParserService.cs
 2006-12-17 17:32:24 UTC (rev 69609)
+++ 
trunk/monodevelop/Core/src/MonoDevelop.Projects/MonoDevelop.Projects.Parser/DefaultParserService.cs
 2006-12-17 17:32:57 UTC (rev 69610)
@@ -551,15 +551,15 @@
                        PropertyService propertyService = Runtime.Properties;
                        string path = 
propertyService.GetProperty("SharpDevelop.CodeCompletion.DataDirectory", 
String.Empty).ToString();
                        if (path == String.Empty) {
-                               path = Path.Combine 
(Runtime.FileUtilityService.GetDirectoryNameWithSeparator(propertyService.ConfigDirectory),
 "CodeCompletionData");
+                               path = Path.Combine 
(Runtime.FileService.GetDirectoryNameWithSeparator(propertyService.ConfigDirectory),
 "CodeCompletionData");
                                propertyService.SetProperty 
("SharpDevelop.CodeCompletion.DataDirectory", path);
                                propertyService.SaveProperties ();
                        }
-                       path = Path.Combine 
(Runtime.FileUtilityService.GetDirectoryNameWithSeparator(propertyService.ConfigDirectory),
 "CodeCompletionData");
+                       path = Path.Combine 
(Runtime.FileService.GetDirectoryNameWithSeparator(propertyService.ConfigDirectory),
 "CodeCompletionData");
                        if (!Directory.Exists (path))
                                Directory.CreateDirectory (path);
 
-                       codeCompletionPath = 
Runtime.FileUtilityService.GetDirectoryNameWithSeparator(path);
+                       codeCompletionPath = 
Runtime.FileService.GetDirectoryNameWithSeparator(path);
                }
 
                public void Initialize ()

Modified: 
trunk/monodevelop/Core/src/MonoDevelop.Projects/MonoDevelop.Projects.mdp
===================================================================
--- trunk/monodevelop/Core/src/MonoDevelop.Projects/MonoDevelop.Projects.mdp    
2006-12-17 17:32:24 UTC (rev 69609)
+++ trunk/monodevelop/Core/src/MonoDevelop.Projects/MonoDevelop.Projects.mdp    
2006-12-17 17:32:57 UTC (rev 69610)
@@ -231,6 +231,7 @@
     <File name="./MonoDevelop.Projects.Documentation/IDocumentationService.cs" 
subtype="Code" buildaction="Compile" />
     <File 
name="./MonoDevelop.Projects.Parser/CommentTasksChangedEventHandler.cs" 
subtype="Code" buildaction="Compile" />
     <File name="./MonoDevelop.Projects/BuildEventHandler.cs" subtype="Code" 
buildaction="Compile" />
+    <File name="./MonoDevelop.Projects.Parser/CompoundClass.cs" subtype="Code" 
buildaction="Compile" />
   </Contents>
   <References>
     <ProjectReference type="Project" localcopy="True" 
refto="ICSharpCode.SharpRefactory" />

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

Reply via email to