Author: koen.aers(a)jboss.com
Date: 2008-07-23 10:34:11 -0400 (Wed, 23 Jul 2008)
New Revision: 9248
Added:
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4.graph/src/org/jboss/tools/flow/
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4.graph/src/org/jboss/tools/flow/jpdl4/
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4.graph/src/org/jboss/tools/flow/jpdl4/graph/
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4.graph/src/org/jboss/tools/flow/jpdl4/graph/Activator.java
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4.graph/src/org/jboss/tools/flow/jpdl4/graph/editor/
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4.graph/src/org/jboss/tools/flow/jpdl4/graph/editpart/
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4.graph/src/org/jboss/tools/flow/jpdl4/graph/wrapper/
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4.graph/src/org/jboss/tools/flow/jpdl4/graph/wrapper/BaseNodeWrapper.java
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4.graph/src/org/jboss/tools/flow/jpdl4/graph/wrapper/EndStateWrapper.java
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4.graph/src/org/jboss/tools/flow/jpdl4/graph/wrapper/ProcessWrapper.java
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4.graph/src/org/jboss/tools/flow/jpdl4/graph/wrapper/StartStateWrapper.java
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4.graph/src/org/jboss/tools/flow/jpdl4/graph/wrapper/StateWrapper.java
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4.graph/src/org/jboss/tools/flow/jpdl4/graph/wrapper/TransitionWrapper.java
Removed:
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4.graph/src/org/jboss/tools/flow/jpdl4/graph/wrapper/BaseNodeWrapper.java
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4.graph/src/org/jboss/tools/flow/jpdl4/graph/wrapper/EndStateWrapper.java
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4.graph/src/org/jboss/tools/flow/jpdl4/graph/wrapper/ProcessWrapper.java
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4.graph/src/org/jboss/tools/flow/jpdl4/graph/wrapper/StartStateWrapper.java
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4.graph/src/org/jboss/tools/flow/jpdl4/graph/wrapper/StateWrapper.java
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4.graph/src/org/jboss/tools/flow/jpdl4/graph/wrapper/TransitionWrapper.java
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4.graph/src/org/jboss/tools/process/
Modified:
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4.graph/META-INF/MANIFEST.MF
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4.graph/plugin.xml
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4.graph/src/org/jboss/tools/flow/jpdl4/graph/editor/JpdlEditor.java
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4.graph/src/org/jboss/tools/flow/jpdl4/graph/editor/JpdlPaletteFactory.java
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4.graph/src/org/jboss/tools/flow/jpdl4/graph/editpart/EndStateEditPart.java
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4.graph/src/org/jboss/tools/flow/jpdl4/graph/editpart/JpdlEditPartFactory.java
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4.graph/src/org/jboss/tools/flow/jpdl4/graph/editpart/StartStateEditPart.java
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4.graph/src/org/jboss/tools/flow/jpdl4/graph/editpart/StateEditPart.java
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4.graph/src/org/jboss/tools/flow/jpdl4/graph/editpart/TransitionEditPart.java
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4.graph/src/org/jboss/tools/flow/jpdl4/graph/wrapper/TransitionWrapperFactory.java
Log:
Modified: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4.graph/META-INF/MANIFEST.MF
===================================================================
--- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4.graph/META-INF/MANIFEST.MF 2008-07-23
14:29:03 UTC (rev 9247)
+++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4.graph/META-INF/MANIFEST.MF 2008-07-23
14:34:11 UTC (rev 9248)
@@ -12,4 +12,4 @@
org.eclipse.core.runtime;bundle-version="3.4.0",
org.jboss.tools.flow.jpdl4.core;bundle-version="1.0.0"
Bundle-ActivationPolicy: lazy
-Bundle-Activator: org.jboss.tools.process.jpdl4.graph.Activator
+Bundle-Activator: org.jboss.tools.flow.jpdl4.graph.Activator
Modified: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4.graph/plugin.xml
===================================================================
--- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4.graph/plugin.xml 2008-07-23 14:29:03 UTC
(rev 9247)
+++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4.graph/plugin.xml 2008-07-23 14:34:11 UTC
(rev 9248)
@@ -8,7 +8,7 @@
extensions="jpdl4"
icon="icons/processH.gif"
contributorClass="org.jboss.tools.process.editor.GenericActionBarContributor"
- class="org.jboss.tools.process.jpdl4.graph.editor.JpdlEditor"
+ class="org.jboss.tools.flow.jpdl4.graph.editor.JpdlEditor"
id="org.jboss.tools.process.jpdl4.graph.editor.JpdlEditor">
</editor>
</extension>
Copied:
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4.graph/src/org/jboss/tools/flow/jpdl4/graph/Activator.java
(from rev 9245,
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4.graph/src/org/jboss/tools/process/jpdl4/graph/Activator.java)
===================================================================
---
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4.graph/src/org/jboss/tools/flow/jpdl4/graph/Activator.java
(rev 0)
+++
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4.graph/src/org/jboss/tools/flow/jpdl4/graph/Activator.java 2008-07-23
14:34:11 UTC (rev 9248)
@@ -0,0 +1,45 @@
+package org.jboss.tools.flow.jpdl4.graph;
+
+/*
+ * Copyright 2005 JBoss Inc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *
http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import org.eclipse.ui.plugin.AbstractUIPlugin;
+import org.osgi.framework.BundleContext;
+
+public class Activator extends AbstractUIPlugin {
+
+ public static final String PLUGIN_ID = "org.jboss.tools.process.jpdl4.graph";
+
+ private static Activator plugin;
+
+ public Activator() {
+ }
+
+ public void start(BundleContext context) throws Exception {
+ super.start(context);
+ plugin = this;
+ }
+
+ public void stop(BundleContext context) throws Exception {
+ plugin = null;
+ super.stop(context);
+ }
+
+ public static Activator getDefault() {
+ return plugin;
+ }
+
+}
Property changes on:
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4.graph/src/org/jboss/tools/flow/jpdl4/graph/Activator.java
___________________________________________________________________
Name: svn:mergeinfo
+
Copied:
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4.graph/src/org/jboss/tools/flow/jpdl4/graph/editor
(from rev 9245,
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4.graph/src/org/jboss/tools/process/jpdl4/graph/editor)
Property changes on:
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4.graph/src/org/jboss/tools/flow/jpdl4/graph/editor
___________________________________________________________________
Name: svn:mergeinfo
+
Modified:
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4.graph/src/org/jboss/tools/flow/jpdl4/graph/editor/JpdlEditor.java
===================================================================
---
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4.graph/src/org/jboss/tools/process/jpdl4/graph/editor/JpdlEditor.java 2008-07-23
14:26:18 UTC (rev 9245)
+++
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4.graph/src/org/jboss/tools/flow/jpdl4/graph/editor/JpdlEditor.java 2008-07-23
14:34:11 UTC (rev 9248)
@@ -1,4 +1,4 @@
-package org.jboss.tools.process.jpdl4.graph.editor;
+package org.jboss.tools.flow.jpdl4.graph.editor;
import java.io.IOException;
import java.io.InputStream;
@@ -7,8 +7,8 @@
import org.eclipse.gef.EditPartFactory;
import org.eclipse.gef.palette.PaletteRoot;
import org.jboss.tools.flow.editor.GenericModelEditor;
-import org.jboss.tools.process.jpdl4.graph.editpart.JpdlEditPartFactory;
-import org.jboss.tools.process.jpdl4.graph.wrapper.ProcessWrapper;
+import org.jboss.tools.flow.jpdl4.graph.editpart.JpdlEditPartFactory;
+import org.jboss.tools.flow.jpdl4.graph.wrapper.ProcessWrapper;
public class JpdlEditor extends GenericModelEditor {
Modified:
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4.graph/src/org/jboss/tools/flow/jpdl4/graph/editor/JpdlPaletteFactory.java
===================================================================
---
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4.graph/src/org/jboss/tools/process/jpdl4/graph/editor/JpdlPaletteFactory.java 2008-07-23
14:26:18 UTC (rev 9245)
+++
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4.graph/src/org/jboss/tools/flow/jpdl4/graph/editor/JpdlPaletteFactory.java 2008-07-23
14:34:11 UTC (rev 9248)
@@ -1,4 +1,4 @@
-package org.jboss.tools.process.jpdl4.graph.editor;
+package org.jboss.tools.flow.jpdl4.graph.editor;
import java.util.ArrayList;
import java.util.List;
@@ -8,10 +8,10 @@
import org.eclipse.gef.requests.SimpleFactory;
import org.eclipse.jface.resource.ImageDescriptor;
import org.jboss.tools.flow.editor.PaletteFactory;
-import org.jboss.tools.process.jpdl4.graph.Activator;
-import org.jboss.tools.process.jpdl4.graph.wrapper.StartStateWrapper;
-import org.jboss.tools.process.jpdl4.graph.wrapper.StateWrapper;
-import org.jboss.tools.process.jpdl4.graph.wrapper.TransitionWrapperFactory;
+import org.jboss.tools.flow.jpdl4.graph.Activator;
+import org.jboss.tools.flow.jpdl4.graph.wrapper.StartStateWrapper;
+import org.jboss.tools.flow.jpdl4.graph.wrapper.StateWrapper;
+import org.jboss.tools.flow.jpdl4.graph.wrapper.TransitionWrapperFactory;
public class JpdlPaletteFactory extends PaletteFactory {
Copied:
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4.graph/src/org/jboss/tools/flow/jpdl4/graph/editpart
(from rev 9245,
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4.graph/src/org/jboss/tools/process/jpdl4/graph/editpart)
Property changes on:
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4.graph/src/org/jboss/tools/flow/jpdl4/graph/editpart
___________________________________________________________________
Name: svn:mergeinfo
+
Modified:
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4.graph/src/org/jboss/tools/flow/jpdl4/graph/editpart/EndStateEditPart.java
===================================================================
---
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4.graph/src/org/jboss/tools/process/jpdl4/graph/editpart/EndStateEditPart.java 2008-07-23
14:26:18 UTC (rev 9245)
+++
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4.graph/src/org/jboss/tools/flow/jpdl4/graph/editpart/EndStateEditPart.java 2008-07-23
14:34:11 UTC (rev 9248)
@@ -1,11 +1,11 @@
-package org.jboss.tools.process.jpdl4.graph.editpart;
+package org.jboss.tools.flow.jpdl4.graph.editpart;
import org.eclipse.draw2d.IFigure;
import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.swt.graphics.Image;
import org.jboss.tools.flow.editor.editpart.ElementEditPart;
import org.jboss.tools.flow.editor.figure.RectangleElementFigure;
-import org.jboss.tools.process.jpdl4.graph.Activator;
+import org.jboss.tools.flow.jpdl4.graph.Activator;
public class EndStateEditPart extends ElementEditPart {
Modified:
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4.graph/src/org/jboss/tools/flow/jpdl4/graph/editpart/JpdlEditPartFactory.java
===================================================================
---
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4.graph/src/org/jboss/tools/process/jpdl4/graph/editpart/JpdlEditPartFactory.java 2008-07-23
14:26:18 UTC (rev 9245)
+++
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4.graph/src/org/jboss/tools/flow/jpdl4/graph/editpart/JpdlEditPartFactory.java 2008-07-23
14:34:11 UTC (rev 9248)
@@ -1,12 +1,12 @@
-package org.jboss.tools.process.jpdl4.graph.editpart;
+package org.jboss.tools.flow.jpdl4.graph.editpart;
import org.eclipse.gef.EditPart;
import org.eclipse.gef.EditPartFactory;
import org.jboss.tools.flow.editor.editpart.RootEditPart;
-import org.jboss.tools.process.jpdl4.graph.wrapper.ProcessWrapper;
-import org.jboss.tools.process.jpdl4.graph.wrapper.StartStateWrapper;
-import org.jboss.tools.process.jpdl4.graph.wrapper.StateWrapper;
-import org.jboss.tools.process.jpdl4.graph.wrapper.TransitionWrapper;
+import org.jboss.tools.flow.jpdl4.graph.wrapper.ProcessWrapper;
+import org.jboss.tools.flow.jpdl4.graph.wrapper.StartStateWrapper;
+import org.jboss.tools.flow.jpdl4.graph.wrapper.StateWrapper;
+import org.jboss.tools.flow.jpdl4.graph.wrapper.TransitionWrapper;
public class JpdlEditPartFactory implements EditPartFactory {
Modified:
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4.graph/src/org/jboss/tools/flow/jpdl4/graph/editpart/StartStateEditPart.java
===================================================================
---
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4.graph/src/org/jboss/tools/process/jpdl4/graph/editpart/StartStateEditPart.java 2008-07-23
14:26:18 UTC (rev 9245)
+++
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4.graph/src/org/jboss/tools/flow/jpdl4/graph/editpart/StartStateEditPart.java 2008-07-23
14:34:11 UTC (rev 9248)
@@ -1,11 +1,11 @@
-package org.jboss.tools.process.jpdl4.graph.editpart;
+package org.jboss.tools.flow.jpdl4.graph.editpart;
import org.eclipse.draw2d.IFigure;
import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.swt.graphics.Image;
import org.jboss.tools.flow.editor.editpart.ElementEditPart;
import org.jboss.tools.flow.editor.figure.RectangleElementFigure;
-import org.jboss.tools.process.jpdl4.graph.Activator;
+import org.jboss.tools.flow.jpdl4.graph.Activator;
public class StartStateEditPart extends ElementEditPart {
Modified:
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4.graph/src/org/jboss/tools/flow/jpdl4/graph/editpart/StateEditPart.java
===================================================================
---
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4.graph/src/org/jboss/tools/process/jpdl4/graph/editpart/StateEditPart.java 2008-07-23
14:26:18 UTC (rev 9245)
+++
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4.graph/src/org/jboss/tools/flow/jpdl4/graph/editpart/StateEditPart.java 2008-07-23
14:34:11 UTC (rev 9248)
@@ -1,4 +1,4 @@
-package org.jboss.tools.process.jpdl4.graph.editpart;
+package org.jboss.tools.flow.jpdl4.graph.editpart;
import org.eclipse.draw2d.IFigure;
import org.eclipse.jface.resource.ImageDescriptor;
@@ -7,7 +7,7 @@
import org.eclipse.swt.widgets.Display;
import org.jboss.tools.flow.editor.editpart.ElementEditPart;
import org.jboss.tools.flow.editor.figure.RoundedRectangleElementFigure;
-import org.jboss.tools.process.jpdl4.graph.Activator;
+import org.jboss.tools.flow.jpdl4.graph.Activator;
public class StateEditPart extends ElementEditPart {
Modified:
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4.graph/src/org/jboss/tools/flow/jpdl4/graph/editpart/TransitionEditPart.java
===================================================================
---
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4.graph/src/org/jboss/tools/process/jpdl4/graph/editpart/TransitionEditPart.java 2008-07-23
14:26:18 UTC (rev 9245)
+++
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4.graph/src/org/jboss/tools/flow/jpdl4/graph/editpart/TransitionEditPart.java 2008-07-23
14:34:11 UTC (rev 9248)
@@ -1,8 +1,8 @@
-package org.jboss.tools.process.jpdl4.graph.editpart;
+package org.jboss.tools.flow.jpdl4.graph.editpart;
import org.jboss.tools.flow.editor.core.ConnectionFactory;
import org.jboss.tools.flow.editor.editpart.ConnectionEditPart;
-import org.jboss.tools.process.jpdl4.graph.wrapper.TransitionWrapperFactory;
+import org.jboss.tools.flow.jpdl4.graph.wrapper.TransitionWrapperFactory;
public class TransitionEditPart extends ConnectionEditPart {
Copied:
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4.graph/src/org/jboss/tools/flow/jpdl4/graph/wrapper
(from rev 9245,
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4.graph/src/org/jboss/tools/process/jpdl4/graph/wrapper)
Property changes on:
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4.graph/src/org/jboss/tools/flow/jpdl4/graph/wrapper
___________________________________________________________________
Name: svn:mergeinfo
+
Deleted:
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4.graph/src/org/jboss/tools/flow/jpdl4/graph/wrapper/BaseNodeWrapper.java
===================================================================
---
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4.graph/src/org/jboss/tools/process/jpdl4/graph/wrapper/BaseNodeWrapper.java 2008-07-23
14:26:18 UTC (rev 9245)
+++
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4.graph/src/org/jboss/tools/flow/jpdl4/graph/wrapper/BaseNodeWrapper.java 2008-07-23
14:34:11 UTC (rev 9248)
@@ -1,63 +0,0 @@
-package org.jboss.tools.process.jpdl4.graph.wrapper;
-
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.jboss.tools.flow.editor.core.AbstractConnectionWrapper;
-import org.jboss.tools.flow.editor.core.AbstractNodeWrapper;
-import org.jboss.tools.process.jpdl4.core.Node;
-
-public abstract class BaseNodeWrapper extends AbstractNodeWrapper {
-
- public void setNode(Node node) {
- setElement(node);
- }
-
- public Node getNode() {
- return (Node) getElement();
- }
-
- public String getId() {
- long id = getNode().getId();
- return id == -1 ? null : getNode().getId() + "";
- }
-
- public String getName() {
- return getNode().getName();
- }
-
- public void internalSetName(String name) {
- getNode().setName(name);
- notifyListeners(CHANGE_VISUAL);
- }
-
- protected void internalSetConstraint(Rectangle constraint) {
- Node node = getNode();
- node.setMetaData("x", constraint.x);
- node.setMetaData("y", constraint.y);
- node.setMetaData("width", constraint.width);
- node.setMetaData("height", constraint.height);
- }
-
- public Rectangle internalGetConstraint() {
- Node node = getNode();
- Integer x = (Integer) node.getMetaData("x");
- Integer y = (Integer) node.getMetaData("y");
- Integer width = (Integer) node.getMetaData("width");
- Integer height = (Integer) node.getMetaData("height");
- return new Rectangle(
- x == null ? 0 : x,
- y == null ? 0 : y,
- width == null ? -1 : width,
- height == null ? -1 : height);
- }
-
- public boolean acceptsIncomingConnection(AbstractConnectionWrapper connection,
BaseNodeWrapper source) {
- return source == null
- || ((BaseNodeWrapper) source).getNode().getNodeContainer() ==
getNode().getNodeContainer();
- }
-
- public boolean acceptsOutgoingConnection(AbstractConnectionWrapper connection,
BaseNodeWrapper target) {
- return target == null
- || ((BaseNodeWrapper) target).getNode().getNodeContainer() ==
getNode().getNodeContainer();
- }
-
-}
Copied:
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4.graph/src/org/jboss/tools/flow/jpdl4/graph/wrapper/BaseNodeWrapper.java
(from rev 9247,
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4.graph/src/org/jboss/tools/process/jpdl4/graph/wrapper/BaseNodeWrapper.java)
===================================================================
---
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4.graph/src/org/jboss/tools/flow/jpdl4/graph/wrapper/BaseNodeWrapper.java
(rev 0)
+++
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4.graph/src/org/jboss/tools/flow/jpdl4/graph/wrapper/BaseNodeWrapper.java 2008-07-23
14:34:11 UTC (rev 9248)
@@ -0,0 +1,63 @@
+package org.jboss.tools.flow.jpdl4.graph.wrapper;
+
+import org.eclipse.draw2d.geometry.Rectangle;
+import org.jboss.tools.flow.editor.core.AbstractConnectionWrapper;
+import org.jboss.tools.flow.editor.core.AbstractNodeWrapper;
+import org.jboss.tools.flow.jpdl4.core.Node;
+
+public abstract class BaseNodeWrapper extends AbstractNodeWrapper {
+
+ public void setNode(Node node) {
+ setElement(node);
+ }
+
+ public Node getNode() {
+ return (Node) getElement();
+ }
+
+ public String getId() {
+ long id = getNode().getId();
+ return id == -1 ? null : getNode().getId() + "";
+ }
+
+ public String getName() {
+ return getNode().getName();
+ }
+
+ public void internalSetName(String name) {
+ getNode().setName(name);
+ notifyListeners(CHANGE_VISUAL);
+ }
+
+ protected void internalSetConstraint(Rectangle constraint) {
+ Node node = getNode();
+ node.setMetaData("x", constraint.x);
+ node.setMetaData("y", constraint.y);
+ node.setMetaData("width", constraint.width);
+ node.setMetaData("height", constraint.height);
+ }
+
+ public Rectangle internalGetConstraint() {
+ Node node = getNode();
+ Integer x = (Integer) node.getMetaData("x");
+ Integer y = (Integer) node.getMetaData("y");
+ Integer width = (Integer) node.getMetaData("width");
+ Integer height = (Integer) node.getMetaData("height");
+ return new Rectangle(
+ x == null ? 0 : x,
+ y == null ? 0 : y,
+ width == null ? -1 : width,
+ height == null ? -1 : height);
+ }
+
+ public boolean acceptsIncomingConnection(AbstractConnectionWrapper connection,
BaseNodeWrapper source) {
+ return source == null
+ || ((BaseNodeWrapper) source).getNode().getNodeContainer() ==
getNode().getNodeContainer();
+ }
+
+ public boolean acceptsOutgoingConnection(AbstractConnectionWrapper connection,
BaseNodeWrapper target) {
+ return target == null
+ || ((BaseNodeWrapper) target).getNode().getNodeContainer() ==
getNode().getNodeContainer();
+ }
+
+}
Deleted:
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4.graph/src/org/jboss/tools/flow/jpdl4/graph/wrapper/EndStateWrapper.java
===================================================================
---
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4.graph/src/org/jboss/tools/process/jpdl4/graph/wrapper/EndStateWrapper.java 2008-07-23
14:26:18 UTC (rev 9245)
+++
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4.graph/src/org/jboss/tools/flow/jpdl4/graph/wrapper/EndStateWrapper.java 2008-07-23
14:34:11 UTC (rev 9248)
@@ -1,26 +0,0 @@
-package org.jboss.tools.process.jpdl4.graph.wrapper;
-
-import org.jboss.tools.flow.editor.core.AbstractConnectionWrapper;
-import org.jboss.tools.flow.editor.core.NodeWrapper;
-import org.jboss.tools.process.jpdl4.core.EndState;
-
-public class EndStateWrapper extends BaseNodeWrapper {
-
- public EndStateWrapper() {
- setElement(new EndState());
- setName("End");
- }
-
- public EndState getEndState() {
- return (EndState) getElement();
- }
-
- public boolean acceptsIncomingConnection(AbstractConnectionWrapper connection,
NodeWrapper source) {
- return super.acceptsIncomingConnection(connection, (BaseNodeWrapper)source)
- && getIncomingConnections().isEmpty();
- }
-
- public boolean acceptsOutgoingConnection(AbstractConnectionWrapper connection,
NodeWrapper target) {
- return false;
- }
-}
Copied:
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4.graph/src/org/jboss/tools/flow/jpdl4/graph/wrapper/EndStateWrapper.java
(from rev 9247,
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4.graph/src/org/jboss/tools/process/jpdl4/graph/wrapper/EndStateWrapper.java)
===================================================================
---
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4.graph/src/org/jboss/tools/flow/jpdl4/graph/wrapper/EndStateWrapper.java
(rev 0)
+++
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4.graph/src/org/jboss/tools/flow/jpdl4/graph/wrapper/EndStateWrapper.java 2008-07-23
14:34:11 UTC (rev 9248)
@@ -0,0 +1,26 @@
+package org.jboss.tools.flow.jpdl4.graph.wrapper;
+
+import org.jboss.tools.flow.editor.core.AbstractConnectionWrapper;
+import org.jboss.tools.flow.editor.core.NodeWrapper;
+import org.jboss.tools.flow.jpdl4.core.EndState;
+
+public class EndStateWrapper extends BaseNodeWrapper {
+
+ public EndStateWrapper() {
+ setElement(new EndState());
+ setName("End");
+ }
+
+ public EndState getEndState() {
+ return (EndState) getElement();
+ }
+
+ public boolean acceptsIncomingConnection(AbstractConnectionWrapper connection,
NodeWrapper source) {
+ return super.acceptsIncomingConnection(connection, (BaseNodeWrapper)source)
+ && getIncomingConnections().isEmpty();
+ }
+
+ public boolean acceptsOutgoingConnection(AbstractConnectionWrapper connection,
NodeWrapper target) {
+ return false;
+ }
+}
Deleted:
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4.graph/src/org/jboss/tools/flow/jpdl4/graph/wrapper/ProcessWrapper.java
===================================================================
---
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4.graph/src/org/jboss/tools/process/jpdl4/graph/wrapper/ProcessWrapper.java 2008-07-23
14:26:18 UTC (rev 9245)
+++
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4.graph/src/org/jboss/tools/flow/jpdl4/graph/wrapper/ProcessWrapper.java 2008-07-23
14:34:11 UTC (rev 9248)
@@ -1,56 +0,0 @@
-package org.jboss.tools.process.jpdl4.graph.wrapper;
-
-import org.jboss.tools.flow.editor.core.AbstractRootWrapper;
-import org.jboss.tools.flow.editor.core.NodeWrapper;
-import org.jboss.tools.process.jpdl4.core.Node;
-import org.jboss.tools.process.jpdl4.core.Process;
-
-public class ProcessWrapper extends AbstractRootWrapper {
-
- private static final long serialVersionUID = 400L;
-
- public ProcessWrapper() {
- setElement(new Process());
- }
-
- public Process getProcess() {
- return (Process) getElement();
- }
-
- public String getName() {
- return getProcess().getName();
- }
-
- public void setName(String name) {
- getProcess().setName(name);
- }
-
- public Integer getRouterLayout() {
- Integer routerLayout = (Integer)
getProcess().getMetaData("routerLayout");
- if (routerLayout == null) {
- return ROUTER_LAYOUT_MANUAL;
- }
- return routerLayout;
- }
-
- public void internalSetRouterLayout(Integer routerLayout) {
- getProcess().setMetaData("routerLayout", routerLayout);
- }
-
- protected void internalAddElement(NodeWrapper element) {
- Node node = ((BaseNodeWrapper) element).getNode();
- long id = 0;
- for (Node n: getProcess().getNodes()) {
- if (n.getId() > id) {
- id = n.getId();
- }
- }
- node.setId(++id);
- getProcess().addNode(node);
- }
-
- protected void internalRemoveElement(NodeWrapper element) {
- getProcess().removeNode(((BaseNodeWrapper) element).getNode());
- }
-
-}
Copied:
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4.graph/src/org/jboss/tools/flow/jpdl4/graph/wrapper/ProcessWrapper.java
(from rev 9247,
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4.graph/src/org/jboss/tools/process/jpdl4/graph/wrapper/ProcessWrapper.java)
===================================================================
---
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4.graph/src/org/jboss/tools/flow/jpdl4/graph/wrapper/ProcessWrapper.java
(rev 0)
+++
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4.graph/src/org/jboss/tools/flow/jpdl4/graph/wrapper/ProcessWrapper.java 2008-07-23
14:34:11 UTC (rev 9248)
@@ -0,0 +1,56 @@
+package org.jboss.tools.flow.jpdl4.graph.wrapper;
+
+import org.jboss.tools.flow.editor.core.AbstractRootWrapper;
+import org.jboss.tools.flow.editor.core.NodeWrapper;
+import org.jboss.tools.flow.jpdl4.core.Node;
+import org.jboss.tools.flow.jpdl4.core.Process;
+
+public class ProcessWrapper extends AbstractRootWrapper {
+
+ private static final long serialVersionUID = 400L;
+
+ public ProcessWrapper() {
+ setElement(new Process());
+ }
+
+ public Process getProcess() {
+ return (Process) getElement();
+ }
+
+ public String getName() {
+ return getProcess().getName();
+ }
+
+ public void setName(String name) {
+ getProcess().setName(name);
+ }
+
+ public Integer getRouterLayout() {
+ Integer routerLayout = (Integer)
getProcess().getMetaData("routerLayout");
+ if (routerLayout == null) {
+ return ROUTER_LAYOUT_MANUAL;
+ }
+ return routerLayout;
+ }
+
+ public void internalSetRouterLayout(Integer routerLayout) {
+ getProcess().setMetaData("routerLayout", routerLayout);
+ }
+
+ protected void internalAddElement(NodeWrapper element) {
+ Node node = ((BaseNodeWrapper) element).getNode();
+ long id = 0;
+ for (Node n: getProcess().getNodes()) {
+ if (n.getId() > id) {
+ id = n.getId();
+ }
+ }
+ node.setId(++id);
+ getProcess().addNode(node);
+ }
+
+ protected void internalRemoveElement(NodeWrapper element) {
+ getProcess().removeNode(((BaseNodeWrapper) element).getNode());
+ }
+
+}
Deleted:
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4.graph/src/org/jboss/tools/flow/jpdl4/graph/wrapper/StartStateWrapper.java
===================================================================
---
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4.graph/src/org/jboss/tools/process/jpdl4/graph/wrapper/StartStateWrapper.java 2008-07-23
14:26:18 UTC (rev 9245)
+++
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4.graph/src/org/jboss/tools/flow/jpdl4/graph/wrapper/StartStateWrapper.java 2008-07-23
14:34:11 UTC (rev 9248)
@@ -1,28 +0,0 @@
-package org.jboss.tools.process.jpdl4.graph.wrapper;
-
-import org.jboss.tools.flow.editor.core.AbstractConnectionWrapper;
-import org.jboss.tools.flow.editor.core.NodeWrapper;
-import org.jboss.tools.process.jpdl4.core.StartState;
-
-public class StartStateWrapper extends BaseNodeWrapper {
-
- private static final long serialVersionUID = 1L;
-
- public StartStateWrapper() {
- setElement(new StartState());
- setName("Start");
- }
-
- public StartState getStartState() {
- return (StartState) getElement();
- }
-
- public boolean acceptsIncomingConnection(AbstractConnectionWrapper connection,
NodeWrapper source) {
- return false;
- }
-
- public boolean acceptsOutgoingConnection(AbstractConnectionWrapper connection,
NodeWrapper target) {
- return super.acceptsOutgoingConnection(connection, (BaseNodeWrapper)target)
- && getOutgoingConnections().isEmpty();
- }
-}
Copied:
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4.graph/src/org/jboss/tools/flow/jpdl4/graph/wrapper/StartStateWrapper.java
(from rev 9247,
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4.graph/src/org/jboss/tools/process/jpdl4/graph/wrapper/StartStateWrapper.java)
===================================================================
---
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4.graph/src/org/jboss/tools/flow/jpdl4/graph/wrapper/StartStateWrapper.java
(rev 0)
+++
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4.graph/src/org/jboss/tools/flow/jpdl4/graph/wrapper/StartStateWrapper.java 2008-07-23
14:34:11 UTC (rev 9248)
@@ -0,0 +1,28 @@
+package org.jboss.tools.flow.jpdl4.graph.wrapper;
+
+import org.jboss.tools.flow.editor.core.AbstractConnectionWrapper;
+import org.jboss.tools.flow.editor.core.NodeWrapper;
+import org.jboss.tools.flow.jpdl4.core.StartState;
+
+public class StartStateWrapper extends BaseNodeWrapper {
+
+ private static final long serialVersionUID = 1L;
+
+ public StartStateWrapper() {
+ setElement(new StartState());
+ setName("Start");
+ }
+
+ public StartState getStartState() {
+ return (StartState) getElement();
+ }
+
+ public boolean acceptsIncomingConnection(AbstractConnectionWrapper connection,
NodeWrapper source) {
+ return false;
+ }
+
+ public boolean acceptsOutgoingConnection(AbstractConnectionWrapper connection,
NodeWrapper target) {
+ return super.acceptsOutgoingConnection(connection, (BaseNodeWrapper)target)
+ && getOutgoingConnections().isEmpty();
+ }
+}
Deleted:
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4.graph/src/org/jboss/tools/flow/jpdl4/graph/wrapper/StateWrapper.java
===================================================================
---
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4.graph/src/org/jboss/tools/process/jpdl4/graph/wrapper/StateWrapper.java 2008-07-23
14:26:18 UTC (rev 9245)
+++
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4.graph/src/org/jboss/tools/flow/jpdl4/graph/wrapper/StateWrapper.java 2008-07-23
14:34:11 UTC (rev 9248)
@@ -1,28 +0,0 @@
-package org.jboss.tools.process.jpdl4.graph.wrapper;
-
-import org.jboss.tools.flow.editor.core.AbstractConnectionWrapper;
-import org.jboss.tools.flow.editor.core.NodeWrapper;
-import org.jboss.tools.process.jpdl4.core.State;
-
-public class StateWrapper extends BaseNodeWrapper {
-
- public StateWrapper() {
- setElement(new State());
- getState().setName("State");
- }
-
- public State getState() {
- return (State) getElement();
- }
-
- public boolean acceptsIncomingConnection(AbstractConnectionWrapper connection,
NodeWrapper source) {
- return super.acceptsIncomingConnection(connection, (BaseNodeWrapper)source)
- && getIncomingConnections().isEmpty();
- }
-
- public boolean acceptsOutgoingConnection(AbstractConnectionWrapper connection,
NodeWrapper target) {
- return super.acceptsOutgoingConnection(connection, (BaseNodeWrapper)target)
- && getOutgoingConnections().isEmpty();
- }
-
-}
Copied:
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4.graph/src/org/jboss/tools/flow/jpdl4/graph/wrapper/StateWrapper.java
(from rev 9247,
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4.graph/src/org/jboss/tools/process/jpdl4/graph/wrapper/StateWrapper.java)
===================================================================
---
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4.graph/src/org/jboss/tools/flow/jpdl4/graph/wrapper/StateWrapper.java
(rev 0)
+++
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4.graph/src/org/jboss/tools/flow/jpdl4/graph/wrapper/StateWrapper.java 2008-07-23
14:34:11 UTC (rev 9248)
@@ -0,0 +1,28 @@
+package org.jboss.tools.flow.jpdl4.graph.wrapper;
+
+import org.jboss.tools.flow.editor.core.AbstractConnectionWrapper;
+import org.jboss.tools.flow.editor.core.NodeWrapper;
+import org.jboss.tools.flow.jpdl4.core.State;
+
+public class StateWrapper extends BaseNodeWrapper {
+
+ public StateWrapper() {
+ setElement(new State());
+ getState().setName("State");
+ }
+
+ public State getState() {
+ return (State) getElement();
+ }
+
+ public boolean acceptsIncomingConnection(AbstractConnectionWrapper connection,
NodeWrapper source) {
+ return super.acceptsIncomingConnection(connection, (BaseNodeWrapper)source)
+ && getIncomingConnections().isEmpty();
+ }
+
+ public boolean acceptsOutgoingConnection(AbstractConnectionWrapper connection,
NodeWrapper target) {
+ return super.acceptsOutgoingConnection(connection, (BaseNodeWrapper)target)
+ && getOutgoingConnections().isEmpty();
+ }
+
+}
Deleted:
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4.graph/src/org/jboss/tools/flow/jpdl4/graph/wrapper/TransitionWrapper.java
===================================================================
---
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4.graph/src/org/jboss/tools/process/jpdl4/graph/wrapper/TransitionWrapper.java 2008-07-23
14:26:18 UTC (rev 9245)
+++
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4.graph/src/org/jboss/tools/flow/jpdl4/graph/wrapper/TransitionWrapper.java 2008-07-23
14:34:11 UTC (rev 9248)
@@ -1,68 +0,0 @@
-package org.jboss.tools.process.jpdl4.graph.wrapper;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.draw2d.geometry.Point;
-import org.jboss.tools.flow.editor.core.AbstractConnectionWrapper;
-import org.jboss.tools.flow.editor.core.NodeWrapper;
-import org.jboss.tools.process.jpdl4.core.Node;
-import org.jboss.tools.process.jpdl4.core.Transition;
-
-public class TransitionWrapper extends AbstractConnectionWrapper {
-
- public TransitionWrapper() {
- }
-
- public Transition getTransition() {
- return (Transition)getElement();
- }
-
- public void localSetTransition(Transition transition) {
- setElement(transition);
- }
-
- public void connect(NodeWrapper source, NodeWrapper target) {
- super.connect(source, target);
- Node from = ((BaseNodeWrapper) getSource()).getNode();
- Node to = ((BaseNodeWrapper) getTarget()).getNode();
- setElement(new Transition(from, to));
- }
-
- protected List<Point> internalGetBendpoints() {
- return (List<Point>) stringToBendpoints((String)
getTransition().getMetaData("bendpoints"));
- }
-
- protected void internalSetBendpoints(List<Point> bendpoints) {
- getTransition().setMetaData("bendpoints",
bendpointsToString(bendpoints));
- }
-
- private String bendpointsToString(List<Point> bendpoints) {
- if (bendpoints == null) {
- return null;
- }
- String result = "[";
- for (Iterator<Point> iterator = bendpoints.iterator(); iterator.hasNext();
) {
- Point point = iterator.next();
- result += point.x + "," + point.y + (iterator.hasNext() ?
";" : "");
- }
- result += "]";
- return result;
- }
-
- private List<Point> stringToBendpoints(String s) {
- List<Point> result = new ArrayList<Point>();
- if (s == null) {
- return result;
- }
- s = s.substring(1, s.length() - 1);
- String[] bendpoints = s.split(";");
- for (String bendpoint: bendpoints) {
- String[] xy = bendpoint.split(",");
- result.add(new Point(new Integer(xy[0]), new Integer(xy[1])));
- }
- return result;
- }
-
-}
Copied:
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4.graph/src/org/jboss/tools/flow/jpdl4/graph/wrapper/TransitionWrapper.java
(from rev 9247,
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4.graph/src/org/jboss/tools/process/jpdl4/graph/wrapper/TransitionWrapper.java)
===================================================================
---
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4.graph/src/org/jboss/tools/flow/jpdl4/graph/wrapper/TransitionWrapper.java
(rev 0)
+++
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4.graph/src/org/jboss/tools/flow/jpdl4/graph/wrapper/TransitionWrapper.java 2008-07-23
14:34:11 UTC (rev 9248)
@@ -0,0 +1,68 @@
+package org.jboss.tools.flow.jpdl4.graph.wrapper;
+
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
+import org.eclipse.draw2d.geometry.Point;
+import org.jboss.tools.flow.editor.core.AbstractConnectionWrapper;
+import org.jboss.tools.flow.editor.core.NodeWrapper;
+import org.jboss.tools.flow.jpdl4.core.Node;
+import org.jboss.tools.flow.jpdl4.core.Transition;
+
+public class TransitionWrapper extends AbstractConnectionWrapper {
+
+ public TransitionWrapper() {
+ }
+
+ public Transition getTransition() {
+ return (Transition)getElement();
+ }
+
+ public void localSetTransition(Transition transition) {
+ setElement(transition);
+ }
+
+ public void connect(NodeWrapper source, NodeWrapper target) {
+ super.connect(source, target);
+ Node from = ((BaseNodeWrapper) getSource()).getNode();
+ Node to = ((BaseNodeWrapper) getTarget()).getNode();
+ setElement(new Transition(from, to));
+ }
+
+ protected List<Point> internalGetBendpoints() {
+ return (List<Point>) stringToBendpoints((String)
getTransition().getMetaData("bendpoints"));
+ }
+
+ protected void internalSetBendpoints(List<Point> bendpoints) {
+ getTransition().setMetaData("bendpoints",
bendpointsToString(bendpoints));
+ }
+
+ private String bendpointsToString(List<Point> bendpoints) {
+ if (bendpoints == null) {
+ return null;
+ }
+ String result = "[";
+ for (Iterator<Point> iterator = bendpoints.iterator(); iterator.hasNext();
) {
+ Point point = iterator.next();
+ result += point.x + "," + point.y + (iterator.hasNext() ?
";" : "");
+ }
+ result += "]";
+ return result;
+ }
+
+ private List<Point> stringToBendpoints(String s) {
+ List<Point> result = new ArrayList<Point>();
+ if (s == null) {
+ return result;
+ }
+ s = s.substring(1, s.length() - 1);
+ String[] bendpoints = s.split(";");
+ for (String bendpoint: bendpoints) {
+ String[] xy = bendpoint.split(",");
+ result.add(new Point(new Integer(xy[0]), new Integer(xy[1])));
+ }
+ return result;
+ }
+
+}
Modified:
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4.graph/src/org/jboss/tools/flow/jpdl4/graph/wrapper/TransitionWrapperFactory.java
===================================================================
---
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4.graph/src/org/jboss/tools/process/jpdl4/graph/wrapper/TransitionWrapperFactory.java 2008-07-23
14:26:18 UTC (rev 9245)
+++
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4.graph/src/org/jboss/tools/flow/jpdl4/graph/wrapper/TransitionWrapperFactory.java 2008-07-23
14:34:11 UTC (rev 9248)
@@ -1,4 +1,4 @@
-package org.jboss.tools.process.jpdl4.graph.wrapper;
+package org.jboss.tools.flow.jpdl4.graph.wrapper;
import org.jboss.tools.flow.editor.core.AbstractConnectionWrapper;
import org.jboss.tools.flow.editor.core.ConnectionFactory;