Removing the Commons Lang dependency. This removes certain obscure number formats as being parseable by the PatternOptionBuilder, but I suspect they don't matter.

git-svn-id: https://svn.apache.org/repos/asf/jakarta/commons/proper/cli/branches/cli-1.0.x@542140 13f79535-47bb-0310-9956-ffa450edef68

Author: hen

project.xml

@@ -132,13 +132,6 @@
 
   <dependencies>
 
-    <!-- used in TypeHandler -->
-    <dependency>
-      <groupId>commons-lang</groupId>
-      <artifactId>commons-lang</artifactId>
-      <version>2.1</version>
-    </dependency>
-
     <!-- used for unit tests -->
     <dependency>
       <groupId>junit</groupId>

src/java/org/apache/commons/cli/PatternOptionBuilder.java

@@ -27,7 +27,7 @@
  * <tr><td>b@</td><td>-b [classname]</td></tr>
  * <tr><td>c&gt;</td><td>-c [filename]</td></tr>
  * <tr><td>d+</td><td>-d [classname] (creates object via empty contructor)</td></tr>
- * <tr><td>e%</td><td>-e [number] (creates Number instance)</td></tr>
+ * <tr><td>e%</td><td>-e [number] (creates Double/Long instance depeding on existing of a '.')</td></tr>
  * <tr><td>f/</td><td>-f [url]</td></tr>
  * <tr><td>g:</td><td>-g [string]</td></tr>
  * </table>

src/java/org/apache/commons/cli/TypeHandler.java

@@ -22,8 +22,6 @@
 
 import java.util.Date;
 
-import org.apache.commons.lang.math.NumberUtils;
-
 /**
   * This is a temporary implementation. TypeHandler will handle the 
   * pluggableness of OptionTypes and it will direct all of these types 
@@ -149,26 +147,35 @@ public static Object createObject(String str)
     }
 
     /**
-     * <p>Create a number from a String.</p>
+     * <p>Create a number from a String. If a . is present, it creates a 
+     *    Double, otherwise a Long. </p>
      *
      * @param str the value
      * @return the number represented by <code>str</code>, if <code>str</code>
      * is not a number, null is returned.
      */
     public static Number createNumber(String str)
     {
-        // Needs to be able to create
         try
         {
-            // do searching for decimal point etc, but atm just make an Integer
-            return NumberUtils.createNumber(str);
+            if( str != null )
+            {
+                if( str.indexOf('.') != -1 )
+                {
+                    return Double.valueOf(str);
+                }
+                else
+                {
+                    return Long.valueOf(str);
+                }
+            }
         }
         catch (NumberFormatException nfe)
         {
             System.err.println(nfe.getMessage());
-
-            return null;
         }
+
+        return null;
     }
 
     /**
@@ -254,4 +261,4 @@ public static File[] createFiles(String str)
         //        return FileW.findFiles(str);
         return null;
     }
-}
+}

src/test/org/apache/commons/cli/PatternOptionBuilderTest.java

@@ -67,8 +67,8 @@ public void testSimplePattern()
            assertEquals("file flag e", new java.io.File("build.xml"), line.getOptionObject('e'));
            assertEquals("class flag f", java.util.Calendar.class, line.getOptionObject("f"));
            assertEquals("class flag f", java.util.Calendar.class, line.getOptionObject('f'));
-           assertEquals("number flag n", new Float(4.5), line.getOptionObject("n"));
-           assertEquals("number flag n", new Float(4.5), line.getOptionObject('n'));
+           assertEquals("number flag n", new Double(4.5), line.getOptionObject("n"));
+           assertEquals("number flag n", new Double(4.5), line.getOptionObject('n'));
            assertEquals("url flag t", new java.net.URL("http://jakarta.apache.org/"), line.getOptionObject("t"));
            assertEquals("url flag t", new java.net.URL("http://jakarta.apache.org/"), line.getOptionObject('t'));
            /// DATES NOT SUPPORTED YET.