Author: koen.aers(a)jboss.com
Date: 2008-09-23 16:26:08 -0400 (Tue, 23 Sep 2008)
New Revision: 10435
Modified:
trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/editpart/RootEditPart.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/wrapper/AbstractFlowWrapper.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/FlowWrapper.java
Log:
use FlowWrapper interface instead of AbstractFlowWrapper class
Modified:
trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/editpart/RootEditPart.java
===================================================================
---
trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/editpart/RootEditPart.java 2008-09-23
20:20:17 UTC (rev 10434)
+++
trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/editpart/RootEditPart.java 2008-09-23
20:26:08 UTC (rev 10435)
@@ -38,7 +38,6 @@
import org.eclipse.swt.SWT;
import org.jboss.tools.flow.common.figure.ElementFigure;
import org.jboss.tools.flow.common.policy.ElementContainerLayoutEditPolicy;
-import org.jboss.tools.flow.common.wrapper.AbstractFlowWrapper;
import org.jboss.tools.flow.common.wrapper.FlowWrapper;
import org.jboss.tools.flow.common.wrapper.ModelEvent;
import org.jboss.tools.flow.common.wrapper.ModelListener;
@@ -84,9 +83,9 @@
}
public void modelChanged(ModelEvent event) {
- if (event.getChange() == AbstractFlowWrapper.CHANGE_ELEMENTS) {
+ if (event.getChange() == FlowWrapper.CHANGE_ELEMENTS) {
refreshChildren();
- } else if (event.getChange() == AbstractFlowWrapper.CHANGE_VISUAL) {
+ } else if (event.getChange() == FlowWrapper.CHANGE_VISUAL) {
refreshVisuals();
}
}
@@ -109,11 +108,11 @@
layer.setAntialias(SWT.ON);
}
- if (getWrapper().getRouterLayout().equals(AbstractFlowWrapper.ROUTER_LAYOUT_MANUAL))
{
+ if (getWrapper().getRouterLayout().equals(FlowWrapper.ROUTER_LAYOUT_MANUAL)) {
AutomaticRouter router = new FanRouter();
router.setNextRouter(new BendpointConnectionRouter());
layer.setConnectionRouter(router);
- } else if
(getWrapper().getRouterLayout().equals(AbstractFlowWrapper.ROUTER_LAYOUT_MANHATTAN)) {
+ } else if
(getWrapper().getRouterLayout().equals(FlowWrapper.ROUTER_LAYOUT_MANHATTAN)) {
layer.setConnectionRouter(new ManhattanConnectionRouter());
} else {
layer.setConnectionRouter(new ShortestPathConnectionRouter(getFigure()));
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
20:20:17 UTC (rev 10434)
+++
trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/policy/ConnectionEditPolicy.java 2008-09-23
20:26:08 UTC (rev 10435)
@@ -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.AbstractFlowWrapper;
import org.jboss.tools.flow.common.wrapper.ConnectionWrapper;
+import org.jboss.tools.flow.common.wrapper.FlowWrapper;
import org.jboss.tools.flow.common.wrapper.NodeWrapper;
/**
@@ -79,7 +79,7 @@
((Element)elementConnection.getElement()).getMetaData("configurationElement"));
cmd.setElementConnection(elementConnection);
cmd.setNewSecondConnection(newSecondConnection);
- cmd.setParent(((AbstractFlowWrapper) ((ConnectionEditPart) getHost())
+ cmd.setParent(((FlowWrapper) ((ConnectionEditPart) getHost())
.getSource().getParent().getModel()));
cmd.setNewElement(((NodeWrapper) ((CreateRequest) request).getNewObject()));
return cmd;
Modified:
trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/wrapper/AbstractFlowWrapper.java
===================================================================
---
trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/wrapper/AbstractFlowWrapper.java 2008-09-23
20:20:17 UTC (rev 10434)
+++
trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/wrapper/AbstractFlowWrapper.java 2008-09-23
20:26:08 UTC (rev 10435)
@@ -29,13 +29,6 @@
*/
public abstract class AbstractFlowWrapper extends AbstractWrapper implements FlowWrapper
{
- public static final int CHANGE_ELEMENTS = 1;
- public static final int CHANGE_VISUAL = 2;
-
- public static final Integer ROUTER_LAYOUT_MANUAL = new Integer(0);
- public static final Integer ROUTER_LAYOUT_MANHATTAN = new Integer(1);
- public static final Integer ROUTER_LAYOUT_SHORTEST_PATH = new Integer(2);
-
private Map<String, NodeWrapper> elements = new HashMap<String,
NodeWrapper>();
private transient List<ModelListener> listeners = new
ArrayList<ModelListener>();
@@ -83,7 +76,7 @@
protected abstract void internalRemoveElement(NodeWrapper element);
- public AbstractFlowWrapper getFlowWrapper() {
+ public FlowWrapper getFlowWrapper() {
return this;
}
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
20:20:17 UTC (rev 10434)
+++
trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/wrapper/ConnectionWrapper.java 2008-09-23
20:26:08 UTC (rev 10435)
@@ -6,7 +6,7 @@
public interface ConnectionWrapper extends Wrapper {
- static final int CHANGE_BENDPOINTS = 1;
+ int CHANGE_BENDPOINTS = 1;
NodeWrapper getSource();
NodeWrapper getTarget();
Modified:
trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/wrapper/FlowWrapper.java
===================================================================
---
trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/wrapper/FlowWrapper.java 2008-09-23
20:20:17 UTC (rev 10434)
+++
trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/wrapper/FlowWrapper.java 2008-09-23
20:26:08 UTC (rev 10435)
@@ -2,6 +2,14 @@
public interface FlowWrapper extends ContainerWrapper {
+ int CHANGE_ELEMENTS = 1;
+ int CHANGE_VISUAL = 2;
+
+ Integer ROUTER_LAYOUT_MANUAL = new Integer(0);
+ Integer ROUTER_LAYOUT_MANHATTAN = new Integer(1);
+ Integer ROUTER_LAYOUT_SHORTEST_PATH = new Integer(2);
+
+
NodeWrapper getElement(String id);
Object getRouterLayout();
Show replies by date