Author: mcucchiara
Date: Tue Mar 26 08:00:18 2013
New Revision: 1461005
URL: http://svn.apache.org/r1461005
Log:
Used string format instead of string concatenation
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/ArrayPropertyAccessor.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=1461005&r1=1461004&r2=1461005&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
Tue Mar 26 08:00:18 2013
@@ -24,6 +24,8 @@ import org.apache.commons.ognl.enhance.E
import java.math.BigDecimal;
import java.math.BigInteger;
+import static java.lang.String.format;
+
/**
* $Id$
*/
@@ -153,15 +155,14 @@ class ASTAdd
Object cast = context.get( ExpressionCompiler.PRE_CAST );
- for ( int i = 0; i < children.length; ++i )
+ for ( Node aChildren : children )
{
- children[i].toGetSourceString( context, target );
+ aChildren.toGetSourceString( context, target );
- if ( NodeType.class.isInstance( children[i] )
- && ( (NodeType) children[i] ).getGetterClass() != null
- && isWider( (NodeType) children[i], lastType ) )
+ if ( NodeType.class.isInstance( aChildren ) && (
(NodeType) aChildren ).getGetterClass() != null
+ && isWider( (NodeType) aChildren, lastType ) )
{
- lastType = (NodeType) children[i];
+ lastType = (NodeType) aChildren;
}
}
@@ -275,7 +276,7 @@ class ASTAdd
// System.out.println("Input expr >>" + expr +
"<<");
expr = expr.replaceAll( """, "\"" );
expr = expr.replaceAll( "\"", "'" );
- expr = "\"" + expr + "\"";
+ expr = format( "\"%s\"", expr );
// System.out.println("Expr now >>" + expr +
"<<");
}
}
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=1461005&r1=1461004&r2=1461005&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
Tue Mar 26 08:00:18 2013
@@ -22,6 +22,8 @@ package org.apache.commons.ognl;
import org.apache.commons.ognl.enhance.ExpressionCompiler;
import org.apache.commons.ognl.enhance.UnsupportedCompilationException;
+import static java.lang.String.format;
+
/**
* $Id$
*/
@@ -150,16 +152,7 @@ public class ASTAnd
second = OgnlRuntime.getCompiler( context
).createLocalReference( context, second, context.getCurrentType() );
}
- result += "(org.apache.commons.ognl.OgnlOps.booleanValue(" + first
+ ")";
-
- result += " ? ";
-
- result += " ($w) (" + second + ")";
- result += " : ";
-
- result += " ($w) (" + first + ")";
-
- result += ")";
+ result += format(
"(org.apache.commons.ognl.OgnlOps.booleanValue(%s) ? ($w) (%s) : ($w) (%s))",
first, second, first );
context.setCurrentObject( target );
context.setCurrentType( Object.class );
Modified:
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ArrayPropertyAccessor.java
URL:
http://svn.apache.org/viewvc/commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ArrayPropertyAccessor.java?rev=1461005&r1=1461004&r2=1461005&view=diff
==============================================================================
---
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ArrayPropertyAccessor.java
(original)
+++
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ArrayPropertyAccessor.java
Tue Mar 26 08:00:18 2013
@@ -22,6 +22,8 @@ package org.apache.commons.ognl;
import java.lang.reflect.Array;
import java.util.Map;
+import static java.lang.String.format;
+
/**
* Implementation of PropertyAccessor that uses numbers and dynamic subscripts
as properties to index into Java arrays.
*/
@@ -147,7 +149,7 @@ public class ArrayPropertyAccessor
context.setCurrentAccessor( target.getClass() );
context.setCurrentType( target.getClass().getComponentType() );
- return "[" + indexStr + "]";
+ return format( "[%s]", indexStr );
}
@Override
@@ -164,10 +166,10 @@ public class ArrayPropertyAccessor
{
Class<?> wrapClass = OgnlRuntime.getPrimitiveWrapperClass( type );
- return "[" + indexStr + "]=((" + wrapClass.getName() +
")org.apache.commons.ognl.OgnlOps.convertValue($3,"
- + wrapClass.getName() + ".class, true))." +
OgnlRuntime.getNumericValueGetter( wrapClass );
+ return format(
"[%s]=((%s)org.apache.commons.ognl.OgnlOps.convertValue($3,%s.class,
true)).%s", indexStr,
+ wrapClass.getName(), wrapClass.getName(),
OgnlRuntime.getNumericValueGetter( wrapClass ) );
}
- return "[" + indexStr +
"]=org.apache.commons.ognl.OgnlOps.convertValue($3," + type.getName() +
".class)";
+ return format(
"[%s]=org.apache.commons.ognl.OgnlOps.convertValue($3,%s.class)", indexStr,
type.getName() );
}
private static String getIndexString( OgnlContext context, Object index )
@@ -192,7 +194,7 @@ public class ArrayPropertyAccessor
String toString =
String.class.isInstance( index ) && context.getCurrentType()
!= Object.class ? "" : ".toString()";
- indexStr = "org.apache.commons.ognl.OgnlOps#getIntValue(" +
indexStr + toString + ")";
+ indexStr = format(
"org.apache.commons.ognl.OgnlOps#getIntValue(%s%s)", indexStr, toString );
}
return indexStr;
}
