Author: rahul
Date: Tue Jan 8 11:33:40 2008
New Revision: 610105
URL: http://svn.apache.org/viewvc?rev=610105&view=rev
Log:
Type safety improvements.
Modified:
commons/proper/scxml/branches/J5/src/main/java/org/apache/commons/scxml/model/Assign.java
commons/proper/scxml/branches/J5/src/main/java/org/apache/commons/scxml/model/Cancel.java
commons/proper/scxml/branches/J5/src/main/java/org/apache/commons/scxml/model/ElseIf.java
commons/proper/scxml/branches/J5/src/main/java/org/apache/commons/scxml/model/Event.java
commons/proper/scxml/branches/J5/src/main/java/org/apache/commons/scxml/model/Exit.java
commons/proper/scxml/branches/J5/src/main/java/org/apache/commons/scxml/model/If.java
commons/proper/scxml/branches/J5/src/main/java/org/apache/commons/scxml/model/Log.java
commons/proper/scxml/branches/J5/src/main/java/org/apache/commons/scxml/model/Send.java
commons/proper/scxml/branches/J5/src/main/java/org/apache/commons/scxml/model/Var.java
Modified:
commons/proper/scxml/branches/J5/src/main/java/org/apache/commons/scxml/model/Assign.java
URL:
http://svn.apache.org/viewvc/commons/proper/scxml/branches/J5/src/main/java/org/apache/commons/scxml/model/Assign.java?rev=610105&r1=610104&r2=610105&view=diff
==============================================================================
---
commons/proper/scxml/branches/J5/src/main/java/org/apache/commons/scxml/model/Assign.java
(original)
+++
commons/proper/scxml/branches/J5/src/main/java/org/apache/commons/scxml/model/Assign.java
Tue Jan 8 11:33:40 2008
@@ -176,7 +176,7 @@
*/
public void execute(final EventDispatcher evtDispatcher,
final ErrorReporter errRep, final SCInstance scInstance,
- final Log appLog, final Collection derivedEvents)
+ final Log appLog, final Collection<TriggerEvent> derivedEvents)
throws ModelException, SCXMLExpressionException {
State parentState = getParentState();
Context ctx = scInstance.getContext(parentState);
Modified:
commons/proper/scxml/branches/J5/src/main/java/org/apache/commons/scxml/model/Cancel.java
URL:
http://svn.apache.org/viewvc/commons/proper/scxml/branches/J5/src/main/java/org/apache/commons/scxml/model/Cancel.java?rev=610105&r1=610104&r2=610105&view=diff
==============================================================================
---
commons/proper/scxml/branches/J5/src/main/java/org/apache/commons/scxml/model/Cancel.java
(original)
+++
commons/proper/scxml/branches/J5/src/main/java/org/apache/commons/scxml/model/Cancel.java
Tue Jan 8 11:33:40 2008
@@ -23,6 +23,7 @@
import org.apache.commons.scxml.EventDispatcher;
import org.apache.commons.scxml.SCInstance;
import org.apache.commons.scxml.SCXMLExpressionException;
+import org.apache.commons.scxml.TriggerEvent;
/**
* The class in this SCXML object model that corresponds to the
@@ -71,7 +72,7 @@
*/
public void execute(final EventDispatcher evtDispatcher,
final ErrorReporter errRep, final SCInstance scInstance,
- final Log appLog, final Collection derivedEvents)
+ final Log appLog, final Collection<TriggerEvent> derivedEvents)
throws ModelException, SCXMLExpressionException {
evtDispatcher.cancel(sendid);
}
Modified:
commons/proper/scxml/branches/J5/src/main/java/org/apache/commons/scxml/model/ElseIf.java
URL:
http://svn.apache.org/viewvc/commons/proper/scxml/branches/J5/src/main/java/org/apache/commons/scxml/model/ElseIf.java?rev=610105&r1=610104&r2=610105&view=diff
==============================================================================
---
commons/proper/scxml/branches/J5/src/main/java/org/apache/commons/scxml/model/ElseIf.java
(original)
+++
commons/proper/scxml/branches/J5/src/main/java/org/apache/commons/scxml/model/ElseIf.java
Tue Jan 8 11:33:40 2008
@@ -23,6 +23,7 @@
import org.apache.commons.scxml.EventDispatcher;
import org.apache.commons.scxml.SCInstance;
import org.apache.commons.scxml.SCXMLExpressionException;
+import org.apache.commons.scxml.TriggerEvent;
/**
* The class in this SCXML object model that corresponds to the
@@ -71,7 +72,7 @@
*/
public void execute(final EventDispatcher evtDispatcher,
final ErrorReporter errRep, final SCInstance scInstance,
- final Log appLog, final Collection derivedEvents)
+ final Log appLog, final Collection<TriggerEvent> derivedEvents)
throws ModelException, SCXMLExpressionException {
// nothing to do, the <if> container will take care of this
return;
Modified:
commons/proper/scxml/branches/J5/src/main/java/org/apache/commons/scxml/model/Event.java
URL:
http://svn.apache.org/viewvc/commons/proper/scxml/branches/J5/src/main/java/org/apache/commons/scxml/model/Event.java?rev=610105&r1=610104&r2=610105&view=diff
==============================================================================
---
commons/proper/scxml/branches/J5/src/main/java/org/apache/commons/scxml/model/Event.java
(original)
+++
commons/proper/scxml/branches/J5/src/main/java/org/apache/commons/scxml/model/Event.java
Tue Jan 8 11:33:40 2008
@@ -73,7 +73,7 @@
*/
public void execute(final EventDispatcher evtDispatcher,
final ErrorReporter errRep, final SCInstance scInstance,
- final Log appLog, final Collection derivedEvents)
+ final Log appLog, final Collection<TriggerEvent> derivedEvents)
throws ModelException, SCXMLExpressionException {
if (appLog.isDebugEnabled()) {
Modified:
commons/proper/scxml/branches/J5/src/main/java/org/apache/commons/scxml/model/Exit.java
URL:
http://svn.apache.org/viewvc/commons/proper/scxml/branches/J5/src/main/java/org/apache/commons/scxml/model/Exit.java?rev=610105&r1=610104&r2=610105&view=diff
==============================================================================
---
commons/proper/scxml/branches/J5/src/main/java/org/apache/commons/scxml/model/Exit.java
(original)
+++
commons/proper/scxml/branches/J5/src/main/java/org/apache/commons/scxml/model/Exit.java
Tue Jan 8 11:33:40 2008
@@ -23,6 +23,7 @@
import org.apache.commons.scxml.EventDispatcher;
import org.apache.commons.scxml.SCInstance;
import org.apache.commons.scxml.SCXMLExpressionException;
+import org.apache.commons.scxml.TriggerEvent;
/**
* The class in this SCXML object model that corresponds to the
@@ -95,7 +96,7 @@
*/
public void execute(final EventDispatcher evtDispatcher,
final ErrorReporter errRep, final SCInstance scInstance,
- final Log appLog, final Collection derivedEvents)
+ final Log appLog, final Collection<TriggerEvent> derivedEvents)
throws ModelException, SCXMLExpressionException {
// we're done
return;
Modified:
commons/proper/scxml/branches/J5/src/main/java/org/apache/commons/scxml/model/If.java
URL:
http://svn.apache.org/viewvc/commons/proper/scxml/branches/J5/src/main/java/org/apache/commons/scxml/model/If.java?rev=610105&r1=610104&r2=610105&view=diff
==============================================================================
---
commons/proper/scxml/branches/J5/src/main/java/org/apache/commons/scxml/model/If.java
(original)
+++
commons/proper/scxml/branches/J5/src/main/java/org/apache/commons/scxml/model/If.java
Tue Jan 8 11:33:40 2008
@@ -28,6 +28,7 @@
import org.apache.commons.scxml.EventDispatcher;
import org.apache.commons.scxml.SCInstance;
import org.apache.commons.scxml.SCXMLExpressionException;
+import org.apache.commons.scxml.TriggerEvent;
/**
* The class in this SCXML object model that corresponds to the
@@ -53,7 +54,7 @@
* The set of executable elements (those that inheriting from
* Action) that are contained in this <if> element.
*/
- private List actions;
+ private List<Action> actions;
/**
* The boolean value that dictates whether the particular child action
@@ -66,7 +67,7 @@
*/
public If() {
super();
- this.actions = new ArrayList();
+ this.actions = new ArrayList<Action>();
this.execute = false;
}
@@ -75,7 +76,7 @@
*
* @return Returns the actions.
*/
- public final List getActions() {
+ public final List<Action> getActions() {
return actions;
}
@@ -114,7 +115,7 @@
*/
public void execute(final EventDispatcher evtDispatcher,
final ErrorReporter errRep, final SCInstance scInstance,
- final Log appLog, final Collection derivedEvents)
+ final Log appLog, final Collection<TriggerEvent> derivedEvents)
throws ModelException, SCXMLExpressionException {
State parentState = getParentState();
Context ctx = scInstance.getContext(parentState);
Modified:
commons/proper/scxml/branches/J5/src/main/java/org/apache/commons/scxml/model/Log.java
URL:
http://svn.apache.org/viewvc/commons/proper/scxml/branches/J5/src/main/java/org/apache/commons/scxml/model/Log.java?rev=610105&r1=610104&r2=610105&view=diff
==============================================================================
---
commons/proper/scxml/branches/J5/src/main/java/org/apache/commons/scxml/model/Log.java
(original)
+++
commons/proper/scxml/branches/J5/src/main/java/org/apache/commons/scxml/model/Log.java
Tue Jan 8 11:33:40 2008
@@ -24,6 +24,7 @@
import org.apache.commons.scxml.EventDispatcher;
import org.apache.commons.scxml.SCInstance;
import org.apache.commons.scxml.SCXMLExpressionException;
+import org.apache.commons.scxml.TriggerEvent;
/**
* The class in this SCXML object model that corresponds to the
@@ -97,7 +98,7 @@
public void execute(final EventDispatcher evtDispatcher,
final ErrorReporter errRep, final SCInstance scInstance,
final org.apache.commons.logging.Log appLog,
- final Collection derivedEvents)
+ final Collection<TriggerEvent> derivedEvents)
throws ModelException, SCXMLExpressionException {
Context ctx = scInstance.getContext(getParentState());
Evaluator eval = scInstance.getEvaluator();
Modified:
commons/proper/scxml/branches/J5/src/main/java/org/apache/commons/scxml/model/Send.java
URL:
http://svn.apache.org/viewvc/commons/proper/scxml/branches/J5/src/main/java/org/apache/commons/scxml/model/Send.java?rev=610105&r1=610104&r2=610105&view=diff
==============================================================================
---
commons/proper/scxml/branches/J5/src/main/java/org/apache/commons/scxml/model/Send.java
(original)
+++
commons/proper/scxml/branches/J5/src/main/java/org/apache/commons/scxml/model/Send.java
Tue Jan 8 11:33:40 2008
@@ -33,6 +33,7 @@
import org.apache.commons.scxml.SCXMLHelper;
import org.apache.commons.scxml.TriggerEvent;
import org.apache.commons.scxml.semantics.ErrorConstants;
+import org.w3c.dom.Node;
/**
* The class in this SCXML object model that corresponds to the
@@ -93,7 +94,7 @@
/**
* The list of external nodes associated with this <send> element.
*/
- private List externalNodes;
+ private List<Node> externalNodes;
/**
* The type of event being generated.
@@ -115,7 +116,7 @@
*/
public Send() {
super();
- this.externalNodes = new ArrayList();
+ this.externalNodes = new ArrayList<Node>();
}
/**
@@ -141,7 +142,7 @@
*
* @return List Returns the list of externalnodes.
*/
- public final List getExternalNodes() {
+ public final List<Node> getExternalNodes() {
return externalNodes;
}
@@ -150,7 +151,7 @@
*
* @param externalNodes The externalnode to set.
*/
- public final void setExternalNodes(final List externalNodes) {
+ public final void setExternalNodes(final List<Node> externalNodes) {
this.externalNodes = externalNodes;
}
@@ -267,7 +268,7 @@
*/
public void execute(final EventDispatcher evtDispatcher,
final ErrorReporter errRep, final SCInstance scInstance,
- final Log appLog, final Collection derivedEvents)
+ final Log appLog, final Collection<TriggerEvent> derivedEvents)
throws ModelException, SCXMLExpressionException {
// Send attributes evaluation
State parentState = getParentState();
@@ -301,10 +302,10 @@
// must default to 'scxml' when unspecified
targettypeValue = TARGETTYPE_SCXML;
}
- Map params = null;
+ Map<String, Object> params = null;
if (!SCXMLHelper.isStringEmpty(namelist)) {
StringTokenizer tkn = new StringTokenizer(namelist);
- params = new HashMap(tkn.countTokens());
+ params = new HashMap<String, Object>(tkn.countTokens());
while (tkn.hasMoreTokens()) {
String varName = tkn.nextToken();
Object varObj = ctx.get(varName);
Modified:
commons/proper/scxml/branches/J5/src/main/java/org/apache/commons/scxml/model/Var.java
URL:
http://svn.apache.org/viewvc/commons/proper/scxml/branches/J5/src/main/java/org/apache/commons/scxml/model/Var.java?rev=610105&r1=610104&r2=610105&view=diff
==============================================================================
---
commons/proper/scxml/branches/J5/src/main/java/org/apache/commons/scxml/model/Var.java
(original)
+++
commons/proper/scxml/branches/J5/src/main/java/org/apache/commons/scxml/model/Var.java
Tue Jan 8 11:33:40 2008
@@ -99,7 +99,7 @@
*/
public void execute(final EventDispatcher evtDispatcher,
final ErrorReporter errRep, final SCInstance scInstance,
- final Log appLog, final Collection derivedEvents)
+ final Log appLog, final Collection<TriggerEvent> derivedEvents)
throws ModelException, SCXMLExpressionException {
Context ctx = scInstance.getContext(getParentState());
Evaluator eval = scInstance.getEvaluator();
