Add separatorsToXxx methods to FilenameUtils

git-svn-id: https://svn.apache.org/repos/asf/jakarta/commons/proper/io/trunk@140632 13f79535-47bb-0310-9956-ffa450edef68

Author: Stephen Colebourne

src/java/org/apache/commons/io/FilenameUtils.java

@@ -55,7 +55,8 @@
  * @author Matthew Hawthorne
  * @author Martin Cooper
  * @author <a href="mailto:jeremias@apache.org">Jeremias Maerki</a>
- * @version $Id: FilenameUtils.java,v 1.18 2004/10/29 21:38:49 bayard Exp $
+ * @author Stephen Colebourne
+ * @version $Id: FilenameUtils.java,v 1.19 2004/10/30 22:16:23 scolebourne Exp $
  * @since Commons IO 1.1
  */
 public class FilenameUtils {
@@ -65,6 +66,21 @@ public class FilenameUtils {
      */
     private static final char INTERNAL_SEPARATOR_CHAR = '/';
 
+    /**
+     * The Unix separator character.
+     */
+    private static final char UNIX_SEPARATOR = '/';
+
+    /**
+     * The Windows separator character.
+     */
+    private static final char WINDOWS_SEPARATOR = '\\';
+
+    /**
+     * The system separator character.
+     */
+    private static final char SYSTEM_SEPARATOR = File.separatorChar;
+
     /**
      * Standard separator string used when internalizing paths.
      */
@@ -475,4 +491,52 @@ private static String externalize(String path) {
         return path;
     }
 
+    //-----------------------------------------------------------------------
+    /**
+     * Convert all separators to the Unix separator of forward slash.
+     * 
+     * @param path  the path to be changed, null ignored
+     * @return the updated path
+     */
+    public static String separatorsToUnix(String path) {
+        if (path == null || path.indexOf(WINDOWS_SEPARATOR) == -1) {
+            return path;
+        }
+        return path.replace(WINDOWS_SEPARATOR, UNIX_SEPARATOR);
+    }
+
+    /**
+     * Convert all separators to the Windows separator of backslash.
+     * 
+     * @param path  the path to be changed, null ignored
+     * @return the updated path
+     */
+    public static String separatorsToWindows(String path) {
+        if (path == null || path.indexOf(UNIX_SEPARATOR) == -1) {
+            return path;
+        }
+        return path.replace(UNIX_SEPARATOR, WINDOWS_SEPARATOR);
+    }
+
+    /**
+     * Convert all separators to the system separator.
+     * 
+     * @param path  the path to be changed, null ignored
+     * @return the updated path
+     */
+    public static String separatorsToSystem(String path) {
+        if (path == null) {
+            return null;
+        }
+        if (SYSTEM_SEPARATOR == UNIX_SEPARATOR) {
+            return separatorsToUnix(path);
+        }
+        if (SYSTEM_SEPARATOR == WINDOWS_SEPARATOR) {
+            return separatorsToWindows(path);
+        }
+        path = path.replace(UNIX_SEPARATOR, SYSTEM_SEPARATOR);
+        path = path.replace(WINDOWS_SEPARATOR, SYSTEM_SEPARATOR);
+        return path;
+    }
+
 }

src/test/org/apache/commons/io/FilenameUtilsTestCase.java

@@ -30,7 +30,7 @@
  * @author Peter Donald
  * @author Matthew Hawthorne
  * @author Martin Cooper
- * @version $Id: FilenameUtilsTestCase.java,v 1.12 2004/10/24 18:44:51 martinc Exp $
+ * @version $Id: FilenameUtilsTestCase.java,v 1.13 2004/10/30 22:16:23 scolebourne Exp $
  * @see FilenameUtils
  */
 public class FilenameUtilsTestCase extends FileBasedTestCase {
@@ -274,4 +274,41 @@ public void testRemoveExtensionWithPaths() {
         }
     }
 
+    //-----------------------------------------------------------------------
+    public void testSeparatorsToUnix() {
+        assertEquals(null, FilenameUtils.separatorsToUnix(null));
+        assertEquals("/a/b/c", FilenameUtils.separatorsToUnix("/a/b/c"));
+        assertEquals("/a/b/c.txt", FilenameUtils.separatorsToUnix("/a/b/c.txt"));
+        assertEquals("/a/b/c", FilenameUtils.separatorsToUnix("/a/b\\c"));
+        assertEquals("/a/b/c", FilenameUtils.separatorsToUnix("\\a\\b\\c"));
+        assertEquals("D:/a/b/c", FilenameUtils.separatorsToUnix("D:\\a\\b\\c"));
+    }
+
+    public void testSeparatorsToWindows() {
+        assertEquals(null, FilenameUtils.separatorsToWindows(null));
+        assertEquals("\\a\\b\\c", FilenameUtils.separatorsToWindows("\\a\\b\\c"));
+        assertEquals("\\a\\b\\c.txt", FilenameUtils.separatorsToWindows("\\a\\b\\c.txt"));
+        assertEquals("\\a\\b\\c", FilenameUtils.separatorsToWindows("\\a\\b/c"));
+        assertEquals("\\a\\b\\c", FilenameUtils.separatorsToWindows("/a/b/c"));
+        assertEquals("D:\\a\\b\\c", FilenameUtils.separatorsToWindows("D:/a/b/c"));
+    }
+
+    public void testSeparatorsToSystem() {
+        if (File.separatorChar == '/') {
+            assertEquals(null, FilenameUtils.separatorsToSystem(null));
+            assertEquals("/a/b/c", FilenameUtils.separatorsToSystem("/a/b/c"));
+            assertEquals("/a/b/c.txt", FilenameUtils.separatorsToSystem("/a/b/c.txt"));
+            assertEquals("/a/b/c", FilenameUtils.separatorsToSystem("/a/b\\c"));
+            assertEquals("/a/b/c", FilenameUtils.separatorsToSystem("\\a\\b\\c"));
+            assertEquals("D:/a/b/c", FilenameUtils.separatorsToSystem("D:\\a\\b\\c"));
+        } else {
+            assertEquals(null, FilenameUtils.separatorsToSystem(null));
+            assertEquals("\\a\\b\\c", FilenameUtils.separatorsToSystem("\\a\\b\\c"));
+            assertEquals("\\a\\b\\c.txt", FilenameUtils.separatorsToSystem("\\a\\b\\c.txt"));
+            assertEquals("\\a\\b\\c", FilenameUtils.separatorsToSystem("\\a\\b/c"));
+            assertEquals("\\a\\b\\c", FilenameUtils.separatorsToSystem("/a/b/c"));
+            assertEquals("D:\\a\\b\\c", FilenameUtils.separatorsToSystem("D:/a/b/c"));
+        }
+    }
+
 }