commons-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s...@apache.org
Subject svn commit: r730863 - in /commons/proper/scxml/branches/J6/src/main/java/org/apache/commons/scxml: env/AbstractStateMachine.java model/Data.java model/Invoke.java model/Parallel.java model/SCXML.java model/State.java model/Transition.java
Date Fri, 02 Jan 2009 23:14:16 GMT
Author: sebb
Date: Fri Jan  2 15:14:14 2009
New Revision: 730863

URL: http://svn.apache.org/viewvc?rev=730863&view=rev
Log:
Remove unused deprecated methods and fields

Modified:
    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/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

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=730863&r1=730862&r2=730863&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 15:14:14 2009
@@ -206,17 +206,6 @@
     }
 
     /**
-     * Get the SCXML object representing this state machine.
-     *
-     * @return Returns the stateMachine.
-     * @deprecated Returns null, use getEngine().getStateMachine() instead
-     */
-    @Deprecated
-    public static SCXML getStateMachine() {
-        return null;
-    }
-
-    /**
      * Get the SCXML engine driving the "lifecycle" of the
      * instances of this class.
      *

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=730863&r1=730862&r2=730863&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 15:14:14 2009
@@ -73,28 +73,6 @@
     }
 
     /**
-     * Get the name.
-     *
-     * @return String The name.
-     * @deprecated Use {@link #getId()} instead.
-     */
-    @Deprecated
-    public final String getName() {
-        return id;
-    }
-
-    /**
-     * Set the name.
-     *
-     * @param name The name.
-     * @deprecated Use {@link #setId(String)} instead.
-     */
-    @Deprecated
-    public final void setName(final String name) {
-        this.id = name;
-    }
-
-    /**
      * Get the id.
      *
      * @return String An identifier.

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=730863&r1=730862&r2=730863&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 15:14:14 2009
@@ -147,17 +147,6 @@
     }
 
     /**
-     * Get the params Map.
-     *
-     * @return Map The params map.
-     * @deprecated Remove in v1.0, use params() instead
-     */
-    @Deprecated
-    public final Map<String, String> getParams() {
-        return params;
-    }
-
-    /**
      * Get the list of {@link Param}s.
      *
      * @return List The params list.

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=730863&r1=730862&r2=730863&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 15:14:14 2009
@@ -48,34 +48,6 @@
     }
 
     /**
-     * Get the set of parallel state machines contained in this Parallel.
-     *
-     * @return Returns the state.
-     *
-     * @deprecated Use getChildren() instead.
-     */
-    @Deprecated
-    public final Set<TransitionTarget> getStates() {
-        return children;
-    }
-
-    /**
-     * Add a State to the list of parallel state machines contained
-     * in this Parallel.
-     *
-     * @param state The state to add.
-     *
-     * @deprecated Use addChild(TransitionTarget) instead.
-     */
-    @Deprecated
-    public final void addState(final State state) {
-        if (state != null) {
-            this.children.add(state);
-            state.setParent(this);
-        }
-    }
-
-    /**
      * Get the set of child transition targets (may be empty).
      *
      * @return Set Returns the children.

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=730863&r1=730862&r2=730863&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 15:14:14 2009
@@ -96,34 +96,6 @@
     }
 
     /**
-     * Get the initial State.
-     *
-     * @return State Returns the initialstate.
-     *
-     * @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;
-        }
-        return null;
-    }
-
-    /**
-     * Set the initial State.
-     *
-     * @param initialState The initialstate to set.
-     *
-     * @deprecated Use setInitialTarget(TransitionTarget) instead.
-     */
-    @Deprecated
-    public final void setInitialState(final State initialState) {
-        this.initialTarget = initialState;
-    }
-
-    /**
      * Get the initial TransitionTarget.
      *
      * @return Returns the initial target for this state machine.
@@ -164,30 +136,6 @@
     }
 
     /**
-     * Get the children states.
-     *
-     * @return Map Returns map of the child states.
-     *
-     * @deprecated Use getChildren() instead.
-     */
-    @Deprecated
-    public final Map<String, TransitionTarget> getStates() {
-        return children;
-    }
-
-    /**
-     * Add a child state.
-     *
-     * @param state The state to be added to the states Map.
-     *
-     * @deprecated Use addChild(TransitionTarget) instead.
-     */
-    @Deprecated
-    public final void addState(final State state) {
-        children.put(state.getId(), state);
-    }
-
-    /**
      * Get the immediate child targets of the SCXML root.
      *
      * @return Map Returns map of the child targets.
@@ -290,30 +238,6 @@
     }
 
     /**
-     * Get the ID of the initial state.
-     *
-     * @return String Returns the initial state ID (used by XML Digester only).
-     * @see #getInitialTarget()
-     * @deprecated Use {@link #getInitial()} instead.
-     */
-    @Deprecated
-    public final String getInitialstate() {
-        return initial;
-    }
-
-    /**
-     * Set the ID of the initial state.
-     *
-     * @param initialstate The initial state ID (used by XML Digester only).
-     * @see #setInitialTarget(TransitionTarget)
-     * @deprecated Use {@link #setInitial(String)} instead.
-     */
-    @Deprecated
-    public final void setInitialstate(final String initialstate) {
-        this.initial = initialstate;
-    }
-
-    /**
      * Get the ID of the initial transition target.
      *
      * @return String Returns the initial transition target ID

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=730863&r1=730862&r2=730863&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 15:14:14 2009
@@ -67,16 +67,6 @@
     private Initial initial;
 
     /**
-     * Applies to composite states only. If one of its final children is
-     * active, its parent is marked done. This property is reset upon
-     * re-entry.
-     *
-     * @deprecated Will be removed in v1.0
-     */
-    @Deprecated
-    private boolean done = false;
-
-    /**
      * Constructor.
      */
     public State() {
@@ -87,29 +77,6 @@
      * Is this state a &quot;final&quot; state.
      *
      * @return boolean Returns the isFinal.
-     * @deprecated Use {@link #isFinal()} instead
-     */
-    @Deprecated
-    public final boolean getIsFinal() {
-        return isFinal;
-    }
-
-    /**
-     * Set whether this is a &quot;final&quot; state.
-     *
-     * @param isFinal
-     *            The isFinal to set.
-     * @deprecated Use {@link #setFinal(boolean)} instead
-     */
-    @Deprecated
-    public final void setIsFinal(final boolean isFinal) {
-        this.isFinal = isFinal;
-    }
-
-    /**
-     * Is this state a &quot;final&quot; state.
-     *
-     * @return boolean Returns the isFinal.
      *
      * @since 0.7
      */
@@ -143,20 +110,6 @@
     }
 
     /**
-     * Set the Parallel child.
-     *
-     * @param parallel
-     *            The parallel to set.
-     *
-     * @deprecated &lt;parallel&gt; no longer needs an enclosing
-     *             &lt;state&gt; element.
-     */
-    @Deprecated
-    public final void setParallel(final Parallel parallel) {
-        this.parallel = parallel;
-    }
-
-    /**
      * Get the Invoke child (may be null).
      *
      * @return Invoke Returns the invoke.
@@ -232,20 +185,6 @@
     }
 
     /**
-     * Add a child state.
-     *
-     * @param state
-     *            a child state
-     *
-     * @deprecated Use {@link #addChild(TransitionTarget)} instead.
-     */
-    @Deprecated
-    public final void addChild(final State state) {
-        this.children.put(state.getId(), state);
-        state.setParent(this);
-    }
-
-    /**
      * Add a child transition target.
      *
      * @param tt
@@ -313,30 +252,5 @@
         return false;
     }
 
-    /**
-     * In case this is a parallel state, check if one its final states
-     * is active.
-     *
-     * @return Returns the done.
-     * @deprecated Will be removed in v1.0, in favor of
-     *             <code>SCInstance#isDone(TransitionTarget)</code>
-     */
-    @Deprecated
-    public final boolean isDone() {
-        return done;
-    }
-
-    /**
-     * Update the done property, which is set if this is a parallel state,
-     * and one its final states is active.
-     *
-     * @param done The done to set.
-     * @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=730863&r1=730862&r2=730863&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 15:14:14 2009
@@ -168,23 +168,6 @@
     }
 
     /**
-     * Get the runtime transition target, which always resolves to
-     * a TransitionTarget instance.
-     *
-     * @return Returns the actual target of a transition at runtime.
-     * <p>Remarks: For both the &quot;stay&quot; and &quot;self&quot;
-     * transitions it returns parent (the source node). This method should
-     * never return <code>null</code>.</p>
-     *
-     * @deprecated A transition may have multiple targets,
-     *             use getRuntimeTargets() instead.
-     */
-    @Deprecated
-    public final TransitionTarget getRuntimeTarget() {
-        return getRuntimeTargets().get(0);
-    }
-
-    /**
      * Get the list of runtime transition target, which always contains
      * atleast one TransitionTarget instance.
      *
@@ -205,17 +188,6 @@
     }
 
     /**
-     * Set the transition target.
-     *
-     * @param target The target to set.
-     * @deprecated Use setTargets(List) instead.
-     */
-    @Deprecated
-    public final void setTarget(final TransitionTarget target) {
-        this.targets.add(0, target);
-    }
-
-    /**
      * Get the ID of the transition target (may be null, if, for example,
      * the target is specified inline).
      *
@@ -237,18 +209,6 @@
     }
 
     /**
-     * Get the path of this transiton.
-     *
-     * @see Path
-     * @return Path returns the transition path
-     * @deprecated Use getPaths() instead.
-     */
-    @Deprecated
-    public final Path getPath() {
-        return getPaths().get(0);
-    }
-
-    /**
      * Get the path(s) of this transiton.
      *
      * @see Path



Mime
View raw message