improvement to the extension handling from Oliver Jones

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

Author: hen

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

@@ -52,7 +52,7 @@
  * @author <a href="mailto:jefft@apache.org">Jeff Turner</a>
  * @author Matthew Hawthorne
  * @author <a href="mailto:jeremias@apache.org">Jeremias Maerki</a>
- * @version $Id: FilenameUtils.java,v 1.9 2004/06/13 04:58:07 bayard Exp $
+ * @version $Id: FilenameUtils.java,v 1.10 2004/06/13 05:13:57 bayard Exp $
  */
 public class FilenameUtils {
 
@@ -103,41 +103,54 @@ public static void mkdir(String dir) {
      * foo.txt    --> foo
      * a\b\c.jpg --> a\b\c
      * a\b\c     --> a\b\c
+     * a.b\c        --> a.b\c
      * </pre>
      *
      * @param filename the filename
      * @return the filename minus extension
      */
-    public static String removeExtension( String filename) {
-        int index = filename.lastIndexOf('.');
-
-        if (-1 == index) {
-            return filename;
-        } else {
-            return filename.substring(0, index);
+    public static String removeExtension( final String filename) {
+        String ext = getExtension(filename);
+        int index = ext.length();
+        if(index > 0) {
+            // include the . in the count
+            index++;
         }
+        index = filename.length() - index;
+        return filename.substring(0, index);
     }
 
-    /**
-     * Get extension from filename.
-     * ie
+   /**
+     * Gets the extension of a filename.
+     * <p>
+     * eg
      * <pre>
-     * foo.txt    --> "txt"
-     * a\b\c.jpg --> "jpg"
-     * a\b\c     --> ""
+     * foo.txt      --> "txt"
+     * a/b/c.jpg    --> "jpg"
+     * a/b/c        --> ""
+     * a.b/c.txt    --> "txt"
+     * a.b/c        --> ""
      * </pre>
      *
-     * @param filename the filename
-     * @return the extension of filename or "" if none
+     * @param filename the filename to retrieve the extension of.
+     * @return the extension of filename or an empty string if none exists.
      */
-    public static String getExtension( String filename) {
-        int index = filename.lastIndexOf('.');
+    public static String getExtension(final String filename) {
+        String suffix = "";
+        String shortFilename = filename;
 
-        if (-1 == index) {
-            return "";
-        } else {
-            return filename.substring(index + 1);
+        int lastDirSeparator = filename.lastIndexOf(File.separatorChar);
+        if(lastDirSeparator > 0){
+            shortFilename = filename.substring(lastDirSeparator + 1);
+        }
+
+        int index = shortFilename.lastIndexOf('.');
+
+        if (index > 0 && index < shortFilename.length() - 1) {
+            suffix = shortFilename.substring(index + 1);
         }
+
+        return suffix;
     }
 
     /**

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

@@ -29,7 +29,7 @@
  *
  * @author Peter Donald
  * @author Matthew Hawthorne
- * @version $Id: FilenameUtilsTestCase.java,v 1.7 2004/03/12 21:59:19 jeremias Exp $
+ * @version $Id: FilenameUtilsTestCase.java,v 1.8 2004/06/13 05:13:57 bayard Exp $
  * @see FilenameUtils
  */
 public class FilenameUtilsTestCase extends FileBasedTestCase {
@@ -203,10 +203,14 @@ private String replaceAll(
     }
 
     public void testGetExtension() {
-        String[][] tests = { { "filename.ext", "ext" }, {
-                "README", "" }, {
-                "domain.dot.com", "com" }, {
-                "image.jpeg", "jpeg" }
+        String[][] tests = {
+                { "filename.ext", "ext" }, 
+                { "README", "" }, 
+                { "domain.dot.com", "com" }, 
+                { "image.jpeg", "jpeg" },
+                { "a.b/c", "" },
+                { "a.b/c.txt", "txt" },
+                { "a/b/c", "" },
         };
         for (int i = 0; i < tests.length; i++) {
             assertEquals(tests[i][1], FilenameUtils.getExtension(tests[i][0]));
@@ -234,11 +238,15 @@ public void DISABLED__testGetExtensionWithPaths() {
     }
 
     public void testRemoveExtension() {
-        String[][] tests = { { "filename.ext", "filename" }, {
-                "first.second.third.ext", "first.second.third" }, {
-                "README", "README" }, {
-                "domain.dot.com", "domain.dot" }, {
-                "image.jpeg", "image" }
+        String[][] tests = { 
+                { "filename.ext", "filename" }, 
+                { "first.second.third.ext", "first.second.third" }, 
+                { "README", "README" }, 
+                { "domain.dot.com", "domain.dot" }, 
+                { "image.jpeg", "image" },
+                { "a.b/c", "a.b/c" },
+                { "a.b/c.txt", "a.b/c" },
+                { "a/b/c", "a/b/c" },
         };
 
         for (int i = 0; i < tests.length; i++) {