--- a/gnv-artifacts/src/main/java/de/intevation/gnv/artifacts/GNVArtifactBase.java	Mon Dec 07 17:03:24 2009 +0000
+++ b/gnv-artifacts/src/main/java/de/intevation/gnv/artifacts/GNVArtifactBase.java	Tue Dec 08 08:39:03 2009 +0000
@@ -26,14 +26,14 @@
 import de.intevation.artifacts.CallContext;
 import de.intevation.artifacts.CallMeta;
 import de.intevation.gnv.artifacts.context.GNVArtifactContext;
-import de.intevation.gnv.transition.DefaultInputData;
-import de.intevation.gnv.transition.InputData;
-import de.intevation.gnv.transition.InputValue;
-import de.intevation.gnv.transition.OutputMode;
-import de.intevation.gnv.transition.OutputTransition;
-import de.intevation.gnv.transition.Transition;
-import de.intevation.gnv.transition.TransitionFactory;
-import de.intevation.gnv.transition.exception.TransitionException;
+import de.intevation.gnv.state.DefaultInputData;
+import de.intevation.gnv.state.InputData;
+import de.intevation.gnv.state.InputValue;
+import de.intevation.gnv.state.OutputMode;
+import de.intevation.gnv.state.OutputState;
+import de.intevation.gnv.state.State;
+import de.intevation.gnv.state.StateFactory;
+import de.intevation.gnv.state.exception.StateException;
 import de.intevation.gnv.utils.ArtifactXMLUtilities;
 
 /**
@@ -63,14 +63,14 @@
                                                               + "']";
 
     /**
-     * The current Transition
+     * The current State
      */
-    protected Transition current = null;
+    protected State current = null;
 
     /**
-     * The Transitions that can be used
+     * The States that can be used
      */
-    protected Map<String, Transition> transitions = null;
+    protected Map<String, State> states = null;
 
     /**
      * The Name of the Artifact
@@ -96,12 +96,12 @@
         Document result = XMLUtils.newDocument();
         try {
             if (this.current != null) {
-                String transitionName = this.readTransitionName(target);
-                log.debug("Transitionsname: " + transitionName);
-                if (this.current.isTransitionReachable(transitionName)) {
+                String stateName = this.readStateName(target);
+                log.debug("Statename: " + stateName);
+                if (this.current.isStateReachable(stateName)) {
                     try {
-                        Transition nextStep = this.transitions
-                                .get(transitionName);
+                        State nextStep = this.states
+                                .get(stateName);
                         // 1.Ergebnisse Berechnen
                         this.current.advance(super.identifier, context.getMeta());
                         // 2. Ergebnisse Übergeben
@@ -116,7 +116,7 @@
                         result = new ArtifactXMLUtilities()
                                 .createSuccessReport("Advance success",
                                         XMLUtils.newDocument());
-                    } catch (TransitionException e) {
+                    } catch (StateException e) {
                         log.error(e, e);
                         result = new ArtifactXMLUtilities()
                                 .createExceptionReport(e
@@ -130,7 +130,7 @@
                             msg, XMLUtils.newDocument());
                 }
             } else {
-                String msg = "Kein Transitionsschritt aktiviert.";
+                String msg = "Kein State aktiviert.";
                 log.error(msg);
                 result = new ArtifactXMLUtilities().createExceptionReport(msg,
                         XMLUtils.newDocument());
@@ -151,7 +151,7 @@
             result = new ArtifactXMLUtilities()
             .createSuccessReport("Initialize success",
                     XMLUtils.newDocument());
-        } catch (TransitionException e) {
+        } catch (StateException e) {
             log.error(e,e);
             result = new ArtifactXMLUtilities().createExceptionReport(e
                     .getLocalizedMessage(), XMLUtils.newDocument());
@@ -159,7 +159,7 @@
         return result;
     }
 
-    protected String readTransitionName(Document document) {
+    protected String readStateName(Document document) {
         String returnValue = Config.getStringXPath(document,
                 "action/target/@name");
         return returnValue;
@@ -205,12 +205,12 @@
                             XMLUtils.newDocument());
                 }
             } else {
-                String msg = "No Transition instantiated";
+                String msg = "No State instantiated";
                 log.warn(msg);
                 result = new ArtifactXMLUtilities().createExceptionReport(msg,
                         XMLUtils.newDocument());
             }
-        } catch (TransitionException e) {
+        } catch (StateException e) {
             log.error(e, e);
             result = new ArtifactXMLUtilities().createExceptionReport(e
                     .getLocalizedMessage(), XMLUtils.newDocument());
@@ -238,17 +238,17 @@
             Document doc = gnvContext.getConfig();
             Node artifactNode = this.getConfigurationFragment(doc);
                         
-            NodeList transitionList = Config.getNodeSetXPath(artifactNode,
-                    "transitions/transition");
-            this.transitions = new HashMap<String, Transition>(transitionList
+            NodeList stateList = Config.getNodeSetXPath(artifactNode,
+                    "states/state");
+            this.states = new HashMap<String, State>(stateList
                     .getLength());
-            for (int i = 0; i < transitionList.getLength(); i++) {
-                Transition tmpTransition = TransitionFactory.getInstance()
-                        .createTransition(transitionList.item(i));
-                if (tmpTransition != null) {
-                    this.transitions.put(tmpTransition.getID(), tmpTransition);
+            for (int i = 0; i < stateList.getLength(); i++) {
+                State tmpState = StateFactory.getInstance()
+                        .createState(stateList.item(i));
+                if (tmpState != null) {
+                    this.states.put(tmpState.getID(), tmpState);
                     if (this.current == null) {
-                        this.current = tmpTransition;
+                        this.current = tmpState;
                     }
                 }
             }
@@ -308,7 +308,7 @@
         Element stateNode = xmlUtilities.createArtifactElement(document,
                 "reachable-states");
         if (this.current != null) {
-            Iterator<String> states = this.current.reachableTransitions()
+            Iterator<String> states = this.current.reachableStates()
                     .iterator();
             while (states.hasNext()) {
                 String value = states.next();
@@ -316,7 +316,7 @@
                         document, "state");
                 currentNode.setAttribute("name", value);
                 log.debug("Reachable State: " + value);
-                currentNode.setAttribute("description", transitions.get(value)
+                currentNode.setAttribute("description", this.states.get(value)
                         .getDescription());
                 stateNode.appendChild(currentNode);
             }
@@ -368,8 +368,8 @@
         log.debug("GNVArtifactBase.createOutputs");
         Element outputsNode = xmlUtilities.createArtifactElement(document,
                 "outputs");
-        if (this.current instanceof OutputTransition) {
-            Collection<OutputMode> outputModes = ((OutputTransition) this.current)
+        if (this.current instanceof OutputState) {
+            Collection<OutputMode> outputModes = ((OutputState) this.current)
                     .getOutputModes();
             if (outputModes != null) {
                 Iterator<OutputMode> it = outputModes.iterator();
@@ -457,13 +457,13 @@
         log.debug("TGNVArtifactBase.out");
         try {
 
-            if (current != null && current instanceof OutputTransition) {
-                ((OutputTransition) current)
+            if (current != null && current instanceof OutputState) {
+                ((OutputState) current)
                         .out(format, this.parseInputData(
                                 format, "/action/out/params/input"),
                                 outputStream, super.identifier, context.getMeta());
             }
-        } catch (TransitionException e) {
+        } catch (StateException e) {
             log.error(e, e);
             throw new IOException(e.getMessage());
         }