commons-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mcucchi...@apache.org
Subject svn commit: r1194869 [1/2] - /commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/
Date Sat, 29 Oct 2011 11:10:18 GMT
Author: mcucchiara
Date: Sat Oct 29 11:10:16 2011
New Revision: 1194869

URL: http://svn.apache.org/viewvc?rev=1194869&view=rev
Log:
OGNL-11: fixed checkstyle errors

Modified:
    commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTAdd.java
    commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTAnd.java
    commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTAssign.java
    commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTBitAnd.java
    commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTBitNegate.java
    commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTBitOr.java
    commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTChain.java
    commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTConst.java
    commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTCtor.java
    commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTDivide.java
    commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTEq.java
    commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTEval.java
    commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTGreater.java
    commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTGreaterEq.java
    commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTIn.java
    commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTInstanceof.java
    commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTKeyValue.java
    commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTLess.java
    commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTLessEq.java
    commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTList.java
    commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTMap.java
    commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTMethod.java
    commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTMultiply.java
    commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTNegate.java
    commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTNot.java
    commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTNotEq.java
    commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTNotIn.java
    commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTOr.java
    commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTProject.java
    commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTProperty.java
    commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTRemainder.java
    commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTRootVarRef.java
    commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTSelect.java
    commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTSelectFirst.java
    commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTSelectLast.java
    commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTSequence.java
    commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTShiftLeft.java
    commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTShiftRight.java
    commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTStaticMethod.java
    commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTSubtract.java
    commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTTest.java
    commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTUnsignedShiftRight.java
    commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTVarRef.java
    commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTXor.java
    commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ComparisonExpression.java
    commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ExpressionNode.java
    commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/NumericExpression.java
    commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/SimpleNode.java
    commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ToStringVisitor.java
    commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/TypeConverter.java

Modified: commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTAdd.java
URL: http://svn.apache.org/viewvc/commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTAdd.java?rev=1194869&r1=1194868&r2=1194869&view=diff
==============================================================================
--- commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTAdd.java (original)
+++ commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTAdd.java Sat Oct 29 11:10:16 2011
@@ -50,11 +50,11 @@ class ASTAdd
     protected Object getValueBody( OgnlContext context, Object source )
         throws OgnlException
     {
-        Object result = _children[0].getValue( context, source );
+        Object result = children[0].getValue( context, source );
 
-        for ( int i = 1; i < _children.length; ++i )
+        for ( int i = 1; i < children.length; ++i )
         {
-            result = OgnlOps.add( result, _children[i].getValue( context, source ) );
+            result = OgnlOps.add( result, children[i].getValue( context, source ) );
         }
 
         return result;
@@ -84,7 +84,7 @@ class ASTAdd
             return true;
         }
 
-        if ( _parent != null && String.class.isAssignableFrom( type.getGetterClass() ) )
+        if ( parent != null && String.class.isAssignableFrom( type.getGetterClass() ) )
         {
             return true;
         }
@@ -94,15 +94,15 @@ class ASTAdd
             return false;
         }
 
-        if ( _parent != null && String.class.isAssignableFrom( lastType.getGetterClass() ) )
+        if ( parent != null && String.class.isAssignableFrom( lastType.getGetterClass() ) )
         {
             return false;
         }
-        else if ( _parent == null && String.class.isAssignableFrom( lastType.getGetterClass() ) )
+        else if ( parent == null && String.class.isAssignableFrom( lastType.getGetterClass() ) )
         {
             return true;
         }
-        else if ( _parent == null && String.class.isAssignableFrom( type.getGetterClass() ) )
+        else if ( parent == null && String.class.isAssignableFrom( type.getGetterClass() ) )
         {
             return false;
         }
@@ -148,22 +148,22 @@ class ASTAdd
 
             // go through once to determine the ultimate type
 
-            if ( ( _children != null ) && ( _children.length > 0 ) )
+            if ( ( children != null ) && ( children.length > 0 ) )
             {
                 Class currType = context.getCurrentType();
                 Class currAccessor = context.getCurrentAccessor();
 
                 Object cast = context.get( ExpressionCompiler.PRE_CAST );
 
-                for ( int i = 0; i < _children.length; ++i )
+                for ( int i = 0; i < children.length; ++i )
                 {
-                    _children[i].toGetSourceString( context, target );
+                    children[i].toGetSourceString( context, target );
 
-                    if ( NodeType.class.isInstance( _children[i] )
-                        && ( (NodeType) _children[i] ).getGetterClass() != null
-                        && isWider( (NodeType) _children[i], lastType ) )
+                    if ( NodeType.class.isInstance( children[i] )
+                        && ( (NodeType) children[i] ).getGetterClass() != null
+                        && isWider( (NodeType) children[i], lastType ) )
                     {
-                        lastType = (NodeType) _children[i];
+                        lastType = (NodeType) children[i];
                     }
                 }
 
@@ -177,20 +177,20 @@ class ASTAdd
 
             context.setCurrentObject( target );
 
-            if ( ( _children != null ) && ( _children.length > 0 ) )
+            if ( ( children != null ) && ( children.length > 0 ) )
             {
 
-                for ( int i = 0; i < _children.length; ++i )
+                for ( int i = 0; i < children.length; ++i )
                 {
                     if ( i > 0 )
                     {
                         result += " " + getExpressionOperator( i ) + " ";
                     }
 
-                    String expr = _children[i].toGetSourceString( context, target );
+                    String expr = children[i].toGetSourceString( context, target );
 
                     if ( ( expr != null && "null".equals( expr ) )
-                        || ( !ASTConst.class.isInstance( _children[i] )
+                        || ( !ASTConst.class.isInstance( children[i] )
                         && ( expr == null || expr.trim().length() <= 0 ) ) )
                     {
                         expr = "null";
@@ -199,16 +199,16 @@ class ASTAdd
                     // System.out.println("astadd child class: " + _children[i].getClass().getName() +
                     // " and return expr: " + expr);
 
-                    if ( ASTProperty.class.isInstance( _children[i] ) )
+                    if ( ASTProperty.class.isInstance( children[i] ) )
                     {
-                        expr = ExpressionCompiler.getRootExpression( _children[i], context.getRoot(), context ) + expr;
+                        expr = ExpressionCompiler.getRootExpression( children[i], context.getRoot(), context ) + expr;
                         context.setCurrentAccessor( context.getRoot().getClass() );
                     }
-                    else if ( ASTMethod.class.isInstance( _children[i] ) )
+                    else if ( ASTMethod.class.isInstance( children[i] ) )
                     {
                         String chain = (String) context.get( "_currentChain" );
                         String rootExpr =
-                            ExpressionCompiler.getRootExpression( _children[i], context.getRoot(), context );
+                            ExpressionCompiler.getRootExpression( children[i], context.getRoot(), context );
 
                         // System.out.println("astadd chains is >>" + chain + "<< and rootExpr is >>" + rootExpr +
                         // "<<");
@@ -223,17 +223,17 @@ class ASTAdd
                         context.setCurrentAccessor( context.getRoot().getClass() );
 
                     }
-                    else if ( ExpressionNode.class.isInstance( _children[i] ) )
+                    else if ( ExpressionNode.class.isInstance( children[i] ) )
                     {
                         expr = "(" + expr + ")";
                     }
-                    else if ( ( _parent == null || !ASTChain.class.isInstance( _parent ) )
-                        && ASTChain.class.isInstance( _children[i] ) )
+                    else if ( ( parent == null || !ASTChain.class.isInstance( parent ) )
+                        && ASTChain.class.isInstance( children[i] ) )
                     {
                         String rootExpr =
-                            ExpressionCompiler.getRootExpression( _children[i], context.getRoot(), context );
+                            ExpressionCompiler.getRootExpression( children[i], context.getRoot(), context );
 
-                        if ( !ASTProperty.class.isInstance( _children[i].jjtGetChild( 0 ) ) && rootExpr.endsWith( ")" )
+                        if ( !ASTProperty.class.isInstance( children[i].jjtGetChild( 0 ) ) && rootExpr.endsWith( ")" )
                             && expr.startsWith( ")" ) )
                         {
                             expr = expr.substring( 1, expr.length() );
@@ -254,7 +254,7 @@ class ASTAdd
                     // turn quoted characters into quoted strings
 
                     if ( context.getCurrentType() != null && context.getCurrentType() == Character.class
-                        && ASTConst.class.isInstance( _children[i] ) )
+                        && ASTConst.class.isInstance( children[i] ) )
                     {
                         expr = expr.replaceAll( "'", "\"" );
                         context.setCurrentType( String.class );
@@ -262,15 +262,15 @@ class ASTAdd
                     else
                     {
 
-                        if ( !ASTVarRef.class.isAssignableFrom( _children[i].getClass() )
-                            && !ASTProperty.class.isInstance( _children[i] )
-                            && !ASTMethod.class.isInstance( _children[i] )
-                            && !ASTSequence.class.isInstance( _children[i] )
-                            && !ASTChain.class.isInstance( _children[i] )
-                            && !NumericExpression.class.isAssignableFrom( _children[i].getClass() )
-                            && !ASTStaticField.class.isInstance( _children[i] )
-                            && !ASTStaticMethod.class.isInstance( _children[i] )
-                            && !ASTTest.class.isInstance( _children[i] ) )
+                        if ( !ASTVarRef.class.isAssignableFrom( children[i].getClass() )
+                            && !ASTProperty.class.isInstance( children[i] )
+                            && !ASTMethod.class.isInstance( children[i] )
+                            && !ASTSequence.class.isInstance( children[i] )
+                            && !ASTChain.class.isInstance( children[i] )
+                            && !NumericExpression.class.isAssignableFrom( children[i].getClass() )
+                            && !ASTStaticField.class.isInstance( children[i] )
+                            && !ASTStaticMethod.class.isInstance( children[i] )
+                            && !ASTTest.class.isInstance( children[i] ) )
                         {
                             if ( lastType != null && String.class.isAssignableFrom( lastType.getGetterClass() ) )
                             {
@@ -288,16 +288,16 @@ class ASTAdd
                     // hanlde addition for numeric types when applicable or just string concatenation
 
                     if ( ( lastType == null || !String.class.isAssignableFrom( lastType.getGetterClass() ) )
-                        && !ASTConst.class.isAssignableFrom( _children[i].getClass() )
-                        && !NumericExpression.class.isAssignableFrom( _children[i].getClass() ) )
+                        && !ASTConst.class.isAssignableFrom( children[i].getClass() )
+                        && !NumericExpression.class.isAssignableFrom( children[i].getClass() ) )
                     {
                         if ( context.getCurrentType() != null
                             && Number.class.isAssignableFrom( context.getCurrentType() )
-                            && !ASTMethod.class.isInstance( _children[i] ) )
+                            && !ASTMethod.class.isInstance( children[i] ) )
                         {
-                            if ( ASTVarRef.class.isInstance( _children[i] )
-                                || ASTProperty.class.isInstance( _children[i] )
-                                || ASTChain.class.isInstance( _children[i] ) )
+                            if ( ASTVarRef.class.isInstance( children[i] )
+                                || ASTProperty.class.isInstance( children[i] )
+                                || ASTChain.class.isInstance( children[i] ) )
                             {
                                 result += ".";
                             }
@@ -314,7 +314,7 @@ class ASTAdd
                 }
             }
 
-            if ( _parent == null || ASTSequence.class.isAssignableFrom( _parent.getClass() ) )
+            if ( parent == null || ASTSequence.class.isAssignableFrom( parent.getClass() ) )
             {
                 if ( getterClass != null && String.class.isAssignableFrom( getterClass ) )
                 {

Modified: commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTAnd.java
URL: http://svn.apache.org/viewvc/commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTAnd.java?rev=1194869&r1=1194868&r2=1194869&view=diff
==============================================================================
--- commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTAnd.java (original)
+++ commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTAnd.java Sat Oct 29 11:10:16 2011
@@ -67,10 +67,10 @@ public class ASTAnd
         throws OgnlException
     {
         Object result = null;
-        int last = _children.length - 1;
+        int last = children.length - 1;
         for ( int i = 0; i <= last; ++i )
         {
-            result = _children[i].getValue( context, source );
+            result = children[i].getValue( context, source );
 
             if ( i != last && !OgnlOps.booleanValue( result ) )
             {
@@ -87,11 +87,11 @@ public class ASTAnd
     protected void setValueBody( OgnlContext context, Object target, Object value )
         throws OgnlException
     {
-        int last = _children.length - 1;
+        int last = children.length - 1;
 
         for ( int i = 0; i < last; ++i )
         {
-            Object v = _children[i].getValue( context, target );
+            Object v = children[i].getValue( context, target );
 
             if ( !OgnlOps.booleanValue( v ) )
             {
@@ -99,7 +99,7 @@ public class ASTAnd
             }
         }
 
-        _children[last].setValue( context, target, value );
+        children[last].setValue( context, target, value );
     }
 
     /* (non-Javadoc)
@@ -123,7 +123,7 @@ public class ASTAnd
      */
     public String toGetSourceString( OgnlContext context, Object target )
     {
-        if ( _children.length != 2 )
+        if ( children.length != 2 )
         {
             throw new UnsupportedCompilationException(
                 "Can only compile boolean expressions with two children." );
@@ -134,7 +134,7 @@ public class ASTAnd
         try
         {
 
-            String first = OgnlRuntime.getChildSource( context, target, _children[0] );
+            String first = OgnlRuntime.getChildSource( context, target, children[0] );
             if ( !OgnlOps.booleanValue( context.getCurrentObject() ) )
             {
                 throw new UnsupportedCompilationException(
@@ -146,7 +146,7 @@ public class ASTAnd
                 first = OgnlRuntime.getCompiler( context ).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( context ).createLocalReference( context, second, context.getCurrentType() );
@@ -184,7 +184,7 @@ public class ASTAnd
      */
     public String toSetSourceString( OgnlContext context, Object target )
     {
-        if ( _children.length != 2 )
+        if ( children.length != 2 )
         {
             throw new UnsupportedCompilationException( "Can only compile boolean expressions with two children." );
         }
@@ -200,21 +200,21 @@ public class ASTAnd
         try
         {
 
-            if ( !OgnlOps.booleanValue( _children[0].getValue( context, target ) ) )
+            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 );
+                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 );
+                ExpressionCompiler.getRootExpression( children[1], context.getRoot(), context ) + pre
+                    + children[1].toSetSourceString( context, target );
 
             if ( !OgnlRuntime.isBoolean( first ) )
             {

Modified: commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTAssign.java
URL: http://svn.apache.org/viewvc/commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTAssign.java?rev=1194869&r1=1194868&r2=1194869&view=diff
==============================================================================
--- commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTAssign.java (original)
+++ commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTAssign.java Sat Oct 29 11:10:16 2011
@@ -43,8 +43,8 @@ class ASTAssign
     protected Object getValueBody( OgnlContext context, Object source )
         throws OgnlException
     {
-        Object result = _children[1].getValue( context, source );
-        _children[0].setValue( context, source, result );
+        Object result = children[1].getValue( context, source );
+        children[0].setValue( context, source, result );
         return result;
     }
 
@@ -52,19 +52,19 @@ class ASTAssign
     {
         String result = "";
 
-        String first = _children[0].toGetSourceString( context, target );
+        String first = children[0].toGetSourceString( context, target );
         String second = "";
 
-        if ( ASTProperty.class.isInstance( _children[1] ) )
+        if ( ASTProperty.class.isInstance( children[1] ) )
         {
             second += "((" + OgnlRuntime.getCompiler( context ).getClassName( target.getClass() ) + ")$2).";
         }
 
-        second += _children[1].toGetSourceString( context, target );
+        second += children[1].toGetSourceString( context, target );
 
-        if ( ASTSequence.class.isAssignableFrom( _children[1].getClass() ) )
+        if ( ASTSequence.class.isAssignableFrom( children[1].getClass() ) )
         {
-            ASTSequence seq = (ASTSequence) _children[1];
+            ASTSequence seq = (ASTSequence) children[1];
 
             context.setCurrentType( Object.class );
 
@@ -81,15 +81,15 @@ class ASTAssign
                                                                 Object.class );
         }
 
-        if ( NodeType.class.isInstance( _children[1] ) && !ASTProperty.class.isInstance( _children[1] )
-            && ( (NodeType) _children[1] ).getGetterClass() != null && !OrderedReturn.class.isInstance( _children[1] ) )
+        if ( NodeType.class.isInstance( children[1] ) && !ASTProperty.class.isInstance( children[1] )
+            && ( (NodeType) children[1] ).getGetterClass() != null && !OrderedReturn.class.isInstance( children[1] ) )
         {
 
-            second = "new " + ( (NodeType) _children[1] ).getGetterClass().getName() + "(" + second + ")";
+            second = "new " + ( (NodeType) children[1] ).getGetterClass().getName() + "(" + second + ")";
         }
 
-        if ( OrderedReturn.class.isAssignableFrom( _children[0].getClass() )
-            && ( (OrderedReturn) _children[0] ).getCoreExpression() != null )
+        if ( OrderedReturn.class.isAssignableFrom( children[0].getClass() )
+            && ( (OrderedReturn) children[0] ).getCoreExpression() != null )
         {
             context.setCurrentType( Object.class );
 
@@ -102,7 +102,7 @@ class ASTAssign
                     .getCompiler( context )
                     .createLocalReference( context,
                                            "org.apache.commons.ognl.OgnlOps.returnValue(($w)" + result + ", ($w)"
-                                               + ( (OrderedReturn) _children[0] ).getLastExpression() + ")",
+                                               + ( (OrderedReturn) children[0] ).getLastExpression() + ")",
                                            Object.class );
         }
 
@@ -113,14 +113,14 @@ class ASTAssign
     {
         String result = "";
 
-        result += _children[0].toSetSourceString( context, target );
+        result += children[0].toSetSourceString( context, target );
 
-        if ( ASTProperty.class.isInstance( _children[1] ) )
+        if ( ASTProperty.class.isInstance( children[1] ) )
         {
             result += "((" + OgnlRuntime.getCompiler( context ).getClassName( target.getClass() ) + ")$2).";
         }
 
-        String value = _children[1].toSetSourceString( context, target );
+        String value = children[1].toSetSourceString( context, target );
 
         if ( value == null )
         {
@@ -128,18 +128,18 @@ class ASTAssign
                 "Value for assignment is null, can't enhance statement to bytecode." );
         }
 
-        if ( ASTSequence.class.isAssignableFrom( _children[1].getClass() ) )
+        if ( ASTSequence.class.isAssignableFrom( children[1].getClass() ) )
         {
-            ASTSequence seq = (ASTSequence) _children[1];
+            ASTSequence seq = (ASTSequence) children[1];
             result = seq.getCoreExpression() + result;
             value = seq.getLastExpression();
         }
 
-        if ( NodeType.class.isInstance( _children[1] ) && !ASTProperty.class.isInstance( _children[1] )
-            && ( (NodeType) _children[1] ).getGetterClass() != null )
+        if ( NodeType.class.isInstance( children[1] ) && !ASTProperty.class.isInstance( children[1] )
+            && ( (NodeType) children[1] ).getGetterClass() != null )
         {
 
-            value = "new " + ( (NodeType) _children[1] ).getGetterClass().getName() + "(" + value + ")";
+            value = "new " + ( (NodeType) children[1] ).getGetterClass().getName() + "(" + value + ")";
         }
 
         return result + value + ")";

Modified: commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTBitAnd.java
URL: http://svn.apache.org/viewvc/commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTBitAnd.java?rev=1194869&r1=1194868&r2=1194869&view=diff
==============================================================================
--- commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTBitAnd.java (original)
+++ commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTBitAnd.java Sat Oct 29 11:10:16 2011
@@ -45,10 +45,10 @@ class ASTBitAnd
     protected Object getValueBody( OgnlContext context, Object source )
         throws OgnlException
     {
-        Object result = _children[0].getValue( context, source );
-        for ( int i = 1; i < _children.length; ++i )
+        Object result = children[0].getValue( context, source );
+        for ( int i = 1; i < children.length; ++i )
         {
-            result = OgnlOps.binaryAnd( result, _children[i].getValue( context, source ) );
+            result = OgnlOps.binaryAnd( result, children[i].getValue( context, source ) );
         }
         return result;
     }

Modified: commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTBitNegate.java
URL: http://svn.apache.org/viewvc/commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTBitNegate.java?rev=1194869&r1=1194868&r2=1194869&view=diff
==============================================================================
--- commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTBitNegate.java (original)
+++ commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTBitNegate.java Sat Oct 29 11:10:16 2011
@@ -40,16 +40,16 @@ class ASTBitNegate
     protected Object getValueBody( OgnlContext context, Object source )
         throws OgnlException
     {
-        return OgnlOps.bitNegate( _children[0].getValue( context, source ) );
+        return OgnlOps.bitNegate( children[0].getValue( context, source ) );
     }
 
     public String toGetSourceString( OgnlContext context, Object target )
     {
-        String source = _children[0].toGetSourceString( context, target );
+        String source = children[0].toGetSourceString( context, target );
 
-        if ( !ASTBitNegate.class.isInstance( _children[0] ) )
+        if ( !ASTBitNegate.class.isInstance( children[0] ) )
         {
-            return "~(" + super.coerceToNumeric( source, context, _children[0] ) + ")";
+            return "~(" + super.coerceToNumeric( source, context, children[0] ) + ")";
         }
         else
         {

Modified: commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTBitOr.java
URL: http://svn.apache.org/viewvc/commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTBitOr.java?rev=1194869&r1=1194868&r2=1194869&view=diff
==============================================================================
--- commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTBitOr.java (original)
+++ commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTBitOr.java Sat Oct 29 11:10:16 2011
@@ -45,10 +45,10 @@ class ASTBitOr
     protected Object getValueBody( OgnlContext context, Object source )
         throws OgnlException
     {
-        Object result = _children[0].getValue( context, source );
-        for ( int i = 1; i < _children.length; ++i )
+        Object result = children[0].getValue( context, source );
+        for ( int i = 1; i < children.length; ++i )
         {
-            result = OgnlOps.binaryOr( result, _children[i].getValue( context, source ) );
+            result = OgnlOps.binaryOr( result, children[i].getValue( context, source ) );
         }
         return result;
     }

Modified: commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTChain.java
URL: http://svn.apache.org/viewvc/commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTChain.java?rev=1194869&r1=1194868&r2=1194869&view=diff
==============================================================================
--- commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTChain.java (original)
+++ commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTChain.java Sat Oct 29 11:10:16 2011
@@ -73,21 +73,21 @@ public class ASTChain
     {
         Object result = source;
 
-        for ( int i = 0, ilast = _children.length - 1; i <= ilast; ++i )
+        for ( int i = 0, ilast = children.length - 1; i <= ilast; ++i )
         {
             boolean handled = false;
 
             if ( i < ilast )
             {
-                if ( _children[i] instanceof ASTProperty )
+                if ( children[i] instanceof ASTProperty )
                 {
-                    ASTProperty propertyNode = (ASTProperty) _children[i];
+                    ASTProperty propertyNode = (ASTProperty) children[i];
                     int indexType = propertyNode.getIndexedPropertyType( context, result );
 
                     if ( ( indexType != OgnlRuntime.INDEXED_PROPERTY_NONE )
-                        && ( _children[i + 1] instanceof ASTProperty ) )
+                        && ( children[i + 1] instanceof ASTProperty ) )
                     {
-                        ASTProperty indexNode = (ASTProperty) _children[i + 1];
+                        ASTProperty indexNode = (ASTProperty) children[i + 1];
 
                         if ( indexNode.isIndexedAccess() )
                         {
@@ -146,7 +146,7 @@ public class ASTChain
             }
             if ( !handled )
             {
-                result = _children[i].getValue( context, result );
+                result = children[i].getValue( context, result );
             }
         }
         return result;
@@ -157,19 +157,19 @@ public class ASTChain
     {
         boolean handled = false;
 
-        for ( int i = 0, ilast = _children.length - 2; i <= ilast; ++i )
+        for ( int i = 0, ilast = children.length - 2; i <= ilast; ++i )
         {
             if ( i <= ilast )
             {
-                if ( _children[i] instanceof ASTProperty )
+                if ( children[i] instanceof ASTProperty )
                 {
-                    ASTProperty propertyNode = (ASTProperty) _children[i];
+                    ASTProperty propertyNode = (ASTProperty) children[i];
                     int indexType = propertyNode.getIndexedPropertyType( context, target );
 
                     if ( ( indexType != OgnlRuntime.INDEXED_PROPERTY_NONE )
-                        && ( _children[i + 1] instanceof ASTProperty ) )
+                        && ( children[i + 1] instanceof ASTProperty ) )
                     {
-                        ASTProperty indexNode = (ASTProperty) _children[i + 1];
+                        ASTProperty indexNode = (ASTProperty) children[i + 1];
 
                         if ( indexNode.isIndexedAccess() )
                         {
@@ -235,12 +235,12 @@ public class ASTChain
             }
             if ( !handled )
             {
-                target = _children[i].getValue( context, target );
+                target = children[i].getValue( context, target );
             }
         }
         if ( !handled )
         {
-            _children[_children.length - 1].setValue( context, target, value );
+            children[children.length - 1].setValue( context, target, value );
         }
     }
 
@@ -249,13 +249,13 @@ public class ASTChain
     {
         boolean result = false;
 
-        if ( ( _children != null ) && ( _children.length > 0 ) )
+        if ( ( children != null ) && ( children.length > 0 ) )
         {
             result = true;
-            for ( int i = 0; result && ( i < _children.length ); i++ )
+            for ( int i = 0; result && ( i < children.length ); i++ )
             {
                 result =
-                    _children[i] instanceof SimpleNode && ( (SimpleNode) _children[i] ).isSimpleProperty( context );
+                    children[i] instanceof SimpleNode && ( (SimpleNode) children[i] ).isSimpleProperty( context );
             }
         }
         return result;
@@ -287,9 +287,9 @@ public class ASTChain
         boolean constructor = false;
         try
         {
-            if ( ( _children != null ) && ( _children.length > 0 ) )
+            if ( ( children != null ) && ( children.length > 0 ) )
             {
-                for ( int i = 0; i < _children.length; i++ )
+                for ( int i = 0; i < children.length; i++ )
                 {
                     /*
                      * System.out.println("astchain child: " + _children[i].getClass().getName() +
@@ -297,30 +297,30 @@ public class ASTChain
                      * context.getCurrentType());
                      */
 
-                    String value = _children[i].toGetSourceString( context, context.getCurrentObject() );
+                    String value = children[i].toGetSourceString( context, context.getCurrentObject() );
 
                     // System.out.println("astchain child returned >>  " + value + "  <<");
 
-                    if ( ASTCtor.class.isInstance( _children[i] ) )
+                    if ( ASTCtor.class.isInstance( children[i] ) )
                     {
                         constructor = true;
                     }
                     
-                    if ( NodeType.class.isInstance( _children[i] )
-                        && ( (NodeType) _children[i] ).getGetterClass() != null )
+                    if ( NodeType.class.isInstance( children[i] )
+                        && ( (NodeType) children[i] ).getGetterClass() != null )
                     {
-                        lastType = (NodeType) _children[i];
+                        lastType = (NodeType) children[i];
                     }
 
                     // System.out.println("Astchain i: " + i + " currentobj : " + context.getCurrentObject() +
                     // " and root: " + context.getRoot());
-                    if ( !ASTVarRef.class.isInstance( _children[i] )
+                    if ( !ASTVarRef.class.isInstance( children[i] )
                         && !constructor
-                        && !( OrderedReturn.class.isInstance( _children[i] ) 
-                        && ( (OrderedReturn) _children[i] ).getLastExpression() != null )
-                        && ( _parent == null || !ASTSequence.class.isInstance( _parent ) ) )
+                        && !( OrderedReturn.class.isInstance( children[i] )
+                        && ( (OrderedReturn) children[i] ).getLastExpression() != null )
+                        && ( parent == null || !ASTSequence.class.isInstance( parent ) ) )
                     {
-                        value = OgnlRuntime.getCompiler( context ).castExpression( context, _children[i], value );
+                        value = OgnlRuntime.getCompiler( context ).castExpression( context, children[i], value );
                     }
 
                     /*
@@ -329,11 +329,11 @@ public class ASTChain
                      * context.getPreviousType() + " prev accessor " + context.getPreviousAccessor());
                      */
 
-                    if ( OrderedReturn.class.isInstance( _children[i] )
-                        && ( (OrderedReturn) _children[i] ).getLastExpression() != null )
+                    if ( OrderedReturn.class.isInstance( children[i] )
+                        && ( (OrderedReturn) children[i] ).getLastExpression() != null )
                     {
                         ordered = true;
-                        OrderedReturn or = (OrderedReturn) _children[i];
+                        OrderedReturn or = (OrderedReturn) children[i];
 
                         if ( or.getCoreExpression() == null || or.getCoreExpression().trim().length() <= 0 )
                         {
@@ -351,9 +351,9 @@ public class ASTChain
                             lastExpression = context.remove( ExpressionCompiler.PRE_CAST ) + lastExpression;
                         }
                     }
-                    else if ( ASTOr.class.isInstance( _children[i] ) || ASTAnd.class.isInstance( _children[i] )
-                        || ASTCtor.class.isInstance( _children[i] )
-                        || ( ASTStaticField.class.isInstance( _children[i] ) && _parent == null ) )
+                    else if ( ASTOr.class.isInstance( children[i] ) || ASTAnd.class.isInstance( children[i] )
+                        || ASTCtor.class.isInstance( children[i] )
+                        || ( ASTStaticField.class.isInstance( children[i] ) && parent == null ) )
                     {
                         context.put( "_noRoot", "true" );
                         result = value;
@@ -409,46 +409,46 @@ public class ASTChain
         boolean constructor = false;
         try
         {
-            if ( ( _children != null ) && ( _children.length > 0 ) )
+            if ( ( children != null ) && ( children.length > 0 ) )
             {
-                if ( ASTConst.class.isInstance( _children[0] ) )
+                if ( ASTConst.class.isInstance( children[0] ) )
                 {
                     throw new UnsupportedCompilationException( "Can't modify constant values." );
                 }
 
-                for ( int i = 0; i < _children.length; i++ )
+                for ( int i = 0; i < children.length; i++ )
                 {
                     // System.out.println("astchain setsource child[" + i + "] : " + _children[i].getClass().getName());
 
-                    if ( i == ( _children.length - 1 ) )
+                    if ( i == ( children.length - 1 ) )
                     {
                         context.put( "_lastChild", "true" );
                     }
 
-                    String value = _children[i].toSetSourceString( context, context.getCurrentObject() );
+                    String value = children[i].toSetSourceString( context, context.getCurrentObject() );
                     // if (value == null || value.trim().length() <= 0)
                     // return "";
 
                     // System.out.println("astchain setter child returned >>  " + value + "  <<");
 
-                    if ( ASTCtor.class.isInstance( _children[i] ) )
+                    if ( ASTCtor.class.isInstance( children[i] ) )
                     {
                         constructor = true;
                     }
                     
-                    if ( NodeType.class.isInstance( _children[i] )
-                        && ( (NodeType) _children[i] ).getGetterClass() != null )
+                    if ( NodeType.class.isInstance( children[i] )
+                        && ( (NodeType) children[i] ).getGetterClass() != null )
                     {
-                        lastType = (NodeType) _children[i];
+                        lastType = (NodeType) children[i];
                     }
 
-                    if ( !ASTVarRef.class.isInstance( _children[i] )
+                    if ( !ASTVarRef.class.isInstance( children[i] )
                         && !constructor
-                        && !( OrderedReturn.class.isInstance( _children[i] ) 
-                        && ( (OrderedReturn) _children[i] ).getLastExpression() != null )
-                        && ( _parent == null || !ASTSequence.class.isInstance( _parent ) ) )
+                        && !( OrderedReturn.class.isInstance( children[i] )
+                        && ( (OrderedReturn) children[i] ).getLastExpression() != null )
+                        && ( parent == null || !ASTSequence.class.isInstance( parent ) ) )
                     {
-                        value = OgnlRuntime.getCompiler( context ).castExpression( context, _children[i], value );
+                        value = OgnlRuntime.getCompiler( context ).castExpression( context, children[i], value );
                     }
 
                     // System.out.println("astchain setter after cast value is: " + value);
@@ -459,8 +459,8 @@ public class ASTChain
                      * OgnlRuntime.getCompiler().castExpression(context, _children[i], value); }
                      */
 
-                    if ( ASTOr.class.isInstance( _children[i] ) || ASTAnd.class.isInstance( _children[i] )
-                        || ASTCtor.class.isInstance( _children[i] ) || ASTStaticField.class.isInstance( _children[i] ) )
+                    if ( ASTOr.class.isInstance( children[i] ) || ASTAnd.class.isInstance( children[i] )
+                        || ASTCtor.class.isInstance( children[i] ) || ASTStaticField.class.isInstance( children[i] ) )
                     {
                         context.put( "_noRoot", "true" );
                         result = value;

Modified: commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTConst.java
URL: http://svn.apache.org/viewvc/commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTConst.java?rev=1194869&r1=1194868&r2=1194869&view=diff
==============================================================================
--- commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTConst.java (original)
+++ commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTConst.java Sat Oct 29 11:10:16 2011
@@ -88,7 +88,7 @@ public class ASTConst
 
     public String toGetSourceString( OgnlContext context, Object target )
     {
-        if ( value == null && _parent != null && ExpressionNode.class.isInstance( _parent ) )
+        if ( value == null && parent != null && ExpressionNode.class.isInstance( parent ) )
         {
             context.setCurrentType( null );
             return "null";
@@ -102,7 +102,7 @@ public class ASTConst
         getterClass = value.getClass();
 
         Object retval = value;
-        if ( _parent != null && ASTProperty.class.isInstance( _parent ) )
+        if ( parent != null && ASTProperty.class.isInstance( parent ) )
         {
             context.setCurrentObject( value );
 
@@ -115,9 +115,9 @@ public class ASTConst
 
             return value.toString();
         }
-        else if ( !( _parent != null 
+        else if ( !( parent != null
                         && value != null 
-                        && NumericExpression.class.isAssignableFrom( _parent.getClass() ) )
+                        && NumericExpression.class.isAssignableFrom( parent.getClass() ) )
             && String.class.isAssignableFrom( value.getClass() ) )
         {
             context.setCurrentType( String.class );
@@ -162,7 +162,7 @@ public class ASTConst
 
     public String toSetSourceString( OgnlContext context, Object target )
     {
-        if ( _parent == null )
+        if ( parent == null )
         {
             throw new UnsupportedCompilationException( "Can't modify constant values." );
         }

Modified: commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTCtor.java
URL: http://svn.apache.org/viewvc/commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTCtor.java?rev=1194869&r1=1194868&r2=1194869&view=diff
==============================================================================
--- commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTCtor.java (original)
+++ commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTCtor.java Sat Oct 29 11:10:16 2011
@@ -87,7 +87,7 @@ public class ASTCtor
         {
             for ( int i = 0; i < count; ++i )
             {
-                args[i] = _children[i].getValue( context, root );
+                args[i] = children[i].getValue( context, root );
             }
             if ( isArray )
             {
@@ -189,27 +189,27 @@ public class ASTCtor
 
             if ( isArray )
             {
-                if ( _children[0] instanceof ASTConst )
+                if ( children[0] instanceof ASTConst )
                 {
 
-                    result = result + "[" + _children[0].toGetSourceString( context, target ) + "]";
+                    result = result + "[" + children[0].toGetSourceString( context, target ) + "]";
                 }
-                else if ( ASTProperty.class.isInstance( _children[0] ) )
+                else if ( ASTProperty.class.isInstance( children[0] ) )
                 {
 
                     result =
-                        result + "[" + ExpressionCompiler.getRootExpression( _children[0], target, context )
-                            + _children[0].toGetSourceString( context, target ) + "]";
+                        result + "[" + ExpressionCompiler.getRootExpression( children[0], target, context )
+                            + children[0].toGetSourceString( context, target ) + "]";
                 }
-                else if ( ASTChain.class.isInstance( _children[0] ) )
+                else if ( ASTChain.class.isInstance( children[0] ) )
                 {
 
-                    result = result + "[" + _children[0].toGetSourceString( context, target ) + "]";
+                    result = result + "[" + children[0].toGetSourceString( context, target ) + "]";
                 }
                 else
                 {
 
-                    result = result + "[] " + _children[0].toGetSourceString( context, target );
+                    result = result + "[] " + children[0].toGetSourceString( context, target );
                 }
 
             }
@@ -217,28 +217,28 @@ public class ASTCtor
             {
                 result = result + "(";
 
-                if ( ( _children != null ) && ( _children.length > 0 ) )
+                if ( ( children != null ) && ( children.length > 0 ) )
                 {
 
-                    Object[] values = new Object[_children.length];
-                    String[] expressions = new String[_children.length];
-                    Class[] types = new Class[_children.length];
+                    Object[] values = new Object[children.length];
+                    String[] expressions = new String[children.length];
+                    Class[] types = new Class[children.length];
 
                     // first populate arrays with child values
 
-                    for ( int i = 0; i < _children.length; i++ )
+                    for ( int i = 0; i < children.length; i++ )
                     {
 
-                        Object objValue = _children[i].getValue( context, context.getRoot() );
-                        String value = _children[i].toGetSourceString( context, target );
+                        Object objValue = children[i].getValue( context, context.getRoot() );
+                        String value = children[i].toGetSourceString( context, target );
 
-                        if ( !ASTRootVarRef.class.isInstance( _children[i] ) )
+                        if ( !ASTRootVarRef.class.isInstance( children[i] ) )
                         {
-                            value = ExpressionCompiler.getRootExpression( _children[i], target, context ) + value;
+                            value = ExpressionCompiler.getRootExpression( children[i], target, context ) + value;
                         }
 
                         String cast = "";
-                        if ( ExpressionCompiler.shouldCast( _children[i] ) )
+                        if ( ExpressionCompiler.shouldCast( children[i] ) )
                         {
 
                             cast = (String) context.remove( ExpressionCompiler.PRE_CAST );
@@ -248,7 +248,7 @@ public class ASTCtor
                             cast = "";
                         }
                         
-                        if ( !ASTConst.class.isInstance( _children[i] ) )
+                        if ( !ASTConst.class.isInstance( children[i] ) )
                         {
                             value = cast + value;
                         }
@@ -293,7 +293,7 @@ public class ASTCtor
 
                     // now loop over child values again and build up the actual source string
 
-                    for ( int i = 0; i < _children.length; i++ )
+                    for ( int i = 0; i < children.length; i++ )
                     {
                         if ( i > 0 )
                         {
@@ -316,15 +316,15 @@ public class ASTCtor
                         {
 
                             if ( values[i] != null && !types[i].isPrimitive() && !values[i].getClass().isArray()
-                                && !ASTConst.class.isInstance( _children[i] ) )
+                                && !ASTConst.class.isInstance( children[i] ) )
                             {
 
                                 value =
                                     "(" + OgnlRuntime.getCompiler( context ).getInterfaceClass( values[i].getClass() ).getName()
                                         + ")" + value;
                             }
-                            else if ( !ASTConst.class.isInstance( _children[i] )
-                                || ( ASTConst.class.isInstance( _children[i] ) && !types[i].isPrimitive() ) )
+                            else if ( !ASTConst.class.isInstance( children[i] )
+                                || ( ASTConst.class.isInstance( children[i] ) && !types[i].isPrimitive() ) )
                             {
 
                                 if ( !types[i].isArray() && types[i].isPrimitive() && !ctorParamTypes[i].isPrimitive() )

Modified: commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTDivide.java
URL: http://svn.apache.org/viewvc/commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTDivide.java?rev=1194869&r1=1194868&r2=1194869&view=diff
==============================================================================
--- commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTDivide.java (original)
+++ commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTDivide.java Sat Oct 29 11:10:16 2011
@@ -40,8 +40,8 @@ class ASTDivide
     protected Object getValueBody( OgnlContext context, Object source )
         throws OgnlException
     {
-        Object v1 = _children[0].getValue( context, source );
-        Object v2 = _children[1].getValue( context, source );
+        Object v1 = children[0].getValue( context, source );
+        Object v2 = children[1].getValue( context, source );
         return OgnlOps.divide( v1, v2 );
     }
 

Modified: commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTEq.java
URL: http://svn.apache.org/viewvc/commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTEq.java?rev=1194869&r1=1194868&r2=1194869&view=diff
==============================================================================
--- commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTEq.java (original)
+++ commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTEq.java Sat Oct 29 11:10:16 2011
@@ -40,8 +40,8 @@ class ASTEq
     protected Object getValueBody( OgnlContext context, Object source )
         throws OgnlException
     {
-        Object v1 = _children[0].getValue( context, source );
-        Object v2 = _children[1].getValue( context, source );
+        Object v1 = children[0].getValue( context, source );
+        Object v2 = children[1].getValue( context, source );
         return OgnlOps.equal( v1, v2 ) ? Boolean.TRUE : Boolean.FALSE;
     }
 

Modified: commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTEval.java
URL: http://svn.apache.org/viewvc/commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTEval.java?rev=1194869&r1=1194868&r2=1194869&view=diff
==============================================================================
--- commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTEval.java (original)
+++ commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTEval.java Sat Oct 29 11:10:16 2011
@@ -43,10 +43,10 @@ class ASTEval
     protected Object getValueBody( OgnlContext context, Object source )
         throws OgnlException
     {
-        Object result, expr = _children[0].getValue( context, source ), previousRoot = context.getRoot();
+        Object result, expr = children[0].getValue( context, source ), previousRoot = context.getRoot();
         Node node;
 
-        source = _children[1].getValue( context, source );
+        source = children[1].getValue( context, source );
         node = ( expr instanceof Node ) ? (Node) expr : (Node) Ognl.parseExpression( expr.toString() );
         try
         {
@@ -63,10 +63,10 @@ class ASTEval
     protected void setValueBody( OgnlContext context, Object target, Object value )
         throws OgnlException
     {
-        Object expr = _children[0].getValue( context, target ), previousRoot = context.getRoot();
+        Object expr = children[0].getValue( context, target ), previousRoot = context.getRoot();
         Node node;
 
-        target = _children[1].getValue( context, target );
+        target = children[1].getValue( context, target );
         node = ( expr instanceof Node ) ? (Node) expr : (Node) Ognl.parseExpression( expr.toString() );
         try
         {

Modified: commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTGreater.java
URL: http://svn.apache.org/viewvc/commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTGreater.java?rev=1194869&r1=1194868&r2=1194869&view=diff
==============================================================================
--- commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTGreater.java (original)
+++ commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTGreater.java Sat Oct 29 11:10:16 2011
@@ -40,8 +40,8 @@ class ASTGreater
     protected Object getValueBody( OgnlContext context, Object source )
         throws OgnlException
     {
-        Object v1 = _children[0].getValue( context, source );
-        Object v2 = _children[1].getValue( context, source );
+        Object v1 = children[0].getValue( context, source );
+        Object v2 = children[1].getValue( context, source );
 
         return OgnlOps.greater( v1, v2 ) ? Boolean.TRUE : Boolean.FALSE;
     }

Modified: commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTGreaterEq.java
URL: http://svn.apache.org/viewvc/commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTGreaterEq.java?rev=1194869&r1=1194868&r2=1194869&view=diff
==============================================================================
--- commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTGreaterEq.java (original)
+++ commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTGreaterEq.java Sat Oct 29 11:10:16 2011
@@ -40,8 +40,8 @@ class ASTGreaterEq
     protected Object getValueBody( OgnlContext context, Object source )
         throws OgnlException
     {
-        Object v1 = _children[0].getValue( context, source );
-        Object v2 = _children[1].getValue( context, source );
+        Object v1 = children[0].getValue( context, source );
+        Object v2 = children[1].getValue( context, source );
         return OgnlOps.less( v1, v2 ) ? Boolean.FALSE : Boolean.TRUE;
     }
 

Modified: commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTIn.java
URL: http://svn.apache.org/viewvc/commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTIn.java?rev=1194869&r1=1194868&r2=1194869&view=diff
==============================================================================
--- commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTIn.java (original)
+++ commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTIn.java Sat Oct 29 11:10:16 2011
@@ -43,8 +43,8 @@ class ASTIn
     protected Object getValueBody( OgnlContext context, Object source )
         throws OgnlException
     {
-        Object v1 = _children[0].getValue( context, source );
-        Object v2 = _children[1].getValue( context, source );
+        Object v1 = children[0].getValue( context, source );
+        Object v2 = children[1].getValue( context, source );
 
         return OgnlOps.in( v1, v2 ) ? Boolean.TRUE : Boolean.FALSE;
     }
@@ -66,8 +66,8 @@ class ASTIn
             String result = "org.apache.commons.ognl.OgnlOps.in( ($w) ";
 
             result +=
-                OgnlRuntime.getChildSource( context, target, _children[0] ) + ", ($w) "
-                    + OgnlRuntime.getChildSource( context, target, _children[1] );
+                OgnlRuntime.getChildSource( context, target, children[0] ) + ", ($w) "
+                    + OgnlRuntime.getChildSource( context, target, children[1] );
 
             result += ")";
 

Modified: commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTInstanceof.java
URL: http://svn.apache.org/viewvc/commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTInstanceof.java?rev=1194869&r1=1194868&r2=1194869&view=diff
==============================================================================
--- commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTInstanceof.java (original)
+++ commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTInstanceof.java Sat Oct 29 11:10:16 2011
@@ -53,7 +53,7 @@ public class ASTInstanceof
     protected Object getValueBody( OgnlContext context, Object source )
         throws OgnlException
     {
-        Object value = _children[0].getValue( context, source );
+        Object value = children[0].getValue( context, source );
         return OgnlRuntime.isInstance( context, value, targetType ) ? Boolean.TRUE : Boolean.FALSE;
     }
 
@@ -74,13 +74,13 @@ public class ASTInstanceof
 
             String ret = "";
 
-            if ( ASTConst.class.isInstance( _children[0] ) )
+            if ( ASTConst.class.isInstance( children[0] ) )
             {
                 ret = ( (Boolean) getValueBody( context, target ) ).toString();
             }
             else
             {
-                ret = _children[0].toGetSourceString( context, target ) + " instanceof " + targetType;
+                ret = children[0].toGetSourceString( context, target ) + " instanceof " + targetType;
             }
             context.setCurrentType( Boolean.TYPE );
 

Modified: commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTKeyValue.java
URL: http://svn.apache.org/viewvc/commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTKeyValue.java?rev=1194869&r1=1194868&r2=1194869&view=diff
==============================================================================
--- commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTKeyValue.java (original)
+++ commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTKeyValue.java Sat Oct 29 11:10:16 2011
@@ -39,12 +39,12 @@ class ASTKeyValue
 
     protected Node getKey()
     {
-        return _children[0];
+        return children[0];
     }
 
     protected Node getValue()
     {
-        return ( jjtGetNumChildren() > 1 ) ? _children[1] : null;
+        return ( jjtGetNumChildren() > 1 ) ? children[1] : null;
     }
 
     /**

Modified: commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTLess.java
URL: http://svn.apache.org/viewvc/commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTLess.java?rev=1194869&r1=1194868&r2=1194869&view=diff
==============================================================================
--- commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTLess.java (original)
+++ commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTLess.java Sat Oct 29 11:10:16 2011
@@ -40,9 +40,9 @@ class ASTLess
     protected Object getValueBody( OgnlContext context, Object source )
         throws OgnlException
     {
-        Object v1 = _children[0].getValue( context, source );
+        Object v1 = children[0].getValue( context, source );
 
-        Object v2 = _children[1].getValue( context, source );
+        Object v2 = children[1].getValue( context, source );
         return OgnlOps.less( v1, v2 ) ? Boolean.TRUE : Boolean.FALSE;
     }
 

Modified: commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTLessEq.java
URL: http://svn.apache.org/viewvc/commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTLessEq.java?rev=1194869&r1=1194868&r2=1194869&view=diff
==============================================================================
--- commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTLessEq.java (original)
+++ commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTLessEq.java Sat Oct 29 11:10:16 2011
@@ -40,8 +40,8 @@ class ASTLessEq
     protected Object getValueBody( OgnlContext context, Object source )
         throws OgnlException
     {
-        Object v1 = _children[0].getValue( context, source );
-        Object v2 = _children[1].getValue( context, source );
+        Object v1 = children[0].getValue( context, source );
+        Object v2 = children[1].getValue( context, source );
         return OgnlOps.greater( v1, v2 ) ? Boolean.FALSE : Boolean.TRUE;
     }
 

Modified: commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTList.java
URL: http://svn.apache.org/viewvc/commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTList.java?rev=1194869&r1=1194868&r2=1194869&view=diff
==============================================================================
--- commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTList.java (original)
+++ commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTList.java Sat Oct 29 11:10:16 2011
@@ -51,7 +51,7 @@ public class ASTList
         List answer = new ArrayList( jjtGetNumChildren() );
         for ( int i = 0; i < jjtGetNumChildren(); ++i )
         {
-            answer.add( _children[i].getValue( context, source ) );
+            answer.add( children[i].getValue( context, source ) );
         }
         return answer;
     }
@@ -71,7 +71,7 @@ public class ASTList
         String result = "";
         boolean array = false;
 
-        if ( _parent != null && ASTCtor.class.isInstance( _parent ) && ( (ASTCtor) _parent ).isArray() )
+        if ( parent != null && ASTCtor.class.isInstance( parent ) && ( (ASTCtor) parent ).isArray() )
         {
 
             array = true;
@@ -103,20 +103,20 @@ public class ASTList
 
                 Class prevType = context.getCurrentType();
 
-                Object objValue = _children[i].getValue( context, context.getRoot() );
-                String value = _children[i].toGetSourceString( context, target );
+                Object objValue = children[i].getValue( context, context.getRoot() );
+                String value = children[i].toGetSourceString( context, target );
 
                 // to undo type setting of constants when used as method parameters
-                if ( ASTConst.class.isInstance( _children[i] ) )
+                if ( ASTConst.class.isInstance( children[i] ) )
                 {
 
                     context.setCurrentType( prevType );
                 }
 
-                value = ExpressionCompiler.getRootExpression( _children[i], target, context ) + value;
+                value = ExpressionCompiler.getRootExpression( children[i], target, context ) + value;
 
                 String cast = "";
-                if ( ExpressionCompiler.shouldCast( _children[i] ) )
+                if ( ExpressionCompiler.shouldCast( children[i] ) )
                 {
 
                     cast = (String) context.remove( ExpressionCompiler.PRE_CAST );
@@ -126,7 +126,7 @@ public class ASTList
                     cast = "";
                 }
                 
-                if ( !ASTConst.class.isInstance( _children[i] ) )
+                if ( !ASTConst.class.isInstance( children[i] ) )
                 {
                     value = cast + value;
                 }
@@ -135,9 +135,9 @@ public class ASTList
                 {
 
                     Class valueClass = value != null ? value.getClass() : null;
-                    if ( NodeType.class.isAssignableFrom( _children[i].getClass() ) )
+                    if ( NodeType.class.isAssignableFrom( children[i].getClass() ) )
                     {
-                        valueClass = ( (NodeType) _children[i] ).getGetterClass();
+                        valueClass = ( (NodeType) children[i] ).getGetterClass();
                     }
                     final OgnlExpressionCompiler compiler = OgnlRuntime.getCompiler( context );
                     if ( valueClass != null && ctorClass.isArray() )
@@ -172,9 +172,9 @@ public class ASTList
                                     + ctorClass.getName() + ".class)", ctorClass );
 
                     }
-                    else if ( ( NodeType.class.isInstance( _children[i] )
-                        && ( (NodeType) _children[i] ).getGetterClass() != null 
-                        && Number.class.isAssignableFrom( ( (NodeType) _children[i] ).getGetterClass() ) )
+                    else if ( ( NodeType.class.isInstance( children[i] )
+                        && ( (NodeType) children[i] ).getGetterClass() != null
+                        && Number.class.isAssignableFrom( ( (NodeType) children[i] ).getGetterClass() ) )
                         || valueClass.isPrimitive() )
                     {
 

Modified: commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTMap.java
URL: http://svn.apache.org/viewvc/commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTMap.java?rev=1194869&r1=1194868&r2=1194869&view=diff
==============================================================================
--- commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTMap.java (original)
+++ commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTMap.java Sat Oct 29 11:10:16 2011
@@ -96,7 +96,7 @@ class ASTMap
 
         for ( int i = 0; i < jjtGetNumChildren(); ++i )
         {
-            ASTKeyValue kv = (ASTKeyValue) _children[i];
+            ASTKeyValue kv = (ASTKeyValue) children[i];
             Node k = kv.getKey(), v = kv.getValue();
 
             answer.put( k.getValue( context, source ), ( v == null ) ? null : v.getValue( context, source ) );

Modified: commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTMethod.java
URL: http://svn.apache.org/viewvc/commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTMethod.java?rev=1194869&r1=1194868&r2=1194869&view=diff
==============================================================================
--- commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTMethod.java (original)
+++ commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTMethod.java Sat Oct 29 11:10:16 2011
@@ -86,7 +86,7 @@ public class ASTMethod
 
             for ( int i = 0, icount = args.length; i < icount; ++i )
             {
-                args[i] = _children[i].getValue( context, root );
+                args[i] = children[i].getValue( context, root );
             }
 
             result = OgnlRuntime.callMethod( context, source, methodName, args );
@@ -147,17 +147,17 @@ public class ASTMethod
 
             method = OgnlRuntime.getMethod( context, context.getCurrentType() != null
                 ? context.getCurrentType()
-                : target.getClass(), methodName, _children, false );
+                : target.getClass(), methodName, children, false );
             if ( method == null )
             {
                 method = OgnlRuntime.getReadMethod( target.getClass(), methodName,
-                                                    _children != null ? _children.length : -1 );
+                                                    children != null ? children.length : -1 );
             }
 
             if ( method == null )
             {
                 method = OgnlRuntime.getWriteMethod( target.getClass(), methodName,
-                                                     _children != null ? _children.length : -1 );
+                                                     children != null ? children.length : -1 );
 
                 if ( method != null )
                 {
@@ -198,7 +198,7 @@ public class ASTMethod
 
             result = "." + method.getName() + "(";
 
-            if ( ( _children != null ) && ( _children.length > 0 ) )
+            if ( ( children != null ) && ( children.length > 0 ) )
             {
                 Class[] parms = method.getParameterTypes();
                 String prevCast = (String) context.remove( ExpressionCompiler.PRE_CAST );
@@ -208,7 +208,7 @@ public class ASTMethod
                  * context.getCurrentType() + " and previous type: " + context.getPreviousType());
                  */
 
-                for ( int i = 0; i < _children.length; i++ )
+                for ( int i = 0; i < children.length; i++ )
                 {
                     if ( i > 0 )
                     {
@@ -223,7 +223,7 @@ public class ASTMethod
                     context.setCurrentAccessor( null );
                     context.setPreviousType( null );
 
-                    Node child = _children[i];
+                    Node child = children[i];
 
                     String parmString = ASTMethodUtil.getParmString( context, root, child, prevType );
 
@@ -282,7 +282,7 @@ public class ASTMethod
          */
         Method m =
             OgnlRuntime.getWriteMethod( context.getCurrentType() != null ? context.getCurrentType() : target.getClass(),
-                                        methodName, _children != null ? _children.length : -1 );
+                                        methodName, children != null ? children.length : -1 );
         if ( m == null )
         {
             throw new UnsupportedCompilationException(
@@ -292,8 +292,8 @@ public class ASTMethod
         String post = "";
         String result = "." + m.getName() + "(";
 
-        if ( m.getReturnType() != void.class && m.getReturnType().isPrimitive() && ( _parent == null
-            || !ASTTest.class.isInstance( _parent ) ) )
+        if ( m.getReturnType() != void.class && m.getReturnType().isPrimitive() && ( parent == null
+            || !ASTTest.class.isInstance( parent ) ) )
         {
             Class wrapper = OgnlRuntime.getPrimitiveWrapperClass( m.getReturnType() );
 
@@ -317,12 +317,12 @@ public class ASTMethod
              * UnsupportedCompilationException("Unable to determine setter method generation for " + m);
              */
 
-            if ( ( _children != null ) && ( _children.length > 0 ) )
+            if ( ( children != null ) && ( children.length > 0 ) )
             {
                 Class[] parms = m.getParameterTypes();
                 String prevCast = (String) context.remove( ExpressionCompiler.PRE_CAST );
 
-                for ( int i = 0; i < _children.length; i++ )
+                for ( int i = 0; i < children.length; i++ )
                 {
                     if ( i > 0 )
                     {
@@ -336,7 +336,7 @@ public class ASTMethod
                     context.setCurrentAccessor( null );
                     context.setPreviousType( null );
 
-                    Node child = _children[i];
+                    Node child = children[i];
                     Object value = child.getValue( context, context.getRoot() );
                     String parmString = child.toSetSourceString( context, context.getRoot() );
 

Modified: commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTMultiply.java
URL: http://svn.apache.org/viewvc/commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTMultiply.java?rev=1194869&r1=1194868&r2=1194869&view=diff
==============================================================================
--- commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTMultiply.java (original)
+++ commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTMultiply.java Sat Oct 29 11:10:16 2011
@@ -46,10 +46,10 @@ class ASTMultiply
     protected Object getValueBody( OgnlContext context, Object source )
         throws OgnlException
     {
-        Object result = _children[0].getValue( context, source );
-        for ( int i = 1; i < _children.length; ++i )
+        Object result = children[0].getValue( context, source );
+        for ( int i = 1; i < children.length; ++i )
         {
-            result = OgnlOps.multiply( result, _children[i].getValue( context, source ) );
+            result = OgnlOps.multiply( result, children[i].getValue( context, source ) );
         }
         return result;
     }

Modified: commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTNegate.java
URL: http://svn.apache.org/viewvc/commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTNegate.java?rev=1194869&r1=1194868&r2=1194869&view=diff
==============================================================================
--- commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTNegate.java (original)
+++ commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTNegate.java Sat Oct 29 11:10:16 2011
@@ -40,14 +40,14 @@ class ASTNegate
     protected Object getValueBody( OgnlContext context, Object source )
         throws OgnlException
     {
-        return OgnlOps.negate( _children[0].getValue( context, source ) );
+        return OgnlOps.negate( children[0].getValue( context, source ) );
     }
 
     public String toGetSourceString( OgnlContext context, Object target )
     {
-        String source = _children[0].toGetSourceString( context, target );
+        String source = children[0].toGetSourceString( context, target );
 
-        if ( !ASTNegate.class.isInstance( _children[0] ) )
+        if ( !ASTNegate.class.isInstance( children[0] ) )
         {
             return "-" + source;
         }

Modified: commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTNot.java
URL: http://svn.apache.org/viewvc/commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTNot.java?rev=1194869&r1=1194868&r2=1194869&view=diff
==============================================================================
--- commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTNot.java (original)
+++ commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTNot.java Sat Oct 29 11:10:16 2011
@@ -40,7 +40,7 @@ class ASTNot
     protected Object getValueBody( OgnlContext context, Object source )
         throws OgnlException
     {
-        return OgnlOps.booleanValue( _children[0].getValue( context, source ) ) ? Boolean.FALSE : Boolean.TRUE;
+        return OgnlOps.booleanValue( children[0].getValue( context, source ) ) ? Boolean.FALSE : Boolean.TRUE;
     }
 
     public String getExpressionOperator( int index )

Modified: commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTNotEq.java
URL: http://svn.apache.org/viewvc/commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTNotEq.java?rev=1194869&r1=1194868&r2=1194869&view=diff
==============================================================================
--- commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTNotEq.java (original)
+++ commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTNotEq.java Sat Oct 29 11:10:16 2011
@@ -40,8 +40,8 @@ class ASTNotEq
     protected Object getValueBody( OgnlContext context, Object source )
         throws OgnlException
     {
-        Object v1 = _children[0].getValue( context, source );
-        Object v2 = _children[1].getValue( context, source );
+        Object v1 = children[0].getValue( context, source );
+        Object v2 = children[1].getValue( context, source );
 
         return OgnlOps.equal( v1, v2 ) ? Boolean.FALSE : Boolean.TRUE;
     }

Modified: commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTNotIn.java
URL: http://svn.apache.org/viewvc/commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTNotIn.java?rev=1194869&r1=1194868&r2=1194869&view=diff
==============================================================================
--- commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTNotIn.java (original)
+++ commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTNotIn.java Sat Oct 29 11:10:16 2011
@@ -43,8 +43,8 @@ class ASTNotIn
     protected Object getValueBody( OgnlContext context, Object source )
         throws OgnlException
     {
-        Object v1 = _children[0].getValue( context, source );
-        Object v2 = _children[1].getValue( context, source );
+        Object v1 = children[0].getValue( context, source );
+        Object v2 = children[1].getValue( context, source );
         return OgnlOps.in( v1, v2 ) ? Boolean.FALSE : Boolean.TRUE;
     }
 
@@ -65,8 +65,8 @@ class ASTNotIn
             String result = "(! org.apache.commons.ognl.OgnlOps.in( ($w) ";
 
             result +=
-                OgnlRuntime.getChildSource( context, target, _children[0] ) + ", ($w) "
-                    + OgnlRuntime.getChildSource( context, target, _children[1] );
+                OgnlRuntime.getChildSource( context, target, children[0] ) + ", ($w) "
+                    + OgnlRuntime.getChildSource( context, target, children[1] );
 
             result += ") )";
 

Modified: commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTOr.java
URL: http://svn.apache.org/viewvc/commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTOr.java?rev=1194869&r1=1194868&r2=1194869&view=diff
==============================================================================
--- commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTOr.java (original)
+++ commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTOr.java Sat Oct 29 11:10:16 2011
@@ -49,10 +49,10 @@ public class ASTOr
         throws OgnlException
     {
         Object result = null;
-        int last = _children.length - 1;
+        int last = children.length - 1;
         for ( int i = 0; i <= last; ++i )
         {
-            result = _children[i].getValue( context, source );
+            result = children[i].getValue( context, source );
             if ( i != last && OgnlOps.booleanValue( result ) )
             {
                 break;
@@ -64,16 +64,16 @@ public class ASTOr
     protected void setValueBody( OgnlContext context, Object target, Object value )
         throws OgnlException
     {
-        int last = _children.length - 1;
+        int last = children.length - 1;
         for ( int i = 0; i < last; ++i )
         {
-            Object v = _children[i].getValue( context, target );
+            Object v = children[i].getValue( context, target );
             if ( OgnlOps.booleanValue( v ) )
             {
                 return;
             }
         }
-        _children[last].setValue( context, target, value );
+        children[last].setValue( context, target, value );
     }
 
     public String getExpressionOperator( int index )
@@ -88,7 +88,7 @@ public class ASTOr
 
     public String toGetSourceString( OgnlContext context, Object target )
     {
-        if ( _children.length != 2 )
+        if ( children.length != 2 )
         {
             throw new UnsupportedCompilationException( "Can only compile boolean expressions with two children." );
         }
@@ -98,7 +98,7 @@ public class ASTOr
         try
         {
 
-            String first = OgnlRuntime.getChildSource( context, target, _children[0] );
+            String first = OgnlRuntime.getChildSource( context, target, children[0] );
             if ( !OgnlRuntime.isBoolean( first ) )
             {
                 first = OgnlRuntime.getCompiler( context ).createLocalReference( context, first, context.getCurrentType() );
@@ -106,7 +106,7 @@ public class ASTOr
             
             Class firstType = context.getCurrentType();
 
-            String second = OgnlRuntime.getChildSource( context, target, _children[1] );
+            String second = OgnlRuntime.getChildSource( context, target, children[1] );
             if ( !OgnlRuntime.isBoolean( second ) )
             {
                 second = OgnlRuntime.getCompiler( context ).createLocalReference( context, second, context.getCurrentType() );
@@ -144,7 +144,7 @@ public class ASTOr
 
     public String toSetSourceString( OgnlContext context, Object target )
     {
-        if ( _children.length != 2 )
+        if ( children.length != 2 )
         {
             throw new UnsupportedCompilationException( "Can only compile boolean expressions with two children." );
         }
@@ -160,20 +160,20 @@ public class ASTOr
         try
         {
 
-            _children[0].getValue( context, target );
+            children[0].getValue( context, target );
 
             String first =
-                ExpressionCompiler.getRootExpression( _children[0], context.getRoot(), context ) + pre
-                    + _children[0].toGetSourceString( context, target );
+                ExpressionCompiler.getRootExpression( children[0], context.getRoot(), context ) + pre
+                    + children[0].toGetSourceString( context, target );
             if ( !OgnlRuntime.isBoolean( first ) )
             {
                 first = OgnlRuntime.getCompiler( context ).createLocalReference( context, first, Object.class );
             }
-            _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 );
+                ExpressionCompiler.getRootExpression( children[1], context.getRoot(), context ) + pre
+                    + children[1].toSetSourceString( context, target );
             if ( !OgnlRuntime.isBoolean( second ) )
             {
                 second = OgnlRuntime.getCompiler( context ).createLocalReference( context, second, context.getCurrentType() );

Modified: commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTProject.java
URL: http://svn.apache.org/viewvc/commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTProject.java?rev=1194869&r1=1194868&r2=1194869&view=diff
==============================================================================
--- commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTProject.java (original)
+++ commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTProject.java Sat Oct 29 11:10:16 2011
@@ -47,7 +47,7 @@ class ASTProject
     protected Object getValueBody( OgnlContext context, Object source )
         throws OgnlException
     {
-        Node expr = _children[0];
+        Node expr = children[0];
         List answer = new ArrayList();
 
         ElementsAccessor elementsAccessor = OgnlRuntime.getElementsAccessor( OgnlRuntime.getTargetClass( source ) );



Mime
View raw message