On 02/01/2009, Rahul Akolkar <rahul.akol...@gmail.com> wrote: > On Fri, Jan 2, 2009 at 2:03 PM, <s...@apache.org> wrote: > > Author: sebb > > Date: Fri Jan 2 11:03:42 2009 > > New Revision: 730816 > > > > URL: http://svn.apache.org/viewvc?rev=730816&view=rev > > Log: > > Add missing @Deprecated annotations > > > <snip/> > > Which reminds me -- these deprecated fields and methods can simply > disappear from the J6 branch. The branch will result in a major > release whenever that happens since it has higher JDK requirements as > compared to trunk (amongst other reasons). > > Some of the methods may be used elsewhere and if so, require a bit of > thought but the constants should be easy to remove if you'd like. >
OK, I've removed all the unused deprecated methods and fields. There are still a few deprecated methods to sort out. > -Rahul > > > > Modified: > > > commons/proper/scxml/branches/J6/src/main/java/org/apache/commons/scxml/ErrorReporter.java > > > commons/proper/scxml/branches/J6/src/main/java/org/apache/commons/scxml/env/AbstractStateMachine.java > > > commons/proper/scxml/branches/J6/src/main/java/org/apache/commons/scxml/io/SCXMLSerializer.java > > > commons/proper/scxml/branches/J6/src/main/java/org/apache/commons/scxml/model/Data.java > > > commons/proper/scxml/branches/J6/src/main/java/org/apache/commons/scxml/model/Invoke.java > > > commons/proper/scxml/branches/J6/src/main/java/org/apache/commons/scxml/model/Parallel.java > > > commons/proper/scxml/branches/J6/src/main/java/org/apache/commons/scxml/model/SCXML.java > > > commons/proper/scxml/branches/J6/src/main/java/org/apache/commons/scxml/model/State.java > > > commons/proper/scxml/branches/J6/src/main/java/org/apache/commons/scxml/model/Transition.java > > > commons/proper/scxml/branches/J6/src/main/java/org/apache/commons/scxml/semantics/ErrorConstants.java > > > > Modified: > commons/proper/scxml/branches/J6/src/main/java/org/apache/commons/scxml/ErrorReporter.java > > URL: > http://svn.apache.org/viewvc/commons/proper/scxml/branches/J6/src/main/java/org/apache/commons/scxml/ErrorReporter.java?rev=730816&r1=730815&r2=730816&view=diff > > > ============================================================================== > > --- > commons/proper/scxml/branches/J6/src/main/java/org/apache/commons/scxml/ErrorReporter.java > (original) > > +++ > commons/proper/scxml/branches/J6/src/main/java/org/apache/commons/scxml/ErrorReporter.java > Fri Jan 2 11:03:42 2009 > > @@ -48,6 +48,7 @@ > > * > > * @deprecated Use {...@link ErrorConstants#NO_INITIAL} instead. > > */ > > + @Deprecated > > String NO_INITIAL = "NO_INITIAL"; > > > > /** > > @@ -56,6 +57,7 @@ > > * > > * @deprecated Use {...@link ErrorConstants#ILLEGAL_INITIAL} instead. > > */ > > + @Deprecated > > String ILLEGAL_INITIAL = "ILLEGAL_INITIAL"; > > > > /** > > @@ -64,6 +66,7 @@ > > * > > * @deprecated Use {...@link ErrorConstants#UNKNOWN_ACTION} instead. > > */ > > + @Deprecated > > String UNKNOWN_ACTION = "UNKNOWN_ACTION"; > > > > /** > > @@ -73,6 +76,7 @@ > > * > > * @deprecated Use {...@link ErrorConstants#ILLEGAL_CONFIG} instead. > > */ > > + @Deprecated > > String ILLEGAL_CONFIG = "ILLEGAL_CONFIG"; > > > > /** > > @@ -82,6 +86,7 @@ > > * @deprecated No longer necessary, non determinism is solved based > > * on state heirarchy and document order priorities. > > */ > > + @Deprecated > > String NON_DETERMINISTIC = "NON_DETERMINISTIC"; > > > > /** > > @@ -89,6 +94,7 @@ > > * > > * @deprecated Use {...@link ErrorConstants#UNDEFINED_VARIABLE} > instead. > > */ > > + @Deprecated > > String UNDEFINED_VARIABLE = "UNDEFINED_VARIABLE"; > > > > /** > > @@ -96,6 +102,7 @@ > > * > > * @deprecated Use {...@link ErrorConstants#EXPRESSION_ERROR} instead. > > */ > > + @Deprecated > > String EXPRESSION_ERROR = "EXPRESSION_ERROR"; > > > > } > > > > Modified: > commons/proper/scxml/branches/J6/src/main/java/org/apache/commons/scxml/env/AbstractStateMachine.java > > URL: > http://svn.apache.org/viewvc/commons/proper/scxml/branches/J6/src/main/java/org/apache/commons/scxml/env/AbstractStateMachine.java?rev=730816&r1=730815&r2=730816&view=diff > > > ============================================================================== > > --- > commons/proper/scxml/branches/J6/src/main/java/org/apache/commons/scxml/env/AbstractStateMachine.java > (original) > > +++ > commons/proper/scxml/branches/J6/src/main/java/org/apache/commons/scxml/env/AbstractStateMachine.java > Fri Jan 2 11:03:42 2009 > > @@ -211,6 +211,7 @@ > > * @return Returns the stateMachine. > > * @deprecated Returns null, use getEngine().getStateMachine() instead > > */ > > + @Deprecated > > public static SCXML getStateMachine() { > > return null; > > } > > > > Modified: > commons/proper/scxml/branches/J6/src/main/java/org/apache/commons/scxml/io/SCXMLSerializer.java > > URL: > http://svn.apache.org/viewvc/commons/proper/scxml/branches/J6/src/main/java/org/apache/commons/scxml/io/SCXMLSerializer.java?rev=730816&r1=730815&r2=730816&view=diff > > > ============================================================================== > > --- > commons/proper/scxml/branches/J6/src/main/java/org/apache/commons/scxml/io/SCXMLSerializer.java > (original) > > +++ > commons/proper/scxml/branches/J6/src/main/java/org/apache/commons/scxml/io/SCXMLSerializer.java > Fri Jan 2 11:03:42 2009 > > @@ -323,6 +323,7 @@ > > * @deprecated Inline <target> element has been deprecated > > * in the SCXML WD > > */ > > + @Deprecated > > public static void serializeTarget(final StringBuffer b, > > final Transition t, final String indent) { > > if (t.getTarget() != null) { > > > > Modified: > commons/proper/scxml/branches/J6/src/main/java/org/apache/commons/scxml/model/Data.java > > URL: > http://svn.apache.org/viewvc/commons/proper/scxml/branches/J6/src/main/java/org/apache/commons/scxml/model/Data.java?rev=730816&r1=730815&r2=730816&view=diff > > > ============================================================================== > > --- > commons/proper/scxml/branches/J6/src/main/java/org/apache/commons/scxml/model/Data.java > (original) > > +++ > commons/proper/scxml/branches/J6/src/main/java/org/apache/commons/scxml/model/Data.java > Fri Jan 2 11:03:42 2009 > > @@ -78,6 +78,7 @@ > > * @return String The name. > > * @deprecated Use {...@link #getId()} instead. > > */ > > + @Deprecated > > public final String getName() { > > return id; > > } > > @@ -88,6 +89,7 @@ > > * @param name The name. > > * @deprecated Use {...@link #setId(String)} instead. > > */ > > + @Deprecated > > public final void setName(final String name) { > > this.id = name; > > } > > > > Modified: > commons/proper/scxml/branches/J6/src/main/java/org/apache/commons/scxml/model/Invoke.java > > URL: > http://svn.apache.org/viewvc/commons/proper/scxml/branches/J6/src/main/java/org/apache/commons/scxml/model/Invoke.java?rev=730816&r1=730815&r2=730816&view=diff > > > ============================================================================== > > --- > commons/proper/scxml/branches/J6/src/main/java/org/apache/commons/scxml/model/Invoke.java > (original) > > +++ > commons/proper/scxml/branches/J6/src/main/java/org/apache/commons/scxml/model/Invoke.java > Fri Jan 2 11:03:42 2009 > > @@ -152,6 +152,7 @@ > > * @return Map The params map. > > * @deprecated Remove in v1.0, use params() instead > > */ > > + @Deprecated > > public final Map<String, String> getParams() { > > return params; > > } > > > > Modified: > commons/proper/scxml/branches/J6/src/main/java/org/apache/commons/scxml/model/Parallel.java > > URL: > http://svn.apache.org/viewvc/commons/proper/scxml/branches/J6/src/main/java/org/apache/commons/scxml/model/Parallel.java?rev=730816&r1=730815&r2=730816&view=diff > > > ============================================================================== > > --- > commons/proper/scxml/branches/J6/src/main/java/org/apache/commons/scxml/model/Parallel.java > (original) > > +++ > commons/proper/scxml/branches/J6/src/main/java/org/apache/commons/scxml/model/Parallel.java > Fri Jan 2 11:03:42 2009 > > @@ -54,6 +54,7 @@ > > * > > * @deprecated Use getChildren() instead. > > */ > > + @Deprecated > > public final Set<TransitionTarget> getStates() { > > return children; > > } > > @@ -66,6 +67,7 @@ > > * > > * @deprecated Use addChild(TransitionTarget) instead. > > */ > > + @Deprecated > > public final void addState(final State state) { > > if (state != null) { > > this.children.add(state); > > > > Modified: > commons/proper/scxml/branches/J6/src/main/java/org/apache/commons/scxml/model/SCXML.java > > URL: > http://svn.apache.org/viewvc/commons/proper/scxml/branches/J6/src/main/java/org/apache/commons/scxml/model/SCXML.java?rev=730816&r1=730815&r2=730816&view=diff > > > ============================================================================== > > --- > commons/proper/scxml/branches/J6/src/main/java/org/apache/commons/scxml/model/SCXML.java > (original) > > +++ > commons/proper/scxml/branches/J6/src/main/java/org/apache/commons/scxml/model/SCXML.java > Fri Jan 2 11:03:42 2009 > > @@ -103,6 +103,7 @@ > > * @deprecated Use getInitialTarget() instead. Returns > <code>null</code> > > * if the initial target is a Parallel. > > */ > > + @Deprecated > > public final State getInitialState() { > > if (initialTarget != null && initialTarget instanceof State) { > > return (State) initialTarget; > > @@ -117,6 +118,7 @@ > > * > > * @deprecated Use setInitialTarget(TransitionTarget) instead. > > */ > > + @Deprecated > > public final void setInitialState(final State initialState) { > > this.initialTarget = initialState; > > } > > @@ -168,6 +170,7 @@ > > * > > * @deprecated Use getChildren() instead. > > */ > > + @Deprecated > > public final Map<String, TransitionTarget> getStates() { > > return children; > > } > > @@ -179,6 +182,7 @@ > > * > > * @deprecated Use addChild(TransitionTarget) instead. > > */ > > + @Deprecated > > public final void addState(final State state) { > > children.put(state.getId(), state); > > } > > @@ -292,6 +296,7 @@ > > * @see #getInitialTarget() > > * @deprecated Use {...@link #getInitial()} instead. > > */ > > + @Deprecated > > public final String getInitialstate() { > > return initial; > > } > > @@ -303,6 +308,7 @@ > > * @see #setInitialTarget(TransitionTarget) > > * @deprecated Use {...@link #setInitial(String)} instead. > > */ > > + @Deprecated > > public final void setInitialstate(final String initialstate) { > > this.initial = initialstate; > > } > > > > Modified: > commons/proper/scxml/branches/J6/src/main/java/org/apache/commons/scxml/model/State.java > > URL: > http://svn.apache.org/viewvc/commons/proper/scxml/branches/J6/src/main/java/org/apache/commons/scxml/model/State.java?rev=730816&r1=730815&r2=730816&view=diff > > > ============================================================================== > > --- > commons/proper/scxml/branches/J6/src/main/java/org/apache/commons/scxml/model/State.java > (original) > > +++ > commons/proper/scxml/branches/J6/src/main/java/org/apache/commons/scxml/model/State.java > Fri Jan 2 11:03:42 2009 > > @@ -73,6 +73,7 @@ > > * > > * @deprecated Will be removed in v1.0 > > */ > > + @Deprecated > > private boolean done = false; > > > > /** > > @@ -88,6 +89,7 @@ > > * @return boolean Returns the isFinal. > > * @deprecated Use {...@link #isFinal()} instead > > */ > > + @Deprecated > > public final boolean getIsFinal() { > > return isFinal; > > } > > @@ -99,6 +101,7 @@ > > * The isFinal to set. > > * @deprecated Use {...@link #setFinal(boolean)} instead > > */ > > + @Deprecated > > public final void setIsFinal(final boolean isFinal) { > > this.isFinal = isFinal; > > } > > @@ -134,6 +137,7 @@ > > * @deprecated <parallel> no longer needs an enclosing > > * <state> element. > > */ > > + @Deprecated > > public final Parallel getParallel() { > > return parallel; > > } > > @@ -147,6 +151,7 @@ > > * @deprecated <parallel> no longer needs an enclosing > > * <state> element. > > */ > > + @Deprecated > > public final void setParallel(final Parallel parallel) { > > this.parallel = parallel; > > } > > @@ -234,6 +239,7 @@ > > * > > * @deprecated Use {...@link #addChild(TransitionTarget)} instead. > > */ > > + @Deprecated > > public final void addChild(final State state) { > > this.children.put(state.getId(), state); > > state.setParent(this); > > @@ -299,6 +305,7 @@ > > * than denoting that the enclosing state is orthogonal, as > > * it did in previous SCXML WDs. > > */ > > + @Deprecated > > public final boolean isOrthogonal() { > > if (parallel != null) { > > return true; > > @@ -314,6 +321,7 @@ > > * @deprecated Will be removed in v1.0, in favor of > > * <code>SCInstance#isDone(TransitionTarget)</code> > > */ > > + @Deprecated > > public final boolean isDone() { > > return done; > > } > > @@ -326,6 +334,7 @@ > > * @deprecated Will be removed in v1.0, in favor of > > * <code>SCInstance#setDone(TransitionTarget)</code> > > */ > > + @Deprecated > > public final void setDone(final boolean done) { > > this.done = done; > > } > > > > Modified: > commons/proper/scxml/branches/J6/src/main/java/org/apache/commons/scxml/model/Transition.java > > URL: > http://svn.apache.org/viewvc/commons/proper/scxml/branches/J6/src/main/java/org/apache/commons/scxml/model/Transition.java?rev=730816&r1=730815&r2=730816&view=diff > > > ============================================================================== > > --- > commons/proper/scxml/branches/J6/src/main/java/org/apache/commons/scxml/model/Transition.java > (original) > > +++ > commons/proper/scxml/branches/J6/src/main/java/org/apache/commons/scxml/model/Transition.java > Fri Jan 2 11:03:42 2009 > > @@ -146,6 +146,7 @@ > > * @deprecated A transition may have multiple targets, > > * use getTargets() instead. > > */ > > + @Deprecated > > public final TransitionTarget getTarget() { > > if (targets.size() > 0) { > > return targets.get(0); > > @@ -178,6 +179,7 @@ > > * @deprecated A transition may have multiple targets, > > * use getRuntimeTargets() instead. > > */ > > + @Deprecated > > public final TransitionTarget getRuntimeTarget() { > > return getRuntimeTargets().get(0); > > } > > @@ -208,6 +210,7 @@ > > * @param target The target to set. > > * @deprecated Use setTargets(List) instead. > > */ > > + @Deprecated > > public final void setTarget(final TransitionTarget target) { > > this.targets.add(0, target); > > } > > @@ -240,6 +243,7 @@ > > * @return Path returns the transition path > > * @deprecated Use getPaths() instead. > > */ > > + @Deprecated > > public final Path getPath() { > > return getPaths().get(0); > > } > > > > Modified: > commons/proper/scxml/branches/J6/src/main/java/org/apache/commons/scxml/semantics/ErrorConstants.java > > URL: > http://svn.apache.org/viewvc/commons/proper/scxml/branches/J6/src/main/java/org/apache/commons/scxml/semantics/ErrorConstants.java?rev=730816&r1=730815&r2=730816&view=diff > > > ============================================================================== > > --- > commons/proper/scxml/branches/J6/src/main/java/org/apache/commons/scxml/semantics/ErrorConstants.java > (original) > > +++ > commons/proper/scxml/branches/J6/src/main/java/org/apache/commons/scxml/semantics/ErrorConstants.java > Fri Jan 2 11:03:42 2009 > > @@ -57,6 +57,7 @@ > > * @deprecated Non deterministic behavior is now resolved using > > * state heirarchy and document order priorities. > > */ > > + @Deprecated > > public static final String NON_DETERMINISTIC = "NON_DETERMINISTIC"; > > > > /** > > > > > > > > --------------------------------------------------------------------- > To unsubscribe, e-mail: dev-unsubscr...@commons.apache.org > For additional commands, e-mail: dev-h...@commons.apache.org > > --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@commons.apache.org For additional commands, e-mail: dev-h...@commons.apache.org
