You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by si...@apache.org on 2011/05/14 15:18:36 UTC
svn commit: r1103095 [1/24] - in /incubator/ognl/trunk/src:
main/java/org/apache/commons/ognl/ main/java/org/apache/commons/ognl/enhance/
main/java/org/apache/commons/ognl/internal/
test/java/org/apache/commons/ognl/ test/java/org/apache/commons/ognl/t...
Author: simonetripodi
Date: Sat May 14 13:18:29 2011
New Revision: 1103095
URL: http://svn.apache.org/viewvc?rev=1103095&view=rev
Log:
code reformatted according to Apache Maven code style, see http://maven.apache.org/developers/conventions/code.html
Modified:
incubator/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTAdd.java
incubator/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTAnd.java
incubator/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTAssign.java
incubator/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTBitAnd.java
incubator/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTBitNegate.java
incubator/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTBitOr.java
incubator/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTChain.java
incubator/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTConst.java
incubator/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTCtor.java
incubator/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTDivide.java
incubator/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTEq.java
incubator/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTEval.java
incubator/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTGreater.java
incubator/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTGreaterEq.java
incubator/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTIn.java
incubator/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTInstanceof.java
incubator/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTKeyValue.java
incubator/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTLess.java
incubator/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTLessEq.java
incubator/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTList.java
incubator/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTMap.java
incubator/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTMethod.java
incubator/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTMultiply.java
incubator/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTNegate.java
incubator/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTNot.java
incubator/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTNotEq.java
incubator/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTNotIn.java
incubator/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTOr.java
incubator/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTProject.java
incubator/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTProperty.java
incubator/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTRemainder.java
incubator/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTRootVarRef.java
incubator/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTSelect.java
incubator/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTSelectFirst.java
incubator/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTSelectLast.java
incubator/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTSequence.java
incubator/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTShiftLeft.java
incubator/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTShiftRight.java
incubator/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTStaticField.java
incubator/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTStaticMethod.java
incubator/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTSubtract.java
incubator/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTTest.java
incubator/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTThisVarRef.java
incubator/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTUnsignedShiftRight.java
incubator/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTVarRef.java
incubator/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTXor.java
incubator/ognl/trunk/src/main/java/org/apache/commons/ognl/ArrayElementsAccessor.java
incubator/ognl/trunk/src/main/java/org/apache/commons/ognl/ArrayPropertyAccessor.java
incubator/ognl/trunk/src/main/java/org/apache/commons/ognl/BooleanExpression.java
incubator/ognl/trunk/src/main/java/org/apache/commons/ognl/ClassCacheInspector.java
incubator/ognl/trunk/src/main/java/org/apache/commons/ognl/ClassResolver.java
incubator/ognl/trunk/src/main/java/org/apache/commons/ognl/CollectionElementsAccessor.java
incubator/ognl/trunk/src/main/java/org/apache/commons/ognl/ComparisonExpression.java
incubator/ognl/trunk/src/main/java/org/apache/commons/ognl/DefaultClassResolver.java
incubator/ognl/trunk/src/main/java/org/apache/commons/ognl/DefaultMemberAccess.java
incubator/ognl/trunk/src/main/java/org/apache/commons/ognl/DefaultTypeConverter.java
incubator/ognl/trunk/src/main/java/org/apache/commons/ognl/DynamicSubscript.java
incubator/ognl/trunk/src/main/java/org/apache/commons/ognl/ElementsAccessor.java
incubator/ognl/trunk/src/main/java/org/apache/commons/ognl/EnumerationElementsAccessor.java
incubator/ognl/trunk/src/main/java/org/apache/commons/ognl/EnumerationIterator.java
incubator/ognl/trunk/src/main/java/org/apache/commons/ognl/EnumerationPropertyAccessor.java
incubator/ognl/trunk/src/main/java/org/apache/commons/ognl/Evaluation.java
incubator/ognl/trunk/src/main/java/org/apache/commons/ognl/EvaluationPool.java
incubator/ognl/trunk/src/main/java/org/apache/commons/ognl/ExpressionNode.java
incubator/ognl/trunk/src/main/java/org/apache/commons/ognl/ExpressionSyntaxException.java
incubator/ognl/trunk/src/main/java/org/apache/commons/ognl/InappropriateExpressionException.java
incubator/ognl/trunk/src/main/java/org/apache/commons/ognl/IntHashMap.java
incubator/ognl/trunk/src/main/java/org/apache/commons/ognl/IteratorElementsAccessor.java
incubator/ognl/trunk/src/main/java/org/apache/commons/ognl/IteratorEnumeration.java
incubator/ognl/trunk/src/main/java/org/apache/commons/ognl/IteratorPropertyAccessor.java
incubator/ognl/trunk/src/main/java/org/apache/commons/ognl/JJTOgnlParserState.java
incubator/ognl/trunk/src/main/java/org/apache/commons/ognl/JavaCharStream.java
incubator/ognl/trunk/src/main/java/org/apache/commons/ognl/JavaSource.java
incubator/ognl/trunk/src/main/java/org/apache/commons/ognl/ListPropertyAccessor.java
incubator/ognl/trunk/src/main/java/org/apache/commons/ognl/MapElementsAccessor.java
incubator/ognl/trunk/src/main/java/org/apache/commons/ognl/MapPropertyAccessor.java
incubator/ognl/trunk/src/main/java/org/apache/commons/ognl/MemberAccess.java
incubator/ognl/trunk/src/main/java/org/apache/commons/ognl/MethodAccessor.java
incubator/ognl/trunk/src/main/java/org/apache/commons/ognl/MethodFailedException.java
incubator/ognl/trunk/src/main/java/org/apache/commons/ognl/NoSuchPropertyException.java
incubator/ognl/trunk/src/main/java/org/apache/commons/ognl/Node.java
incubator/ognl/trunk/src/main/java/org/apache/commons/ognl/NodeType.java
incubator/ognl/trunk/src/main/java/org/apache/commons/ognl/NullHandler.java
incubator/ognl/trunk/src/main/java/org/apache/commons/ognl/NumberElementsAccessor.java
incubator/ognl/trunk/src/main/java/org/apache/commons/ognl/NumericExpression.java
incubator/ognl/trunk/src/main/java/org/apache/commons/ognl/NumericTypes.java
incubator/ognl/trunk/src/main/java/org/apache/commons/ognl/ObjectArrayPool.java
incubator/ognl/trunk/src/main/java/org/apache/commons/ognl/ObjectElementsAccessor.java
incubator/ognl/trunk/src/main/java/org/apache/commons/ognl/ObjectIndexedPropertyDescriptor.java
incubator/ognl/trunk/src/main/java/org/apache/commons/ognl/ObjectMethodAccessor.java
incubator/ognl/trunk/src/main/java/org/apache/commons/ognl/ObjectNullHandler.java
incubator/ognl/trunk/src/main/java/org/apache/commons/ognl/ObjectPropertyAccessor.java
incubator/ognl/trunk/src/main/java/org/apache/commons/ognl/Ognl.java
incubator/ognl/trunk/src/main/java/org/apache/commons/ognl/OgnlContext.java
incubator/ognl/trunk/src/main/java/org/apache/commons/ognl/OgnlException.java
incubator/ognl/trunk/src/main/java/org/apache/commons/ognl/OgnlInvokePermission.java
incubator/ognl/trunk/src/main/java/org/apache/commons/ognl/OgnlOps.java
incubator/ognl/trunk/src/main/java/org/apache/commons/ognl/OgnlParser.java
incubator/ognl/trunk/src/main/java/org/apache/commons/ognl/OgnlParserConstants.java
incubator/ognl/trunk/src/main/java/org/apache/commons/ognl/OgnlParserTokenManager.java
incubator/ognl/trunk/src/main/java/org/apache/commons/ognl/OgnlParserTreeConstants.java
incubator/ognl/trunk/src/main/java/org/apache/commons/ognl/OgnlRuntime.java
incubator/ognl/trunk/src/main/java/org/apache/commons/ognl/ParseException.java
incubator/ognl/trunk/src/main/java/org/apache/commons/ognl/PropertyAccessor.java
incubator/ognl/trunk/src/main/java/org/apache/commons/ognl/SetPropertyAccessor.java
incubator/ognl/trunk/src/main/java/org/apache/commons/ognl/SimpleNode.java
incubator/ognl/trunk/src/main/java/org/apache/commons/ognl/Token.java
incubator/ognl/trunk/src/main/java/org/apache/commons/ognl/TokenMgrError.java
incubator/ognl/trunk/src/main/java/org/apache/commons/ognl/TypeConverter.java
incubator/ognl/trunk/src/main/java/org/apache/commons/ognl/enhance/ContextClassLoader.java
incubator/ognl/trunk/src/main/java/org/apache/commons/ognl/enhance/EnhancedClassLoader.java
incubator/ognl/trunk/src/main/java/org/apache/commons/ognl/enhance/ExpressionAccessor.java
incubator/ognl/trunk/src/main/java/org/apache/commons/ognl/enhance/ExpressionCompiler.java
incubator/ognl/trunk/src/main/java/org/apache/commons/ognl/enhance/LocalReference.java
incubator/ognl/trunk/src/main/java/org/apache/commons/ognl/enhance/LocalReferenceImpl.java
incubator/ognl/trunk/src/main/java/org/apache/commons/ognl/enhance/OgnlExpressionCompiler.java
incubator/ognl/trunk/src/main/java/org/apache/commons/ognl/enhance/OrderedReturn.java
incubator/ognl/trunk/src/main/java/org/apache/commons/ognl/enhance/UnsupportedCompilationException.java
incubator/ognl/trunk/src/main/java/org/apache/commons/ognl/internal/ClassCache.java
incubator/ognl/trunk/src/main/java/org/apache/commons/ognl/internal/ClassCacheImpl.java
incubator/ognl/trunk/src/main/java/org/apache/commons/ognl/internal/Entry.java
incubator/ognl/trunk/src/main/java/org/apache/commons/ognl/package-info.java
incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/InExpressionTest.java
incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/TestOgnlException.java
incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/TestOgnlRuntime.java
incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/test/ASTChainTest.java
incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/test/ASTMethodTest.java
incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/test/ASTPropertyTest.java
incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/test/ArithmeticAndLogicalOperatorsTest.java
incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/test/ArrayCreationTest.java
incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/test/ArrayElementsTest.java
incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/test/ClassMethodTest.java
incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/test/CollectionDirectPropertyTest.java
incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/test/CompilingPropertyAccessor.java
incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/test/ConstantTest.java
incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/test/ConstantTreeTest.java
incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/test/ContextVariableTest.java
incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/test/CorrectedObjectNullHandler.java
incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/test/GenericsTest.java
incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/test/IndexAccessTest.java
incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/test/IndexedPropertyTest.java
incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/test/InheritedMethodsTest.java
incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/test/InterfaceInheritanceTest.java
incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/test/LambdaExpressionTest.java
incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/test/MapCreationTest.java
incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/test/MemberAccessTest.java
incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/test/MethodTest.java
incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/test/MethodWithConversionTest.java
incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/test/NestedMethodTest.java
incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/test/NullHandlerTest.java
incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/test/NullStringCatenationTest.java
incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/test/NumberFormatExceptionTest.java
incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/test/NumericConversionTest.java
incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/test/ObjectIndexedPropertyTest.java
incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/test/ObjectIndexedTest.java
incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/test/OgnlTestCase.java
incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/test/OperatorTest.java
incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/test/Performance.java
incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/test/PrimitiveArrayTest.java
incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/test/PrimitiveNullHandlingTest.java
incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/test/PrivateAccessorTest.java
incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/test/PrivateMemberTest.java
incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/test/ProjectionSelectionTest.java
incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/test/PropertyArithmeticAndLogicalOperatorsTest.java
incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/test/PropertyNotFoundTest.java
incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/test/PropertySetterTest.java
incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/test/PropertyTest.java
incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/test/ProtectedInnerClassTest.java
incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/test/QuotingTest.java
incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/test/SetterTest.java
incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/test/SetterWithConversionTest.java
incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/test/ShortCircuitingExpressionTest.java
incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/test/SimpleNavigationChainTreeTest.java
incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/test/SimplePropertyTreeTest.java
incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/test/StaticsAndConstructorsTest.java
incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/test/accessors/ListPropertyAccessorTest.java
incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/test/enhance/TestExpressionCompiler.java
incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/test/objects/BaseBean.java
incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/test/objects/BaseGeneric.java
incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/test/objects/BaseIndexed.java
incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/test/objects/BaseObjectIndexed.java
incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/test/objects/BaseSyntheticObject.java
incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/test/objects/Bean1.java
incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/test/objects/Bean2.java
incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/test/objects/Bean3.java
incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/test/objects/BeanProvider.java
incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/test/objects/BeanProviderAccessor.java
incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/test/objects/BeanProviderImpl.java
incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/test/objects/Component.java
incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/test/objects/ComponentImpl.java
incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/test/objects/ComponentSubclass.java
incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/test/objects/Copy.java
incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/test/objects/CorrectedObject.java
incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/test/objects/Cracker.java
incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/test/objects/Entry.java
incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/test/objects/EvenOdd.java
incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/test/objects/FirstBean.java
incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/test/objects/FormComponentImpl.java
incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/test/objects/FormImpl.java
incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/test/objects/GameGeneric.java
incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/test/objects/GameGenericObject.java
incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/test/objects/GenericCracker.java
incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/test/objects/GenericObject.java
incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/test/objects/GenericRoot.java
incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/test/objects/GenericService.java
incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/test/objects/GenericServiceImpl.java
incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/test/objects/GetterMethods.java
incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/test/objects/IComponent.java
incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/test/objects/IContentProvider.java
incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/test/objects/IForm.java
incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/test/objects/IFormComponent.java
incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/test/objects/ITreeContentProvider.java
incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/test/objects/Indexed.java
incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/test/objects/IndexedMapObject.java
incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/test/objects/IndexedSetObject.java
incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/test/objects/Inherited.java
incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/test/objects/ListSource.java
incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/test/objects/ListSourceImpl.java
incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/test/objects/MenuItem.java
incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/test/objects/Messages.java
incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/test/objects/Model.java
incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/test/objects/MyMap.java
incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/test/objects/MyMapImpl.java
incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/test/objects/ObjectIndexed.java
incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/test/objects/OtherObjectIndexed.java
incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/test/objects/PersonGenericObject.java
incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/test/objects/PropertyHolder.java
incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/test/objects/Root.java
incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/test/objects/SearchCriteria.java
incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/test/objects/SearchTab.java
incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/test/objects/SecondBean.java
incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/test/objects/SetterReturns.java
incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/test/objects/Simple.java
incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/test/objects/SimpleEnum.java
incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/test/objects/SimpleNumeric.java
incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/test/objects/SubclassSyntheticObject.java
incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/test/objects/TestClass.java
incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/test/objects/TestImpl.java
incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/test/objects/TestInherited1.java
incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/test/objects/TestInherited2.java
incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/test/objects/TestModel.java
incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/test/objects/TreeContentProvider.java
incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/test/objects/Two.java
incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/test/util/ContextClassLoader.java
incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/test/util/EnhancedClassLoader.java
incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/test/util/NameFactory.java
Modified: incubator/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTAdd.java
URL: http://svn.apache.org/viewvc/incubator/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTAdd.java?rev=1103095&r1=1103094&r2=1103095&view=diff
==============================================================================
--- incubator/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTAdd.java (original)
+++ incubator/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTAdd.java Sat May 14 13:18:29 2011
@@ -24,21 +24,21 @@ import org.apache.commons.ognl.enhance.E
import java.math.BigDecimal;
import java.math.BigInteger;
-
/**
* @author Luke Blanshard (blanshlu@netscape.net)
* @author Drew Davidson (drew@ognl.org)
*/
-class ASTAdd extends NumericExpression
+class ASTAdd
+ extends NumericExpression
{
- public ASTAdd(int id)
+ public ASTAdd( int id )
{
- super(id);
+ super( id );
}
- public ASTAdd(OgnlParser p, int id)
+ public ASTAdd( OgnlParser p, int id )
{
- super(p, id);
+ super( p, id );
}
public void jjtClose()
@@ -46,162 +46,170 @@ class ASTAdd extends NumericExpression
flattenTree();
}
- protected Object getValueBody( OgnlContext context, Object source ) throws OgnlException
+ protected Object getValueBody( OgnlContext context, Object source )
+ throws OgnlException
{
Object result = _children[0].getValue( context, source );
- for ( int i=1; i < _children.length; ++i )
- result = OgnlOps.add( result, _children[i].getValue(context, source) );
+ for ( int i = 1; i < _children.length; ++i )
+ result = OgnlOps.add( result, _children[i].getValue( context, source ) );
return result;
}
- public String getExpressionOperator(int index)
+ public String getExpressionOperator( int index )
{
return "+";
}
- boolean isWider(NodeType type, NodeType lastType)
+ boolean isWider( NodeType type, NodeType lastType )
{
- if (lastType == null)
+ if ( lastType == null )
return true;
- //System.out.println("checking isWider(" + type.getGetterClass() + " , " + lastType.getGetterClass() + ")");
+ // System.out.println("checking isWider(" + type.getGetterClass() + " , " + lastType.getGetterClass() + ")");
- if (String.class.isAssignableFrom(lastType.getGetterClass()))
+ if ( String.class.isAssignableFrom( lastType.getGetterClass() ) )
return false;
- if (String.class.isAssignableFrom(type.getGetterClass()))
+ if ( String.class.isAssignableFrom( type.getGetterClass() ) )
return true;
- if (_parent != null && String.class.isAssignableFrom(type.getGetterClass()))
+ if ( _parent != null && String.class.isAssignableFrom( type.getGetterClass() ) )
return true;
- if (String.class.isAssignableFrom(lastType.getGetterClass()) && Object.class == type.getGetterClass())
+ if ( String.class.isAssignableFrom( lastType.getGetterClass() ) && Object.class == type.getGetterClass() )
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;
- if (BigDecimal.class.isAssignableFrom(type.getGetterClass())
- || BigInteger.class.isAssignableFrom(type.getGetterClass()))
+ if ( BigDecimal.class.isAssignableFrom( type.getGetterClass() )
+ || BigInteger.class.isAssignableFrom( type.getGetterClass() ) )
return true;
- if (BigDecimal.class.isAssignableFrom(lastType.getGetterClass())
- || BigInteger.class.isAssignableFrom(lastType.getGetterClass()))
+ if ( BigDecimal.class.isAssignableFrom( lastType.getGetterClass() )
+ || BigInteger.class.isAssignableFrom( lastType.getGetterClass() ) )
return false;
- if (Double.class.isAssignableFrom(type.getGetterClass()))
+ if ( Double.class.isAssignableFrom( type.getGetterClass() ) )
return true;
- if (Integer.class.isAssignableFrom(type.getGetterClass())
- && Double.class.isAssignableFrom(lastType.getGetterClass()))
+ if ( Integer.class.isAssignableFrom( type.getGetterClass() )
+ && Double.class.isAssignableFrom( lastType.getGetterClass() ) )
return false;
- if (Float.class.isAssignableFrom(type.getGetterClass())
- && Integer.class.isAssignableFrom(lastType.getGetterClass()))
+ if ( Float.class.isAssignableFrom( type.getGetterClass() )
+ && Integer.class.isAssignableFrom( lastType.getGetterClass() ) )
return true;
return true;
}
- public String toGetSourceString(OgnlContext context, Object target)
+ public String toGetSourceString( OgnlContext context, Object target )
{
- try {
+ try
+ {
String result = "";
NodeType lastType = null;
// 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);
+ Object cast = context.get( ExpressionCompiler.PRE_CAST );
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];
}
}
- context.put(ExpressionCompiler.PRE_CAST, cast);
+ context.put( ExpressionCompiler.PRE_CAST, cast );
- context.setCurrentType(currType);
- context.setCurrentAccessor(currAccessor);
+ context.setCurrentType( currType );
+ context.setCurrentAccessor( currAccessor );
}
// reset context since previous children loop would have changed it
- context.setCurrentObject(target);
+ context.setCurrentObject( target );
- if ((_children != null) && (_children.length > 0))
+ if ( ( _children != null ) && ( _children.length > 0 ) )
{
for ( int i = 0; i < _children.length; ++i )
{
- if (i > 0)
- result += " " + getExpressionOperator(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])
- && (expr == null || expr.trim().length() <= 0)))
+ if ( ( expr != null && "null".equals( expr ) )
+ || ( !ASTConst.class.isInstance( _children[i] ) && ( expr == null || expr.trim().length() <= 0 ) ) )
{
expr = "null";
}
- //System.out.println("astadd child class: " + _children[i].getClass().getName() + " and return expr: " + expr);
+ // 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;
- context.setCurrentAccessor(context.getRoot().getClass());
- } else if (ASTMethod.class.isInstance(_children[i]))
+ expr = ExpressionCompiler.getRootExpression( _children[i], context.getRoot(), context ) + expr;
+ context.setCurrentAccessor( context.getRoot().getClass() );
+ }
+ else if ( ASTMethod.class.isInstance( _children[i] ) )
{
- String chain = (String)context.get("_currentChain");
- String rootExpr = ExpressionCompiler.getRootExpression(_children[i], context.getRoot(), context);
+ String chain = (String) context.get( "_currentChain" );
+ String rootExpr =
+ ExpressionCompiler.getRootExpression( _children[i], context.getRoot(), context );
- //System.out.println("astadd chains is >>" + chain + "<< and rootExpr is >>" + rootExpr + "<<");
+ // System.out.println("astadd chains is >>" + chain + "<< and rootExpr is >>" + rootExpr +
+ // "<<");
// dirty fix for overly aggressive casting dot operations
- if (rootExpr.endsWith(".") && chain != null && chain.startsWith(")."))
+ if ( rootExpr.endsWith( "." ) && chain != null && chain.startsWith( ")." ) )
{
- chain = chain.substring(1, chain.length());
+ chain = chain.substring( 1, chain.length() );
}
- expr = rootExpr + (chain != null ? chain + "." : "") + expr;
- context.setCurrentAccessor(context.getRoot().getClass());
+ expr = rootExpr + ( chain != null ? chain + "." : "" ) + expr;
+ 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);
+ String rootExpr =
+ ExpressionCompiler.getRootExpression( _children[i], context.getRoot(), context );
- if (!ASTProperty.class.isInstance(_children[i].jjtGetChild(0))
- && rootExpr.endsWith(")") && expr.startsWith(")"))
- expr = expr.substring(1, expr.length());
+ if ( !ASTProperty.class.isInstance( _children[i].jjtGetChild( 0 ) ) && rootExpr.endsWith( ")" )
+ && expr.startsWith( ")" ) )
+ expr = expr.substring( 1, expr.length() );
expr = rootExpr + expr;
- context.setCurrentAccessor(context.getRoot().getClass());
+ context.setCurrentAccessor( context.getRoot().getClass() );
- String cast = (String)context.remove(ExpressionCompiler.PRE_CAST);
- if (cast == null)
+ String cast = (String) context.remove( ExpressionCompiler.PRE_CAST );
+ if ( cast == null )
cast = "";
expr = cast + expr;
@@ -209,30 +217,32 @@ class ASTAdd extends NumericExpression
// turn quoted characters into quoted strings
- if (context.getCurrentType() != null && context.getCurrentType() == Character.class
- && ASTConst.class.isInstance(_children[i]))
+ if ( context.getCurrentType() != null && context.getCurrentType() == Character.class
+ && ASTConst.class.isInstance( _children[i] ) )
{
- expr = expr.replaceAll("'", "\"");
- context.setCurrentType(String.class);
- } 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]))
+ expr = expr.replaceAll( "'", "\"" );
+ context.setCurrentType( String.class );
+ }
+ 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 (lastType != null && String.class.isAssignableFrom(lastType.getGetterClass()))
+ if ( lastType != null && String.class.isAssignableFrom( lastType.getGetterClass() ) )
{
- //System.out.println("Input expr >>" + expr + "<<");
- expr = expr.replaceAll(""", "\"");
- expr = expr.replaceAll("\"", "'");
+ // System.out.println("Input expr >>" + expr + "<<");
+ expr = expr.replaceAll( """, "\"" );
+ expr = expr.replaceAll( "\"", "'" );
expr = "\"" + expr + "\"";
- //System.out.println("Expr now >>" + expr + "<<");
+ // System.out.println("Expr now >>" + expr + "<<");
}
}
}
@@ -241,51 +251,55 @@ class ASTAdd extends NumericExpression
// 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()))
+ if ( ( lastType == null || !String.class.isAssignableFrom( lastType.getGetterClass() ) )
+ && !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]))
+ if ( context.getCurrentType() != null
+ && Number.class.isAssignableFrom( context.getCurrentType() )
+ && !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 += ".";
- result += OgnlRuntime.getNumericValueGetter(context.getCurrentType());
- context.setCurrentType(OgnlRuntime.getPrimitiveWrapperClass(context.getCurrentType()));
+ result += OgnlRuntime.getNumericValueGetter( context.getCurrentType() );
+ context.setCurrentType( OgnlRuntime.getPrimitiveWrapperClass( context.getCurrentType() ) );
}
}
- if (lastType != null)
- context.setCurrentAccessor(lastType.getGetterClass());
+ if ( lastType != null )
+ context.setCurrentAccessor( lastType.getGetterClass() );
}
}
- if (_parent == null || ASTSequence.class.isAssignableFrom(_parent.getClass()))
+ if ( _parent == null || ASTSequence.class.isAssignableFrom( _parent.getClass() ) )
{
- if (_getterClass != null && String.class.isAssignableFrom(_getterClass))
+ if ( _getterClass != null && String.class.isAssignableFrom( _getterClass ) )
_getterClass = Object.class;
- } else
+ }
+ else
{
- context.setCurrentType(_getterClass);
+ context.setCurrentType( _getterClass );
}
try
{
- Object contextObj = getValueBody(context, target);
- context.setCurrentObject(contextObj);
- } catch (Throwable t)
+ Object contextObj = getValueBody( context, target );
+ context.setCurrentObject( contextObj );
+ }
+ catch ( Throwable t )
{
- throw OgnlOps.castToRuntime(t);
+ throw OgnlOps.castToRuntime( t );
}
return result;
- } catch (Throwable t)
+ }
+ catch ( Throwable t )
{
- throw OgnlOps.castToRuntime(t);
+ throw OgnlOps.castToRuntime( t );
}
}
}
Modified: incubator/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTAnd.java
URL: http://svn.apache.org/viewvc/incubator/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTAnd.java?rev=1103095&r1=1103094&r2=1103095&view=diff
==============================================================================
--- incubator/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTAnd.java (original)
+++ incubator/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTAnd.java Sat May 14 13:18:29 2011
@@ -26,53 +26,57 @@ import org.apache.commons.ognl.enhance.U
* @author Luke Blanshard (blanshlu@netscape.net)
* @author Drew Davidson (drew@ognl.org)
*/
-public class ASTAnd extends BooleanExpression
+public class ASTAnd
+ extends BooleanExpression
{
- public ASTAnd(int id) {
- super(id);
+ public ASTAnd( int id )
+ {
+ super( id );
}
- public ASTAnd(OgnlParser p, int id) {
- super(p, id);
+ public ASTAnd( OgnlParser p, int id )
+ {
+ super( p, id );
}
- public void jjtClose() {
+ public void jjtClose()
+ {
flattenTree();
}
protected Object getValueBody( OgnlContext context, Object source )
- throws OgnlException
+ throws OgnlException
{
Object result = null;
int last = _children.length - 1;
- for ( int i=0; i <= last; ++i )
+ for ( int i = 0; i <= last; ++i )
{
result = _children[i].getValue( context, source );
- if ( i != last && ! OgnlOps.booleanValue(result) )
+ if ( i != last && !OgnlOps.booleanValue( result ) )
break;
}
-
+
return result;
}
protected void setValueBody( OgnlContext context, Object target, Object value )
- throws OgnlException
+ throws OgnlException
{
int last = _children.length - 1;
-
- for ( int i=0; i < last; ++i )
+
+ for ( int i = 0; i < last; ++i )
{
Object v = _children[i].getValue( context, target );
-
- if ( ! OgnlOps.booleanValue(v) )
+
+ if ( !OgnlOps.booleanValue( v ) )
return;
}
-
+
_children[last].setValue( context, target, value );
}
- public String getExpressionOperator(int index)
+ public String getExpressionOperator( int index )
{
return "&&";
}
@@ -82,94 +86,104 @@ public class ASTAnd extends BooleanExpre
return null;
}
- public String toGetSourceString(OgnlContext context, Object target)
+ public String toGetSourceString( OgnlContext context, Object target )
{
- if (_children.length != 2)
- throw new UnsupportedCompilationException("Can only compile boolean expressions with two children.");
-
+ if ( _children.length != 2 )
+ throw new UnsupportedCompilationException( "Can only compile boolean expressions with two children." );
+
String result = "";
-
- try {
- String first = OgnlRuntime.getChildSource(context, target, _children[0]);
- if (!OgnlOps.booleanValue(context.getCurrentObject()))
+ try
+ {
+
+ String first = OgnlRuntime.getChildSource( context, target, _children[0] );
+ if ( !OgnlOps.booleanValue( context.getCurrentObject() ) )
{
- throw new UnsupportedCompilationException("And expression can't be compiled until all conditions are true.");
+ throw new UnsupportedCompilationException(
+ "And expression can't be compiled until all conditions are true." );
}
- if (!OgnlRuntime.isBoolean(first) && !context.getCurrentType().isPrimitive())
- first = OgnlRuntime.getCompiler().createLocalReference(context, first, context.getCurrentType());
+ if ( !OgnlRuntime.isBoolean( first ) && !context.getCurrentType().isPrimitive() )
+ first = OgnlRuntime.getCompiler().createLocalReference( context, first, context.getCurrentType() );
- String second = OgnlRuntime.getChildSource(context, target, _children[1]);
- if (!OgnlRuntime.isBoolean(second) && !context.getCurrentType().isPrimitive())
- second = OgnlRuntime.getCompiler().createLocalReference(context, second, context.getCurrentType());
+ String second = OgnlRuntime.getChildSource( context, target, _children[1] );
+ if ( !OgnlRuntime.isBoolean( second ) && !context.getCurrentType().isPrimitive() )
+ second = OgnlRuntime.getCompiler().createLocalReference( context, second, context.getCurrentType() );
result += "(org.apache.commons.ognl.OgnlOps.booleanValue(" + first + ")";
-
+
result += " ? ";
- result += " ($w) (" + second + ")";
+ result += " ($w) (" + second + ")";
result += " : ";
result += " ($w) (" + first + ")";
result += ")";
- context.setCurrentObject(target);
- context.setCurrentType(Object.class);
- } catch (NullPointerException e) {
-
- throw new UnsupportedCompilationException("evaluation resulted in null expression.");
- } catch (Throwable t)
+ context.setCurrentObject( target );
+ context.setCurrentType( Object.class );
+ }
+ catch ( NullPointerException e )
+ {
+
+ throw new UnsupportedCompilationException( "evaluation resulted in null expression." );
+ }
+ catch ( Throwable t )
{
- throw OgnlOps.castToRuntime(t);
+ throw OgnlOps.castToRuntime( t );
}
-
+
return result;
}
-
- public String toSetSourceString(OgnlContext context, Object target)
+
+ public String toSetSourceString( OgnlContext context, Object target )
{
- if (_children.length != 2)
- throw new UnsupportedCompilationException("Can only compile boolean expressions with two children.");
-
- String pre = (String)context.get("_currentChain");
- if (pre == null)
+ if ( _children.length != 2 )
+ throw new UnsupportedCompilationException( "Can only compile boolean expressions with two children." );
+
+ String pre = (String) context.get( "_currentChain" );
+ if ( pre == null )
pre = "";
-
+
String result = "";
-
- try {
- if (!OgnlOps.booleanValue(_children[0].getValue(context, target)))
+ try
+ {
+
+ if ( !OgnlOps.booleanValue( _children[0].getValue( context, target ) ) )
{
- throw new UnsupportedCompilationException("And expression can't be compiled until all conditions are true.");
+ 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);
-
- _children[1].getValue(context, target);
-
- String second = ExpressionCompiler.getRootExpression(_children[1], context.getRoot(), context)
- + pre + _children[1].toSetSourceString(context, target);
- if (!OgnlRuntime.isBoolean(first))
+ String first =
+ ExpressionCompiler.getRootExpression( _children[0], context.getRoot(), context ) + pre
+ + _children[0].toGetSourceString( context, target );
+
+ _children[1].getValue( context, target );
+
+ String second =
+ ExpressionCompiler.getRootExpression( _children[1], context.getRoot(), context ) + pre
+ + _children[1].toSetSourceString( context, target );
+
+ if ( !OgnlRuntime.isBoolean( first ) )
result += "if(org.apache.commons.ognl.OgnlOps.booleanValue(" + first + ")){";
else
result += "if(" + first + "){";
-
+
result += second;
result += "; } ";
-
- context.setCurrentObject(target);
- context.setCurrentType(Object.class);
-
- } catch (Throwable t)
+
+ context.setCurrentObject( target );
+ context.setCurrentType( Object.class );
+
+ }
+ catch ( Throwable t )
{
- throw OgnlOps.castToRuntime(t);
+ throw OgnlOps.castToRuntime( t );
}
-
+
return result;
}
}
Modified: incubator/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTAssign.java
URL: http://svn.apache.org/viewvc/incubator/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTAssign.java?rev=1103095&r1=1103094&r2=1103095&view=diff
==============================================================================
--- incubator/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTAssign.java (original)
+++ incubator/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTAssign.java Sat May 14 13:18:29 2011
@@ -26,17 +26,21 @@ import org.apache.commons.ognl.enhance.U
* @author Luke Blanshard (blanshlu@netscape.net)
* @author Drew Davidson (drew@ognl.org)
*/
-class ASTAssign extends SimpleNode
+class ASTAssign
+ extends SimpleNode
{
- public ASTAssign(int id) {
- super(id);
+ public ASTAssign( int id )
+ {
+ super( id );
}
- public ASTAssign(OgnlParser p, int id) {
- super(p, id);
+ public ASTAssign( OgnlParser p, int id )
+ {
+ super( p, id );
}
- protected Object getValueBody( OgnlContext context, Object source ) throws OgnlException
+ protected Object getValueBody( OgnlContext context, Object source )
+ throws OgnlException
{
Object result = _children[1].getValue( context, source );
_children[0].setValue( context, source, result );
@@ -47,85 +51,97 @@ class ASTAssign extends SimpleNode
{
return _children[0] + " = " + _children[1];
}
-
- public String toGetSourceString(OgnlContext context, Object target)
+
+ public String toGetSourceString( OgnlContext context, Object target )
{
String result = "";
- String first = _children[0].toGetSourceString(context, target);
+ String first = _children[0].toGetSourceString( context, target );
String second = "";
-
- if (ASTProperty.class.isInstance(_children[1])) {
- second += "((" + OgnlRuntime.getCompiler().getClassName(target.getClass()) + ")$2).";
- }
-
- second += _children[1].toGetSourceString(context, target);
-
- if (ASTSequence.class.isAssignableFrom(_children[1].getClass())) {
- ASTSequence seq = (ASTSequence)_children[1];
- context.setCurrentType(Object.class);
+ if ( ASTProperty.class.isInstance( _children[1] ) )
+ {
+ second += "((" + OgnlRuntime.getCompiler().getClassName( target.getClass() ) + ")$2).";
+ }
+
+ second += _children[1].toGetSourceString( context, target );
+
+ if ( ASTSequence.class.isAssignableFrom( _children[1].getClass() ) )
+ {
+ ASTSequence seq = (ASTSequence) _children[1];
+
+ context.setCurrentType( Object.class );
String core = seq.getCoreExpression();
- if (core.endsWith(";"))
- core = core.substring(0, core.lastIndexOf(";"));
+ if ( core.endsWith( ";" ) )
+ core = core.substring( 0, core.lastIndexOf( ";" ) );
+
+ second =
+ OgnlRuntime.getCompiler().createLocalReference( context,
+ "org.apache.commons.ognl.OgnlOps.returnValue(($w)"
+ + core + ", ($w) " + seq.getLastExpression() + ")",
+ Object.class );
+ }
+
+ 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 = OgnlRuntime.getCompiler().createLocalReference(context,
- "org.apache.commons.ognl.OgnlOps.returnValue(($w)" + core + ", ($w) " + seq.getLastExpression() + ")",
- Object.class);
- }
-
- 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 + ")";
- }
-
- if (OrderedReturn.class.isAssignableFrom(_children[0].getClass())
- && ((OrderedReturn)_children[0]).getCoreExpression() != null) {
- context.setCurrentType(Object.class);
+ if ( OrderedReturn.class.isAssignableFrom( _children[0].getClass() )
+ && ( (OrderedReturn) _children[0] ).getCoreExpression() != null )
+ {
+ context.setCurrentType( Object.class );
result = first + second + ")";
// System.out.println("building ordered ret from child[0] with result of:" + result);
- result = OgnlRuntime.getCompiler().createLocalReference(context,
- "org.apache.commons.ognl.OgnlOps.returnValue(($w)" + result + ", ($w)" + ((OrderedReturn)_children[0]).getLastExpression() + ")",
- Object.class);
+ result =
+ OgnlRuntime.getCompiler().createLocalReference( context,
+ "org.apache.commons.ognl.OgnlOps.returnValue(($w)"
+ + result
+ + ", ($w)"
+ + ( (OrderedReturn) _children[0] ).getLastExpression()
+ + ")", Object.class );
}
return result;
}
-
- public String toSetSourceString(OgnlContext context, Object target)
+
+ public String toSetSourceString( OgnlContext context, Object target )
{
String result = "";
-
- result += _children[0].toSetSourceString(context, target);
-
- if (ASTProperty.class.isInstance(_children[1])) {
- result += "((" + OgnlRuntime.getCompiler().getClassName(target.getClass()) + ")$2).";
- }
-
- String value =_children[1].toSetSourceString(context, target);
-
- if (value == null)
- throw new UnsupportedCompilationException("Value for assignment is null, can't enhance statement to bytecode.");
-
- if (ASTSequence.class.isAssignableFrom(_children[1].getClass())) {
- ASTSequence seq = (ASTSequence)_children[1];
+
+ result += _children[0].toSetSourceString( context, target );
+
+ if ( ASTProperty.class.isInstance( _children[1] ) )
+ {
+ result += "((" + OgnlRuntime.getCompiler().getClassName( target.getClass() ) + ")$2).";
+ }
+
+ String value = _children[1].toSetSourceString( context, target );
+
+ if ( value == null )
+ throw new UnsupportedCompilationException(
+ "Value for assignment is null, can't enhance statement to bytecode." );
+
+ if ( ASTSequence.class.isAssignableFrom( _children[1].getClass() ) )
+ {
+ 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) {
-
- value = "new " + ((NodeType)_children[1]).getGetterClass().getName() + "(" + value + ")";
+
+ if ( NodeType.class.isInstance( _children[1] ) && !ASTProperty.class.isInstance( _children[1] )
+ && ( (NodeType) _children[1] ).getGetterClass() != null )
+ {
+
+ value = "new " + ( (NodeType) _children[1] ).getGetterClass().getName() + "(" + value + ")";
}
-
+
return result + value + ")";
}
}
Modified: incubator/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTBitAnd.java
URL: http://svn.apache.org/viewvc/incubator/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTBitAnd.java?rev=1103095&r1=1103094&r2=1103095&view=diff
==============================================================================
--- incubator/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTBitAnd.java (original)
+++ incubator/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTBitAnd.java Sat May 14 13:18:29 2011
@@ -23,35 +23,40 @@ package org.apache.commons.ognl;
* @author Luke Blanshard (blanshlu@netscape.net)
* @author Drew Davidson (drew@ognl.org)
*/
-class ASTBitAnd extends NumericExpression
+class ASTBitAnd
+ extends NumericExpression
{
- public ASTBitAnd(int id) {
- super(id);
+ public ASTBitAnd( int id )
+ {
+ super( id );
}
- public ASTBitAnd(OgnlParser p, int id) {
- super(p, id);
+ public ASTBitAnd( OgnlParser p, int id )
+ {
+ super( p, id );
}
- public void jjtClose() {
+ public void jjtClose()
+ {
flattenTree();
}
- protected Object getValueBody( OgnlContext context, Object source ) throws OgnlException
+ protected Object getValueBody( OgnlContext context, Object source )
+ throws OgnlException
{
Object result = _children[0].getValue( context, source );
- for ( int i=1; i < _children.length; ++i )
- result = OgnlOps.binaryAnd( result, _children[i].getValue(context, source) );
+ for ( int i = 1; i < _children.length; ++i )
+ result = OgnlOps.binaryAnd( result, _children[i].getValue( context, source ) );
return result;
}
- public String getExpressionOperator(int index)
+ public String getExpressionOperator( int index )
{
return "&";
}
-
- public String coerceToNumeric(String source, OgnlContext context, Node child)
+
+ public String coerceToNumeric( String source, OgnlContext context, Node child )
{
- return "(long)" + super.coerceToNumeric(source, context, child);
+ return "(long)" + super.coerceToNumeric( source, context, child );
}
}
Modified: incubator/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTBitNegate.java
URL: http://svn.apache.org/viewvc/incubator/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTBitNegate.java?rev=1103095&r1=1103094&r2=1103095&view=diff
==============================================================================
--- incubator/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTBitNegate.java (original)
+++ incubator/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTBitNegate.java Sat May 14 13:18:29 2011
@@ -23,19 +23,23 @@ package org.apache.commons.ognl;
* @author Luke Blanshard (blanshlu@netscape.net)
* @author Drew Davidson (drew@ognl.org)
*/
-class ASTBitNegate extends NumericExpression
+class ASTBitNegate
+ extends NumericExpression
{
- public ASTBitNegate(int id) {
- super(id);
+ public ASTBitNegate( int id )
+ {
+ super( id );
}
- public ASTBitNegate(OgnlParser p, int id) {
- super(p, id);
+ public ASTBitNegate( OgnlParser p, int id )
+ {
+ super( p, id );
}
- protected Object getValueBody( OgnlContext context, Object source ) throws OgnlException
+ 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 toString()
@@ -43,14 +47,15 @@ class ASTBitNegate extends NumericExpres
return "~" + _children[0];
}
- public String toGetSourceString(OgnlContext context, Object target)
+ 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]) + ")";
- } else
+ return "~(" + super.coerceToNumeric( source, context, _children[0] ) + ")";
+ }
+ else
{
return "~(" + source + ")";
}
Modified: incubator/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTBitOr.java
URL: http://svn.apache.org/viewvc/incubator/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTBitOr.java?rev=1103095&r1=1103094&r2=1103095&view=diff
==============================================================================
--- incubator/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTBitOr.java (original)
+++ incubator/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTBitOr.java Sat May 14 13:18:29 2011
@@ -23,29 +23,34 @@ package org.apache.commons.ognl;
* @author Luke Blanshard (blanshlu@netscape.net)
* @author Drew Davidson (drew@ognl.org)
*/
-class ASTBitOr extends NumericExpression
+class ASTBitOr
+ extends NumericExpression
{
- public ASTBitOr(int id) {
- super(id);
+ public ASTBitOr( int id )
+ {
+ super( id );
}
- public ASTBitOr(OgnlParser p, int id) {
- super(p, id);
+ public ASTBitOr( OgnlParser p, int id )
+ {
+ super( p, id );
}
- public void jjtClose() {
+ public void jjtClose()
+ {
flattenTree();
}
- protected Object getValueBody( OgnlContext context, Object source ) throws OgnlException
+ protected Object getValueBody( OgnlContext context, Object source )
+ throws OgnlException
{
Object result = _children[0].getValue( context, source );
- for ( int i=1; i < _children.length; ++i )
- result = OgnlOps.binaryOr( result, _children[i].getValue(context, source) );
+ for ( int i = 1; i < _children.length; ++i )
+ result = OgnlOps.binaryOr( result, _children[i].getValue( context, source ) );
return result;
}
- public String getExpressionOperator(int index)
+ public String getExpressionOperator( int index )
{
return "|";
}