Author: koen.aers(a)jboss.com
Date: 2008-09-19 15:48:39 -0400 (Fri, 19 Sep 2008)
New Revision: 10383
Modified:
trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/action/VerticalAutoLayoutAction.java
trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/command/DeleteElementCommand.java
trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/command/ElementConnectionCreateCommand.java
trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/command/ReconnectElementConnectionSourceCommand.java
trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/command/ReconnectElementConnectionTargetCommand.java
trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/editpart/ElementEditPart.java
trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/wrapper/AbstractNodeWrapper.java
trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/wrapper/ConnectionWrapper.java
trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/wrapper/DefaultFlowWrapper.java
trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/wrapper/NodeWrapper.java
Log:
replace the use of class AbstractConnectionWrapper with the use of interface
ConnectionWrapper
Modified:
trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/action/VerticalAutoLayoutAction.java
===================================================================
---
trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/action/VerticalAutoLayoutAction.java 2008-09-19
16:42:21 UTC (rev 10382)
+++
trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/action/VerticalAutoLayoutAction.java 2008-09-19
19:48:39 UTC (rev 10383)
@@ -30,8 +30,8 @@
import org.eclipse.jface.action.IAction;
import org.eclipse.jface.resource.ImageDescriptor;
import org.jboss.tools.flow.common.Activator;
-import org.jboss.tools.flow.common.wrapper.AbstractConnectionWrapper;
import org.jboss.tools.flow.common.wrapper.AbstractFlowWrapper;
+import org.jboss.tools.flow.common.wrapper.ConnectionWrapper;
import org.jboss.tools.flow.common.wrapper.NodeWrapper;
/**
@@ -91,7 +91,7 @@
mapping.put(elementWrapper.getId(), node);
}
for (NodeWrapper elementWrapper: processWrapper.getElements()) {
- for (AbstractConnectionWrapper connection:
elementWrapper.getIncomingConnections()) {
+ for (ConnectionWrapper connection: elementWrapper.getIncomingConnections())
{
Node source = mapping.get(connection.getSource().getId());
Node target = mapping.get(connection.getTarget().getId());
graph.edges.add(new Edge(source, target));
Modified:
trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/command/DeleteElementCommand.java
===================================================================
---
trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/command/DeleteElementCommand.java 2008-09-19
16:42:21 UTC (rev 10382)
+++
trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/command/DeleteElementCommand.java 2008-09-19
19:48:39 UTC (rev 10383)
@@ -20,7 +20,7 @@
import java.util.List;
import org.eclipse.gef.commands.Command;
-import org.jboss.tools.flow.common.wrapper.AbstractConnectionWrapper;
+import org.jboss.tools.flow.common.wrapper.ConnectionWrapper;
import org.jboss.tools.flow.common.wrapper.ContainerWrapper;
import org.jboss.tools.flow.common.wrapper.NodeWrapper;
@@ -36,23 +36,23 @@
private List<NodeWrapper> incomingElementWrappers = new
ArrayList<NodeWrapper>();
private List<NodeWrapper> outgoingElementWrappers = new
ArrayList<NodeWrapper>();
- private List<AbstractConnectionWrapper> incomingConnections = new
ArrayList<AbstractConnectionWrapper>();
- private List<AbstractConnectionWrapper> outgoingConnections = new
ArrayList<AbstractConnectionWrapper>();
+ private List<ConnectionWrapper> incomingConnections = new
ArrayList<ConnectionWrapper>();
+ private List<ConnectionWrapper> outgoingConnections = new
ArrayList<ConnectionWrapper>();
private void deleteConnections(NodeWrapper element) {
- for (AbstractConnectionWrapper connection: element.getIncomingConnections()) {
+ for (ConnectionWrapper connection: element.getIncomingConnections()) {
incomingElementWrappers.add(connection.getSource());
incomingConnections.add(connection);
}
- for (AbstractConnectionWrapper connection: element.getOutgoingConnections()) {
+ for (ConnectionWrapper connection: element.getOutgoingConnections()) {
outgoingElementWrappers.add(connection.getTarget());
outgoingConnections.add(connection);
}
- for (AbstractConnectionWrapper connection: incomingConnections) {
+ for (ConnectionWrapper connection: incomingConnections) {
connection.disconnect();
}
- for (AbstractConnectionWrapper connection: outgoingConnections) {
+ for (ConnectionWrapper connection: outgoingConnections) {
connection.disconnect();
}
}
@@ -64,12 +64,12 @@
private void restoreConnections() {
int i = 0;
- for (AbstractConnectionWrapper connection: incomingConnections) {
+ for (ConnectionWrapper connection: incomingConnections) {
connection.connect((NodeWrapper) incomingElementWrappers.get(i), child);
i++;
}
i = 0;
- for (AbstractConnectionWrapper connection: outgoingConnections) {
+ for (ConnectionWrapper connection: outgoingConnections) {
connection.connect(child, (NodeWrapper) outgoingElementWrappers.get(i));
i++;
}
Modified:
trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/command/ElementConnectionCreateCommand.java
===================================================================
---
trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/command/ElementConnectionCreateCommand.java 2008-09-19
16:42:21 UTC (rev 10382)
+++
trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/command/ElementConnectionCreateCommand.java 2008-09-19
19:48:39 UTC (rev 10383)
@@ -18,6 +18,7 @@
import org.eclipse.gef.commands.Command;
import org.jboss.tools.flow.common.wrapper.AbstractConnectionWrapper;
+import org.jboss.tools.flow.common.wrapper.ConnectionWrapper;
import org.jboss.tools.flow.common.wrapper.NodeWrapper;
/**
@@ -36,7 +37,7 @@
return false;
}
// Check for existence of connection already
- for (AbstractConnectionWrapper connection: source.getOutgoingConnections()) {
+ for (ConnectionWrapper connection: source.getOutgoingConnections()) {
if (connection.getTarget().equals(target)) {
return false;
}
Modified:
trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/command/ReconnectElementConnectionSourceCommand.java
===================================================================
---
trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/command/ReconnectElementConnectionSourceCommand.java 2008-09-19
16:42:21 UTC (rev 10382)
+++
trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/command/ReconnectElementConnectionSourceCommand.java 2008-09-19
19:48:39 UTC (rev 10383)
@@ -18,6 +18,7 @@
import org.eclipse.gef.commands.Command;
import org.jboss.tools.flow.common.wrapper.AbstractConnectionWrapper;
+import org.jboss.tools.flow.common.wrapper.ConnectionWrapper;
import org.jboss.tools.flow.common.wrapper.NodeWrapper;
/**
@@ -36,7 +37,7 @@
if (connection.getTarget().equals(newSource)) {
return false;
}
- for (AbstractConnectionWrapper connection: newSource.getOutgoingConnections()) {
+ for (ConnectionWrapper connection: newSource.getOutgoingConnections()) {
if (connection.getTarget().equals(target) &&
!connection.getSource().equals(oldSource)) {
return false;
}
Modified:
trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/command/ReconnectElementConnectionTargetCommand.java
===================================================================
---
trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/command/ReconnectElementConnectionTargetCommand.java 2008-09-19
16:42:21 UTC (rev 10382)
+++
trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/command/ReconnectElementConnectionTargetCommand.java 2008-09-19
19:48:39 UTC (rev 10383)
@@ -18,6 +18,7 @@
import org.eclipse.gef.commands.Command;
import org.jboss.tools.flow.common.wrapper.AbstractConnectionWrapper;
+import org.jboss.tools.flow.common.wrapper.ConnectionWrapper;
import org.jboss.tools.flow.common.wrapper.NodeWrapper;
/**
@@ -37,7 +38,7 @@
if (connection.getSource().equals(newTarget)) {
return false;
}
- for (AbstractConnectionWrapper connection: newTarget.getIncomingConnections()) {
+ for (ConnectionWrapper connection: newTarget.getIncomingConnections()) {
if (connection.getSource().equals(source) &&
!connection.getTarget().equals(oldTarget)) {
return false;
}
Modified:
trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/editpart/ElementEditPart.java
===================================================================
---
trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/editpart/ElementEditPart.java 2008-09-19
16:42:21 UTC (rev 10382)
+++
trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/editpart/ElementEditPart.java 2008-09-19
19:48:39 UTC (rev 10383)
@@ -33,7 +33,7 @@
import org.jboss.tools.flow.common.policy.ElementDirectEditPolicy;
import org.jboss.tools.flow.common.policy.ElementEditPolicy;
import org.jboss.tools.flow.common.policy.ElementNodeEditPolicy;
-import org.jboss.tools.flow.common.wrapper.AbstractConnectionWrapper;
+import org.jboss.tools.flow.common.wrapper.ConnectionWrapper;
import org.jboss.tools.flow.common.wrapper.ModelEvent;
import org.jboss.tools.flow.common.wrapper.ModelListener;
import org.jboss.tools.flow.common.wrapper.NodeWrapper;
@@ -61,11 +61,11 @@
installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new ElementDirectEditPolicy());
}
- protected List<AbstractConnectionWrapper> getModelSourceConnections() {
+ protected List<ConnectionWrapper> getModelSourceConnections() {
return getElementWrapper().getOutgoingConnections();
}
- protected List<AbstractConnectionWrapper> getModelTargetConnections() {
+ protected List<ConnectionWrapper> getModelTargetConnections() {
return getElementWrapper().getIncomingConnections();
}
Modified:
trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/wrapper/AbstractNodeWrapper.java
===================================================================
---
trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/wrapper/AbstractNodeWrapper.java 2008-09-19
16:42:21 UTC (rev 10382)
+++
trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/wrapper/AbstractNodeWrapper.java 2008-09-19
19:48:39 UTC (rev 10383)
@@ -42,8 +42,8 @@
private ContainerWrapper parent;
private transient Rectangle constraint;
- private List<AbstractConnectionWrapper> incomingConnections = new
ArrayList<AbstractConnectionWrapper>();
- private List<AbstractConnectionWrapper> outgoingConnections = new
ArrayList<AbstractConnectionWrapper>();
+ private List<ConnectionWrapper> incomingConnections = new
ArrayList<ConnectionWrapper>();
+ private List<ConnectionWrapper> outgoingConnections = new
ArrayList<ConnectionWrapper>();
private transient List<ModelListener> listeners = new
ArrayList<ModelListener>();
public void setConstraint(Rectangle constraint) {
@@ -71,11 +71,11 @@
return parent;
}
- public List<AbstractConnectionWrapper> getOutgoingConnections() {
+ public List<ConnectionWrapper> getOutgoingConnections() {
return Collections.unmodifiableList(outgoingConnections);
}
- public List<AbstractConnectionWrapper> getIncomingConnections() {
+ public List<ConnectionWrapper> getIncomingConnections() {
return Collections.unmodifiableList(incomingConnections);
}
Modified:
trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/wrapper/ConnectionWrapper.java
===================================================================
---
trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/wrapper/ConnectionWrapper.java 2008-09-19
16:42:21 UTC (rev 10382)
+++
trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/wrapper/ConnectionWrapper.java 2008-09-19
19:48:39 UTC (rev 10383)
@@ -2,4 +2,9 @@
public interface ConnectionWrapper extends Wrapper {
+ NodeWrapper getSource();
+ NodeWrapper getTarget();
+ void disconnect();
+ void connect(NodeWrapper source, NodeWrapper target);
+
}
Modified:
trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/wrapper/DefaultFlowWrapper.java
===================================================================
---
trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/wrapper/DefaultFlowWrapper.java 2008-09-19
16:42:21 UTC (rev 10382)
+++
trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/wrapper/DefaultFlowWrapper.java 2008-09-19
19:48:39 UTC (rev 10383)
@@ -3,8 +3,6 @@
import org.jboss.tools.flow.common.model.Flow;
import org.jboss.tools.flow.common.model.Node;
import org.jboss.tools.flow.common.strategy.AcceptsElementStrategy;
-import org.jboss.tools.flow.common.wrapper.AbstractFlowWrapper;
-import org.jboss.tools.flow.common.wrapper.NodeWrapper;
public class DefaultFlowWrapper extends AbstractFlowWrapper {
Modified:
trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/wrapper/NodeWrapper.java
===================================================================
---
trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/wrapper/NodeWrapper.java 2008-09-19
16:42:21 UTC (rev 10382)
+++
trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/wrapper/NodeWrapper.java 2008-09-19
19:48:39 UTC (rev 10383)
@@ -41,8 +41,8 @@
void setParent(ContainerWrapper parent);
ContainerWrapper getParent();
- List<AbstractConnectionWrapper> getOutgoingConnections();
- List<AbstractConnectionWrapper> getIncomingConnections();
+ List<ConnectionWrapper> getOutgoingConnections();
+ List<ConnectionWrapper> getIncomingConnections();
void addIncomingConnection(AbstractConnectionWrapper connection);
void localAddIncomingConnection(AbstractConnectionWrapper connection);
void removeIncomingConnection(AbstractConnectionWrapper connection);