Author: koen.aers(a)jboss.com
Date: 2008-09-23 15:59:51 -0400 (Tue, 23 Sep 2008)
New Revision: 10429
Added:
trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/strategy/SaveElementStrategy.java
Modified:
trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/command/CreateBendpointCommand.java
trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/command/DeleteBendpointCommand.java
trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/command/DeleteConnectionCommand.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/MoveBendpointCommand.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/command/SplitConnectionCommand.java
trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/editpart/ConnectionEditPart.java
trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/model/Connection.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/policy/ConnectionEditPolicy.java
trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/policy/ElementNodeEditPolicy.java
trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/registry/ElementRegistry.java
trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/wrapper/AbstractConnectionWrapper.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/DefaultConnectionWrapper.java
trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/wrapper/NodeWrapper.java
Log:
use ConnectionWrapper interface instead of AbstractConnectionWrapper class
Modified:
trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/command/CreateBendpointCommand.java
===================================================================
---
trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/command/CreateBendpointCommand.java 2008-09-23
18:16:52 UTC (rev 10428)
+++
trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/command/CreateBendpointCommand.java 2008-09-23
19:59:51 UTC (rev 10429)
@@ -18,7 +18,7 @@
import org.eclipse.draw2d.geometry.Point;
import org.eclipse.gef.commands.Command;
-import org.jboss.tools.flow.common.wrapper.AbstractConnectionWrapper;
+import org.jboss.tools.flow.common.wrapper.ConnectionWrapper;
/**
* A command for creating a bendpoint.
@@ -27,7 +27,7 @@
*/
public class CreateBendpointCommand extends Command {
- private AbstractConnectionWrapper connection;
+ private ConnectionWrapper connection;
private Point location;
private int index;
@@ -36,7 +36,7 @@
}
public void setConnection(Object model) {
- connection = (AbstractConnectionWrapper) model;
+ connection = (ConnectionWrapper) model;
}
public void setIndex(int i) {
Modified:
trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/command/DeleteBendpointCommand.java
===================================================================
---
trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/command/DeleteBendpointCommand.java 2008-09-23
18:16:52 UTC (rev 10428)
+++
trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/command/DeleteBendpointCommand.java 2008-09-23
19:59:51 UTC (rev 10429)
@@ -18,7 +18,7 @@
import org.eclipse.draw2d.geometry.Point;
import org.eclipse.gef.commands.Command;
-import org.jboss.tools.flow.common.wrapper.AbstractConnectionWrapper;
+import org.jboss.tools.flow.common.wrapper.ConnectionWrapper;
/**
@@ -28,7 +28,7 @@
*/
public class DeleteBendpointCommand extends Command {
- private AbstractConnectionWrapper connection;
+ private ConnectionWrapper connection;
private Point oldLocation;
private int index;
@@ -38,7 +38,7 @@
}
public void setConnectionModel(Object model) {
- connection = (AbstractConnectionWrapper) model;
+ connection = (ConnectionWrapper) model;
}
public void setIndex(int i) {
Modified:
trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/command/DeleteConnectionCommand.java
===================================================================
---
trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/command/DeleteConnectionCommand.java 2008-09-23
18:16:52 UTC (rev 10428)
+++
trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/command/DeleteConnectionCommand.java 2008-09-23
19:59:51 UTC (rev 10429)
@@ -17,7 +17,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;
/**
@@ -29,7 +29,7 @@
private NodeWrapper source;
private NodeWrapper target;
- private AbstractConnectionWrapper connection;
+ private ConnectionWrapper connection;
public void execute() {
connection.disconnect();
@@ -43,7 +43,7 @@
target = action;
}
- public void setAntecedentTaskConnection(AbstractConnectionWrapper connection) {
+ public void setAntecedentTaskConnection(ConnectionWrapper connection) {
this.connection = connection;
}
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-23
18:16:52 UTC (rev 10428)
+++
trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/command/ElementConnectionCreateCommand.java 2008-09-23
19:59:51 UTC (rev 10429)
@@ -17,7 +17,6 @@
*/
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;
@@ -28,7 +27,7 @@
*/
public class ElementConnectionCreateCommand extends Command {
- private AbstractConnectionWrapper connection;
+ private ConnectionWrapper connection;
private NodeWrapper source;
private NodeWrapper target;
@@ -66,7 +65,7 @@
this.source = source;
}
- public void setConnection(AbstractConnectionWrapper connection) {
+ public void setConnection(ConnectionWrapper connection) {
this.connection = connection;
}
Modified:
trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/command/MoveBendpointCommand.java
===================================================================
---
trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/command/MoveBendpointCommand.java 2008-09-23
18:16:52 UTC (rev 10428)
+++
trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/command/MoveBendpointCommand.java 2008-09-23
19:59:51 UTC (rev 10429)
@@ -18,7 +18,7 @@
import org.eclipse.draw2d.geometry.Point;
import org.eclipse.gef.commands.Command;
-import org.jboss.tools.flow.common.wrapper.AbstractConnectionWrapper;
+import org.jboss.tools.flow.common.wrapper.ConnectionWrapper;
/**
* A command for moving a bendpoint.
@@ -27,7 +27,7 @@
*/
public class MoveBendpointCommand extends Command {
- private AbstractConnectionWrapper connection;
+ private ConnectionWrapper connection;
private Point oldLocation, newLocation;
private int index;
@@ -37,7 +37,7 @@
}
public void setConnectionModel(Object model) {
- connection = (AbstractConnectionWrapper) model;
+ connection = (ConnectionWrapper) model;
}
public void setIndex(int i) {
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-23
18:16:52 UTC (rev 10428)
+++
trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/command/ReconnectElementConnectionSourceCommand.java 2008-09-23
19:59:51 UTC (rev 10429)
@@ -17,7 +17,6 @@
*/
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;
@@ -28,7 +27,7 @@
*/
public class ReconnectElementConnectionSourceCommand extends Command {
- private AbstractConnectionWrapper connection;
+ private ConnectionWrapper connection;
private NodeWrapper target;
private NodeWrapper oldSource;
private NodeWrapper newSource;
@@ -56,7 +55,7 @@
this.newSource = source;
}
- public void setConnection(AbstractConnectionWrapper connection) {
+ public void setConnection(ConnectionWrapper connection) {
this.connection = connection;
this.target = connection.getTarget();
this.oldSource = connection.getSource();
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-23
18:16:52 UTC (rev 10428)
+++
trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/command/ReconnectElementConnectionTargetCommand.java 2008-09-23
19:59:51 UTC (rev 10429)
@@ -17,7 +17,6 @@
*/
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;
@@ -28,7 +27,7 @@
*/
public class ReconnectElementConnectionTargetCommand extends Command {
- private AbstractConnectionWrapper connection;
+ private ConnectionWrapper connection;
private NodeWrapper oldTarget;
private NodeWrapper newTarget;
private NodeWrapper source;
@@ -57,7 +56,7 @@
this.newTarget = target;
}
- public void setConnection(AbstractConnectionWrapper connection) {
+ public void setConnection(ConnectionWrapper connection) {
this.connection = connection;
this.source = connection.getSource();
this.oldTarget = connection.getTarget();
Modified:
trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/command/SplitConnectionCommand.java
===================================================================
---
trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/command/SplitConnectionCommand.java 2008-09-23
18:16:52 UTC (rev 10428)
+++
trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/command/SplitConnectionCommand.java 2008-09-23
19:59:51 UTC (rev 10429)
@@ -17,8 +17,8 @@
*/
import org.eclipse.gef.commands.Command;
-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;
/**
@@ -31,11 +31,11 @@
private AbstractFlowWrapper parent;
private NodeWrapper oldSource;
private NodeWrapper oldTarget;
- private AbstractConnectionWrapper oldConnection;
- private AbstractConnectionWrapper secondConnection;
+ private ConnectionWrapper oldConnection;
+ private ConnectionWrapper secondConnection;
private NodeWrapper newElement;
- public void setNewSecondConnection(AbstractConnectionWrapper connection) {
+ public void setNewSecondConnection(ConnectionWrapper connection) {
if (connection == null) {
throw new IllegalArgumentException("new second connection cannot be
null");
}
@@ -60,7 +60,7 @@
parent = process;
}
- public void setElementConnection(AbstractConnectionWrapper connection) {
+ public void setElementConnection(ConnectionWrapper connection) {
if (connection == null) {
throw new IllegalArgumentException("Element connection is null");
}
Modified:
trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/editpart/ConnectionEditPart.java
===================================================================
---
trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/editpart/ConnectionEditPart.java 2008-09-23
18:16:52 UTC (rev 10428)
+++
trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/editpart/ConnectionEditPart.java 2008-09-23
19:59:51 UTC (rev 10429)
@@ -33,7 +33,7 @@
import org.eclipse.gef.requests.SimpleFactory;
import org.jboss.tools.flow.common.policy.ConnectionBendpointEditPolicy;
import org.jboss.tools.flow.common.policy.ConnectionEditPolicy;
-import org.jboss.tools.flow.common.wrapper.AbstractConnectionWrapper;
+import org.jboss.tools.flow.common.wrapper.ConnectionWrapper;
import org.jboss.tools.flow.common.wrapper.DefaultConnectionWrapper;
import org.jboss.tools.flow.common.wrapper.ModelEvent;
import org.jboss.tools.flow.common.wrapper.ModelListener;
@@ -45,8 +45,8 @@
*/
public class ConnectionEditPart extends AbstractConnectionEditPart implements
ModelListener {
- public AbstractConnectionWrapper getElementConnection() {
- return (AbstractConnectionWrapper) getModel();
+ public ConnectionWrapper getElementConnection() {
+ return (ConnectionWrapper) getModel();
}
protected void createEditPolicies() {
@@ -83,7 +83,7 @@
}
public void modelChanged(ModelEvent event) {
- if (event.getChange() == AbstractConnectionWrapper.CHANGE_BENDPOINTS) {
+ if (event.getChange() == ConnectionWrapper.CHANGE_BENDPOINTS) {
refreshBendpoints();
}
}
Modified:
trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/model/Connection.java
===================================================================
---
trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/model/Connection.java 2008-09-23
18:16:52 UTC (rev 10428)
+++
trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/model/Connection.java 2008-09-23
19:59:51 UTC (rev 10429)
@@ -30,12 +30,22 @@
Node getFrom();
/**
+ * Set the from node of the connection.
+ */
+ void setFrom(Node node);
+
+ /**
* Returns the to node of the connection
* @return the to node of the connection
*/
Node getTo();
/**
+ * Set the to node of the connection.
+ */
+ void setTo(Node node);
+
+ /**
* Returns the type of the connection at the from node
*
* @return the type of the connection at the from node
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 2008-09-23
18:16:52 UTC (rev 10428)
+++
trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/model/DefaultConnection.java 2008-09-23
19:59:51 UTC (rev 10429)
@@ -6,6 +6,10 @@
private HashMap<String, Object> metaData = new HashMap<String, Object>();
private Node from, to;
+
+ public DefaultConnection() {
+ this(null, null);
+ }
public DefaultConnection(Node from, Node to) {
this.from = from;
@@ -24,9 +28,17 @@
return from;
}
+ public void setFrom(Node node) {
+ this.from = node;
+ }
+
public Node getTo() {
return to;
}
+
+ public void setTo(Node node) {
+ this.to = node;
+ }
public String getFromType() {
return null;
Modified:
trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/policy/ConnectionEditPolicy.java
===================================================================
---
trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/policy/ConnectionEditPolicy.java 2008-09-23
18:16:52 UTC (rev 10428)
+++
trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/policy/ConnectionEditPolicy.java 2008-09-23
19:59:51 UTC (rev 10429)
@@ -27,8 +27,8 @@
import org.jboss.tools.flow.common.command.SplitConnectionCommand;
import org.jboss.tools.flow.common.editpart.ConnectionEditPart;
import org.jboss.tools.flow.common.model.Element;
-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;
/**
@@ -59,7 +59,7 @@
protected Command getDeleteCommand(GroupRequest request) {
DeleteConnectionCommand cmd = new DeleteConnectionCommand();
- AbstractConnectionWrapper connection = (AbstractConnectionWrapper)
getHost().getModel();
+ ConnectionWrapper connection = (ConnectionWrapper) getHost().getModel();
cmd.setAntecedentTaskConnection(connection);
cmd.setSource(connection.getSource());
cmd.setTarget(connection.getTarget());
@@ -71,8 +71,8 @@
throw new IllegalStateException("DefaultElementConnectionFactory is
null");
}
SplitConnectionCommand cmd = new SplitConnectionCommand();
- AbstractConnectionWrapper elementConnection =
(AbstractConnectionWrapper)getHost().getModel();
- AbstractConnectionWrapper newSecondConnection =
(AbstractConnectionWrapper)elementConnectionFactory.getNewObject();
+ ConnectionWrapper elementConnection = (ConnectionWrapper)getHost().getModel();
+ ConnectionWrapper newSecondConnection =
(ConnectionWrapper)elementConnectionFactory.getNewObject();
// Copy the configurationElement from the first connection as it is empty
((Element)newSecondConnection.getElement()).setMetaData(
"configurationElement",
Modified:
trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/policy/ElementNodeEditPolicy.java
===================================================================
---
trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/policy/ElementNodeEditPolicy.java 2008-09-23
18:16:52 UTC (rev 10428)
+++
trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/policy/ElementNodeEditPolicy.java 2008-09-23
19:59:51 UTC (rev 10429)
@@ -24,7 +24,7 @@
import org.jboss.tools.flow.common.command.ReconnectElementConnectionSourceCommand;
import org.jboss.tools.flow.common.command.ReconnectElementConnectionTargetCommand;
import org.jboss.tools.flow.common.editpart.ElementEditPart;
-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 +37,7 @@
protected Command getConnectionCompleteCommand(CreateConnectionRequest request) {
ElementConnectionCreateCommand cmd =
(ElementConnectionCreateCommand) request.getStartCommand();
- cmd.setConnection((AbstractConnectionWrapper) request.getNewObject());
+ cmd.setConnection((ConnectionWrapper) request.getNewObject());
cmd.setTarget(getElement());
return cmd;
}
@@ -45,7 +45,7 @@
protected Command getConnectionCreateCommand(CreateConnectionRequest request) {
ElementConnectionCreateCommand cmd =
new ElementConnectionCreateCommand();
- cmd.setConnection((AbstractConnectionWrapper) request.getNewObject());
+ cmd.setConnection((ConnectionWrapper) request.getNewObject());
cmd.setSource(getElement());
request.setStartCommand(cmd);
return cmd;
@@ -62,7 +62,7 @@
protected Command getReconnectSourceCommand(ReconnectRequest request) {
ReconnectElementConnectionSourceCommand cmd
= new ReconnectElementConnectionSourceCommand();
- cmd.setConnection((AbstractConnectionWrapper)
request.getConnectionEditPart().getModel());
+ cmd.setConnection((ConnectionWrapper)
request.getConnectionEditPart().getModel());
cmd.setSource(getElement());
return cmd;
}
@@ -70,7 +70,7 @@
protected Command getReconnectTargetCommand(ReconnectRequest request) {
ReconnectElementConnectionTargetCommand cmd
= new ReconnectElementConnectionTargetCommand();
- cmd.setConnection((AbstractConnectionWrapper)
request.getConnectionEditPart().getModel());
+ cmd.setConnection((ConnectionWrapper)
request.getConnectionEditPart().getModel());
cmd.setTarget(getElement());
return cmd;
}
Modified:
trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/registry/ElementRegistry.java
===================================================================
---
trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/registry/ElementRegistry.java 2008-09-23
18:16:52 UTC (rev 10428)
+++
trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/registry/ElementRegistry.java 2008-09-23
19:59:51 UTC (rev 10429)
@@ -24,6 +24,7 @@
import org.jboss.tools.flow.common.figure.EllipseElementFigure;
import org.jboss.tools.flow.common.figure.RectangleElementFigure;
import org.jboss.tools.flow.common.figure.RoundedRectangleElementFigure;
+import org.jboss.tools.flow.common.model.Connection;
import org.jboss.tools.flow.common.model.Container;
import org.jboss.tools.flow.common.model.Element;
import org.jboss.tools.flow.common.model.Flow;
@@ -74,8 +75,15 @@
private static Wrapper createConnection(IConfigurationElement configurationElement)
throws CoreException {
+ Object element = configurationElement.createExecutableExtension("class");
+ if (!(element instanceof Connection)) {
+ String message = "Expecting to instantiate a
org.jboss.tools.flow.common.model.Connection instance.";
+ Logger.logError(message, new RuntimeException(message));
+ return null;
+ }
+ ((Element)element).setMetaData("configurationElement",
configurationElement);
Wrapper result = new DefaultConnectionWrapper();
- ((Element)result.getElement()).setMetaData("configurationElement",
configurationElement);
+ result.setElement(element);
return result;
}
Added:
trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/strategy/SaveElementStrategy.java
===================================================================
---
trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/strategy/SaveElementStrategy.java
(rev 0)
+++
trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/strategy/SaveElementStrategy.java 2008-09-23
19:59:51 UTC (rev 10429)
@@ -0,0 +1,11 @@
+package org.jboss.tools.flow.common.strategy;
+
+import org.jboss.tools.flow.common.model.Container;
+
+public interface SaveElementStrategy {
+
+ void setContainer(Container container);
+
+ boolean acceptsElement(Object element);
+
+}
Modified:
trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/wrapper/AbstractConnectionWrapper.java
===================================================================
---
trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/wrapper/AbstractConnectionWrapper.java 2008-09-23
18:16:52 UTC (rev 10428)
+++
trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/wrapper/AbstractConnectionWrapper.java 2008-09-23
19:59:51 UTC (rev 10429)
@@ -30,8 +30,6 @@
private static final long serialVersionUID = 1L;
- public static final int CHANGE_BENDPOINTS = 1;
-
private Object element;
private NodeWrapper source;
private NodeWrapper target;
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-23
18:16:52 UTC (rev 10428)
+++
trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/wrapper/AbstractNodeWrapper.java 2008-09-23
19:59:51 UTC (rev 10429)
@@ -79,48 +79,48 @@
return Collections.unmodifiableList(incomingConnections);
}
- public void addIncomingConnection(AbstractConnectionWrapper connection) {
+ public void addIncomingConnection(ConnectionWrapper connection) {
localAddIncomingConnection(connection);
internalAddIncomingConnection(connection);
notifyListeners(CHANGE_INCOMING_CONNECTIONS);
}
- public void localAddIncomingConnection(AbstractConnectionWrapper connection) {
+ public void localAddIncomingConnection(ConnectionWrapper connection) {
incomingConnections.add(connection);
}
- protected void internalAddIncomingConnection(AbstractConnectionWrapper connection) {
+ protected void internalAddIncomingConnection(ConnectionWrapper connection) {
}
- public void removeIncomingConnection(AbstractConnectionWrapper connection) {
+ public void removeIncomingConnection(ConnectionWrapper connection) {
incomingConnections.remove(connection);
internalRemoveIncomingConnection(connection);
notifyListeners(CHANGE_INCOMING_CONNECTIONS);
}
- protected void internalRemoveIncomingConnection(AbstractConnectionWrapper connection) {
+ protected void internalRemoveIncomingConnection(ConnectionWrapper connection) {
}
- public void addOutgoingConnection(AbstractConnectionWrapper connection) {
+ public void addOutgoingConnection(ConnectionWrapper connection) {
localAddOutgoingConnection(connection);
internalAddOutgoingConnection(connection);
notifyListeners(CHANGE_OUTGOING_CONNECTIONS);
}
- public void localAddOutgoingConnection(AbstractConnectionWrapper connection) {
+ public void localAddOutgoingConnection(ConnectionWrapper connection) {
outgoingConnections.add(connection);
}
- protected void internalAddOutgoingConnection(AbstractConnectionWrapper connection) {
+ protected void internalAddOutgoingConnection(ConnectionWrapper connection) {
}
- public void removeOutgoingConnection(AbstractConnectionWrapper connection) {
+ public void removeOutgoingConnection(ConnectionWrapper connection) {
outgoingConnections.remove(connection);
internalRemoveOutgoingConnection(connection);
notifyListeners(CHANGE_OUTGOING_CONNECTIONS);
}
- protected void internalRemoveOutgoingConnection(AbstractConnectionWrapper connection) {
+ protected void internalRemoveOutgoingConnection(ConnectionWrapper connection) {
}
public void setName(String name) {
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-23
18:16:52 UTC (rev 10428)
+++
trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/wrapper/ConnectionWrapper.java 2008-09-23
19:59:51 UTC (rev 10429)
@@ -1,10 +1,25 @@
package org.jboss.tools.flow.common.wrapper;
+import java.util.List;
+
+import org.eclipse.draw2d.geometry.Point;
+
public interface ConnectionWrapper extends Wrapper {
+ static final int CHANGE_BENDPOINTS = 1;
+
NodeWrapper getSource();
NodeWrapper getTarget();
+
void disconnect();
void connect(NodeWrapper source, NodeWrapper target);
+
+ void addBendpoint(int index, Point location);
+ void replaceBendpoint(int index, Point newLocation);
+ void removeBendpoint(int index);
+ List<Point> getBendpoints();
+
+ void addListener(ModelListener modelListener);
+ void removeListener(ModelListener modelListener);
}
Modified:
trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/wrapper/DefaultConnectionWrapper.java
===================================================================
---
trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/wrapper/DefaultConnectionWrapper.java 2008-09-23
18:16:52 UTC (rev 10428)
+++
trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/wrapper/DefaultConnectionWrapper.java 2008-09-23
19:59:51 UTC (rev 10429)
@@ -12,11 +12,6 @@
public class DefaultConnectionWrapper extends AbstractConnectionWrapper {
- public DefaultConnectionWrapper() {
- // create a dummy connection in order to be able to add the metadata
- setElement(createConnection(null, null));
- }
-
public Connection getConnection() {
return (Connection)getElement();
}
@@ -61,7 +56,13 @@
super.connect(source, target);
Node from = (Node)getSource().getElement();
Node to = (Node)getTarget().getElement();
- setElement(createConnection(from, to));
+ Connection connection = getConnection();
+ if (connection != null) {
+ connection.setTo(to);
+ connection.setFrom(from);
+ } else {
+ setElement(createConnection(from, to));
+ }
}
protected Connection createConnection(Node from, Node to) {
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-23
18:16:52 UTC (rev 10428)
+++
trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/wrapper/NodeWrapper.java 2008-09-23
19:59:51 UTC (rev 10429)
@@ -43,12 +43,12 @@
List<ConnectionWrapper> getOutgoingConnections();
List<ConnectionWrapper> getIncomingConnections();
- void addIncomingConnection(AbstractConnectionWrapper connection);
- void localAddIncomingConnection(AbstractConnectionWrapper connection);
- void removeIncomingConnection(AbstractConnectionWrapper connection);
- void addOutgoingConnection(AbstractConnectionWrapper connection);
- void localAddOutgoingConnection(AbstractConnectionWrapper connection);
- void removeOutgoingConnection(AbstractConnectionWrapper connection);
+ void addIncomingConnection(ConnectionWrapper connection);
+ void localAddIncomingConnection(ConnectionWrapper connection);
+ void removeIncomingConnection(ConnectionWrapper connection);
+ void addOutgoingConnection(ConnectionWrapper connection);
+ void localAddOutgoingConnection(ConnectionWrapper connection);
+ void removeOutgoingConnection(ConnectionWrapper connection);
boolean acceptsIncomingConnection(ConnectionWrapper connection, NodeWrapper source);
boolean acceptsOutgoingConnection(ConnectionWrapper connection, NodeWrapper target);