[jbosstools-commits] JBoss Tools SVN: r9360 - in trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4.core: src/org/jboss/tools/flow/jpdl4/core and 1 other directory.

Author: koen.aers(a)jboss.com Date: 2008-07-28 11:03:26 -0400 (Mon, 28 Jul 2008) New Revision: 9360 Added: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4.core/src/org/jboss/tools/flow/jpdl4/core/SuperState.java Removed: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4.core/src/org/jboss/tools/flow/jpdl4/core/Node.java Modified: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4.core/META-INF/MANIFEST.MF trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4.core/src/org/jboss/tools/flow/jpdl4/core/EndState.java trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4.core/src/org/jboss/tools/flow/jpdl4/core/Process.java trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4.core/src/org/jboss/tools/flow/jpdl4/core/StartState.java trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4.core/src/org/jboss/tools/flow/jpdl4/core/State.java trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4.core/src/org/jboss/tools/flow/jpdl4/core/Transition.java Log: derive the model from the abstract base implementation Modified: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4.core/META-INF/MANIFEST.MF =================================================================== --- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4.core/META-INF/MANIFEST.MF 2008-07-28 15:00:29 UTC (rev 9359) +++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4.core/META-INF/MANIFEST.MF 2008-07-28 15:03:26 UTC (rev 9360) @@ -6,3 +6,4 @@ Bundle-Vendor: JBoss, a Division of Red Hat Bundle-RequiredExecutionEnvironment: J2SE-1.5 Export-Package: org.jboss.tools.flow.jpdl4.core +Require-Bundle: org.jboss.tools.flow.common.core;bundle-version="1.0.0" Modified: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4.core/src/org/jboss/tools/flow/jpdl4/core/EndState.java =================================================================== --- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4.core/src/org/jboss/tools/flow/jpdl4/core/EndState.java 2008-07-28 15:00:29 UTC (rev 9359) +++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4.core/src/org/jboss/tools/flow/jpdl4/core/EndState.java 2008-07-28 15:03:26 UTC (rev 9360) @@ -1,5 +1,7 @@ package org.jboss.tools.flow.jpdl4.core; -public class EndState extends Node { +import org.jboss.tools.flow.common.core.AbstractNode; +public class EndState extends AbstractNode { + } Deleted: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4.core/src/org/jboss/tools/flow/jpdl4/core/Node.java =================================================================== --- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4.core/src/org/jboss/tools/flow/jpdl4/core/Node.java 2008-07-28 15:00:29 UTC (rev 9359) +++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4.core/src/org/jboss/tools/flow/jpdl4/core/Node.java 2008-07-28 15:03:26 UTC (rev 9360) @@ -1,45 +0,0 @@ -package org.jboss.tools.flow.jpdl4.core; - -import java.util.HashMap; - -public class Node { - - private long id; - private String name; - private Process container; - - private HashMap<String, Object> metaData = new HashMap<String, Object>(); - - public long getId() { - return id; - } - - public void setId(long l) { - id = l; - } - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - public void setMetaData(String key, Object value) { - metaData.put(key, value); - } - - public Object getMetaData(String key) { - return metaData.get(key); - } - - public Object getNodeContainer() { - return container; - } - - public void setNodeContainer(Process container) { - this.container = container; - } - -} Modified: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4.core/src/org/jboss/tools/flow/jpdl4/core/Process.java =================================================================== --- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4.core/src/org/jboss/tools/flow/jpdl4/core/Process.java 2008-07-28 15:00:29 UTC (rev 9359) +++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4.core/src/org/jboss/tools/flow/jpdl4/core/Process.java 2008-07-28 15:03:26 UTC (rev 9360) @@ -1,48 +1,14 @@ package org.jboss.tools.flow.jpdl4.core; -import java.util.ArrayList; -import java.util.HashMap; import java.util.Iterator; -import java.util.List; -public class Process { - - private String name; - private HashMap<String, Object> metaData = new HashMap<String, Object>(); - private ArrayList<Node> nodes = new ArrayList<Node>(); +import org.jboss.tools.flow.common.core.AbstractFlow; +import org.jboss.tools.flow.common.core.Node; - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - public Object getMetaData(String key) { - return metaData.get(key); - } - - public void setMetaData(String key, Object value) { - metaData.put(key, value); - } - - public List<Node> getNodes() { - return nodes; - } - - public void addNode(Node node) { - nodes.add(node); - node.setNodeContainer(this); - } - - public void removeNode(Node node) { - node.setNodeContainer(null); - nodes.remove(node); - } - +public class Process extends AbstractFlow { + public StartState getStartState() { - for (Iterator<Node> iterator = nodes.iterator(); iterator.hasNext(); ) { + for (Iterator<Node> iterator = getNodes().iterator(); iterator.hasNext(); ) { Node node = iterator.next(); if (node instanceof StartState) { return (StartState)node; Modified: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4.core/src/org/jboss/tools/flow/jpdl4/core/StartState.java =================================================================== --- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4.core/src/org/jboss/tools/flow/jpdl4/core/StartState.java 2008-07-28 15:00:29 UTC (rev 9359) +++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4.core/src/org/jboss/tools/flow/jpdl4/core/StartState.java 2008-07-28 15:03:26 UTC (rev 9360) @@ -1,5 +1,7 @@ package org.jboss.tools.flow.jpdl4.core; -public class StartState extends Node { +import org.jboss.tools.flow.common.core.AbstractNode; +public class StartState extends AbstractNode { + } Modified: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4.core/src/org/jboss/tools/flow/jpdl4/core/State.java =================================================================== --- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4.core/src/org/jboss/tools/flow/jpdl4/core/State.java 2008-07-28 15:00:29 UTC (rev 9359) +++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4.core/src/org/jboss/tools/flow/jpdl4/core/State.java 2008-07-28 15:03:26 UTC (rev 9360) @@ -1,5 +1,7 @@ package org.jboss.tools.flow.jpdl4.core; -public class State extends Node { +import org.jboss.tools.flow.common.core.AbstractNode; +public class State extends AbstractNode { + } Added: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4.core/src/org/jboss/tools/flow/jpdl4/core/SuperState.java =================================================================== --- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4.core/src/org/jboss/tools/flow/jpdl4/core/SuperState.java (rev 0) +++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4.core/src/org/jboss/tools/flow/jpdl4/core/SuperState.java 2008-07-28 15:03:26 UTC (rev 9360) @@ -0,0 +1,7 @@ +package org.jboss.tools.flow.jpdl4.core; + +import org.jboss.tools.flow.common.core.AbstractNodeContainer; + +public class SuperState extends AbstractNodeContainer { + +} Modified: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4.core/src/org/jboss/tools/flow/jpdl4/core/Transition.java =================================================================== --- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4.core/src/org/jboss/tools/flow/jpdl4/core/Transition.java 2008-07-28 15:00:29 UTC (rev 9359) +++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4.core/src/org/jboss/tools/flow/jpdl4/core/Transition.java 2008-07-28 15:03:26 UTC (rev 9360) @@ -2,11 +2,15 @@ import java.util.HashMap; -public class Transition { +import org.jboss.tools.flow.common.core.AbstractConnection; +import org.jboss.tools.flow.common.core.Node; + +public class Transition extends AbstractConnection { private HashMap<String, Object> metaData = new HashMap<String, Object>(); public Transition(Node from, Node to) { + super(from, to); } public Object getMetaData(String key) { @@ -17,4 +21,12 @@ metaData.put(key, value); } + public String getFromType() { + return null; + } + + public String getToType() { + return null; + } + }