commons-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From d...@apache.org
Subject svn commit: r397340 - /jakarta/commons/proper/jexl/trunk/src/java/org/apache/commons/jexl/parser/ASTAddNode.java
Date Wed, 26 Apr 2006 23:35:44 GMT
Author: dion
Date: Wed Apr 26 16:35:42 2006
New Revision: 397340

URL: http://svn.apache.org/viewcvs?rev=397340&view=rev
Log:
Checkstyle

Modified:
    jakarta/commons/proper/jexl/trunk/src/java/org/apache/commons/jexl/parser/ASTAddNode.java

Modified: jakarta/commons/proper/jexl/trunk/src/java/org/apache/commons/jexl/parser/ASTAddNode.java
URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/jexl/trunk/src/java/org/apache/commons/jexl/parser/ASTAddNode.java?rev=397340&r1=397339&r2=397340&view=diff
==============================================================================
--- jakarta/commons/proper/jexl/trunk/src/java/org/apache/commons/jexl/parser/ASTAddNode.java
(original)
+++ jakarta/commons/proper/jexl/trunk/src/java/org/apache/commons/jexl/parser/ASTAddNode.java
Wed Apr 26 16:35:42 2006
@@ -1,12 +1,12 @@
 /*
- * Copyright 2002,2004 The Apache Software Foundation.
- * 
+ * Copyright 2002-2006 The Apache Software Foundation.
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -20,41 +20,36 @@
 import org.apache.commons.jexl.util.Coercion;
 
 /**
- *  Addition : either integer addition or string concatenation
+ *  Addition : either integer addition or string concatenation.
  *
  *  @author <a href="mailto:geirm@apache.org">Geir Magnusson Jr.</a>
  *  @version $Id$
  */
-public class ASTAddNode extends SimpleNode
-{
-    public ASTAddNode(int id)
-    {
+public class ASTAddNode extends SimpleNode {
+    public ASTAddNode(int id) {
         super(id);
     }
 
-    public ASTAddNode(Parser p, int id)
-    {
+    public ASTAddNode(Parser p, int id) {
         super(p, id);
     }
 
 
     /** Accept the visitor. **/
-    public Object jjtAccept(ParserVisitor visitor, Object data)
-    {
+    public Object jjtAccept(ParserVisitor visitor, Object data) {
         return visitor.visit(this, data);
     }
 
-    public Object value(JexlContext context)
-        throws Exception
-    {
+    public Object value(JexlContext context) throws Exception {
         Object left = ((SimpleNode) jjtGetChild(0)).value(context);
         Object right = ((SimpleNode) jjtGetChild(1)).value(context);
 
         /*
          *  the spec says 'and'
          */
-        if (left == null && right == null)
+        if (left == null && right == null) {
             return new Long(0);
+        }
 
         /*
          *  if anything is float, double or string with ( "." | "E" | "e")
@@ -62,32 +57,28 @@
          */
         if (left instanceof Float || left instanceof Double
             || right instanceof Float || right instanceof Double
-            || (  left instanceof String
-                  && (  ((String) left).indexOf(".") != -1 ||
-                        ((String) left).indexOf("e") != -1 ||
-                        ((String) left).indexOf("E") != -1 )
+            || (left instanceof String
+                  && (((String) left).indexOf(".") != -1 
+                          || ((String) left).indexOf("e") != -1
+                          || ((String) left).indexOf("E") != -1)
                )
-            || (  right instanceof String
-                  && (  ((String) right).indexOf(".") != -1 ||
-                        ((String) right).indexOf("e") != -1 ||
-                        ((String) right).indexOf("E") != -1)
+            || (right instanceof String
+                  && (((String) right).indexOf(".") != -1
+                          || ((String) right).indexOf("e") != -1
+                          || ((String) right).indexOf("E") != -1)
                )
-            )
-        {
+            ) {
 
             /*
              * in the event that either is null and not both, then just make the
              * null a 0
              */
 
-            try
-            {
+            try {
                 Double l = Coercion.coerceDouble(left);
                 Double r = Coercion.coerceDouble(right);
                 return new Double(l.doubleValue() + r.doubleValue());
-            }
-            catch( java.lang.NumberFormatException nfe )
-            {
+            } catch (java.lang.NumberFormatException nfe) {
                 /*
                  * Well, use strings!
                  */
@@ -98,14 +89,11 @@
         /*
          * attempt to use Longs
          */
-        try
-        {
+        try {
             Long l = Coercion.coerceLong(left);
             Long r = Coercion.coerceLong(right);
             return new Long(l.longValue() + r.longValue());
-        }
-        catch( java.lang.NumberFormatException nfe )
-        {
+        } catch (java.lang.NumberFormatException nfe) {
             /*
              * Well, use strings!
              */



---------------------------------------------------------------------
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