[jbosstools-commits] JBoss Tools SVN: r10433 - in trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common: command and 2 other directories.

Author: koen.aers(a)jboss.com Date: 2008-09-23 16:19:37 -0400 (Tue, 23 Sep 2008) New Revision: 10433 Added: trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/wrapper/FlowWrapper.java 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/SplitConnectionCommand.java 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/wrapper/AbstractContainerWrapper.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/ContainerWrapper.java 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/Wrapper.java Log: use FlowWrapper interface instead of AbstractFlowWrapper class 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-23 20:12:49 UTC (rev 10432) +++ trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/action/VerticalAutoLayoutAction.java 2008-09-23 20:19:37 UTC (rev 10433) @@ -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.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; /** @@ -67,7 +67,7 @@ for (Map.Entry<String, Node> entry: mapping.entrySet()) { Node node = entry.getValue(); NodeWrapper nodeWrapper = - ((AbstractFlowWrapper)diagramViewer.getContents().getModel()).getElement(entry.getKey()); + ((FlowWrapper)diagramViewer.getContents().getModel()).getElement(entry.getKey()); nodeWrapper.setConstraint(new Rectangle(node.x, node.y, node.width, node.height)); } } @@ -75,7 +75,7 @@ @SuppressWarnings("unchecked") protected DirectedGraph createDirectedGraph(Map<String, Node> mapping) { DirectedGraph graph = new DirectedGraph(); - AbstractFlowWrapper processWrapper = (AbstractFlowWrapper)diagramViewer.getContents().getModel(); + FlowWrapper processWrapper = (FlowWrapper)diagramViewer.getContents().getModel(); for (NodeWrapper elementWrapper: processWrapper.getElements()) { Node node = new Node(); Integer width = (Integer) elementWrapper.getConstraint().width; 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 20:12:49 UTC (rev 10432) +++ trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/command/SplitConnectionCommand.java 2008-09-23 20:19:37 UTC (rev 10433) @@ -17,8 +17,8 @@ */ import org.eclipse.gef.commands.Command; -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; /** @@ -28,7 +28,7 @@ */ public class SplitConnectionCommand extends Command { - private AbstractFlowWrapper parent; + private FlowWrapper parent; private NodeWrapper oldSource; private NodeWrapper oldTarget; private ConnectionWrapper oldConnection; @@ -53,11 +53,11 @@ secondConnection.connect(newElement, oldTarget); } - public void setParent(AbstractFlowWrapper process) { - if (process == null) { + public void setParent(FlowWrapper flow) { + if (flow == null) { throw new IllegalArgumentException("process is null"); } - parent = process; + parent = flow; } public void setElementConnection(ConnectionWrapper connection) { 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:12:49 UTC (rev 10432) +++ trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/editpart/RootEditPart.java 2008-09-23 20:19:37 UTC (rev 10433) @@ -39,6 +39,7 @@ 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; import org.jboss.tools.flow.common.wrapper.NodeWrapper; @@ -50,8 +51,8 @@ */ public class RootEditPart extends AbstractGraphicalEditPart implements ModelListener { - public AbstractFlowWrapper getProcessWrapper() { - return (AbstractFlowWrapper) getModel(); + private FlowWrapper getWrapper() { + return (FlowWrapper) getModel(); } protected IFigure createFigure() { @@ -69,16 +70,16 @@ } protected List<NodeWrapper> getModelChildren() { - return getProcessWrapper().getElements(); + return getWrapper().getElements(); } public void activate() { super.activate(); - getProcessWrapper().addListener(this); + getWrapper().addListener(this); } public void deactivate() { - getProcessWrapper().removeListener(this); + getWrapper().removeListener(this); super.deactivate(); } @@ -108,11 +109,11 @@ layer.setAntialias(SWT.ON); } - if (getProcessWrapper().getRouterLayout().equals(AbstractFlowWrapper.ROUTER_LAYOUT_MANUAL)) { + if (getWrapper().getRouterLayout().equals(AbstractFlowWrapper.ROUTER_LAYOUT_MANUAL)) { AutomaticRouter router = new FanRouter(); router.setNextRouter(new BendpointConnectionRouter()); layer.setConnectionRouter(router); - } else if (getProcessWrapper().getRouterLayout().equals(AbstractFlowWrapper.ROUTER_LAYOUT_MANHATTAN)) { + } else if (getWrapper().getRouterLayout().equals(AbstractFlowWrapper.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/wrapper/AbstractContainerWrapper.java =================================================================== --- trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/wrapper/AbstractContainerWrapper.java 2008-09-23 20:12:49 UTC (rev 10432) +++ trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/wrapper/AbstractContainerWrapper.java 2008-09-23 20:19:37 UTC (rev 10433) @@ -50,7 +50,7 @@ return elements; } - public AbstractFlowWrapper getFlowWrapper() { + public FlowWrapper getFlowWrapper() { return getParent().getFlowWrapper(); } 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:12:49 UTC (rev 10432) +++ trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/wrapper/AbstractFlowWrapper.java 2008-09-23 20:19:37 UTC (rev 10433) @@ -27,7 +27,7 @@ * * @author <a href="mailto:kris_verlaenen@hotmail.com">Kris Verlaenen</a> */ -public abstract class AbstractFlowWrapper extends AbstractWrapper implements ContainerWrapper { +public abstract class AbstractFlowWrapper extends AbstractWrapper implements FlowWrapper { public static final int CHANGE_ELEMENTS = 1; public static final int CHANGE_VISUAL = 2; 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:12:49 UTC (rev 10432) +++ trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/wrapper/ConnectionWrapper.java 2008-09-23 20:19:37 UTC (rev 10433) @@ -19,7 +19,4 @@ 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/ContainerWrapper.java =================================================================== --- trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/wrapper/ContainerWrapper.java 2008-09-23 20:12:49 UTC (rev 10432) +++ trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/wrapper/ContainerWrapper.java 2008-09-23 20:19:37 UTC (rev 10433) @@ -28,7 +28,7 @@ List<NodeWrapper> getElements(); - AbstractFlowWrapper getFlowWrapper(); + FlowWrapper getFlowWrapper(); boolean acceptsElement(NodeWrapper element); Added: 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 (rev 0) +++ trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/wrapper/FlowWrapper.java 2008-09-23 20:19:37 UTC (rev 10433) @@ -0,0 +1,9 @@ +package org.jboss.tools.flow.common.wrapper; + +public interface FlowWrapper extends ContainerWrapper { + + NodeWrapper getElement(String id); + + Object getRouterLayout(); + +} 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 20:12:49 UTC (rev 10432) +++ trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/wrapper/NodeWrapper.java 2008-09-23 20:19:37 UTC (rev 10433) @@ -52,7 +52,4 @@ boolean acceptsIncomingConnection(ConnectionWrapper connection, NodeWrapper source); boolean acceptsOutgoingConnection(ConnectionWrapper connection, NodeWrapper target); - void addListener(ModelListener listener); - void removeListener(ModelListener listener); - } Modified: trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/wrapper/Wrapper.java =================================================================== --- trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/wrapper/Wrapper.java 2008-09-23 20:12:49 UTC (rev 10432) +++ trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/wrapper/Wrapper.java 2008-09-23 20:19:37 UTC (rev 10433) @@ -4,5 +4,9 @@ void setElement(Object element); Object getElement(); + + void addListener(ModelListener listener); + void removeListener(ModelListener listener); + }