commons-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s...@apache.org
Subject svn commit: r730830 - in /commons/proper/scxml/branches/J6/src/main/java/org/apache/commons/scxml: ErrorReporter.java semantics/ErrorConstants.java
Date Fri, 02 Jan 2009 19:45:18 GMT
Author: sebb
Date: Fri Jan  2 11:45:17 2009
New Revision: 730830

URL: http://svn.apache.org/viewvc?rev=730830&view=rev
Log:
Remove deprecated fields

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/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=730830&r1=730829&r2=730830&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:45:17 2009
@@ -16,9 +16,6 @@
  */
 package org.apache.commons.scxml;
 
-// Used for suggesting replacement in deprecation warnings
-import org.apache.commons.scxml.semantics.ErrorConstants;
-
 /**
  * An interface for reporting SCXML errors to the host environment,
  * containing the definition of commonly occuring errors while executing
@@ -39,70 +36,4 @@
      *            may be accompanied by additional information
      */
     void onError(String errCode, String errDetail, Object errCtx);
-
-    /**
-     * Missing initial state for a composite state or for the scxml root.
-     *
-     * @see org.apache.commons.scxml.model.SCXML#getInitialState()
-     * @see org.apache.commons.scxml.model.State#getInitial()
-     *
-     * @deprecated Use {@link ErrorConstants#NO_INITIAL} instead.
-     */
-    @Deprecated
-    String NO_INITIAL = "NO_INITIAL";
-
-    /**
-     * An initial state for a composite state whose Transition does not.
-     * Map to a descendant of the composite state.
-     *
-     * @deprecated Use {@link ErrorConstants#ILLEGAL_INITIAL} instead.
-     */
-    @Deprecated
-    String ILLEGAL_INITIAL = "ILLEGAL_INITIAL";
-
-    /**
-     * Unknown action - unsupported executable content. List of supported.
-     * actions: assign, cancel, elseif, else, if, log, send, var
-     *
-     * @deprecated Use {@link ErrorConstants#UNKNOWN_ACTION} instead.
-     */
-    @Deprecated
-    String UNKNOWN_ACTION = "UNKNOWN_ACTION";
-
-    /**
-     * Illegal state machine configuration.
-     * Either a parallel exists which does not have all its AND sub-states
-     * active or there are multiple enabled OR states on the same level.
-     *
-     * @deprecated Use {@link ErrorConstants#ILLEGAL_CONFIG} instead.
-     */
-    @Deprecated
-    String ILLEGAL_CONFIG = "ILLEGAL_CONFIG";
-
-    /**
-     * Non-deterministic situation has occured - there are more than
-     * one enabled transitions in conflict.
-     *
-     * @deprecated No longer necessary, non determinism is solved based
-     *             on state heirarchy and document order priorities.
-     */
-    @Deprecated
-    String NON_DETERMINISTIC = "NON_DETERMINISTIC";
-
-    /**
-     * A variable referred to by assign name attribute is undefined.
-     *
-     * @deprecated Use {@link ErrorConstants#UNDEFINED_VARIABLE} instead.
-     */
-    @Deprecated
-    String UNDEFINED_VARIABLE = "UNDEFINED_VARIABLE";
-
-    /**
-     * An expression language error.
-     *
-     * @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/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=730830&r1=730829&r2=730830&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:45:17 2009
@@ -25,7 +25,7 @@
     /**
      * Missing initial state for a composite state or for the scxml root.
      *
-     * @see org.apache.commons.scxml.model.SCXML#getInitialState()
+     * @see org.apache.commons.scxml.model.SCXML#getInitialTarget()
      * @see org.apache.commons.scxml.model.State#getInitial()
      */
     public static final String NO_INITIAL = "NO_INITIAL";
@@ -51,16 +51,6 @@
     public static final String ILLEGAL_CONFIG = "ILLEGAL_CONFIG";
 
     /**
-     * Non-deterministic situation has occured - there are more than
-     * one enabled transitions in conflict.
-     *
-     * @deprecated Non deterministic behavior is now resolved using
-     *             state heirarchy and document order priorities.
-     */
-    @Deprecated
-    public static final String NON_DETERMINISTIC = "NON_DETERMINISTIC";
-
-    /**
      * A variable referred to by assign name attribute is undefined.
      */
     public static final String UNDEFINED_VARIABLE = "UNDEFINED_VARIABLE";



Mime
View raw message