commons-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From simonetrip...@apache.org
Subject svn commit: r1103075 - /incubator/ognl/trunk/src/main/java/org/apache/commons/ognl/OgnlContext.java
Date Sat, 14 May 2011 12:05:11 GMT
Author: simonetripodi
Date: Sat May 14 12:05:11 2011
New Revision: 1103075

URL: http://svn.apache.org/viewvc?rev=1103075&view=rev
Log:
removed Ognl class qualifier for static constants

Modified:
    incubator/ognl/trunk/src/main/java/org/apache/commons/ognl/OgnlContext.java

Modified: incubator/ognl/trunk/src/main/java/org/apache/commons/ognl/OgnlContext.java
URL: http://svn.apache.org/viewvc/incubator/ognl/trunk/src/main/java/org/apache/commons/ognl/OgnlContext.java?rev=1103075&r1=1103074&r2=1103075&view=diff
==============================================================================
--- incubator/ognl/trunk/src/main/java/org/apache/commons/ognl/OgnlContext.java (original)
+++ incubator/ognl/trunk/src/main/java/org/apache/commons/ognl/OgnlContext.java Sat May 14
12:05:11 2011
@@ -496,39 +496,39 @@ public class OgnlContext extends Object 
 
         if ( RESERVED_KEYS.contains( key ) )
         {
-            if ( key.equals( OgnlContext.THIS_CONTEXT_KEY ) )
+            if ( key.equals( THIS_CONTEXT_KEY ) )
             {
                 result = getCurrentObject();
             }
-            else if ( key.equals( OgnlContext.ROOT_CONTEXT_KEY ) )
+            else if ( key.equals( ROOT_CONTEXT_KEY ) )
             {
                 result = getRoot();
             }
-            else if ( key.equals( OgnlContext.CONTEXT_CONTEXT_KEY ) )
+            else if ( key.equals( CONTEXT_CONTEXT_KEY ) )
             {
                 result = this;
             }
-            else if ( key.equals( OgnlContext.TRACE_EVALUATIONS_CONTEXT_KEY ) )
+            else if ( key.equals( TRACE_EVALUATIONS_CONTEXT_KEY ) )
             {
                 result = getTraceEvaluations() ? Boolean.TRUE : Boolean.FALSE;
             }
-            else if ( key.equals( OgnlContext.LAST_EVALUATION_CONTEXT_KEY ) )
+            else if ( key.equals( LAST_EVALUATION_CONTEXT_KEY ) )
             {
                 result = getLastEvaluation();
             }
-            else if ( key.equals( OgnlContext.KEEP_LAST_EVALUATION_CONTEXT_KEY ) )
+            else if ( key.equals( KEEP_LAST_EVALUATION_CONTEXT_KEY ) )
             {
                 result = getKeepLastEvaluation() ? Boolean.TRUE : Boolean.FALSE;
             }
-            else if ( key.equals( OgnlContext.CLASS_RESOLVER_CONTEXT_KEY ) )
+            else if ( key.equals( CLASS_RESOLVER_CONTEXT_KEY ) )
             {
                 result = getClassResolver();
             }
-            else if ( key.equals( OgnlContext.TYPE_CONVERTER_CONTEXT_KEY ) )
+            else if ( key.equals( TYPE_CONVERTER_CONTEXT_KEY ) )
             {
                 result = getTypeConverter();
             }
-            else if ( key.equals( OgnlContext.MEMBER_ACCESS_CONTEXT_KEY ) )
+            else if ( key.equals( MEMBER_ACCESS_CONTEXT_KEY ) )
             {
                 result = getMemberAccess();
             }
@@ -546,47 +546,47 @@ public class OgnlContext extends Object 
 
         if ( RESERVED_KEYS.contains( key ) )
         {
-            if ( key.equals( OgnlContext.CONTEXT_CONTEXT_KEY ) )
+            if ( key.equals( CONTEXT_CONTEXT_KEY ) )
             {
-                throw new IllegalArgumentException( "can't change " + OgnlContext.CONTEXT_CONTEXT_KEY
+ " in context" );
+                throw new IllegalArgumentException( "can't change " + CONTEXT_CONTEXT_KEY
+ " in context" );
             }
 
-            if ( key.equals( OgnlContext.THIS_CONTEXT_KEY ) )
+            if ( key.equals( THIS_CONTEXT_KEY ) )
             {
                 result = getCurrentObject();
                 setCurrentObject( value );
             }
-            else if ( key.equals( OgnlContext.ROOT_CONTEXT_KEY ) )
+            else if ( key.equals( ROOT_CONTEXT_KEY ) )
             {
                 result = getRoot();
                 setRoot( value );
             }
-            else if ( key.equals( OgnlContext.TRACE_EVALUATIONS_CONTEXT_KEY ) )
+            else if ( key.equals( TRACE_EVALUATIONS_CONTEXT_KEY ) )
             {
                 result = getTraceEvaluations() ? Boolean.TRUE : Boolean.FALSE;
                 setTraceEvaluations( OgnlOps.booleanValue( value ) );
             }
-            else if ( key.equals( OgnlContext.LAST_EVALUATION_CONTEXT_KEY ) )
+            else if ( key.equals( LAST_EVALUATION_CONTEXT_KEY ) )
             {
                 result = getLastEvaluation();
                 _lastEvaluation = (Evaluation) value;
             }
-            else if ( key.equals( OgnlContext.KEEP_LAST_EVALUATION_CONTEXT_KEY ) )
+            else if ( key.equals( KEEP_LAST_EVALUATION_CONTEXT_KEY ) )
             {
                 result = getKeepLastEvaluation() ? Boolean.TRUE : Boolean.FALSE;
                 setKeepLastEvaluation( OgnlOps.booleanValue( value ) );
             }
-            else if ( key.equals( OgnlContext.CLASS_RESOLVER_CONTEXT_KEY ) )
+            else if ( key.equals( CLASS_RESOLVER_CONTEXT_KEY ) )
             {
                 result = getClassResolver();
                 setClassResolver( (ClassResolver) value );
             }
-            else if ( key.equals( OgnlContext.TYPE_CONVERTER_CONTEXT_KEY ) )
+            else if ( key.equals( TYPE_CONVERTER_CONTEXT_KEY ) )
             {
                 result = getTypeConverter();
                 setTypeConverter( (TypeConverter) value );
             }
-            else if ( key.equals( OgnlContext.MEMBER_ACCESS_CONTEXT_KEY ) )
+            else if ( key.equals( MEMBER_ACCESS_CONTEXT_KEY ) )
             {
                 result = getMemberAccess();
                 setMemberAccess( (MemberAccess) value );
@@ -606,39 +606,39 @@ public class OgnlContext extends Object 
 
         if ( RESERVED_KEYS.contains( key ) )
         {
-            if ( key.equals( OgnlContext.CONTEXT_CONTEXT_KEY )
-                || key.equals( OgnlContext.TRACE_EVALUATIONS_CONTEXT_KEY )
-                || key.equals( OgnlContext.KEEP_LAST_EVALUATION_CONTEXT_KEY ) )
+            if ( key.equals( CONTEXT_CONTEXT_KEY )
+                || key.equals( TRACE_EVALUATIONS_CONTEXT_KEY )
+                || key.equals( KEEP_LAST_EVALUATION_CONTEXT_KEY ) )
             {
-                throw new IllegalArgumentException( "can't remove " + OgnlContext.CONTEXT_CONTEXT_KEY
+ " from context" );
+                throw new IllegalArgumentException( "can't remove " + CONTEXT_CONTEXT_KEY
+ " from context" );
             }
 
-            if ( key.equals( OgnlContext.THIS_CONTEXT_KEY ) )
+            if ( key.equals( THIS_CONTEXT_KEY ) )
             {
                 result = getCurrentObject();
                 setCurrentObject( null );
             }
-            else if ( key.equals( OgnlContext.ROOT_CONTEXT_KEY ) )
+            else if ( key.equals( ROOT_CONTEXT_KEY ) )
             {
                 result = getRoot();
                 setRoot( null );
             }
-            else if ( key.equals( OgnlContext.LAST_EVALUATION_CONTEXT_KEY ) )
+            else if ( key.equals( LAST_EVALUATION_CONTEXT_KEY ) )
             {
                 result = _lastEvaluation;
                 setLastEvaluation( null );
             }
-            else if ( key.equals( OgnlContext.CLASS_RESOLVER_CONTEXT_KEY ) )
+            else if ( key.equals( CLASS_RESOLVER_CONTEXT_KEY ) )
             {
                 result = getClassResolver();
                 setClassResolver( null );
             }
-            else if ( key.equals( OgnlContext.TYPE_CONVERTER_CONTEXT_KEY ) )
+            else if ( key.equals( TYPE_CONVERTER_CONTEXT_KEY ) )
             {
                 result = getTypeConverter();
                 setTypeConverter( null );
             }
-            else if ( key.equals( OgnlContext.MEMBER_ACCESS_CONTEXT_KEY ) )
+            else if ( key.equals( MEMBER_ACCESS_CONTEXT_KEY ) )
             {
                 result = getMemberAccess();
                 setMemberAccess( null );



Mime
View raw message