commons-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mcucchi...@apache.org
Subject svn commit: r1197449 - /commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ListPropertyAccessor.java
Date Fri, 04 Nov 2011 09:16:35 GMT
Author: mcucchiara
Date: Fri Nov  4 09:16:35 2011
New Revision: 1197449

URL: http://svn.apache.org/viewvc?rev=1197449&view=rev
Log:
Fixed code style

Modified:
    commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ListPropertyAccessor.java

Modified: commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ListPropertyAccessor.java
URL: http://svn.apache.org/viewvc/commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ListPropertyAccessor.java?rev=1197449&r1=1197448&r2=1197449&view=diff
==============================================================================
--- commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ListPropertyAccessor.java
(original)
+++ commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ListPropertyAccessor.java
Fri Nov  4 09:16:35 2011
@@ -42,19 +42,19 @@ public class ListPropertyAccessor
         {
             Object result;
 
-            if ( "size".equals(name) )
+            if ( "size".equals( name ) )
             {
                 result = list.size();
             }
             else
             {
-                if ( "iterator".equals(name) )
+                if ( "iterator".equals( name ) )
                 {
                     result = list.iterator();
                 }
                 else
                 {
-                    if ( "isEmpty".equals(name) || "empty".equals(name) )
+                    if ( "isEmpty".equals( name ) || "empty".equals( name ) )
                     {
                         result = list.isEmpty() ? Boolean.TRUE : Boolean.FALSE;
                     }
@@ -229,19 +229,25 @@ public class ListPropertyAccessor
         return getSourceBeanMethod( context, target, index, indexStr, true );
     }
 
-    private String getSourceBeanMethod( OgnlContext context, Object target, Object index,
String indexStr, boolean isSetter ) {
+    private String getSourceBeanMethod( OgnlContext context, Object target, Object index,
String indexStr,
+                                        boolean isSetter )
+    {
         Object currentObject = context.getCurrentObject();
         Class<?> currentType = context.getCurrentType();
         if ( currentObject != null && !Number.class.isInstance( currentObject ) )
         {
             try
             {
-                if ( isSetter ) {
-                    if ( OgnlRuntime.getWriteMethod( target.getClass(), indexStr ) != null
|| !currentType.isPrimitive() )
+                if ( isSetter )
+                {
+                    if ( OgnlRuntime.getWriteMethod( target.getClass(), indexStr ) != null
+                        || !currentType.isPrimitive() )
                     {
                         return super.getSourceSetter( context, target, index );
                     }
-                } else {
+                }
+                else
+                {
                     if ( OgnlRuntime.getReadMethod( target.getClass(), indexStr ) != null
)
                     {
                         return super.getSourceAccessor( context, target, index );
@@ -250,7 +256,7 @@ public class ListPropertyAccessor
             }
             catch ( Throwable t )
             {
-                throw OgnlOps.castToRuntime(t);
+                throw OgnlOps.castToRuntime( t );
             }
         }
 
@@ -266,13 +272,12 @@ public class ListPropertyAccessor
         {
             indexStr += "." + OgnlRuntime.getNumericValueGetter( currentType );
         }
-        else if ( currentObject != null && Number.class.isAssignableFrom(
-            currentObject.getClass() ) && !currentType.isPrimitive() )
+        else if ( currentObject != null && Number.class.isAssignableFrom( currentObject.getClass()
)
+            && !currentType.isPrimitive() )
         {
             // means it needs to be cast first as well
 
-            String toString =
-                String.class.isInstance( index ) && currentType != Object.class ?
"" : ".toString()";
+            String toString = String.class.isInstance( index ) && currentType !=
Object.class ? "" : ".toString()";
 
             indexStr = "org.apache.commons.ognl.OgnlOps#getIntValue(" + indexStr + toString
+ ")";
         }



Mime
View raw message