Author: koen.aers(a)jboss.com Date: 2008-12-16 19:26:23 -0500 (Tue, 16 Dec 2008) New Revision: 12631 Added: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/icons/16/ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/icons/16/end_event_cancel.png trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/icons/16/end_event_error.png trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/icons/16/end_event_terminate.png trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/icons/16/flow_sequence.png trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/icons/16/gateway_exclusive.png trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/icons/16/gateway_parallel.png trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/icons/16/start_event_empty.png trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/icons/16/task_empty.png trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/icons/32/ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/icons/32/end_event_cancel.png trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/icons/32/end_event_error.png trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/icons/32/end_event_terminate.png trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/icons/32/flow_sequence.png trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/icons/32/gateway_exclusive.png trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/icons/32/gateway_parallel.png trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/icons/32/start_event_empty.png trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/icons/32/task_empty.png trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/icons/48/ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/icons/48/end_event_cancel.png trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/icons/48/end_event_error.png trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/icons/48/end_event_terminate.png trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/icons/48/flow_sequence.png trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/icons/48/gateway_exclusive.png trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/icons/48/gateway_parallel.png trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/icons/48/start_event_empty.png trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/icons/48/task_empty.png trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/icons/task_empty_110.png trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/figure/GatewayFigure.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/editor/JpdlSerializer.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/EventFigure.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/ParallelGatewayFigure.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/figure/StateTaskFigure.java Log: - short xml notation while saving - new graphics Added: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/icons/16/end_event_cancel.png =================================================================== (Binary files differ) Property changes on: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/icons/16/end_event_cancel.png ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Added: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/icons/16/end_event_error.png =================================================================== (Binary files differ) Property changes on: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/icons/16/end_event_error.png ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Added: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/icons/16/end_event_terminate.png =================================================================== (Binary files differ) Property changes on: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/icons/16/end_event_terminate.png ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Added: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/icons/16/flow_sequence.png =================================================================== (Binary files differ) Property changes on: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/icons/16/flow_sequence.png ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Added: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/icons/16/gateway_exclusive.png =================================================================== (Binary files differ) Property changes on: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/icons/16/gateway_exclusive.png ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Added: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/icons/16/gateway_parallel.png =================================================================== (Binary files differ) Property changes on: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/icons/16/gateway_parallel.png ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Added: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/icons/16/start_event_empty.png =================================================================== (Binary files differ) Property changes on: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/icons/16/start_event_empty.png ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Added: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/icons/16/task_empty.png =================================================================== (Binary files differ) Property changes on: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/icons/16/task_empty.png ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Added: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/icons/32/end_event_cancel.png =================================================================== (Binary files differ) Property changes on: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/icons/32/end_event_cancel.png ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Added: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/icons/32/end_event_error.png =================================================================== (Binary files differ) Property changes on: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/icons/32/end_event_error.png ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Added: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/icons/32/end_event_terminate.png =================================================================== (Binary files differ) Property changes on: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/icons/32/end_event_terminate.png ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Added: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/icons/32/flow_sequence.png =================================================================== (Binary files differ) Property changes on: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/icons/32/flow_sequence.png ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Added: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/icons/32/gateway_exclusive.png =================================================================== (Binary files differ) Property changes on: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/icons/32/gateway_exclusive.png ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Added: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/icons/32/gateway_parallel.png =================================================================== (Binary files differ) Property changes on: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/icons/32/gateway_parallel.png ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Added: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/icons/32/start_event_empty.png =================================================================== (Binary files differ) Property changes on: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/icons/32/start_event_empty.png ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Added: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/icons/32/task_empty.png =================================================================== (Binary files differ) Property changes on: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/icons/32/task_empty.png ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Added: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/icons/48/end_event_cancel.png =================================================================== (Binary files differ) Property changes on: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/icons/48/end_event_cancel.png ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Added: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/icons/48/end_event_error.png =================================================================== (Binary files differ) Property changes on: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/icons/48/end_event_error.png ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Added: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/icons/48/end_event_terminate.png =================================================================== (Binary files differ) Property changes on: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/icons/48/end_event_terminate.png ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Added: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/icons/48/flow_sequence.png =================================================================== (Binary files differ) Property changes on: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/icons/48/flow_sequence.png ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Added: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/icons/48/gateway_exclusive.png =================================================================== (Binary files differ) Property changes on: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/icons/48/gateway_exclusive.png ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Added: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/icons/48/gateway_parallel.png =================================================================== (Binary files differ) Property changes on: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/icons/48/gateway_parallel.png ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Added: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/icons/48/start_event_empty.png =================================================================== (Binary files differ) Property changes on: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/icons/48/start_event_empty.png ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Added: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/icons/48/task_empty.png =================================================================== (Binary files differ) Property changes on: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/icons/48/task_empty.png ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Added: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/icons/task_empty_110.png =================================================================== (Binary files differ) Property changes on: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/icons/task_empty_110.png ___________________________________________________________________ Name: svn:executable + * 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-17 00:25:15 UTC (rev 12630) +++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editor/JpdlPaletteFactory.java 2008-12-17 00:26:23 UTC (rev 12631) @@ -70,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/small/start_event_empty.png")), - ImageDescriptor.createFromURL(Activator.getDefault().getBundle().getEntry("icons/small/start_event_empty.png")) + ImageDescriptor.createFromURL(Activator.getDefault().getBundle().getEntry("icons/16/start_event_empty.png")), + ImageDescriptor.createFromURL(Activator.getDefault().getBundle().getEntry("icons/32/start_event_empty.png")) ); entries.add(combined); combined = new CombinedTemplateCreationEntry( @@ -79,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/small/end_event_terminate.png")), - ImageDescriptor.createFromURL(Activator.getDefault().getBundle().getEntry("icons/small/end_event_terminate.png")) + ImageDescriptor.createFromURL(Activator.getDefault().getBundle().getEntry("icons/16/end_event_terminate.png")), + ImageDescriptor.createFromURL(Activator.getDefault().getBundle().getEntry("icons/32/end_event_terminate.png")) ); entries.add(combined); return entries; @@ -93,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/small/task_empty.png")), - ImageDescriptor.createFromURL(Activator.getDefault().getBundle().getEntry("icons/small/task_empty.png")) + ImageDescriptor.createFromURL(Activator.getDefault().getBundle().getEntry("icons/16/task_empty.png")), + ImageDescriptor.createFromURL(Activator.getDefault().getBundle().getEntry("icons/32/task_empty.png")) ); entries.add(combined); return entries; @@ -107,8 +107,8 @@ "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/small/gateway_exclusive.png")), - ImageDescriptor.createFromURL(Activator.getDefault().getBundle().getEntry("icons/small/gateway_exclusive.png")) + ImageDescriptor.createFromURL(Activator.getDefault().getBundle().getEntry("icons/16/gateway_exclusive.png")), + ImageDescriptor.createFromURL(Activator.getDefault().getBundle().getEntry("icons/32/gateway_exclusive.png")) ); entries.add(combined); combined = new CombinedTemplateCreationEntry( @@ -116,8 +116,8 @@ "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")) + ImageDescriptor.createFromURL(Activator.getDefault().getBundle().getEntry("icons/16/gateway_parallel.png")), + ImageDescriptor.createFromURL(Activator.getDefault().getBundle().getEntry("icons/32/gateway_parallel.png")) ); entries.add(combined); combined = new CombinedTemplateCreationEntry( @@ -125,8 +125,8 @@ "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")) + ImageDescriptor.createFromURL(Activator.getDefault().getBundle().getEntry("icons/16/gateway_parallel.png")), + ImageDescriptor.createFromURL(Activator.getDefault().getBundle().getEntry("icons/32/gateway_parallel.png")) ); entries.add(combined); return entries; @@ -138,8 +138,8 @@ "Sequence", "Creating a new Sequence Flow", ElementRegistry.getCreationFactory("org.jboss.tools.flow.jpdl4.sequenceFlow"), - ImageDescriptor.createFromURL(Activator.getDefault().getBundle().getEntry("icons/small/flow_sequence.png")), - ImageDescriptor.createFromURL(Activator.getDefault().getBundle().getEntry("icons/small/flow_sequence.png")) + ImageDescriptor.createFromURL(Activator.getDefault().getBundle().getEntry("icons/16/flow_sequence.png")), + ImageDescriptor.createFromURL(Activator.getDefault().getBundle().getEntry("icons/32/flow_sequence.png")) ); entries.add(tool); return entries; Modified: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editor/JpdlSerializer.java =================================================================== --- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editor/JpdlSerializer.java 2008-12-17 00:25:15 UTC (rev 12630) +++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editor/JpdlSerializer.java 2008-12-17 00:26:23 UTC (rev 12631) @@ -18,10 +18,10 @@ import org.jboss.tools.flow.jpdl4.model.ParallelForkGateway; import org.jboss.tools.flow.jpdl4.model.ParallelJoinGateway; import org.jboss.tools.flow.jpdl4.model.Process; +import org.jboss.tools.flow.jpdl4.model.SequenceFlow; import org.jboss.tools.flow.jpdl4.model.StartEvent; import org.jboss.tools.flow.jpdl4.model.StateTask; import org.jboss.tools.flow.jpdl4.model.SuperState; -import org.jboss.tools.flow.jpdl4.model.SequenceFlow; public class JpdlSerializer { @@ -38,8 +38,15 @@ Object object = wrapper.getElement(); if (!(object instanceof Element)) return; appendOpening(buffer, wrapper, level); - appendBody(buffer, wrapper, level); - appendClosing(buffer, wrapper, level); + StringBuffer body = new StringBuffer(); + appendBody(body, wrapper, level); + if (body.length() > 0) { + buffer.append(">"); + buffer.append(body); + appendClosing(buffer, wrapper, level); + } else { + buffer.append("/>"); + } } private static void appendOpening(StringBuffer buffer, Wrapper wrapper, int level) { @@ -56,90 +63,82 @@ buffer.append("to=\"" + value + "\""); } appendConnectionGraphics(buffer, (ConnectionWrapper)wrapper); - buffer.append(">"); } else if (element instanceof EndEvent) { EndEvent endState = (EndEvent)element; buffer.append("\n"); appendPadding(buffer, level); buffer.append("<end"); - if (endState.getName() != null) { + if (!isEmpty(endState.getName())) { buffer.append(" "); String value = endState.getName(); buffer.append("name=\"" + value + "\""); } appendNodeGraphics(buffer, (NodeWrapper)wrapper); - buffer.append(">"); } else if (element instanceof StartEvent) { StartEvent startState = (StartEvent)element; buffer.append("\n"); appendPadding(buffer, level); buffer.append("<start"); - if (startState.getName() != null) { + if (!isEmpty(startState.getName())) { buffer.append(" "); String value = startState.getName(); buffer.append("name=\"" + value + "\""); } appendNodeGraphics(buffer, (NodeWrapper)wrapper); - buffer.append(">"); } else if (element instanceof SuperState) { SuperState superState = (SuperState)element; buffer.append("\n"); appendPadding(buffer, level); buffer.append("<super-state"); - if (superState.getName() != null) { + if (!isEmpty(superState.getName())) { buffer.append(" "); String value = superState.getName(); buffer.append("name=\"" + value + "\""); } - buffer.append(">"); } else if (element instanceof StateTask) { StateTask state = (StateTask)element; buffer.append("\n"); appendPadding(buffer, level); buffer.append("<state"); - if (state.getName() != null) { + if (!isEmpty(state.getName())) { buffer.append(" "); String value = state.getName(); buffer.append("name=\"" + value + "\""); } appendNodeGraphics(buffer, (NodeWrapper)wrapper); - buffer.append(">"); } else if (element instanceof ExclusiveGateway) { ExclusiveGateway exclusiveGateway = (ExclusiveGateway)element; buffer.append("\n"); appendPadding(buffer, level); buffer.append("<exclusive"); - if (exclusiveGateway.getName() != null) { + if (!isEmpty(exclusiveGateway.getName())) { buffer.append(" "); String value = exclusiveGateway.getName(); buffer.append("name=\"" + value + "\""); } appendNodeGraphics(buffer, (NodeWrapper)wrapper); - buffer.append(">"); } else if (element instanceof ParallelForkGateway) { ParallelForkGateway parallelForkGateway = (ParallelForkGateway)element; buffer.append("\n"); appendPadding(buffer, level); buffer.append("<fork"); - if (parallelForkGateway.getName() != null) { + if (!isEmpty(parallelForkGateway.getName())) { buffer.append(" "); String value = parallelForkGateway.getName(); buffer.append("name=\"" + value + "\""); } appendNodeGraphics(buffer, (NodeWrapper)wrapper); - buffer.append(">"); } else if (element instanceof ParallelJoinGateway) { ParallelJoinGateway parallelJoinGateway = (ParallelJoinGateway)element; buffer.append("\n"); appendPadding(buffer, level); buffer.append("<join"); - if (parallelJoinGateway.getName() != null) { + if (!isEmpty(parallelJoinGateway.getName())) { buffer.append(" "); String value = parallelJoinGateway.getName(); buffer.append("name=\"" + value + "\""); } appendNodeGraphics(buffer, (NodeWrapper)wrapper); - buffer.append(">"); } else if (element instanceof Process) { Process process = (Process)element; buffer.append("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n\n"); @@ -151,16 +150,19 @@ value = value == null ? "" : value; buffer.append("initial=\"" + value + "\""); } - if (process.getName() != null) { + if (!isEmpty(process.getName())) { buffer.append(" "); String value = process.getName(); buffer.append("name=\"" + value + "\""); } - buffer.append(">"); } } + private static boolean isEmpty(String str) { + return str == null || "".equals(str); + } + private static void appendPadding(StringBuffer buffer, int level) { for (int i = 0; i < level; i++) { buffer.append(" "); 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-17 00:25:15 UTC (rev 12630) +++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/figure/EndEventFigure.java 2008-12-17 00:26:23 UTC (rev 12631) @@ -1,42 +1,17 @@ package org.jboss.tools.flow.jpdl4.figure; -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 AbstractElementFigure { //EventFigure { +public class EndEventFigure extends EventFigure { //EventFigure { private static final Image icon = ImageDescriptor.createFromURL( Activator.getDefault().getBundle().getEntry( - "icons/large/end_event_terminate.png")).createImage(); + "icons/48/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); - // } - } Modified: 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 2008-12-17 00:25:15 UTC (rev 12630) +++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/figure/EventFigure.java 2008-12-17 00:26:23 UTC (rev 12631) @@ -1,7 +1,30 @@ package org.jboss.tools.flow.jpdl4.figure; -import org.jboss.tools.flow.common.figure.EllipseElementFigure; +import org.eclipse.draw2d.ConnectionAnchor; +import org.eclipse.draw2d.EllipseAnchor; +import org.eclipse.draw2d.geometry.Rectangle; +import org.jboss.tools.flow.common.figure.AbstractElementFigure; -public class EventFigure extends EllipseElementFigure { +public abstract class EventFigure extends AbstractElementFigure { + public EventFigure() { + setSize(48, 48); + } + + public void setText(String text) { + } + + public void setBounds(Rectangle r) { + r.setSize(48, 48); + super.setBounds(r); + } + + public ConnectionAnchor getSourceConnectionAnchor() { + return new EllipseAnchor(this); + } + + public ConnectionAnchor getTargetConnectionAnchor() { + return new EllipseAnchor(this); + } + } 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-17 00:25:15 UTC (rev 12630) +++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/figure/ExclusiveGatewayFigure.java 2008-12-17 00:26:23 UTC (rev 12631) @@ -1,29 +1,15 @@ package org.jboss.tools.flow.jpdl4.figure; -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 AbstractElementFigure { //DiamondElementFigure { +public class ExclusiveGatewayFigure extends GatewayFigure { //DiamondElementFigure { private static final Image ICON = ImageDescriptor.createFromURL( Activator.getDefault().getBundle().getEntry( - "icons/large/gateway_exclusive.png")).createImage(); + "icons/48/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); } Added: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/figure/GatewayFigure.java =================================================================== --- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/figure/GatewayFigure.java (rev 0) +++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/figure/GatewayFigure.java 2008-12-17 00:26:23 UTC (rev 12631) @@ -0,0 +1,30 @@ +package org.jboss.tools.flow.jpdl4.figure; + +import org.eclipse.draw2d.ConnectionAnchor; +import org.eclipse.draw2d.geometry.Rectangle; +import org.jboss.tools.flow.common.figure.AbstractElementFigure; +import org.jboss.tools.flow.common.figure.DiamondAnchor; + +public abstract class GatewayFigure extends AbstractElementFigure { //DiamondElementFigure { + + public GatewayFigure() { + setSize(48, 48); + } + + public void setText(String text) { + } + + public void setBounds(Rectangle r) { + r.setSize(48, 48); + super.setBounds(r); + } + + public ConnectionAnchor getSourceConnectionAnchor() { + return new DiamondAnchor(this); + } + + public ConnectionAnchor getTargetConnectionAnchor() { + return new DiamondAnchor(this); + } + +} Modified: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/figure/ParallelGatewayFigure.java =================================================================== --- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/figure/ParallelGatewayFigure.java 2008-12-17 00:25:15 UTC (rev 12630) +++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/figure/ParallelGatewayFigure.java 2008-12-17 00:26:23 UTC (rev 12631) @@ -1,30 +1,17 @@ package org.jboss.tools.flow.jpdl4.figure; -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 ParallelGatewayFigure extends AbstractElementFigure { //DiamondElementFigure { +public class ParallelGatewayFigure extends GatewayFigure { //DiamondElementFigure { private static final Image ICON = ImageDescriptor.createFromURL( Activator.getDefault().getBundle().getEntry( - "icons/large/gateway_parallel.png")).createImage(); + "icons/48/gateway_parallel.png")).createImage(); - public ParallelGatewayFigure() { - 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-17 00:25:15 UTC (rev 12630) +++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/figure/StartEventFigure.java 2008-12-17 00:26:23 UTC (rev 12631) @@ -1,39 +1,18 @@ package org.jboss.tools.flow.jpdl4.figure; -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 AbstractElementFigure { // EventFigure { +public class StartEventFigure extends EventFigure { // EventFigure { private static final Image icon = ImageDescriptor.createFromURL( - Activator.getDefault().getBundle().getEntry("icons/large/start_event_empty.png")).createImage();; + Activator.getDefault().getBundle().getEntry("icons/48/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() { + 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/figure/StateTaskFigure.java =================================================================== --- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/figure/StateTaskFigure.java 2008-12-17 00:25:15 UTC (rev 12630) +++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/figure/StateTaskFigure.java 2008-12-17 00:26:23 UTC (rev 12631) @@ -1,7 +1,29 @@ package org.jboss.tools.flow.jpdl4.figure; +import org.eclipse.draw2d.ColorConstants; +import org.eclipse.draw2d.Graphics; +import org.eclipse.swt.graphics.Color; import org.jboss.tools.flow.common.figure.RoundedRectangleElementFigure; public class StateTaskFigure extends RoundedRectangleElementFigure { - + + private static final Color veryLightBlue = new Color(null, 246, 247, 255); + private static final Color lightBlue = new Color(null, 3, 104, 154); + + protected void paintChildren(Graphics graphics) { + Color foregroundColor = graphics.getForegroundColor(); + Color backgroundColor = graphics.getBackgroundColor(); + graphics.setBackgroundColor(veryLightBlue); + graphics.setForegroundColor(lightBlue); + super.paintChildren(graphics); + graphics.setBackgroundColor(backgroundColor); + graphics.setForegroundColor(foregroundColor); + } + + protected void customizeFigure() { + super.customizeFigure(); + getLabel().setForegroundColor(ColorConstants.darkGray); + rectangle.setLineWidth(2); + } + }