[jbosstools-commits] JBoss Tools SVN: r9267 - in trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4.graph: src/org/jboss/tools/flow/jpdl4/graph/editor and 1 other directories.

Author: koen.aers(a)jboss.com Date: 2008-07-24 09:31:06 -0400 (Thu, 24 Jul 2008) New Revision: 9267 Modified: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4.graph/build.properties trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4.graph/plugin.xml trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4.graph/src/org/jboss/tools/flow/jpdl4/graph/editor/JpdlPaletteFactory.java trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4.graph/src/org/jboss/tools/flow/jpdl4/graph/editpart/EndStateEditPart.java trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4.graph/src/org/jboss/tools/flow/jpdl4/graph/editpart/JpdlEditPartFactory.java Log: add End State Modified: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4.graph/build.properties =================================================================== --- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4.graph/build.properties 2008-07-24 12:59:42 UTC (rev 9266) +++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4.graph/build.properties 2008-07-24 13:31:06 UTC (rev 9267) @@ -1,4 +1,5 @@ source.. = src/ output.. = bin/ bin.includes = META-INF/,\ - . + .,\ + plugin.xml Modified: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4.graph/plugin.xml =================================================================== --- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4.graph/plugin.xml 2008-07-24 12:59:42 UTC (rev 9266) +++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4.graph/plugin.xml 2008-07-24 13:31:06 UTC (rev 9267) @@ -4,10 +4,10 @@ <extension point="org.eclipse.ui.editors"> <editor - name="RuleFlow Editor" + name="jPDL4 Editor" extensions="jpdl4" - icon="icons/processH.gif" - contributorClass="org.jboss.tools.process.editor.GenericActionBarContributor" + icon="icons/process.gif" + contributorClass="org.jboss.tools.flow.editor.GenericActionBarContributor" class="org.jboss.tools.flow.jpdl4.graph.editor.JpdlEditor" id="org.jboss.tools.process.jpdl4.graph.editor.JpdlEditor"> </editor> @@ -24,7 +24,7 @@ toolbarPath="Process" icon="icons/processV.gif" tooltip="Auto layout the process (vertical)" - class="org.jboss.tools.process.editor.action.VerticalAutoLayoutAction" + class="org.jboss.tools.flow.editor.action.VerticalAutoLayoutAction" /> </editorContribution> <editorContribution @@ -36,7 +36,7 @@ toolbarPath="Process" icon="icons/processH.gif" tooltip="Auto layout the process (horizontal)" - class="org.jboss.tools.process.editor.action.HorizontalAutoLayoutAction" + class="org.jboss.tools.flow.editor.action.HorizontalAutoLayoutAction" /> </editorContribution> </extension> Modified: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4.graph/src/org/jboss/tools/flow/jpdl4/graph/editor/JpdlPaletteFactory.java =================================================================== --- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4.graph/src/org/jboss/tools/flow/jpdl4/graph/editor/JpdlPaletteFactory.java 2008-07-24 12:59:42 UTC (rev 9266) +++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4.graph/src/org/jboss/tools/flow/jpdl4/graph/editor/JpdlPaletteFactory.java 2008-07-24 13:31:06 UTC (rev 9267) @@ -9,6 +9,7 @@ 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.TransitionWrapperFactory; @@ -33,15 +34,25 @@ entries.add(combined); combined = new CombinedTemplateCreationEntry( - "State", - "Create a new State", - StateWrapper.class, - new SimpleFactory(StateWrapper.class), - ImageDescriptor.createFromURL(Activator.getDefault().getBundle().getEntry("icons/state.gif")), - ImageDescriptor.createFromURL(Activator.getDefault().getBundle().getEntry("icons/state.gif")) - ); + "State", + "Create a new State", + StateWrapper.class, + new SimpleFactory(StateWrapper.class), + ImageDescriptor.createFromURL(Activator.getDefault().getBundle().getEntry("icons/state.gif")), + ImageDescriptor.createFromURL(Activator.getDefault().getBundle().getEntry("icons/state.gif")) + ); entries.add(combined); - + + combined = new CombinedTemplateCreationEntry( + "End", + "Create a new End State", + EndStateWrapper.class, + new SimpleFactory(EndStateWrapper.class), + ImageDescriptor.createFromURL(Activator.getDefault().getBundle().getEntry("icons/end.gif")), + ImageDescriptor.createFromURL(Activator.getDefault().getBundle().getEntry("icons/end.gif")) + ); + entries.add(combined); + return entries; } Modified: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4.graph/src/org/jboss/tools/flow/jpdl4/graph/editpart/EndStateEditPart.java =================================================================== --- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4.graph/src/org/jboss/tools/flow/jpdl4/graph/editpart/EndStateEditPart.java 2008-07-24 12:59:42 UTC (rev 9266) +++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4.graph/src/org/jboss/tools/flow/jpdl4/graph/editpart/EndStateEditPart.java 2008-07-24 13:31:06 UTC (rev 9267) @@ -10,7 +10,7 @@ public class EndStateEditPart extends ElementEditPart { private static final Image ICON = ImageDescriptor.createFromURL( - Activator.getDefault().getBundle().getEntry("icons/start.gif")).createImage(); + Activator.getDefault().getBundle().getEntry("icons/end.gif")).createImage(); protected IFigure createFigure() { RectangleElementFigure figure = new RectangleElementFigure(); Modified: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4.graph/src/org/jboss/tools/flow/jpdl4/graph/editpart/JpdlEditPartFactory.java =================================================================== --- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4.graph/src/org/jboss/tools/flow/jpdl4/graph/editpart/JpdlEditPartFactory.java 2008-07-24 12:59:42 UTC (rev 9266) +++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4.graph/src/org/jboss/tools/flow/jpdl4/graph/editpart/JpdlEditPartFactory.java 2008-07-24 13:31:06 UTC (rev 9267) @@ -3,6 +3,7 @@ import org.eclipse.gef.EditPart; import org.eclipse.gef.EditPartFactory; 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; @@ -18,6 +19,8 @@ result = new StartStateEditPart(); } else if (model instanceof StateWrapper) { result = new StateEditPart(); + } else if (model instanceof EndStateWrapper) { + result = new EndStateEditPart(); } else if (model instanceof TransitionWrapper) { result = new TransitionEditPart(); } else {