Author: sebb
Date: Fri Jan 2 10:56:30 2009
New Revision: 730811
URL: http://svn.apache.org/viewvc?rev=730811&view=rev
Log:
Add missing @Override markers; remove unnecessary casts
Modified:
commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/SCInstanceTest.java
commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/SCXMLTestHelper.java
commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/StatusTest.java
commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/TieBreakerTest.java
commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/TriggerEventTest.java
commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/env/AbstractSCXMLListenerTest.java
commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/env/SimpleContextTest.java
commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/env/StopWatch.java
commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/env/StopWatchDisplay.java
commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/env/StopWatchTest.java
commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/env/jexl/StaticMethodTest.java
commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/env/jsp/MockJspContext.java
commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/io/SCXMLParserTest.java
commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/issues/Issue62Test.java
commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/issues/Issue64Test.java
commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/model/ActionTest.java
commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/model/ActionsTest.java
commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/model/AssignTest.java
commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/model/CustomActionTest.java
commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/model/PathTest.java
commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/model/StateTest.java
commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/model/TransitionTest.java
commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/semantics/TransitionTargetComparatorTest.java
Modified:
commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/SCInstanceTest.java
URL:
http://svn.apache.org/viewvc/commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/SCInstanceTest.java?rev=730811&r1=730810&r2=730811&view=diff
==============================================================================
---
commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/SCInstanceTest.java
(original)
+++
commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/SCInstanceTest.java
Fri Jan 2 10:56:30 2009
@@ -47,6 +47,7 @@
private SCInstance instance;
+ @Override
public void setUp() {
instance = new SCInstance(null);
}
Modified:
commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/SCXMLTestHelper.java
URL:
http://svn.apache.org/viewvc/commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/SCXMLTestHelper.java?rev=730811&r1=730810&r2=730811&view=diff
==============================================================================
---
commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/SCXMLTestHelper.java
(original)
+++
commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/SCXMLTestHelper.java
Fri Jan 2 10:56:30 2009
@@ -183,7 +183,7 @@
public static TransitionTarget lookupTransitionTarget(SCXMLExecutor exec,
String id) {
- return (TransitionTarget) exec.getStateMachine().getTargets().get(id);
+ return exec.getStateMachine().getTargets().get(id);
}
public static Context lookupContext(SCXMLExecutor exec,
Modified:
commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/StatusTest.java
URL:
http://svn.apache.org/viewvc/commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/StatusTest.java?rev=730811&r1=730810&r2=730811&view=diff
==============================================================================
---
commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/StatusTest.java
(original)
+++
commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/StatusTest.java
Fri Jan 2 10:56:30 2009
@@ -41,6 +41,7 @@
private Status status;
+ @Override
public void setUp() {
status = new Status();
}
Modified:
commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/TieBreakerTest.java
URL:
http://svn.apache.org/viewvc/commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/TieBreakerTest.java?rev=730811&r1=730810&r2=730811&view=diff
==============================================================================
---
commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/TieBreakerTest.java
(original)
+++
commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/TieBreakerTest.java
Fri Jan 2 10:56:30 2009
@@ -60,6 +60,7 @@
/**
* Set up instance variables required by this test case.
*/
+ @Override
public void setUp() {
tiebreaker01 = this.getClass().getClassLoader().
getResource("org/apache/commons/scxml/tie-breaker-01.xml");
@@ -78,6 +79,7 @@
/**
* Tear down instance variables required by this test case.
*/
+ @Override
public void tearDown() {
tiebreaker01 = tiebreaker02 = tiebreaker03 = tiebreaker04 =
tiebreaker05 = tiebreaker06 = null;
Modified:
commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/TriggerEventTest.java
URL:
http://svn.apache.org/viewvc/commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/TriggerEventTest.java?rev=730811&r1=730810&r2=730811&view=diff
==============================================================================
---
commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/TriggerEventTest.java
(original)
+++
commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/TriggerEventTest.java
Fri Jan 2 10:56:30 2009
@@ -49,6 +49,7 @@
/**
* Set up instance variables required by this test case.
*/
+ @Override
public void setUp() {
payloadData = new HashMap<String, String>();
payloadData.put("property1", "value1");
@@ -66,6 +67,7 @@
/**
* Tear down instance variables required by this test case.
*/
+ @Override
public void tearDown() {
payloadData.clear();
payloadData = null;
Modified:
commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/env/AbstractSCXMLListenerTest.java
URL:
http://svn.apache.org/viewvc/commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/env/AbstractSCXMLListenerTest.java?rev=730811&r1=730810&r2=730811&view=diff
==============================================================================
---
commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/env/AbstractSCXMLListenerTest.java
(original)
+++
commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/env/AbstractSCXMLListenerTest.java
Fri Jan 2 10:56:30 2009
@@ -48,6 +48,7 @@
/**
* Set up instance variables required by this test case.
*/
+ @Override
public void setUp() {
to = new State();
from = new State();
@@ -60,6 +61,7 @@
/**
* Tear down instance variables required by this test case.
*/
+ @Override
public void tearDown() {
to = null;
from = null;
@@ -71,6 +73,7 @@
/**
* @see SCXMLListener#onEntry(TransitionTarget)
*/
+ @Override
public void onEntry(TransitionTarget state) {
heardOnEntry = true;
}
@@ -78,6 +81,7 @@
/**
* @see SCXMLListener#onExit(TransitionTarget)
*/
+ @Override
public void onExit(TransitionTarget state) {
heardOnExit = true;
}
@@ -85,6 +89,7 @@
/**
* @see
SCXMLListener#onTransition(TransitionTarget,TransitionTarget,Transition)
*/
+ @Override
public void onTransition(TransitionTarget from,
TransitionTarget to,
Transition transition) {
heardOnTransition = true;
@@ -107,6 +112,7 @@
/**
* @see SCXMLListener#onEntry(TransitionTarget)
*/
+ @Override
public void onEntry(TransitionTarget state) {
heardOnEntry = true;
}
@@ -114,6 +120,7 @@
/**
* @see SCXMLListener#onExit(TransitionTarget)
*/
+ @Override
public void onExit(TransitionTarget state) {
heardOnExit = true;
}
@@ -135,6 +142,7 @@
/**
* @see SCXMLListener#onEntry(TransitionTarget)
*/
+ @Override
public void onEntry(TransitionTarget state) {
heardOnEntry = true;
}
Modified:
commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/env/SimpleContextTest.java
URL:
http://svn.apache.org/viewvc/commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/env/SimpleContextTest.java?rev=730811&r1=730810&r2=730811&view=diff
==============================================================================
---
commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/env/SimpleContextTest.java
(original)
+++
commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/env/SimpleContextTest.java
Fri Jan 2 10:56:30 2009
@@ -40,6 +40,7 @@
private SimpleContext context;
+ @Override
protected void setUp() throws Exception {
context = new SimpleContext();
}
Modified:
commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/env/StopWatch.java
URL:
http://svn.apache.org/viewvc/commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/env/StopWatch.java?rev=730811&r1=730810&r2=730811&view=diff
==============================================================================
---
commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/env/StopWatch.java
(original)
+++
commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/env/StopWatch.java
Fri Jan 2 10:56:30 2009
@@ -67,6 +67,7 @@
if (timer == null) {
timer = new Timer(true);
timer.scheduleAtFixedRate(new TimerTask() {
+ @Override
public void run() {
increment();
}
Modified:
commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/env/StopWatchDisplay.java
URL:
http://svn.apache.org/viewvc/commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/env/StopWatchDisplay.java?rev=730811&r1=730810&r2=730811&view=diff
==============================================================================
---
commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/env/StopWatchDisplay.java
(original)
+++
commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/env/StopWatchDisplay.java
Fri Jan 2 10:56:30 2009
@@ -112,6 +112,7 @@
setDefaultCloseOperation(EXIT_ON_CLOSE);
Timer displayTimer = new Timer();
displayTimer.scheduleAtFixedRate(new TimerTask() {
+ @Override
public void run() {
display.setText(DISPLAY_PREFIX + stopWatch.getDisplay()
+ DISPLAY_SUFFIX);
@@ -134,6 +135,7 @@
class WatchPanel extends JPanel {
private static final long serialVersionUID = 1L;
+ @Override
public void paintComponent(Graphics g) {
if(watchImage != null) {
g.drawImage(watchImage,0,0,this.getWidth(),this.getHeight(),this);
Modified:
commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/env/StopWatchTest.java
URL:
http://svn.apache.org/viewvc/commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/env/StopWatchTest.java?rev=730811&r1=730810&r2=730811&view=diff
==============================================================================
---
commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/env/StopWatchTest.java
(original)
+++
commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/env/StopWatchTest.java
Fri Jan 2 10:56:30 2009
@@ -41,6 +41,7 @@
/**
* Set up instance variables required by this test case.
*/
+ @Override
public void setUp() {
stopWatch = new StopWatch();
}
@@ -48,6 +49,7 @@
/**
* Tear down instance variables required by this test case.
*/
+ @Override
public void tearDown() {
stopWatch = null;
}
Modified:
commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/env/jexl/StaticMethodTest.java
URL:
http://svn.apache.org/viewvc/commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/env/jexl/StaticMethodTest.java?rev=730811&r1=730810&r2=730811&view=diff
==============================================================================
---
commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/env/jexl/StaticMethodTest.java
(original)
+++
commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/env/jexl/StaticMethodTest.java
Fri Jan 2 10:56:30 2009
@@ -48,6 +48,7 @@
/**
* Set up instance variables required by this test case.
*/
+ @Override
public void setUp() {
staticmethod = this.getClass().getClassLoader().
getResource("org/apache/commons/scxml/env/jexl/static-method.xml");
@@ -56,6 +57,7 @@
/**
* Tear down instance variables required by this test case.
*/
+ @Override
public void tearDown() {
staticmethod = null;
}
Modified:
commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/env/jsp/MockJspContext.java
URL:
http://svn.apache.org/viewvc/commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/env/jsp/MockJspContext.java?rev=730811&r1=730810&r2=730811&view=diff
==============================================================================
---
commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/env/jsp/MockJspContext.java
(original)
+++
commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/env/jsp/MockJspContext.java
Fri Jan 2 10:56:30 2009
@@ -35,42 +35,54 @@
super();
vars = new HashMap<String, Object>();
}
+ @Override
public void setAttribute(String name, Object value) {
vars.put(name, value);
}
+ @Override
public void setAttribute(String name, Object value, int scope) {
setAttribute(name, value);
}
+ @Override
public Object getAttribute(String name) {
return vars.get(name);
}
+ @Override
public Object getAttribute(String name, int scope) {
return getAttribute(name);
}
+ @Override
public void removeAttribute(String name) {
vars.remove(name);
}
+ @Override
public void removeAttribute(String name, int scope) {
removeAttribute(name);
}
+ @Override
public Object findAttribute(String name) {
return getAttribute(name);
}
+ @Override
public VariableResolver getVariableResolver() {
return this;
}
public Object resolveVariable(String name) {
return getAttribute(name);
}
+ @Override
public ExpressionEvaluator getExpressionEvaluator() {
return null;
}
+ @Override
public int getAttributesScope(String name) {
return 1;
}
+ @Override
public Enumeration<String> getAttributeNamesInScope(int scope) {
return null;
}
+ @Override
public JspWriter getOut() {
return null;
}
Modified:
commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/io/SCXMLParserTest.java
URL:
http://svn.apache.org/viewvc/commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/io/SCXMLParserTest.java?rev=730811&r1=730810&r2=730811&view=diff
==============================================================================
---
commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/io/SCXMLParserTest.java
(original)
+++
commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/io/SCXMLParserTest.java
Fri Jan 2 10:56:30 2009
@@ -58,6 +58,7 @@
/**
* Set up instance variables required by this test case.
*/
+ @Override
public void setUp() {
microwave01 = this.getClass().getClassLoader().
getResource("org/apache/commons/scxml/env/jsp/microwave-01.xml");
@@ -80,6 +81,7 @@
/**
* Tear down instance variables required by this test case.
*/
+ @Override
public void tearDown() {
microwave01 = microwave02 = microwave03 = microwave04 = transitions01
= prefix01 = send01 = null;
scxml = null;
@@ -138,7 +140,7 @@
assertEquals("ten", ten.getId());
List<Transition> ten_done = ten.getTransitionsList("ten.done");
assertEquals(1, ten_done.size());
- Transition ten2twenty = (Transition) ten_done.get(0);
+ Transition ten2twenty = ten_done.get(0);
List<Action> actions = ten2twenty.getActions();
assertEquals(1, actions.size());
Send send = (Send) actions.get(0);
Modified:
commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/issues/Issue62Test.java
URL:
http://svn.apache.org/viewvc/commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/issues/Issue62Test.java?rev=730811&r1=730810&r2=730811&view=diff
==============================================================================
---
commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/issues/Issue62Test.java
(original)
+++
commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/issues/Issue62Test.java
Fri Jan 2 10:56:30 2009
@@ -50,6 +50,7 @@
/**
* Set up instance variables required by this test case.
*/
+ @Override
public void setUp() {
test01 = this.getClass().getClassLoader().
getResource("org/apache/commons/scxml/issues/issue62-01.xml");
@@ -62,6 +63,7 @@
/**
* Tear down instance variables required by this test case.
*/
+ @Override
public void tearDown() {
test01 = test02 = null;
exec = null;
Modified:
commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/issues/Issue64Test.java
URL:
http://svn.apache.org/viewvc/commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/issues/Issue64Test.java?rev=730811&r1=730810&r2=730811&view=diff
==============================================================================
---
commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/issues/Issue64Test.java
(original)
+++
commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/issues/Issue64Test.java
Fri Jan 2 10:56:30 2009
@@ -48,6 +48,7 @@
/**
* Set up instance variables required by this test case.
*/
+ @Override
public void setUp() {
works = this.getClass().getClassLoader().
getResource("org/apache/commons/scxml/issues/issue64-01.xml");
@@ -58,6 +59,7 @@
/**
* Tear down instance variables required by this test case.
*/
+ @Override
public void tearDown() {
works = fails = null;
exec = null;
Modified:
commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/model/ActionTest.java
URL:
http://svn.apache.org/viewvc/commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/model/ActionTest.java?rev=730811&r1=730810&r2=730811&view=diff
==============================================================================
---
commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/model/ActionTest.java
(original)
+++
commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/model/ActionTest.java
Fri Jan 2 10:56:30 2009
@@ -37,6 +37,7 @@
private Action action;
+ @Override
public void setUp() {
action = new Assign();
}
Modified:
commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/model/ActionsTest.java
URL:
http://svn.apache.org/viewvc/commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/model/ActionsTest.java?rev=730811&r1=730810&r2=730811&view=diff
==============================================================================
---
commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/model/ActionsTest.java
(original)
+++
commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/model/ActionsTest.java
Fri Jan 2 10:56:30 2009
@@ -62,6 +62,7 @@
/**
* Set up instance variables required by this test case.
*/
+ @Override
public void setUp() {
actionsSample01 = this.getClass().getClassLoader().
getResource("org/apache/commons/scxml/model/actions-state-test.xml");
@@ -76,6 +77,7 @@
/**
* Tear down instance variables required by this test case.
*/
+ @Override
public void tearDown() {
actionsSample01 = actionsSample02 = actionsSample03 = null;
evaluator = null;
Modified:
commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/model/AssignTest.java
URL:
http://svn.apache.org/viewvc/commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/model/AssignTest.java?rev=730811&r1=730810&r2=730811&view=diff
==============================================================================
---
commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/model/AssignTest.java
(original)
+++
commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/model/AssignTest.java
Fri Jan 2 10:56:30 2009
@@ -51,6 +51,7 @@
/**
* Set up instance variables required by this test case.
*/
+ @Override
public void setUp() {
assign01 = this.getClass().getClassLoader().
getResource("org/apache/commons/scxml/model/assign-test-01.xml");
@@ -61,6 +62,7 @@
/**
* Tear down instance variables required by this test case.
*/
+ @Override
public void tearDown() {
assign01 = assign02 = null;
exec = null;
Modified:
commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/model/CustomActionTest.java
URL:
http://svn.apache.org/viewvc/commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/model/CustomActionTest.java?rev=730811&r1=730810&r2=730811&view=diff
==============================================================================
---
commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/model/CustomActionTest.java
(original)
+++
commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/model/CustomActionTest.java
Fri Jan 2 10:56:30 2009
@@ -49,6 +49,7 @@
/**
* Set up instance variables required by this test case.
*/
+ @Override
public void setUp() {
hello01 = this.getClass().getClassLoader().
getResource("org/apache/commons/scxml/hello-world.xml");
@@ -67,6 +68,7 @@
/**
* Tear down instance variables required by this test case.
*/
+ @Override
public void tearDown() {
hello01 = custom01 = external01 = payload01 = payload02 = null;
exec = null;
Modified:
commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/model/PathTest.java
URL:
http://svn.apache.org/viewvc/commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/model/PathTest.java?rev=730811&r1=730810&r2=730811&view=diff
==============================================================================
---
commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/model/PathTest.java
(original)
+++
commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/model/PathTest.java
Fri Jan 2 10:56:30 2009
@@ -226,7 +226,7 @@
Path path = new Path(source, target);
assertEquals(1, path.getRegionsExited().size());
- assertEquals("1", ((State)path.getRegionsExited().get(0)).getId());
+ assertEquals("1", (path.getRegionsExited().get(0)).getId());
}
public void testGetRegionsEnteredNull() {
@@ -272,7 +272,7 @@
Path path = new Path(source, target);
assertEquals(1, path.getRegionsEntered().size());
- assertEquals("2", ((State)path.getRegionsEntered().get(0)).getId());
+ assertEquals("2", (path.getRegionsEntered().get(0)).getId());
}
}
Modified:
commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/model/StateTest.java
URL:
http://svn.apache.org/viewvc/commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/model/StateTest.java?rev=730811&r1=730810&r2=730811&view=diff
==============================================================================
---
commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/model/StateTest.java
(original)
+++
commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/model/StateTest.java
Fri Jan 2 10:56:30 2009
@@ -46,12 +46,14 @@
private URL state01;
private SCXMLExecutor exec;
+ @Override
public void setUp() {
state = new State();
state01 = this.getClass().getClassLoader().
getResource("org/apache/commons/scxml/model/state-01.xml");
}
+ @Override
public void tearDown() {
state01 = null;
exec = null;
Modified:
commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/model/TransitionTest.java
URL:
http://svn.apache.org/viewvc/commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/model/TransitionTest.java?rev=730811&r1=730810&r2=730811&view=diff
==============================================================================
---
commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/model/TransitionTest.java
(original)
+++
commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/model/TransitionTest.java
Fri Jan 2 10:56:30 2009
@@ -37,6 +37,7 @@
private Transition transition;
+ @Override
public void setUp() {
transition = new Transition();
}
@@ -51,8 +52,7 @@
transition.setParent(state);
- assertEquals("1", ((TransitionTarget) transition.
- getRuntimeTargets().get(0)).getId());
+ assertEquals("1", (transition.getRuntimeTargets().get(0)).getId());
}
public void testGetRuntimeTarget() {
@@ -61,8 +61,7 @@
transition.getTargets().add(state);
- assertEquals("2", ((TransitionTarget) transition.
- getRuntimeTargets().get(0)).getId());
+ assertEquals("2", (transition.getRuntimeTargets().get(0)).getId());
}
public void testGetPath() {
Modified:
commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/semantics/TransitionTargetComparatorTest.java
URL:
http://svn.apache.org/viewvc/commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/semantics/TransitionTargetComparatorTest.java?rev=730811&r1=730810&r2=730811&view=diff
==============================================================================
---
commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/semantics/TransitionTargetComparatorTest.java
(original)
+++
commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/semantics/TransitionTargetComparatorTest.java
Fri Jan 2 10:56:30 2009
@@ -43,6 +43,7 @@
private Comparator<TransitionTarget> comparator;
+ @Override
public void setUp() {
comparator = new TransitionTargetComparator<TransitionTarget>();
}
