Author: koen.aers(a)jboss.com Date: 2008-07-29 05:41:25 -0400 (Tue, 29 Jul 2008) New Revision: 9373 Added: trunk/flow/plugins/org.jboss.tools.flow.common.core/src/org/ trunk/flow/plugins/org.jboss.tools.flow.common.core/src/org/jboss/ trunk/flow/plugins/org.jboss.tools.flow.common.core/src/org/jboss/tools/ trunk/flow/plugins/org.jboss.tools.flow.common.core/src/org/jboss/tools/flow/ trunk/flow/plugins/org.jboss.tools.flow.common.core/src/org/jboss/tools/flow/common/ trunk/flow/plugins/org.jboss.tools.flow.common.core/src/org/jboss/tools/flow/common/core/ trunk/flow/plugins/org.jboss.tools.flow.common.core/src/org/jboss/tools/flow/common/core/AbstractConnection.java trunk/flow/plugins/org.jboss.tools.flow.common.core/src/org/jboss/tools/flow/common/core/AbstractFlow.java trunk/flow/plugins/org.jboss.tools.flow.common.core/src/org/jboss/tools/flow/common/core/AbstractNode.java trunk/flow/plugins/org.jboss.tools.flow.common.core/src/org/jboss/tools/flow/common/core/AbstractNodeContainer.java trunk/flow/plugins/org.jboss.tools.flow.common.core/src/org/jboss/tools/flow/common/core/NodeContainer.java Removed: trunk/flow/plugins/org.jboss.tools.flow.common.core/src/main/ trunk/flow/plugins/org.jboss.tools.flow.common.core/src/org/jboss/tools/flow/common/core/NodeContainer.java trunk/flow/plugins/org.jboss.tools.flow.common.core/src/org/jboss/tools/flow/common/core/WorkflowProcess.java Modified: trunk/flow/plugins/org.jboss.tools.flow.common.core/.classpath trunk/flow/plugins/org.jboss.tools.flow.common.core/build.properties Log: changed source and output folders Modified: trunk/flow/plugins/org.jboss.tools.flow.common.core/.classpath =================================================================== --- trunk/flow/plugins/org.jboss.tools.flow.common.core/.classpath 2008-07-28 17:44:04 UTC (rev 9372) +++ trunk/flow/plugins/org.jboss.tools.flow.common.core/.classpath 2008-07-29 09:41:25 UTC (rev 9373) @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="src" path="src/main/java"/> + <classpathentry kind="src" path="src"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> - <classpathentry kind="output" path="target"/> + <classpathentry kind="output" path="bin"/> </classpath> Modified: trunk/flow/plugins/org.jboss.tools.flow.common.core/build.properties =================================================================== --- trunk/flow/plugins/org.jboss.tools.flow.common.core/build.properties 2008-07-28 17:44:04 UTC (rev 9372) +++ trunk/flow/plugins/org.jboss.tools.flow.common.core/build.properties 2008-07-29 09:41:25 UTC (rev 9373) @@ -1,4 +1,2 @@ -source.. = src/ output.. = target/ -bin.includes = META-INF/,\ - . +bin.includes = META-INF/ Copied: trunk/flow/plugins/org.jboss.tools.flow.common.core/src/org/jboss/tools/flow/common/core (from rev 9355, trunk/flow/plugins/org.jboss.tools.flow.common.core/src/main/java/org/jboss/tools/flow/common/core) Property changes on: trunk/flow/plugins/org.jboss.tools.flow.common.core/src/org/jboss/tools/flow/common/core ___________________________________________________________________ Name: svn:mergeinfo + Copied: trunk/flow/plugins/org.jboss.tools.flow.common.core/src/org/jboss/tools/flow/common/core/AbstractConnection.java (from rev 9359, trunk/flow/plugins/org.jboss.tools.flow.common.core/src/main/java/org/jboss/tools/flow/common/core/AbstractConnection.java) =================================================================== --- trunk/flow/plugins/org.jboss.tools.flow.common.core/src/org/jboss/tools/flow/common/core/AbstractConnection.java (rev 0) +++ trunk/flow/plugins/org.jboss.tools.flow.common.core/src/org/jboss/tools/flow/common/core/AbstractConnection.java 2008-07-29 09:41:25 UTC (rev 9373) @@ -0,0 +1,31 @@ +package org.jboss.tools.flow.common.core; + +import java.util.HashMap; + +public abstract class AbstractConnection implements Connection { + + private HashMap<String, Object> metaData = new HashMap<String, Object>(); + private Node from, to; + + public AbstractConnection(Node from, Node to) { + this.from = from; + this.to = to; + } + + public Object getMetaData(String key) { + return metaData.get(key); + } + + public void setMetaData(String key, Object value) { + metaData.put(key, value); + } + + public Node getFrom() { + return from; + } + + public Node getTo() { + return to; + } + +} Copied: trunk/flow/plugins/org.jboss.tools.flow.common.core/src/org/jboss/tools/flow/common/core/AbstractFlow.java (from rev 9359, trunk/flow/plugins/org.jboss.tools.flow.common.core/src/main/java/org/jboss/tools/flow/common/core/AbstractFlow.java) =================================================================== --- trunk/flow/plugins/org.jboss.tools.flow.common.core/src/org/jboss/tools/flow/common/core/AbstractFlow.java (rev 0) +++ trunk/flow/plugins/org.jboss.tools.flow.common.core/src/org/jboss/tools/flow/common/core/AbstractFlow.java 2008-07-29 09:41:25 UTC (rev 9373) @@ -0,0 +1,88 @@ +package org.jboss.tools.flow.common.core; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; + +public class AbstractFlow implements Flow { + + private String name; + private HashMap<String, Object> metaData = new HashMap<String, Object>(); + private ArrayList<Node> nodes = new ArrayList<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 String getId() { + // TODO Auto-generated method stub + return null; + } + + public String getPackageName() { + // TODO Auto-generated method stub + return null; + } + + public String getType() { + // TODO Auto-generated method stub + return null; + } + + public String getVersion() { + // TODO Auto-generated method stub + return null; + } + + public void setId(String id) { + // TODO Auto-generated method stub + + } + + public void setPackageName(String packageName) { + // TODO Auto-generated method stub + + } + + public void setType(String type) { + // TODO Auto-generated method stub + + } + + public void setVersion(String version) { + // TODO Auto-generated method stub + + } + + public Node getNode(long id) { + // TODO Auto-generated method stub + return null; + } + +} Copied: trunk/flow/plugins/org.jboss.tools.flow.common.core/src/org/jboss/tools/flow/common/core/AbstractNode.java (from rev 9359, trunk/flow/plugins/org.jboss.tools.flow.common.core/src/main/java/org/jboss/tools/flow/common/core/AbstractNode.java) =================================================================== --- trunk/flow/plugins/org.jboss.tools.flow.common.core/src/org/jboss/tools/flow/common/core/AbstractNode.java (rev 0) +++ trunk/flow/plugins/org.jboss.tools.flow.common.core/src/org/jboss/tools/flow/common/core/AbstractNode.java 2008-07-29 09:41:25 UTC (rev 9373) @@ -0,0 +1,45 @@ +package org.jboss.tools.flow.common.core; + +import java.util.HashMap; + +public class AbstractNode { + + private long id; + private String name; + private AbstractFlow 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(AbstractFlow container) { + this.container = container; + } + +} Copied: trunk/flow/plugins/org.jboss.tools.flow.common.core/src/org/jboss/tools/flow/common/core/AbstractNodeContainer.java (from rev 9359, trunk/flow/plugins/org.jboss.tools.flow.common.core/src/main/java/org/jboss/tools/flow/common/core/AbstractNodeContainer.java) =================================================================== --- trunk/flow/plugins/org.jboss.tools.flow.common.core/src/org/jboss/tools/flow/common/core/AbstractNodeContainer.java (rev 0) +++ trunk/flow/plugins/org.jboss.tools.flow.common.core/src/org/jboss/tools/flow/common/core/AbstractNodeContainer.java 2008-07-29 09:41:25 UTC (rev 9373) @@ -0,0 +1,52 @@ +package org.jboss.tools.flow.common.core; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; + +public abstract class AbstractNodeContainer implements NodeContainer { + + private String name; + private HashMap<String, Object> metaData = new HashMap<String, Object>(); + private ArrayList<Node> nodes = new ArrayList<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 Node getNode(long id) { + for (Node node : nodes) { + if (node.getId() == id) { + return node; + } + } + return null; + } + +} Deleted: trunk/flow/plugins/org.jboss.tools.flow.common.core/src/org/jboss/tools/flow/common/core/NodeContainer.java =================================================================== --- trunk/flow/plugins/org.jboss.tools.flow.common.core/src/main/java/org/jboss/tools/flow/common/core/NodeContainer.java 2008-07-28 13:56:22 UTC (rev 9355) +++ trunk/flow/plugins/org.jboss.tools.flow.common.core/src/org/jboss/tools/flow/common/core/NodeContainer.java 2008-07-29 09:41:25 UTC (rev 9373) @@ -1,45 +0,0 @@ -package org.jboss.tools.flow.common.core; - -/** - * A container of nodes. - * - * @author <a href="mailto:kris_verlaenen@hotmail.com">Kris Verlaenen</a> - */ -public interface NodeContainer { - - /** - * Returns the nodes of this node container. - * - * @return the nodes of this node container - */ - Node[] getNodes(); - - /** - * Returns the node with the given id - * - * @param id - * the node id - * @return the node with the given id - * @throws IllegalArgumentException - * if an unknown id is passed - */ - Node getNode(long id); - - /** - * Method for adding a node to this node container. - * Note that the node will get an id unique for this node container. - * - * @param node the node to be added - * @throws IllegalArgumentException if <code>node</code> is null - */ - void addNode(Node node); - - /** - * Method for removing a node from this node container - * - * @param node the node to be removed - * @throws IllegalArgumentException if <code>node</code> is null or unknown - */ - void removeNode(Node node); - -} Copied: trunk/flow/plugins/org.jboss.tools.flow.common.core/src/org/jboss/tools/flow/common/core/NodeContainer.java (from rev 9359, trunk/flow/plugins/org.jboss.tools.flow.common.core/src/main/java/org/jboss/tools/flow/common/core/NodeContainer.java) =================================================================== --- trunk/flow/plugins/org.jboss.tools.flow.common.core/src/org/jboss/tools/flow/common/core/NodeContainer.java (rev 0) +++ trunk/flow/plugins/org.jboss.tools.flow.common.core/src/org/jboss/tools/flow/common/core/NodeContainer.java 2008-07-29 09:41:25 UTC (rev 9373) @@ -0,0 +1,47 @@ +package org.jboss.tools.flow.common.core; + +import java.util.List; + +/** + * A container of nodes. + * + * @author <a href="mailto:kris_verlaenen@hotmail.com">Kris Verlaenen</a> + */ +public interface NodeContainer { + + /** + * Returns the nodes of this node container. + * + * @return the nodes of this node container + */ + List<Node> getNodes(); + + /** + * Returns the node with the given id + * + * @param id + * the node id + * @return the node with the given id + * @throws IllegalArgumentException + * if an unknown id is passed + */ + Node getNode(long id); + + /** + * Method for adding a node to this node container. + * Note that the node will get an id unique for this node container. + * + * @param node the node to be added + * @throws IllegalArgumentException if <code>node</code> is null + */ + void addNode(Node node); + + /** + * Method for removing a node from this node container + * + * @param node the node to be removed + * @throws IllegalArgumentException if <code>node</code> is null or unknown + */ + void removeNode(Node node); + +} Deleted: trunk/flow/plugins/org.jboss.tools.flow.common.core/src/org/jboss/tools/flow/common/core/WorkflowProcess.java =================================================================== --- trunk/flow/plugins/org.jboss.tools.flow.common.core/src/main/java/org/jboss/tools/flow/common/core/WorkflowProcess.java 2008-07-28 13:56:22 UTC (rev 9355) +++ trunk/flow/plugins/org.jboss.tools.flow.common.core/src/org/jboss/tools/flow/common/core/WorkflowProcess.java 2008-07-29 09:41:25 UTC (rev 9373) @@ -1,27 +0,0 @@ -package org.jboss.tools.flow.common.core; - -/* - * Copyright 2005 JBoss Inc - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - - -/** - * Represents a RuleFlow process. - * - * @author <a href="mailto:kris_verlaenen@hotmail.com">Kris Verlaenen</a> - */ -public interface WorkflowProcess extends Flow, NodeContainer { - -}