You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by gg...@apache.org on 2023/08/23 19:39:39 UTC
[commons-scxml] branch master updated: Add missing @Override
This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-scxml.git
The following commit(s) were added to refs/heads/master by this push:
new 7a2d359 Add missing @Override
7a2d359 is described below
commit 7a2d3594ec641cde5b51767a9dc1b524c6d4988a
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Wed Aug 23 15:39:34 2023 -0400
Add missing @Override
---
.../org/apache/commons/scxml2/SCInstanceObjectInputStream.java | 1 +
src/main/java/org/apache/commons/scxml2/SCXMLExecutor.java | 1 +
.../org/apache/commons/scxml2/env/AbstractBaseEvaluator.java | 1 +
.../org/apache/commons/scxml2/env/AbstractSCXMLListener.java | 3 +++
.../org/apache/commons/scxml2/env/AbstractStateMachine.java | 3 +++
src/main/java/org/apache/commons/scxml2/env/SimpleContext.java | 9 +++++++++
.../java/org/apache/commons/scxml2/env/SimpleDispatcher.java | 2 ++
.../java/org/apache/commons/scxml2/env/SimpleErrorHandler.java | 3 +++
.../org/apache/commons/scxml2/env/SimpleErrorReporter.java | 1 +
.../org/apache/commons/scxml2/env/SimpleSCXMLListener.java | 3 +++
.../java/org/apache/commons/scxml2/env/SimpleXMLReporter.java | 1 +
src/main/java/org/apache/commons/scxml2/env/Tracer.java | 10 +++++++++-
src/main/java/org/apache/commons/scxml2/env/URLResolver.java | 2 ++
.../java/org/apache/commons/scxml2/env/jexl/JexlEvaluator.java | 4 ++++
src/main/java/org/apache/commons/scxml2/model/Assign.java | 2 ++
src/main/java/org/apache/commons/scxml2/model/Content.java | 2 ++
src/main/java/org/apache/commons/scxml2/model/Data.java | 2 ++
src/main/java/org/apache/commons/scxml2/model/DoneData.java | 3 +++
src/main/java/org/apache/commons/scxml2/model/Final.java | 1 +
src/main/java/org/apache/commons/scxml2/model/If.java | 2 ++
src/main/java/org/apache/commons/scxml2/model/Invoke.java | 4 ++++
src/main/java/org/apache/commons/scxml2/model/Parallel.java | 1 +
src/main/java/org/apache/commons/scxml2/model/SCXML.java | 1 +
src/main/java/org/apache/commons/scxml2/model/Send.java | 3 +++
.../java/org/apache/commons/scxml2/model/SimpleTransition.java | 1 +
src/main/java/org/apache/commons/scxml2/model/State.java | 1 +
.../java/org/apache/commons/scxml2/model/TransitionTarget.java | 1 +
.../org/apache/commons/scxml2/model/TransitionalState.java | 1 +
.../apache/commons/scxml2/semantics/SCXMLSemanticsImpl.java | 6 ++++++
.../java/org/apache/commons/scxml2/system/EventVariable.java | 1 +
src/test/java/org/apache/commons/scxml2/WizardsTest.java | 2 ++
.../java/org/apache/commons/scxml2/env/MockErrorReporter.java | 1 +
.../java/org/apache/commons/scxml2/env/StopWatchDisplay.java | 1 +
src/test/java/org/apache/commons/scxml2/w3c/W3CTests.java | 2 ++
34 files changed, 81 insertions(+), 1 deletion(-)
diff --git a/src/main/java/org/apache/commons/scxml2/SCInstanceObjectInputStream.java b/src/main/java/org/apache/commons/scxml2/SCInstanceObjectInputStream.java
index 9bd4231..9f5695d 100644
--- a/src/main/java/org/apache/commons/scxml2/SCInstanceObjectInputStream.java
+++ b/src/main/java/org/apache/commons/scxml2/SCInstanceObjectInputStream.java
@@ -87,6 +87,7 @@ public class SCInstanceObjectInputStream extends ObjectInputStream {
return old;
}
+ @Override
protected Class resolveClass(final ObjectStreamClass osc) throws IOException, ClassNotFoundException {
if (classResolver != null) {
return classResolver.resolveClass(osc);
diff --git a/src/main/java/org/apache/commons/scxml2/SCXMLExecutor.java b/src/main/java/org/apache/commons/scxml2/SCXMLExecutor.java
index edfc262..11ee9df 100644
--- a/src/main/java/org/apache/commons/scxml2/SCXMLExecutor.java
+++ b/src/main/java/org/apache/commons/scxml2/SCXMLExecutor.java
@@ -473,6 +473,7 @@ public class SCXMLExecutor implements SCXMLIOProcessor {
* </p>
* @param evt an external event
*/
+ @Override
public void addEvent(final TriggerEvent evt) {
if (evt != null) {
externalEventQueue.add(evt);
diff --git a/src/main/java/org/apache/commons/scxml2/env/AbstractBaseEvaluator.java b/src/main/java/org/apache/commons/scxml2/env/AbstractBaseEvaluator.java
index b53138e..c87d900 100644
--- a/src/main/java/org/apache/commons/scxml2/env/AbstractBaseEvaluator.java
+++ b/src/main/java/org/apache/commons/scxml2/env/AbstractBaseEvaluator.java
@@ -43,6 +43,7 @@ public abstract class AbstractBaseEvaluator implements Evaluator, Serializable {
/**
* @see Evaluator#evalAssign(Context, String, Object)
*/
+ @Override
public void evalAssign(final Context ctx, final String location, final Object data) throws SCXMLExpressionException {
final StringBuilder sb = new StringBuilder(location).append("=").append(ASSIGN_VARIABLE_NAME);
try {
diff --git a/src/main/java/org/apache/commons/scxml2/env/AbstractSCXMLListener.java b/src/main/java/org/apache/commons/scxml2/env/AbstractSCXMLListener.java
index e2c1680..ece496e 100644
--- a/src/main/java/org/apache/commons/scxml2/env/AbstractSCXMLListener.java
+++ b/src/main/java/org/apache/commons/scxml2/env/AbstractSCXMLListener.java
@@ -33,6 +33,7 @@ public abstract class AbstractSCXMLListener implements SCXMLListener {
/**
* @see SCXMLListener#onEntry(EnterableState)
*/
+ @Override
public void onEntry(final EnterableState state) {
// empty
}
@@ -40,6 +41,7 @@ public abstract class AbstractSCXMLListener implements SCXMLListener {
/**
* @see SCXMLListener#onExit(EnterableState)
*/
+ @Override
public void onExit(final EnterableState state) {
// empty
}
@@ -47,6 +49,7 @@ public abstract class AbstractSCXMLListener implements SCXMLListener {
/**
* @see SCXMLListener#onTransition(TransitionTarget,TransitionTarget,Transition,String)
*/
+ @Override
public void onTransition(final TransitionTarget from,
final TransitionTarget to, final Transition transition, final String event) {
// empty
diff --git a/src/main/java/org/apache/commons/scxml2/env/AbstractStateMachine.java b/src/main/java/org/apache/commons/scxml2/env/AbstractStateMachine.java
index c8a156b..6f5d4c6 100644
--- a/src/main/java/org/apache/commons/scxml2/env/AbstractStateMachine.java
+++ b/src/main/java/org/apache/commons/scxml2/env/AbstractStateMachine.java
@@ -284,6 +284,7 @@ public abstract class AbstractStateMachine {
/**
* {@inheritDoc}
*/
+ @Override
public void onEntry(final EnterableState entered) {
invoke(entered.getId());
}
@@ -296,6 +297,7 @@ public abstract class AbstractStateMachine {
* @param transition The transition being followed.
* @param event The event triggering the transition
*/
+ @Override
public void onTransition(final TransitionTarget from,
final TransitionTarget to, final Transition transition, final String event) {
// nothing to do
@@ -306,6 +308,7 @@ public abstract class AbstractStateMachine {
*
* @param exited The state being exited.
*/
+ @Override
public void onExit(final EnterableState exited) {
// nothing to do
}
diff --git a/src/main/java/org/apache/commons/scxml2/env/SimpleContext.java b/src/main/java/org/apache/commons/scxml2/env/SimpleContext.java
index 326a70e..85c12f0 100644
--- a/src/main/java/org/apache/commons/scxml2/env/SimpleContext.java
+++ b/src/main/java/org/apache/commons/scxml2/env/SimpleContext.java
@@ -84,6 +84,7 @@ public class SimpleContext implements Context, Serializable {
* @param value The variable value
* @see org.apache.commons.scxml2.Context#set(String, Object)
*/
+ @Override
public void set(final String name, final Object value) {
if (getVars().containsKey(name)) { //first try to override local
setLocal(name, value);
@@ -101,6 +102,7 @@ public class SimpleContext implements Context, Serializable {
* @return Object The variable value
* @see org.apache.commons.scxml2.Context#get(String)
*/
+ @Override
public Object get(final String name) {
final Object localValue = getVars().get(name);
if (localValue != null) {
@@ -119,6 +121,7 @@ public class SimpleContext implements Context, Serializable {
* @return boolean true if this variable exists
* @see org.apache.commons.scxml2.Context#has(String)
*/
+ @Override
public boolean has(final String name) {
return (hasLocal(name) || (parent != null && parent.has(name)));
}
@@ -130,6 +133,7 @@ public class SimpleContext implements Context, Serializable {
* @return boolean true if this variable exists
* @see org.apache.commons.scxml2.Context#hasLocal(String)
*/
+ @Override
public boolean hasLocal(final String name) {
return (getVars().containsKey(name));
}
@@ -139,6 +143,7 @@ public class SimpleContext implements Context, Serializable {
*
* @see org.apache.commons.scxml2.Context#reset()
*/
+ @Override
public void reset() {
getVars().clear();
}
@@ -149,6 +154,7 @@ public class SimpleContext implements Context, Serializable {
* @return Context The parent Context
* @see org.apache.commons.scxml2.Context#getParent()
*/
+ @Override
public Context getParent() {
return parent;
}
@@ -158,6 +164,7 @@ public class SimpleContext implements Context, Serializable {
*
* @return The SCXMLSystemContext in a chained Context environment
*/
+ @Override
public final SCXMLSystemContext getSystemContext() {
return systemContext;
}
@@ -171,6 +178,7 @@ public class SimpleContext implements Context, Serializable {
* @param value The variable value
* @see org.apache.commons.scxml2.Context#setLocal(String, Object)
*/
+ @Override
public void setLocal(final String name, final Object value) {
getVars().put(name, value);
if (log.isDebugEnabled()) {
@@ -192,6 +200,7 @@ public class SimpleContext implements Context, Serializable {
*
* @return Returns the vars.
*/
+ @Override
public Map<String, Object> getVars() {
return vars;
}
diff --git a/src/main/java/org/apache/commons/scxml2/env/SimpleDispatcher.java b/src/main/java/org/apache/commons/scxml2/env/SimpleDispatcher.java
index be3de9a..d4aaef8 100644
--- a/src/main/java/org/apache/commons/scxml2/env/SimpleDispatcher.java
+++ b/src/main/java/org/apache/commons/scxml2/env/SimpleDispatcher.java
@@ -132,6 +132,7 @@ public class SimpleDispatcher implements EventDispatcher, Serializable {
/**
* @see EventDispatcher#cancel(String)
*/
+ @Override
public void cancel(final String sendId) {
if (log.isInfoEnabled()) {
log.info("cancel( sendId: " + sendId + ")");
@@ -153,6 +154,7 @@ public class SimpleDispatcher implements EventDispatcher, Serializable {
/**
@see EventDispatcher#send(java.util.Map, String, String, String, String, Object, Object, long)
*/
+ @Override
public void send(final Map<String, SCXMLIOProcessor> ioProcessors, final String id, final String target,
final String type, final String event, final Object data, final Object hints, final long delay) {
if (log.isInfoEnabled()) {
diff --git a/src/main/java/org/apache/commons/scxml2/env/SimpleErrorHandler.java b/src/main/java/org/apache/commons/scxml2/env/SimpleErrorHandler.java
index bbaadaf..de96799 100644
--- a/src/main/java/org/apache/commons/scxml2/env/SimpleErrorHandler.java
+++ b/src/main/java/org/apache/commons/scxml2/env/SimpleErrorHandler.java
@@ -48,6 +48,7 @@ public class SimpleErrorHandler implements ErrorHandler, Serializable {
/**
* @see ErrorHandler#error(SAXParseException)
*/
+ @Override
public void error(final SAXParseException exception) {
if (log.isErrorEnabled()) {
log.error(MSG_PREFIX + exception.getMessage() + MSG_POSTFIX,
@@ -58,6 +59,7 @@ public class SimpleErrorHandler implements ErrorHandler, Serializable {
/**
* @see ErrorHandler#fatalError(SAXParseException)
*/
+ @Override
public void fatalError(final SAXParseException exception) {
if (log.isFatalEnabled()) {
log.fatal(MSG_PREFIX + exception.getMessage() + MSG_POSTFIX,
@@ -68,6 +70,7 @@ public class SimpleErrorHandler implements ErrorHandler, Serializable {
/**
* @see ErrorHandler#warning(SAXParseException)
*/
+ @Override
public void warning(final SAXParseException exception) {
if (log.isWarnEnabled()) {
log.warn(MSG_PREFIX + exception.getMessage() + MSG_POSTFIX,
diff --git a/src/main/java/org/apache/commons/scxml2/env/SimpleErrorReporter.java b/src/main/java/org/apache/commons/scxml2/env/SimpleErrorReporter.java
index 915c8de..648ef6d 100644
--- a/src/main/java/org/apache/commons/scxml2/env/SimpleErrorReporter.java
+++ b/src/main/java/org/apache/commons/scxml2/env/SimpleErrorReporter.java
@@ -51,6 +51,7 @@ public class SimpleErrorReporter implements ErrorReporter, Serializable {
/**
* @see ErrorReporter#onError(String, String, Object)
*/
+ @Override
@SuppressWarnings("unchecked")
public void onError(final String errorCode, final String errDetail,
final Object errCtx) {
diff --git a/src/main/java/org/apache/commons/scxml2/env/SimpleSCXMLListener.java b/src/main/java/org/apache/commons/scxml2/env/SimpleSCXMLListener.java
index e6eba13..cdf9cf4 100644
--- a/src/main/java/org/apache/commons/scxml2/env/SimpleSCXMLListener.java
+++ b/src/main/java/org/apache/commons/scxml2/env/SimpleSCXMLListener.java
@@ -40,6 +40,7 @@ public class SimpleSCXMLListener implements SCXMLListener, Serializable {
/**
* @see SCXMLListener#onEntry(EnterableState)
*/
+ @Override
public void onEntry(final EnterableState state) {
if (log.isInfoEnabled()) {
log.info("enter " + LogUtils.getTTPath(state));
@@ -49,6 +50,7 @@ public class SimpleSCXMLListener implements SCXMLListener, Serializable {
/**
* @see SCXMLListener#onExit(EnterableState)
*/
+ @Override
public void onExit(final EnterableState state) {
if (log.isInfoEnabled()) {
log.info("exit " + LogUtils.getTTPath(state));
@@ -58,6 +60,7 @@ public class SimpleSCXMLListener implements SCXMLListener, Serializable {
/**
* @see SCXMLListener#onTransition(TransitionTarget,TransitionTarget,Transition,String)
*/
+ @Override
public void onTransition(final TransitionTarget from,
final TransitionTarget to, final Transition transition, final String event) {
if (log.isInfoEnabled()) {
diff --git a/src/main/java/org/apache/commons/scxml2/env/SimpleXMLReporter.java b/src/main/java/org/apache/commons/scxml2/env/SimpleXMLReporter.java
index 8cbdb7d..b33f30c 100644
--- a/src/main/java/org/apache/commons/scxml2/env/SimpleXMLReporter.java
+++ b/src/main/java/org/apache/commons/scxml2/env/SimpleXMLReporter.java
@@ -48,6 +48,7 @@ public class SimpleXMLReporter implements XMLReporter, Serializable {
/**
* @see XMLReporter#report(String, String, Object, Location)
*/
+ @Override
public void report(final String message, final String errorType, final Object relatedInformation,
final Location location)
throws XMLStreamException {
diff --git a/src/main/java/org/apache/commons/scxml2/env/Tracer.java b/src/main/java/org/apache/commons/scxml2/env/Tracer.java
index 202d8a9..24a3854 100644
--- a/src/main/java/org/apache/commons/scxml2/env/Tracer.java
+++ b/src/main/java/org/apache/commons/scxml2/env/Tracer.java
@@ -61,6 +61,7 @@ public class Tracer implements ErrorHandler, ErrorReporter,
/**
* @see org.xml.sax.ErrorHandler#warning(org.xml.sax.SAXParseException)
*/
+ @Override
public void warning(final SAXParseException exception)
throws SAXException {
errHandler.warning(exception);
@@ -69,6 +70,7 @@ public class Tracer implements ErrorHandler, ErrorReporter,
/**
* @see org.xml.sax.ErrorHandler#error(org.xml.sax.SAXParseException)
*/
+ @Override
public void error(final SAXParseException exception)
throws SAXException {
errHandler.error(exception);
@@ -77,6 +79,7 @@ public class Tracer implements ErrorHandler, ErrorReporter,
/**
* @see org.xml.sax.ErrorHandler#fatalError(org.xml.sax.SAXParseException)
*/
+ @Override
public void fatalError(final SAXParseException exception)
throws SAXException {
errHandler.fatalError(exception);
@@ -85,6 +88,7 @@ public class Tracer implements ErrorHandler, ErrorReporter,
/**
* @see ErrorReporter#onError(String, String, Object)
*/
+ @Override
public void onError(final String errCode, final String errDetail,
final Object errCtx) {
errReporter.onError(errCode, errDetail, errCtx);
@@ -93,6 +97,7 @@ public class Tracer implements ErrorHandler, ErrorReporter,
/**
* @see SCXMLListener#onEntry(EnterableState)
*/
+ @Override
public void onEntry(final EnterableState state) {
scxmlListener.onEntry(state);
}
@@ -100,6 +105,7 @@ public class Tracer implements ErrorHandler, ErrorReporter,
/**
* @see SCXMLListener#onExit(EnterableState)
*/
+ @Override
public void onExit(final EnterableState state) {
scxmlListener.onExit(state);
}
@@ -107,6 +113,7 @@ public class Tracer implements ErrorHandler, ErrorReporter,
/**
* @see SCXMLListener#onTransition(TransitionTarget,TransitionTarget,Transition,String)
*/
+ @Override
public void onTransition(final TransitionTarget from,
final TransitionTarget to, final Transition transition, final String event) {
scxmlListener.onTransition(from, to, transition, event);
@@ -115,7 +122,8 @@ public class Tracer implements ErrorHandler, ErrorReporter,
/**
* @see XMLReporter#report(String, String, Object, Location)
*/
- public void report(final String message, final String errorType, final Object relatedInformation,
+ @Override
+ public void report(final String message, final String errorType, final Object relatedInformation,
final Location location)
throws XMLStreamException {
xmlReporter.report(message, errorType, relatedInformation, location);
diff --git a/src/main/java/org/apache/commons/scxml2/env/URLResolver.java b/src/main/java/org/apache/commons/scxml2/env/URLResolver.java
index 0296d4a..71f867a 100644
--- a/src/main/java/org/apache/commons/scxml2/env/URLResolver.java
+++ b/src/main/java/org/apache/commons/scxml2/env/URLResolver.java
@@ -53,6 +53,7 @@ public class URLResolver implements PathResolver, Serializable {
* Uses URL(URL, String) constructor to combine URL's.
* @see org.apache.commons.scxml2.PathResolver#resolvePath(String)
*/
+ @Override
public String resolvePath(final String ctxPath) {
URL combined;
try {
@@ -67,6 +68,7 @@ public class URLResolver implements PathResolver, Serializable {
/**
* @see org.apache.commons.scxml2.PathResolver#getResolver(String)
*/
+ @Override
public PathResolver getResolver(final String ctxPath) {
URL combined;
try {
diff --git a/src/main/java/org/apache/commons/scxml2/env/jexl/JexlEvaluator.java b/src/main/java/org/apache/commons/scxml2/env/jexl/JexlEvaluator.java
index b175719..643e373 100644
--- a/src/main/java/org/apache/commons/scxml2/env/jexl/JexlEvaluator.java
+++ b/src/main/java/org/apache/commons/scxml2/env/jexl/JexlEvaluator.java
@@ -98,6 +98,7 @@ public class JexlEvaluator extends AbstractBaseEvaluator {
* @throws SCXMLExpressionException For a malformed expression
* @see Evaluator#eval(Context, String)
*/
+ @Override
public Object eval(final Context ctx, final String expr)
throws SCXMLExpressionException {
if (expr == null) {
@@ -119,6 +120,7 @@ public class JexlEvaluator extends AbstractBaseEvaluator {
/**
* @see Evaluator#evalCond(Context, String)
*/
+ @Override
public Boolean evalCond(final Context ctx, final String expr)
throws SCXMLExpressionException {
if (expr == null) {
@@ -141,6 +143,7 @@ public class JexlEvaluator extends AbstractBaseEvaluator {
/**
* @see Evaluator#evalScript(Context, String)
*/
+ @Override
public Object evalScript(final Context ctx, final String script)
throws SCXMLExpressionException {
if (script == null) {
@@ -166,6 +169,7 @@ public class JexlEvaluator extends AbstractBaseEvaluator {
* @return new child context
* @see Evaluator#newContext(Context)
*/
+ @Override
public Context newContext(final Context parent) {
return new JexlContext(parent);
}
diff --git a/src/main/java/org/apache/commons/scxml2/model/Assign.java b/src/main/java/org/apache/commons/scxml2/model/Assign.java
index 99aead2..ddb815f 100644
--- a/src/main/java/org/apache/commons/scxml2/model/Assign.java
+++ b/src/main/java/org/apache/commons/scxml2/model/Assign.java
@@ -118,6 +118,7 @@ public class Assign extends Action implements ParsedValueContainer {
*
* @return The assign value
*/
+ @Override
public final ParsedValue getParsedValue() {
return assignValue;
}
@@ -127,6 +128,7 @@ public class Assign extends Action implements ParsedValueContainer {
*
* @param assignValue The assign value
*/
+ @Override
public final void setParsedValue(final ParsedValue assignValue) {
this.assignValue = assignValue;
}
diff --git a/src/main/java/org/apache/commons/scxml2/model/Content.java b/src/main/java/org/apache/commons/scxml2/model/Content.java
index b9d05bb..91cbdad 100644
--- a/src/main/java/org/apache/commons/scxml2/model/Content.java
+++ b/src/main/java/org/apache/commons/scxml2/model/Content.java
@@ -60,6 +60,7 @@ public class Content implements ParsedValueContainer {
*
* @return The content element body.
*/
+ @Override
public final ParsedValue getParsedValue() {
return contentBody;
}
@@ -69,6 +70,7 @@ public class Content implements ParsedValueContainer {
*
* @param contentBody The content element body
*/
+ @Override
public final void setParsedValue(final ParsedValue contentBody) {
this.contentBody = contentBody;
}
diff --git a/src/main/java/org/apache/commons/scxml2/model/Data.java b/src/main/java/org/apache/commons/scxml2/model/Data.java
index a8903ba..20ab907 100644
--- a/src/main/java/org/apache/commons/scxml2/model/Data.java
+++ b/src/main/java/org/apache/commons/scxml2/model/Data.java
@@ -107,6 +107,7 @@ public class Data implements ParsedValueContainer {
*
* @return The data value
*/
+ @Override
public final ParsedValue getParsedValue() {
return dataValue;
}
@@ -116,6 +117,7 @@ public class Data implements ParsedValueContainer {
*
* @param dataValue The data value
*/
+ @Override
public final void setParsedValue(final ParsedValue dataValue) {
this.dataValue = dataValue;
}
diff --git a/src/main/java/org/apache/commons/scxml2/model/DoneData.java b/src/main/java/org/apache/commons/scxml2/model/DoneData.java
index d752d64..a47fdca 100644
--- a/src/main/java/org/apache/commons/scxml2/model/DoneData.java
+++ b/src/main/java/org/apache/commons/scxml2/model/DoneData.java
@@ -40,6 +40,7 @@ public class DoneData implements ContentContainer, ParamsContainer, Serializable
*
* @return the content
*/
+ @Override
public Content getContent() {
return content;
}
@@ -49,6 +50,7 @@ public class DoneData implements ContentContainer, ParamsContainer, Serializable
*
* @param content the content to set
*/
+ @Override
public void setContent(final Content content) {
this.content = content;
}
@@ -58,6 +60,7 @@ public class DoneData implements ContentContainer, ParamsContainer, Serializable
*
* @return List The params list.
*/
+ @Override
public List<Param> getParams() {
return paramsList;
}
diff --git a/src/main/java/org/apache/commons/scxml2/model/Final.java b/src/main/java/org/apache/commons/scxml2/model/Final.java
index a9c6197..5fcf1a6 100644
--- a/src/main/java/org/apache/commons/scxml2/model/Final.java
+++ b/src/main/java/org/apache/commons/scxml2/model/Final.java
@@ -68,6 +68,7 @@ public class Final extends EnterableState {
* {@inheritDoc}
* @return Returns always true (a state of type Final is always atomic)
*/
+ @Override
public final boolean isAtomicState() {
return true;
}
diff --git a/src/main/java/org/apache/commons/scxml2/model/If.java b/src/main/java/org/apache/commons/scxml2/model/If.java
index 8530c4d..c51aeed 100644
--- a/src/main/java/org/apache/commons/scxml2/model/If.java
+++ b/src/main/java/org/apache/commons/scxml2/model/If.java
@@ -71,6 +71,7 @@ public class If extends Action implements ActionsContainer {
*
* @return Returns the actions.
*/
+ @Override
public final List<Action> getActions() {
return actions;
}
@@ -81,6 +82,7 @@ public class If extends Action implements ActionsContainer {
*
* @param action The action to add.
*/
+ @Override
public final void addAction(final Action action) {
if (action != null) {
this.actions.add(action);
diff --git a/src/main/java/org/apache/commons/scxml2/model/Invoke.java b/src/main/java/org/apache/commons/scxml2/model/Invoke.java
index 6ed753d..6bcd788 100644
--- a/src/main/java/org/apache/commons/scxml2/model/Invoke.java
+++ b/src/main/java/org/apache/commons/scxml2/model/Invoke.java
@@ -267,6 +267,7 @@ public class Invoke extends Action implements ContentContainer, ParamsContainer
*
* @return List The params list.
*/
+ @Override
public List<Param> getParams() {
return paramsList;
}
@@ -313,6 +314,7 @@ public class Invoke extends Action implements ContentContainer, ParamsContainer
*
* @return the content
*/
+ @Override
public Content getContent() {
return content;
}
@@ -329,6 +331,7 @@ public class Invoke extends Action implements ContentContainer, ParamsContainer
*
* @param content the content to set
*/
+ @Override
public void setContent(final Content content) {
this.content = content;
}
@@ -338,6 +341,7 @@ public class Invoke extends Action implements ContentContainer, ParamsContainer
*
* @return Returns the parent state
*/
+ @Override
public EnterableState getParentEnterableState() {
return parent;
}
diff --git a/src/main/java/org/apache/commons/scxml2/model/Parallel.java b/src/main/java/org/apache/commons/scxml2/model/Parallel.java
index 2e0d6cc..9d77004 100644
--- a/src/main/java/org/apache/commons/scxml2/model/Parallel.java
+++ b/src/main/java/org/apache/commons/scxml2/model/Parallel.java
@@ -41,6 +41,7 @@ public class Parallel extends TransitionalState {
* {@inheritDoc}
* @return Returns always false (a state of type Parallel is never atomic)
*/
+ @Override
public final boolean isAtomicState() {
return false;
}
diff --git a/src/main/java/org/apache/commons/scxml2/model/SCXML.java b/src/main/java/org/apache/commons/scxml2/model/SCXML.java
index 718cc1c..ceec9b9 100644
--- a/src/main/java/org/apache/commons/scxml2/model/SCXML.java
+++ b/src/main/java/org/apache/commons/scxml2/model/SCXML.java
@@ -137,6 +137,7 @@ public class SCXML implements Serializable, Observable {
/**
* {@inheritDoc}
*/
+ @Override
public final Integer getObservableId() {
return SCXML_OBSERVABLE_ID;
}
diff --git a/src/main/java/org/apache/commons/scxml2/model/Send.java b/src/main/java/org/apache/commons/scxml2/model/Send.java
index 015aaa8..bcd36a6 100644
--- a/src/main/java/org/apache/commons/scxml2/model/Send.java
+++ b/src/main/java/org/apache/commons/scxml2/model/Send.java
@@ -337,6 +337,7 @@ public class Send extends Action implements ContentContainer, ParamsContainer {
*
* @return the content
*/
+ @Override
public Content getContent() {
return content;
}
@@ -346,6 +347,7 @@ public class Send extends Action implements ContentContainer, ParamsContainer {
*
* @param content the content to set
*/
+ @Override
public void setContent(final Content content) {
this.content = content;
}
@@ -355,6 +357,7 @@ public class Send extends Action implements ContentContainer, ParamsContainer {
*
* @return List The params list.
*/
+ @Override
public List<Param> getParams() {
return paramsList;
}
diff --git a/src/main/java/org/apache/commons/scxml2/model/SimpleTransition.java b/src/main/java/org/apache/commons/scxml2/model/SimpleTransition.java
index 9b8b8c2..5e1f0dc 100644
--- a/src/main/java/org/apache/commons/scxml2/model/SimpleTransition.java
+++ b/src/main/java/org/apache/commons/scxml2/model/SimpleTransition.java
@@ -86,6 +86,7 @@ public class SimpleTransition extends Executable implements Observable {
/**
* {@inheritDoc}
*/
+ @Override
public final Integer getObservableId() {
return observableId;
}
diff --git a/src/main/java/org/apache/commons/scxml2/model/State.java b/src/main/java/org/apache/commons/scxml2/model/State.java
index 50185fc..0a18627 100644
--- a/src/main/java/org/apache/commons/scxml2/model/State.java
+++ b/src/main/java/org/apache/commons/scxml2/model/State.java
@@ -95,6 +95,7 @@ public class State extends TransitionalState {
* {@inheritDoc}
* @return Returns true if this State has no children
*/
+ @Override
public final boolean isAtomicState() {
return getChildren().isEmpty();
}
diff --git a/src/main/java/org/apache/commons/scxml2/model/TransitionTarget.java b/src/main/java/org/apache/commons/scxml2/model/TransitionTarget.java
index 1052280..abdc65c 100644
--- a/src/main/java/org/apache/commons/scxml2/model/TransitionTarget.java
+++ b/src/main/java/org/apache/commons/scxml2/model/TransitionTarget.java
@@ -55,6 +55,7 @@ public abstract class TransitionTarget implements Serializable, Observable {
/**
* {@inheritDoc}
*/
+ @Override
public final Integer getObservableId() {
return observableId;
}
diff --git a/src/main/java/org/apache/commons/scxml2/model/TransitionalState.java b/src/main/java/org/apache/commons/scxml2/model/TransitionalState.java
index 0632016..092e7ec 100644
--- a/src/main/java/org/apache/commons/scxml2/model/TransitionalState.java
+++ b/src/main/java/org/apache/commons/scxml2/model/TransitionalState.java
@@ -64,6 +64,7 @@ public abstract class TransitionalState extends EnterableState {
/**
* Update TransitionTarget descendants their ancestors
*/
+ @Override
protected void updateDescendantsAncestors() {
super.updateDescendantsAncestors();
for (final History h : history) {
diff --git a/src/main/java/org/apache/commons/scxml2/semantics/SCXMLSemanticsImpl.java b/src/main/java/org/apache/commons/scxml2/semantics/SCXMLSemanticsImpl.java
index 508d7cd..f69ac11 100644
--- a/src/main/java/org/apache/commons/scxml2/semantics/SCXMLSemanticsImpl.java
+++ b/src/main/java/org/apache/commons/scxml2/semantics/SCXMLSemanticsImpl.java
@@ -78,11 +78,13 @@ public class SCXMLSemanticsImpl implements SCXMLSemantics {
* @param errRep ErrorReporter callback
* @return normalized SCXML state machine, pseudo states are removed, etc.
*/
+ @Override
public SCXML normalizeStateMachine(final SCXML input, final ErrorReporter errRep) {
//it is a no-op for now
return input;
}
+ @Override
public void initialize(final SCXMLExecutionContext exctx, final Map<String, Object> data) throws ModelException {
// (re)initialize the execution context and state machine instance
exctx.initialize(data);
@@ -109,6 +111,7 @@ public class SCXMLSemanticsImpl implements SCXMLSemantics {
* @throws ModelException if the state machine instance failed to initialize or a SCXML model error occurred during
* the execution.
*/
+ @Override
public void firstStep(final SCXMLExecutionContext exctx) throws ModelException {
// starts the state machine instance
exctx.start();
@@ -156,6 +159,7 @@ public class SCXMLSemanticsImpl implements SCXMLSemantics {
* @param event The event to process
* @throws ModelException if a SCXML model error occurred during the execution.
*/
+ @Override
public void nextStep(final SCXMLExecutionContext exctx, final TriggerEvent event) throws ModelException {
if (!exctx.isRunning()) {
return;
@@ -197,6 +201,7 @@ public class SCXMLSemanticsImpl implements SCXMLSemantics {
* @param exctx The execution context for this step
* @throws ModelException if a SCXML model error occurred during the execution.
*/
+ @Override
public void finalStep(final SCXMLExecutionContext exctx) throws ModelException {
if (exctx.isRunning()) {
return;
@@ -760,6 +765,7 @@ public class SCXMLSemanticsImpl implements SCXMLSemantics {
* @param errRep ErrorReporter to report detailed error info if needed
* @return true if a given state configuration is legal, false otherwise
*/
+ @Override
public boolean isLegalConfiguration(final Set<EnterableState> states, final ErrorReporter errRep) {
/*
* For every active state we add 1 to the count of its parent. Each
diff --git a/src/main/java/org/apache/commons/scxml2/system/EventVariable.java b/src/main/java/org/apache/commons/scxml2/system/EventVariable.java
index 13800aa..89baea0 100644
--- a/src/main/java/org/apache/commons/scxml2/system/EventVariable.java
+++ b/src/main/java/org/apache/commons/scxml2/system/EventVariable.java
@@ -105,6 +105,7 @@ public class EventVariable implements Serializable {
return data;
}
+ @Override
public String toString() {
final StringBuilder sb = new StringBuilder("_event(");
sb.append("name: ").append(name);
diff --git a/src/test/java/org/apache/commons/scxml2/WizardsTest.java b/src/test/java/org/apache/commons/scxml2/WizardsTest.java
index 4c5ca82..6501b44 100644
--- a/src/test/java/org/apache/commons/scxml2/WizardsTest.java
+++ b/src/test/java/org/apache/commons/scxml2/WizardsTest.java
@@ -78,6 +78,7 @@ public class WizardsTest {
// If you change this, you must also change testWizard02Sample()
int callback = 0;
+ @Override
@SuppressWarnings("unchecked")
public void send(final Map<String, SCXMLIOProcessor> ioProcessors, final String id, final String target, final String type,
final String event, final Object data, final Object hints, final long delay) {
@@ -101,6 +102,7 @@ public class WizardsTest {
super.send(ioProcessors, id, target, type, event, data, hints, delay);
}
}
+ @Override
public void cancel(final String sendId) {
// should never be called
Assertions.fail("<cancel> TestEventDispatcher callback unexpected");
diff --git a/src/test/java/org/apache/commons/scxml2/env/MockErrorReporter.java b/src/test/java/org/apache/commons/scxml2/env/MockErrorReporter.java
index 807c9c8..5c052dd 100644
--- a/src/test/java/org/apache/commons/scxml2/env/MockErrorReporter.java
+++ b/src/test/java/org/apache/commons/scxml2/env/MockErrorReporter.java
@@ -24,6 +24,7 @@ public class MockErrorReporter implements ErrorReporter {
private String errDetail;
private Object errCtx;
+ @Override
public void onError( final String errCode, final String errDetail, final Object errCtx ) {
this.errCode = errCode;
this.errDetail = errDetail;
diff --git a/src/test/java/org/apache/commons/scxml2/env/StopWatchDisplay.java b/src/test/java/org/apache/commons/scxml2/env/StopWatchDisplay.java
index 315aa74..5779f32 100644
--- a/src/test/java/org/apache/commons/scxml2/env/StopWatchDisplay.java
+++ b/src/test/java/org/apache/commons/scxml2/env/StopWatchDisplay.java
@@ -57,6 +57,7 @@ public class StopWatchDisplay extends JFrame
setupUI();
}
+ @Override
public void actionPerformed(final ActionEvent e) {
final String command = e.getActionCommand();
if (command.equals("START")) {
diff --git a/src/test/java/org/apache/commons/scxml2/w3c/W3CTests.java b/src/test/java/org/apache/commons/scxml2/w3c/W3CTests.java
index 0d73df1..5f33566 100644
--- a/src/test/java/org/apache/commons/scxml2/w3c/W3CTests.java
+++ b/src/test/java/org/apache/commons/scxml2/w3c/W3CTests.java
@@ -200,6 +200,7 @@ public class W3CTests {
return comment;
}
+ @Override
public String toString() {
return id;
}
@@ -280,6 +281,7 @@ public class W3CTests {
return null;
}
+ @Override
public String toString() {
return id;
}