svn commit: r1440554 - in /commons/proper/cli/trunk/src/main/java/org/apache/commons/cli: Option.java OptionBuilder.java TypeHandler.java

[sebb]

Author: sebb
Date: Wed Jan 30 17:48:30 2013
New Revision: 1440554

URL: http://svn.apache.org/viewvc?rev=1440554&view=rev
Log:
Fix some obvious raw types

Modified:
    commons/proper/cli/trunk/src/main/java/org/apache/commons/cli/Option.java
    
commons/proper/cli/trunk/src/main/java/org/apache/commons/cli/OptionBuilder.java
    
commons/proper/cli/trunk/src/main/java/org/apache/commons/cli/TypeHandler.java

Modified: 
commons/proper/cli/trunk/src/main/java/org/apache/commons/cli/Option.java
URL: 
http://svn.apache.org/viewvc/commons/proper/cli/trunk/src/main/java/org/apache/commons/cli/Option.java?rev=1440554&r1=1440553&r2=1440554&view=diff
==============================================================================
--- commons/proper/cli/trunk/src/main/java/org/apache/commons/cli/Option.java 
(original)
+++ commons/proper/cli/trunk/src/main/java/org/apache/commons/cli/Option.java 
Wed Jan 30 17:48:30 2013
@@ -200,7 +200,7 @@ public class Option implements Cloneable
     @Deprecated
     public void setType(Object type)
     {
-        setType((Class) type);
+        setType((Class<?>) type);
     }
 
     /**
@@ -208,7 +208,7 @@ public class Option implements Cloneable
      *
      * @param type the type of this Option
      */
-    public void setType(Class type)
+    public void setType(Class<?> type)
     {
         this.type = type;
     }

Modified: 
commons/proper/cli/trunk/src/main/java/org/apache/commons/cli/OptionBuilder.java
URL: 
http://svn.apache.org/viewvc/commons/proper/cli/trunk/src/main/java/org/apache/commons/cli/OptionBuilder.java?rev=1440554&r1=1440553&r2=1440554&view=diff
==============================================================================
--- 
commons/proper/cli/trunk/src/main/java/org/apache/commons/cli/OptionBuilder.java
 (original)
+++ 
commons/proper/cli/trunk/src/main/java/org/apache/commons/cli/OptionBuilder.java
 Wed Jan 30 17:48:30 2013
@@ -48,7 +48,7 @@ public final class OptionBuilder
     private static int numberOfArgs = Option.UNINITIALIZED;
 
     /** option type */
-    private static Class type;
+    private static Class<?> type;
 
     /** option can have an optional argument value */
     private static boolean optionalArg;
@@ -294,7 +294,7 @@ public final class OptionBuilder
     @Deprecated
     public static OptionBuilder withType(Object newType)
     {
-        return withType((Class) newType);
+        return withType((Class<?>) newType);
     }
 
     /**
@@ -304,7 +304,7 @@ public final class OptionBuilder
      * @param newType the type of the Options argument value
      * @return the OptionBuilder instance
      */
-    public static OptionBuilder withType(Class newType)
+    public static OptionBuilder withType(Class<?> newType)
     {
         OptionBuilder.type = newType;
 

Modified: 
commons/proper/cli/trunk/src/main/java/org/apache/commons/cli/TypeHandler.java
URL: 
http://svn.apache.org/viewvc/commons/proper/cli/trunk/src/main/java/org/apache/commons/cli/TypeHandler.java?rev=1440554&r1=1440553&r2=1440554&view=diff
==============================================================================
--- 
commons/proper/cli/trunk/src/main/java/org/apache/commons/cli/TypeHandler.java 
(original)
+++ 
commons/proper/cli/trunk/src/main/java/org/apache/commons/cli/TypeHandler.java 
Wed Jan 30 17:48:30 2013
@@ -46,7 +46,7 @@ public class TypeHandler
      */
     public static Object createValue(String str, Object obj) throws 
ParseException
     {
-        return createValue(str, (Class) obj);
+        return createValue(str, (Class<?>) obj);
     }
 
     /**
@@ -59,7 +59,7 @@ public class TypeHandler
      * the value of <code>str</code>.
      * @throws ParseException if the value creation for the given class failed
      */
-    public static Object createValue(String str, Class clazz) throws 
ParseException
+    public static Object createValue(String str, Class<?> clazz) throws 
ParseException
     {
         if (PatternOptionBuilder.STRING_VALUE == clazz)
         {
@@ -112,7 +112,7 @@ public class TypeHandler
       */
     public static Object createObject(String classname) throws ParseException
     {
-        Class cl;
+        Class<?> cl;
 
         try
         {
@@ -167,7 +167,7 @@ public class TypeHandler
      * @return The class if it is found
      * @throws ParseException if the class could not be found
      */
-    public static Class createClass(String classname) throws ParseException
+    public static Class<?> createClass(String classname) throws ParseException
     {
         try
         {