Author: rahul
Date: Wed Jan 9 10:46:31 2008
New Revision: 610507
URL: http://svn.apache.org/viewvc?rev=610507&view=rev
Log:
Type safety improvements.
Modified:
commons/proper/scxml/branches/J5/src/main/java/org/apache/commons/scxml/env/jexl/JexlEvaluator.java
Modified:
commons/proper/scxml/branches/J5/src/main/java/org/apache/commons/scxml/env/jexl/JexlEvaluator.java
URL:
http://svn.apache.org/viewvc/commons/proper/scxml/branches/J5/src/main/java/org/apache/commons/scxml/env/jexl/JexlEvaluator.java?rev=610507&r1=610506&r2=610507&view=diff
==============================================================================
---
commons/proper/scxml/branches/J5/src/main/java/org/apache/commons/scxml/env/jexl/JexlEvaluator.java
(original)
+++
commons/proper/scxml/branches/J5/src/main/java/org/apache/commons/scxml/env/jexl/JexlEvaluator.java
Wed Jan 9 10:46:31 2008
@@ -167,17 +167,17 @@
* document root.
*/
private JexlContext getEffectiveContext(final JexlContext nodeCtx) {
- List contexts = new ArrayList();
+ List<JexlContext> contexts = new ArrayList<JexlContext>();
// trace path to root
JexlContext currentCtx = nodeCtx;
while (currentCtx != null) {
contexts.add(currentCtx);
currentCtx = (JexlContext) currentCtx.getParent();
}
- Map vars = new HashMap();
+ Map<String, Object> vars = new HashMap<String, Object>();
// summation of the contexts, parent first, child wins
for (int i = contexts.size() - 1; i > -1; i--) {
- vars.putAll(((JexlContext) contexts.get(i)).getVars());
+ vars.putAll(contexts.get(i).getVars());
}
return new JexlContext(vars);
}