svn commit: r1124137 - in /incubator/ognl/trunk/src/main/java/org/apache/commons/ognl: ASTProperty.java BooleanExpression.java ComparisonExpression.java

[olamy]

Author: olamy
Date: Wed May 18 09:34:37 2011
New Revision: 1124137

URL: http://svn.apache.org/viewvc?rev=1124137&view=rev
Log:
fix checktyle issue

Modified:
    incubator/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTProperty.java
    
incubator/ognl/trunk/src/main/java/org/apache/commons/ognl/BooleanExpression.java
    
incubator/ognl/trunk/src/main/java/org/apache/commons/ognl/ComparisonExpression.java

Modified: 
incubator/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTProperty.java
URL: 
http://svn.apache.org/viewvc/incubator/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTProperty.java?rev=1124137&r1=1124136&r2=1124137&view=diff
==============================================================================
--- incubator/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTProperty.java 
(original)
+++ incubator/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTProperty.java 
Wed May 18 09:34:37 2011
@@ -534,7 +534,7 @@ public class ASTProperty
                      * {
                      * 
context.setCurrentType(OgnlRuntime.getPrimitiveWrapperClass(context.getCurrentObject().getClass(
                      * ))); } result = p.getSourceSetter(context, target, 
srcString); context.setCurrentObject(value);
-                     * context.setCurrentType(_getterClass);
+                     * context.setCurrentType(getterClass);
                      */
                     return result;
                 }

Modified: 
incubator/ognl/trunk/src/main/java/org/apache/commons/ognl/BooleanExpression.java
URL: 
http://svn.apache.org/viewvc/incubator/ognl/trunk/src/main/java/org/apache/commons/ognl/BooleanExpression.java?rev=1124137&r1=1124136&r2=1124137&view=diff
==============================================================================
--- 
incubator/ognl/trunk/src/main/java/org/apache/commons/ognl/BooleanExpression.java
 (original)
+++ 
incubator/ognl/trunk/src/main/java/org/apache/commons/ognl/BooleanExpression.java
 Wed May 18 09:34:37 2011
@@ -31,7 +31,7 @@ public abstract class BooleanExpression
     implements NodeType
 {
 
-    protected Class _getterClass;
+    protected Class getterClass;
 
     public BooleanExpression( int id )
     {
@@ -45,7 +45,7 @@ public abstract class BooleanExpression
 
     public Class getGetterClass()
     {
-        return _getterClass;
+        return getterClass;
     }
 
     public Class getSetterClass()
@@ -61,19 +61,28 @@ public abstract class BooleanExpression
             Object value = getValueBody( context, target );
 
             if ( value != null && Boolean.class.isAssignableFrom( 
value.getClass() ) )
-                _getterClass = Boolean.TYPE;
+            {
+                getterClass = Boolean.TYPE;
+            }
             else if ( value != null )
-                _getterClass = value.getClass();
+            {
+                getterClass = value.getClass();
+            }
             else
-                _getterClass = Boolean.TYPE;
+            {
+                getterClass = Boolean.TYPE;
+            }
 
             String ret = super.toGetSourceString( context, target );
 
             if ( "(false)".equals( ret ) )
+            {
                 return "false";
+            }
             else if ( "(true)".equals( ret ) )
+            {
                 return "true";
-
+            }
             return ret;
 
         }

Modified: 
incubator/ognl/trunk/src/main/java/org/apache/commons/ognl/ComparisonExpression.java
URL: 
http://svn.apache.org/viewvc/incubator/ognl/trunk/src/main/java/org/apache/commons/ognl/ComparisonExpression.java?rev=1124137&r1=1124136&r2=1124137&view=diff
==============================================================================
--- 
incubator/ognl/trunk/src/main/java/org/apache/commons/ognl/ComparisonExpression.java
 (original)
+++ 
incubator/ognl/trunk/src/main/java/org/apache/commons/ognl/ComparisonExpression.java
 Wed May 18 09:34:37 2011
@@ -51,11 +51,11 @@ public abstract class ComparisonExpressi
             Object value = getValueBody( context, target );
 
             if ( value != null && Boolean.class.isAssignableFrom( 
value.getClass() ) )
-                _getterClass = Boolean.TYPE;
+                getterClass = Boolean.TYPE;
             else if ( value != null )
-                _getterClass = value.getClass();
+                getterClass = value.getClass();
             else
-                _getterClass = Boolean.TYPE;
+                getterClass = Boolean.TYPE;
 
             // iterate over children to make numeric type detection work 
properly