svn commit: r1811339 - in /commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/parser: ASTNumberLiteral.java NumberParser.java

[he...@apache.org]

Author: henrib
Date: Fri Oct  6 14:57:35 2017
New Revision: 1811339

URL: http://svn.apache.org/viewvc?rev=1811339&view=rev
Log:
JEXL-238:
Changed signatures & variable types

Modified:
    commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/parser/ASTNumberLiteral.java
    commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/parser/NumberParser.java

Modified: commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/parser/ASTNumberLiteral.java
URL: http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/parser/ASTNumberLiteral.java?rev=1811339&r1=1811338&r2=1811339&view=diff
==============================================================================
--- commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/parser/ASTNumberLiteral.java (original)
+++ commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/parser/ASTNumberLiteral.java Fri Oct  6 14:57:35 2017
@@ -44,7 +44,7 @@ public final class ASTNumberLiteral exte
         return true;
     }
 
-    public Class<?> getLiteralClass() {
+    public Class<? extends Number> getLiteralClass() {
         return nlp.getLiteralClass();
     }
 

Modified: commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/parser/NumberParser.java
URL: http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/parser/NumberParser.java?rev=1811339&r1=1811338&r2=1811339&view=diff
==============================================================================
--- commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/parser/NumberParser.java (original)
+++ commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/parser/NumberParser.java Fri Oct  6 14:57:35 2017
@@ -26,7 +26,7 @@ public final class NumberParser {
     /** The type literal value. */
     private Number literal = null;
     /** The expected class. */
-    private Class<?> clazz = null;
+    private Class<? extends Number> clazz = null;
     /** JEXL locale-neutral big decimal format. */
     static final DecimalFormat BIGDF = new DecimalFormat("0.0b", new DecimalFormatSymbols(Locale.ENGLISH));
 
@@ -54,7 +54,7 @@ public final class NumberParser {
     }
 
 
-    Class<?> getLiteralClass() {
+    Class<? extends Number> getLiteralClass() {
         return clazz;
     }
 
@@ -85,7 +85,7 @@ public final class NumberParser {
      */
     void setNatural(String s) {
         Number result;
-        Class<?> rclass;
+        Class<? extends Number> rclass;
         // determine the base
         final int base;
         if (s.charAt(0) == '0') {
@@ -136,7 +136,7 @@ public final class NumberParser {
      */
     void setReal(String s) {
         Number result;
-        Class<?> rclass;
+        Class<? extends Number> rclass;
         if ("#NaN".equals(s) || "NaN".equals(s)) {
             result = Double.NaN;
             rclass = Double.class;