Assimilate PosixPathHelper into FilePath

dahlbyk · nulltoken · commit db5d0d0c09b6 · 2012-03-06T14:55:53.000+01:00
diff --git a/LibGit2Sharp/Core/FilePath.cs b/LibGit2Sharp/Core/FilePath.cs
@@ -1,14 +1,18 @@
-﻿namespace LibGit2Sharp.Core
+﻿using System.IO;
+
+namespace LibGit2Sharp.Core
 {
     internal class FilePath
     {
+        private const char posixDirectorySeparatorChar = '/';
+
         private readonly string native;
         private readonly string posix;
 
         private FilePath(string path)
         {
-            native = PosixPathHelper.ToNative(path);
-            posix = PosixPathHelper.ToPosix(path);
+            native = Replace(path, posixDirectorySeparatorChar, Path.DirectorySeparatorChar);
+            posix = Replace(path, Path.DirectorySeparatorChar, posixDirectorySeparatorChar);
         }
 
         public string Native
@@ -30,5 +34,15 @@ public static implicit operator FilePath(string path)
         {
             return path == null ? null : new FilePath(path);
         }
+
+        private static string Replace(string path, char oldChar, char newChar)
+        {
+            if (oldChar == newChar)
+            {
+                return path;
+            }
+
+            return path == null ? null : path.Replace(oldChar, newChar);
+        }
     }
 }
diff --git a/LibGit2Sharp/Core/PosixPathHelper.cs b/LibGit2Sharp/Core/PosixPathHelper.cs
diff --git a/LibGit2Sharp/LibGit2Sharp.csproj b/LibGit2Sharp/LibGit2Sharp.csproj
@@ -77,9 +77,6 @@
     <Compile Include="Core\NativeMethods.cs" />
     <Compile Include="Core\SafeHandleExtensions.cs" />
     <Compile Include="Core\ObjectSafeWrapper.cs" />
-    <Compile Include="Core\PosixPathHelper.cs">
-      <SubType>Code</SubType>
-    </Compile>
     <Compile Include="Core\RemoteSafeHandle.cs" />
     <Compile Include="Core\RevWalkerSafeHandle.cs">
       <SubType>Code</SubType>

Original file line number	Diff line number	Diff line change
`@@ -1,14 +1,18 @@`
`1`		`-namespace LibGit2Sharp.Core`
	`1`	`+using System.IO;`
	`2`	`+`
	`3`	`+namespace LibGit2Sharp.Core`
`2`	`4`	`{`
`3`	`5`	`internal class FilePath`
`4`	`6`	`{`
	`7`	`+ private const char posixDirectorySeparatorChar = '/';`
	`8`	`+`
`5`	`9`	`private readonly string native;`
`6`	`10`	`private readonly string posix;`
`7`	`11`
`8`	`12`	`private FilePath(string path)`
`9`	`13`	`{`
`10`		`- native = PosixPathHelper.ToNative(path);`
`11`		`- posix = PosixPathHelper.ToPosix(path);`
	`14`	`+ native = Replace(path, posixDirectorySeparatorChar, Path.DirectorySeparatorChar);`
	`15`	`+ posix = Replace(path, Path.DirectorySeparatorChar, posixDirectorySeparatorChar);`
`12`	`16`	`}`
`13`	`17`
`14`	`18`	`public string Native`
`@@ -30,5 +34,15 @@ public static implicit operator FilePath(string path)`
`30`	`34`	`{`
`31`	`35`	`return path == null ? null : new FilePath(path);`
`32`	`36`	`}`
	`37`	`+`
	`38`	`+ private static string Replace(string path, char oldChar, char newChar)`
	`39`	`+ {`
	`40`	`+ if (oldChar == newChar)`
	`41`	`+ {`
	`42`	`+ return path;`
	`43`	`+ }`
	`44`	`+`
	`45`	`+ return path == null ? null : path.Replace(oldChar, newChar);`
	`46`	`+ }`
`33`	`47`	`}`
`34`	`48`	`}`