You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beehive.apache.org by ek...@apache.org on 2005/02/15 00:32:05 UTC
svn commit: r153873 - in
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script:
./ el/ el/tokens/ el/util/
Author: ekoneil
Date: Mon Feb 14 15:31:59 2005
New Revision: 153873
URL: http://svn.apache.org/viewcvs?view=rev&rev=153873
Log:
Expression language cleanup.
Fixing variable names, cleaning up imports, etc. in preparation for some bugs that need to be fixed there.
BB: self
DRT: NetUI pass
Modified:
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/ExpressionEngineFactory.java
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/ExpressionEvaluatorImpl.java
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/ExpressionParseException.java
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/ExpressionTerm.java
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/LiteralTerm.java
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/NetUIReadVariableResolver.java
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/NetUIUpdateVariableResolver.java
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/NetUIVariableResolver.java
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/ParsedExpression.java
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/tokens/ArrayIndexToken.java
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/tokens/ContextToken.java
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/tokens/ExpressionToken.java
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/tokens/IdentifierToken.java
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/tokens/MapKeyToken.java
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/util/AbstractAttributeMap.java
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/util/BindingContext.java
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/util/ParseUtils.java
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/util/RequestAttributeMap.java
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/util/SessionAttributeMap.java
Modified: incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/ExpressionEngineFactory.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/ExpressionEngineFactory.java?view=diff&r1=153872&r2=153873
==============================================================================
--- incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/ExpressionEngineFactory.java (original)
+++ incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/ExpressionEngineFactory.java Mon Feb 14 15:31:59 2005
@@ -17,12 +17,6 @@
*/
package org.apache.beehive.netui.script;
-// java imports
-
-// internal imports
-
-// external imports
-
/**
*
*/
Modified: incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/ExpressionEvaluatorImpl.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/ExpressionEvaluatorImpl.java?view=diff&r1=153872&r2=153873
==============================================================================
--- incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/ExpressionEvaluatorImpl.java (original)
+++ incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/ExpressionEvaluatorImpl.java Mon Feb 14 15:31:59 2005
@@ -33,8 +33,8 @@
public class ExpressionEvaluatorImpl
implements ExpressionEvaluator {
- private static final Logger _logger = Logger.getInstance(ExpressionEvaluatorImpl.class);
- private static final boolean DEBUG_ENABLED = _logger.isDebugEnabled();
+ private static final Logger LOGGER = Logger.getInstance(ExpressionEvaluatorImpl.class);
+ private static final boolean DEBUG_ENABLED = LOGGER.isDebugEnabled();
public static class NetUIELEngineFactory
extends org.apache.beehive.netui.script.ExpressionEngineFactory {
@@ -54,7 +54,7 @@
return ParseUtils.evaluate(expression, vr);
} catch(Exception e) {
if(DEBUG_ENABLED)
- _logger.debug("Expression evaluation failed in NetUIEL. Cause: " + e, e);
+ LOGGER.debug("Expression evaluation failed in NetUIEL. Cause: " + e, e);
Exception act = e;
@@ -62,8 +62,8 @@
String msg = "Caught exception when evaluating expression \"" + expression + "\" with available binding contexts " +
contextStr + ". Root cause: " + ParseUtils.getRootCause(act).toString();
- if(_logger.isErrorEnabled())
- _logger.error(msg, act);
+ if(LOGGER.isErrorEnabled())
+ LOGGER.error(msg, act);
throw new ExpressionEvaluationException(msg, expression, act);
}
@@ -77,19 +77,19 @@
try {
if(DEBUG_ENABLED)
- _logger.debug("Update expression \"" + expression + "\"");
+ LOGGER.debug("Update expression \"" + expression + "\"");
ParseUtils.update(expression, value, vr);
} catch(Exception e) {
if(DEBUG_ENABLED)
- _logger.debug("Expression update failed in NetUIEL. Cause: " + e, e);
+ LOGGER.debug("Expression update failed in NetUIEL. Cause: " + e, e);
String contextStr = ParseUtils.getContextString(vr.getAvailableVariables());
String msg = "Exception when attempting to update the expression \"" + expression + "\" with available binding contexts " +
contextStr + ". Root cause: " + ParseUtils.getRootCause(e).toString();
- if(_logger.isErrorEnabled())
- _logger.error(msg, e);
+ if(LOGGER.isErrorEnabled())
+ LOGGER.error(msg, e);
ExpressionUpdateException eee = new ExpressionUpdateException(msg, expression, e);
eee.setLocalizedMessage(msg);
@@ -108,7 +108,7 @@
String msg = "Error when trying to replace old context '" + oldContext + "' with new context '" +
newContext + "' and index '" + lookupIndex + "': " + ParseUtils.getRootCause(e).toString();
- if(_logger.isErrorEnabled()) _logger.error(msg, e);
+ if(LOGGER.isErrorEnabled()) LOGGER.error(msg, e);
throw new ExpressionEvaluationException(msg, e);
}
@@ -132,8 +132,8 @@
ParsedExpression pe = ParseUtils.parse(expression);
return pe.isExpression();
} catch(Exception e) {
- if(_logger.isErrorEnabled())
- _logger.error("Exception parsing expression \"" + expression + "\". Cause: " +
+ if(LOGGER.isErrorEnabled())
+ LOGGER.error("Exception parsing expression \"" + expression + "\". Cause: " +
ParseUtils.getRootCause(e).toString(), e);
if(e instanceof IllegalExpressionException)
@@ -153,8 +153,8 @@
assert pe != null;
return pe.containsExpression();
} catch(Exception e) {
- if(_logger.isErrorEnabled())
- _logger.error("Exception checking for expressions in \"" + expression + "\"", e);
+ if(LOGGER.isErrorEnabled())
+ LOGGER.error("Exception checking for expressions in \"" + expression + "\"", e);
return false;
}
Modified: incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/ExpressionParseException.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/ExpressionParseException.java?view=diff&r1=153872&r2=153873
==============================================================================
--- incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/ExpressionParseException.java (original)
+++ incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/ExpressionParseException.java Mon Feb 14 15:31:59 2005
@@ -24,8 +24,6 @@
extends RuntimeException {
/**
- *
- *
*/
public ExpressionParseException() {
super();
Modified: incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/ExpressionTerm.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/ExpressionTerm.java?view=diff&r1=153872&r2=153873
==============================================================================
--- incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/ExpressionTerm.java (original)
+++ incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/ExpressionTerm.java Mon Feb 14 15:31:59 2005
@@ -39,36 +39,36 @@
extends Expression
implements Term {
- private static Logger _logger = Logger.getInstance(ExpressionTerm.class);
+ private static Logger LOGGER = Logger.getInstance(ExpressionTerm.class);
- private List tokens = null;
- private String exprStr = null;
- private ContextToken context = null;
- private ExpressionToken[] tokenArray = null;
+ private List _tokens = null;
+ private String _exprStr = null;
+ private ContextToken _context = null;
+ private ExpressionToken[] _tokenArray = null;
private List _noModTokens = null;
public ExpressionTerm() {
super();
- tokens = new ArrayList();
+ _tokens = new ArrayList();
}
public void seal() {
- context = (ContextToken)tokens.get(0);
- tokenArray = new ExpressionToken[tokens.size()];
+ _context = (ContextToken)_tokens.get(0);
+ _tokenArray = new ExpressionToken[_tokens.size()];
StringBuffer buf = new StringBuffer();
- for(int i = 0; i < tokens.size(); i++) {
- buf.append(((ExpressionToken)tokens.get(i)).getTokenString());
- tokenArray[i] = (ExpressionToken)tokens.get(i);
+ for(int i = 0; i < _tokens.size(); i++) {
+ buf.append(((ExpressionToken)_tokens.get(i)).getTokenString());
+ _tokenArray[i] = (ExpressionToken)_tokens.get(i);
}
- exprStr = buf.toString();
+ _exprStr = buf.toString();
- _noModTokens = Collections.unmodifiableList(tokens);
+ _noModTokens = Collections.unmodifiableList(_tokens);
}
public String getContext() {
- return context.getName();
+ return _context.getName();
}
public List getTokens() {
@@ -76,15 +76,15 @@
}
public String getExpression(int start) {
- if(start >= tokens.size())
+ if(start >= _tokens.size())
throw new IllegalStateException("The index \"" + start + "\" is an invalid reference into an expression with \"" +
- tokens.size() + "\" tokens.");
+ _tokens.size() + "\" _tokens.");
boolean needDot = true;
StringBuffer buf = new StringBuffer();
buf.append("{");
- for(int i = start; i < tokens.size(); i++) {
- ExpressionToken tok = (ExpressionToken)tokens.get(i);
+ for(int i = start; i < _tokens.size(); i++) {
+ ExpressionToken tok = (ExpressionToken)_tokens.get(i);
if(tok instanceof ArrayIndexToken) {
buf.append(tok.getTokenString());
needDot = false;
@@ -102,54 +102,54 @@
}
public void addToken(ExpressionToken token) {
- tokens.add(token);
+ _tokens.add(token);
}
public Iterator getExpressionTokens() {
- return tokens.iterator();
+ return _tokens.iterator();
}
public int getTokenCount() {
- return tokenArray.length;
+ return _tokenArray.length;
}
public ExpressionToken getToken(int index) {
// @TODO: error checking
- return tokenArray[index];
+ return _tokenArray[index];
}
public String getExpressionString() {
- return exprStr;
+ return _exprStr;
}
public Object evaluate(NetUIVariableResolver vr) {
- return _evaluate(tokens.size(), vr);
+ return _evaluate(_tokens.size(), vr);
}
public void update(Object newValue, NetUIVariableResolver vr) {
// find leaf
- Object branch = _evaluate(tokens.size() - 1, vr);
+ Object branch = _evaluate(_tokens.size() - 1, vr);
- ExpressionToken token = tokenArray[tokens.size() - 1];
+ ExpressionToken token = _tokenArray[_tokens.size() - 1];
- if(_logger.isDebugEnabled()) _logger.debug("Update leaf token: " + token + " on object: " + branch);
+ if(LOGGER.isDebugEnabled()) LOGGER.debug("Update leaf token: " + token + " on object: " + branch);
// apply value
token.update(branch, newValue);
}
- // @TODO: this could be done more effectively / efficiently
+ /* todo: perf. this could be done more effectively / efficiently */
public String changeContext(String oldContext, String newContext, Object index) {
String thisExpr = getExpressionString();
- if(_logger.isDebugEnabled()) _logger.debug("oldContext: " + oldContext + " newContext: " + newContext + " thisExpr: " + thisExpr);
+ if(LOGGER.isDebugEnabled()) LOGGER.debug("oldContext: " + oldContext + " newContext: " + newContext + " thisExpr: " + thisExpr);
// needs to be checked for atomicity
ParsedExpression pe = ParseUtils.parse(newContext);
if(!pe.isExpression()) {
- String msg = "The expression can not be qualified into new context because the new context is not atomic.";
- if(_logger.isErrorEnabled()) _logger.error(msg);
+ String msg = "The expression can not be qualified into new _context because the new _context is not atomic.";
+ if(LOGGER.isErrorEnabled()) LOGGER.error(msg);
throw new RuntimeException(msg);
}
@@ -162,7 +162,7 @@
String msg = "Can not create an indexed expression with an array index greater than the Java array limit for the expression \"" +
thisExpr + "\"";
- if(_logger.isWarnEnabled()) _logger.warn(msg);
+ if(LOGGER.isWarnEnabled()) LOGGER.warn(msg);
throw new RuntimeException(msg);
}
@@ -170,7 +170,7 @@
ctxStr = ctxStr + "[" + index + "]";
- if(_logger.isDebugEnabled()) _logger.debug("thisExpr: " + thisExpr + " ctxStr: " + ctxStr);
+ if(LOGGER.isDebugEnabled()) LOGGER.debug("thisExpr: " + thisExpr + " ctxStr: " + ctxStr);
thisExpr = thisExpr.replaceFirst(oldContext, ctxStr);
@@ -196,8 +196,8 @@
public String toString() {
StringBuffer buf = new StringBuffer();
buf.append("ExpressionTerm:\n");
- for(int i = 0; i < tokens.size(); i++) {
- buf.append(" " + tokens.get(i).toString() + "\n");
+ for(int i = 0; i < _tokens.size(); i++) {
+ buf.append(" " + _tokens.get(i).toString() + "\n");
}
return buf.toString();
}
@@ -205,14 +205,14 @@
private final Object _evaluate(int index, NetUIVariableResolver vr) {
Object result = null;
- if(tokens.size() == 1) {
- if(_logger.isDebugEnabled()) _logger.debug("found single term expression");
+ if(_tokens.size() == 1) {
+ if(LOGGER.isDebugEnabled()) LOGGER.debug("found single term expression");
- result = vr.resolveVariable(context.getName());
+ result = vr.resolveVariable(_context.getName());
if(result != null && result instanceof BindingContext) {
- if(_logger.isDebugEnabled())
- _logger.debug("result is of type BindingContext; return type: " + (((BindingContext)result).unwrap().getClass()));
+ if(LOGGER.isDebugEnabled())
+ LOGGER.debug("result is of type BindingContext; return type: " + (((BindingContext)result).unwrap().getClass()));
return ((BindingContext)result).unwrap();
} else
@@ -220,9 +220,9 @@
} else {
for(int i = 0; i < index; i++) {
if(i == 0) {
- result = vr.resolveVariable(context.getName());
+ result = vr.resolveVariable(_context.getName());
} else
- result = tokenArray[i].evaluate(result);
+ result = _tokenArray[i].evaluate(result);
}
return result;
Modified: incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/LiteralTerm.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/LiteralTerm.java?view=diff&r1=153872&r2=153873
==============================================================================
--- incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/LiteralTerm.java (original)
+++ incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/LiteralTerm.java Mon Feb 14 15:31:59 2005
@@ -25,20 +25,21 @@
public class LiteralTerm
implements Term {
- private static final Logger logger = Logger.getInstance(LiteralTerm.class);
+ private static final Logger LOGGER = Logger.getInstance(LiteralTerm.class);
private String text = null;
public LiteralTerm(String text) {
super();
- // hack for Radar 39861. probably being lazy in not fixing the grammar...
+ /* todo: probably being lazy in not fixing the grammar */
if(text.equals("\\{"))
this.text = "{";
else
this.text = text;
- if(logger.isDebugEnabled()) logger.debug("LiteralTerm text: " + text + " this.text: " + this.text);
+ if(LOGGER.isDebugEnabled())
+ LOGGER.debug("LiteralTerm text: " + text + " this.text: " + this.text);
}
public void seal() {
Modified: incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/NetUIReadVariableResolver.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/NetUIReadVariableResolver.java?view=diff&r1=153872&r2=153873
==============================================================================
--- incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/NetUIReadVariableResolver.java (original)
+++ incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/NetUIReadVariableResolver.java Mon Feb 14 15:31:59 2005
@@ -28,7 +28,7 @@
public class NetUIReadVariableResolver
extends NetUIVariableResolver {
- private static final Logger _logger = Logger.getInstance(NetUIReadVariableResolver.class);
+ private static final Logger LOGGER = Logger.getInstance(NetUIReadVariableResolver.class);
private VariableResolver _vr = null;
@@ -44,15 +44,14 @@
} catch(javax.servlet.jsp.el.ELException ele) {
RuntimeException re = new RuntimeException("Could not resolve variable named \"" + name + "\"", new IllegalExpressionException());
- if(_logger.isErrorEnabled())
- _logger.error("", re);
+ if(LOGGER.isErrorEnabled())
+ LOGGER.error("", re);
throw re;
}
}
public String[] getAvailableVariables() {
- /* todo: implement this correctly! */
return new String[]{"actionForm", "pageFlow", "globalApp", "request", "session", "application", "pageContext", "bundle", "container", "url", "pageInput"};
}
}
Modified: incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/NetUIUpdateVariableResolver.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/NetUIUpdateVariableResolver.java?view=diff&r1=153872&r2=153873
==============================================================================
--- incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/NetUIUpdateVariableResolver.java (original)
+++ incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/NetUIUpdateVariableResolver.java Mon Feb 14 15:31:59 2005
@@ -37,10 +37,9 @@
*
*/
public class NetUIUpdateVariableResolver
- extends NetUIVariableResolver
- implements VariableResolver {
+ extends NetUIVariableResolver {
- private static final Logger _logger = Logger.getInstance(NetUIVariableResolver.class);
+ private static final Logger LOGGER = Logger.getInstance(NetUIVariableResolver.class);
private boolean _requestParameter = true;
private Object _form = null;
@@ -84,8 +83,8 @@
throw new IllegalExpressionException("The application data binding context can not be updated from a request parameter.");
} else {
String msg = "Could not resolve variable named \"" + name + "\" for an expression update.";
- if(_logger.isErrorEnabled())
- _logger.error(msg);
+ if(LOGGER.isErrorEnabled())
+ LOGGER.error(msg);
throw new IllegalExpressionException(msg);
}
Modified: incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/NetUIVariableResolver.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/NetUIVariableResolver.java?view=diff&r1=153872&r2=153873
==============================================================================
--- incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/NetUIVariableResolver.java (original)
+++ incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/NetUIVariableResolver.java Mon Feb 14 15:31:59 2005
@@ -17,14 +17,7 @@
*/
package org.apache.beehive.netui.script.el;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
import javax.servlet.jsp.el.VariableResolver;
-
-import org.apache.beehive.netui.pageflow.GlobalApp;
-import org.apache.beehive.netui.pageflow.PageFlowController;
-import org.apache.beehive.netui.pageflow.SharedFlowController;
-import org.apache.beehive.netui.script.common.ImplicitObjectUtil;
/**
*
Modified: incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/ParsedExpression.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/ParsedExpression.java?view=diff&r1=153872&r2=153873
==============================================================================
--- incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/ParsedExpression.java (original)
+++ incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/ParsedExpression.java Mon Feb 14 15:31:59 2005
@@ -26,91 +26,90 @@
*/
public class ParsedExpression {
- private static Logger _logger = Logger.getInstance(ParsedExpression.class);
+ private static Logger LOGGER = Logger.getInstance(ParsedExpression.class);
/* cache the debug status; this needs to be _fast_ */
- private static final boolean DEBUG_ENABLED = _logger.isDebugEnabled();
+ private static final boolean DEBUG_ENABLED = LOGGER.isDebugEnabled();
private static final String EMPTY_STRING = "";
- private ArrayList<Term> terms = new ArrayList<Term>(3);
- private boolean isExpression = false;
- private boolean containsExpression = false;
-
- private ExpressionTerm atomicExpression = null;
- private Term[] termArray = null;
- private String exprStr;
+ private ArrayList<Term> _terms = new ArrayList<Term>(3);
+ private boolean _isExpression = false;
+ private boolean _containsExpression = false;
+ private ExpressionTerm _atomicExpression = null;
+ private Term[] _termArray = null;
+ private String _exprStr;
public void seal() {
- termArray = new Term[terms.size()];
+ _termArray = new Term[_terms.size()];
StringBuffer buf = new StringBuffer();
- for(int i = 0; i < terms.size(); i++) {
- Term t = (Term)terms.get(i);
+ for(int i = 0; i < _terms.size(); i++) {
+ Term t = (Term)_terms.get(i);
t.seal();
if(t instanceof ExpressionTerm) {
- if(terms.size() == 1) {
- atomicExpression = (ExpressionTerm)terms.get(0);
- isExpression = true;
+ if(_terms.size() == 1) {
+ _atomicExpression = (ExpressionTerm)_terms.get(0);
+ _isExpression = true;
}
- containsExpression = true;
+ _containsExpression = true;
} else if(t instanceof LiteralTerm) {
String lit = t.getExpressionString();
if(lit != null && lit.indexOf("{") > -1)
- containsExpression = true;
+ _containsExpression = true;
}
- termArray[i] = (Term)terms.get(i);
+ _termArray[i] = (Term)_terms.get(i);
buf.append(t.getExpressionString());
}
- exprStr = buf.toString();
+ _exprStr = buf.toString();
}
public boolean isExpression() {
- return isExpression;
+ return _isExpression;
}
public boolean containsExpression() {
- return containsExpression;
+ return _containsExpression;
}
public void addTerm(Term term) {
- terms.add(term);
+ _terms.add(term);
}
public int getTokenCount() {
- return terms.size();
+ return _terms.size();
}
public Term getTerm(int i) {
- assert termArray != null;
- assert i > 0 && i < termArray.length;
+ assert _termArray != null;
+ assert i > 0 && i < _termArray.length;
- return termArray[i];
+ return _termArray[i];
}
public ExpressionTerm getAtomicExpressionTerm() {
- return atomicExpression;
+ return _atomicExpression;
}
public Object evaluate(NetUIVariableResolver vr) {
if(DEBUG_ENABLED)
- _logger.debug("evaluate expression: " + exprStr);
+ LOGGER.debug("evaluate expression: " + _exprStr);
- if(isExpression) {
+ if(_isExpression) {
if(DEBUG_ENABLED)
- _logger.debug("atoimc expression");
+ LOGGER.debug("atoimc expression");
- return atomicExpression.evaluate(vr);
+ return _atomicExpression.evaluate(vr);
} else {
StringBuffer buf = new StringBuffer();
- for(int i = 0; i < terms.size(); i++) {
+ for(int i = 0; i < _terms.size(); i++) {
if(DEBUG_ENABLED)
- _logger.debug("term[" + i + "]: " + termArray[i].getClass().getName() +
- " expression string: " + termArray[i].getExpressionString());
+ LOGGER.debug("term[" + i + "]: " + _termArray[i].getClass().getName() +
+ " expression string: " + _termArray[i].getExpressionString());
- Object result = termArray[i].evaluate(vr);
+ Object result = _termArray[i].evaluate(vr);
buf.append(result != null ? result.toString() : EMPTY_STRING);
}
@@ -120,27 +119,27 @@
}
public void update(Object value, NetUIVariableResolver vr) {
- if(!isExpression) {
+ if(!_isExpression) {
String msg = "The expression can not be updated because it is not atomic.";
- if(_logger.isErrorEnabled())
- _logger.error(msg);
+ if(LOGGER.isErrorEnabled())
+ LOGGER.error(msg);
throw new RuntimeException(msg);
}
- atomicExpression.update(value, vr);
+ _atomicExpression.update(value, vr);
}
public String changeContext(String oldContext, String newContext, Object index) {
- if(!isExpression) {
+ if(!_isExpression) {
String msg = "The expression can not change context because it is not atomic.";
- if(_logger.isErrorEnabled())
- _logger.error(msg);
+ if(LOGGER.isErrorEnabled())
+ LOGGER.error(msg);
throw new RuntimeException(msg);
}
- return atomicExpression.changeContext(oldContext, newContext, index);
+ return _atomicExpression.changeContext(oldContext, newContext, index);
}
public String qualify(String contextName) {
@@ -151,15 +150,15 @@
// only call on atomic expressions
public String getExpressionString() {
- if(isExpression)
- return atomicExpression.getExpressionString();
+ if(_isExpression)
+ return _atomicExpression.getExpressionString();
else
- return exprStr;
+ return _exprStr;
}
public String toString() {
StringBuilder builder = new StringBuilder();
- for(Term term : terms)
+ for(Term term : _terms)
builder.append(term.toString());
return builder.toString();
}
Modified: incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/tokens/ArrayIndexToken.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/tokens/ArrayIndexToken.java?view=diff&r1=153872&r2=153873
==============================================================================
--- incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/tokens/ArrayIndexToken.java (original)
+++ incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/tokens/ArrayIndexToken.java Mon Feb 14 15:31:59 2005
@@ -17,59 +17,54 @@
*/
package org.apache.beehive.netui.script.el.tokens;
-// java imports
-
import java.util.List;
-// internal imports
import org.apache.beehive.netui.util.logging.Logger;
-// external imports
-
/**
*
*/
public class ArrayIndexToken
extends ExpressionToken {
- private static final Logger _logger = Logger.getInstance(ArrayIndexToken.class);
+ private static final Logger LOGGER = Logger.getInstance(ArrayIndexToken.class);
- private int index;
+ private int _index;
public ArrayIndexToken(String identifier) {
- index = Integer.parseInt(identifier);
+ _index = Integer.parseInt(identifier);
}
public void update(Object root, Object newValue) {
if(root instanceof List)
- listUpdate((List)root, index, newValue);
+ listUpdate((List)root, _index, newValue);
else if(root.getClass().isArray())
- arrayUpdate(root, index, newValue);
+ arrayUpdate(root, _index, newValue);
else {
- RuntimeException re = new RuntimeException("The index \"" + index + "\" can not be used to look-up the type of a property" +
+ RuntimeException re = new RuntimeException("The _index \"" + _index + "\" can not be used to look-up the type of a property" +
" on an object that is not an array or list.");
- _logger.error("", re);
+ LOGGER.error("", re);
throw re;
}
}
public Object evaluate(Object value) {
if(value instanceof List)
- return listLookup((List)value, index);
+ return listLookup((List)value, _index);
else if(value.getClass().isArray())
- return arrayLookup(value, index);
+ return arrayLookup(value, _index);
else {
- RuntimeException re = new RuntimeException("The index \"" + index + "\" can not be used to look-up a property on an object that is not an array or list.");
- _logger.error("", re);
+ RuntimeException re = new RuntimeException("The _index \"" + _index + "\" can not be used to look-up a property on an object that is not an array or list.");
+ LOGGER.error("", re);
throw re;
}
}
public String getTokenString() {
- return "[" + index + "]";
+ return "[" + _index + "]";
}
public String toString() {
- return "" + index;
+ return "" + _index;
}
}
Modified: incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/tokens/ContextToken.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/tokens/ContextToken.java?view=diff&r1=153872&r2=153873
==============================================================================
--- incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/tokens/ContextToken.java (original)
+++ incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/tokens/ContextToken.java Mon Feb 14 15:31:59 2005
@@ -20,17 +20,17 @@
public class ContextToken
extends ExpressionToken {
- private String context = null;
+ private String _context = null;
public ContextToken(String context) {
- this.context = context;
+ _context = context;
}
public void update(Object value, Object newValue) {
}
public String getName() {
- return context;
+ return _context;
}
public Object evaluate(Object value) {
@@ -38,10 +38,10 @@
}
public String getTokenString() {
- return context;
+ return _context;
}
public String toString() {
- return context;
+ return _context;
}
}
Modified: incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/tokens/ExpressionToken.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/tokens/ExpressionToken.java?view=diff&r1=153872&r2=153873
==============================================================================
--- incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/tokens/ExpressionToken.java (original)
+++ incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/tokens/ExpressionToken.java Mon Feb 14 15:31:59 2005
@@ -32,9 +32,9 @@
*/
public abstract class ExpressionToken {
- private static final Logger _logger = Logger.getInstance(ArrayIndexToken.class);
+ private static final Logger LOGGER = Logger.getInstance(ArrayIndexToken.class);
- private static final PropertyCache cache = new PropertyCache();
+ private static final PropertyCache PROPERTY_CACHE = new PropertyCache();
public abstract Object evaluate(Object value);
@@ -48,26 +48,29 @@
* Property Lookup
*
*/
-
protected final Object mapLookup(Map map, Object identifier) {
- if(_logger.isDebugEnabled()) _logger.debug("mapLookup: " + identifier);
+ if(LOGGER.isDebugEnabled())
+ LOGGER.debug("mapLookup: " + identifier);
return map.get(identifier);
}
protected final Object beanLookup(Object bean, Object identifier) {
- if(_logger.isDebugEnabled()) _logger.debug("beanLookup: " + identifier);
+ if(LOGGER.isDebugEnabled())
+ LOGGER.debug("beanLookup: " + identifier);
- return ParseUtils.getProperty(bean, identifier.toString(), cache);
+ return ParseUtils.getProperty(bean, identifier.toString(), PROPERTY_CACHE);
}
protected final Object listLookup(List list, int index) {
- if(_logger.isDebugEnabled()) _logger.debug("listLookup: " + index);
+ if(LOGGER.isDebugEnabled())
+ LOGGER.debug("listLookup: " + index);
return list.get(index);
}
protected final Object arrayLookup(Object array, int index) {
- if(_logger.isDebugEnabled()) _logger.debug("arrayLookup: " + index);
+ if(LOGGER.isDebugEnabled())
+ LOGGER.debug("arrayLookup: " + index);
return Array.get(array, index);
}
@@ -98,7 +101,7 @@
String msg = "An error occurred setting a value at index \"" + index + "\" on an array with component types \"" +
elementType + "\". Cause: " + e.toString();
- if(_logger.isErrorEnabled()) _logger.error(msg);
+ if(LOGGER.isErrorEnabled()) LOGGER.error(msg);
throw new RuntimeException(msg);
}
}
@@ -140,18 +143,18 @@
(list != null ? (" of size " + list.size()) : "null") + ". " +
"Be sure to allocate enough items in the List to accomodate any updates which may occur against the list.";
- if(_logger.isErrorEnabled()) _logger.error(msg);
+ if(LOGGER.isErrorEnabled()) LOGGER.error(msg);
throw new RuntimeException(msg);
}
}
protected final void beanUpdate(Object bean, Object identifier, Object value) {
- if(_logger.isDebugEnabled()) _logger.debug("Update \"" + bean + "\" type field/property \"" + identifier + "\"");
+ if(LOGGER.isDebugEnabled()) LOGGER.debug("Update \"" + bean + "\" type field/property \"" + identifier + "\"");
String id = identifier.toString();
Class beanType = bean.getClass();
- Field f = cache.getField(beanType, id);
+ Field f = PROPERTY_CACHE.getField(beanType, id);
if(f != null) {
Class targetType = f.getType();
try {
@@ -161,7 +164,8 @@
return;
} else {
- if(_logger.isDebugEnabled()) _logger.debug("Apply value via field: " + f);
+ if(LOGGER.isDebugEnabled())
+ LOGGER.debug("Apply value via field: " + f);
Object converted = ParseUtils.convertType(value, targetType);
f.set(bean, converted);
@@ -170,26 +174,28 @@
}
} catch(Exception e) {
String msg = "Could not update field named \"" + id + "\" on bean of type \"" + beanType + "\". Cause: " + e;
- if(_logger.isErrorEnabled()) _logger.error(msg, e);
+ if(LOGGER.isErrorEnabled())
+ LOGGER.error(msg, e);
throw new RuntimeException(msg, e);
}
}
- Class propType = cache.getPropertyType(beanType, id);
+ Class propType = PROPERTY_CACHE.getPropertyType(beanType, id);
if(propType != null) {
try {
if(java.util.List.class.isAssignableFrom(propType)) {
- Method lm = cache.getPropertyGetter(beanType, id);
+ Method lm = PROPERTY_CACHE.getPropertyGetter(beanType, id);
if(lm != null) {
List list = (List)lm.invoke(bean, (Object[])null);
applyValuesToList(value, list);
return;
}
} else {
- Method m = cache.getPropertySetter(beanType, id);
+ Method m = PROPERTY_CACHE.getPropertySetter(beanType, id);
if(m != null) {
- if(_logger.isDebugEnabled()) _logger.debug("Apply value to property via method: " + m);
+ if(LOGGER.isDebugEnabled())
+ LOGGER.debug("Apply value to property via method: " + m);
Class targetType = m.getParameterTypes()[0];
Object converted = ParseUtils.convertType(value, targetType);
@@ -200,7 +206,8 @@
}
} catch(Exception e) {
String msg = "Could not update proprety named \"" + id + "\" on bean of type \"" + beanType + "\". Cause: " + e;
- if(_logger.isErrorEnabled()) _logger.error(msg, e);
+ if(LOGGER.isErrorEnabled())
+ LOGGER.error(msg, e);
throw new RuntimeException(msg, e);
}
}
@@ -208,7 +215,8 @@
String msg = "Could not update expression because a public field named \"" + id + "\" or setter for the property \"" +
identifier + "\" could not be found.";
- if(_logger.isErrorEnabled()) _logger.error(msg);
+ if(LOGGER.isErrorEnabled())
+ LOGGER.error(msg);
throw new RuntimeException(msg);
}
@@ -219,7 +227,8 @@
} catch(Exception e) {
String msg = "Error performing an array look-up with the index \"" + identifier + "\". Cause: " + e;
- if(_logger.isDebugEnabled()) _logger.debug(msg, e);
+ if(LOGGER.isDebugEnabled())
+ LOGGER.debug(msg, e);
throw new RuntimeException(msg, e);
}
@@ -228,7 +237,8 @@
private static final void applyValuesToList(Object value, List list) {
if(list == null) {
String msg = "Can not add a field onto a null java.util.List";
- if(_logger.isErrorEnabled()) _logger.error(msg);
+ if(LOGGER.isErrorEnabled())
+ LOGGER.error(msg);
throw new RuntimeException(msg);
}
@@ -242,7 +252,6 @@
list.add(value);
}
// types that are not String[] or String are just set on the object
- else
- list.add(value);
+ else list.add(value);
}
}
Modified: incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/tokens/IdentifierToken.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/tokens/IdentifierToken.java?view=diff&r1=153872&r2=153873
==============================================================================
--- incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/tokens/IdentifierToken.java (original)
+++ incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/tokens/IdentifierToken.java Mon Feb 14 15:31:59 2005
@@ -17,12 +17,9 @@
*/
package org.apache.beehive.netui.script.el.tokens;
-// java imports
-
import java.util.List;
import java.util.Map;
-// internal imports
import org.apache.beehive.netui.util.logging.Logger;
/**
@@ -31,67 +28,70 @@
public class IdentifierToken
extends ExpressionToken {
- private static final Logger _logger = Logger.getInstance(IdentifierToken.class);
- private static final boolean debugEnabled = _logger.isDebugEnabled();
+ private static final Logger LOGGER = Logger.getInstance(IdentifierToken.class);
+ private static final boolean DEBUG_ENABLED = LOGGER.isDebugEnabled();
- private String identifier = null;
+ private String _identifier = null;
public IdentifierToken(String identifier) {
- this.identifier = identifier;
+ _identifier = identifier;
}
public Object evaluate(Object value) {
- // @TODO: error handling
+ /* todo: error handling */
if(value == null) {
- String msg = "Can not evaluate the identifier \"" + identifier + "\" on a null value object.";
- if(_logger.isErrorEnabled()) _logger.error(msg);
+ String msg = "Can not evaluate the _identifier \"" + _identifier + "\" on a null value object.";
+ if(LOGGER.isErrorEnabled())
+ LOGGER.error(msg);
throw new RuntimeException(msg);
}
- if(debugEnabled) {
- _logger.debug("evaluate: " + identifier);
- _logger.debug("value type: " + value.getClass().getName());
+ if(DEBUG_ENABLED) {
+ LOGGER.debug("evaluate: " + _identifier);
+ LOGGER.debug("value type: " + value.getClass().getName());
}
if(value instanceof Map) {
- return mapLookup((Map)value, identifier);
+ return mapLookup((Map)value, _identifier);
} else if(value instanceof List) {
- int i = parseIndex(identifier);
+ int i = parseIndex(_identifier);
return listLookup((List)value, i);
} else if(value.getClass().isArray()) {
- int i = parseIndex(identifier);
+ int i = parseIndex(_identifier);
return arrayLookup(value, i);
} else
- return beanLookup(value, identifier);
+ return beanLookup(value, _identifier);
}
public void update(Object root, Object newValue) {
- // @TODO: error handling
+ /* todo: error handling */
if(root == null) {
- String msg = "Can not update the identifier \"" + identifier + "\" on a null value object.";
- if(_logger.isErrorEnabled()) _logger.error(msg);
+ String msg = "Can not update the _identifier \"" + _identifier + "\" on a null value object.";
+ if(LOGGER.isErrorEnabled())
+ LOGGER.error(msg);
throw new RuntimeException(msg);
}
- if(debugEnabled) _logger.debug("Update identifier \"" + identifier + "\" on object of type: \"" + root.getClass().getName() + "\"");
+ if(DEBUG_ENABLED)
+ LOGGER.debug("Update _identifier \"" + _identifier + "\" on object of type: \"" + root.getClass().getName() + "\"");
if(root instanceof Map)
- mapUpdate((Map)root, identifier, newValue);
+ mapUpdate((Map)root, _identifier, newValue);
else if(root instanceof List) {
- int i = parseIndex(identifier);
+ int i = parseIndex(_identifier);
listUpdate((List)root, i, newValue);
} else if(root.getClass().isArray()) {
- int i = parseIndex(identifier);
+ int i = parseIndex(_identifier);
arrayUpdate(root, i, newValue);
} else
- beanUpdate(root, identifier, newValue);
+ beanUpdate(root, _identifier, newValue);
}
public String getTokenString() {
- return "." + identifier;
+ return "." + _identifier;
}
public String toString() {
- return identifier;
+ return _identifier;
}
}
Modified: incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/tokens/MapKeyToken.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/tokens/MapKeyToken.java?view=diff&r1=153872&r2=153873
==============================================================================
--- incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/tokens/MapKeyToken.java (original)
+++ incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/tokens/MapKeyToken.java Mon Feb 14 15:31:59 2005
@@ -17,35 +17,30 @@
*/
package org.apache.beehive.netui.script.el.tokens;
-// java imports
-
import java.util.Map;
-// internal imports
import org.apache.beehive.netui.util.logging.Logger;
-// external imports
-
/**
*
*/
public class MapKeyToken
extends ExpressionToken {
- private static final Logger _logger = Logger.getInstance(MapKeyToken.class);
+ private static final Logger LOGGER = Logger.getInstance(MapKeyToken.class);
- private String identifier = null;
- private boolean dblQuote = false;
+ private String _identifier = null;
+ private boolean _dblQuote = false;
public MapKeyToken(String identifier) {
- this.identifier = identifier;
+ this._identifier = identifier;
if(identifier.startsWith("\""))
- dblQuote = true;
+ _dblQuote = true;
// convert the Java string to an EcmaScript string. Strip the quotes that exist because they're
// always there for this token.
- this.identifier = convertToEcmaScriptString(this.identifier.substring(1, identifier.length() - 1));
+ this._identifier = convertToEcmaScriptString(this._identifier.substring(1, identifier.length() - 1));
}
/**
@@ -85,33 +80,33 @@
buf.append(c);
}
- if(_logger.isDebugEnabled()) _logger.debug("new identifier: " + buf.toString());
+ if(LOGGER.isDebugEnabled()) LOGGER.debug("new _identifier: " + buf.toString());
return buf.toString();
}
public void update(Object root, Object newValue) {
if(root instanceof Map)
- mapUpdate((Map)root, identifier, newValue);
+ mapUpdate((Map)root, _identifier, newValue);
else
- beanUpdate(root, identifier, newValue);
+ beanUpdate(root, _identifier, newValue);
}
public Object evaluate(Object value) {
if(value instanceof Map)
- return mapLookup((Map)value, identifier);
+ return mapLookup((Map)value, _identifier);
else
- return beanLookup(value, identifier);
+ return beanLookup(value, _identifier);
}
public String getTokenString() {
- if(dblQuote)
- return "[\"" + identifier + "\"]";
+ if(_dblQuote)
+ return "[\"" + _identifier + "\"]";
else
- return "['" + identifier + "']";
+ return "['" + _identifier + "']";
}
public String toString() {
- return identifier;
+ return _identifier;
}
}
Modified: incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/util/AbstractAttributeMap.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/util/AbstractAttributeMap.java?view=diff&r1=153872&r2=153873
==============================================================================
--- incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/util/AbstractAttributeMap.java (original)
+++ incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/util/AbstractAttributeMap.java Mon Feb 14 15:31:59 2005
@@ -17,25 +17,19 @@
*/
package org.apache.beehive.netui.script.el.util;
-// java imports
-
import java.util.Collection;
import java.util.Enumeration;
import java.util.HashMap;
import java.util.Map;
import java.util.Set;
-// internal imports
-
-// external imports
-
/**
*
*/
public abstract class AbstractAttributeMap
implements Map {
- private Map map = null;
+ private Map _map = null;
protected abstract Object getValue(Object key);
@@ -91,30 +85,22 @@
}
private Map getMap() {
- if(map == null)
- map = convertToMap();
+ if(_map == null)
+ _map = convertToMap();
- return map;
+ return _map;
}
private Map convertToMap() {
- if(map == null)
- map = new HashMap();
+ if(_map == null)
+ _map = new HashMap();
- // why are we still stuck on enums?
Enumeration keys = getKeysEnumeration();
while(keys.hasMoreElements()) {
Object key = keys.nextElement();
- map.put(key, getValue(key));
+ _map.put(key, getValue(key));
}
-// Iterator keys = map.getKeys();
-// while(keys.hasNext())
-// {
-// Object key = keys.next();
-// map.put(key, getValue(key))
-// }
-
- return map;
+ return _map;
}
}
Modified: incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/util/BindingContext.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/util/BindingContext.java?view=diff&r1=153872&r2=153873
==============================================================================
--- incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/util/BindingContext.java (original)
+++ incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/util/BindingContext.java Mon Feb 14 15:31:59 2005
@@ -17,12 +17,6 @@
*/
package org.apache.beehive.netui.script.el.util;
-// java imports
-
-// internal imports
-
-// external imports
-
/**
*
*/
Modified: incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/util/ParseUtils.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/util/ParseUtils.java?view=diff&r1=153872&r2=153873
==============================================================================
--- incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/util/ParseUtils.java (original)
+++ incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/util/ParseUtils.java Mon Feb 14 15:31:59 2005
@@ -38,7 +38,7 @@
*/
public class ParseUtils {
- private static final Logger _logger = Logger.getInstance(ParseUtils.class);
+ private static final Logger LOGGER = Logger.getInstance(ParseUtils.class);
private static final HashMap<String, ParsedExpression> PARSED_CACHE =
new HashMap<String, ParsedExpression>();
@@ -67,13 +67,13 @@
return expr;
} catch(ParseException e) {
String msg = "Error occurred parsing expression \"" + exprStr + "\".";
- if(_logger.isErrorEnabled())
- _logger.error(msg, e);
+ if(LOGGER.isErrorEnabled())
+ LOGGER.error(msg, e);
throw new ExpressionParseException(msg, e);
} catch(TokenMgrError tm) {
String msg = "Error occurred parsing expression \"" + exprStr + "\".";
- if(_logger.isErrorEnabled())
- _logger.error(msg, tm);
+ if(LOGGER.isErrorEnabled())
+ LOGGER.error(msg, tm);
throw new ExpressionParseException(msg, tm);
}
}
@@ -103,8 +103,8 @@
if(m == null) {
String msg = "Can not find setter method for property \"" + name + "\" on object of type \"" + value.getClass() + "\".";
- if(_logger.isErrorEnabled())
- _logger.error(msg);
+ if(LOGGER.isErrorEnabled())
+ LOGGER.error(msg);
throw new RuntimeException(msg);
}
// PropertyCache guarantees that props are found and match JavaBean naming rules
@@ -126,8 +126,8 @@
return f.get(value);
} catch(Exception e) {
String msg = "An error occurred evaluating the field \"" + name + "\" on an object of type \"" + type + "\".";
- if(_logger.isDebugEnabled())
- _logger.debug(msg, e);
+ if(LOGGER.isDebugEnabled())
+ LOGGER.debug(msg, e);
throw new RuntimeException(msg, e);
}
}
@@ -138,14 +138,14 @@
return m.invoke(value, (Object[])null);
} catch(Exception e) {
String msg = "An error occurred invoking a getter for the property \"" + name + "\" on an object of type \"" + type + "\".";
- if(_logger.isDebugEnabled()) _logger.debug(msg, e);
+ if(LOGGER.isDebugEnabled()) LOGGER.debug(msg, e);
throw new RuntimeException(msg, e);
}
}
String msg = "Could not find property or field \"" + name + "\" on object of type \"" + type + "\"";
- if(_logger.isDebugEnabled())
- _logger.debug(msg);
+ if(LOGGER.isDebugEnabled())
+ LOGGER.debug(msg);
throw new RuntimeException(msg);
}
@@ -180,8 +180,8 @@
o = TypeUtils.convertToObject(strs[i], compType);
} catch(IllegalArgumentException e) {
String msg = "Can not set Object types via expressions that are not supported by the set of registered type converters. Cause: " + e;
- if(_logger.isErrorEnabled())
- _logger.error(msg, e);
+ if(LOGGER.isErrorEnabled())
+ LOGGER.error(msg, e);
throw new RuntimeException(msg, e);
}
@@ -193,8 +193,8 @@
}
// convert the String into its target type and return the result
else {
- if(_logger.isDebugEnabled())
- _logger.debug("convert value \"" + value + "\" to type: " + toType);
+ if(LOGGER.isDebugEnabled())
+ LOGGER.debug("convert value \"" + value + "\" to type: " + toType);
// If the "value" is multi-valued (String[]), it needs to be converted into a single-valued object.
// There is no policy defined for how we do this right now, so the first one will always win when
@@ -213,15 +213,15 @@
return TypeUtils.convertToObject((String)value, toType);
} catch(IllegalArgumentException e) {
String msg = "The type \"" + toType.getName() + "\" can not be set through XScript with the update value \"" + value + "\"";
- if(_logger.isErrorEnabled())
- _logger.error(msg, e);
+ if(LOGGER.isErrorEnabled())
+ LOGGER.error(msg, e);
throw new RuntimeException(msg, e);
}
}
} catch(Exception e) {
String msg = "Unable to convert a value of type \"" + value.getClass() + "\" to the array element type of \"" + toType + "\". Cause: " + e;
- if(_logger.isErrorEnabled())
- _logger.error(msg, e);
+ if(LOGGER.isErrorEnabled())
+ LOGGER.error(msg, e);
throw new RuntimeException(msg, e);
}
}
Modified: incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/util/RequestAttributeMap.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/util/RequestAttributeMap.java?view=diff&r1=153872&r2=153873
==============================================================================
--- incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/util/RequestAttributeMap.java (original)
+++ incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/util/RequestAttributeMap.java Mon Feb 14 15:31:59 2005
@@ -27,30 +27,30 @@
extends AbstractAttributeMap
implements BindingContext {
- private ServletRequest request = null;
+ private ServletRequest _request = null;
public RequestAttributeMap(ServletRequest request) {
- this.request = request;
+ _request = request;
}
public Object unwrap() {
- return request;
+ return _request;
}
protected Object getValue(Object key) {
- return request.getAttribute(key.toString());
+ return _request.getAttribute(key.toString());
}
protected Object putValue(Object key, Object value) {
String strKey = key.toString();
- Object prev = request.getAttribute(strKey);
+ Object prev = _request.getAttribute(strKey);
- request.setAttribute(strKey, value);
+ _request.setAttribute(strKey, value);
return prev;
}
protected Enumeration getKeysEnumeration() {
- return request.getAttributeNames();
+ return _request.getAttributeNames();
}
}
Modified: incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/util/SessionAttributeMap.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/util/SessionAttributeMap.java?view=diff&r1=153872&r2=153873
==============================================================================
--- incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/util/SessionAttributeMap.java (original)
+++ incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/util/SessionAttributeMap.java Mon Feb 14 15:31:59 2005
@@ -27,30 +27,30 @@
extends AbstractAttributeMap
implements BindingContext {
- private HttpSession session = null;
+ private HttpSession _session = null;
public SessionAttributeMap(HttpSession session) {
- this.session = session;
+ this._session = session;
}
public Object unwrap() {
- return session;
+ return _session;
}
protected Object getValue(Object key) {
- return session.getAttribute(key.toString());
+ return _session.getAttribute(key.toString());
}
protected Object putValue(Object key, Object value) {
String strKey = key.toString();
- Object prev = session.getAttribute(strKey);
+ Object prev = _session.getAttribute(strKey);
- session.setAttribute(strKey, value);
+ _session.setAttribute(strKey, value);
return prev;
}
protected Enumeration getKeysEnumeration() {
- return session.getAttributeNames();
+ return _session.getAttributeNames();
}
}