diff options
author | Lluis Sanchez <lluis@novell.com> | 2009-05-19 13:32:21 +0400 |
---|---|---|
committer | Lluis Sanchez <lluis@novell.com> | 2009-05-19 13:32:21 +0400 |
commit | 2994a9fb2746a3093416ade0c0511279809c6f45 (patch) | |
tree | fd291966304ba36a33b66479b6032e698d71c8a4 /main/src/addins/prj2make-sharp-lib | |
parent | 895e1974b5ce782d3bc4d830183cc04b36123b5f (diff) |
Use the new FilePath class for handling file and directory paths.
svn path=/trunk/monodevelop/; revision=134374
Diffstat (limited to 'main/src/addins/prj2make-sharp-lib')
-rw-r--r-- | main/src/addins/prj2make-sharp-lib/ChangeLog | 5 | ||||
-rw-r--r-- | main/src/addins/prj2make-sharp-lib/VS2003ProjectFileFormat.cs | 62 |
2 files changed, 36 insertions, 31 deletions
diff --git a/main/src/addins/prj2make-sharp-lib/ChangeLog b/main/src/addins/prj2make-sharp-lib/ChangeLog index 6ba63b8c5a..d55ad87e97 100644 --- a/main/src/addins/prj2make-sharp-lib/ChangeLog +++ b/main/src/addins/prj2make-sharp-lib/ChangeLog @@ -1,3 +1,8 @@ +2009-05-19 Lluis Sanchez Gual <lluis@novell.com> + + * VS2003ProjectFileFormat.cs: Use the new FilePath class for + handling file and directory paths. + 2009-05-01 Michael Hutchinson <mhutchinson@novell.com> * Makefile.am: diff --git a/main/src/addins/prj2make-sharp-lib/VS2003ProjectFileFormat.cs b/main/src/addins/prj2make-sharp-lib/VS2003ProjectFileFormat.cs index 01bc55e05d..190d9229bb 100644 --- a/main/src/addins/prj2make-sharp-lib/VS2003ProjectFileFormat.cs +++ b/main/src/addins/prj2make-sharp-lib/VS2003ProjectFileFormat.cs @@ -60,16 +60,16 @@ namespace MonoDevelop.Prj2Make helper = new GuiHelper (); return helper; } - } - - public string GetValidFormatName (object obj, string fileName) + }
+
+ public FilePath GetValidFormatName (object obj, FilePath fileName) { return fileName; - } - - public bool CanReadFile (string file, Type expectedObjectType) + }
+
+ public bool CanReadFile (FilePath file, Type expectedObjectType) { - if (expectedObjectType.IsAssignableFrom (typeof(Solution)) && String.Compare (Path.GetExtension (file), ".sln", true) == 0) { + if (expectedObjectType.IsAssignableFrom (typeof(Solution)) && String.Compare (file.Extension, ".sln", true) == 0) { string ver = GetSlnFileVersion (file); if (ver == "7.00" || ver == "8.00") return true; @@ -78,8 +78,8 @@ namespace MonoDevelop.Prj2Make if (!expectedObjectType.IsAssignableFrom (typeof(DotNetProject))) return false; - if (String.Compare (Path.GetExtension (file), ".csproj", true) != 0 && - String.Compare (Path.GetExtension (file), ".vbproj", true) != 0) + if (String.Compare (file.Extension, ".csproj", true) != 0 && + String.Compare (file.Extension, ".vbproj", true) != 0) return false; try { @@ -98,21 +98,21 @@ namespace MonoDevelop.Prj2Make public bool CanWriteFile (object obj) { return false; - } - - public void WriteFile (string file, object node, IProgressMonitor monitor) + }
+
+ public void WriteFile (FilePath file, object node, IProgressMonitor monitor) { - } - - public object ReadFile (string file, Type expectedType, IProgressMonitor monitor) + }
+
+ public object ReadFile (FilePath file, Type expectedType, IProgressMonitor monitor) { if (expectedType.IsAssignableFrom (typeof(DotNetProject))) return ReadProjectFile (file, monitor); else return ReadSolutionFile (file, monitor); - } - - public object ReadProjectFile (string fileName, IProgressMonitor monitor) + }
+
+ public object ReadProjectFile (FilePath fileName, IProgressMonitor monitor) { TargetConvert choice = IdeApp.IsInitialized ? GuiHelper.QueryProjectConversion (fileName) : TargetConvert.None; if (choice == TargetConvert.None) @@ -129,9 +129,9 @@ namespace MonoDevelop.Prj2Make project.Save (monitor); return project; - } - - public object ReadSolutionFile (string fileName, IProgressMonitor monitor) + }
+
+ public object ReadSolutionFile (FilePath fileName, IProgressMonitor monitor) { TargetConvert choice = IdeApp.IsInitialized ? GuiHelper.QuerySolutionConversion (fileName) : TargetConvert.None; if (choice == TargetConvert.None) @@ -147,9 +147,9 @@ namespace MonoDevelop.Prj2Make solution.Save (monitor); return solution; - } - - internal DotNetProject ImportCsproj (string fileName) + }
+
+ internal DotNetProject ImportCsproj (FilePath fileName) { DotNetProject project = null; SlnMaker slnmaker = new SlnMaker (); @@ -168,15 +168,15 @@ namespace MonoDevelop.Prj2Make public void ConvertToFormat (object obj) { throw new NotSupportedException (); + }
+
+ public List<FilePath> GetItemFiles (object obj) + {
+ return new List<FilePath> (); } - public List<string> GetItemFiles (object obj) - { - return new List<string> (); - } - - // Converts a vs2003 solution to a Combine object - internal Solution ImportSln (string fileName) + // Converts a vs2003 solution to a Combine object
+ internal Solution ImportSln (FilePath fileName) { SlnMaker slnmaker = new SlnMaker (); Solution solution = null; |