Author: koen.aers(a)jboss.com Date: 2009-01-18 20:20:43 -0500 (Sun, 18 Jan 2009) New Revision: 13107 Modified: trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/editor/GenericModelEditor.java trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/model/Container.java trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/model/DefaultConnection.java trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/model/DefaultNode.java Log: - implement addition and removing of connections for default node - containers are elements Modified: trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/editor/GenericModelEditor.java =================================================================== --- trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/editor/GenericModelEditor.java 2009-01-18 14:24:16 UTC (rev 13106) +++ trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/editor/GenericModelEditor.java 2009-01-19 01:20:43 UTC (rev 13107) @@ -359,9 +359,9 @@ return overviewOutlinePage; } - public String getContributorId() { - return getSite().getId(); - } +// public String getContributorId() { +// return getSite().getId(); +// } /** * Writes the content of this editor to the given stream. Possible formats Modified: trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/model/Container.java =================================================================== --- trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/model/Container.java 2009-01-18 14:24:16 UTC (rev 13106) +++ trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/model/Container.java 2009-01-19 01:20:43 UTC (rev 13107) @@ -7,7 +7,7 @@ * * @author <a href="mailto:kris_verlaenen@hotmail.com">Kris Verlaenen</a> */ -public interface Container { +public interface Container extends Element{ /** * Returns the nodes of this node container. Modified: trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/model/DefaultConnection.java =================================================================== --- trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/model/DefaultConnection.java 2009-01-18 14:24:16 UTC (rev 13106) +++ trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/model/DefaultConnection.java 2009-01-19 01:20:43 UTC (rev 13107) @@ -12,8 +12,8 @@ } public DefaultConnection(Node from, Node to) { - this.from = from; - this.to = to; + setFrom(from); + setTo(to); } public Object getMetaData(String key) { @@ -29,7 +29,13 @@ } public void setFrom(Node node) { - this.from = node; + if (from != null) { + from.removeOutgoingConnection(null, this); + } + from = node; + if (from != null) { + from.addOutgoingConnection(null, this); + } } public Node getTo() { @@ -37,7 +43,13 @@ } public void setTo(Node node) { - this.to = node; + if (to != null) { + to.removeIncomingConnection(null, this); + } + to = node; + if (to != null) { + to.addIncomingConnection(null, this); + } } public String getFromType() { Modified: trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/model/DefaultNode.java =================================================================== --- trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/model/DefaultNode.java 2009-01-18 14:24:16 UTC (rev 13106) +++ trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/model/DefaultNode.java 2009-01-19 01:20:43 UTC (rev 13107) @@ -1,5 +1,6 @@ package org.jboss.tools.flow.common.model; +import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -11,6 +12,9 @@ private Container container; private HashMap<String, Object> metaData = new HashMap<String, Object>(); + + private List<Connection> incomingConnections = new ArrayList<Connection>(); + private List<Connection> outgoingConnections = new ArrayList<Connection>(); public long getId() { return id; @@ -45,43 +49,39 @@ } public void addIncomingConnection(String type, Connection connection) { - // TODO Auto-generated method stub - + incomingConnections.add(connection); } public void addOutgoingConnection(String type, Connection connection) { - // TODO Auto-generated method stub - + outgoingConnections.add(connection); } public Map<String, List<Connection>> getIncomingConnections() { - // TODO Auto-generated method stub - return null; + HashMap<String, List<Connection>> result = new HashMap<String, List<Connection>>(); + result.put(null, getIncomingConnections(null)); + return result; } public List<Connection> getIncomingConnections(String type) { - // TODO Auto-generated method stub - return null; + return new ArrayList<Connection>(incomingConnections); } public Map<String, List<Connection>> getOutgoingConnections() { - // TODO Auto-generated method stub - return null; + HashMap<String, List<Connection>> result = new HashMap<String, List<Connection>>(); + result.put(null, getOutgoingConnections(null)); + return result; } public List<Connection> getOutgoingConnections(String type) { - // TODO Auto-generated method stub - return null; + return new ArrayList<Connection>(outgoingConnections); } public void removeIncomingConnection(String type, Connection connection) { - // TODO Auto-generated method stub - + incomingConnections.remove(connection); } public void removeOutgoingConnection(String type, Connection connection) { - // TODO Auto-generated method stub - + outgoingConnections.remove(connection); } }