[jbosstools-commits] JBoss Tools SVN: r14941 - in trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4: icons/16 and 6 other directories.

Author: koen.aers(a)jboss.com Date: 2009-04-27 13:33:41 -0400 (Mon, 27 Apr 2009) New Revision: 14941 Added: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/icons/16/delete.gif trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/icons/16/swimlane.gif trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/icons/16/timer.gif trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editpart/ElementTreeEditPart.java trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editpart/ListTreeEditPart.java trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editpart/SwimlaneTreeEditPart.java trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editpart/TimerTreeEditPart.java trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/handler/DeleteElementHandler.java trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/model/Timer.java Removed: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editpart/ListTreeEditPart.java trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editpart/ProcessNodeListTreeEditPart.java Modified: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/plugin.xml trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/command/AddProcessNodeCommand.java 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/editpart/EventListenerContainerListTreeEditPart.java trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editpart/JpdlTreeEditPart.java trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editpart/JpdlTreeEditPartFactory.java trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editpart/ProcessTreeRootEditPart.java trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editpart/SwimlaneListTreeEditPart.java trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editpart/TimerListTreeEditPart.java trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/handler/AddEventListenerHandler.java trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/handler/AddSwimlaneHandler.java trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/handler/AddTimerHandler.java trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/model/Process.java trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/model/Swimlane.java trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/view/DetailsPage.java Log: enable adding and deleting of Swimlanes and Timers on Processes Added: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/icons/16/delete.gif =================================================================== (Binary files differ) Property changes on: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/icons/16/delete.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/icons/16/swimlane.gif =================================================================== (Binary files differ) Property changes on: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/icons/16/swimlane.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/icons/16/timer.gif =================================================================== (Binary files differ) Property changes on: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/icons/16/timer.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/plugin.xml =================================================================== --- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/plugin.xml 2009-04-27 17:32:53 UTC (rev 14940) +++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/plugin.xml 2009-04-27 17:33:41 UTC (rev 14941) @@ -316,12 +316,6 @@ <command categoryId="org.jboss.tools.flow.jpdl4" defaultHandler="org.jboss.tools.flow.jpdl4.handler.AddEventListenerHandler" - id="org.jboss.tools.flow.jpdl4.addEventListenerType" - name="Add Event Listener Type"> - </command> - <command - categoryId="org.jboss.tools.flow.jpdl4" - defaultHandler="org.jboss.tools.flow.jpdl4.handler.AddEventListenerHandler" id="org.jboss.tools.flow.jpdl4.addEventListener" name="Add Event Listener"> </command> @@ -331,6 +325,12 @@ id="org.jboss.tools.flow.jpdl4.addTimer" name="Add Timer"> </command> + <command + categoryId="org.jboss.tools.flow.jpdl4" + defaultHandler="org.jboss.tools.flow.jpdl4.handler.DeleteElementHandler" + id="org.jboss.tools.flow.jpdl4.delete" + name="Delete"> + </command> </extension> <extension point="org.eclipse.ui.menus"> @@ -378,6 +378,24 @@ </iterate> </visibleWhen> </command> + <separator + name="org.jboss.tools.flow.jpdl4.details.separator1" + visible="true"> + </separator> + <command + commandId="org.jboss.tools.flow.jpdl4.delete" + icon="icons/16/delete.gif" + id="org.jboss.tools.flow.jpdl4.details.delete" + style="push"> + <visibleWhen + checkEnabled="true"> + <iterate> + <instanceof + value="org.jboss.tools.flow.jpdl4.editpart.ElementTreeEditPart"> + </instanceof> + </iterate> + </visibleWhen> + </command> </menuContribution> </extension> Modified: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/command/AddProcessNodeCommand.java =================================================================== --- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/command/AddProcessNodeCommand.java 2009-04-27 17:32:53 UTC (rev 14940) +++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/command/AddProcessNodeCommand.java 2009-04-27 17:33:41 UTC (rev 14941) @@ -1,11 +1,11 @@ package org.jboss.tools.flow.jpdl4.command; -import org.jboss.tools.flow.common.command.AddElementCommand; +import org.jboss.tools.flow.common.command.AddNodeCommand; import org.jboss.tools.flow.common.model.Flow; import org.jboss.tools.flow.common.model.Node; import org.jboss.tools.flow.jpdl4.util.Jpdl4Helper; -public class AddProcessNodeCommand extends AddElementCommand { +public class AddProcessNodeCommand extends AddNodeCommand { public void execute() { if (getChild().getName() == null) { 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/editor/JpdlEditor.java 2009-04-27 17:32:53 UTC (rev 14940) +++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editor/JpdlEditor.java 2009-04-27 17:33:41 UTC (rev 14941) @@ -7,14 +7,12 @@ import org.eclipse.gef.DefaultEditDomain; import org.eclipse.gef.commands.CommandStack; import org.eclipse.gef.palette.PaletteRoot; -import org.eclipse.gef.ui.parts.TreeViewer; import org.eclipse.ui.views.properties.IPropertySheetPage; import org.eclipse.ui.views.properties.tabbed.ITabbedPropertySheetPageContributor; import org.jboss.tools.flow.common.editor.GenericModelEditor; import org.jboss.tools.flow.common.registry.ElementRegistry; import org.jboss.tools.flow.common.wrapper.Wrapper; import org.jboss.tools.flow.jpdl4.editpart.JpdlGraphicalEditPartFactory; -import org.jboss.tools.flow.jpdl4.editpart.JpdlTreeEditPartFactory; import org.jboss.tools.flow.jpdl4.properties.JpdlPropertySheetPage; import org.jboss.tools.flow.jpdl4.view.DetailsPage; import org.jboss.tools.flow.jpdl4.view.IDetailsPage; @@ -83,11 +81,7 @@ } protected void initDetailsPage() { - TreeViewer treeViewer = new TreeViewer(); - treeViewer.setEditPartFactory(new JpdlTreeEditPartFactory()); - getEditDomain().addViewer(treeViewer); -// getSelectionSynchronizer().addViewer(treeViewer); - detailsPage = new DetailsPage(treeViewer); + detailsPage = new DetailsPage(this); getSite().getSelectionProvider().addSelectionChangedListener(detailsPage); } Added: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editpart/ElementTreeEditPart.java =================================================================== --- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editpart/ElementTreeEditPart.java (rev 0) +++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editpart/ElementTreeEditPart.java 2009-04-27 17:33:41 UTC (rev 14941) @@ -0,0 +1,5 @@ +package org.jboss.tools.flow.jpdl4.editpart; + +public interface ElementTreeEditPart { + +} Property changes on: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editpart/ElementTreeEditPart.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editpart/EventListenerContainerListTreeEditPart.java =================================================================== --- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editpart/EventListenerContainerListTreeEditPart.java 2009-04-27 17:32:53 UTC (rev 14940) +++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editpart/EventListenerContainerListTreeEditPart.java 2009-04-27 17:33:41 UTC (rev 14941) @@ -6,7 +6,7 @@ import org.jboss.tools.flow.jpdl4.model.Process; import org.jboss.tools.flow.jpdl4.util.SharedImages; -public class EventListenerContainerListTreeEditPart extends JpdlTreeEditPart implements ListTreeEditPart { +public class EventListenerContainerListTreeEditPart extends JpdlTreeEditPart { public EventListenerContainerListTreeEditPart(Process process) { super(process); Modified: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editpart/JpdlTreeEditPart.java =================================================================== --- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editpart/JpdlTreeEditPart.java 2009-04-27 17:32:53 UTC (rev 14940) +++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editpart/JpdlTreeEditPart.java 2009-04-27 17:33:41 UTC (rev 14941) @@ -1,27 +1,45 @@ package org.jboss.tools.flow.jpdl4.editpart; +import org.eclipse.core.runtime.IAdaptable; +import org.eclipse.gef.EditPart; import org.eclipse.gef.editparts.AbstractTreeEditPart; import org.eclipse.ui.views.properties.IPropertySource; -import org.jboss.tools.flow.common.model.Element; +import org.jboss.tools.flow.common.wrapper.ModelEvent; +import org.jboss.tools.flow.common.wrapper.ModelListener; -public class JpdlTreeEditPart extends AbstractTreeEditPart { +public class JpdlTreeEditPart extends AbstractTreeEditPart implements ModelListener { - protected IPropertySource propertySource; - - public JpdlTreeEditPart(Element element) { - super(element); - if (element == null) return; - Object object = element.getMetaData("propertySource"); - if (object != null && object instanceof IPropertySource) { - propertySource = (IPropertySource)object; - } + private IPropertySource propertySource; + + public JpdlTreeEditPart(Object model) { + super(model); } @SuppressWarnings("unchecked") public Object getAdapter(Class adapter) { if (adapter == IPropertySource.class) - return propertySource; + return getPropertySource(); return super.getAdapter(adapter); } + private IPropertySource getPropertySource() { + if (propertySource == null) { + initPropertySource(); + } + return propertySource; + } + + private void initPropertySource() { + EditPart editPart = this; + while (editPart != null && propertySource != null) { + if (editPart.getModel() != null && editPart.getModel() instanceof IAdaptable) { + propertySource = (IPropertySource)((IAdaptable)editPart.getModel()).getAdapter(IPropertySource.class); + } + editPart = editPart.getParent(); + } + } + + public void modelChanged(ModelEvent event) { + } + } Modified: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editpart/JpdlTreeEditPartFactory.java =================================================================== --- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editpart/JpdlTreeEditPartFactory.java 2009-04-27 17:32:53 UTC (rev 14940) +++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editpart/JpdlTreeEditPartFactory.java 2009-04-27 17:33:41 UTC (rev 14941) @@ -2,9 +2,13 @@ import org.eclipse.gef.EditPart; import org.eclipse.gef.EditPartFactory; +import org.jboss.tools.flow.common.model.Element; import org.jboss.tools.flow.common.wrapper.ConnectionWrapper; import org.jboss.tools.flow.common.wrapper.FlowWrapper; import org.jboss.tools.flow.common.wrapper.NodeWrapper; +import org.jboss.tools.flow.common.wrapper.Wrapper; +import org.jboss.tools.flow.jpdl4.model.Swimlane; +import org.jboss.tools.flow.jpdl4.model.Timer; public class JpdlTreeEditPartFactory implements EditPartFactory { @@ -12,7 +16,12 @@ if (model instanceof FlowWrapper && context == null) return new ProcessTreeRootEditPart((FlowWrapper)model); if (model instanceof NodeWrapper && context == null) return new TaskTreeRootEditPart((NodeWrapper)model); if (model instanceof ConnectionWrapper && context == null) return new SequenceFlowTreeRootEditPart((ConnectionWrapper)model); - if (model instanceof ProcessNodeListTreeEditPart) return (EditPart)model; + if (model instanceof Wrapper) { + Element element = ((Wrapper)model).getElement(); + if (element instanceof Swimlane) return new SwimlaneTreeEditPart((Wrapper)model); + if (element instanceof Timer) return new TimerTreeEditPart((Wrapper)model); + return new NoDetailsTreeRootEditPart(); + } if (model instanceof SwimlaneListTreeEditPart) return (EditPart)model; if (model instanceof EventListenerContainerListTreeEditPart) return (EditPart)model; if (model instanceof TimerListTreeEditPart) return (EditPart)model; Deleted: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editpart/ListTreeEditPart.java =================================================================== --- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editpart/ListTreeEditPart.java 2009-04-27 17:32:53 UTC (rev 14940) +++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editpart/ListTreeEditPart.java 2009-04-27 17:33:41 UTC (rev 14941) @@ -1,5 +0,0 @@ -package org.jboss.tools.flow.jpdl4.editpart; - -public interface ListTreeEditPart { - -} Added: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editpart/ListTreeEditPart.java =================================================================== --- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editpart/ListTreeEditPart.java (rev 0) +++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editpart/ListTreeEditPart.java 2009-04-27 17:33:41 UTC (rev 14941) @@ -0,0 +1,5 @@ +package org.jboss.tools.flow.jpdl4.editpart; + +public interface ListTreeEditPart { + +} Deleted: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editpart/ProcessNodeListTreeEditPart.java =================================================================== --- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editpart/ProcessNodeListTreeEditPart.java 2009-04-27 17:32:53 UTC (rev 14940) +++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editpart/ProcessNodeListTreeEditPart.java 2009-04-27 17:33:41 UTC (rev 14941) @@ -1,26 +0,0 @@ -package org.jboss.tools.flow.jpdl4.editpart; - -import org.eclipse.core.runtime.Platform; -import org.eclipse.jface.resource.ImageDescriptor; -import org.eclipse.swt.graphics.Image; -import org.jboss.tools.flow.jpdl4.model.Process; -import org.jboss.tools.flow.jpdl4.util.SharedImages; - -public class ProcessNodeListTreeEditPart extends JpdlTreeEditPart { - - public ProcessNodeListTreeEditPart(Process process) { - super(process); - } - - protected Image getImage() { - String iconPath = "icons/16/node_elements_multiple.gif"; - ImageDescriptor descriptor = ImageDescriptor.createFromURL( - Platform.getBundle("org.jboss.tools.flow.jpdl4").getEntry(iconPath)); - return SharedImages.INSTANCE.getImage(descriptor); - } - - protected String getText() { - return "Nodes"; - } - -} Modified: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editpart/ProcessTreeRootEditPart.java =================================================================== --- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editpart/ProcessTreeRootEditPart.java 2009-04-27 17:32:53 UTC (rev 14940) +++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editpart/ProcessTreeRootEditPart.java 2009-04-27 17:33:41 UTC (rev 14941) @@ -3,9 +3,11 @@ import java.util.ArrayList; import java.util.List; -import org.jboss.tools.flow.jpdl4.model.Process; - +import org.eclipse.gef.EditPart; +import org.jboss.tools.flow.common.model.Element; import org.jboss.tools.flow.common.wrapper.FlowWrapper; +import org.jboss.tools.flow.common.wrapper.ModelEvent; +import org.jboss.tools.flow.common.wrapper.Wrapper; public class ProcessTreeRootEditPart extends JpdlTreeEditPart { @@ -13,24 +15,51 @@ super(flowWrapper); } - private Process getProcess() { - return (Process)((FlowWrapper)getModel()).getElement(); - } - protected void createEditPolicies() { } protected List<Object> getModelChildren() { List<Object> result = new ArrayList<Object>(); - result.add(new EventListenerContainerListTreeEditPart(null)); -// Process process = getProcess(); -// if (process.get) + FlowWrapper flowWrapper = (FlowWrapper)getModel(); + if (flowWrapper == null) return null; + addSwimlanes(result, flowWrapper); + addTimers(result, flowWrapper); return result; -// List<Object> result = new ArrayList<Object>(); -// if (modelChildren == null) { -// modelChildren = initModelChildren(); -// } -// return modelChildren; } + private void addSwimlanes(List<Object> list, FlowWrapper wrapper) { + List<Element> swimlanes = wrapper.getChildren("swimlane"); + if (swimlanes != null && !(swimlanes.isEmpty())) { + list.add(new SwimlaneListTreeEditPart(swimlanes)); + } + } + + private void addTimers(List<Object> list, FlowWrapper wrapper) { + List<Element> timers = wrapper.getChildren("timer"); + if (timers != null && !(timers.isEmpty())) { + list.add(new TimerListTreeEditPart(timers)); + } + } + + public void modelChanged(ModelEvent event) { + if (event.getChangeType() == Wrapper.ADD_ELEMENT) { + refreshChildren(); + Object object = event.getNewValue(); + EditPart editPart = (EditPart)getViewer().getEditPartRegistry().get(object); + getViewer().select(editPart); + } else if (event.getChangeType() == Wrapper.REMOVE_ELEMENT) { + refreshChildren(); + } + } + + public void activate() { + super.activate(); + ((FlowWrapper)getModel()).addListener(this); + } + + public void deactivate() { + ((FlowWrapper)getModel()).removeListener(this); + super.deactivate(); + } + } Modified: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editpart/SwimlaneListTreeEditPart.java =================================================================== --- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editpart/SwimlaneListTreeEditPart.java 2009-04-27 17:32:53 UTC (rev 14940) +++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editpart/SwimlaneListTreeEditPart.java 2009-04-27 17:33:41 UTC (rev 14941) @@ -1,15 +1,17 @@ package org.jboss.tools.flow.jpdl4.editpart; +import java.util.List; + import org.eclipse.core.runtime.Platform; import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.swt.graphics.Image; -import org.jboss.tools.flow.jpdl4.model.Process; +import org.jboss.tools.flow.common.model.Element; import org.jboss.tools.flow.jpdl4.util.SharedImages; -public class SwimlaneListTreeEditPart extends JpdlTreeEditPart implements ListTreeEditPart { +public class SwimlaneListTreeEditPart extends JpdlTreeEditPart { - public SwimlaneListTreeEditPart(Process process) { - super(process); + public SwimlaneListTreeEditPart(List<Element> swimlanes) { + super(swimlanes); } protected Image getImage() { @@ -22,5 +24,11 @@ protected String getText() { return "Swimlanes"; } + + @SuppressWarnings("unchecked") + protected List<Object> getModelChildren() { + return (List<Object>)getModel(); + } + } Added: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editpart/SwimlaneTreeEditPart.java =================================================================== --- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editpart/SwimlaneTreeEditPart.java (rev 0) +++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editpart/SwimlaneTreeEditPart.java 2009-04-27 17:33:41 UTC (rev 14941) @@ -0,0 +1,26 @@ +package org.jboss.tools.flow.jpdl4.editpart; + +import org.eclipse.core.runtime.Platform; +import org.eclipse.jface.resource.ImageDescriptor; +import org.eclipse.swt.graphics.Image; +import org.jboss.tools.flow.common.wrapper.Wrapper; +import org.jboss.tools.flow.jpdl4.util.SharedImages; + +public class SwimlaneTreeEditPart extends JpdlTreeEditPart implements ElementTreeEditPart { + + public SwimlaneTreeEditPart(Wrapper wrapper) { + super(wrapper); + } + + protected Image getImage() { + String iconPath = "icons/16/swimlane.gif"; + ImageDescriptor descriptor = ImageDescriptor.createFromURL( + Platform.getBundle("org.jboss.tools.flow.jpdl4").getEntry(iconPath)); + return SharedImages.INSTANCE.getImage(descriptor); + } + + protected String getText() { + return "swimlane"; + } + +} Property changes on: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editpart/SwimlaneTreeEditPart.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editpart/TimerListTreeEditPart.java =================================================================== --- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editpart/TimerListTreeEditPart.java 2009-04-27 17:32:53 UTC (rev 14940) +++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editpart/TimerListTreeEditPart.java 2009-04-27 17:33:41 UTC (rev 14941) @@ -1,15 +1,17 @@ package org.jboss.tools.flow.jpdl4.editpart; +import java.util.List; + import org.eclipse.core.runtime.Platform; import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.swt.graphics.Image; -import org.jboss.tools.flow.jpdl4.model.Process; +import org.jboss.tools.flow.common.model.Element; import org.jboss.tools.flow.jpdl4.util.SharedImages; -public class TimerListTreeEditPart extends JpdlTreeEditPart implements ListTreeEditPart { +public class TimerListTreeEditPart extends JpdlTreeEditPart { - public TimerListTreeEditPart(Process process) { - super(process); + public TimerListTreeEditPart(List<Element> timers) { + super(timers); } protected Image getImage() { @@ -23,4 +25,9 @@ return "Timers"; } + @SuppressWarnings("unchecked") + protected List<Object> getModelChildren() { + return (List<Object>)getModel(); + } + } Added: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editpart/TimerTreeEditPart.java =================================================================== --- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editpart/TimerTreeEditPart.java (rev 0) +++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editpart/TimerTreeEditPart.java 2009-04-27 17:33:41 UTC (rev 14941) @@ -0,0 +1,26 @@ +package org.jboss.tools.flow.jpdl4.editpart; + +import org.eclipse.core.runtime.Platform; +import org.eclipse.jface.resource.ImageDescriptor; +import org.eclipse.swt.graphics.Image; +import org.jboss.tools.flow.common.wrapper.Wrapper; +import org.jboss.tools.flow.jpdl4.util.SharedImages; + +public class TimerTreeEditPart extends JpdlTreeEditPart implements ElementTreeEditPart { + + public TimerTreeEditPart(Wrapper wrapper) { + super(wrapper); + } + + protected Image getImage() { + String iconPath = "icons/16/timer.gif"; + ImageDescriptor descriptor = ImageDescriptor.createFromURL( + Platform.getBundle("org.jboss.tools.flow.jpdl4").getEntry(iconPath)); + return SharedImages.INSTANCE.getImage(descriptor); + } + + protected String getText() { + return "timer"; + } + +} Property changes on: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editpart/TimerTreeEditPart.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/handler/AddEventListenerHandler.java =================================================================== --- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/handler/AddEventListenerHandler.java 2009-04-27 17:32:53 UTC (rev 14940) +++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/handler/AddEventListenerHandler.java 2009-04-27 17:33:41 UTC (rev 14941) @@ -4,17 +4,45 @@ import org.eclipse.core.commands.ExecutionEvent; import org.eclipse.core.commands.ExecutionException; import org.eclipse.core.commands.IHandler; -import org.eclipse.jface.dialogs.MessageDialog; -import org.eclipse.ui.IWorkbenchWindow; +import org.eclipse.gef.EditPart; +import org.eclipse.gef.commands.CommandStack; +import org.eclipse.jface.viewers.ISelection; +import org.eclipse.jface.viewers.IStructuredSelection; +import org.eclipse.ui.IEditorPart; +import org.eclipse.ui.IWorkbenchPage; import org.eclipse.ui.handlers.HandlerUtil; +import org.jboss.tools.flow.common.command.AddChildCommand; +import org.jboss.tools.flow.common.wrapper.DefaultWrapper; +import org.jboss.tools.flow.common.wrapper.FlowWrapper; +import org.jboss.tools.flow.common.wrapper.Wrapper; +import org.jboss.tools.flow.jpdl4.model.Swimlane; public class AddEventListenerHandler extends AbstractHandler implements IHandler { public Object execute(ExecutionEvent event) throws ExecutionException { - IWorkbenchWindow window = HandlerUtil.getActiveWorkbenchWindowChecked(event); - MessageDialog.openInformation( - window.getShell(), "MenuEclipseArticle Plug-in", - "Hello, Eclipse world"); + IWorkbenchPage page = HandlerUtil.getActiveWorkbenchWindowChecked(event).getActivePage(); + if (page == null) return null; + ISelection selection = page.getSelection(); + if (!(selection instanceof IStructuredSelection)) return null; + IStructuredSelection structuredSelection = (IStructuredSelection)selection; + Object first = structuredSelection.getFirstElement(); + if (!(first instanceof EditPart)) return null; + EditPart editPart = (EditPart)first; + Object model = editPart.getModel(); + if (model == null || !(model instanceof FlowWrapper)) return null; + FlowWrapper flowWrapper = (FlowWrapper)model; + IEditorPart editorPart = HandlerUtil.getActiveEditor(event); + if (editorPart == null) return null; + Object object = editorPart.getAdapter(CommandStack.class); + if (object == null || !(object instanceof CommandStack)) return null; + CommandStack commandStack = (CommandStack)object; + AddChildCommand addChildCommand = new AddChildCommand(); + Wrapper child = new DefaultWrapper(); + child.setElement(new Swimlane()); + addChildCommand.setChild(child); + addChildCommand.setType("eventListener"); + addChildCommand.setParent(flowWrapper); + commandStack.execute(addChildCommand); return null; } Modified: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/handler/AddSwimlaneHandler.java =================================================================== --- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/handler/AddSwimlaneHandler.java 2009-04-27 17:32:53 UTC (rev 14940) +++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/handler/AddSwimlaneHandler.java 2009-04-27 17:33:41 UTC (rev 14941) @@ -4,17 +4,45 @@ import org.eclipse.core.commands.ExecutionEvent; import org.eclipse.core.commands.ExecutionException; import org.eclipse.core.commands.IHandler; -import org.eclipse.jface.dialogs.MessageDialog; -import org.eclipse.ui.IWorkbenchWindow; +import org.eclipse.gef.EditPart; +import org.eclipse.gef.commands.CommandStack; +import org.eclipse.jface.viewers.ISelection; +import org.eclipse.jface.viewers.IStructuredSelection; +import org.eclipse.ui.IEditorPart; +import org.eclipse.ui.IWorkbenchPage; import org.eclipse.ui.handlers.HandlerUtil; +import org.jboss.tools.flow.common.command.AddChildCommand; +import org.jboss.tools.flow.common.wrapper.DefaultWrapper; +import org.jboss.tools.flow.common.wrapper.FlowWrapper; +import org.jboss.tools.flow.common.wrapper.Wrapper; +import org.jboss.tools.flow.jpdl4.model.Swimlane; public class AddSwimlaneHandler extends AbstractHandler implements IHandler { public Object execute(ExecutionEvent event) throws ExecutionException { - IWorkbenchWindow window = HandlerUtil.getActiveWorkbenchWindowChecked(event); - MessageDialog.openInformation( - window.getShell(), "MenuEclipseArticle Plug-in", - "Hello, Eclipse world"); + IWorkbenchPage page = HandlerUtil.getActiveWorkbenchWindowChecked(event).getActivePage(); + if (page == null) return null; + ISelection selection = page.getSelection(); + if (!(selection instanceof IStructuredSelection)) return null; + IStructuredSelection structuredSelection = (IStructuredSelection)selection; + Object first = structuredSelection.getFirstElement(); + if (!(first instanceof EditPart)) return null; + EditPart editPart = (EditPart)first; + Object model = editPart.getModel(); + if (model == null || !(model instanceof FlowWrapper)) return null; + FlowWrapper flowWrapper = (FlowWrapper)model; + IEditorPart editorPart = HandlerUtil.getActiveEditor(event); + if (editorPart == null) return null; + Object object = editorPart.getAdapter(CommandStack.class); + if (object == null || !(object instanceof CommandStack)) return null; + CommandStack commandStack = (CommandStack)object; + AddChildCommand addChildCommand = new AddChildCommand(); + Wrapper child = new DefaultWrapper(); + child.setElement(new Swimlane()); + addChildCommand.setChild(child); + addChildCommand.setType("swimlane"); + addChildCommand.setParent(flowWrapper); + commandStack.execute(addChildCommand); return null; } Modified: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/handler/AddTimerHandler.java =================================================================== --- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/handler/AddTimerHandler.java 2009-04-27 17:32:53 UTC (rev 14940) +++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/handler/AddTimerHandler.java 2009-04-27 17:33:41 UTC (rev 14941) @@ -4,17 +4,45 @@ import org.eclipse.core.commands.ExecutionEvent; import org.eclipse.core.commands.ExecutionException; import org.eclipse.core.commands.IHandler; -import org.eclipse.jface.dialogs.MessageDialog; -import org.eclipse.ui.IWorkbenchWindow; +import org.eclipse.gef.EditPart; +import org.eclipse.gef.commands.CommandStack; +import org.eclipse.jface.viewers.ISelection; +import org.eclipse.jface.viewers.IStructuredSelection; +import org.eclipse.ui.IEditorPart; +import org.eclipse.ui.IWorkbenchPage; import org.eclipse.ui.handlers.HandlerUtil; +import org.jboss.tools.flow.common.command.AddChildCommand; +import org.jboss.tools.flow.common.wrapper.DefaultWrapper; +import org.jboss.tools.flow.common.wrapper.FlowWrapper; +import org.jboss.tools.flow.common.wrapper.Wrapper; +import org.jboss.tools.flow.jpdl4.model.Timer; public class AddTimerHandler extends AbstractHandler implements IHandler { public Object execute(ExecutionEvent event) throws ExecutionException { - IWorkbenchWindow window = HandlerUtil.getActiveWorkbenchWindowChecked(event); - MessageDialog.openInformation( - window.getShell(), "MenuEclipseArticle Plug-in", - "Hello, Eclipse world"); + IWorkbenchPage page = HandlerUtil.getActiveWorkbenchWindowChecked(event).getActivePage(); + if (page == null) return null; + ISelection selection = page.getSelection(); + if (!(selection instanceof IStructuredSelection)) return null; + IStructuredSelection structuredSelection = (IStructuredSelection)selection; + Object first = structuredSelection.getFirstElement(); + if (!(first instanceof EditPart)) return null; + EditPart editPart = (EditPart)first; + Object model = editPart.getModel(); + if (model == null || !(model instanceof FlowWrapper)) return null; + FlowWrapper flowWrapper = (FlowWrapper)model; + IEditorPart editorPart = HandlerUtil.getActiveEditor(event); + if (editorPart == null) return null; + Object object = editorPart.getAdapter(CommandStack.class); + if (object == null || !(object instanceof CommandStack)) return null; + CommandStack commandStack = (CommandStack)object; + AddChildCommand addChildCommand = new AddChildCommand(); + Wrapper child = new DefaultWrapper(); + child.setElement(new Timer()); + addChildCommand.setChild(child); + addChildCommand.setType("timer"); + addChildCommand.setParent(flowWrapper); + commandStack.execute(addChildCommand); return null; } Added: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/handler/DeleteElementHandler.java =================================================================== --- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/handler/DeleteElementHandler.java (rev 0) +++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/handler/DeleteElementHandler.java 2009-04-27 17:33:41 UTC (rev 14941) @@ -0,0 +1,65 @@ +package org.jboss.tools.flow.jpdl4.handler; + +import org.eclipse.core.commands.AbstractHandler; +import org.eclipse.core.commands.ExecutionEvent; +import org.eclipse.core.commands.ExecutionException; +import org.eclipse.core.commands.IHandler; +import org.eclipse.gef.EditPart; +import org.eclipse.gef.RootEditPart; +import org.eclipse.gef.commands.CommandStack; +import org.eclipse.jface.viewers.ISelection; +import org.eclipse.jface.viewers.IStructuredSelection; +import org.eclipse.ui.IEditorPart; +import org.eclipse.ui.IWorkbenchPage; +import org.eclipse.ui.handlers.HandlerUtil; +import org.jboss.tools.flow.common.command.DeleteChildCommand; +import org.jboss.tools.flow.common.wrapper.Wrapper; +import org.jboss.tools.flow.jpdl4.Logger; +import org.jboss.tools.flow.jpdl4.model.Swimlane; +import org.jboss.tools.flow.jpdl4.model.Timer; + +public class DeleteElementHandler extends AbstractHandler implements IHandler { + + public Object execute(ExecutionEvent event) throws ExecutionException { + IWorkbenchPage page = HandlerUtil.getActiveWorkbenchWindowChecked(event).getActivePage(); + if (page == null) return null; + ISelection selection = page.getSelection(); + if (!(selection instanceof IStructuredSelection)) return null; + IStructuredSelection structuredSelection = (IStructuredSelection)selection; + Object first = structuredSelection.getFirstElement(); + if (!(first instanceof EditPart)) return null; + EditPart editPart = (EditPart)first; + Object model = editPart.getModel(); + if (model == null || !(model instanceof Wrapper)) return null; + Wrapper child = (Wrapper)model; + EditPart root = null; + while (editPart != null && !(editPart instanceof RootEditPart)) { + root = editPart; + editPart = editPart.getParent(); + } + if (root == null) return null; + model = root.getModel(); + if (model == null || !(model instanceof Wrapper)) return null; + Wrapper parent = (Wrapper)model; + IEditorPart editorPart = HandlerUtil.getActiveEditor(event); + if (editorPart == null) return null; + Object object = editorPart.getAdapter(CommandStack.class); + if (object == null || !(object instanceof CommandStack)) return null; + CommandStack commandStack = (CommandStack)object; + DeleteChildCommand deleteChildCommand = new DeleteChildCommand(); + deleteChildCommand.setChild(child); + if (child.getElement() instanceof Swimlane) { + deleteChildCommand.setType("swimlane"); + } else if (child.getElement() instanceof Timer) { + deleteChildCommand.setType("timer"); + } + deleteChildCommand.setParent(parent); + if (deleteChildCommand.canExecute()) { + commandStack.execute(deleteChildCommand); + } else { + Logger.logInfo("Could not execute delete element command: " + deleteChildCommand); + } + return null; + } + +} Property changes on: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/handler/DeleteElementHandler.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/model/Process.java =================================================================== --- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/model/Process.java 2009-04-27 17:32:53 UTC (rev 14940) +++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/model/Process.java 2009-04-27 17:33:41 UTC (rev 14941) @@ -1,7 +1,11 @@ -package org.jboss.tools.flow.jpdl4.model; + package org.jboss.tools.flow.jpdl4.model; +import java.util.ArrayList; import java.util.Iterator; +import java.util.List; +import org.eclipse.ui.views.properties.IPropertyDescriptor; +import org.eclipse.ui.views.properties.IPropertySource; import org.jboss.tools.flow.common.model.DefaultFlow; import org.jboss.tools.flow.common.model.Node; import org.jboss.tools.flow.jpdl4.util.Jpdl4Helper; @@ -10,6 +14,15 @@ private Node initial = null; + private List<Swimlane> swimlanes = new ArrayList<Swimlane>(); + private List<Timer> timers = new ArrayList<Timer>(); +// private List<String> eventTypes = new ArrayList<String>(); +// private Map<String, List<EventListener>> eventListeners = new HashMap<String, List<EventListener>>(); + + public Process() { + setMetaData("propertySource", new PropertySource()); + } + public StartEvent getStartState() { for (Iterator<Node> iterator = getNodes().iterator(); iterator.hasNext(); ) { Node node = iterator.next(); @@ -32,5 +45,40 @@ Jpdl4Helper.mergeLeadingNodes(node); super.removeNode(node); } - + + private class PropertySource implements IPropertySource { + + public Object getEditableValue() { + return null; + } + + public IPropertyDescriptor[] getPropertyDescriptors() { + return new IPropertyDescriptor[0]; + } + + public Object getPropertyValue(Object id) { + if ("swimlane".equals(id)) { + return swimlanes; + } else if ("timer".equals(id)) { + return timers; + } + return null; + } + + public boolean isPropertySet(Object id) { + if ("swimlane".equals(id)) { + return true; + } else if ("timer".equals(id)) { + return true; + } + return false; + } + + public void resetPropertyValue(Object id) { + } + + public void setPropertyValue(Object id, Object value) { + } + + } } Modified: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/model/Swimlane.java =================================================================== --- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/model/Swimlane.java 2009-04-27 17:32:53 UTC (rev 14940) +++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/model/Swimlane.java 2009-04-27 17:33:41 UTC (rev 14941) @@ -1,7 +1,8 @@ package org.jboss.tools.flow.jpdl4.model; -import org.jboss.tools.flow.common.model.DefaultContainer; +import org.jboss.tools.flow.common.model.DefaultElement; -public class Swimlane extends DefaultContainer { +public class Swimlane extends DefaultElement { + } Added: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/model/Timer.java =================================================================== --- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/model/Timer.java (rev 0) +++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/model/Timer.java 2009-04-27 17:33:41 UTC (rev 14941) @@ -0,0 +1,7 @@ +package org.jboss.tools.flow.jpdl4.model; + +import org.jboss.tools.flow.common.model.DefaultElement; + +public class Timer extends DefaultElement { + +} Property changes on: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/model/Timer.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/view/DetailsPage.java =================================================================== --- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/view/DetailsPage.java 2009-04-27 17:32:53 UTC (rev 14940) +++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/view/DetailsPage.java 2009-04-27 17:33:41 UTC (rev 14941) @@ -2,6 +2,7 @@ import org.eclipse.gef.EditPart; import org.eclipse.gef.EditPartViewer; +import org.eclipse.gef.ui.parts.TreeViewer; import org.eclipse.jface.viewers.ISelection; import org.eclipse.jface.viewers.ISelectionChangedListener; import org.eclipse.jface.viewers.IStructuredSelection; @@ -10,14 +11,18 @@ import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Control; import org.eclipse.ui.part.Page; +import org.jboss.tools.flow.jpdl4.editor.JpdlEditor; +import org.jboss.tools.flow.jpdl4.editpart.JpdlTreeEditPartFactory; public class DetailsPage extends Page implements IDetailsPage, ISelectionChangedListener { private EditPartViewer viewer; private Control control; - - public DetailsPage(EditPartViewer viewer) { - this.viewer = viewer; + + public DetailsPage(JpdlEditor jpdlEditor) { + viewer = new TreeViewer(); + viewer.setEditPartFactory(new JpdlTreeEditPartFactory()); + jpdlEditor.getEditDomain().addViewer(viewer); } public Control getControl() { @@ -27,7 +32,7 @@ protected EditPartViewer getViewer() { return viewer; } - + public void addSelectionChangedListener(ISelectionChangedListener listener) { getViewer().addSelectionChangedListener(listener); }