svn commit: r1103064 - /incubator/ognl/trunk/src/main/java/org/apache/commons/ognl/OgnlContext.java

[simonetripodi]

Author: simonetripodi
Date: Sat May 14 11:45:50 2011
New Revision: 1103064

URL: http://svn.apache.org/viewvc?rev=1103064&view=rev
Log:
simplified if-the-else chain in OgnlContext#get(Object) method

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=1103064&r1=1103063&r2=1103064&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 11:45:50 2011
@@ -494,46 +494,52 @@ public class OgnlContext extends Object 
     {
         Object result;
 
-        if (RESERVED_KEYS.contains(key)) {
-            if (key.equals(OgnlContext.THIS_CONTEXT_KEY)) {
+        if ( RESERVED_KEYS.contains( key ) )
+        {
+            if ( key.equals( OgnlContext.THIS_CONTEXT_KEY ) )
+            {
                 result = getCurrentObject();
-            } else {
-                if (key.equals(OgnlContext.ROOT_CONTEXT_KEY)) {
-                    result = getRoot();
-                } else {
-                    if (key.equals(OgnlContext.CONTEXT_CONTEXT_KEY)) {
-                        result = this;
-                    } else {
-                        if 
(key.equals(OgnlContext.TRACE_EVALUATIONS_CONTEXT_KEY)) {
-                            result = getTraceEvaluations() ? Boolean.TRUE : 
Boolean.FALSE;
-                        } else {
-                            if 
(key.equals(OgnlContext.LAST_EVALUATION_CONTEXT_KEY)) {
-                                result = getLastEvaluation();
-                            } else {
-                                if 
(key.equals(OgnlContext.KEEP_LAST_EVALUATION_CONTEXT_KEY)) {
-                                    result = getKeepLastEvaluation() ? 
Boolean.TRUE : Boolean.FALSE;
-                                } else {
-                                    if 
(key.equals(OgnlContext.CLASS_RESOLVER_CONTEXT_KEY)) {
-                                        result = getClassResolver();
-                                    } else {
-                                        if 
(key.equals(OgnlContext.TYPE_CONVERTER_CONTEXT_KEY)) {
-                                            result = getTypeConverter();
-                                        } else {
-                                            if 
(key.equals(OgnlContext.MEMBER_ACCESS_CONTEXT_KEY)) {
-                                                result = getMemberAccess();
-                                            } else {
-                                                throw new 
IllegalArgumentException("unknown reserved key '" + key + "'");
-                                            }
-                                        }
-                                    }
-                                }
-                            }
-                        }
-                    }
-                }
             }
-        } else {
-            result = _values.get(key);
+            else if ( key.equals( OgnlContext.ROOT_CONTEXT_KEY ) )
+            {
+                result = getRoot();
+            }
+            else if ( key.equals( OgnlContext.CONTEXT_CONTEXT_KEY ) )
+            {
+                result = this;
+            }
+            else if ( key.equals( OgnlContext.TRACE_EVALUATIONS_CONTEXT_KEY ) )
+            {
+                result = getTraceEvaluations() ? Boolean.TRUE : Boolean.FALSE;
+            }
+            else if ( key.equals( OgnlContext.LAST_EVALUATION_CONTEXT_KEY ) )
+            {
+                result = getLastEvaluation();
+            }
+            else if ( key.equals( OgnlContext.KEEP_LAST_EVALUATION_CONTEXT_KEY 
) )
+            {
+                result = getKeepLastEvaluation() ? Boolean.TRUE : 
Boolean.FALSE;
+            }
+            else if ( key.equals( OgnlContext.CLASS_RESOLVER_CONTEXT_KEY ) )
+            {
+                result = getClassResolver();
+            }
+            else if ( key.equals( OgnlContext.TYPE_CONVERTER_CONTEXT_KEY ) )
+            {
+                result = getTypeConverter();
+            }
+            else if ( key.equals( OgnlContext.MEMBER_ACCESS_CONTEXT_KEY ) )
+            {
+                result = getMemberAccess();
+            }
+            else
+            {
+                throw new IllegalArgumentException( "unknown reserved key '" + 
key + "'" );
+            }
+        }
+        else
+        {
+            result = _values.get( key );
         }
         return result;
     }