Cleans up code

src/main/java/org/ognl/ASTAnd.java

@@ -1,44 +1,30 @@
-//--------------------------------------------------------------------------
-//	Copyright (c) 1998-2004, Drew Davidson and Luke Blanshard
-//  All rights reserved.
-//
-//	Redistribution and use in source and binary forms, with or without
-//  modification, are permitted provided that the following conditions are
-//  met:
-//
-//	Redistributions of source code must retain the above copyright notice,
-//  this list of conditions and the following disclaimer.
-//	Redistributions in binary form must reproduce the above copyright
-//  notice, this list of conditions and the following disclaimer in the
-//  documentation and/or other materials provided with the distribution.
-//	Neither the name of the Drew Davidson nor the names of its contributors
-//  may be used to endorse or promote products derived from this software
-//  without specific prior written permission.
-//
-//	THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-//  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-//  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-//  FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-//  COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-//  INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-//  BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
-//  OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
-//  AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-//  OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
-//  THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
-//  DAMAGE.
-//--------------------------------------------------------------------------
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 package org.ognl;
 
 import org.ognl.enhance.ExpressionCompiler;
 import org.ognl.enhance.UnsupportedCompilationException;
 
-/**
- * @author Luke Blanshard ([email protected])
- * @author Drew Davidson ([email protected])
- */
-public class ASTAnd extends BooleanExpression
-{
+public class ASTAnd extends BooleanExpression {
+
+    private static final long serialVersionUID = 6696870754345362407L;
+
     public ASTAnd(int id) {
         super(id);
     }
@@ -51,75 +37,67 @@ public void jjtClose() {
         flattenTree();
     }
 
-    protected Object getValueBody( OgnlContext context, Object source )
-            throws OgnlException
-    {
+    protected Object getValueBody(OgnlContext context, Object source)
+            throws OgnlException {
         Object result = null;
-        int last = _children.length - 1;
-        for ( int i=0; i <= last; ++i )
-        {
-            result = _children[i].getValue( context, source );
+        int last = children.length - 1;
+        for (int i = 0; i <= last; ++i) {
+            result = children[i].getValue(context, source);
 
-            if ( i != last && ! OgnlOps.booleanValue(result) )
+            if (i != last && !OgnlOps.booleanValue(result))
                 break;
         }
 
         return result;
     }
 
-    protected void setValueBody( OgnlContext context, Object target, Object value )
-            throws OgnlException
-    {
-        int last = _children.length - 1;
+    protected void setValueBody(OgnlContext context, Object target, Object value)
+            throws OgnlException {
+        int last = children.length - 1;
 
-        for ( int i=0; i < last; ++i )
-        {
-            Object v = _children[i].getValue( context, target );
+        for (int i = 0; i < last; ++i) {
+            Object v = children[i].getValue(context, target);
 
-            if ( ! OgnlOps.booleanValue(v) )
+            if (!OgnlOps.booleanValue(v))
                 return;
         }
 
-        _children[last].setValue( context, target, value );
+        children[last].setValue(context, target, value);
     }
 
-    public String getExpressionOperator(int index)
-    {
+    public String getExpressionOperator(int index) {
         return "&&";
     }
 
-    public Class getGetterClass()
-    {
+    public Class<?> getGetterClass() {
         return null;
     }
 
-    public String toGetSourceString(OgnlContext context, Object target)
-    {
-        if (_children.length != 2)
+    public String toGetSourceString(OgnlContext context, Object target) {
+        if (children.length != 2)
             throw new UnsupportedCompilationException("Can only compile boolean expressions with two children.");
 
         String result = "";
 
         try {
 
-            String first = OgnlRuntime.getChildSource(context, target, _children[0]);
-            if (!OgnlOps.booleanValue(context.getCurrentObject()))
-            {
+            String first = OgnlRuntime.getChildSource(context, target, children[0]);
+            if (!OgnlOps.booleanValue(context.getCurrentObject())) {
                 throw new UnsupportedCompilationException("And expression can't be compiled until all conditions are true.");
             }
 
             if (!OgnlRuntime.isBoolean(first) && !context.getCurrentType().isPrimitive())
                 first = OgnlRuntime.getCompiler().createLocalReference(context, first, context.getCurrentType());
 
-            String second = OgnlRuntime.getChildSource(context, target, _children[1]);
+            String second = OgnlRuntime.getChildSource(context, target, children[1]);
             if (!OgnlRuntime.isBoolean(second) && !context.getCurrentType().isPrimitive())
                 second = OgnlRuntime.getCompiler().createLocalReference(context, second, context.getCurrentType());
 
             result += "(org.ognl.OgnlOps.booleanValue(" + first + ")";
 
             result += " ? ";
 
-            result += " ($w) ("  + second + ")";
+            result += " ($w) (" + second + ")";
             result += " : ";
 
             result += " ($w) (" + first + ")";
@@ -131,39 +109,36 @@ public String toGetSourceString(OgnlContext context, Object target)
         } catch (NullPointerException e) {
 
             throw new UnsupportedCompilationException("evaluation resulted in null expression.");
-        } catch (Throwable t)
-        {
+        } catch (Throwable t) {
             throw OgnlOps.castToRuntime(t);
         }
 
         return result;
     }
 
-    public String toSetSourceString(OgnlContext context, Object target)
-    {
-        if (_children.length != 2)
+    public String toSetSourceString(OgnlContext context, Object target) {
+        if (children.length != 2)
             throw new UnsupportedCompilationException("Can only compile boolean expressions with two children.");
 
-        String pre = (String)context.get("_currentChain");
+        String pre = (String) context.get("_currentChain");
         if (pre == null)
             pre = "";
 
         String result = "";
 
         try {
 
-            if (!OgnlOps.booleanValue(_children[0].getValue(context, target)))
-            {
-               throw new UnsupportedCompilationException("And expression can't be compiled until all conditions are true.");
+            if (!OgnlOps.booleanValue(children[0].getValue(context, target))) {
+                throw new UnsupportedCompilationException("And expression can't be compiled until all conditions are true.");
             }
 
-            String first = ExpressionCompiler.getRootExpression(_children[0], context.getRoot(), context)
-            + pre + _children[0].toGetSourceString(context, target);
+            String first = ExpressionCompiler.getRootExpression(children[0], context.getRoot(), context)
+                    + pre + children[0].toGetSourceString(context, target);
 
-            _children[1].getValue(context, target);
+            children[1].getValue(context, target);
 
-            String second = ExpressionCompiler.getRootExpression(_children[1], context.getRoot(), context)
-            + pre + _children[1].toSetSourceString(context, target);
+            String second = ExpressionCompiler.getRootExpression(children[1], context.getRoot(), context)
+                    + pre + children[1].toSetSourceString(context, target);
 
             if (!OgnlRuntime.isBoolean(first))
                 result += "if(org.ognl.OgnlOps.booleanValue(" + first + ")){";
@@ -176,8 +151,7 @@ public String toSetSourceString(OgnlContext context, Object target)
             context.setCurrentObject(target);
             context.setCurrentType(Object.class);
 
-        } catch (Throwable t)
-        {
+        } catch (Throwable t) {
             throw OgnlOps.castToRuntime(t);
         }