Author: rahul Date: Mon Oct 24 19:27:12 2005 New Revision: 328238 URL: http://svn.apache.org/viewcvs?rev=328238&view=rev Log: Better variable name (vr -> variableResolver) and getter/setter.
Modified: jakarta/commons/sandbox/scxml/trunk/src/main/java/org/apache/commons/scxml/env/jsp/RootContext.java Modified: jakarta/commons/sandbox/scxml/trunk/src/main/java/org/apache/commons/scxml/env/jsp/RootContext.java URL: http://svn.apache.org/viewcvs/jakarta/commons/sandbox/scxml/trunk/src/main/java/org/apache/commons/scxml/env/jsp/RootContext.java?rev=328238&r1=328237&r2=328238&view=diff ============================================================================== --- jakarta/commons/sandbox/scxml/trunk/src/main/java/org/apache/commons/scxml/env/jsp/RootContext.java (original) +++ jakarta/commons/sandbox/scxml/trunk/src/main/java/org/apache/commons/scxml/env/jsp/RootContext.java Mon Oct 24 19:27:12 2005 @@ -31,7 +31,7 @@ public final class RootContext extends ELContext { /** Host JSP's VariableResolver. */ - private VariableResolver vr; + private VariableResolver variableResolver; /** Bark if JSP Context is null. */ private static final String ERR_HOST_JSP_CTX_NULL = "Host JSP Context cannot be null"; @@ -48,7 +48,7 @@ throw new IllegalArgumentException(ERR_HOST_JSP_CTX_NULL); } else { // only retain the VariableResolver - this.vr = ctx.getVariableResolver(); + this.variableResolver = ctx.getVariableResolver(); } } @@ -63,7 +63,7 @@ Object value = super.get(name); if (value == null) { try { - value = vr.resolveVariable(name); + value = variableResolver.resolveVariable(name); } catch (ELException ele) { LOG.error(ele.getMessage(), ele); } @@ -83,7 +83,7 @@ Object value = null; if (!exists) { try { - value = vr.resolveVariable(name); + value = variableResolver.resolveVariable(name); } catch (ELException ele) { LOG.error(ele.getMessage(), ele); } @@ -103,6 +103,24 @@ // The reason why this method body exists is to emphasize that // read-only (JSP) variables are not included in the Iterator return super.iterator(); + } + + /** + * Get the VariableResolver associated with this root context. + * + * @return Returns the variableResolver. + */ + public VariableResolver getVariableResolver() { + return variableResolver; + } + + /** + * Set the VariableResolver associated with this root context. + * + * @param variableResolver The variableResolver to set. + */ + public void setVariableResolver(final VariableResolver variableResolver) { + this.variableResolver = variableResolver; } } --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]