commons-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From d...@apache.org
Subject cvs commit: jakarta-commons/jexl/src/java/org/apache/commons/jexl/parser ASTNENode.java ASTEQNode.java
Date Sat, 21 Aug 2004 10:01:19 GMT
dion        2004/08/21 03:01:19

  Modified:    jexl/src/java/org/apache/commons/jexl/parser ASTNENode.java
                        ASTEQNode.java
  Log:
  Back out jdk1.4 only change
  
  Revision  Changes    Path
  1.6       +7 -7      jakarta-commons/jexl/src/java/org/apache/commons/jexl/parser/ASTNENode.java
  
  Index: ASTNENode.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/jexl/src/java/org/apache/commons/jexl/parser/ASTNENode.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- ASTNENode.java	20 Aug 2004 12:04:39 -0000	1.5
  +++ ASTNENode.java	21 Aug 2004 10:01:18 -0000	1.6
  @@ -66,30 +66,30 @@
           }
           else if (left.getClass().equals(right.getClass()))
           {
  -            return Boolean.valueOf(!left.equals(right));
  +            return new Boolean(!left.equals(right));
           }
           else if(left instanceof Float || left instanceof Double ||
                   right instanceof Float || right instanceof Double)
           {
  -            return Boolean.valueOf(
  +            return new Boolean(
                   !Coercion.coerceDouble(left).equals(Coercion.coerceDouble(right)));
           }
           else if ( left instanceof Number || right instanceof Number ||
                      left instanceof Character || right instanceof Character)
           {
  -            return Boolean.valueOf(
  +            return new Boolean(
                       !Coercion.coerceLong(left).equals(Coercion.coerceLong(right)));
           }
           else if (left instanceof Boolean || right instanceof Boolean)
           {
  -            return Boolean.valueOf(
  +            return new Boolean(
                       !Coercion.coerceBoolean(left).equals(Coercion.coerceBoolean(right)));
           }
           else if (left instanceof java.lang.String || right instanceof String)
           {
  -            return Boolean.valueOf(!left.toString().equals(right.toString()));
  +            return new Boolean(!left.toString().equals(right.toString()));
           }
   
  -        return Boolean.valueOf(!left.equals(right));
  +        return new Boolean(!left.equals(right));
       }
   }
  
  
  
  1.6       +7 -7      jakarta-commons/jexl/src/java/org/apache/commons/jexl/parser/ASTEQNode.java
  
  Index: ASTEQNode.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/jexl/src/java/org/apache/commons/jexl/parser/ASTEQNode.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- ASTEQNode.java	20 Aug 2004 12:04:39 -0000	1.5
  +++ ASTEQNode.java	21 Aug 2004 10:01:18 -0000	1.6
  @@ -64,7 +64,7 @@
           }
           else if (left.getClass().equals(right.getClass()))
           {
  -            return Boolean.valueOf(left.equals(right));
  +            return new Boolean(left.equals(right));
           }
           else if(left instanceof Float || left instanceof Double ||
                   right instanceof Float || right instanceof Double)
  @@ -72,24 +72,24 @@
               Double l = Coercion.coerceDouble(left);
               Double r = Coercion.coerceDouble(right);
   
  -            return Boolean.valueOf(l.equals(r));
  +            return new Boolean(l.equals(r));
           }
           else if ( left instanceof Number || right instanceof Number ||
                      left instanceof Character || right instanceof Character)
           {
  -            return Boolean.valueOf(
  +            return new Boolean(
                       Coercion.coerceLong(left).equals(Coercion.coerceLong(right)));
           }
           else if (left instanceof Boolean || right instanceof Boolean)
           {
  -            return Boolean.valueOf(
  +            return new Boolean(
                       Coercion.coerceBoolean(left).equals(Coercion.coerceBoolean(right)));
           }
           else if (left instanceof java.lang.String || right instanceof String)
           {
  -            return Boolean.valueOf(left.toString().equals(right.toString()));
  +            return new Boolean(left.toString().equals(right.toString()));
           }
   
  -        return Boolean.valueOf(left.equals(right));
  +        return new Boolean(left.equals(right));
       }
   }
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: commons-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: commons-dev-help@jakarta.apache.org


Mime
View raw message