You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by mb...@apache.org on 2007/08/14 02:06:30 UTC
svn commit: r565581 -
/commons/proper/el/trunk/src/java/org/apache/commons/el/VariableResolverImpl.java
Author: mbenson
Date: Mon Aug 13 17:06:29 2007
New Revision: 565581
URL: http://svn.apache.org/viewvc?view=rev&rev=565581
Log:
format
Modified:
commons/proper/el/trunk/src/java/org/apache/commons/el/VariableResolverImpl.java
Modified: commons/proper/el/trunk/src/java/org/apache/commons/el/VariableResolverImpl.java
URL: http://svn.apache.org/viewvc/commons/proper/el/trunk/src/java/org/apache/commons/el/VariableResolverImpl.java?view=diff&rev=565581&r1=565580&r2=565581
==============================================================================
--- commons/proper/el/trunk/src/java/org/apache/commons/el/VariableResolverImpl.java (original)
+++ commons/proper/el/trunk/src/java/org/apache/commons/el/VariableResolverImpl.java Mon Aug 13 17:06:29 2007
@@ -30,94 +30,62 @@
* @version $Change: 181177 $$DateTime: 2001/06/26 08:45:09 $$Author$
**/
-public class VariableResolverImpl
- implements VariableResolver
-{
- //-------------------------------------
- // Member variables
- //-------------------------------------
+public class VariableResolverImpl implements VariableResolver {
+ // -------------------------------------
+ // Member variables
+ // -------------------------------------
- private PageContext mCtx;
+ private PageContext mCtx;
- //-------------------------------------
- /**
- *
- * Constructor
- **/
- public VariableResolverImpl (PageContext pCtx)
- {
- mCtx = pCtx;
- }
-
- //-------------------------------------
- /**
- *
- * Resolves the specified variable within the given context.
- * Returns null if the variable is not found.
- **/
- public Object resolveVariable (String pName)
- throws ELException
- {
- // Check for implicit objects
- if ("pageContext".equals (pName)) {
- return mCtx;
- }
- else if ("pageScope".equals (pName)) {
- return ImplicitObjects.
- getImplicitObjects (mCtx).
- getPageScopeMap ();
- }
- else if ("requestScope".equals (pName)) {
- return ImplicitObjects.
- getImplicitObjects (mCtx).
- getRequestScopeMap ();
- }
- else if ("sessionScope".equals (pName)) {
- return ImplicitObjects.
- getImplicitObjects (mCtx).
- getSessionScopeMap ();
- }
- else if ("applicationScope".equals (pName)) {
- return ImplicitObjects.
- getImplicitObjects (mCtx).
- getApplicationScopeMap ();
- }
- else if ("param".equals (pName)) {
- return ImplicitObjects.
- getImplicitObjects (mCtx).
- getParamMap ();
- }
- else if ("paramValues".equals (pName)) {
- return ImplicitObjects.
- getImplicitObjects (mCtx).
- getParamsMap ();
- }
- else if ("header".equals (pName)) {
- return ImplicitObjects.
- getImplicitObjects (mCtx).
- getHeaderMap ();
- }
- else if ("headerValues".equals (pName)) {
- return ImplicitObjects.
- getImplicitObjects (mCtx).
- getHeadersMap ();
- }
- else if ("initParam".equals (pName)) {
- return ImplicitObjects.
- getImplicitObjects (mCtx).
- getInitParamMap ();
- }
- else if ("cookie".equals (pName)) {
- return ImplicitObjects.
- getImplicitObjects (mCtx).
- getCookieMap ();
+ // -------------------------------------
+ /**
+ *
+ * Constructor
+ **/
+ public VariableResolverImpl(PageContext pCtx) {
+ mCtx = pCtx;
}
- // Otherwise, just look it up in the page context
- else {
- return mCtx.findAttribute (pName);
+ // -------------------------------------
+ /**
+ *
+ * Resolves the specified variable within the given context.
+ * Returns null if the variable is not found.
+ **/
+ public Object resolveVariable(String pName) throws ELException {
+ // Check for implicit objects
+ if ("pageContext".equals(pName)) {
+ return mCtx;
+ } else if ("pageScope".equals(pName)) {
+ return ImplicitObjects.getImplicitObjects(mCtx).getPageScopeMap();
+ } else if ("requestScope".equals(pName)) {
+ return ImplicitObjects.getImplicitObjects(mCtx)
+ .getRequestScopeMap();
+ } else if ("sessionScope".equals(pName)) {
+ return ImplicitObjects.getImplicitObjects(mCtx)
+ .getSessionScopeMap();
+ } else if ("applicationScope".equals(pName)) {
+ return ImplicitObjects.getImplicitObjects(mCtx)
+ .getApplicationScopeMap();
+ } else if ("param".equals(pName)) {
+ return ImplicitObjects.getImplicitObjects(mCtx).getParamMap();
+ } else if ("paramValues".equals(pName)) {
+ return ImplicitObjects.getImplicitObjects(mCtx).getParamsMap();
+ } else if ("header".equals(pName)) {
+ return ImplicitObjects.getImplicitObjects(mCtx).getHeaderMap();
+ } else if ("headerValues".equals(pName)) {
+ return ImplicitObjects.getImplicitObjects(mCtx).getHeadersMap();
+ } else if ("initParam".equals(pName)) {
+ return ImplicitObjects.getImplicitObjects(mCtx).getInitParamMap();
+ } else if ("cookie".equals(pName)) {
+ return ImplicitObjects.getImplicitObjects(mCtx).getCookieMap();
+ }
+
+ // Otherwise, just look it up in the page context
+ else {
+ return mCtx.findAttribute(pName);
+ }
}
- }
-
- //-------------------------------------
+
+ // -------------------------------------
}