Changeset 2322

Timestamp:

10/29/2011 10:03:40 AM (19 months ago)

Author:

lowjoel

Message:

Call our relative-path handling class PathUtil? instead so that we do not conflict with the .NET runtime. This is to allow less typing when using both System.IO and Eraser.Util.ExtensionMethods?.

Location:

trunk/eraser

Files:

• Eraser.DefaultPlugins/ErasureTargets/SecureMoveErasureTarget.cs (modified) (2 diffs)
• Eraser.Util/Eraser.Util.csproj (modified) (1 diff)
• Eraser.Util/ExtensionMethods/PathUtil.cs (moved) (moved from trunk/eraser/Eraser.Util/ExtensionMethods/Path.cs) (1 diff)

trunk/eraser/Eraser.DefaultPlugins/ErasureTargets/SecureMoveErasureTarget.cs

@@ -150 +150 @@
         {
             //Check the the destination is not a subfolder of the source.
-            if (Eraser.Util.ExtensionMethods.Path.IsRootedAt(info, Destination))
+            if (PathUtil.IsRootedAt(info, Destination))
             {
                 Logger.Log(S._("The destination directory cannot be within the source directory."),
@@ -264 +264 @@
             string baseDir = System.IO.Path.Combine(Destination, source.Name);
             return System.IO.Path.Combine(baseDir,
-                Eraser.Util.ExtensionMethods.Path.MakeRelativeTo(source, sourcePath));
+                PathUtil.MakeRelativeTo(source, sourcePath));
         }
 

trunk/eraser/Eraser.Util/Eraser.Util.csproj

@@ -116 +116 @@
     </Compile>
     <Compile Include="ExtensionMethods\Assembly.cs" />
-    <Compile Include="ExtensionMethods\Path.cs" />
+    <Compile Include="ExtensionMethods\PathUtil.cs" />
     <Compile Include="FileSize.cs" />
     <Compile Include="Logger.cs" />

trunk/eraser/Eraser.Util/ExtensionMethods/PathUtil.cs

@@ -31 +31 @@
     /// Additional Path utility methods.
     /// </summary>
-    public class Path
+    public class PathUtil
     {
         /// <summary>