Author: koen.aers(a)jboss.com Date: 2008-12-12 20:33:21 -0500 (Fri, 12 Dec 2008) New Revision: 12583 Added: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/icons/large/ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/icons/large/end_event_empty.png trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/icons/large/end_event_terminate.png trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/icons/large/gateway_exclusive.png trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/icons/large/start_event_empty.png trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/icons/small/ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/icons/small/end_event_empty.png trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/icons/small/end_event_terminate.png trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/icons/small/flow_sequence.png trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/icons/small/gateway_exclusive.png trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/icons/small/gateway_parallel.png trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/icons/small/start_event_empty.png trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/icons/small/task_empty.png trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/figure/EventFigure.java 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/figure/EndEventFigure.java trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/figure/ExclusiveGatewayFigure.java trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/figure/StartEventFigure.java trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/wizard/NewJpdl4FileWizard.java Log: add bpmn figures in palette and graph Added: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/icons/large/end_event_empty.png =================================================================== (Binary files differ) Property changes on: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/icons/large/end_event_empty.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/icons/large/end_event_terminate.png =================================================================== (Binary files differ) Property changes on: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/icons/large/end_event_terminate.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/icons/large/gateway_exclusive.png =================================================================== (Binary files differ) Property changes on: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/icons/large/gateway_exclusive.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/icons/large/start_event_empty.png =================================================================== (Binary files differ) Property changes on: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/icons/large/start_event_empty.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/icons/small/end_event_empty.png =================================================================== (Binary files differ) Property changes on: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/icons/small/end_event_empty.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/icons/small/end_event_terminate.png =================================================================== (Binary files differ) Property changes on: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/icons/small/end_event_terminate.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/icons/small/flow_sequence.png =================================================================== (Binary files differ) Property changes on: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/icons/small/flow_sequence.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/icons/small/gateway_exclusive.png =================================================================== (Binary files differ) Property changes on: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/icons/small/gateway_exclusive.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/icons/small/gateway_parallel.png =================================================================== (Binary files differ) Property changes on: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/icons/small/gateway_parallel.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/icons/small/start_event_empty.png =================================================================== (Binary files differ) Property changes on: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/icons/small/start_event_empty.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/icons/small/task_empty.png =================================================================== (Binary files differ) Property changes on: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/icons/small/task_empty.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream 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/editor/JpdlPaletteFactory.java 2008-12-12 23:07:11 UTC (rev 12582) +++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editor/JpdlPaletteFactory.java 2008-12-13 01:33:21 UTC (rev 12583) @@ -8,7 +8,6 @@ import org.eclipse.gef.palette.PaletteContainer; import org.eclipse.gef.palette.PaletteDrawer; import org.eclipse.gef.palette.PaletteEntry; -import org.eclipse.gef.palette.PaletteRoot; import org.eclipse.gef.palette.ToolEntry; import org.eclipse.jface.resource.ImageDescriptor; import org.jboss.tools.flow.common.editor.PaletteFactory; @@ -17,16 +16,25 @@ public class JpdlPaletteFactory extends PaletteFactory { - protected List<PaletteContainer> createCategories(PaletteRoot root) { - List<PaletteContainer> categories = new ArrayList<PaletteContainer>(); - categories.add(createControlGroup(root)); - categories.add(createEventsDrawer()); - categories.add(createTasksDrawer()); - categories.add(createGatewayDrawer()); - categories.add(createFlowDrawer()); - return categories; +// protected List<PaletteContainer> createCategories(PaletteRoot root) { +// List<PaletteContainer> categories = new ArrayList<PaletteContainer>(); +// categories.add(createControlGroup(root)); +// categories.add(createEventsDrawer()); +// categories.add(createTasksDrawer()); +// categories.add(createGatewayDrawer()); +// categories.add(createFlowDrawer()); +// return categories; +// } + + protected List<PaletteEntry> createComponentEntries() { + ArrayList<PaletteEntry> componentEntries = new ArrayList<PaletteEntry>(); + componentEntries.addAll(createFlowEntries()); + componentEntries.addAll(createEventEntries()); + componentEntries.addAll(createTaskEntries()); + componentEntries.addAll(createGatewayEntries()); + return componentEntries; } - + protected PaletteContainer createEventsDrawer() { PaletteDrawer drawer = new PaletteDrawer("Events", null); List<PaletteEntry> entries = createEventEntries(); @@ -62,8 +70,8 @@ "Create a new Start Event", "org.jboss.tools.flow.jpdl4.startEvent", ElementRegistry.getCreationFactory("org.jboss.tools.flow.jpdl4.startEvent"), - ImageDescriptor.createFromURL(Activator.getDefault().getBundle().getEntry("icons/start.gif")), - ImageDescriptor.createFromURL(Activator.getDefault().getBundle().getEntry("icons/start.gif")) + ImageDescriptor.createFromURL(Activator.getDefault().getBundle().getEntry("icons/small/start_event_empty.png")), + ImageDescriptor.createFromURL(Activator.getDefault().getBundle().getEntry("icons/small/start_event_empty.png")) ); entries.add(combined); combined = new CombinedTemplateCreationEntry( @@ -71,8 +79,8 @@ "Create a new End Event", "org.jboss.tools.flow.jpdl4.endEvent", ElementRegistry.getCreationFactory("org.jboss.tools.flow.jpdl4.endEvent"), - ImageDescriptor.createFromURL(Activator.getDefault().getBundle().getEntry("icons/end.gif")), - ImageDescriptor.createFromURL(Activator.getDefault().getBundle().getEntry("icons/end.gif")) + ImageDescriptor.createFromURL(Activator.getDefault().getBundle().getEntry("icons/small/end_event_terminate.png")), + ImageDescriptor.createFromURL(Activator.getDefault().getBundle().getEntry("icons/small/end_event_terminate.png")) ); entries.add(combined); return entries; @@ -85,8 +93,8 @@ "Create a new Wait State Task", "org.jboss.tools.flow.jpdl4.stateTask", ElementRegistry.getCreationFactory("org.jboss.tools.flow.jpdl4.stateTask"), - ImageDescriptor.createFromURL(Activator.getDefault().getBundle().getEntry("icons/state.gif")), - ImageDescriptor.createFromURL(Activator.getDefault().getBundle().getEntry("icons/state.gif")) + ImageDescriptor.createFromURL(Activator.getDefault().getBundle().getEntry("icons/small/task_empty.png")), + ImageDescriptor.createFromURL(Activator.getDefault().getBundle().getEntry("icons/small/task_empty.png")) ); entries.add(combined); return entries; @@ -99,10 +107,28 @@ "Create a new Exclusive Gateway", "org.jboss.tools.flow.jpdl4.exclusiveGateway", ElementRegistry.getCreationFactory("org.jboss.tools.flow.jpdl4.exclusiveGateway"), - ImageDescriptor.createFromURL(Activator.getDefault().getBundle().getEntry("icons/exclusive.gif")), - ImageDescriptor.createFromURL(Activator.getDefault().getBundle().getEntry("icons/exclusive.gif")) + ImageDescriptor.createFromURL(Activator.getDefault().getBundle().getEntry("icons/small/gateway_exclusive.png")), + ImageDescriptor.createFromURL(Activator.getDefault().getBundle().getEntry("icons/small/gateway_exclusive.png")) ); entries.add(combined); + combined = new CombinedTemplateCreationEntry( + "Parallel Fork", + "Create a new Parallel Fork Gateway", + "org.jboss.tools.flow.jpdl4.parallelForkGateway", + ElementRegistry.getCreationFactory("org.jboss.tools.flow.jpdl4.parallelForkGateway"), + ImageDescriptor.createFromURL(Activator.getDefault().getBundle().getEntry("icons/small/gateway_parallel.png")), + ImageDescriptor.createFromURL(Activator.getDefault().getBundle().getEntry("icons/small/gateway_parallel.png")) + ); + entries.add(combined); + combined = new CombinedTemplateCreationEntry( + "Parallel Join", + "Create a new Parallel Join Gateway", + "org.jboss.tools.flow.jpdl4.parallelJoinGateway", + ElementRegistry.getCreationFactory("org.jboss.tools.flow.jpdl4.parallelJoinGateway"), + ImageDescriptor.createFromURL(Activator.getDefault().getBundle().getEntry("icons/small/gateway_parallel.png")), + ImageDescriptor.createFromURL(Activator.getDefault().getBundle().getEntry("icons/small/gateway_parallel.png")) + ); + entries.add(combined); return entries; } @@ -112,8 +138,8 @@ "Sequence", "Creating a new Sequence Flow", ElementRegistry.getCreationFactory("org.jboss.tools.flow.jpdl4.sequenceFlow"), - ImageDescriptor.createFromURL(Activator.getDefault().getBundle().getEntry("icons/sequence.gif")), - ImageDescriptor.createFromURL(Activator.getDefault().getBundle().getEntry("icons/sequence.gif")) + ImageDescriptor.createFromURL(Activator.getDefault().getBundle().getEntry("icons/small/flow_sequence.png")), + ImageDescriptor.createFromURL(Activator.getDefault().getBundle().getEntry("icons/small/flow_sequence.png")) ); entries.add(tool); return entries; Modified: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/figure/EndEventFigure.java =================================================================== --- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/figure/EndEventFigure.java 2008-12-12 23:07:11 UTC (rev 12582) +++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/figure/EndEventFigure.java 2008-12-13 01:33:21 UTC (rev 12583) @@ -1,12 +1,42 @@ package org.jboss.tools.flow.jpdl4.figure; -import org.jboss.tools.flow.common.figure.EllipseElementFigure; +import org.eclipse.draw2d.LineBorder; +import org.eclipse.draw2d.geometry.Rectangle; +import org.eclipse.jface.resource.ImageDescriptor; +import org.eclipse.swt.graphics.Image; +import org.jboss.tools.flow.common.figure.AbstractElementFigure; +import org.jboss.tools.flow.jpdl4.Activator; -public class EndEventFigure extends EllipseElementFigure { - - protected void customizeFigure() { - super.customizeFigure(); - ellipse.setLineWidth(5); - } - +public class EndEventFigure extends AbstractElementFigure { //EventFigure { + + private static final Image icon = ImageDescriptor.createFromURL( + Activator.getDefault().getBundle().getEntry( + "icons/large/end_event_terminate.png")).createImage(); + + public EndEventFigure() { + setSize(32, 32); + } + + public void setText(String text) { + } + + public void setBounds(Rectangle r) { + r.setSize(32, 32); + super.setBounds(r); + } + + protected void customizeFigure() { + setIcon(icon); + } + + public void setSelected(boolean b) { + super.setSelected(b); + ((LineBorder) getBorder()).setWidth(b ? 3 : 0); + repaint(); + } + // protected void customizeFigure() { + // super.customizeFigure(); + // ellipse.setLineWidth(5); + // } + } Added: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/figure/EventFigure.java =================================================================== --- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/figure/EventFigure.java (rev 0) +++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/figure/EventFigure.java 2008-12-13 01:33:21 UTC (rev 12583) @@ -0,0 +1,7 @@ +package org.jboss.tools.flow.jpdl4.figure; + +import org.jboss.tools.flow.common.figure.EllipseElementFigure; + +public class EventFigure extends EllipseElementFigure { + +} Modified: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/figure/ExclusiveGatewayFigure.java =================================================================== --- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/figure/ExclusiveGatewayFigure.java 2008-12-12 23:07:11 UTC (rev 12582) +++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/figure/ExclusiveGatewayFigure.java 2008-12-13 01:33:21 UTC (rev 12583) @@ -1,7 +1,30 @@ package org.jboss.tools.flow.jpdl4.figure; -import org.jboss.tools.flow.common.figure.DiamondElementFigure; +import org.eclipse.draw2d.geometry.Rectangle; +import org.eclipse.jface.resource.ImageDescriptor; +import org.eclipse.swt.graphics.Image; +import org.jboss.tools.flow.common.figure.AbstractElementFigure; +import org.jboss.tools.flow.jpdl4.Activator; -public class ExclusiveGatewayFigure extends DiamondElementFigure { +public class ExclusiveGatewayFigure extends AbstractElementFigure { //DiamondElementFigure { + private static final Image ICON = ImageDescriptor.createFromURL( + Activator.getDefault().getBundle().getEntry( + "icons/large/gateway_exclusive.png")).createImage(); + + public ExclusiveGatewayFigure() { + setSize(32, 32); + } + + public void setText(String text) { + } + + public void setBounds(Rectangle r) { + r.setSize(32, 32); + super.setBounds(r); + } + + protected void customizeFigure() { + setIcon(ICON); + } } Modified: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/figure/StartEventFigure.java =================================================================== --- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/figure/StartEventFigure.java 2008-12-12 23:07:11 UTC (rev 12582) +++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/figure/StartEventFigure.java 2008-12-13 01:33:21 UTC (rev 12583) @@ -1,7 +1,39 @@ package org.jboss.tools.flow.jpdl4.figure; -import org.jboss.tools.flow.common.figure.EllipseElementFigure; +import org.eclipse.draw2d.LineBorder; +import org.eclipse.draw2d.geometry.Rectangle; +import org.eclipse.jface.resource.ImageDescriptor; +import org.eclipse.swt.graphics.Image; +import org.jboss.tools.flow.common.figure.AbstractElementFigure; +import org.jboss.tools.flow.jpdl4.Activator; -public class StartEventFigure extends EllipseElementFigure { +public class StartEventFigure extends AbstractElementFigure { // EventFigure { + + private static final Image icon = ImageDescriptor.createFromURL( + Activator.getDefault().getBundle().getEntry("icons/large/start_event_empty.png")).createImage();; + + public StartEventFigure() { + setSize(32, 32); + } + + public void setText(String text) { + } + + public void setBounds(Rectangle r) { + r.setSize(32, 32); + super.setBounds(r); + } + + protected void customizeFigure() { + setIcon(icon); + } + + public void setSelected(boolean b) { + super.setSelected(b); + ((LineBorder) getBorder()).setWidth(b ? 3 : 1); + repaint(); + } + } + Modified: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/wizard/NewJpdl4FileWizard.java =================================================================== --- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/wizard/NewJpdl4FileWizard.java 2008-12-12 23:07:11 UTC (rev 12582) +++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/wizard/NewJpdl4FileWizard.java 2008-12-13 01:33:21 UTC (rev 12583) @@ -10,10 +10,8 @@ import org.eclipse.ui.PartInitException; import org.eclipse.ui.PlatformUI; import org.eclipse.ui.ide.IDE; -import org.eclipse.ui.part.FileEditorInput; import org.eclipse.ui.wizards.newresource.BasicNewResourceWizard; import org.jboss.tools.flow.jpdl4.Logger; -import org.jboss.tools.flow.jpdl4.editor.JpdlEditor; public class NewJpdl4FileWizard extends Wizard implements IWorkbenchWizard {