JBoss Tools SVN: r9550 - trunk/drools/plugins/org.jboss.tools.flow.ruleflow.
by jbosstools-commits＠lists.jboss.org
Author: koen.aers(a)jboss.com
Date: 2008-08-05 12:55:11 -0400 (Tue, 05 Aug 2008)
New Revision: 9550
Modified:
trunk/drools/plugins/org.jboss.tools.flow.ruleflow/plugin.xml
Log:
fixed action bar contributor class
Modified: trunk/drools/plugins/org.jboss.tools.flow.ruleflow/plugin.xml
===================================================================
--- trunk/drools/plugins/org.jboss.tools.flow.ruleflow/plugin.xml 2008-08-05 16:54:53 UTC (rev 9549)
+++ trunk/drools/plugins/org.jboss.tools.flow.ruleflow/plugin.xml 2008-08-05 16:55:11 UTC (rev 9550)
@@ -7,7 +7,7 @@
name="RuleFlow Editor"
extensions="rf"
icon="icons/process.gif"
- contributorClass="org.jboss.tools.flow.editor.GenericActionBarContributor"
+ contributorClass="org.jboss.tools.flow.common.editor.GenericActionBarContributor"
class="org.jboss.tools.process.ruleflow.editor.RuleFlowEditor"
id="org.jboss.tools.process.ruleflow.editor.RuleFlowModelEditor">
</editor>
16 years, 7 months
- 1
- 0
JBoss Tools SVN: r9549 - trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4.
by jbosstools-commits＠lists.jboss.org
Author: koen.aers(a)jboss.com
Date: 2008-08-05 12:54:53 -0400 (Tue, 05 Aug 2008)
New Revision: 9549
Modified:
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/plugin.xml
Log:
fixed action bar contributor class
Modified: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/plugin.xml
===================================================================
--- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/plugin.xml 2008-08-05 16:50:08 UTC (rev 9548)
+++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/plugin.xml 2008-08-05 16:54:53 UTC (rev 9549)
@@ -7,7 +7,7 @@
name="jPDL4 Editor"
extensions="jpdl4"
icon="icons/process.gif"
- contributorClass="org.jboss.tools.flow.editor.GenericActionBarContributor"
+ contributorClass="org.jboss.tools.flow.common.editor.GenericActionBarContributor"
class="org.jboss.tools.flow.jpdl4.editor.JpdlEditor"
id="org.jboss.tools.process.jpdl4.graph.editor.JpdlEditor">
</editor>
16 years, 7 months
- 1
- 0
JBoss Tools SVN: r9548 - trunk/jbpm/plugins.
by jbosstools-commits＠lists.jboss.org
Author: koen.aers(a)jboss.com
Date: 2008-08-05 12:50:08 -0400 (Tue, 05 Aug 2008)
New Revision: 9548
Removed:
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4.graph/
Log:
16 years, 7 months
- 1
- 0
JBoss Tools SVN: r9547 - trunk/jbpm/plugins.
by jbosstools-commits＠lists.jboss.org
Author: koen.aers(a)jboss.com
Date: 2008-08-05 12:49:54 -0400 (Tue, 05 Aug 2008)
New Revision: 9547
Removed:
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4.core/
Log:
16 years, 7 months
- 1
- 0
JBoss Tools SVN: r9546 - trunk/flow/plugins.
by jbosstools-commits＠lists.jboss.org
Author: koen.aers(a)jboss.com
Date: 2008-08-05 12:49:11 -0400 (Tue, 05 Aug 2008)
New Revision: 9546
Removed:
trunk/flow/plugins/org.jboss.tools.flow.common.graph/
Log:
16 years, 7 months
- 1
- 0
JBoss Tools SVN: r9545 - trunk/flow/plugins.
by jbosstools-commits＠lists.jboss.org
Author: koen.aers(a)jboss.com
Date: 2008-08-05 12:48:49 -0400 (Tue, 05 Aug 2008)
New Revision: 9545
Removed:
trunk/flow/plugins/org.jboss.tools.flow.common.core/
Log:
16 years, 7 months
- 1
- 0
JBoss Tools SVN: r9544 - in trunk/drools/plugins/org.jboss.tools.flow.ruleflow/src/main/java/org/jboss/tools/process/ruleflow/editor: core and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: koen.aers(a)jboss.com
Date: 2008-08-05 12:46:43 -0400 (Tue, 05 Aug 2008)
New Revision: 9544
Modified:
trunk/drools/plugins/org.jboss.tools.flow.ruleflow/src/main/java/org/jboss/tools/process/ruleflow/editor/RuleFlowEditor.java
trunk/drools/plugins/org.jboss.tools.flow.ruleflow/src/main/java/org/jboss/tools/process/ruleflow/editor/RuleFlowPaletteFactory.java
trunk/drools/plugins/org.jboss.tools.flow.ruleflow/src/main/java/org/jboss/tools/process/ruleflow/editor/core/BaseConnectionWrapper.java
trunk/drools/plugins/org.jboss.tools.flow.ruleflow/src/main/java/org/jboss/tools/process/ruleflow/editor/core/BaseNodeWrapper.java
trunk/drools/plugins/org.jboss.tools.flow.ruleflow/src/main/java/org/jboss/tools/process/ruleflow/editor/core/ProcessWrapper.java
trunk/drools/plugins/org.jboss.tools.flow.ruleflow/src/main/java/org/jboss/tools/process/ruleflow/editor/core/StartNodeWrapper.java
trunk/drools/plugins/org.jboss.tools.flow.ruleflow/src/main/java/org/jboss/tools/process/ruleflow/editor/core/SubProcessWrapper.java
trunk/drools/plugins/org.jboss.tools.flow.ruleflow/src/main/java/org/jboss/tools/process/ruleflow/editor/editpart/ConnectionWrapperEditPart.java
trunk/drools/plugins/org.jboss.tools.flow.ruleflow/src/main/java/org/jboss/tools/process/ruleflow/editor/editpart/RuleFlowEditPartFactory.java
trunk/drools/plugins/org.jboss.tools.flow.ruleflow/src/main/java/org/jboss/tools/process/ruleflow/editor/editpart/StartNodeEditPart.java
trunk/drools/plugins/org.jboss.tools.flow.ruleflow/src/main/java/org/jboss/tools/process/ruleflow/editor/editpart/SubProcessEditPart.java
Log:
name refactorings of packages
Modified: trunk/drools/plugins/org.jboss.tools.flow.ruleflow/src/main/java/org/jboss/tools/process/ruleflow/editor/RuleFlowEditor.java
===================================================================
--- trunk/drools/plugins/org.jboss.tools.flow.ruleflow/src/main/java/org/jboss/tools/process/ruleflow/editor/RuleFlowEditor.java 2008-08-05 16:45:58 UTC (rev 9543)
+++ trunk/drools/plugins/org.jboss.tools.flow.ruleflow/src/main/java/org/jboss/tools/process/ruleflow/editor/RuleFlowEditor.java 2008-08-05 16:46:43 UTC (rev 9544)
@@ -25,7 +25,7 @@
import org.eclipse.gef.EditPartFactory;
import org.eclipse.gef.palette.PaletteRoot;
import org.eclipse.ui.IFileEditorInput;
-import org.jboss.tools.flow.editor.GenericModelEditor;
+import org.jboss.tools.flow.common.editor.GenericModelEditor;
import org.jboss.tools.process.ruleflow.editor.core.ProcessWrapper;
import org.jboss.tools.process.ruleflow.editor.core.StartNodeWrapper;
import org.jboss.tools.process.ruleflow.editor.editpart.RuleFlowEditPartFactory;
Modified: trunk/drools/plugins/org.jboss.tools.flow.ruleflow/src/main/java/org/jboss/tools/process/ruleflow/editor/RuleFlowPaletteFactory.java
===================================================================
--- trunk/drools/plugins/org.jboss.tools.flow.ruleflow/src/main/java/org/jboss/tools/process/ruleflow/editor/RuleFlowPaletteFactory.java 2008-08-05 16:45:58 UTC (rev 9543)
+++ trunk/drools/plugins/org.jboss.tools.flow.ruleflow/src/main/java/org/jboss/tools/process/ruleflow/editor/RuleFlowPaletteFactory.java 2008-08-05 16:46:43 UTC (rev 9544)
@@ -26,7 +26,7 @@
import org.eclipse.gef.palette.PaletteRoot;
import org.eclipse.gef.requests.SimpleFactory;
import org.eclipse.jface.resource.ImageDescriptor;
-import org.jboss.tools.flow.editor.PaletteFactory;
+import org.jboss.tools.flow.common.editor.PaletteFactory;
import org.jboss.tools.process.ruleflow.Activator;
import org.jboss.tools.process.ruleflow.editor.core.BaseConnectionWrapper;
import org.jboss.tools.process.ruleflow.editor.core.StartNodeWrapper;
Modified: trunk/drools/plugins/org.jboss.tools.flow.ruleflow/src/main/java/org/jboss/tools/process/ruleflow/editor/core/BaseConnectionWrapper.java
===================================================================
--- trunk/drools/plugins/org.jboss.tools.flow.ruleflow/src/main/java/org/jboss/tools/process/ruleflow/editor/core/BaseConnectionWrapper.java 2008-08-05 16:45:58 UTC (rev 9543)
+++ trunk/drools/plugins/org.jboss.tools.flow.ruleflow/src/main/java/org/jboss/tools/process/ruleflow/editor/core/BaseConnectionWrapper.java 2008-08-05 16:46:43 UTC (rev 9544)
@@ -24,8 +24,8 @@
import org.drools.workflow.core.Node;
import org.drools.workflow.core.impl.ConnectionImpl;
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.common.wrapper.AbstractConnectionWrapper;
+import org.jboss.tools.flow.common.wrapper.NodeWrapper;
/**
* Wrapper for a connection.
Modified: trunk/drools/plugins/org.jboss.tools.flow.ruleflow/src/main/java/org/jboss/tools/process/ruleflow/editor/core/BaseNodeWrapper.java
===================================================================
--- trunk/drools/plugins/org.jboss.tools.flow.ruleflow/src/main/java/org/jboss/tools/process/ruleflow/editor/core/BaseNodeWrapper.java 2008-08-05 16:45:58 UTC (rev 9543)
+++ trunk/drools/plugins/org.jboss.tools.flow.ruleflow/src/main/java/org/jboss/tools/process/ruleflow/editor/core/BaseNodeWrapper.java 2008-08-05 16:46:43 UTC (rev 9544)
@@ -18,9 +18,9 @@
import org.drools.workflow.core.Node;
import org.eclipse.draw2d.geometry.Rectangle;
-import org.jboss.tools.flow.editor.core.AbstractNodeWrapper;
-import org.jboss.tools.flow.editor.core.ConnectionWrapper;
-import org.jboss.tools.flow.editor.core.NodeWrapper;
+import org.jboss.tools.flow.common.wrapper.AbstractNodeWrapper;
+import org.jboss.tools.flow.common.wrapper.ConnectionWrapper;
+import org.jboss.tools.flow.common.wrapper.NodeWrapper;
/**
* Wrapper for a node.
Modified: trunk/drools/plugins/org.jboss.tools.flow.ruleflow/src/main/java/org/jboss/tools/process/ruleflow/editor/core/ProcessWrapper.java
===================================================================
--- trunk/drools/plugins/org.jboss.tools.flow.ruleflow/src/main/java/org/jboss/tools/process/ruleflow/editor/core/ProcessWrapper.java 2008-08-05 16:45:58 UTC (rev 9543)
+++ trunk/drools/plugins/org.jboss.tools.flow.ruleflow/src/main/java/org/jboss/tools/process/ruleflow/editor/core/ProcessWrapper.java 2008-08-05 16:46:43 UTC (rev 9544)
@@ -18,8 +18,8 @@
import org.drools.ruleflow.core.RuleFlowProcess;
import org.drools.workflow.core.Node;
-import org.jboss.tools.flow.editor.core.AbstractFlowWrapper;
-import org.jboss.tools.flow.editor.core.NodeWrapper;
+import org.jboss.tools.flow.common.wrapper.AbstractFlowWrapper;
+import org.jboss.tools.flow.common.wrapper.NodeWrapper;
/**
* Wrapper for a RuleFlow process.
Modified: trunk/drools/plugins/org.jboss.tools.flow.ruleflow/src/main/java/org/jboss/tools/process/ruleflow/editor/core/StartNodeWrapper.java
===================================================================
--- trunk/drools/plugins/org.jboss.tools.flow.ruleflow/src/main/java/org/jboss/tools/process/ruleflow/editor/core/StartNodeWrapper.java 2008-08-05 16:45:58 UTC (rev 9543)
+++ trunk/drools/plugins/org.jboss.tools.flow.ruleflow/src/main/java/org/jboss/tools/process/ruleflow/editor/core/StartNodeWrapper.java 2008-08-05 16:46:43 UTC (rev 9544)
@@ -17,8 +17,8 @@
*/
import org.drools.workflow.core.node.StartNode;
-import org.jboss.tools.flow.editor.core.ConnectionWrapper;
-import org.jboss.tools.flow.editor.core.NodeWrapper;
+import org.jboss.tools.flow.common.wrapper.ConnectionWrapper;
+import org.jboss.tools.flow.common.wrapper.NodeWrapper;
/**
* Wrapper for a start node.
Modified: trunk/drools/plugins/org.jboss.tools.flow.ruleflow/src/main/java/org/jboss/tools/process/ruleflow/editor/core/SubProcessWrapper.java
===================================================================
--- trunk/drools/plugins/org.jboss.tools.flow.ruleflow/src/main/java/org/jboss/tools/process/ruleflow/editor/core/SubProcessWrapper.java 2008-08-05 16:45:58 UTC (rev 9543)
+++ trunk/drools/plugins/org.jboss.tools.flow.ruleflow/src/main/java/org/jboss/tools/process/ruleflow/editor/core/SubProcessWrapper.java 2008-08-05 16:46:43 UTC (rev 9544)
@@ -17,8 +17,8 @@
*/
import org.drools.workflow.core.node.SubProcessNode;
-import org.jboss.tools.flow.editor.core.ConnectionWrapper;
-import org.jboss.tools.flow.editor.core.NodeWrapper;
+import org.jboss.tools.flow.common.wrapper.ConnectionWrapper;
+import org.jboss.tools.flow.common.wrapper.NodeWrapper;
/**
* Wrapper for a SubProcess node.
Modified: trunk/drools/plugins/org.jboss.tools.flow.ruleflow/src/main/java/org/jboss/tools/process/ruleflow/editor/editpart/ConnectionWrapperEditPart.java
===================================================================
--- trunk/drools/plugins/org.jboss.tools.flow.ruleflow/src/main/java/org/jboss/tools/process/ruleflow/editor/editpart/ConnectionWrapperEditPart.java 2008-08-05 16:45:58 UTC (rev 9543)
+++ trunk/drools/plugins/org.jboss.tools.flow.ruleflow/src/main/java/org/jboss/tools/process/ruleflow/editor/editpart/ConnectionWrapperEditPart.java 2008-08-05 16:46:43 UTC (rev 9544)
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-import org.jboss.tools.flow.editor.editpart.ConnectionEditPart;
+import org.jboss.tools.flow.common.editpart.ConnectionEditPart;
import org.jboss.tools.process.ruleflow.editor.core.BaseConnectionWrapper;
public class ConnectionWrapperEditPart extends ConnectionEditPart {
Modified: trunk/drools/plugins/org.jboss.tools.flow.ruleflow/src/main/java/org/jboss/tools/process/ruleflow/editor/editpart/RuleFlowEditPartFactory.java
===================================================================
--- trunk/drools/plugins/org.jboss.tools.flow.ruleflow/src/main/java/org/jboss/tools/process/ruleflow/editor/editpart/RuleFlowEditPartFactory.java 2008-08-05 16:45:58 UTC (rev 9543)
+++ trunk/drools/plugins/org.jboss.tools.flow.ruleflow/src/main/java/org/jboss/tools/process/ruleflow/editor/editpart/RuleFlowEditPartFactory.java 2008-08-05 16:46:43 UTC (rev 9544)
@@ -18,7 +18,7 @@
import org.eclipse.gef.EditPart;
import org.eclipse.gef.EditPartFactory;
-import org.jboss.tools.flow.editor.editpart.RootEditPart;
+import org.jboss.tools.flow.common.editpart.RootEditPart;
import org.jboss.tools.process.ruleflow.editor.core.BaseConnectionWrapper;
import org.jboss.tools.process.ruleflow.editor.core.ProcessWrapper;
import org.jboss.tools.process.ruleflow.editor.core.StartNodeWrapper;
Modified: trunk/drools/plugins/org.jboss.tools.flow.ruleflow/src/main/java/org/jboss/tools/process/ruleflow/editor/editpart/StartNodeEditPart.java
===================================================================
--- trunk/drools/plugins/org.jboss.tools.flow.ruleflow/src/main/java/org/jboss/tools/process/ruleflow/editor/editpart/StartNodeEditPart.java 2008-08-05 16:45:58 UTC (rev 9543)
+++ trunk/drools/plugins/org.jboss.tools.flow.ruleflow/src/main/java/org/jboss/tools/process/ruleflow/editor/editpart/StartNodeEditPart.java 2008-08-05 16:46:43 UTC (rev 9544)
@@ -19,8 +19,8 @@
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.flow.common.editpart.ElementEditPart;
+import org.jboss.tools.flow.common.figure.RectangleElementFigure;
import org.jboss.tools.process.ruleflow.Activator;
/**
Modified: trunk/drools/plugins/org.jboss.tools.flow.ruleflow/src/main/java/org/jboss/tools/process/ruleflow/editor/editpart/SubProcessEditPart.java
===================================================================
--- trunk/drools/plugins/org.jboss.tools.flow.ruleflow/src/main/java/org/jboss/tools/process/ruleflow/editor/editpart/SubProcessEditPart.java 2008-08-05 16:45:58 UTC (rev 9543)
+++ trunk/drools/plugins/org.jboss.tools.flow.ruleflow/src/main/java/org/jboss/tools/process/ruleflow/editor/editpart/SubProcessEditPart.java 2008-08-05 16:46:43 UTC (rev 9544)
@@ -21,8 +21,8 @@
import org.eclipse.swt.graphics.Color;
import org.eclipse.swt.graphics.Image;
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.flow.common.editpart.ElementEditPart;
+import org.jboss.tools.flow.common.figure.RoundedRectangleElementFigure;
import org.jboss.tools.process.ruleflow.Activator;
/**
16 years, 7 months
- 1
- 0
JBoss Tools SVN: r9543 - in trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4: META-INF and 5 other directories.
by jbosstools-commits＠lists.jboss.org
Author: koen.aers(a)jboss.com
Date: 2008-08-05 12:45:58 -0400 (Tue, 05 Aug 2008)
New Revision: 9543
Added:
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/Activator.java
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editor/
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editpart/
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/strategy/
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/wrapper/
Removed:
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/graph/
Modified:
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/META-INF/MANIFEST.MF
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/plugin.xml
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editor/JpdlEditor.java
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editor/JpdlPaletteFactory.java
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editpart/EndStateEditPart.java
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editpart/JpdlEditPartFactory.java
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editpart/StartStateEditPart.java
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editpart/StateEditPart.java
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editpart/TransitionEditPart.java
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/strategy/EndStateAcceptsOutgoingConnectionStrategy.java
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/strategy/ProcessAcceptsElementStrategy.java
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/strategy/StartStateAcceptsIncomingConnectionStrategy.java
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/wrapper/EndStateWrapper.java
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/wrapper/ProcessWrapper.java
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/wrapper/StartStateWrapper.java
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/wrapper/StateWrapper.java
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/wrapper/SuperStateWrapper.java
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/wrapper/TransitionWrapper.java
Log:
name refactorings of packages
Modified: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/META-INF/MANIFEST.MF
===================================================================
--- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/META-INF/MANIFEST.MF 2008-08-05 16:42:16 UTC (rev 9542)
+++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/META-INF/MANIFEST.MF 2008-08-05 16:45:58 UTC (rev 9543)
@@ -11,5 +11,5 @@
org.eclipse.ui;bundle-version="3.4.0",
org.eclipse.core.runtime;bundle-version="3.4.0"
Bundle-ActivationPolicy: lazy
-Bundle-Activator: org.jboss.tools.flow.jpdl4.graph.Activator
+Bundle-Activator: org.jboss.tools.flow.jpdl4.Activator
Export-Package: org.jboss.tools.flow.jpdl4.model
Modified: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/plugin.xml
===================================================================
--- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/plugin.xml 2008-08-05 16:42:16 UTC (rev 9542)
+++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/plugin.xml 2008-08-05 16:45:58 UTC (rev 9543)
@@ -8,7 +8,7 @@
extensions="jpdl4"
icon="icons/process.gif"
contributorClass="org.jboss.tools.flow.editor.GenericActionBarContributor"
- class="org.jboss.tools.flow.jpdl4.graph.editor.JpdlEditor"
+ class="org.jboss.tools.flow.jpdl4.editor.JpdlEditor"
id="org.jboss.tools.process.jpdl4.graph.editor.JpdlEditor">
</editor>
</extension>
Copied: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/Activator.java (from rev 9540, trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/graph/Activator.java)
===================================================================
--- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/Activator.java (rev 0)
+++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/Activator.java 2008-08-05 16:45:58 UTC (rev 9543)
@@ -0,0 +1,45 @@
+package org.jboss.tools.flow.jpdl4;
+
+/*
+ * 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/src/org/jboss/tools/flow/jpdl4/Activator.java
___________________________________________________________________
Name: svn:mergeinfo
+
Copied: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editor (from rev 9540, trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/graph/editor)
Property changes on: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editor
___________________________________________________________________
Name: svn:mergeinfo
+
Modified: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editor/JpdlEditor.java
===================================================================
--- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/graph/editor/JpdlEditor.java 2008-08-05 16:34:56 UTC (rev 9540)
+++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editor/JpdlEditor.java 2008-08-05 16:45:58 UTC (rev 9543)
@@ -1,4 +1,4 @@
-package org.jboss.tools.flow.jpdl4.graph.editor;
+package org.jboss.tools.flow.jpdl4.editor;
import java.io.IOException;
import java.io.InputStream;
@@ -6,9 +6,9 @@
import org.eclipse.gef.EditPartFactory;
import org.eclipse.gef.palette.PaletteRoot;
-import org.jboss.tools.flow.editor.GenericModelEditor;
-import org.jboss.tools.flow.jpdl4.graph.editpart.JpdlEditPartFactory;
-import org.jboss.tools.flow.jpdl4.graph.wrapper.ProcessWrapper;
+import org.jboss.tools.flow.common.editor.GenericModelEditor;
+import org.jboss.tools.flow.jpdl4.editpart.JpdlEditPartFactory;
+import org.jboss.tools.flow.jpdl4.wrapper.ProcessWrapper;
public class JpdlEditor extends GenericModelEditor {
Modified: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editor/JpdlPaletteFactory.java
===================================================================
--- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/graph/editor/JpdlPaletteFactory.java 2008-08-05 16:34:56 UTC (rev 9540)
+++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editor/JpdlPaletteFactory.java 2008-08-05 16:45:58 UTC (rev 9543)
@@ -1,4 +1,4 @@
-package org.jboss.tools.flow.jpdl4.graph.editor;
+package org.jboss.tools.flow.jpdl4.editor;
import java.util.ArrayList;
import java.util.List;
@@ -9,13 +9,13 @@
import org.eclipse.gef.palette.ToolEntry;
import org.eclipse.gef.requests.SimpleFactory;
import org.eclipse.jface.resource.ImageDescriptor;
-import org.jboss.tools.flow.editor.PaletteFactory;
-import org.jboss.tools.flow.jpdl4.graph.Activator;
-import org.jboss.tools.flow.jpdl4.graph.wrapper.EndStateWrapper;
-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.SuperStateWrapper;
-import org.jboss.tools.flow.jpdl4.graph.wrapper.TransitionWrapper;
+import org.jboss.tools.flow.common.editor.PaletteFactory;
+import org.jboss.tools.flow.jpdl4.Activator;
+import org.jboss.tools.flow.jpdl4.wrapper.EndStateWrapper;
+import org.jboss.tools.flow.jpdl4.wrapper.StartStateWrapper;
+import org.jboss.tools.flow.jpdl4.wrapper.StateWrapper;
+import org.jboss.tools.flow.jpdl4.wrapper.SuperStateWrapper;
+import org.jboss.tools.flow.jpdl4.wrapper.TransitionWrapper;
public class JpdlPaletteFactory extends PaletteFactory {
Copied: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editpart (from rev 9540, trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/graph/editpart)
Property changes on: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editpart
___________________________________________________________________
Name: svn:mergeinfo
+
Modified: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editpart/EndStateEditPart.java
===================================================================
--- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/graph/editpart/EndStateEditPart.java 2008-08-05 16:34:56 UTC (rev 9540)
+++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editpart/EndStateEditPart.java 2008-08-05 16:45:58 UTC (rev 9543)
@@ -1,11 +1,11 @@
-package org.jboss.tools.flow.jpdl4.graph.editpart;
+package org.jboss.tools.flow.jpdl4.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.flow.jpdl4.graph.Activator;
+import org.jboss.tools.flow.common.editpart.ElementEditPart;
+import org.jboss.tools.flow.common.figure.RectangleElementFigure;
+import org.jboss.tools.flow.jpdl4.Activator;
public class EndStateEditPart extends ElementEditPart {
Modified: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editpart/JpdlEditPartFactory.java
===================================================================
--- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/graph/editpart/JpdlEditPartFactory.java 2008-08-05 16:34:56 UTC (rev 9540)
+++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editpart/JpdlEditPartFactory.java 2008-08-05 16:45:58 UTC (rev 9543)
@@ -1,15 +1,15 @@
-package org.jboss.tools.flow.jpdl4.graph.editpart;
+package org.jboss.tools.flow.jpdl4.editpart;
import org.eclipse.gef.EditPart;
import org.eclipse.gef.EditPartFactory;
-import org.jboss.tools.flow.editor.editpart.ContainerEditPart;
-import org.jboss.tools.flow.editor.editpart.RootEditPart;
-import org.jboss.tools.flow.jpdl4.graph.wrapper.EndStateWrapper;
-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.SuperStateWrapper;
-import org.jboss.tools.flow.jpdl4.graph.wrapper.TransitionWrapper;
+import org.jboss.tools.flow.common.editpart.ContainerEditPart;
+import org.jboss.tools.flow.common.editpart.RootEditPart;
+import org.jboss.tools.flow.jpdl4.wrapper.EndStateWrapper;
+import org.jboss.tools.flow.jpdl4.wrapper.ProcessWrapper;
+import org.jboss.tools.flow.jpdl4.wrapper.StartStateWrapper;
+import org.jboss.tools.flow.jpdl4.wrapper.StateWrapper;
+import org.jboss.tools.flow.jpdl4.wrapper.SuperStateWrapper;
+import org.jboss.tools.flow.jpdl4.wrapper.TransitionWrapper;
public class JpdlEditPartFactory implements EditPartFactory {
Modified: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editpart/StartStateEditPart.java
===================================================================
--- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/graph/editpart/StartStateEditPart.java 2008-08-05 16:34:56 UTC (rev 9540)
+++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editpart/StartStateEditPart.java 2008-08-05 16:45:58 UTC (rev 9543)
@@ -1,11 +1,11 @@
-package org.jboss.tools.flow.jpdl4.graph.editpart;
+package org.jboss.tools.flow.jpdl4.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.flow.jpdl4.graph.Activator;
+import org.jboss.tools.flow.common.editpart.ElementEditPart;
+import org.jboss.tools.flow.common.figure.RectangleElementFigure;
+import org.jboss.tools.flow.jpdl4.Activator;
public class StartStateEditPart extends ElementEditPart {
Modified: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editpart/StateEditPart.java
===================================================================
--- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/graph/editpart/StateEditPart.java 2008-08-05 16:34:56 UTC (rev 9540)
+++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editpart/StateEditPart.java 2008-08-05 16:45:58 UTC (rev 9543)
@@ -1,13 +1,13 @@
-package org.jboss.tools.flow.jpdl4.graph.editpart;
+package org.jboss.tools.flow.jpdl4.editpart;
import org.eclipse.draw2d.IFigure;
import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.swt.graphics.Color;
import org.eclipse.swt.graphics.Image;
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.flow.jpdl4.graph.Activator;
+import org.jboss.tools.flow.common.editpart.ElementEditPart;
+import org.jboss.tools.flow.common.figure.RoundedRectangleElementFigure;
+import org.jboss.tools.flow.jpdl4.Activator;
public class StateEditPart extends ElementEditPart {
Modified: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editpart/TransitionEditPart.java
===================================================================
--- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/graph/editpart/TransitionEditPart.java 2008-08-05 16:34:56 UTC (rev 9540)
+++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editpart/TransitionEditPart.java 2008-08-05 16:45:58 UTC (rev 9543)
@@ -1,7 +1,7 @@
-package org.jboss.tools.flow.jpdl4.graph.editpart;
+package org.jboss.tools.flow.jpdl4.editpart;
-import org.jboss.tools.flow.editor.editpart.ConnectionEditPart;
-import org.jboss.tools.flow.jpdl4.graph.wrapper.TransitionWrapper;
+import org.jboss.tools.flow.common.editpart.ConnectionEditPart;
+import org.jboss.tools.flow.jpdl4.wrapper.TransitionWrapper;
public class TransitionEditPart extends ConnectionEditPart {
Copied: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/strategy (from rev 9540, trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/graph/strategy)
Property changes on: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/strategy
___________________________________________________________________
Name: svn:mergeinfo
+
Modified: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/strategy/EndStateAcceptsOutgoingConnectionStrategy.java
===================================================================
--- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/graph/strategy/EndStateAcceptsOutgoingConnectionStrategy.java 2008-08-05 16:34:56 UTC (rev 9540)
+++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/strategy/EndStateAcceptsOutgoingConnectionStrategy.java 2008-08-05 16:45:58 UTC (rev 9543)
@@ -1,8 +1,8 @@
-package org.jboss.tools.flow.jpdl4.graph.strategy;
+package org.jboss.tools.flow.jpdl4.strategy;
import org.jboss.tools.flow.common.model.Connection;
import org.jboss.tools.flow.common.model.Node;
-import org.jboss.tools.flow.editor.strategy.AcceptsOutgoingConnectionStrategy;
+import org.jboss.tools.flow.common.strategy.AcceptsOutgoingConnectionStrategy;
public class EndStateAcceptsOutgoingConnectionStrategy implements AcceptsOutgoingConnectionStrategy {
Modified: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/strategy/ProcessAcceptsElementStrategy.java
===================================================================
--- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/graph/strategy/ProcessAcceptsElementStrategy.java 2008-08-05 16:34:56 UTC (rev 9540)
+++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/strategy/ProcessAcceptsElementStrategy.java 2008-08-05 16:45:58 UTC (rev 9543)
@@ -1,7 +1,7 @@
-package org.jboss.tools.flow.jpdl4.graph.strategy;
+package org.jboss.tools.flow.jpdl4.strategy;
import org.jboss.tools.flow.common.model.Container;
-import org.jboss.tools.flow.editor.strategy.AcceptsElementStrategy;
+import org.jboss.tools.flow.common.strategy.AcceptsElementStrategy;
import org.jboss.tools.flow.jpdl4.model.Process;
import org.jboss.tools.flow.jpdl4.model.StartState;
Modified: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/strategy/StartStateAcceptsIncomingConnectionStrategy.java
===================================================================
--- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/graph/strategy/StartStateAcceptsIncomingConnectionStrategy.java 2008-08-05 16:34:56 UTC (rev 9540)
+++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/strategy/StartStateAcceptsIncomingConnectionStrategy.java 2008-08-05 16:45:58 UTC (rev 9543)
@@ -1,8 +1,8 @@
-package org.jboss.tools.flow.jpdl4.graph.strategy;
+package org.jboss.tools.flow.jpdl4.strategy;
import org.jboss.tools.flow.common.model.Connection;
import org.jboss.tools.flow.common.model.Node;
-import org.jboss.tools.flow.editor.strategy.AcceptsIncomingConnectionStrategy;
+import org.jboss.tools.flow.common.strategy.AcceptsIncomingConnectionStrategy;
public class StartStateAcceptsIncomingConnectionStrategy implements AcceptsIncomingConnectionStrategy {
Copied: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/wrapper (from rev 9540, trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/graph/wrapper)
Property changes on: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/wrapper
___________________________________________________________________
Name: svn:mergeinfo
+
Modified: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/wrapper/EndStateWrapper.java
===================================================================
--- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/graph/wrapper/EndStateWrapper.java 2008-08-05 16:34:56 UTC (rev 9540)
+++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/wrapper/EndStateWrapper.java 2008-08-05 16:45:58 UTC (rev 9543)
@@ -1,9 +1,9 @@
-package org.jboss.tools.flow.jpdl4.graph.wrapper;
+package org.jboss.tools.flow.jpdl4.wrapper;
-import org.jboss.tools.flow.editor.core.DefaultNodeWrapper;
-import org.jboss.tools.flow.editor.strategy.AcceptsOutgoingConnectionStrategy;
-import org.jboss.tools.flow.jpdl4.graph.strategy.EndStateAcceptsOutgoingConnectionStrategy;
+import org.jboss.tools.flow.common.strategy.AcceptsOutgoingConnectionStrategy;
+import org.jboss.tools.flow.common.wrapper.DefaultNodeWrapper;
import org.jboss.tools.flow.jpdl4.model.EndState;
+import org.jboss.tools.flow.jpdl4.strategy.EndStateAcceptsOutgoingConnectionStrategy;
public class EndStateWrapper extends DefaultNodeWrapper {
Modified: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/wrapper/ProcessWrapper.java
===================================================================
--- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/graph/wrapper/ProcessWrapper.java 2008-08-05 16:34:56 UTC (rev 9540)
+++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/wrapper/ProcessWrapper.java 2008-08-05 16:45:58 UTC (rev 9543)
@@ -1,8 +1,8 @@
-package org.jboss.tools.flow.jpdl4.graph.wrapper;
+package org.jboss.tools.flow.jpdl4.wrapper;
-import org.jboss.tools.flow.editor.core.DefaultFlowWrapper;
-import org.jboss.tools.flow.jpdl4.graph.strategy.ProcessAcceptsElementStrategy;
+import org.jboss.tools.flow.common.wrapper.DefaultFlowWrapper;
import org.jboss.tools.flow.jpdl4.model.Process;
+import org.jboss.tools.flow.jpdl4.strategy.ProcessAcceptsElementStrategy;
public class ProcessWrapper extends DefaultFlowWrapper {
Modified: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/wrapper/StartStateWrapper.java
===================================================================
--- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/graph/wrapper/StartStateWrapper.java 2008-08-05 16:34:56 UTC (rev 9540)
+++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/wrapper/StartStateWrapper.java 2008-08-05 16:45:58 UTC (rev 9543)
@@ -1,9 +1,9 @@
-package org.jboss.tools.flow.jpdl4.graph.wrapper;
+package org.jboss.tools.flow.jpdl4.wrapper;
-import org.jboss.tools.flow.editor.core.DefaultNodeWrapper;
-import org.jboss.tools.flow.editor.strategy.AcceptsIncomingConnectionStrategy;
-import org.jboss.tools.flow.jpdl4.graph.strategy.StartStateAcceptsIncomingConnectionStrategy;
+import org.jboss.tools.flow.common.strategy.AcceptsIncomingConnectionStrategy;
+import org.jboss.tools.flow.common.wrapper.DefaultNodeWrapper;
import org.jboss.tools.flow.jpdl4.model.StartState;
+import org.jboss.tools.flow.jpdl4.strategy.StartStateAcceptsIncomingConnectionStrategy;
public class StartStateWrapper extends DefaultNodeWrapper {
Modified: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/wrapper/StateWrapper.java
===================================================================
--- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/graph/wrapper/StateWrapper.java 2008-08-05 16:34:56 UTC (rev 9540)
+++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/wrapper/StateWrapper.java 2008-08-05 16:45:58 UTC (rev 9543)
@@ -1,6 +1,6 @@
-package org.jboss.tools.flow.jpdl4.graph.wrapper;
+package org.jboss.tools.flow.jpdl4.wrapper;
-import org.jboss.tools.flow.editor.core.DefaultNodeWrapper;
+import org.jboss.tools.flow.common.wrapper.DefaultNodeWrapper;
import org.jboss.tools.flow.jpdl4.model.State;
public class StateWrapper extends DefaultNodeWrapper {
Modified: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/wrapper/SuperStateWrapper.java
===================================================================
--- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/graph/wrapper/SuperStateWrapper.java 2008-08-05 16:34:56 UTC (rev 9540)
+++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/wrapper/SuperStateWrapper.java 2008-08-05 16:45:58 UTC (rev 9543)
@@ -1,6 +1,6 @@
-package org.jboss.tools.flow.jpdl4.graph.wrapper;
+package org.jboss.tools.flow.jpdl4.wrapper;
-import org.jboss.tools.flow.editor.core.DefaultContainerWrapper;
+import org.jboss.tools.flow.common.wrapper.DefaultContainerWrapper;
import org.jboss.tools.flow.jpdl4.model.SuperState;
public class SuperStateWrapper extends DefaultContainerWrapper {
Modified: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/wrapper/TransitionWrapper.java
===================================================================
--- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/graph/wrapper/TransitionWrapper.java 2008-08-05 16:34:56 UTC (rev 9540)
+++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/wrapper/TransitionWrapper.java 2008-08-05 16:45:58 UTC (rev 9543)
@@ -1,6 +1,6 @@
-package org.jboss.tools.flow.jpdl4.graph.wrapper;
+package org.jboss.tools.flow.jpdl4.wrapper;
-import org.jboss.tools.flow.editor.core.DefaultConnectionWrapper;
+import org.jboss.tools.flow.common.wrapper.DefaultConnectionWrapper;
public class TransitionWrapper extends DefaultConnectionWrapper {
16 years, 7 months
- 1
- 0
JBoss Tools SVN: r9542 - in trunk/flow/plugins/org.jboss.tools.flow.common: src/org/jboss/tools/flow and 9 other directories.
by jbosstools-commits＠lists.jboss.org
Author: koen.aers(a)jboss.com
Date: 2008-08-05 12:42:16 -0400 (Tue, 05 Aug 2008)
New Revision: 9542
Added:
trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/Activator.java
trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/action/
trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/command/
trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/editor/
trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/editor/DropDownMenuWithDefaultAction.java
trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/editor/GenericActionBarContributor.java
trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/editor/GenericContextMenuProvider.java
trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/editor/GenericModelEditor.java
trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/editor/OverviewOutlinePage.java
trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/editor/PaletteFactory.java
trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/editpart/
trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/figure/
trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/policy/
trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/strategy/
trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/wrapper/
Removed:
trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/Activator.java
trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/editor/
Modified:
trunk/flow/plugins/org.jboss.tools.flow.common/META-INF/MANIFEST.MF
trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/action/HorizontalAutoLayoutAction.java
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/AddElementCommand.java
trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/command/ChangeConstraintCommand.java
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/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/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/RenameElementCommand.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/CellEditorLocator.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/editpart/ContainerEditPart.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/editpart/RootEditPart.java
trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/figure/AbstractElementFigure.java
trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/figure/ElementContainerFigure.java
trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/figure/ElementFigure.java
trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/figure/EllipseElementFigure.java
trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/figure/RectangleElementFigure.java
trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/figure/RoundedRectangleElementFigure.java
trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/policy/ConnectionBendpointEditPolicy.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/ElementContainerLayoutEditPolicy.java
trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/policy/ElementDirectEditManager.java
trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/policy/ElementDirectEditPolicy.java
trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/policy/ElementEditPolicy.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/strategy/AcceptsElementStrategy.java
trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/strategy/AcceptsIncomingConnectionStrategy.java
trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/strategy/AcceptsOutgoingConnectionStrategy.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/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/AbstractNodeWrapper.java
trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/wrapper/AbstractWrapper.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/DefaultConnectionWrapper.java
trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/wrapper/DefaultContainerWrapper.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/DefaultNodeWrapper.java
trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/wrapper/ModelEvent.java
trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/wrapper/ModelListener.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:
name refactorings of packages
Modified: trunk/flow/plugins/org.jboss.tools.flow.common/META-INF/MANIFEST.MF
===================================================================
--- trunk/flow/plugins/org.jboss.tools.flow.common/META-INF/MANIFEST.MF 2008-08-05 16:35:56 UTC (rev 9541)
+++ trunk/flow/plugins/org.jboss.tools.flow.common/META-INF/MANIFEST.MF 2008-08-05 16:42:16 UTC (rev 9542)
@@ -3,7 +3,7 @@
Bundle-Name: JBoss Tools Process Plug-in
Bundle-SymbolicName: org.jboss.tools.flow.common;singleton:=true
Bundle-Version: 1.0.0
-Bundle-Activator: org.jboss.tools.flow.Activator
+Bundle-Activator: org.jboss.tools.flow.common.Activator
Bundle-Vendor: JBoss
Require-Bundle:
org.eclipse.ui.views,
@@ -15,15 +15,15 @@
org.eclipse.core.resources,
org.eclipse.ui.ide
Bundle-ActivationPolicy: lazy
-Export-Package: org.jboss.tools.flow;uses:="org.eclipse.core.runtime,org.eclipse.ui.plugin,org.osgi.framework",
+Export-Package: org.jboss.tools.flow.common;uses:="org.eclipse.core.runtime,org.eclipse.ui.plugin,org.osgi.framework",
+ org.jboss.tools.flow.common.action,
+ org.jboss.tools.flow.common.command,
+ org.jboss.tools.flow.common.editor,
+ org.jboss.tools.flow.common.editpart,
+ org.jboss.tools.flow.common.figure,
org.jboss.tools.flow.common.model,
- org.jboss.tools.flow.editor,
- org.jboss.tools.flow.editor.action,
- org.jboss.tools.flow.editor.command,
- org.jboss.tools.flow.editor.core,
- org.jboss.tools.flow.editor.editpart,
- org.jboss.tools.flow.editor.figure,
- org.jboss.tools.flow.editor.policy,
- org.jboss.tools.flow.editor.strategy
+ org.jboss.tools.flow.common.policy,
+ org.jboss.tools.flow.common.strategy,
+ org.jboss.tools.flow.common.wrapper
Bundle-ClassPath: .
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Deleted: trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/Activator.java
===================================================================
--- trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/Activator.java 2008-08-05 16:35:56 UTC (rev 9541)
+++ trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/Activator.java 2008-08-05 16:42:16 UTC (rev 9542)
@@ -1,64 +0,0 @@
-package org.jboss.tools.flow;
-
-/*
- * 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.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.osgi.framework.BundleContext;
-
-/**
- * The main plugin class.
- *
- * @author <a href="mailto:kris_verlaenen@hotmail.com">kris verlaenen </a>
- */
-public class Activator extends AbstractUIPlugin {
-
- public static final String PLUGIN_ID = "org.jboss.tools.process";
-
- private static Activator plugin;
-
- public Activator() {
- plugin = this;
- }
-
- public void stop(BundleContext context) throws Exception {
- super.stop(context);
- plugin = null;
- }
-
- public static Activator getDefault() {
- return plugin;
- }
-
- private static String getUniqueIdentifier() {
- if (getDefault() == null ) {
- return PLUGIN_ID;
- }
- return getDefault().getBundle().getSymbolicName();
- }
-
- public static void log(Throwable t) {
- log(new Status(IStatus.ERROR, getUniqueIdentifier(), 0,
- "Internal error in JBoss Tools Process Plugin: ", t));
- }
-
- public static void log(IStatus status) {
- getDefault().getLog().log(status);
- }
-
-}
Copied: trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/Activator.java (from rev 9532, trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/Activator.java)
===================================================================
--- trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/Activator.java (rev 0)
+++ trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/Activator.java 2008-08-05 16:42:16 UTC (rev 9542)
@@ -0,0 +1,64 @@
+package org.jboss.tools.flow.common;
+
+/*
+ * 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.core.runtime.IStatus;
+import org.eclipse.core.runtime.Status;
+import org.eclipse.ui.plugin.AbstractUIPlugin;
+import org.osgi.framework.BundleContext;
+
+/**
+ * The main plugin class.
+ *
+ * @author <a href="mailto:kris_verlaenen@hotmail.com">kris verlaenen </a>
+ */
+public class Activator extends AbstractUIPlugin {
+
+ public static final String PLUGIN_ID = "org.jboss.tools.process";
+
+ private static Activator plugin;
+
+ public Activator() {
+ plugin = this;
+ }
+
+ public void stop(BundleContext context) throws Exception {
+ super.stop(context);
+ plugin = null;
+ }
+
+ public static Activator getDefault() {
+ return plugin;
+ }
+
+ private static String getUniqueIdentifier() {
+ if (getDefault() == null ) {
+ return PLUGIN_ID;
+ }
+ return getDefault().getBundle().getSymbolicName();
+ }
+
+ public static void log(Throwable t) {
+ log(new Status(IStatus.ERROR, getUniqueIdentifier(), 0,
+ "Internal error in JBoss Tools Process Plugin: ", t));
+ }
+
+ public static void log(IStatus status) {
+ getDefault().getLog().log(status);
+ }
+
+}
Property changes on: trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/Activator.java
___________________________________________________________________
Name: svn:mergeinfo
+
Copied: trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/action (from rev 9532, trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/editor/action)
Property changes on: trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/action
___________________________________________________________________
Name: svn:mergeinfo
+
Modified: trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/action/HorizontalAutoLayoutAction.java
===================================================================
--- trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/editor/action/HorizontalAutoLayoutAction.java 2008-08-05 16:25:42 UTC (rev 9532)
+++ trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/action/HorizontalAutoLayoutAction.java 2008-08-05 16:42:16 UTC (rev 9542)
@@ -1,4 +1,4 @@
-package org.jboss.tools.flow.editor.action;
+package org.jboss.tools.flow.common.action;
/*
* Copyright 2005 JBoss Inc
@@ -23,7 +23,7 @@
import org.eclipse.draw2d.graph.Node;
import org.eclipse.gef.GraphicalViewer;
import org.eclipse.jface.resource.ImageDescriptor;
-import org.jboss.tools.flow.Activator;
+import org.jboss.tools.flow.common.Activator;
/**
* Action for auto layouting a process.
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/editor/action/VerticalAutoLayoutAction.java 2008-08-05 16:25:42 UTC (rev 9532)
+++ trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/action/VerticalAutoLayoutAction.java 2008-08-05 16:42:16 UTC (rev 9542)
@@ -1,4 +1,4 @@
-package org.jboss.tools.flow.editor.action;
+package org.jboss.tools.flow.common.action;
/*
* Copyright 2005 JBoss Inc
@@ -29,10 +29,10 @@
import org.eclipse.jface.action.Action;
import org.eclipse.jface.action.IAction;
import org.eclipse.jface.resource.ImageDescriptor;
-import org.jboss.tools.flow.Activator;
-import org.jboss.tools.flow.editor.core.AbstractConnectionWrapper;
-import org.jboss.tools.flow.editor.core.AbstractFlowWrapper;
-import org.jboss.tools.flow.editor.core.NodeWrapper;
+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.NodeWrapper;
/**
* Action for auto layouting a process.
Copied: trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/command (from rev 9532, trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/editor/command)
Property changes on: trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/command
___________________________________________________________________
Name: svn:mergeinfo
+
Modified: trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/command/AddElementCommand.java
===================================================================
--- trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/editor/command/AddElementCommand.java 2008-08-05 16:25:42 UTC (rev 9532)
+++ trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/command/AddElementCommand.java 2008-08-05 16:42:16 UTC (rev 9542)
@@ -1,4 +1,4 @@
-package org.jboss.tools.flow.editor.command;
+package org.jboss.tools.flow.common.command;
/*
* Copyright 2005 JBoss Inc
@@ -17,8 +17,8 @@
*/
import org.eclipse.gef.commands.Command;
-import org.jboss.tools.flow.editor.core.ContainerWrapper;
-import org.jboss.tools.flow.editor.core.NodeWrapper;
+import org.jboss.tools.flow.common.wrapper.ContainerWrapper;
+import org.jboss.tools.flow.common.wrapper.NodeWrapper;
/**
* A command for adding an element.
Modified: trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/command/ChangeConstraintCommand.java
===================================================================
--- trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/editor/command/ChangeConstraintCommand.java 2008-08-05 16:25:42 UTC (rev 9532)
+++ trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/command/ChangeConstraintCommand.java 2008-08-05 16:42:16 UTC (rev 9542)
@@ -1,4 +1,4 @@
-package org.jboss.tools.flow.editor.command;
+package org.jboss.tools.flow.common.command;
/*
* Copyright 2005 JBoss Inc
@@ -18,7 +18,7 @@
import org.eclipse.draw2d.geometry.Rectangle;
import org.eclipse.gef.commands.Command;
-import org.jboss.tools.flow.editor.core.NodeWrapper;
+import org.jboss.tools.flow.common.wrapper.NodeWrapper;
/**
* A command for changing a constraint.
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/editor/command/CreateBendpointCommand.java 2008-08-05 16:25:42 UTC (rev 9532)
+++ trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/command/CreateBendpointCommand.java 2008-08-05 16:42:16 UTC (rev 9542)
@@ -1,4 +1,4 @@
-package org.jboss.tools.flow.editor.command;
+package org.jboss.tools.flow.common.command;
/*
* Copyright 2005 JBoss Inc
@@ -18,7 +18,7 @@
import org.eclipse.draw2d.geometry.Point;
import org.eclipse.gef.commands.Command;
-import org.jboss.tools.flow.editor.core.AbstractConnectionWrapper;
+import org.jboss.tools.flow.common.wrapper.AbstractConnectionWrapper;
/**
* A command for creating a bendpoint.
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/editor/command/DeleteBendpointCommand.java 2008-08-05 16:25:42 UTC (rev 9532)
+++ trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/command/DeleteBendpointCommand.java 2008-08-05 16:42:16 UTC (rev 9542)
@@ -1,4 +1,4 @@
-package org.jboss.tools.flow.editor.command;
+package org.jboss.tools.flow.common.command;
/*
* Copyright 2005 JBoss Inc
@@ -18,7 +18,7 @@
import org.eclipse.draw2d.geometry.Point;
import org.eclipse.gef.commands.Command;
-import org.jboss.tools.flow.editor.core.AbstractConnectionWrapper;
+import org.jboss.tools.flow.common.wrapper.AbstractConnectionWrapper;
/**
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/editor/command/DeleteConnectionCommand.java 2008-08-05 16:25:42 UTC (rev 9532)
+++ trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/command/DeleteConnectionCommand.java 2008-08-05 16:42:16 UTC (rev 9542)
@@ -1,4 +1,4 @@
-package org.jboss.tools.flow.editor.command;
+package org.jboss.tools.flow.common.command;
/*
* Copyright 2005 JBoss Inc
@@ -17,8 +17,8 @@
*/
import org.eclipse.gef.commands.Command;
-import org.jboss.tools.flow.editor.core.AbstractConnectionWrapper;
-import org.jboss.tools.flow.editor.core.NodeWrapper;
+import org.jboss.tools.flow.common.wrapper.AbstractConnectionWrapper;
+import org.jboss.tools.flow.common.wrapper.NodeWrapper;
/**
* A command for deleting a connection.
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/editor/command/DeleteElementCommand.java 2008-08-05 16:25:42 UTC (rev 9532)
+++ trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/command/DeleteElementCommand.java 2008-08-05 16:42:16 UTC (rev 9542)
@@ -1,4 +1,4 @@
-package org.jboss.tools.flow.editor.command;
+package org.jboss.tools.flow.common.command;
/*
* Copyright 2005 JBoss Inc
@@ -20,9 +20,9 @@
import java.util.List;
import org.eclipse.gef.commands.Command;
-import org.jboss.tools.flow.editor.core.AbstractConnectionWrapper;
-import org.jboss.tools.flow.editor.core.ContainerWrapper;
-import org.jboss.tools.flow.editor.core.NodeWrapper;
+import org.jboss.tools.flow.common.wrapper.AbstractConnectionWrapper;
+import org.jboss.tools.flow.common.wrapper.ContainerWrapper;
+import org.jboss.tools.flow.common.wrapper.NodeWrapper;
/**
* A command for deleting an element.
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/editor/command/ElementConnectionCreateCommand.java 2008-08-05 16:25:42 UTC (rev 9532)
+++ trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/command/ElementConnectionCreateCommand.java 2008-08-05 16:42:16 UTC (rev 9542)
@@ -1,4 +1,4 @@
-package org.jboss.tools.flow.editor.command;
+package org.jboss.tools.flow.common.command;
/*
* Copyright 2005 JBoss Inc
@@ -17,8 +17,8 @@
*/
import org.eclipse.gef.commands.Command;
-import org.jboss.tools.flow.editor.core.AbstractConnectionWrapper;
-import org.jboss.tools.flow.editor.core.NodeWrapper;
+import org.jboss.tools.flow.common.wrapper.AbstractConnectionWrapper;
+import org.jboss.tools.flow.common.wrapper.NodeWrapper;
/**
* A command for creating an element.
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/editor/command/MoveBendpointCommand.java 2008-08-05 16:25:42 UTC (rev 9532)
+++ trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/command/MoveBendpointCommand.java 2008-08-05 16:42:16 UTC (rev 9542)
@@ -1,4 +1,4 @@
-package org.jboss.tools.flow.editor.command;
+package org.jboss.tools.flow.common.command;
/*
* Copyright 2005 JBoss Inc
@@ -18,7 +18,7 @@
import org.eclipse.draw2d.geometry.Point;
import org.eclipse.gef.commands.Command;
-import org.jboss.tools.flow.editor.core.AbstractConnectionWrapper;
+import org.jboss.tools.flow.common.wrapper.AbstractConnectionWrapper;
/**
* A command for moving a bendpoint.
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/editor/command/ReconnectElementConnectionSourceCommand.java 2008-08-05 16:25:42 UTC (rev 9532)
+++ trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/command/ReconnectElementConnectionSourceCommand.java 2008-08-05 16:42:16 UTC (rev 9542)
@@ -1,4 +1,4 @@
-package org.jboss.tools.flow.editor.command;
+package org.jboss.tools.flow.common.command;
/*
* Copyright 2005 JBoss Inc
@@ -17,8 +17,8 @@
*/
import org.eclipse.gef.commands.Command;
-import org.jboss.tools.flow.editor.core.AbstractConnectionWrapper;
-import org.jboss.tools.flow.editor.core.NodeWrapper;
+import org.jboss.tools.flow.common.wrapper.AbstractConnectionWrapper;
+import org.jboss.tools.flow.common.wrapper.NodeWrapper;
/**
* A command for reconnecting the source of a connection.
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/editor/command/ReconnectElementConnectionTargetCommand.java 2008-08-05 16:25:42 UTC (rev 9532)
+++ trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/command/ReconnectElementConnectionTargetCommand.java 2008-08-05 16:42:16 UTC (rev 9542)
@@ -1,4 +1,4 @@
-package org.jboss.tools.flow.editor.command;
+package org.jboss.tools.flow.common.command;
/*
* Copyright 2005 JBoss Inc
@@ -17,8 +17,8 @@
*/
import org.eclipse.gef.commands.Command;
-import org.jboss.tools.flow.editor.core.AbstractConnectionWrapper;
-import org.jboss.tools.flow.editor.core.NodeWrapper;
+import org.jboss.tools.flow.common.wrapper.AbstractConnectionWrapper;
+import org.jboss.tools.flow.common.wrapper.NodeWrapper;
/**
* A command for reconnecting the target of a connection.
Modified: trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/command/RenameElementCommand.java
===================================================================
--- trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/editor/command/RenameElementCommand.java 2008-08-05 16:25:42 UTC (rev 9532)
+++ trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/command/RenameElementCommand.java 2008-08-05 16:42:16 UTC (rev 9542)
@@ -1,4 +1,4 @@
-package org.jboss.tools.flow.editor.command;
+package org.jboss.tools.flow.common.command;
/*
* Copyright 2005 JBoss Inc
@@ -17,7 +17,7 @@
*/
import org.eclipse.gef.commands.Command;
-import org.jboss.tools.flow.editor.core.NodeWrapper;
+import org.jboss.tools.flow.common.wrapper.NodeWrapper;
/**
* A command for renaming an element.
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/editor/command/SplitConnectionCommand.java 2008-08-05 16:25:42 UTC (rev 9532)
+++ trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/command/SplitConnectionCommand.java 2008-08-05 16:42:16 UTC (rev 9542)
@@ -1,4 +1,4 @@
-package org.jboss.tools.flow.editor.command;
+package org.jboss.tools.flow.common.command;
/*
* Copyright 2005 JBoss Inc
@@ -17,9 +17,9 @@
*/
import org.eclipse.gef.commands.Command;
-import org.jboss.tools.flow.editor.core.AbstractConnectionWrapper;
-import org.jboss.tools.flow.editor.core.AbstractFlowWrapper;
-import org.jboss.tools.flow.editor.core.NodeWrapper;
+import org.jboss.tools.flow.common.wrapper.AbstractConnectionWrapper;
+import org.jboss.tools.flow.common.wrapper.AbstractFlowWrapper;
+import org.jboss.tools.flow.common.wrapper.NodeWrapper;
/**
* A command for splitting a connection.
Copied: trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/editor/DropDownMenuWithDefaultAction.java (from rev 9532, trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/editor/DropDownMenuWithDefaultAction.java)
===================================================================
--- trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/editor/DropDownMenuWithDefaultAction.java (rev 0)
+++ trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/editor/DropDownMenuWithDefaultAction.java 2008-08-05 16:42:16 UTC (rev 9542)
@@ -0,0 +1,147 @@
+package org.jboss.tools.flow.common.editor;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.eclipse.jface.action.Action;
+import org.eclipse.jface.action.ActionContributionItem;
+import org.eclipse.jface.action.IAction;
+import org.eclipse.jface.action.IContributionItem;
+import org.eclipse.jface.action.IMenuCreator;
+import org.eclipse.jface.util.IPropertyChangeListener;
+import org.eclipse.jface.util.PropertyChangeEvent;
+import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.events.SelectionListener;
+import org.eclipse.swt.widgets.Control;
+import org.eclipse.swt.widgets.Menu;
+import org.eclipse.swt.widgets.MenuItem;
+
+public class DropDownMenuWithDefaultAction extends Action implements IMenuCreator {
+
+ private Menu dropDownMenu;
+ private IAction delegate;
+ private List<Object> list;
+ private IPropertyChangeListener enabledListener;
+ private SelectionListener selectionListener;
+
+ public DropDownMenuWithDefaultAction(final IAction action) {
+ this.selectionListener = new ItemSelectionListener(this);
+ setMenuCreator(this);
+ this.dropDownMenu = null;
+ setAction(action);
+ this.list = new ArrayList<Object>();
+ }
+
+ public void dispose() {
+ if (this.dropDownMenu != null) {
+ this.dropDownMenu.dispose();
+ this.dropDownMenu = null;
+ }
+ }
+
+ public void add(final IContributionItem item) {
+ this.list.add(item);
+ }
+
+ public void add(final IAction action) {
+ this.list.add(action);
+ }
+
+ public Menu getMenu(final Control parent) {
+ if (this.dropDownMenu == null) {
+ this.dropDownMenu = new Menu(parent);
+ populateMenu();
+ }
+ return this.dropDownMenu;
+ }
+
+ public Menu getMenu(final Menu parent) {
+ if (this.dropDownMenu == null) {
+ this.dropDownMenu = new Menu(parent);
+ populateMenu();
+ }
+ return this.dropDownMenu;
+ }
+
+ private void populateMenu() {
+ for (Object object: list) {
+ if (object instanceof IContributionItem) {
+ final IContributionItem item = (IContributionItem) object;
+ item.fill(this.dropDownMenu, -1);
+ } else {
+ final IAction action = (IAction) object;
+ final ActionContributionItem item = new ActionContributionItem(action);
+ item.fill(this.dropDownMenu, -1);
+ }
+ }
+ final MenuItem[] items = this.dropDownMenu.getItems();
+ for (int i = 0; i < items.length; i++) {
+ items[i].addSelectionListener(this.selectionListener);
+ }
+ }
+
+ public void setAction(final IAction action) {
+ if (this.enabledListener == null) {
+ this.enabledListener = new EnabledPropertyChangeListener(this);
+ }
+ setText(action.getText());
+ setToolTipText(action.getToolTipText());
+ setImageDescriptor(action.getImageDescriptor());
+ setDisabledImageDescriptor(action.getDisabledImageDescriptor());
+ setEnabled(action.isEnabled());
+ setDescription(action.getDescription());
+ setHelpListener(action.getHelpListener());
+ setHoverImageDescriptor(action.getHoverImageDescriptor());
+ if (this.delegate != null) {
+ this.delegate.removePropertyChangeListener(this.enabledListener);
+ }
+ this.delegate = action;
+ this.delegate.addPropertyChangeListener(this.enabledListener);
+ }
+
+ public void run() {
+ this.delegate.run();
+ }
+
+ public static class EnabledPropertyChangeListener implements IPropertyChangeListener {
+ private IAction action;
+
+ public EnabledPropertyChangeListener(final IAction action) {
+ this.action = action;
+ }
+
+ public void propertyChange(final PropertyChangeEvent event) {
+ if (event.getProperty().equals(IAction.ENABLED)) {
+ this.action.setEnabled(((Boolean) event.getNewValue())
+ .booleanValue());
+ }
+ }
+ }
+
+ public static class ItemSelectionListener implements SelectionListener {
+ private DropDownMenuWithDefaultAction dropDownMenu;
+
+ public ItemSelectionListener(
+ final DropDownMenuWithDefaultAction dropDownMenu) {
+ this.dropDownMenu = dropDownMenu;
+ }
+
+ public void widgetDefaultSelected(final SelectionEvent e) {
+ final MenuItem menuItem = (MenuItem) e.getSource();
+ if (menuItem.getData() instanceof ActionContributionItem) {
+ final ActionContributionItem item = (ActionContributionItem) menuItem
+ .getData();
+ this.dropDownMenu.setAction(item.getAction());
+ }
+ }
+
+ public void widgetSelected(final SelectionEvent e) {
+ final MenuItem menuItem = (MenuItem) e.getSource();
+ if (menuItem.getData() instanceof ActionContributionItem) {
+ final ActionContributionItem item = (ActionContributionItem) menuItem
+ .getData();
+ this.dropDownMenu.setAction(item.getAction());
+ }
+ }
+ }
+}
Property changes on: trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/editor/DropDownMenuWithDefaultAction.java
___________________________________________________________________
Name: svn:mergeinfo
+
Copied: trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/editor/GenericActionBarContributor.java (from rev 9532, trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/editor/GenericActionBarContributor.java)
===================================================================
--- trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/editor/GenericActionBarContributor.java (rev 0)
+++ trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/editor/GenericActionBarContributor.java 2008-08-05 16:42:16 UTC (rev 9542)
@@ -0,0 +1,102 @@
+package org.jboss.tools.flow.common.editor;
+
+/*
+ * 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.draw2d.PositionConstants;
+import org.eclipse.gef.ui.actions.ActionBarContributor;
+import org.eclipse.gef.ui.actions.AlignmentRetargetAction;
+import org.eclipse.gef.ui.actions.DeleteRetargetAction;
+import org.eclipse.gef.ui.actions.GEFActionConstants;
+import org.eclipse.gef.ui.actions.RedoRetargetAction;
+import org.eclipse.gef.ui.actions.UndoRetargetAction;
+import org.eclipse.gef.ui.actions.ZoomComboContributionItem;
+import org.eclipse.gef.ui.actions.ZoomInRetargetAction;
+import org.eclipse.gef.ui.actions.ZoomOutRetargetAction;
+import org.eclipse.jface.action.IToolBarManager;
+import org.eclipse.jface.action.Separator;
+import org.eclipse.jface.resource.ImageDescriptor;
+import org.eclipse.ui.actions.ActionFactory;
+import org.eclipse.ui.actions.RetargetAction;
+import org.jboss.tools.flow.common.Activator;
+import org.jboss.tools.flow.common.action.HorizontalAutoLayoutAction;
+import org.jboss.tools.flow.common.action.VerticalAutoLayoutAction;
+
+/**
+ * Common implementation of a ActionBarContributor.
+ *
+ * @author <a href="mailto:kris_verlaenen@hotmail.com">Kris Verlaenen</a>
+ */
+public class GenericActionBarContributor extends ActionBarContributor {
+
+ protected void buildActions() {
+ addRetargetAction( new UndoRetargetAction() );
+ addRetargetAction( new RedoRetargetAction() );
+ addRetargetAction( new DeleteRetargetAction() );
+
+ addRetargetAction( new ZoomInRetargetAction() );
+ addRetargetAction( new ZoomOutRetargetAction() );
+
+ addRetargetAction( new AlignmentRetargetAction( PositionConstants.LEFT ) );
+ addRetargetAction( new AlignmentRetargetAction( PositionConstants.CENTER ) );
+ addRetargetAction( new AlignmentRetargetAction( PositionConstants.RIGHT ) );
+ addRetargetAction( new AlignmentRetargetAction( PositionConstants.TOP ) );
+ addRetargetAction( new AlignmentRetargetAction( PositionConstants.MIDDLE ) );
+ addRetargetAction( new AlignmentRetargetAction( PositionConstants.BOTTOM ) );
+
+ addRetargetAction( new RetargetAction(
+ GEFActionConstants.TOGGLE_GRID_VISIBILITY, "Grid" ));
+
+ RetargetAction verticalAutoLayoutAction = new RetargetAction(VerticalAutoLayoutAction.ID, null);
+ verticalAutoLayoutAction.setImageDescriptor(
+ ImageDescriptor.createFromURL(Activator.getDefault().getBundle().getEntry("icons/layoutV.gif")));
+ addRetargetAction(verticalAutoLayoutAction);
+
+ RetargetAction horizontalAutoLayoutAction = new RetargetAction(HorizontalAutoLayoutAction.ID, null);
+ horizontalAutoLayoutAction.setImageDescriptor(
+ ImageDescriptor.createFromURL(Activator.getDefault().getBundle().getEntry("icons/layoutH.gif")));
+ addRetargetAction(horizontalAutoLayoutAction);
+
+ }
+
+ public void contributeToToolBar(IToolBarManager toolBarManager) {
+ toolBarManager.add( getAction( ActionFactory.UNDO.getId() ) );
+ toolBarManager.add( getAction( ActionFactory.REDO.getId() ) );
+ toolBarManager.add( new Separator() );
+ toolBarManager.add( new ZoomComboContributionItem( getPage() ) );
+ toolBarManager.add( new Separator() );
+
+ DropDownMenuWithDefaultAction alignMenu = new DropDownMenuWithDefaultAction( getActionRegistry().getAction( GEFActionConstants.ALIGN_LEFT ) );
+ alignMenu.add( getActionRegistry().getAction( GEFActionConstants.ALIGN_LEFT ) );
+ alignMenu.add( getActionRegistry().getAction( GEFActionConstants.ALIGN_CENTER ) );
+ alignMenu.add( getActionRegistry().getAction( GEFActionConstants.ALIGN_RIGHT ) );
+ alignMenu.add( new Separator() );
+ alignMenu.add( getActionRegistry().getAction( GEFActionConstants.ALIGN_TOP ) );
+ alignMenu.add( getActionRegistry().getAction( GEFActionConstants.ALIGN_MIDDLE ) );
+ alignMenu.add( getActionRegistry().getAction( GEFActionConstants.ALIGN_BOTTOM ) );
+ toolBarManager.add( alignMenu );
+
+ toolBarManager.add( new Separator() );
+ toolBarManager.add( getAction(GEFActionConstants.TOGGLE_GRID_VISIBILITY) );
+
+ toolBarManager.add( new Separator());
+ toolBarManager.add( getAction(VerticalAutoLayoutAction.ID));
+ toolBarManager.add( getAction(HorizontalAutoLayoutAction.ID));
+ }
+
+ protected void declareGlobalActionKeys() {
+ }
+}
Property changes on: trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/editor/GenericActionBarContributor.java
___________________________________________________________________
Name: svn:mergeinfo
+
Copied: trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/editor/GenericContextMenuProvider.java (from rev 9532, trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/editor/GenericContextMenuProvider.java)
===================================================================
--- trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/editor/GenericContextMenuProvider.java (rev 0)
+++ trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/editor/GenericContextMenuProvider.java 2008-08-05 16:42:16 UTC (rev 9542)
@@ -0,0 +1,61 @@
+package org.jboss.tools.flow.common.editor;
+
+/*
+ * 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.gef.ContextMenuProvider;
+import org.eclipse.gef.GraphicalViewer;
+import org.eclipse.gef.ui.actions.ActionRegistry;
+import org.eclipse.gef.ui.actions.GEFActionConstants;
+import org.eclipse.jface.action.IAction;
+import org.eclipse.jface.action.IMenuManager;
+import org.eclipse.ui.actions.ActionFactory;
+
+/**
+ * Common implementation of a ContextMenuProvider.
+ *
+ * @author <a href="mailto:kris_verlaenen@hotmail.com">Kris Verlaenen</a>
+ */
+public class GenericContextMenuProvider extends ContextMenuProvider {
+
+ private ActionRegistry actionRegistry;
+
+ public GenericContextMenuProvider(GraphicalViewer viewer, ActionRegistry registry) {
+ super(viewer);
+ setActionRegistry(registry);
+ }
+
+ public void buildContextMenu(IMenuManager menu) {
+ GEFActionConstants.addStandardActionGroups(menu);
+ IAction action = getActionRegistry().getAction(ActionFactory.UNDO.getId());
+ menu.appendToGroup(GEFActionConstants.GROUP_UNDO, action);
+ action = getActionRegistry().getAction(ActionFactory.REDO.getId());
+ menu.appendToGroup(GEFActionConstants.GROUP_UNDO, action);
+ action = getActionRegistry().getAction(ActionFactory.DELETE.getId());
+ if (action.isEnabled()) {
+ menu.appendToGroup(GEFActionConstants.GROUP_EDIT, action);
+ }
+ }
+
+ private ActionRegistry getActionRegistry() {
+ return actionRegistry;
+ }
+
+ public void setActionRegistry(ActionRegistry registry) {
+ actionRegistry = registry;
+ }
+
+}
Property changes on: trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/editor/GenericContextMenuProvider.java
___________________________________________________________________
Name: svn:mergeinfo
+
Copied: trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/editor/GenericModelEditor.java (from rev 9532, trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/editor/GenericModelEditor.java)
===================================================================
--- trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/editor/GenericModelEditor.java (rev 0)
+++ trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/editor/GenericModelEditor.java 2008-08-05 16:42:16 UTC (rev 9542)
@@ -0,0 +1,374 @@
+package org.jboss.tools.flow.common.editor;
+
+/*
+ * 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 java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.util.EventObject;
+
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IWorkspace;
+import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.draw2d.IFigure;
+import org.eclipse.draw2d.PositionConstants;
+import org.eclipse.draw2d.SWTGraphics;
+import org.eclipse.draw2d.geometry.Rectangle;
+import org.eclipse.gef.ContextMenuProvider;
+import org.eclipse.gef.DefaultEditDomain;
+import org.eclipse.gef.EditPartFactory;
+import org.eclipse.gef.KeyHandler;
+import org.eclipse.gef.KeyStroke;
+import org.eclipse.gef.LayerConstants;
+import org.eclipse.gef.editparts.LayerManager;
+import org.eclipse.gef.editparts.ScalableRootEditPart;
+import org.eclipse.gef.editparts.ZoomManager;
+import org.eclipse.gef.palette.PaletteRoot;
+import org.eclipse.gef.ui.actions.ActionRegistry;
+import org.eclipse.gef.ui.actions.AlignmentAction;
+import org.eclipse.gef.ui.actions.DirectEditAction;
+import org.eclipse.gef.ui.actions.GEFActionConstants;
+import org.eclipse.gef.ui.actions.ToggleGridAction;
+import org.eclipse.gef.ui.parts.GraphicalEditorWithPalette;
+import org.eclipse.gef.ui.parts.GraphicalViewerKeyHandler;
+import org.eclipse.jface.action.IAction;
+import org.eclipse.jface.dialogs.ProgressMonitorDialog;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.graphics.GC;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.graphics.ImageData;
+import org.eclipse.swt.graphics.ImageLoader;
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.ui.IEditorInput;
+import org.eclipse.ui.IEditorPart;
+import org.eclipse.ui.IFileEditorInput;
+import org.eclipse.ui.IWorkbenchPart;
+import org.eclipse.ui.actions.ActionFactory;
+import org.eclipse.ui.actions.WorkspaceModifyOperation;
+import org.eclipse.ui.dialogs.SaveAsDialog;
+import org.eclipse.ui.part.FileEditorInput;
+import org.eclipse.ui.views.contentoutline.IContentOutlinePage;
+import org.jboss.tools.flow.common.Activator;
+import org.jboss.tools.flow.common.action.HorizontalAutoLayoutAction;
+import org.jboss.tools.flow.common.action.VerticalAutoLayoutAction;
+
+/**
+ * Abstract implementation of a graphical editor.
+ *
+ * @author <a href="mailto:kris_verlaenen@hotmail.com">Kris Verlaenen</a>
+ */
+public abstract class GenericModelEditor extends GraphicalEditorWithPalette {
+
+ private Object model;
+ private boolean savePreviouslyNeeded = false;
+ private KeyHandler sharedKeyHandler;
+ private PaletteRoot root;
+ private OverviewOutlinePage overviewOutlinePage;
+
+ public GenericModelEditor() {
+ setEditDomain(new DefaultEditDomain(this));
+ }
+
+ protected void setModel(Object model) {
+ this.model = model;
+ }
+
+ public Object getModel() {
+ return model;
+ }
+
+ @SuppressWarnings("unchecked")
+ protected void createActions() {
+ super.createActions();
+ ActionRegistry registry = getActionRegistry();
+
+ IAction action = new DirectEditAction((IWorkbenchPart) this);
+ registry.registerAction(action);
+ getSelectionActions().add(action.getId());
+
+ action = new AlignmentAction((IWorkbenchPart) this,
+ PositionConstants.LEFT);
+ registry.registerAction(action);
+ getSelectionActions().add(action.getId());
+
+ action = new AlignmentAction((IWorkbenchPart) this,
+ PositionConstants.CENTER);
+ registry.registerAction(action);
+ getSelectionActions().add(action.getId());
+
+ action = new AlignmentAction((IWorkbenchPart) this,
+ PositionConstants.RIGHT);
+ registry.registerAction(action);
+ getSelectionActions().add(action.getId());
+
+ action = new AlignmentAction((IWorkbenchPart) this,
+ PositionConstants.TOP);
+ registry.registerAction(action);
+ getSelectionActions().add(action.getId());
+
+ action = new AlignmentAction((IWorkbenchPart) this,
+ PositionConstants.MIDDLE);
+ registry.registerAction(action);
+ getSelectionActions().add(action.getId());
+
+ action = new AlignmentAction((IWorkbenchPart) this,
+ PositionConstants.BOTTOM);
+ registry.registerAction(action);
+ getSelectionActions().add(action.getId());
+ }
+
+ public void commandStackChanged(EventObject event) {
+ if (isDirty()) {
+ if (!savePreviouslyNeeded()) {
+ setSavePreviouslyNeeded(true);
+ firePropertyChange(IEditorPart.PROP_DIRTY);
+ }
+ } else {
+ setSavePreviouslyNeeded(false);
+ firePropertyChange(IEditorPart.PROP_DIRTY);
+ }
+ super.commandStackChanged(event);
+ }
+
+ protected abstract void writeModel(OutputStream os) throws IOException;
+
+ protected void configureGraphicalViewer() {
+ super.configureGraphicalViewer();
+ getGraphicalViewer().setRootEditPart(new ScalableRootEditPart());
+ getGraphicalViewer().setEditPartFactory(createEditPartFactory());
+ getGraphicalViewer().setKeyHandler(
+ new GraphicalViewerKeyHandler(getGraphicalViewer())
+ .setParent(getCommonKeyHandler()));
+
+ IAction showGrid = new ToggleGridAction(getGraphicalViewer());
+ getActionRegistry().registerAction(showGrid);
+
+ IAction layoutVertically = new VerticalAutoLayoutAction(getGraphicalViewer());
+ getActionRegistry().registerAction(layoutVertically);
+ IAction layoutHorizontally = new HorizontalAutoLayoutAction(getGraphicalViewer());
+ getActionRegistry().registerAction(layoutHorizontally);
+
+
+ ContextMenuProvider provider = new GenericContextMenuProvider(
+ getGraphicalViewer(), getActionRegistry());
+ getGraphicalViewer().setContextMenu(provider);
+ getSite().registerContextMenu("org.jboss.tools.flow.editor.contextmenu",
+ provider, getGraphicalViewer());
+ }
+
+ protected abstract EditPartFactory createEditPartFactory();
+
+ protected void initializeGraphicalViewer() {
+ getGraphicalViewer().setContents(model);
+ }
+
+ public void doSave(IProgressMonitor monitor) {
+ try {
+ ByteArrayOutputStream out = new ByteArrayOutputStream();
+ writeModel(out);
+ IFile file = ((IFileEditorInput) getEditorInput()).getFile();
+ file.setContents(new ByteArrayInputStream(out.toByteArray()), true,
+ false, monitor);
+ out.close();
+ getCommandStack().markSaveLocation();
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
+
+ public void doSaveAs() {
+ SaveAsDialog dialog = new SaveAsDialog(getSite().getWorkbenchWindow()
+ .getShell());
+ dialog.setOriginalFile(((IFileEditorInput) getEditorInput()).getFile());
+ dialog.open();
+ IPath path = dialog.getResult();
+
+ if (path == null) {
+ return;
+ }
+
+ IWorkspace workspace = ResourcesPlugin.getWorkspace();
+ final IFile file = workspace.getRoot().getFile(path);
+
+ WorkspaceModifyOperation op = new WorkspaceModifyOperation() {
+ public void execute(final IProgressMonitor monitor)
+ throws CoreException {
+ try {
+ ByteArrayOutputStream out = new ByteArrayOutputStream();
+ writeModel(out);
+ file.create(new ByteArrayInputStream(out.toByteArray()),
+ true, monitor);
+ out.close();
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
+ };
+
+ try {
+ new ProgressMonitorDialog(getSite().getWorkbenchWindow().getShell())
+ .run(false, true, op);
+ setInput(new FileEditorInput(file));
+ getCommandStack().markSaveLocation();
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
+
+ protected KeyHandler getCommonKeyHandler() {
+ if (sharedKeyHandler == null) {
+ sharedKeyHandler = new KeyHandler();
+ sharedKeyHandler
+ .put(KeyStroke.getPressed(SWT.DEL, 127, 0),
+ getActionRegistry().getAction(
+ ActionFactory.DELETE.getId()));
+ sharedKeyHandler.put(KeyStroke.getPressed(SWT.F2, 0),
+ getActionRegistry().getAction(
+ GEFActionConstants.DIRECT_EDIT));
+ }
+ return sharedKeyHandler;
+ }
+
+ public boolean isDirty() {
+ return isSaveOnCloseNeeded();
+ }
+
+ public boolean isSaveAsAllowed() {
+ return true;
+ }
+
+ public boolean isSaveOnCloseNeeded() {
+ return getCommandStack().isDirty();
+ }
+
+ private boolean savePreviouslyNeeded() {
+ return savePreviouslyNeeded;
+ }
+
+ private void setSavePreviouslyNeeded(boolean value) {
+ savePreviouslyNeeded = value;
+ }
+
+ protected PaletteRoot getPaletteRoot() {
+ if (root == null) {
+ root = createPalette();
+ }
+ return root;
+ }
+
+ protected abstract PaletteRoot createPalette();
+
+ protected void setInput(IEditorInput input) {
+ super.setInput(input);
+
+ IFile file = getFile();
+ setPartName(file.getName());
+ try {
+ InputStream is = file.getContents(false);
+ createModel(is);
+ } catch (Throwable t) {
+ Activator.log(t);
+ }
+ if (getGraphicalViewer() != null) {
+ initializeGraphicalViewer();
+ }
+ }
+
+ public IFile getFile() {
+ return ((IFileEditorInput) getEditorInput()).getFile();
+ }
+
+ public IProject getProject() {
+ IFile file = getFile();
+ if (file != null) {
+ return file.getProject();
+ }
+ return null;
+ }
+
+ protected abstract void createModel(InputStream is);
+
+ @SuppressWarnings("unchecked")
+ public Object getAdapter(Class type) {
+ if (type == IContentOutlinePage.class) {
+ return getOverviewOutlinePage();
+ }
+ if (type == ZoomManager.class) {
+ return ((ScalableRootEditPart) getGraphicalViewer()
+ .getRootEditPart()).getZoomManager();
+ }
+ return super.getAdapter(type);
+ }
+
+ protected OverviewOutlinePage getOverviewOutlinePage() {
+ if (null == overviewOutlinePage && null != getGraphicalViewer()) {
+ ScalableRootEditPart rootEditPart = (ScalableRootEditPart) getGraphicalViewer()
+ .getRootEditPart();
+ overviewOutlinePage = new OverviewOutlinePage(rootEditPart);
+ }
+ return overviewOutlinePage;
+ }
+
+ public String getContributorId() {
+ return getSite().getId();
+ }
+
+ /**
+ * Writes the content of this editor to the given stream.
+ * Possible formats are for example SWT.IMAGE_BMP, IMAGE_GIF,
+ * IMAGE_JPEG, IMAGE_PNG.
+ * @param stream
+ * @param format
+ */
+ public void createImage(OutputStream stream, int format) {
+ SWTGraphics g = null;
+ GC gc = null;
+ Image image = null;
+ LayerManager layerManager = (LayerManager)
+ getGraphicalViewer().getEditPartRegistry().get(LayerManager.ID);
+ IFigure figure = layerManager.getLayer(LayerConstants.PRINTABLE_LAYERS);
+ Rectangle r = figure.getBounds();
+ try {
+ image = new Image(Display.getDefault(), r.width, r.height);
+ gc = new GC(image);
+ g = new SWTGraphics(gc);
+ g.translate(r.x * -1, r.y * -1);
+ figure.paint(g);
+ ImageLoader imageLoader = new ImageLoader();
+ imageLoader.data = new ImageData[] { image.getImageData() };
+ imageLoader.save(stream, format);
+ } catch (Throwable t) {
+ Activator.log(t);
+ } finally {
+ if (g != null) {
+ g.dispose();
+ }
+ if (gc != null) {
+ gc.dispose();
+ }
+ if (image != null) {
+ image.dispose();
+ }
+ }
+ }
+}
Property changes on: trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/editor/GenericModelEditor.java
___________________________________________________________________
Name: svn:mergeinfo
+
Copied: trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/editor/OverviewOutlinePage.java (from rev 9532, trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/editor/OverviewOutlinePage.java)
===================================================================
--- trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/editor/OverviewOutlinePage.java (rev 0)
+++ trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/editor/OverviewOutlinePage.java 2008-08-05 16:42:16 UTC (rev 9542)
@@ -0,0 +1,91 @@
+package org.jboss.tools.flow.common.editor;
+
+/*
+ * 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.draw2d.LightweightSystem;
+import org.eclipse.draw2d.MarginBorder;
+import org.eclipse.draw2d.Viewport;
+import org.eclipse.draw2d.parts.ScrollableThumbnail;
+import org.eclipse.draw2d.parts.Thumbnail;
+import org.eclipse.gef.LayerConstants;
+import org.eclipse.gef.editparts.ScalableRootEditPart;
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.jface.viewers.ISelectionChangedListener;
+import org.eclipse.jface.viewers.StructuredSelection;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.widgets.Canvas;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Control;
+import org.eclipse.ui.part.Page;
+import org.eclipse.ui.views.contentoutline.IContentOutlinePage;
+
+/**
+ * Common implementation of an outline page.
+ *
+ * @author <a href="mailto:kris_verlaenen@hotmail.com">Kris Verlaenen</a>
+ */
+public class OverviewOutlinePage extends Page implements IContentOutlinePage {
+
+ private Canvas overview;
+ private ScalableRootEditPart rootEditPart;
+ private Thumbnail thumbnail;
+
+ public OverviewOutlinePage(ScalableRootEditPart rootEditPart) {
+ this.rootEditPart = rootEditPart;
+ }
+
+ public void addSelectionChangedListener(ISelectionChangedListener listener) {
+ }
+
+ public void createControl(Composite parent) {
+ overview = new Canvas(parent, SWT.NONE);
+ LightweightSystem lws = new LightweightSystem(overview);
+ thumbnail = new ScrollableThumbnail((Viewport) rootEditPart.getFigure());
+ thumbnail.setBorder(new MarginBorder(3));
+ thumbnail.setSource(rootEditPart
+ .getLayer(LayerConstants.PRINTABLE_LAYERS));
+ lws.setContents(thumbnail);
+ }
+
+ public void dispose() {
+ if (null != thumbnail) {
+ thumbnail.deactivate();
+ }
+ super.dispose();
+ }
+
+ public Control getControl() {
+ return overview;
+ }
+
+ public ISelection getSelection() {
+ return StructuredSelection.EMPTY;
+ }
+
+ public void removeSelectionChangedListener(
+ ISelectionChangedListener listener) {
+ }
+
+ public void setFocus() {
+ if (getControl() != null) {
+ getControl().setFocus();
+ }
+ }
+
+ public void setSelection(ISelection selection) {
+ }
+}
Property changes on: trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/editor/OverviewOutlinePage.java
___________________________________________________________________
Name: svn:mergeinfo
+
Copied: trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/editor/PaletteFactory.java (from rev 9532, trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/editor/PaletteFactory.java)
===================================================================
--- trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/editor/PaletteFactory.java (rev 0)
+++ trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/editor/PaletteFactory.java 2008-08-05 16:42:16 UTC (rev 9542)
@@ -0,0 +1,76 @@
+package org.jboss.tools.flow.common.editor;
+
+/*
+ * 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 java.util.ArrayList;
+import java.util.List;
+
+import org.eclipse.gef.palette.MarqueeToolEntry;
+import org.eclipse.gef.palette.PaletteContainer;
+import org.eclipse.gef.palette.PaletteDrawer;
+import org.eclipse.gef.palette.PaletteEntry;
+import org.eclipse.gef.palette.PaletteGroup;
+import org.eclipse.gef.palette.PaletteRoot;
+import org.eclipse.gef.palette.SelectionToolEntry;
+import org.eclipse.gef.palette.ToolEntry;
+
+/**
+ * Factory for creating a RuleFlow palette.
+ *
+ * @author <a href="mailto:kris_verlaenen@hotmail.com">Kris Verlaenen</a>
+ */
+public abstract class PaletteFactory {
+
+ public PaletteRoot createPalette() {
+ PaletteRoot palette = new PaletteRoot();
+ palette.addAll(createCategories(palette));
+ return palette;
+ }
+
+ protected List<PaletteContainer> createCategories(PaletteRoot root) {
+ List<PaletteContainer> categories = new ArrayList<PaletteContainer>();
+ categories.add(createControlGroup(root));
+ categories.add(createComponentsDrawer());
+ return categories;
+ }
+
+ protected PaletteContainer createControlGroup(PaletteRoot root) {
+ PaletteGroup controlGroup = new PaletteGroup("Control Group");
+
+ List<PaletteEntry> entries = new ArrayList<PaletteEntry>();
+
+ ToolEntry tool = new SelectionToolEntry();
+ entries.add(tool);
+ root.setDefaultEntry(tool);
+
+ tool = new MarqueeToolEntry();
+ entries.add(tool);
+
+ controlGroup.addAll(entries);
+ return controlGroup;
+ }
+
+ protected PaletteContainer createComponentsDrawer() {
+ PaletteDrawer drawer = new PaletteDrawer("Components", null);
+ List<PaletteEntry> entries = createComponentEntries();
+ drawer.addAll(entries);
+ return drawer;
+ }
+
+ protected abstract List<PaletteEntry> createComponentEntries();
+
+}
Property changes on: trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/editor/PaletteFactory.java
___________________________________________________________________
Name: svn:mergeinfo
+
Copied: trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/editpart (from rev 9532, trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/editor/editpart)
Property changes on: trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/editpart
___________________________________________________________________
Name: svn:mergeinfo
+
Modified: trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/editpart/CellEditorLocator.java
===================================================================
--- trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/editor/editpart/CellEditorLocator.java 2008-08-05 16:25:42 UTC (rev 9532)
+++ trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/editpart/CellEditorLocator.java 2008-08-05 16:42:16 UTC (rev 9542)
@@ -1,4 +1,4 @@
-package org.jboss.tools.flow.editor.editpart;
+package org.jboss.tools.flow.common.editpart;
/*
* Copyright 2005 JBoss Inc
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/editor/editpart/ConnectionEditPart.java 2008-08-05 16:25:42 UTC (rev 9532)
+++ trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/editpart/ConnectionEditPart.java 2008-08-05 16:42:16 UTC (rev 9542)
@@ -1,4 +1,4 @@
-package org.jboss.tools.flow.editor.editpart;
+package org.jboss.tools.flow.common.editpart;
/*
* Copyright 2005 JBoss Inc
@@ -31,11 +31,11 @@
import org.eclipse.gef.editpolicies.ConnectionEndpointEditPolicy;
import org.eclipse.gef.requests.CreationFactory;
import org.eclipse.gef.requests.SimpleFactory;
-import org.jboss.tools.flow.editor.core.AbstractConnectionWrapper;
-import org.jboss.tools.flow.editor.core.ModelEvent;
-import org.jboss.tools.flow.editor.core.ModelListener;
-import org.jboss.tools.flow.editor.policy.ConnectionBendpointEditPolicy;
-import org.jboss.tools.flow.editor.policy.ConnectionEditPolicy;
+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.ModelEvent;
+import org.jboss.tools.flow.common.wrapper.ModelListener;
/**
* Implementation of a connection EditPart.
Modified: trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/editpart/ContainerEditPart.java
===================================================================
--- trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/editor/editpart/ContainerEditPart.java 2008-08-05 16:25:42 UTC (rev 9532)
+++ trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/editpart/ContainerEditPart.java 2008-08-05 16:42:16 UTC (rev 9542)
@@ -1,4 +1,4 @@
-package org.jboss.tools.flow.editor.editpart;
+package org.jboss.tools.flow.common.editpart;
/*
* Copyright 2005 JBoss Inc
@@ -22,11 +22,11 @@
import org.eclipse.gef.EditPolicy;
import org.eclipse.gef.MouseWheelHelper;
import org.eclipse.gef.editparts.ViewportMouseWheelHelper;
-import org.jboss.tools.flow.editor.core.AbstractContainerWrapper;
-import org.jboss.tools.flow.editor.core.ModelEvent;
-import org.jboss.tools.flow.editor.core.NodeWrapper;
-import org.jboss.tools.flow.editor.figure.ElementContainerFigure;
-import org.jboss.tools.flow.editor.policy.ElementContainerLayoutEditPolicy;
+import org.jboss.tools.flow.common.figure.ElementContainerFigure;
+import org.jboss.tools.flow.common.policy.ElementContainerLayoutEditPolicy;
+import org.jboss.tools.flow.common.wrapper.AbstractContainerWrapper;
+import org.jboss.tools.flow.common.wrapper.ModelEvent;
+import org.jboss.tools.flow.common.wrapper.NodeWrapper;
public class ContainerEditPart extends ElementEditPart {
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/editor/editpart/ElementEditPart.java 2008-08-05 16:25:42 UTC (rev 9532)
+++ trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/editpart/ElementEditPart.java 2008-08-05 16:42:16 UTC (rev 9542)
@@ -1,4 +1,4 @@
-package org.jboss.tools.flow.editor.editpart;
+package org.jboss.tools.flow.common.editpart;
/*
* Copyright 2005 JBoss Inc
@@ -28,15 +28,15 @@
import org.eclipse.gef.RequestConstants;
import org.eclipse.gef.editparts.AbstractGraphicalEditPart;
import org.eclipse.gef.tools.DirectEditManager;
-import org.jboss.tools.flow.editor.core.AbstractConnectionWrapper;
-import org.jboss.tools.flow.editor.core.ModelEvent;
-import org.jboss.tools.flow.editor.core.ModelListener;
-import org.jboss.tools.flow.editor.core.NodeWrapper;
-import org.jboss.tools.flow.editor.figure.ElementFigure;
-import org.jboss.tools.flow.editor.policy.ElementDirectEditManager;
-import org.jboss.tools.flow.editor.policy.ElementDirectEditPolicy;
-import org.jboss.tools.flow.editor.policy.ElementEditPolicy;
-import org.jboss.tools.flow.editor.policy.ElementNodeEditPolicy;
+import org.jboss.tools.flow.common.figure.ElementFigure;
+import org.jboss.tools.flow.common.policy.ElementDirectEditManager;
+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.ModelEvent;
+import org.jboss.tools.flow.common.wrapper.ModelListener;
+import org.jboss.tools.flow.common.wrapper.NodeWrapper;
/**
* Default implementation of an element EditPart.
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/editor/editpart/RootEditPart.java 2008-08-05 16:25:42 UTC (rev 9532)
+++ trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/editpart/RootEditPart.java 2008-08-05 16:42:16 UTC (rev 9542)
@@ -1,4 +1,4 @@
-package org.jboss.tools.flow.editor.editpart;
+package org.jboss.tools.flow.common.editpart;
/*
* Copyright 2005 JBoss Inc
@@ -36,12 +36,12 @@
import org.eclipse.gef.editparts.AbstractGraphicalEditPart;
import org.eclipse.gef.editpolicies.RootComponentEditPolicy;
import org.eclipse.swt.SWT;
-import org.jboss.tools.flow.editor.core.AbstractFlowWrapper;
-import org.jboss.tools.flow.editor.core.ModelEvent;
-import org.jboss.tools.flow.editor.core.ModelListener;
-import org.jboss.tools.flow.editor.core.NodeWrapper;
-import org.jboss.tools.flow.editor.figure.ElementFigure;
-import org.jboss.tools.flow.editor.policy.ElementContainerLayoutEditPolicy;
+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.ModelEvent;
+import org.jboss.tools.flow.common.wrapper.ModelListener;
+import org.jboss.tools.flow.common.wrapper.NodeWrapper;
/**
* Default implementation of a process EditPart.
Copied: trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/figure (from rev 9532, trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/editor/figure)
Property changes on: trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/figure
___________________________________________________________________
Name: svn:mergeinfo
+
Modified: trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/figure/AbstractElementFigure.java
===================================================================
--- trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/editor/figure/AbstractElementFigure.java 2008-08-05 16:25:42 UTC (rev 9532)
+++ trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/figure/AbstractElementFigure.java 2008-08-05 16:42:16 UTC (rev 9542)
@@ -1,4 +1,4 @@
-package org.jboss.tools.flow.editor.figure;
+package org.jboss.tools.flow.common.figure;
/*
* Copyright 2005 JBoss Inc
Modified: trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/figure/ElementContainerFigure.java
===================================================================
--- trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/editor/figure/ElementContainerFigure.java 2008-08-05 16:25:42 UTC (rev 9532)
+++ trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/figure/ElementContainerFigure.java 2008-08-05 16:42:16 UTC (rev 9542)
@@ -1,4 +1,4 @@
-package org.jboss.tools.flow.editor.figure;
+package org.jboss.tools.flow.common.figure;
/*
* Copyright 2005 JBoss Inc
Modified: trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/figure/ElementFigure.java
===================================================================
--- trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/editor/figure/ElementFigure.java 2008-08-05 16:25:42 UTC (rev 9532)
+++ trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/figure/ElementFigure.java 2008-08-05 16:42:16 UTC (rev 9542)
@@ -1,4 +1,4 @@
-package org.jboss.tools.flow.editor.figure;
+package org.jboss.tools.flow.common.figure;
/*
* Copyright 2005 JBoss Inc
Modified: trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/figure/EllipseElementFigure.java
===================================================================
--- trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/editor/figure/EllipseElementFigure.java 2008-08-05 16:25:42 UTC (rev 9532)
+++ trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/figure/EllipseElementFigure.java 2008-08-05 16:42:16 UTC (rev 9542)
@@ -1,4 +1,4 @@
-package org.jboss.tools.flow.editor.figure;
+package org.jboss.tools.flow.common.figure;
import org.eclipse.draw2d.ConnectionAnchor;
import org.eclipse.draw2d.Ellipse;
Modified: trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/figure/RectangleElementFigure.java
===================================================================
--- trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/editor/figure/RectangleElementFigure.java 2008-08-05 16:25:42 UTC (rev 9532)
+++ trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/figure/RectangleElementFigure.java 2008-08-05 16:42:16 UTC (rev 9542)
@@ -1,4 +1,4 @@
-package org.jboss.tools.flow.editor.figure;
+package org.jboss.tools.flow.common.figure;
/*
* Copyright 2005 JBoss Inc
Modified: trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/figure/RoundedRectangleElementFigure.java
===================================================================
--- trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/editor/figure/RoundedRectangleElementFigure.java 2008-08-05 16:25:42 UTC (rev 9532)
+++ trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/figure/RoundedRectangleElementFigure.java 2008-08-05 16:42:16 UTC (rev 9542)
@@ -1,4 +1,4 @@
-package org.jboss.tools.flow.editor.figure;
+package org.jboss.tools.flow.common.figure;
/*
* Copyright 2005 JBoss Inc
Copied: trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/policy (from rev 9532, trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/editor/policy)
Property changes on: trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/policy
___________________________________________________________________
Name: svn:mergeinfo
+
Modified: trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/policy/ConnectionBendpointEditPolicy.java
===================================================================
--- trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/editor/policy/ConnectionBendpointEditPolicy.java 2008-08-05 16:25:42 UTC (rev 9532)
+++ trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/policy/ConnectionBendpointEditPolicy.java 2008-08-05 16:42:16 UTC (rev 9542)
@@ -1,4 +1,4 @@
-package org.jboss.tools.flow.editor.policy;
+package org.jboss.tools.flow.common.policy;
/*
* Copyright 2005 JBoss Inc
@@ -20,9 +20,9 @@
import org.eclipse.gef.commands.Command;
import org.eclipse.gef.editpolicies.BendpointEditPolicy;
import org.eclipse.gef.requests.BendpointRequest;
-import org.jboss.tools.flow.editor.command.CreateBendpointCommand;
-import org.jboss.tools.flow.editor.command.DeleteBendpointCommand;
-import org.jboss.tools.flow.editor.command.MoveBendpointCommand;
+import org.jboss.tools.flow.common.command.CreateBendpointCommand;
+import org.jboss.tools.flow.common.command.DeleteBendpointCommand;
+import org.jboss.tools.flow.common.command.MoveBendpointCommand;
/**
* Policy for bendpoints of connections.
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/editor/policy/ConnectionEditPolicy.java 2008-08-05 16:25:42 UTC (rev 9532)
+++ trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/policy/ConnectionEditPolicy.java 2008-08-05 16:42:16 UTC (rev 9542)
@@ -1,4 +1,4 @@
-package org.jboss.tools.flow.editor.policy;
+package org.jboss.tools.flow.common.policy;
/*
* Copyright 2005 JBoss Inc
@@ -23,12 +23,12 @@
import org.eclipse.gef.requests.CreateRequest;
import org.eclipse.gef.requests.CreationFactory;
import org.eclipse.gef.requests.GroupRequest;
-import org.jboss.tools.flow.editor.command.DeleteConnectionCommand;
-import org.jboss.tools.flow.editor.command.SplitConnectionCommand;
-import org.jboss.tools.flow.editor.core.AbstractConnectionWrapper;
-import org.jboss.tools.flow.editor.core.AbstractFlowWrapper;
-import org.jboss.tools.flow.editor.core.NodeWrapper;
-import org.jboss.tools.flow.editor.editpart.ConnectionEditPart;
+import org.jboss.tools.flow.common.command.DeleteConnectionCommand;
+import org.jboss.tools.flow.common.command.SplitConnectionCommand;
+import org.jboss.tools.flow.common.editpart.ConnectionEditPart;
+import org.jboss.tools.flow.common.wrapper.AbstractConnectionWrapper;
+import org.jboss.tools.flow.common.wrapper.AbstractFlowWrapper;
+import org.jboss.tools.flow.common.wrapper.NodeWrapper;
/**
* Policy for editing connections.
Modified: trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/policy/ElementContainerLayoutEditPolicy.java
===================================================================
--- trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/editor/policy/ElementContainerLayoutEditPolicy.java 2008-08-05 16:25:42 UTC (rev 9532)
+++ trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/policy/ElementContainerLayoutEditPolicy.java 2008-08-05 16:42:16 UTC (rev 9542)
@@ -1,4 +1,4 @@
-package org.jboss.tools.flow.editor.policy;
+package org.jboss.tools.flow.common.policy;
/*
* Copyright 2005 JBoss Inc
@@ -22,10 +22,10 @@
import org.eclipse.gef.commands.Command;
import org.eclipse.gef.editpolicies.XYLayoutEditPolicy;
import org.eclipse.gef.requests.CreateRequest;
-import org.jboss.tools.flow.editor.command.AddElementCommand;
-import org.jboss.tools.flow.editor.command.ChangeConstraintCommand;
-import org.jboss.tools.flow.editor.core.ContainerWrapper;
-import org.jboss.tools.flow.editor.core.NodeWrapper;
+import org.jboss.tools.flow.common.command.AddElementCommand;
+import org.jboss.tools.flow.common.command.ChangeConstraintCommand;
+import org.jboss.tools.flow.common.wrapper.ContainerWrapper;
+import org.jboss.tools.flow.common.wrapper.NodeWrapper;
/**
* Policy for performing layout of a process.
Modified: trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/policy/ElementDirectEditManager.java
===================================================================
--- trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/editor/policy/ElementDirectEditManager.java 2008-08-05 16:25:42 UTC (rev 9532)
+++ trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/policy/ElementDirectEditManager.java 2008-08-05 16:42:16 UTC (rev 9542)
@@ -1,4 +1,4 @@
-package org.jboss.tools.flow.editor.policy;
+package org.jboss.tools.flow.common.policy;
/*
* Copyright 2005 JBoss Inc
@@ -20,8 +20,8 @@
import org.eclipse.gef.tools.DirectEditManager;
import org.eclipse.jface.viewers.TextCellEditor;
import org.eclipse.swt.widgets.Text;
-import org.jboss.tools.flow.editor.core.NodeWrapper;
-import org.jboss.tools.flow.editor.editpart.ElementEditPart;
+import org.jboss.tools.flow.common.editpart.ElementEditPart;
+import org.jboss.tools.flow.common.wrapper.NodeWrapper;
/**
* Manager for directly editing elements.
Modified: trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/policy/ElementDirectEditPolicy.java
===================================================================
--- trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/editor/policy/ElementDirectEditPolicy.java 2008-08-05 16:25:42 UTC (rev 9532)
+++ trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/policy/ElementDirectEditPolicy.java 2008-08-05 16:42:16 UTC (rev 9542)
@@ -1,4 +1,4 @@
-package org.jboss.tools.flow.editor.policy;
+package org.jboss.tools.flow.common.policy;
/*
* Copyright 2005 JBoss Inc
@@ -19,9 +19,9 @@
import org.eclipse.gef.commands.Command;
import org.eclipse.gef.editpolicies.DirectEditPolicy;
import org.eclipse.gef.requests.DirectEditRequest;
-import org.jboss.tools.flow.editor.command.RenameElementCommand;
-import org.jboss.tools.flow.editor.core.NodeWrapper;
-import org.jboss.tools.flow.editor.figure.ElementFigure;
+import org.jboss.tools.flow.common.command.RenameElementCommand;
+import org.jboss.tools.flow.common.figure.ElementFigure;
+import org.jboss.tools.flow.common.wrapper.NodeWrapper;
/**
* Policy for directly editing elements.
Modified: trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/policy/ElementEditPolicy.java
===================================================================
--- trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/editor/policy/ElementEditPolicy.java 2008-08-05 16:25:42 UTC (rev 9532)
+++ trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/policy/ElementEditPolicy.java 2008-08-05 16:42:16 UTC (rev 9542)
@@ -1,4 +1,4 @@
-package org.jboss.tools.flow.editor.policy;
+package org.jboss.tools.flow.common.policy;
/*
* Copyright 2005 JBoss Inc
@@ -19,9 +19,9 @@
import org.eclipse.gef.commands.Command;
import org.eclipse.gef.editpolicies.ComponentEditPolicy;
import org.eclipse.gef.requests.GroupRequest;
-import org.jboss.tools.flow.editor.command.DeleteElementCommand;
-import org.jboss.tools.flow.editor.core.ContainerWrapper;
-import org.jboss.tools.flow.editor.core.NodeWrapper;
+import org.jboss.tools.flow.common.command.DeleteElementCommand;
+import org.jboss.tools.flow.common.wrapper.ContainerWrapper;
+import org.jboss.tools.flow.common.wrapper.NodeWrapper;
/**
* Policy for editing elements.
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/editor/policy/ElementNodeEditPolicy.java 2008-08-05 16:25:42 UTC (rev 9532)
+++ trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/policy/ElementNodeEditPolicy.java 2008-08-05 16:42:16 UTC (rev 9542)
@@ -1,4 +1,4 @@
-package org.jboss.tools.flow.editor.policy;
+package org.jboss.tools.flow.common.policy;
/*
* Copyright 2005 JBoss Inc
@@ -20,12 +20,12 @@
import org.eclipse.gef.editpolicies.GraphicalNodeEditPolicy;
import org.eclipse.gef.requests.CreateConnectionRequest;
import org.eclipse.gef.requests.ReconnectRequest;
-import org.jboss.tools.flow.editor.command.ElementConnectionCreateCommand;
-import org.jboss.tools.flow.editor.command.ReconnectElementConnectionSourceCommand;
-import org.jboss.tools.flow.editor.command.ReconnectElementConnectionTargetCommand;
-import org.jboss.tools.flow.editor.core.AbstractConnectionWrapper;
-import org.jboss.tools.flow.editor.core.NodeWrapper;
-import org.jboss.tools.flow.editor.editpart.ElementEditPart;
+import org.jboss.tools.flow.common.command.ElementConnectionCreateCommand;
+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.NodeWrapper;
/**
* Policy for editing an element node.
Copied: trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/strategy (from rev 9532, trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/editor/strategy)
Property changes on: trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/strategy
___________________________________________________________________
Name: svn:mergeinfo
+
Modified: trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/strategy/AcceptsElementStrategy.java
===================================================================
--- trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/editor/strategy/AcceptsElementStrategy.java 2008-08-05 16:25:42 UTC (rev 9532)
+++ trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/strategy/AcceptsElementStrategy.java 2008-08-05 16:42:16 UTC (rev 9542)
@@ -1,4 +1,4 @@
-package org.jboss.tools.flow.editor.strategy;
+package org.jboss.tools.flow.common.strategy;
import org.jboss.tools.flow.common.model.Container;
Modified: trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/strategy/AcceptsIncomingConnectionStrategy.java
===================================================================
--- trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/editor/strategy/AcceptsIncomingConnectionStrategy.java 2008-08-05 16:25:42 UTC (rev 9532)
+++ trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/strategy/AcceptsIncomingConnectionStrategy.java 2008-08-05 16:42:16 UTC (rev 9542)
@@ -1,4 +1,4 @@
-package org.jboss.tools.flow.editor.strategy;
+package org.jboss.tools.flow.common.strategy;
import org.jboss.tools.flow.common.model.Connection;
import org.jboss.tools.flow.common.model.Node;
Modified: trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/strategy/AcceptsOutgoingConnectionStrategy.java
===================================================================
--- trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/editor/strategy/AcceptsOutgoingConnectionStrategy.java 2008-08-05 16:25:42 UTC (rev 9532)
+++ trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/strategy/AcceptsOutgoingConnectionStrategy.java 2008-08-05 16:42:16 UTC (rev 9542)
@@ -1,4 +1,4 @@
-package org.jboss.tools.flow.editor.strategy;
+package org.jboss.tools.flow.common.strategy;
import org.jboss.tools.flow.common.model.Connection;
import org.jboss.tools.flow.common.model.Node;
Copied: trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/wrapper (from rev 9532, trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/editor/core)
Property changes on: trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/wrapper
___________________________________________________________________
Name: svn:mergeinfo
+
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/editor/core/AbstractConnectionWrapper.java 2008-08-05 16:25:42 UTC (rev 9532)
+++ trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/wrapper/AbstractConnectionWrapper.java 2008-08-05 16:42:16 UTC (rev 9542)
@@ -1,4 +1,4 @@
-package org.jboss.tools.flow.editor.core;
+package org.jboss.tools.flow.common.wrapper;
/*
* Copyright 2005 JBoss Inc
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/editor/core/AbstractContainerWrapper.java 2008-08-05 16:25:42 UTC (rev 9532)
+++ trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/wrapper/AbstractContainerWrapper.java 2008-08-05 16:42:16 UTC (rev 9542)
@@ -1,4 +1,4 @@
-package org.jboss.tools.flow.editor.core;
+package org.jboss.tools.flow.common.wrapper;
/*
* Copyright 2005 JBoss Inc
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/editor/core/AbstractFlowWrapper.java 2008-08-05 16:25:42 UTC (rev 9532)
+++ trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/wrapper/AbstractFlowWrapper.java 2008-08-05 16:42:16 UTC (rev 9542)
@@ -1,4 +1,4 @@
-package org.jboss.tools.flow.editor.core;
+package org.jboss.tools.flow.common.wrapper;
/*
* Copyright 2005 JBoss Inc
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/editor/core/AbstractNodeWrapper.java 2008-08-05 16:25:42 UTC (rev 9532)
+++ trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/wrapper/AbstractNodeWrapper.java 2008-08-05 16:42:16 UTC (rev 9542)
@@ -1,4 +1,4 @@
-package org.jboss.tools.flow.editor.core;
+package org.jboss.tools.flow.common.wrapper;
/*
* Copyright 2005 JBoss Inc
Modified: trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/wrapper/AbstractWrapper.java
===================================================================
--- trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/editor/core/AbstractWrapper.java 2008-08-05 16:25:42 UTC (rev 9532)
+++ trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/wrapper/AbstractWrapper.java 2008-08-05 16:42:16 UTC (rev 9542)
@@ -1,4 +1,4 @@
-package org.jboss.tools.flow.editor.core;
+package org.jboss.tools.flow.common.wrapper;
public abstract class AbstractWrapper implements Wrapper {
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/editor/core/ConnectionWrapper.java 2008-08-05 16:25:42 UTC (rev 9532)
+++ trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/wrapper/ConnectionWrapper.java 2008-08-05 16:42:16 UTC (rev 9542)
@@ -1,4 +1,4 @@
-package org.jboss.tools.flow.editor.core;
+package org.jboss.tools.flow.common.wrapper;
public interface ConnectionWrapper extends Wrapper {
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/editor/core/ContainerWrapper.java 2008-08-05 16:25:42 UTC (rev 9532)
+++ trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/wrapper/ContainerWrapper.java 2008-08-05 16:42:16 UTC (rev 9542)
@@ -1,4 +1,4 @@
-package org.jboss.tools.flow.editor.core;
+package org.jboss.tools.flow.common.wrapper;
/*
* Copyright 2005 JBoss Inc
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/editor/core/DefaultConnectionWrapper.java 2008-08-05 16:25:42 UTC (rev 9532)
+++ trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/wrapper/DefaultConnectionWrapper.java 2008-08-05 16:42:16 UTC (rev 9542)
@@ -1,4 +1,4 @@
-package org.jboss.tools.flow.editor.core;
+package org.jboss.tools.flow.common.wrapper;
import java.util.ArrayList;
import java.util.Iterator;
Modified: trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/wrapper/DefaultContainerWrapper.java
===================================================================
--- trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/editor/core/DefaultContainerWrapper.java 2008-08-05 16:25:42 UTC (rev 9532)
+++ trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/wrapper/DefaultContainerWrapper.java 2008-08-05 16:42:16 UTC (rev 9542)
@@ -1,4 +1,4 @@
-package org.jboss.tools.flow.editor.core;
+package org.jboss.tools.flow.common.wrapper;
import java.util.List;
@@ -7,8 +7,8 @@
import org.jboss.tools.flow.common.model.Container;
import org.jboss.tools.flow.common.model.Flow;
import org.jboss.tools.flow.common.model.Node;
-import org.jboss.tools.flow.editor.strategy.AcceptsIncomingConnectionStrategy;
-import org.jboss.tools.flow.editor.strategy.AcceptsOutgoingConnectionStrategy;
+import org.jboss.tools.flow.common.strategy.AcceptsIncomingConnectionStrategy;
+import org.jboss.tools.flow.common.strategy.AcceptsOutgoingConnectionStrategy;
public class DefaultContainerWrapper extends AbstractContainerWrapper {
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/editor/core/DefaultFlowWrapper.java 2008-08-05 16:25:42 UTC (rev 9532)
+++ trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/wrapper/DefaultFlowWrapper.java 2008-08-05 16:42:16 UTC (rev 9542)
@@ -1,10 +1,10 @@
-package org.jboss.tools.flow.editor.core;
+package org.jboss.tools.flow.common.wrapper;
import org.jboss.tools.flow.common.model.Flow;
import org.jboss.tools.flow.common.model.Node;
-import org.jboss.tools.flow.editor.core.AbstractFlowWrapper;
-import org.jboss.tools.flow.editor.core.NodeWrapper;
-import org.jboss.tools.flow.editor.strategy.AcceptsElementStrategy;
+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/DefaultNodeWrapper.java
===================================================================
--- trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/editor/core/DefaultNodeWrapper.java 2008-08-05 16:25:42 UTC (rev 9532)
+++ trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/wrapper/DefaultNodeWrapper.java 2008-08-05 16:42:16 UTC (rev 9542)
@@ -1,10 +1,10 @@
-package org.jboss.tools.flow.editor.core;
+package org.jboss.tools.flow.common.wrapper;
import org.eclipse.draw2d.geometry.Rectangle;
import org.jboss.tools.flow.common.model.Connection;
import org.jboss.tools.flow.common.model.Node;
-import org.jboss.tools.flow.editor.strategy.AcceptsIncomingConnectionStrategy;
-import org.jboss.tools.flow.editor.strategy.AcceptsOutgoingConnectionStrategy;
+import org.jboss.tools.flow.common.strategy.AcceptsIncomingConnectionStrategy;
+import org.jboss.tools.flow.common.strategy.AcceptsOutgoingConnectionStrategy;
public abstract class DefaultNodeWrapper extends AbstractNodeWrapper {
Modified: trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/wrapper/ModelEvent.java
===================================================================
--- trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/editor/core/ModelEvent.java 2008-08-05 16:25:42 UTC (rev 9532)
+++ trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/wrapper/ModelEvent.java 2008-08-05 16:42:16 UTC (rev 9542)
@@ -1,4 +1,4 @@
-package org.jboss.tools.flow.editor.core;
+package org.jboss.tools.flow.common.wrapper;
/*
* Copyright 2005 JBoss Inc
Modified: trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/wrapper/ModelListener.java
===================================================================
--- trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/editor/core/ModelListener.java 2008-08-05 16:25:42 UTC (rev 9532)
+++ trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/wrapper/ModelListener.java 2008-08-05 16:42:16 UTC (rev 9542)
@@ -1,4 +1,4 @@
-package org.jboss.tools.flow.editor.core;
+package org.jboss.tools.flow.common.wrapper;
/*
* Copyright 2005 JBoss Inc
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/editor/core/NodeWrapper.java 2008-08-05 16:25:42 UTC (rev 9532)
+++ trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/wrapper/NodeWrapper.java 2008-08-05 16:42:16 UTC (rev 9542)
@@ -1,4 +1,4 @@
-package org.jboss.tools.flow.editor.core;
+package org.jboss.tools.flow.common.wrapper;
/*
* Copyright 2005 JBoss Inc
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/editor/core/Wrapper.java 2008-08-05 16:25:42 UTC (rev 9532)
+++ trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/wrapper/Wrapper.java 2008-08-05 16:42:16 UTC (rev 9542)
@@ -1,4 +1,4 @@
-package org.jboss.tools.flow.editor.core;
+package org.jboss.tools.flow.common.wrapper;
public interface Wrapper {
16 years, 7 months
- 1
- 0
JBoss Tools SVN: r9541 - trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/META-INF.
by jbosstools-commits＠lists.jboss.org
Author: koen.aers(a)jboss.com
Date: 2008-08-05 12:35:56 -0400 (Tue, 05 Aug 2008)
New Revision: 9541
Modified:
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/META-INF/MANIFEST.MF
Log:
removed dependency on org.jboss.tools.flow.jpdl4.core
Modified: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/META-INF/MANIFEST.MF
===================================================================
--- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/META-INF/MANIFEST.MF 2008-08-05 16:34:56 UTC (rev 9540)
+++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/META-INF/MANIFEST.MF 2008-08-05 16:35:56 UTC (rev 9541)
@@ -6,7 +6,6 @@
Bundle-Vendor: JBoss, a Division of Red Hat
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Require-Bundle: org.jboss.tools.flow.common;bundle-version="1.0.0",
- org.jboss.tools.flow.jpdl4.core;bundle-version="1.0.0",
org.eclipse.core.resources;bundle-version="3.4.0",
org.eclipse.gef;bundle-version="3.4.0",
org.eclipse.ui;bundle-version="3.4.0",
16 years, 7 months
- 1
- 0