"someone" forget to cast in the right way

Author: Leonardo Lopes

src/main/java/org/json/JSONArray.java

@@ -288,7 +288,7 @@ public boolean getBoolean(int index) throws JSONException {
                         .equalsIgnoreCase("true"))) {
             return true;
         }
-        throw wrongValueFormatException(index, "boolean", null);
+        throw wrongValueFormatException(index, "Boolean", null);
     }
 
     /**
@@ -326,7 +326,7 @@ public double getDouble(int index) throws JSONException {
     public float getFloat(int index) throws JSONException {
         final Object object = this.get(index);
         if(object instanceof Number) {
-            return ((Float)object).floatValue();
+            return ((Number)object).floatValue();
         }
         try {
             return Float.parseFloat(object.toString());
@@ -377,8 +377,7 @@ public <E extends Enum<E>> E getEnum(Class<E> clazz, int index) throws JSONExcep
             // JSONException should really take a throwable argument.
             // If it did, I would re-implement this with the Enum.valueOf
             // method and place any thrown exception in the JSONException
-            throw wrongValueFormatException(index, "enum of type "
-                    + JSONObject.quote(clazz.getSimpleName()), null);
+            throw wrongValueFormatException(index, "enum of type " + JSONObject.quote(clazz.getSimpleName()), null);
         }
         return val;
     }
@@ -396,13 +395,13 @@ public <E extends Enum<E>> E getEnum(Class<E> clazz, int index) throws JSONExcep
      *             If the key is not found or if the value cannot be converted
      *             to a BigDecimal.
      */
-    public BigDecimal getBigDecimal (int index) throws JSONException {
+    public BigDecimal getBigDecimal(int index) throws JSONException {
         Object object = this.get(index);
-        BigDecimal val = JSONObject.objectToBigDecimal(object, null);
-        if(val == null) {
-            throw wrongValueFormatException(index, "BigDecimal", object, null);
+        BigDecimal ret = JSONObject.objectToBigDecimal(object, null);
+        if (ret != null) {
+            return ret;
         }
-        return val;
+        throw wrongValueFormatException(index, "BigDecimal", object, null);
     }
 
     /**
@@ -415,13 +414,13 @@ public BigDecimal getBigDecimal (int index) throws JSONException {
      *             If the key is not found or if the value cannot be converted
      *             to a BigInteger.
      */
-    public BigInteger getBigInteger (int index) throws JSONException {
+    public BigInteger getBigInteger(int index) throws JSONException {
         Object object = this.get(index);
-        BigInteger val = JSONObject.objectToBigInteger(object, null);
-        if(val == null) {
-            throw wrongValueFormatException(index, "BigInteger", object, null);
+        BigInteger ret = JSONObject.objectToBigInteger(object, null);
+        if (ret != null) {
+            return ret;
         }
-        return val;
+        throw wrongValueFormatException(index, "BigInteger", object, null);
     }
 
     /**

src/main/java/org/json/JSONObject.java

@@ -594,7 +594,7 @@ public <E extends Enum<E>> E getEnum(Class<E> clazz, String key) throws JSONExce
             // JSONException should really take a throwable argument.
             // If it did, I would re-implement this with the Enum.valueOf
             // method and place any thrown exception in the JSONException
-            throw wrongValueFormatException(key, "enum of type " + quote(clazz.getSimpleName()), null);
+            throw wrongValueFormatException(key, "enum of type " + JSONObject.quote(clazz.getSimpleName()), null);
         }
         return val;
     }
@@ -635,7 +635,7 @@ public boolean getBoolean(String key) throws JSONException {
      */
     public BigInteger getBigInteger(String key) throws JSONException {
         Object object = this.get(key);
-        BigInteger ret = objectToBigInteger(object, null);
+        BigInteger ret = JSONObject.objectToBigInteger(object, null);
         if (ret != null) {
             return ret;
         }
@@ -657,7 +657,7 @@ public BigInteger getBigInteger(String key) throws JSONException {
      */
     public BigDecimal getBigDecimal(String key) throws JSONException {
         Object object = this.get(key);
-        BigDecimal ret = objectToBigDecimal(object, null);
+        BigDecimal ret = JSONObject.objectToBigDecimal(object, null);
         if (ret != null) {
             return ret;
         }
@@ -724,7 +724,7 @@ public Number getNumber(String key) throws JSONException {
             if (object instanceof Number) {
                 return (Number)object;
             }
-            return stringToNumber(object.toString());
+            return JSONObject.stringToNumber(object.toString());
         } catch (Exception e) {
             throw wrongValueFormatException(key, "number", e);
         }
@@ -860,7 +860,7 @@ public String getString(String key) throws JSONException {
         if (object instanceof String) {
             return (String) object;
         }
-        throw wrongValueFormatException(key, "string", null);
+        throw wrongValueFormatException(key, "String", null);
     }
 
     /**