February 2011 - jbosstools-commits

JBoss Tools SVN: r29076 - in trunk/cdi: plugins/org.jboss.tools.cdi.text.ext/META-INF and 6 other directories.

by jbosstools-commits＠lists.jboss.org

Author: akazakov Date: 2011-02-09 09:29:58 -0500 (Wed, 09 Feb 2011) New Revision: 29076 Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/META-INF/MANIFEST.MF trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/META-INF/MANIFEST.MF trunk/cdi/plugins/org.jboss.tools.cdi.ui/META-INF/MANIFEST.MF trunk/cdi/plugins/org.jboss.tools.cdi.xml.ui/META-INF/MANIFEST.MF trunk/cdi/plugins/org.jboss.tools.cdi.xml/META-INF/MANIFEST.MF trunk/cdi/tests/org.jboss.tools.cdi.core.test/META-INF/MANIFEST.MF trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/META-INF/MANIFEST.MF trunk/cdi/tests/org.jboss.tools.cdi.ui.test/META-INF/MANIFEST.MF Log: https://issues.jboss.org/browse/JBIDE-8366 Changed the execution environment to JavaSE-1.6 Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/META-INF/MANIFEST.MF =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.core/META-INF/MANIFEST.MF 2011-02-09 09:47:12 UTC (rev 29075) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/META-INF/MANIFEST.MF 2011-02-09 14:29:58 UTC (rev 29076) @@ -25,7 +25,7 @@ org.eclipse.jdt.ui, org.apache.ant Bundle-ActivationPolicy: lazy -Bundle-RequiredExecutionEnvironment: J2SE-1.5 +Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Bundle-Vendor: JBoss by Red Hat Export-Package: org.jboss.tools.cdi.core, org.jboss.tools.cdi.core.preferences, Modified: trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/META-INF/MANIFEST.MF =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/META-INF/MANIFEST.MF 2011-02-09 09:47:12 UTC (rev 29075) +++ trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/META-INF/MANIFEST.MF 2011-02-09 14:29:58 UTC (rev 29076) @@ -21,4 +21,4 @@ org.jboss.tools.common.el.core;bundle-version="2.0.0", org.jboss.tools.common.model;bundle-version="2.0.0" Bundle-Version: 1.1.0.qualifier -Bundle-RequiredExecutionEnvironment: J2SE-1.5 +Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/META-INF/MANIFEST.MF =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.ui/META-INF/MANIFEST.MF 2011-02-09 09:47:12 UTC (rev 29075) +++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/META-INF/MANIFEST.MF 2011-02-09 14:29:58 UTC (rev 29076) @@ -31,7 +31,7 @@ org.jboss.tools.jst.jsp, org.eclipse.wst.common.project.facet.ui Bundle-ActivationPolicy: lazy -Bundle-RequiredExecutionEnvironment: J2SE-1.5 +Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Bundle-Vendor: %Bundle-Vendor.0 Export-Package: org.jboss.tools.cdi.ui, org.jboss.tools.cdi.ui.ca, Modified: trunk/cdi/plugins/org.jboss.tools.cdi.xml/META-INF/MANIFEST.MF =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.xml/META-INF/MANIFEST.MF 2011-02-09 09:47:12 UTC (rev 29075) +++ trunk/cdi/plugins/org.jboss.tools.cdi.xml/META-INF/MANIFEST.MF 2011-02-09 14:29:58 UTC (rev 29076) @@ -27,4 +27,4 @@ org.eclipse.core.runtime, org.eclipse.wst.web Bundle-Version: 1.0.0.qualifier -Bundle-RequiredExecutionEnvironment: J2SE-1.5 +Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Modified: trunk/cdi/plugins/org.jboss.tools.cdi.xml.ui/META-INF/MANIFEST.MF =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.xml.ui/META-INF/MANIFEST.MF 2011-02-09 09:47:12 UTC (rev 29075) +++ trunk/cdi/plugins/org.jboss.tools.cdi.xml.ui/META-INF/MANIFEST.MF 2011-02-09 14:29:58 UTC (rev 29076) @@ -33,4 +33,4 @@ org.jboss.tools.cdi.xml, org.jboss.tools.cdi.ui Bundle-Version: 1.0.0.qualifier -Bundle-RequiredExecutionEnvironment: J2SE-1.5 +Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/META-INF/MANIFEST.MF =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.core.test/META-INF/MANIFEST.MF 2011-02-09 09:47:12 UTC (rev 29075) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/META-INF/MANIFEST.MF 2011-02-09 14:29:58 UTC (rev 29076) @@ -4,7 +4,7 @@ Bundle-SymbolicName: org.jboss.tools.cdi.core.test Bundle-Version: 1.1.0.qualifier Bundle-Vendor: JBoss by Red Hat -Bundle-RequiredExecutionEnvironment: J2SE-1.5 +Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Require-Bundle: org.jboss.tools.tests, org.eclipse.core.runtime, org.eclipse.core.resources, Modified: trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/META-INF/MANIFEST.MF =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/META-INF/MANIFEST.MF 2011-02-09 09:47:12 UTC (rev 29075) +++ trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/META-INF/MANIFEST.MF 2011-02-09 14:29:58 UTC (rev 29076) @@ -20,5 +20,5 @@ Bundle-Vendor: %Bundle-Vendor.0 Export-Package: org.jboss.tools.cdi.text.ext.test Bundle-Localization: plugin -Bundle-RequiredExecutionEnvironment: J2SE-1.5 +Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Modified: trunk/cdi/tests/org.jboss.tools.cdi.ui.test/META-INF/MANIFEST.MF =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.ui.test/META-INF/MANIFEST.MF 2011-02-09 09:47:12 UTC (rev 29075) +++ trunk/cdi/tests/org.jboss.tools.cdi.ui.test/META-INF/MANIFEST.MF 2011-02-09 14:29:58 UTC (rev 29076) @@ -4,7 +4,7 @@ Bundle-SymbolicName: org.jboss.tools.cdi.ui.test Bundle-Version: 1.1.0.qualifier Bundle-Vendor: JBoss by Red Hat -Bundle-RequiredExecutionEnvironment: J2SE-1.5 +Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Require-Bundle: org.junit, org.jboss.tools.tests, org.jboss.tools.cdi.core.test,

13 years, 11 months

1
0
0 / 0

JBoss Tools SVN: r29075 - trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram.

by jbosstools-commits＠lists.jboss.org

Author: koen.aers(a)jboss.com Date: 2011-02-09 04:47:12 -0500 (Wed, 09 Feb 2011) New Revision: 29075 Removed: trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/test/ Log: cleanup

13 years, 11 months

1
0
0 / 0

JBoss Tools SVN: r29074 - in trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram: .settings and 12 other directories.

by jbosstools-commits＠lists.jboss.org

Author: koen.aers(a)jboss.com Date: 2011-02-09 04:46:27 -0500 (Wed, 09 Feb 2011) New Revision: 29074 Added: trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/.settings/ trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/.settings/org.eclipse.gmf.bridge.ui.dashboard.prefs trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/icons/obj16/activity_16px_subprocess.png trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/icons/obj16/events_16px_end_message.png trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/icons/obj16/events_16px_end_none.png trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/icons/obj16/events_16px_end_terminate.png trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/icons/obj16/events_16px_intermediate_error_catch.png trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/icons/obj16/events_16px_intermediate_message_catch.png trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/icons/obj16/events_16px_intermediate_message_throw.png trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/icons/obj16/events_16px_intermediate_timer_catch.png trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/icons/obj16/events_16px_start_message.png trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/icons/obj16/events_16px_start_none.png trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/icons/obj16/gateways_16px_exclusive.png trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/icons/obj16/gateways_16px_parallel.png trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/icons/obj16/tasks_16px_script.png trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/icons/obj16/tasks_16px_service.png trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/icons/obj16/tasks_16px_user.png trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/icons/obj32/ trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/icons/obj32/activity_32px_subprocess.png trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/icons/obj32/events_32px_end_message.png trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/icons/obj32/events_32px_end_none.png trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/icons/obj32/events_32px_end_terminate.png trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/icons/obj32/events_32px_intermediate_error_catch.png trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/icons/obj32/events_32px_intermediate_message_catch.png trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/icons/obj32/events_32px_intermediate_message_throw.png trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/icons/obj32/events_32px_intermediate_timer_catch.png trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/icons/obj32/events_32px_start_message.png trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/icons/obj32/events_32px_start_none.png trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/icons/obj32/gateways_32px_exclusive.png trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/icons/obj32/gateways_32px_parallel.png trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/icons/obj32/tasks_32px_script.png trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/icons/obj32/tasks_32px_service.png trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/icons/obj32/tasks_32px_user.png trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/images/ trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/images/events_48px_end_message.svg trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/images/events_48px_end_none.svg trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/images/events_48px_end_terminate.svg trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/images/events_48px_intermediate_error_catch.svg trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/images/events_48px_intermediate_message_catch.svg trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/images/events_48px_intermediate_message_throw.svg trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/images/events_48px_intermediate_timer_catch.svg trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/images/events_48px_start_message.svg trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/images/events_48px_start_none.svg trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/images/gateways_48px_exclusive.svg trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/images/gateways_48px_parallel.svg trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/part/Bpmn2ProcessDiagramEditorPlugin.java trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/test/ Modified: trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/.options trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/META-INF/MANIFEST.MF trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/plugin.properties trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/plugin.xml trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/edit/parts/AssociationEditPart.java trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/edit/parts/DataObject2EditPart.java trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/edit/parts/DataObjectEditPart.java trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/edit/parts/EndEvent2EditPart.java trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/edit/parts/EndEvent3EditPart.java trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/edit/parts/EndEvent4EditPart.java trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/edit/parts/EndEvent5EditPart.java trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/edit/parts/EndEvent6EditPart.java trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/edit/parts/EndEventEditPart.java trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/edit/parts/ExclusiveGateway2EditPart.java trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/edit/parts/ExclusiveGatewayEditPart.java trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/edit/parts/IntermediateCatchEvent2EditPart.java trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/edit/parts/IntermediateCatchEvent3EditPart.java trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/edit/parts/IntermediateCatchEvent4EditPart.java trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/edit/parts/IntermediateCatchEvent5EditPart.java trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/edit/parts/IntermediateCatchEventEditPart.java trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/edit/parts/IntermediateThrowEvent2EditPart.java trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/edit/parts/IntermediateThrowEventEditPart.java trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/edit/parts/ParallelGateway2EditPart.java trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/edit/parts/ParallelGatewayEditPart.java trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/edit/parts/ScriptTask2EditPart.java trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/edit/parts/ScriptTaskEditPart.java trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/edit/parts/ServiceTask2EditPart.java trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/edit/parts/ServiceTaskEditPart.java trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/edit/parts/StartEvent2EditPart.java trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/edit/parts/StartEvent3EditPart.java trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/edit/parts/StartEvent4EditPart.java trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/edit/parts/StartEventEditPart.java trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/edit/parts/SubProcess2EditPart.java trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/edit/parts/SubProcessEditPart.java trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/edit/parts/TextAnnotation2EditPart.java trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/edit/parts/TextAnnotationEditPart.java trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/edit/parts/UserTask2EditPart.java trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/edit/parts/UserTaskEditPart.java trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/edit/policies/Bpmn2BaseItemSemanticEditPolicy.java trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/navigator/Bpmn2AbstractNavigatorItem.java trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/navigator/Bpmn2DomainNavigatorContentProvider.java trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/navigator/Bpmn2DomainNavigatorLabelProvider.java trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/navigator/Bpmn2NavigatorActionProvider.java trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/navigator/Bpmn2NavigatorContentProvider.java trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/navigator/Bpmn2NavigatorLabelProvider.java trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/navigator/Bpmn2NavigatorLinkHelper.java trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/parsers/AbstractParser.java trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/parsers/MessageFormatParser.java trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/part/Bpmn2CreationWizard.java trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/part/Bpmn2DiagramEditor.java trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/part/Bpmn2DiagramEditorUtil.java trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/part/Bpmn2DocumentProvider.java trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/part/Bpmn2InitDiagramFileAction.java trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/part/Bpmn2NewDiagramFileWizard.java trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/part/Bpmn2PaletteFactory.java trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/part/Bpmn2VisualIDRegistry.java trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/part/DiagramEditorContextMenuProvider.java trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/part/ModelElementSelectionPage.java trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/preferences/DiagramAppearancePreferencePage.java trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/preferences/DiagramConnectionsPreferencePage.java trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/preferences/DiagramGeneralPreferencePage.java trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/preferences/DiagramPreferenceInitializer.java trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/preferences/DiagramPrintingPreferencePage.java trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/preferences/DiagramRulersAndGridPreferencePage.java trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/providers/Bpmn2ElementTypes.java trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/providers/Bpmn2ModelingAssistantProvider.java trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/providers/Bpmn2ViewProvider.java trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/providers/ElementInitializers.java Log: james' icons Modified: trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/.options =================================================================== --- trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/.options 2011-02-09 09:42:57 UTC (rev 29073) +++ trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/.options 2011-02-09 09:46:27 UTC (rev 29074) @@ -1,7 +1,7 @@ -# Tracing options for the org.eclipse.bpmn2.diagram plug-in +# Tracing options for the org.jboss.tools.bpmn2.process.diagram plug-in # Common issues -org.eclipse.bpmn2.diagram/debug=false +org.jboss.tools.bpmn2.process.diagram/debug=false # Visual IDs -org.eclipse.bpmn2.diagram/debug/visualID=false +org.jboss.tools.bpmn2.process.diagram/debug/visualID=false Added: trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/.settings/org.eclipse.gmf.bridge.ui.dashboard.prefs =================================================================== --- trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/.settings/org.eclipse.gmf.bridge.ui.dashboard.prefs (rev 0) +++ trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/.settings/org.eclipse.gmf.bridge.ui.dashboard.prefs 2011-02-09 09:46:27 UTC (rev 29074) @@ -0,0 +1,8 @@ +#Sun Jan 23 19:01:17 CET 2011 +eclipse.preferences.version=1 +gmf_dashboard/domainGenerationModel=platform\:/resource/org.eclipse.bpmn2/model/BPMN20.genmodel +gmf_dashboard/domainModel=platform\:/resource/org.eclipse.bpmn2/model/BPMN20.ecore +gmf_dashboard/generationModel=platform\:/resource/org.jboss.tools.bpmn2.model/model/bpmn.process.gmfgen +gmf_dashboard/graphicalDefinitionModel=platform\:/resource/org.jboss.tools.bpmn2.model/model/bpmn.gmfgraph +gmf_dashboard/mappingModel=platform\:/resource/org.jboss.tools.bpmn2.model/model/bpmn.process.gmfmap +gmf_dashboard/toolingDefinitionModel=platform\:/resource/org.jboss.tools.bpmn2.model/model/bpmn.process.gmftool Property changes on: trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/.settings/org.eclipse.gmf.bridge.ui.dashboard.prefs ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/META-INF/MANIFEST.MF =================================================================== --- trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/META-INF/MANIFEST.MF 2011-02-09 09:42:57 UTC (rev 29073) +++ trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/META-INF/MANIFEST.MF 2011-02-09 09:46:27 UTC (rev 29074) @@ -1,10 +1,10 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName -Bundle-SymbolicName: org.jboss.tools.bpmn2.process.diagram;singleton:=true +Bundle-SymbolicName: org.jboss.tools.bpmn2.process.diagram; singleton:=true Bundle-Version: 1.0.0.qualifier Bundle-ClassPath: . -Bundle-Activator: org.jboss.tools.bpmn2.process.diagram.part.Bpmn2DiagramEditorPlugin +Bundle-Activator: org.jboss.tools.bpmn2.process.diagram.part.Bpmn2ProcessDiagramEditorPlugin Bundle-Vendor: %providerName Bundle-Localization: plugin Export-Package: org.jboss.tools.bpmn2.process.diagram.edit.parts, @@ -37,6 +37,7 @@ org.eclipse.bpmn2.edit;visibility:=reexport, org.eclipse.gef;visibility:=reexport, org.eclipse.jdt.ui;bundle-version="[3.6.0,4.0.0)", - org.eclipse.ocl.ecore;visibility:=reexport + org.eclipse.ocl.ecore;visibility:=reexport, + org.eclipse.gmf.runtime.lite.svg;bundle-version="1.0.0" Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: J2SE-1.5 Added: trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/icons/obj16/activity_16px_subprocess.png =================================================================== (Binary files differ) Property changes on: trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/icons/obj16/activity_16px_subprocess.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/icons/obj16/events_16px_end_message.png =================================================================== (Binary files differ) Property changes on: trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/icons/obj16/events_16px_end_message.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/icons/obj16/events_16px_end_none.png =================================================================== (Binary files differ) Property changes on: trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/icons/obj16/events_16px_end_none.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/icons/obj16/events_16px_end_terminate.png =================================================================== (Binary files differ) Property changes on: trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/icons/obj16/events_16px_end_terminate.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/icons/obj16/events_16px_intermediate_error_catch.png =================================================================== (Binary files differ) Property changes on: trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/icons/obj16/events_16px_intermediate_error_catch.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/icons/obj16/events_16px_intermediate_message_catch.png =================================================================== (Binary files differ) Property changes on: trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/icons/obj16/events_16px_intermediate_message_catch.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/icons/obj16/events_16px_intermediate_message_throw.png =================================================================== (Binary files differ) Property changes on: trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/icons/obj16/events_16px_intermediate_message_throw.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/icons/obj16/events_16px_intermediate_timer_catch.png =================================================================== (Binary files differ) Property changes on: trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/icons/obj16/events_16px_intermediate_timer_catch.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/icons/obj16/events_16px_start_message.png =================================================================== (Binary files differ) Property changes on: trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/icons/obj16/events_16px_start_message.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/icons/obj16/events_16px_start_none.png =================================================================== (Binary files differ) Property changes on: trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/icons/obj16/events_16px_start_none.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/icons/obj16/gateways_16px_exclusive.png =================================================================== (Binary files differ) Property changes on: trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/icons/obj16/gateways_16px_exclusive.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/icons/obj16/gateways_16px_parallel.png =================================================================== (Binary files differ) Property changes on: trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/icons/obj16/gateways_16px_parallel.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/icons/obj16/tasks_16px_script.png =================================================================== (Binary files differ) Property changes on: trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/icons/obj16/tasks_16px_script.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/icons/obj16/tasks_16px_service.png =================================================================== (Binary files differ) Property changes on: trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/icons/obj16/tasks_16px_service.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/icons/obj16/tasks_16px_user.png =================================================================== (Binary files differ) Property changes on: trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/icons/obj16/tasks_16px_user.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/icons/obj32/activity_32px_subprocess.png =================================================================== (Binary files differ) Property changes on: trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/icons/obj32/activity_32px_subprocess.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/icons/obj32/events_32px_end_message.png =================================================================== (Binary files differ) Property changes on: trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/icons/obj32/events_32px_end_message.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/icons/obj32/events_32px_end_none.png =================================================================== (Binary files differ) Property changes on: trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/icons/obj32/events_32px_end_none.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/icons/obj32/events_32px_end_terminate.png =================================================================== (Binary files differ) Property changes on: trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/icons/obj32/events_32px_end_terminate.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/icons/obj32/events_32px_intermediate_error_catch.png =================================================================== (Binary files differ) Property changes on: trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/icons/obj32/events_32px_intermediate_error_catch.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/icons/obj32/events_32px_intermediate_message_catch.png =================================================================== (Binary files differ) Property changes on: trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/icons/obj32/events_32px_intermediate_message_catch.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/icons/obj32/events_32px_intermediate_message_throw.png =================================================================== (Binary files differ) Property changes on: trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/icons/obj32/events_32px_intermediate_message_throw.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/icons/obj32/events_32px_intermediate_timer_catch.png =================================================================== (Binary files differ) Property changes on: trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/icons/obj32/events_32px_intermediate_timer_catch.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/icons/obj32/events_32px_start_message.png =================================================================== (Binary files differ) Property changes on: trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/icons/obj32/events_32px_start_message.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/icons/obj32/events_32px_start_none.png =================================================================== (Binary files differ) Property changes on: trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/icons/obj32/events_32px_start_none.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/icons/obj32/gateways_32px_exclusive.png =================================================================== (Binary files differ) Property changes on: trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/icons/obj32/gateways_32px_exclusive.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/icons/obj32/gateways_32px_parallel.png =================================================================== (Binary files differ) Property changes on: trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/icons/obj32/gateways_32px_parallel.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/icons/obj32/tasks_32px_script.png =================================================================== (Binary files differ) Property changes on: trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/icons/obj32/tasks_32px_script.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/icons/obj32/tasks_32px_service.png =================================================================== (Binary files differ) Property changes on: trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/icons/obj32/tasks_32px_service.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/icons/obj32/tasks_32px_user.png =================================================================== (Binary files differ) Property changes on: trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/icons/obj32/tasks_32px_user.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/images/events_48px_end_message.svg =================================================================== --- trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/images/events_48px_end_message.svg (rev 0) +++ trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/images/events_48px_end_message.svg 2011-02-09 09:46:27 UTC (rev 29074) @@ -0,0 +1,62 @@ +<?xml version="1.0" encoding="utf-8"?> + +<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"> +<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="48px" + height="48px" viewBox="0 0 48 48" enable-background="new 0 0 48 48" xml:space="preserve"> +<g id="Gradient_-_Red"> + <linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="23.9468" y1="7.6123" x2="23.9468" y2="39.9299"> + <stop offset="0" style="stop-color:#FDE4E4"/> + <stop offset="0.1136" style="stop-color:#F3D2D2"/> + <stop offset="0.363" style="stop-color:#DFAEAE"/> + <stop offset="0.4969" style="stop-color:#D7A1A1"/> + <stop offset="0.6654" style="stop-color:#E2B4B4"/> + <stop offset="1" style="stop-color:#FDE4E4"/> + </linearGradient> + <circle fill="url(#SVGID_1_)" cx="23.947" cy="23.985" r="18"/> +</g> +<g id="throwing_x2F_end"> + <path fill="#751B28" d="M23.947,1.484c-12.407,0-22.5,10.094-22.5,22.5c0,12.407,10.093,22.5,22.5,22.5 + c12.406,0,22.501-10.094,22.501-22.5C46.448,11.578,36.354,1.484,23.947,1.484z M23.947,41.984c-9.941,0-18-8.061-18-18 + c0-9.941,8.059-18,18-18s18.001,8.059,18.001,18C41.948,33.924,33.889,41.984,23.947,41.984z"/> +</g> +<g id="message"> + <g> + <polygon fill="#751B28" points="35.96,15.01 12.201,15.01 24.068,22.951 "/> + <path fill="#751B28" d="M24.484,24.477c-0.126,0.084-0.271,0.126-0.417,0.126s-0.29-0.043-0.416-0.127l-12.446-8.327v15.769 + c0,0.414,0.335,0.75,0.75,0.75h24.236c0.414,0,0.75-0.336,0.75-0.75V16.159L24.484,24.477z"/> + </g> +</g> +<g id="escalation" display="none"> + <g display="inline"> + <polygon fill="#751B28" points="24.02,20.533 34.724,32.119 24.02,10.957 13.314,32.119 "/> + </g> +</g> +<g id="error" display="none"> + <g display="inline"> + <polygon fill="#751B28" points="12.594,33.18 19.681,16.641 25.83,26.092 33.854,14.278 26.768,31.754 20.631,23.728 "/> + </g> +</g> +<g id="cancel" display="none"> + <g display="inline"> + <polygon fill="#751B28" points="35.567,32.076 27.344,23.849 35.567,15.625 32.239,12.299 24.017,20.523 15.791,12.297 + 12.465,15.625 20.689,23.849 12.466,32.076 15.793,35.4 24.017,27.176 32.239,35.4 "/> + </g> +</g> +<g id="compensation" display="none"> + <g display="inline"> + <polygon fill="#751B28" points="21.817,32.246 11.451,23.699 21.817,15.15 "/> + </g> + <g display="inline"> + <polygon fill="#751B28" points="33.657,32.246 23.291,23.699 33.657,15.15 "/> + </g> +</g> +<g id="signal" display="none"> + <polygon display="inline" fill="#751B28" points="12.328,31.248 23.99,11.051 35.652,31.248 "/> +</g> +<g id="multiple" display="none"> + <polygon display="inline" fill="#751B28" points="16.619,34.127 12.063,20.109 23.989,11.444 35.914,20.109 31.36,34.127 "/> +</g> +<g id="terminate" display="none"> + <circle display="inline" fill="#751B28" cx="23.975" cy="23.969" r="11.156"/> +</g> +</svg> Added: trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/images/events_48px_end_none.svg =================================================================== --- trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/images/events_48px_end_none.svg (rev 0) +++ trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/images/events_48px_end_none.svg 2011-02-09 09:46:27 UTC (rev 29074) @@ -0,0 +1,62 @@ +<?xml version="1.0" encoding="utf-8"?> + +<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"> +<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="48px" + height="48px" viewBox="0 0 48 48" enable-background="new 0 0 48 48" xml:space="preserve"> +<g id="Gradient_-_Red"> + <linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="23.9468" y1="7.6123" x2="23.9468" y2="39.9299"> + <stop offset="0" style="stop-color:#FDE4E4"/> + <stop offset="0.1136" style="stop-color:#F3D2D2"/> + <stop offset="0.363" style="stop-color:#DFAEAE"/> + <stop offset="0.4969" style="stop-color:#D7A1A1"/> + <stop offset="0.6654" style="stop-color:#E2B4B4"/> + <stop offset="1" style="stop-color:#FDE4E4"/> + </linearGradient> + <circle fill="url(#SVGID_1_)" cx="23.947" cy="23.985" r="18"/> +</g> +<g id="throwing_x2F_end"> + <path fill="#751B28" d="M23.947,1.484c-12.407,0-22.5,10.094-22.5,22.5c0,12.407,10.093,22.5,22.5,22.5 + c12.406,0,22.501-10.094,22.501-22.5C46.448,11.578,36.354,1.484,23.947,1.484z M23.947,41.984c-9.941,0-18-8.061-18-18 + c0-9.941,8.059-18,18-18s18.001,8.059,18.001,18C41.948,33.924,33.889,41.984,23.947,41.984z"/> +</g> +<g id="message" display="none"> + <g display="inline"> + <polygon fill="#751B28" points="35.96,15.01 12.201,15.01 24.068,22.951 "/> + <path fill="#751B28" d="M24.484,24.477c-0.126,0.084-0.271,0.126-0.417,0.126s-0.29-0.043-0.416-0.127l-12.446-8.327v15.769 + c0,0.414,0.335,0.75,0.75,0.75h24.236c0.414,0,0.75-0.336,0.75-0.75V16.159L24.484,24.477z"/> + </g> +</g> +<g id="escalation" display="none"> + <g display="inline"> + <polygon fill="#751B28" points="24.02,20.533 34.724,32.119 24.02,10.957 13.314,32.119 "/> + </g> +</g> +<g id="error" display="none"> + <g display="inline"> + <polygon fill="#751B28" points="12.594,33.18 19.681,16.641 25.83,26.092 33.854,14.278 26.768,31.754 20.631,23.728 "/> + </g> +</g> +<g id="cancel" display="none"> + <g display="inline"> + <polygon fill="#751B28" points="35.567,32.076 27.344,23.849 35.567,15.625 32.239,12.299 24.017,20.523 15.791,12.297 + 12.465,15.625 20.689,23.849 12.466,32.076 15.793,35.4 24.017,27.176 32.239,35.4 "/> + </g> +</g> +<g id="compensation" display="none"> + <g display="inline"> + <polygon fill="#751B28" points="21.817,32.246 11.451,23.699 21.817,15.15 "/> + </g> + <g display="inline"> + <polygon fill="#751B28" points="33.657,32.246 23.291,23.699 33.657,15.15 "/> + </g> +</g> +<g id="signal" display="none"> + <polygon display="inline" fill="#751B28" points="12.328,31.248 23.99,11.051 35.652,31.248 "/> +</g> +<g id="multiple" display="none"> + <polygon display="inline" fill="#751B28" points="16.619,34.127 12.063,20.109 23.989,11.444 35.914,20.109 31.36,34.127 "/> +</g> +<g id="terminate" display="none"> + <circle display="inline" fill="#751B28" cx="23.975" cy="23.969" r="11.156"/> +</g> +</svg> Added: trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/images/events_48px_end_terminate.svg =================================================================== --- trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/images/events_48px_end_terminate.svg (rev 0) +++ trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/images/events_48px_end_terminate.svg 2011-02-09 09:46:27 UTC (rev 29074) @@ -0,0 +1,62 @@ +<?xml version="1.0" encoding="utf-8"?> + +<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"> +<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="48px" + height="48px" viewBox="0 0 48 48" enable-background="new 0 0 48 48" xml:space="preserve"> +<g id="Gradient_-_Red"> + <linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="23.9468" y1="7.6123" x2="23.9468" y2="39.9299"> + <stop offset="0" style="stop-color:#FDE4E4"/> + <stop offset="0.1136" style="stop-color:#F3D2D2"/> + <stop offset="0.363" style="stop-color:#DFAEAE"/> + <stop offset="0.4969" style="stop-color:#D7A1A1"/> + <stop offset="0.6654" style="stop-color:#E2B4B4"/> + <stop offset="1" style="stop-color:#FDE4E4"/> + </linearGradient> + <circle fill="url(#SVGID_1_)" cx="23.947" cy="23.985" r="18"/> +</g> +<g id="throwing_x2F_end"> + <path fill="#751B28" d="M23.947,1.484c-12.407,0-22.5,10.094-22.5,22.5c0,12.407,10.093,22.5,22.5,22.5 + c12.406,0,22.501-10.094,22.501-22.5C46.448,11.578,36.354,1.484,23.947,1.484z M23.947,41.984c-9.941,0-18-8.061-18-18 + c0-9.941,8.059-18,18-18s18.001,8.059,18.001,18C41.948,33.924,33.889,41.984,23.947,41.984z"/> +</g> +<g id="message" display="none"> + <g display="inline"> + <polygon fill="#751B28" points="35.96,15.01 12.201,15.01 24.068,22.951 "/> + <path fill="#751B28" d="M24.484,24.477c-0.126,0.084-0.271,0.126-0.417,0.126s-0.29-0.043-0.416-0.127l-12.446-8.327v15.769 + c0,0.414,0.335,0.75,0.75,0.75h24.236c0.414,0,0.75-0.336,0.75-0.75V16.159L24.484,24.477z"/> + </g> +</g> +<g id="escalation" display="none"> + <g display="inline"> + <polygon fill="#751B28" points="24.02,20.533 34.724,32.119 24.02,10.957 13.314,32.119 "/> + </g> +</g> +<g id="error" display="none"> + <g display="inline"> + <polygon fill="#751B28" points="12.594,33.18 19.681,16.641 25.83,26.092 33.854,14.278 26.768,31.754 20.631,23.728 "/> + </g> +</g> +<g id="cancel" display="none"> + <g display="inline"> + <polygon fill="#751B28" points="35.567,32.076 27.344,23.849 35.567,15.625 32.239,12.299 24.017,20.523 15.791,12.297 + 12.465,15.625 20.689,23.849 12.466,32.076 15.793,35.4 24.017,27.176 32.239,35.4 "/> + </g> +</g> +<g id="compensation" display="none"> + <g display="inline"> + <polygon fill="#751B28" points="21.817,32.246 11.451,23.699 21.817,15.15 "/> + </g> + <g display="inline"> + <polygon fill="#751B28" points="33.657,32.246 23.291,23.699 33.657,15.15 "/> + </g> +</g> +<g id="signal" display="none"> + <polygon display="inline" fill="#751B28" points="12.328,31.248 23.99,11.051 35.652,31.248 "/> +</g> +<g id="multiple" display="none"> + <polygon display="inline" fill="#751B28" points="16.619,34.127 12.063,20.109 23.989,11.444 35.914,20.109 31.36,34.127 "/> +</g> +<g id="terminate"> + <circle fill="#751B28" cx="23.975" cy="23.969" r="11.156"/> +</g> +</svg> Added: trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/images/events_48px_intermediate_error_catch.svg =================================================================== --- trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/images/events_48px_intermediate_error_catch.svg (rev 0) +++ trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/images/events_48px_intermediate_error_catch.svg 2011-02-09 09:46:27 UTC (rev 29074) @@ -0,0 +1,230 @@ +<?xml version="1.0" encoding="utf-8"?> + +<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"> +<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="48px" + height="48px" viewBox="0 0 48 48" enable-background="new 0 0 48 48" xml:space="preserve"> +<g id="Gradient_-_Red"> + <linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="23.9487" y1="7.604" x2="23.9487" y2="39.9212"> + <stop offset="0" style="stop-color:#F7E4CD"/> + <stop offset="0.1901" style="stop-color:#F1D3A6"/> + <stop offset="0.3897" style="stop-color:#ECC382"/> + <stop offset="0.4969" style="stop-color:#EABD75"/> + <stop offset="0.63" style="stop-color:#EDC588"/> + <stop offset="0.8987" style="stop-color:#F4DBB9"/> + <stop offset="1" style="stop-color:#F7E4CD"/> + </linearGradient> + <circle fill="url(#SVGID_1_)" cx="23.949" cy="23.977" r="18"/> +</g> +<g id="catching_x2F_boundary_interupting"> + <path fill="none" stroke="#AA7733" stroke-width="1.5" stroke-miterlimit="10" d="M23.949,46.476c-12.407,0-22.5-10.093-22.5-22.5 + c0-12.406,10.093-22.5,22.5-22.5c12.406,0,22.501,10.094,22.501,22.5C46.45,36.383,36.355,46.476,23.949,46.476z"/> + <circle fill="none" stroke="#AA7733" stroke-width="1.5" stroke-miterlimit="10" cx="23.95" cy="23.976" r="18"/> +</g> +<g id="boundary_non-interupting"> + <g> + <path fill="none" stroke="#AA7733" stroke-width="1.5" stroke-miterlimit="10" stroke-dasharray="6.2111,4.6583" d=" + M23.949,46.476c-12.407,0-22.5-10.093-22.5-22.5c0-12.406,10.093-22.5,22.5-22.5c12.406,0,22.501,10.094,22.501,22.5 + C46.45,36.383,36.355,46.476,23.949,46.476z"/> + </g> + <g> + + <circle fill="none" stroke="#AA7733" stroke-width="1.5" stroke-miterlimit="10" stroke-dasharray="5.8737,4.4053" cx="23.95" cy="23.976" r="18"/> + </g> +</g> +<g id="_x5F__x5F__x5F__x5F__x5F__x5F__x5F__x5F__x5F__x5F__x5F__x5F__x5F__x5F__x5F__x5F__x5F__x5F__x5F__x5F__x5F__x5F__x5F__x5F__x5F__x5F__x5F__x5F__x5F__x5F__x5F__x5F__x5F__x5F__x5F__x5F__x5F__x5F__x5F__x5F__x5F_" display="none"> +</g> +<g id="message_-_throwing" display="none"> + <g display="inline"> + <polygon fill="#AA7733" points="35.742,15.002 12.34,15.002 24.069,22.938 "/> + <path fill="#AA7733" d="M24.491,24.465c-0.127,0.087-0.274,0.13-0.422,0.13c-0.146,0-0.293-0.043-0.42-0.129l-12.442-8.419v15.862 + c0,0.414,0.335,0.75,0.75,0.75h24.236c0.414,0,0.75-0.336,0.75-0.75V16L24.491,24.465z"/> + </g> +</g> +<g id="message" display="none"> + + <rect x="11.957" y="15.752" display="inline" fill="#FFFFFF" stroke="#AA7733" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" width="24.236" height="16.157"/> + + <polyline display="inline" fill="none" stroke="#AA7733" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" points=" + 11.957,15.766 24.069,23.845 36.196,15.766 "/> +</g> +<g id="timer" display="none"> + + <circle display="inline" fill="#FFFFFF" stroke="#AA7733" stroke-width="1.5" stroke-miterlimit="10" cx="23.918" cy="24.004" r="14.37"/> + <g display="inline"> + + <line fill="none" stroke="#AA7733" stroke-width="1.5" stroke-linecap="round" stroke-miterlimit="10" x1="23.918" y1="10.206" x2="23.918" y2="11.708"/> + + <line fill="none" stroke="#AA7733" stroke-width="1.5" stroke-linecap="round" stroke-miterlimit="10" x1="17.021" y1="12.055" x2="17.771" y2="13.354"/> + + <line fill="none" stroke="#AA7733" stroke-width="1.5" stroke-linecap="round" stroke-miterlimit="10" x1="11.97" y1="17.104" x2="13.269" y2="17.855"/> + + <line fill="none" stroke="#AA7733" stroke-width="1.5" stroke-linecap="round" stroke-miterlimit="10" x1="10.121" y1="24.004" x2="11.621" y2="24.004"/> + + <line fill="none" stroke="#AA7733" stroke-width="1.5" stroke-linecap="round" stroke-miterlimit="10" x1="11.97" y1="30.901" x2="13.269" y2="30.152"/> + + <line fill="none" stroke="#AA7733" stroke-width="1.5" stroke-linecap="round" stroke-miterlimit="10" x1="17.019" y1="35.952" x2="17.771" y2="34.654"/> + + <line fill="none" stroke="#AA7733" stroke-width="1.5" stroke-linecap="round" stroke-miterlimit="10" x1="23.917" y1="37.801" x2="23.92" y2="36.301"/> + + <line fill="none" stroke="#AA7733" stroke-width="1.5" stroke-linecap="round" stroke-miterlimit="10" x1="30.815" y1="35.952" x2="30.067" y2="34.652"/> + + <line fill="none" stroke="#AA7733" stroke-width="1.5" stroke-linecap="round" stroke-miterlimit="10" x1="35.866" y1="30.902" x2="34.568" y2="30.151"/> + + <line fill="none" stroke="#AA7733" stroke-width="1.5" stroke-linecap="round" stroke-miterlimit="10" x1="37.715" y1="24.004" x2="36.215" y2="24.003"/> + + <line fill="none" stroke="#AA7733" stroke-width="1.5" stroke-linecap="round" stroke-miterlimit="10" x1="35.866" y1="17.105" x2="34.567" y2="17.854"/> + + <line fill="none" stroke="#AA7733" stroke-width="1.5" stroke-linecap="round" stroke-miterlimit="10" x1="30.815" y1="12.056" x2="30.065" y2="13.354"/> + </g> + <path display="inline" fill="#AA7733" d="M33.768,24.004l-8.686-0.933l0.963-9.793l-3.041,10.233 + c-0.08,0.148-0.139,0.311-0.139,0.492c0,0.581,0.472,1.053,1.053,1.053c0.013,0,0.023-0.007,0.036-0.007v0.009L33.768,24.004z"/> +</g> +<g id="escalation" display="none"> + <g display="inline"> + <path fill="#FFFFFF" d="M13.316,32.861c-0.148,0-0.298-0.044-0.427-0.134c-0.308-0.214-0.41-0.621-0.242-0.955L23.352,10.61 + c0.128-0.252,0.387-0.412,0.669-0.412l0,0c0.283,0,0.542,0.159,0.669,0.412l10.704,21.163c0.169,0.334,0.066,0.741-0.241,0.955 + c-0.13,0.09-0.279,0.134-0.428,0.134c-0.203,0-0.404-0.082-0.551-0.241L24.021,21.63L13.867,32.62 + C13.721,32.779,13.519,32.861,13.316,32.861z"/> + <path fill="#AA7733" d="M24.021,10.948l10.704,21.163L24.021,20.524L13.316,32.111L24.021,10.948 M24.021,9.448 + c-0.565,0-1.083,0.318-1.338,0.823L11.978,31.435c-0.338,0.667-0.132,1.481,0.483,1.909c0.259,0.18,0.558,0.268,0.855,0.268 + c0.406,0,0.809-0.164,1.102-0.482l9.604-10.394l9.603,10.394c0.293,0.317,0.696,0.482,1.103,0.482 + c0.297,0,0.596-0.088,0.854-0.268c0.615-0.428,0.82-1.242,0.483-1.909L25.36,10.271C25.104,9.767,24.587,9.448,24.021,9.448 + L24.021,9.448z"/> + </g> +</g> +<g id="escalation_-_throwing" display="none"> + <g display="inline"> + <polygon fill="#AA7733" points="24.021,20.524 34.726,32.111 24.021,10.948 13.316,32.111 "/> + </g> +</g> +<g id="conditional" display="none"> + <g display="inline"> + <path fill="#FFFFFF" d="M16.729,34.989c-0.414,0-0.75-0.336-0.75-0.75V14.431c0-0.414,0.336-0.75,0.75-0.75h15.563 + c0.414,0,0.75,0.336,0.75,0.75v19.809c0,0.414-0.336,0.75-0.75,0.75H16.729z"/> + <path fill="#AA7733" d="M32.292,14.431v19.809H16.729V14.431H32.292 M32.292,12.931H16.729c-0.829,0-1.5,0.671-1.5,1.5v19.809 + c0,0.828,0.671,1.5,1.5,1.5h15.563c0.828,0,1.5-0.672,1.5-1.5V14.431C33.792,13.602,33.12,12.931,32.292,12.931L32.292,12.931z"/> + </g> + + <line display="inline" fill="none" stroke="#AA7733" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" x1="18.754" y1="16.835" x2="30.268" y2="16.835"/> + + <line display="inline" fill="none" stroke="#AA7733" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" x1="18.754" y1="20.655" x2="30.268" y2="20.655"/> + + <line display="inline" fill="none" stroke="#AA7733" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" x1="18.754" y1="25.755" x2="30.268" y2="25.755"/> + + <line display="inline" fill="none" stroke="#AA7733" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" x1="18.754" y1="31.408" x2="30.268" y2="31.408"/> +</g> +<g id="link" display="none"> + <g display="inline"> + <path fill="#FFFFFF" d="M25.565,33.53c-0.101,0-0.201-0.021-0.297-0.062c-0.283-0.122-0.462-0.403-0.453-0.711l0.143-4.82H14.555 + c-0.253,0-0.489-0.128-0.627-0.34c-0.139-0.211-0.161-0.479-0.06-0.711l1.36-3.113l-1.346-2.726 + c-0.115-0.232-0.102-0.508,0.035-0.728c0.137-0.22,0.378-0.354,0.637-0.354h10.404l-0.143-4.821 + c-0.009-0.308,0.17-0.589,0.453-0.711c0.096-0.042,0.196-0.062,0.297-0.062c0.195,0,0.387,0.076,0.53,0.22l8.826,8.829 + c0.293,0.293,0.293,0.768,0,1.061l-8.826,8.829C25.952,33.454,25.761,33.53,25.565,33.53z"/> + <path fill="#AA7733" d="M25.565,15.122l8.826,8.829l-8.826,8.829l0.166-5.593H14.555l1.5-3.433l-1.5-3.039h11.177L25.565,15.122 + M25.565,13.622c-0.201,0-0.402,0.04-0.594,0.123c-0.564,0.243-0.923,0.807-0.905,1.421l0.12,4.049h-9.631 + c-0.519,0-1,0.268-1.274,0.708s-0.301,0.991-0.071,1.456l1.191,2.414l-1.221,2.793c-0.203,0.464-0.158,0.998,0.119,1.422 + c0.277,0.424,0.75,0.679,1.255,0.679h9.631l-0.12,4.048c-0.018,0.615,0.341,1.179,0.905,1.422 + c0.191,0.083,0.393,0.123,0.594,0.123c0.39,0,0.773-0.152,1.061-0.439l8.826-8.829c0.586-0.586,0.586-1.535,0-2.121l-8.826-8.829 + C26.339,13.774,25.955,13.622,25.565,13.622L25.565,13.622z"/> + </g> +</g> +<g id="link_-_throwing" display="none"> + <g display="inline"> + <polygon fill="#AA7733" points="34.392,23.951 25.565,15.122 25.731,20.716 14.555,20.716 16.055,23.755 14.555,27.188 + 25.731,27.188 25.565,32.78 "/> + </g> +</g> +<g id="error"> + <g> + <path fill="#FFFFFF" d="M12.595,33.922c-0.135,0-0.272-0.037-0.395-0.112c-0.315-0.195-0.44-0.592-0.294-0.933l7.087-16.54 + c0.109-0.254,0.349-0.428,0.625-0.452c0.021-0.002,0.043-0.003,0.064-0.003c0.252,0,0.489,0.127,0.628,0.341l5.535,8.505 + l7.391-10.88c0.144-0.212,0.379-0.329,0.621-0.329c0.119,0,0.24,0.029,0.353,0.088c0.338,0.181,0.485,0.588,0.342,0.943 + l-7.087,17.476c-0.102,0.249-0.328,0.425-0.596,0.461c-0.033,0.005-0.066,0.007-0.1,0.007c-0.231,0-0.453-0.107-0.596-0.295 + l-5.572-7.286l-7.435,8.743C13.02,33.831,12.809,33.922,12.595,33.922z"/> + <path fill="#AA7733" d="M33.856,14.27h0.005 M33.856,14.27L26.77,31.745l-6.137-8.025l-8.037,9.452l7.087-16.539l6.149,9.45 + L33.856,14.27 M33.857,12.77c-0.042,0-0.083,0.001-0.125,0.005c-0.237,0.02-0.459,0.094-0.652,0.211 + c-0.148,0.09-0.283,0.206-0.396,0.348c-0.029,0.036-0.056,0.073-0.081,0.112l-6.745,9.929l-4.918-7.559 + c-0.278-0.428-0.753-0.682-1.257-0.682c-0.043,0-0.086,0.002-0.129,0.005c-0.551,0.048-1.032,0.395-1.25,0.904l-7.087,16.539 + c-0.292,0.682-0.042,1.475,0.589,1.866c0.245,0.151,0.518,0.225,0.789,0.225c0.428,0,0.85-0.183,1.144-0.528l6.833-8.035 + l5.007,6.548c0.286,0.374,0.728,0.589,1.191,0.589c0.066,0,0.133-0.005,0.2-0.014c0.533-0.071,0.987-0.424,1.189-0.923l7.057-17.4 + c0.092-0.194,0.144-0.41,0.144-0.639c0-0.811-0.642-1.472-1.445-1.499C33.895,12.77,33.876,12.77,33.857,12.77L33.857,12.77z"/> + </g> +</g> +<g id="cancel" display="none"> + <g display="inline"> + <path fill="#FFFFFF" d="M32.241,36.143c-0.192,0-0.384-0.073-0.53-0.22l-7.692-7.695l-7.693,7.695 + c-0.146,0.146-0.338,0.22-0.53,0.22s-0.384-0.073-0.53-0.22l-3.327-3.325c-0.141-0.141-0.22-0.331-0.22-0.53s0.079-0.39,0.22-0.53 + l7.693-7.696l-7.694-7.693c-0.293-0.293-0.293-0.768,0-1.061l3.326-3.328c0.141-0.141,0.331-0.22,0.53-0.22 + c0.199,0,0.39,0.079,0.53,0.22l7.695,7.695l7.692-7.693c0.146-0.146,0.338-0.22,0.53-0.22c0.191,0,0.384,0.073,0.53,0.22 + l3.328,3.326c0.141,0.141,0.22,0.331,0.22,0.53c0,0.199-0.079,0.39-0.22,0.53l-7.693,7.693l7.693,7.696 + c0.141,0.141,0.22,0.332,0.22,0.53c0,0.199-0.079,0.39-0.22,0.53l-3.328,3.325C32.625,36.069,32.433,36.143,32.241,36.143z"/> + <path fill="#AA7733" d="M15.793,12.289l8.226,8.226l8.223-8.224l3.328,3.326l-8.224,8.224l8.224,8.227l-3.328,3.325l-8.223-8.226 + l-8.224,8.226l-3.327-3.325l8.224-8.227l-8.225-8.224L15.793,12.289 M15.793,10.789L15.793,10.789 + c-0.398,0-0.78,0.158-1.061,0.439l-3.326,3.328c-0.585,0.586-0.585,1.536,0,2.121l7.164,7.164l-7.164,7.166 + c-0.281,0.281-0.439,0.663-0.439,1.061c0,0.398,0.158,0.779,0.439,1.061l3.327,3.325c0.293,0.293,0.677,0.439,1.061,0.439 + s0.768-0.146,1.061-0.439l7.163-7.164l7.162,7.164c0.293,0.293,0.677,0.439,1.061,0.439s0.768-0.146,1.061-0.438l3.328-3.325 + c0.281-0.281,0.439-0.663,0.439-1.062c0-0.397-0.158-0.779-0.439-1.061l-7.163-7.166l7.163-7.163 + c0.281-0.281,0.439-0.663,0.439-1.061c0-0.398-0.158-0.78-0.439-1.061l-3.328-3.326c-0.293-0.292-0.677-0.439-1.061-0.439 + s-0.768,0.146-1.061,0.439l-7.162,7.163l-7.165-7.165C16.572,10.947,16.191,10.789,15.793,10.789L15.793,10.789z"/> + </g> +</g> +<g id="compensation" display="none"> + <g display="inline"> + <path fill="#FFFFFF" d="M21.819,32.988c-0.171,0-0.34-0.059-0.477-0.171l-10.366-8.548c-0.173-0.143-0.273-0.354-0.273-0.579 + s0.1-0.436,0.273-0.579l10.366-8.549c0.137-0.113,0.306-0.171,0.477-0.171c0.109,0,0.218,0.023,0.32,0.072 + c0.263,0.124,0.43,0.388,0.43,0.678v17.097c0,0.29-0.167,0.555-0.43,0.679C22.037,32.965,21.928,32.988,21.819,32.988z"/> + <path fill="#AA7733" d="M21.819,15.142v17.097L11.453,23.69L21.819,15.142 M21.82,13.642c-0.342,0-0.681,0.117-0.955,0.343 + l-10.367,8.549c-0.345,0.285-0.545,0.709-0.545,1.157s0.2,0.873,0.546,1.157l10.366,8.548c0.274,0.226,0.612,0.343,0.955,0.343 + c0.217,0,0.435-0.047,0.639-0.144c0.525-0.247,0.86-0.775,0.86-1.356V15.142c0-0.581-0.335-1.109-0.86-1.357 + C22.255,13.688,22.037,13.642,21.82,13.642L21.82,13.642z"/> + </g> + <g display="inline"> + <path fill="#FFFFFF" d="M33.659,32.988c-0.171,0-0.34-0.059-0.478-0.171l-10.366-8.548c-0.173-0.143-0.273-0.354-0.273-0.579 + s0.1-0.436,0.273-0.579l10.366-8.549c0.138-0.113,0.307-0.171,0.478-0.171c0.108,0,0.218,0.023,0.32,0.072 + c0.262,0.124,0.43,0.388,0.43,0.678v17.097c0,0.29-0.168,0.555-0.43,0.679C33.877,32.965,33.768,32.988,33.659,32.988z"/> + <path fill="#AA7733" d="M33.659,15.142v17.097L23.293,23.69L33.659,15.142 M33.659,13.642c-0.342,0-0.681,0.117-0.954,0.343 + l-10.367,8.549c-0.345,0.285-0.545,0.709-0.545,1.157s0.2,0.873,0.546,1.157l10.366,8.548c0.273,0.226,0.612,0.343,0.954,0.343 + c0.218,0,0.436-0.047,0.64-0.144c0.525-0.247,0.86-0.775,0.86-1.356V15.142c0-0.581-0.335-1.109-0.86-1.357 + C34.095,13.688,33.877,13.642,33.659,13.642L33.659,13.642z"/> + </g> +</g> +<g id="compensation_-_throwing" display="none"> + <g display="inline"> + <polygon fill="#AA7733" points="21.819,32.238 11.453,23.69 21.819,15.142 "/> + </g> + <g display="inline"> + <polygon fill="#AA7733" points="33.659,32.238 23.293,23.69 33.659,15.142 "/> + </g> +</g> +<g id="signal" display="none"> + + <polygon display="inline" fill="#FFFFFF" stroke="#AA7733" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" points=" + 12.33,31.239 23.992,11.043 35.654,31.239 "/> +</g> +<g id="signal_-_throwing" display="none"> + <polygon display="inline" fill="#AA7733" points="12.33,31.239 23.992,11.043 35.654,31.239 "/> +</g> +<g id="multiple" display="none"> + + <polygon display="inline" fill="#FFFFFF" stroke="#AA7733" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" points=" + 16.621,34.119 12.065,20.101 23.991,11.436 35.916,20.101 31.362,34.119 "/> +</g> +<g id="multiple_-_throwing" display="none"> + <polygon display="inline" fill="#AA7733" points="16.621,34.119 12.065,20.101 23.991,11.436 35.916,20.101 31.362,34.119 "/> +</g> +<g id="parallel_multiple" display="none"> + <g display="inline"> + <path fill="#FFFFFF" d="M22.124,35.815c-0.414,0-0.75-0.336-0.75-0.75v-8.576l-8.576,0.001c-0.414,0-0.75-0.336-0.75-0.75 + l-0.001-3.771c0-0.199,0.079-0.39,0.22-0.53s0.331-0.22,0.53-0.22l8.577-0.001l-0.001-8.575c0-0.199,0.079-0.39,0.22-0.53 + s0.332-0.22,0.53-0.22h3.772c0.414,0,0.75,0.336,0.75,0.75v8.575h8.575c0.414,0,0.75,0.335,0.75,0.75l0.001,3.772 + c0,0.199-0.079,0.39-0.22,0.53s-0.331,0.22-0.53,0.22h-8.576v8.577c0,0.199-0.079,0.39-0.22,0.53s-0.331,0.22-0.53,0.22 + L22.124,35.815z"/> + <path fill="#AA7733" d="M25.896,12.643v9.325h9.325l0.001,3.772h-9.326v9.327l-3.771-0.002v-9.326l-9.326,0.001l-0.001-3.771 + l9.327-0.001l-0.001-9.325H25.896 M25.896,11.143h-3.772c-0.398,0-0.779,0.158-1.061,0.439s-0.439,0.663-0.439,1.061l0.001,7.825 + l-7.827,0.001c-0.398,0-0.78,0.158-1.061,0.439s-0.439,0.663-0.439,1.061l0.001,3.771c0,0.829,0.672,1.5,1.5,1.5l0,0l7.826-0.001 + v7.826c0,0.828,0.671,1.5,1.499,1.5l3.771,0.002h0.001c0.397,0,0.779-0.158,1.061-0.439s0.439-0.662,0.439-1.061V27.24h7.826 + c0.397,0,0.779-0.158,1.061-0.439s0.439-0.663,0.439-1.061l-0.001-3.773c0-0.828-0.672-1.5-1.5-1.5h-7.825v-7.825 + C27.396,11.814,26.724,11.143,25.896,11.143L25.896,11.143z"/> + </g> +</g> +</svg> Added: trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/images/events_48px_intermediate_message_catch.svg =================================================================== --- trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/images/events_48px_intermediate_message_catch.svg (rev 0) +++ trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/images/events_48px_intermediate_message_catch.svg 2011-02-09 09:46:27 UTC (rev 29074) @@ -0,0 +1,239 @@ +<?xml version="1.0" encoding="utf-8"?> + +<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"> +<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="48px" + height="48px" viewBox="0 0 48 48" enable-background="new 0 0 48 48" xml:space="preserve"> +<g id="Gradient_-_Red"> + <linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="23.9487" y1="7.604" x2="23.9487" y2="39.9212"> + <stop offset="0" style="stop-color:#F7E4CD"/> + <stop offset="0.1901" style="stop-color:#F1D3A6"/> + <stop offset="0.3897" style="stop-color:#ECC382"/> + <stop offset="0.4969" style="stop-color:#EABD75"/> + <stop offset="0.63" style="stop-color:#EDC588"/> + <stop offset="0.8987" style="stop-color:#F4DBB9"/> + <stop offset="1" style="stop-color:#F7E4CD"/> + </linearGradient> + <circle fill="url(#SVGID_1_)" cx="23.949" cy="23.977" r="18"/> +</g> +<g id="top-level" display="none"> + <circle display="inline" fill="none" stroke="#AA7733" stroke-width="1.5" stroke-miterlimit="10" cx="23.95" cy="23.976" r="18"/> +</g> +<g id="sub_process_interupting" display="none"> + <g display="inline"> + + <circle fill="none" stroke="#AA7733" stroke-width="1.5" stroke-miterlimit="10" stroke-dasharray="5.8737,4.4053" cx="23.95" cy="23.976" r="18"/> + </g> +</g> +<g id="catching_x2F_boundary_interupting"> + <path fill="none" stroke="#AA7733" stroke-width="1.5" stroke-miterlimit="10" d="M23.949,46.476c-12.407,0-22.5-10.093-22.5-22.5 + c0-12.406,10.093-22.5,22.5-22.5c12.406,0,22.501,10.094,22.501,22.5C46.45,36.383,36.355,46.476,23.949,46.476z"/> + <circle fill="none" stroke="#AA7733" stroke-width="1.5" stroke-miterlimit="10" cx="23.95" cy="23.976" r="18"/> +</g> +<g id="boundary_non-interupting" display="none"> + <g display="inline"> + <path fill="none" stroke="#AA7733" stroke-width="1.5" stroke-miterlimit="10" stroke-dasharray="6.2111,4.6583" d=" + M23.949,46.476c-12.407,0-22.5-10.093-22.5-22.5c0-12.406,10.093-22.5,22.5-22.5c12.406,0,22.501,10.094,22.501,22.5 + C46.45,36.383,36.355,46.476,23.949,46.476z"/> + </g> + <g display="inline"> + + <circle fill="none" stroke="#AA7733" stroke-width="1.5" stroke-miterlimit="10" stroke-dasharray="5.8737,4.4053" cx="23.95" cy="23.976" r="18"/> + </g> +</g> +<g id="_x5F__x5F__x5F__x5F__x5F__x5F__x5F__x5F__x5F__x5F__x5F__x5F__x5F__x5F__x5F__x5F__x5F__x5F__x5F__x5F__x5F__x5F__x5F__x5F__x5F__x5F__x5F__x5F__x5F__x5F__x5F__x5F__x5F__x5F__x5F__x5F__x5F__x5F__x5F__x5F__x5F_" display="none"> +</g> +<g id="message_-_throwing" display="none"> + <g display="inline"> + <polygon fill="#AA7733" points="35.742,15.002 12.34,15.002 24.069,22.938 "/> + <path fill="#AA7733" d="M24.491,24.465c-0.127,0.087-0.274,0.13-0.422,0.13c-0.146,0-0.293-0.043-0.42-0.129l-12.442-8.419v15.862 + c0,0.414,0.335,0.75,0.75,0.75h24.236c0.414,0,0.75-0.336,0.75-0.75V16L24.491,24.465z"/> + </g> +</g> +<g id="message"> + + <rect x="11.957" y="15.752" fill="#FFFFFF" stroke="#AA7733" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" width="24.236" height="16.157"/> + + <polyline fill="none" stroke="#AA7733" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" points=" + 11.957,15.766 24.069,23.845 36.196,15.766 "/> +</g> +<g id="timer" display="none"> + + <circle display="inline" fill="#FFFFFF" stroke="#AA7733" stroke-width="1.5" stroke-miterlimit="10" cx="23.918" cy="24.004" r="14.37"/> + <g display="inline"> + + <line fill="none" stroke="#AA7733" stroke-width="1.5" stroke-linecap="round" stroke-miterlimit="10" x1="23.918" y1="10.206" x2="23.918" y2="11.708"/> + + <line fill="none" stroke="#AA7733" stroke-width="1.5" stroke-linecap="round" stroke-miterlimit="10" x1="17.021" y1="12.055" x2="17.771" y2="13.354"/> + + <line fill="none" stroke="#AA7733" stroke-width="1.5" stroke-linecap="round" stroke-miterlimit="10" x1="11.97" y1="17.104" x2="13.269" y2="17.855"/> + + <line fill="none" stroke="#AA7733" stroke-width="1.5" stroke-linecap="round" stroke-miterlimit="10" x1="10.121" y1="24.004" x2="11.621" y2="24.004"/> + + <line fill="none" stroke="#AA7733" stroke-width="1.5" stroke-linecap="round" stroke-miterlimit="10" x1="11.97" y1="30.901" x2="13.269" y2="30.152"/> + + <line fill="none" stroke="#AA7733" stroke-width="1.5" stroke-linecap="round" stroke-miterlimit="10" x1="17.019" y1="35.952" x2="17.771" y2="34.654"/> + + <line fill="none" stroke="#AA7733" stroke-width="1.5" stroke-linecap="round" stroke-miterlimit="10" x1="23.917" y1="37.801" x2="23.92" y2="36.301"/> + + <line fill="none" stroke="#AA7733" stroke-width="1.5" stroke-linecap="round" stroke-miterlimit="10" x1="30.815" y1="35.952" x2="30.067" y2="34.652"/> + + <line fill="none" stroke="#AA7733" stroke-width="1.5" stroke-linecap="round" stroke-miterlimit="10" x1="35.866" y1="30.902" x2="34.568" y2="30.151"/> + + <line fill="none" stroke="#AA7733" stroke-width="1.5" stroke-linecap="round" stroke-miterlimit="10" x1="37.715" y1="24.004" x2="36.215" y2="24.003"/> + + <line fill="none" stroke="#AA7733" stroke-width="1.5" stroke-linecap="round" stroke-miterlimit="10" x1="35.866" y1="17.105" x2="34.567" y2="17.854"/> + + <line fill="none" stroke="#AA7733" stroke-width="1.5" stroke-linecap="round" stroke-miterlimit="10" x1="30.815" y1="12.056" x2="30.065" y2="13.354"/> + </g> + <path display="inline" fill="#AA7733" d="M33.768,24.004l-8.686-0.933l0.963-9.793l-3.041,10.233 + c-0.08,0.148-0.139,0.311-0.139,0.492c0,0.581,0.472,1.053,1.053,1.053c0.013,0,0.023-0.007,0.036-0.007v0.009L33.768,24.004z"/> +</g> +<g id="escalation" display="none"> + <g display="inline"> + <path fill="#FFFFFF" d="M13.316,32.861c-0.148,0-0.298-0.044-0.427-0.134c-0.308-0.214-0.41-0.621-0.242-0.955L23.352,10.61 + c0.128-0.252,0.387-0.412,0.669-0.412l0,0c0.283,0,0.542,0.159,0.669,0.412l10.704,21.163c0.169,0.334,0.066,0.741-0.241,0.955 + c-0.13,0.09-0.279,0.134-0.428,0.134c-0.203,0-0.404-0.082-0.551-0.241L24.021,21.63L13.867,32.62 + C13.721,32.779,13.519,32.861,13.316,32.861z"/> + <path fill="#AA7733" d="M24.021,10.948l10.704,21.163L24.021,20.524L13.316,32.111L24.021,10.948 M24.021,9.448 + c-0.565,0-1.083,0.318-1.338,0.823L11.978,31.435c-0.338,0.667-0.132,1.481,0.483,1.909c0.259,0.18,0.558,0.268,0.855,0.268 + c0.406,0,0.809-0.164,1.102-0.482l9.604-10.394l9.603,10.394c0.293,0.317,0.696,0.482,1.103,0.482 + c0.297,0,0.596-0.088,0.854-0.268c0.615-0.428,0.82-1.242,0.483-1.909L25.36,10.271C25.104,9.767,24.587,9.448,24.021,9.448 + L24.021,9.448z"/> + </g> +</g> +<g id="escalation_-_throwing" display="none"> + <g display="inline"> + <polygon fill="#AA7733" points="24.021,20.524 34.726,32.111 24.021,10.948 13.316,32.111 "/> + </g> +</g> +<g id="conditional" display="none"> + <g display="inline"> + <path fill="#FFFFFF" d="M16.729,34.989c-0.414,0-0.75-0.336-0.75-0.75V14.431c0-0.414,0.336-0.75,0.75-0.75h15.563 + c0.414,0,0.75,0.336,0.75,0.75v19.809c0,0.414-0.336,0.75-0.75,0.75H16.729z"/> + <path fill="#AA7733" d="M32.292,14.431v19.809H16.729V14.431H32.292 M32.292,12.931H16.729c-0.829,0-1.5,0.671-1.5,1.5v19.809 + c0,0.828,0.671,1.5,1.5,1.5h15.563c0.828,0,1.5-0.672,1.5-1.5V14.431C33.792,13.602,33.12,12.931,32.292,12.931L32.292,12.931z"/> + </g> + + <line display="inline" fill="none" stroke="#AA7733" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" x1="18.754" y1="16.835" x2="30.268" y2="16.835"/> + + <line display="inline" fill="none" stroke="#AA7733" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" x1="18.754" y1="20.655" x2="30.268" y2="20.655"/> + + <line display="inline" fill="none" stroke="#AA7733" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" x1="18.754" y1="25.755" x2="30.268" y2="25.755"/> + + <line display="inline" fill="none" stroke="#AA7733" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" x1="18.754" y1="31.408" x2="30.268" y2="31.408"/> +</g> +<g id="link" display="none"> + <g display="inline"> + <path fill="#FFFFFF" d="M25.565,33.53c-0.101,0-0.201-0.021-0.297-0.062c-0.283-0.122-0.462-0.403-0.453-0.711l0.143-4.82H14.555 + c-0.253,0-0.489-0.128-0.627-0.34c-0.139-0.211-0.161-0.479-0.06-0.711l1.36-3.113l-1.346-2.726 + c-0.115-0.232-0.102-0.508,0.035-0.728c0.137-0.22,0.378-0.354,0.637-0.354h10.404l-0.143-4.821 + c-0.009-0.308,0.17-0.589,0.453-0.711c0.096-0.042,0.196-0.062,0.297-0.062c0.195,0,0.387,0.076,0.53,0.22l8.826,8.829 + c0.293,0.293,0.293,0.768,0,1.061l-8.826,8.829C25.952,33.454,25.761,33.53,25.565,33.53z"/> + <path fill="#AA7733" d="M25.565,15.122l8.826,8.829l-8.826,8.829l0.166-5.593H14.555l1.5-3.433l-1.5-3.039h11.177L25.565,15.122 + M25.565,13.622c-0.201,0-0.402,0.04-0.594,0.123c-0.564,0.243-0.923,0.807-0.905,1.421l0.12,4.049h-9.631 + c-0.519,0-1,0.268-1.274,0.708s-0.301,0.991-0.071,1.456l1.191,2.414l-1.221,2.793c-0.203,0.464-0.158,0.998,0.119,1.422 + c0.277,0.424,0.75,0.679,1.255,0.679h9.631l-0.12,4.048c-0.018,0.615,0.341,1.179,0.905,1.422 + c0.191,0.083,0.393,0.123,0.594,0.123c0.39,0,0.773-0.152,1.061-0.439l8.826-8.829c0.586-0.586,0.586-1.535,0-2.121l-8.826-8.829 + C26.339,13.774,25.955,13.622,25.565,13.622L25.565,13.622z"/> + </g> +</g> +<g id="link_-_throwing" display="none"> + <g display="inline"> + <polygon fill="#AA7733" points="34.392,23.951 25.565,15.122 25.731,20.716 14.555,20.716 16.055,23.755 14.555,27.188 + 25.731,27.188 25.565,32.78 "/> + </g> +</g> +<g id="error" display="none"> + <g display="inline"> + <path fill="#FFFFFF" d="M12.595,33.922c-0.135,0-0.272-0.037-0.395-0.112c-0.315-0.195-0.44-0.592-0.294-0.933l7.087-16.54 + c0.109-0.254,0.349-0.428,0.625-0.452c0.021-0.002,0.043-0.003,0.064-0.003c0.252,0,0.489,0.127,0.628,0.341l5.535,8.505 + l7.391-10.88c0.144-0.212,0.379-0.329,0.621-0.329c0.119,0,0.24,0.029,0.353,0.088c0.338,0.181,0.485,0.588,0.342,0.943 + l-7.087,17.476c-0.102,0.249-0.328,0.425-0.596,0.461c-0.033,0.005-0.066,0.007-0.1,0.007c-0.231,0-0.453-0.107-0.596-0.295 + l-5.572-7.286l-7.435,8.743C13.02,33.831,12.809,33.922,12.595,33.922z"/> + <path fill="#AA7733" d="M33.856,14.27h0.005 M33.856,14.27L26.77,31.745l-6.137-8.025l-8.037,9.452l7.087-16.539l6.149,9.45 + L33.856,14.27 M33.857,12.77c-0.042,0-0.083,0.001-0.125,0.005c-0.237,0.02-0.459,0.094-0.652,0.211 + c-0.148,0.09-0.283,0.206-0.396,0.348c-0.029,0.036-0.056,0.073-0.081,0.112l-6.745,9.929l-4.918-7.559 + c-0.278-0.428-0.753-0.682-1.257-0.682c-0.043,0-0.086,0.002-0.129,0.005c-0.551,0.048-1.032,0.395-1.25,0.904l-7.087,16.539 + c-0.292,0.682-0.042,1.475,0.589,1.866c0.245,0.151,0.518,0.225,0.789,0.225c0.428,0,0.85-0.183,1.144-0.528l6.833-8.035 + l5.007,6.548c0.286,0.374,0.728,0.589,1.191,0.589c0.066,0,0.133-0.005,0.2-0.014c0.533-0.071,0.987-0.424,1.189-0.923l7.057-17.4 + c0.092-0.194,0.144-0.41,0.144-0.639c0-0.811-0.642-1.472-1.445-1.499C33.895,12.77,33.876,12.77,33.857,12.77L33.857,12.77z"/> + </g> +</g> +<g id="cancel" display="none"> + <g display="inline"> + <path fill="#FFFFFF" d="M32.241,36.143c-0.192,0-0.384-0.073-0.53-0.22l-7.692-7.695l-7.693,7.695 + c-0.146,0.146-0.338,0.22-0.53,0.22s-0.384-0.073-0.53-0.22l-3.327-3.325c-0.141-0.141-0.22-0.331-0.22-0.53s0.079-0.39,0.22-0.53 + l7.693-7.696l-7.694-7.693c-0.293-0.293-0.293-0.768,0-1.061l3.326-3.328c0.141-0.141,0.331-0.22,0.53-0.22 + c0.199,0,0.39,0.079,0.53,0.22l7.695,7.695l7.692-7.693c0.146-0.146,0.338-0.22,0.53-0.22c0.191,0,0.384,0.073,0.53,0.22 + l3.328,3.326c0.141,0.141,0.22,0.331,0.22,0.53c0,0.199-0.079,0.39-0.22,0.53l-7.693,7.693l7.693,7.696 + c0.141,0.141,0.22,0.332,0.22,0.53c0,0.199-0.079,0.39-0.22,0.53l-3.328,3.325C32.625,36.069,32.433,36.143,32.241,36.143z"/> + <path fill="#AA7733" d="M15.793,12.289l8.226,8.226l8.223-8.224l3.328,3.326l-8.224,8.224l8.224,8.227l-3.328,3.325l-8.223-8.226 + l-8.224,8.226l-3.327-3.325l8.224-8.227l-8.225-8.224L15.793,12.289 M15.793,10.789L15.793,10.789 + c-0.398,0-0.78,0.158-1.061,0.439l-3.326,3.328c-0.585,0.586-0.585,1.536,0,2.121l7.164,7.164l-7.164,7.166 + c-0.281,0.281-0.439,0.663-0.439,1.061c0,0.398,0.158,0.779,0.439,1.061l3.327,3.325c0.293,0.293,0.677,0.439,1.061,0.439 + s0.768-0.146,1.061-0.439l7.163-7.164l7.162,7.164c0.293,0.293,0.677,0.439,1.061,0.439s0.768-0.146,1.061-0.438l3.328-3.325 + c0.281-0.281,0.439-0.663,0.439-1.062c0-0.397-0.158-0.779-0.439-1.061l-7.163-7.166l7.163-7.163 + c0.281-0.281,0.439-0.663,0.439-1.061c0-0.398-0.158-0.78-0.439-1.061l-3.328-3.326c-0.293-0.292-0.677-0.439-1.061-0.439 + s-0.768,0.146-1.061,0.439l-7.162,7.163l-7.165-7.165C16.572,10.947,16.191,10.789,15.793,10.789L15.793,10.789z"/> + </g> +</g> +<g id="compensation" display="none"> + <g display="inline"> + <path fill="#FFFFFF" d="M21.819,32.988c-0.171,0-0.34-0.059-0.477-0.171l-10.366-8.548c-0.173-0.143-0.273-0.354-0.273-0.579 + s0.1-0.436,0.273-0.579l10.366-8.549c0.137-0.113,0.306-0.171,0.477-0.171c0.109,0,0.218,0.023,0.32,0.072 + c0.263,0.124,0.43,0.388,0.43,0.678v17.097c0,0.29-0.167,0.555-0.43,0.679C22.037,32.965,21.928,32.988,21.819,32.988z"/> + <path fill="#AA7733" d="M21.819,15.142v17.097L11.453,23.69L21.819,15.142 M21.82,13.642c-0.342,0-0.681,0.117-0.955,0.343 + l-10.367,8.549c-0.345,0.285-0.545,0.709-0.545,1.157s0.2,0.873,0.546,1.157l10.366,8.548c0.274,0.226,0.612,0.343,0.955,0.343 + c0.217,0,0.435-0.047,0.639-0.144c0.525-0.247,0.86-0.775,0.86-1.356V15.142c0-0.581-0.335-1.109-0.86-1.357 + C22.255,13.688,22.037,13.642,21.82,13.642L21.82,13.642z"/> + </g> + <g display="inline"> + <path fill="#FFFFFF" d="M33.659,32.988c-0.171,0-0.34-0.059-0.478-0.171l-10.366-8.548c-0.173-0.143-0.273-0.354-0.273-0.579 + s0.1-0.436,0.273-0.579l10.366-8.549c0.138-0.113,0.307-0.171,0.478-0.171c0.108,0,0.218,0.023,0.32,0.072 + c0.262,0.124,0.43,0.388,0.43,0.678v17.097c0,0.29-0.168,0.555-0.43,0.679C33.877,32.965,33.768,32.988,33.659,32.988z"/> + <path fill="#AA7733" d="M33.659,15.142v17.097L23.293,23.69L33.659,15.142 M33.659,13.642c-0.342,0-0.681,0.117-0.954,0.343 + l-10.367,8.549c-0.345,0.285-0.545,0.709-0.545,1.157s0.2,0.873,0.546,1.157l10.366,8.548c0.273,0.226,0.612,0.343,0.954,0.343 + c0.218,0,0.436-0.047,0.64-0.144c0.525-0.247,0.86-0.775,0.86-1.356V15.142c0-0.581-0.335-1.109-0.86-1.357 + C34.095,13.688,33.877,13.642,33.659,13.642L33.659,13.642z"/> + </g> +</g> +<g id="compensation_-_throwing" display="none"> + <g display="inline"> + <polygon fill="#AA7733" points="21.819,32.238 11.453,23.69 21.819,15.142 "/> + </g> + <g display="inline"> + <polygon fill="#AA7733" points="33.659,32.238 23.293,23.69 33.659,15.142 "/> + </g> +</g> +<g id="signal" display="none"> + + <polygon display="inline" fill="#FFFFFF" stroke="#AA7733" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" points=" + 12.33,31.239 23.992,11.043 35.654,31.239 "/> +</g> +<g id="signal_-_throwing" display="none"> + <polygon display="inline" fill="#AA7733" points="12.33,31.239 23.992,11.043 35.654,31.239 "/> +</g> +<g id="multiple" display="none"> + + <polygon display="inline" fill="#FFFFFF" stroke="#AA7733" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" points=" + 16.621,34.119 12.065,20.101 23.991,11.436 35.916,20.101 31.362,34.119 "/> +</g> +<g id="multiple_-_throwing" display="none"> + <polygon display="inline" fill="#AA7733" points="16.621,34.119 12.065,20.101 23.991,11.436 35.916,20.101 31.362,34.119 "/> +</g> +<g id="parallel_multiple" display="none"> + <g display="inline"> + <path fill="#FFFFFF" d="M22.124,35.815c-0.414,0-0.75-0.336-0.75-0.75v-8.576l-8.576,0.001c-0.414,0-0.75-0.336-0.75-0.75 + l-0.001-3.771c0-0.199,0.079-0.39,0.22-0.53s0.331-0.22,0.53-0.22l8.577-0.001l-0.001-8.575c0-0.199,0.079-0.39,0.22-0.53 + s0.332-0.22,0.53-0.22h3.772c0.414,0,0.75,0.336,0.75,0.75v8.575h8.575c0.414,0,0.75,0.335,0.75,0.75l0.001,3.772 + c0,0.199-0.079,0.39-0.22,0.53s-0.331,0.22-0.53,0.22h-8.576v8.577c0,0.199-0.079,0.39-0.22,0.53s-0.331,0.22-0.53,0.22 + L22.124,35.815z"/> + <path fill="#AA7733" d="M25.896,12.643v9.325h9.325l0.001,3.772h-9.326v9.327l-3.771-0.002v-9.326l-9.326,0.001l-0.001-3.771 + l9.327-0.001l-0.001-9.325H25.896 M25.896,11.143h-3.772c-0.398,0-0.779,0.158-1.061,0.439s-0.439,0.663-0.439,1.061l0.001,7.825 + l-7.827,0.001c-0.398,0-0.78,0.158-1.061,0.439s-0.439,0.663-0.439,1.061l0.001,3.771c0,0.829,0.672,1.5,1.5,1.5l0,0l7.826-0.001 + v7.826c0,0.828,0.671,1.5,1.499,1.5l3.771,0.002h0.001c0.397,0,0.779-0.158,1.061-0.439s0.439-0.662,0.439-1.061V27.24h7.826 + c0.397,0,0.779-0.158,1.061-0.439s0.439-0.663,0.439-1.061l-0.001-3.773c0-0.828-0.672-1.5-1.5-1.5h-7.825v-7.825 + C27.396,11.814,26.724,11.143,25.896,11.143L25.896,11.143z"/> + </g> +</g> +</svg> Added: trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/images/events_48px_intermediate_message_throw.svg =================================================================== --- trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/images/events_48px_intermediate_message_throw.svg (rev 0) +++ trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/images/events_48px_intermediate_message_throw.svg 2011-02-09 09:46:27 UTC (rev 29074) @@ -0,0 +1,230 @@ +<?xml version="1.0" encoding="utf-8"?> + +<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"> +<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="48px" + height="48px" viewBox="0 0 48 48" enable-background="new 0 0 48 48" xml:space="preserve"> +<g id="Gradient_-_Red"> + <linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="23.9487" y1="7.604" x2="23.9487" y2="39.9212"> + <stop offset="0" style="stop-color:#F7E4CD"/> + <stop offset="0.1901" style="stop-color:#F1D3A6"/> + <stop offset="0.3897" style="stop-color:#ECC382"/> + <stop offset="0.4969" style="stop-color:#EABD75"/> + <stop offset="0.63" style="stop-color:#EDC588"/> + <stop offset="0.8987" style="stop-color:#F4DBB9"/> + <stop offset="1" style="stop-color:#F7E4CD"/> + </linearGradient> + <circle fill="url(#SVGID_1_)" cx="23.949" cy="23.977" r="18"/> +</g> +<g id="catching_x2F_boundary_interupting"> + <path fill="none" stroke="#AA7733" stroke-width="1.5" stroke-miterlimit="10" d="M23.949,46.476c-12.407,0-22.5-10.093-22.5-22.5 + c0-12.406,10.093-22.5,22.5-22.5c12.406,0,22.501,10.094,22.501,22.5C46.45,36.383,36.355,46.476,23.949,46.476z"/> + <circle fill="none" stroke="#AA7733" stroke-width="1.5" stroke-miterlimit="10" cx="23.95" cy="23.976" r="18"/> +</g> +<g id="boundary_non-interupting" display="none"> + <g display="inline"> + <path fill="none" stroke="#AA7733" stroke-width="1.5" stroke-miterlimit="10" stroke-dasharray="6.2111,4.6583" d=" + M23.949,46.476c-12.407,0-22.5-10.093-22.5-22.5c0-12.406,10.093-22.5,22.5-22.5c12.406,0,22.501,10.094,22.501,22.5 + C46.45,36.383,36.355,46.476,23.949,46.476z"/> + </g> + <g display="inline"> + + <circle fill="none" stroke="#AA7733" stroke-width="1.5" stroke-miterlimit="10" stroke-dasharray="5.8737,4.4053" cx="23.95" cy="23.976" r="18"/> + </g> +</g> +<g id="_x5F__x5F__x5F__x5F__x5F__x5F__x5F__x5F__x5F__x5F__x5F__x5F__x5F__x5F__x5F__x5F__x5F__x5F__x5F__x5F__x5F__x5F__x5F__x5F__x5F__x5F__x5F__x5F__x5F__x5F__x5F__x5F__x5F__x5F__x5F__x5F__x5F__x5F__x5F__x5F__x5F_" display="none"> +</g> +<g id="message_-_throwing"> + <g> + <polygon fill="#AA7733" points="35.742,15.002 12.34,15.002 24.069,22.938 "/> + <path fill="#AA7733" d="M24.491,24.465c-0.127,0.087-0.274,0.13-0.422,0.13c-0.146,0-0.293-0.043-0.42-0.129l-12.442-8.419v15.862 + c0,0.414,0.335,0.75,0.75,0.75h24.236c0.414,0,0.75-0.336,0.75-0.75V16L24.491,24.465z"/> + </g> +</g> +<g id="message" display="none"> + + <rect x="11.957" y="15.752" display="inline" fill="#FFFFFF" stroke="#AA7733" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" width="24.236" height="16.157"/> + + <polyline display="inline" fill="none" stroke="#AA7733" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" points=" + 11.957,15.766 24.069,23.845 36.196,15.766 "/> +</g> +<g id="timer" display="none"> + + <circle display="inline" fill="#FFFFFF" stroke="#AA7733" stroke-width="1.5" stroke-miterlimit="10" cx="23.918" cy="24.004" r="14.37"/> + <g display="inline"> + + <line fill="none" stroke="#AA7733" stroke-width="1.5" stroke-linecap="round" stroke-miterlimit="10" x1="23.918" y1="10.206" x2="23.918" y2="11.708"/> + + <line fill="none" stroke="#AA7733" stroke-width="1.5" stroke-linecap="round" stroke-miterlimit="10" x1="17.021" y1="12.055" x2="17.771" y2="13.354"/> + + <line fill="none" stroke="#AA7733" stroke-width="1.5" stroke-linecap="round" stroke-miterlimit="10" x1="11.97" y1="17.104" x2="13.269" y2="17.855"/> + + <line fill="none" stroke="#AA7733" stroke-width="1.5" stroke-linecap="round" stroke-miterlimit="10" x1="10.121" y1="24.004" x2="11.621" y2="24.004"/> + + <line fill="none" stroke="#AA7733" stroke-width="1.5" stroke-linecap="round" stroke-miterlimit="10" x1="11.97" y1="30.901" x2="13.269" y2="30.152"/> + + <line fill="none" stroke="#AA7733" stroke-width="1.5" stroke-linecap="round" stroke-miterlimit="10" x1="17.019" y1="35.952" x2="17.771" y2="34.654"/> + + <line fill="none" stroke="#AA7733" stroke-width="1.5" stroke-linecap="round" stroke-miterlimit="10" x1="23.917" y1="37.801" x2="23.92" y2="36.301"/> + + <line fill="none" stroke="#AA7733" stroke-width="1.5" stroke-linecap="round" stroke-miterlimit="10" x1="30.815" y1="35.952" x2="30.067" y2="34.652"/> + + <line fill="none" stroke="#AA7733" stroke-width="1.5" stroke-linecap="round" stroke-miterlimit="10" x1="35.866" y1="30.902" x2="34.568" y2="30.151"/> + + <line fill="none" stroke="#AA7733" stroke-width="1.5" stroke-linecap="round" stroke-miterlimit="10" x1="37.715" y1="24.004" x2="36.215" y2="24.003"/> + + <line fill="none" stroke="#AA7733" stroke-width="1.5" stroke-linecap="round" stroke-miterlimit="10" x1="35.866" y1="17.105" x2="34.567" y2="17.854"/> + + <line fill="none" stroke="#AA7733" stroke-width="1.5" stroke-linecap="round" stroke-miterlimit="10" x1="30.815" y1="12.056" x2="30.065" y2="13.354"/> + </g> + <path display="inline" fill="#AA7733" d="M33.768,24.004l-8.686-0.933l0.963-9.793l-3.041,10.233 + c-0.08,0.148-0.139,0.311-0.139,0.492c0,0.581,0.472,1.053,1.053,1.053c0.013,0,0.023-0.007,0.036-0.007v0.009L33.768,24.004z"/> +</g> +<g id="escalation" display="none"> + <g display="inline"> + <path fill="#FFFFFF" d="M13.316,32.861c-0.148,0-0.298-0.044-0.427-0.134c-0.308-0.214-0.41-0.621-0.242-0.955L23.352,10.61 + c0.128-0.252,0.387-0.412,0.669-0.412l0,0c0.283,0,0.542,0.159,0.669,0.412l10.704,21.163c0.169,0.334,0.066,0.741-0.241,0.955 + c-0.13,0.09-0.279,0.134-0.428,0.134c-0.203,0-0.404-0.082-0.551-0.241L24.021,21.63L13.867,32.62 + C13.721,32.779,13.519,32.861,13.316,32.861z"/> + <path fill="#AA7733" d="M24.021,10.948l10.704,21.163L24.021,20.524L13.316,32.111L24.021,10.948 M24.021,9.448 + c-0.565,0-1.083,0.318-1.338,0.823L11.978,31.435c-0.338,0.667-0.132,1.481,0.483,1.909c0.259,0.18,0.558,0.268,0.855,0.268 + c0.406,0,0.809-0.164,1.102-0.482l9.604-10.394l9.603,10.394c0.293,0.317,0.696,0.482,1.103,0.482 + c0.297,0,0.596-0.088,0.854-0.268c0.615-0.428,0.82-1.242,0.483-1.909L25.36,10.271C25.104,9.767,24.587,9.448,24.021,9.448 + L24.021,9.448z"/> + </g> +</g> +<g id="escalation_-_throwing" display="none"> + <g display="inline"> + <polygon fill="#AA7733" points="24.021,20.524 34.726,32.111 24.021,10.948 13.316,32.111 "/> + </g> +</g> +<g id="conditional" display="none"> + <g display="inline"> + <path fill="#FFFFFF" d="M16.729,34.989c-0.414,0-0.75-0.336-0.75-0.75V14.431c0-0.414,0.336-0.75,0.75-0.75h15.563 + c0.414,0,0.75,0.336,0.75,0.75v19.809c0,0.414-0.336,0.75-0.75,0.75H16.729z"/> + <path fill="#AA7733" d="M32.292,14.431v19.809H16.729V14.431H32.292 M32.292,12.931H16.729c-0.829,0-1.5,0.671-1.5,1.5v19.809 + c0,0.828,0.671,1.5,1.5,1.5h15.563c0.828,0,1.5-0.672,1.5-1.5V14.431C33.792,13.602,33.12,12.931,32.292,12.931L32.292,12.931z"/> + </g> + + <line display="inline" fill="none" stroke="#AA7733" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" x1="18.754" y1="16.835" x2="30.268" y2="16.835"/> + + <line display="inline" fill="none" stroke="#AA7733" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" x1="18.754" y1="20.655" x2="30.268" y2="20.655"/> + + <line display="inline" fill="none" stroke="#AA7733" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" x1="18.754" y1="25.755" x2="30.268" y2="25.755"/> + + <line display="inline" fill="none" stroke="#AA7733" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" x1="18.754" y1="31.408" x2="30.268" y2="31.408"/> +</g> +<g id="link" display="none"> + <g display="inline"> + <path fill="#FFFFFF" d="M25.565,33.53c-0.101,0-0.201-0.021-0.297-0.062c-0.283-0.122-0.462-0.403-0.453-0.711l0.143-4.82H14.555 + c-0.253,0-0.489-0.128-0.627-0.34c-0.139-0.211-0.161-0.479-0.06-0.711l1.36-3.113l-1.346-2.726 + c-0.115-0.232-0.102-0.508,0.035-0.728c0.137-0.22,0.378-0.354,0.637-0.354h10.404l-0.143-4.821 + c-0.009-0.308,0.17-0.589,0.453-0.711c0.096-0.042,0.196-0.062,0.297-0.062c0.195,0,0.387,0.076,0.53,0.22l8.826,8.829 + c0.293,0.293,0.293,0.768,0,1.061l-8.826,8.829C25.952,33.454,25.761,33.53,25.565,33.53z"/> + <path fill="#AA7733" d="M25.565,15.122l8.826,8.829l-8.826,8.829l0.166-5.593H14.555l1.5-3.433l-1.5-3.039h11.177L25.565,15.122 + M25.565,13.622c-0.201,0-0.402,0.04-0.594,0.123c-0.564,0.243-0.923,0.807-0.905,1.421l0.12,4.049h-9.631 + c-0.519,0-1,0.268-1.274,0.708s-0.301,0.991-0.071,1.456l1.191,2.414l-1.221,2.793c-0.203,0.464-0.158,0.998,0.119,1.422 + c0.277,0.424,0.75,0.679,1.255,0.679h9.631l-0.12,4.048c-0.018,0.615,0.341,1.179,0.905,1.422 + c0.191,0.083,0.393,0.123,0.594,0.123c0.39,0,0.773-0.152,1.061-0.439l8.826-8.829c0.586-0.586,0.586-1.535,0-2.121l-8.826-8.829 + C26.339,13.774,25.955,13.622,25.565,13.622L25.565,13.622z"/> + </g> +</g> +<g id="link_-_throwing" display="none"> + <g display="inline"> + <polygon fill="#AA7733" points="34.392,23.951 25.565,15.122 25.731,20.716 14.555,20.716 16.055,23.755 14.555,27.188 + 25.731,27.188 25.565,32.78 "/> + </g> +</g> +<g id="error" display="none"> + <g display="inline"> + <path fill="#FFFFFF" d="M12.595,33.922c-0.135,0-0.272-0.037-0.395-0.112c-0.315-0.195-0.44-0.592-0.294-0.933l7.087-16.54 + c0.109-0.254,0.349-0.428,0.625-0.452c0.021-0.002,0.043-0.003,0.064-0.003c0.252,0,0.489,0.127,0.628,0.341l5.535,8.505 + l7.391-10.88c0.144-0.212,0.379-0.329,0.621-0.329c0.119,0,0.24,0.029,0.353,0.088c0.338,0.181,0.485,0.588,0.342,0.943 + l-7.087,17.476c-0.102,0.249-0.328,0.425-0.596,0.461c-0.033,0.005-0.066,0.007-0.1,0.007c-0.231,0-0.453-0.107-0.596-0.295 + l-5.572-7.286l-7.435,8.743C13.02,33.831,12.809,33.922,12.595,33.922z"/> + <path fill="#AA7733" d="M33.856,14.27h0.005 M33.856,14.27L26.77,31.745l-6.137-8.025l-8.037,9.452l7.087-16.539l6.149,9.45 + L33.856,14.27 M33.857,12.77c-0.042,0-0.083,0.001-0.125,0.005c-0.237,0.02-0.459,0.094-0.652,0.211 + c-0.148,0.09-0.283,0.206-0.396,0.348c-0.029,0.036-0.056,0.073-0.081,0.112l-6.745,9.929l-4.918-7.559 + c-0.278-0.428-0.753-0.682-1.257-0.682c-0.043,0-0.086,0.002-0.129,0.005c-0.551,0.048-1.032,0.395-1.25,0.904l-7.087,16.539 + c-0.292,0.682-0.042,1.475,0.589,1.866c0.245,0.151,0.518,0.225,0.789,0.225c0.428,0,0.85-0.183,1.144-0.528l6.833-8.035 + l5.007,6.548c0.286,0.374,0.728,0.589,1.191,0.589c0.066,0,0.133-0.005,0.2-0.014c0.533-0.071,0.987-0.424,1.189-0.923l7.057-17.4 + c0.092-0.194,0.144-0.41,0.144-0.639c0-0.811-0.642-1.472-1.445-1.499C33.895,12.77,33.876,12.77,33.857,12.77L33.857,12.77z"/> + </g> +</g> +<g id="cancel" display="none"> + <g display="inline"> + <path fill="#FFFFFF" d="M32.241,36.143c-0.192,0-0.384-0.073-0.53-0.22l-7.692-7.695l-7.693,7.695 + c-0.146,0.146-0.338,0.22-0.53,0.22s-0.384-0.073-0.53-0.22l-3.327-3.325c-0.141-0.141-0.22-0.331-0.22-0.53s0.079-0.39,0.22-0.53 + l7.693-7.696l-7.694-7.693c-0.293-0.293-0.293-0.768,0-1.061l3.326-3.328c0.141-0.141,0.331-0.22,0.53-0.22 + c0.199,0,0.39,0.079,0.53,0.22l7.695,7.695l7.692-7.693c0.146-0.146,0.338-0.22,0.53-0.22c0.191,0,0.384,0.073,0.53,0.22 + l3.328,3.326c0.141,0.141,0.22,0.331,0.22,0.53c0,0.199-0.079,0.39-0.22,0.53l-7.693,7.693l7.693,7.696 + c0.141,0.141,0.22,0.332,0.22,0.53c0,0.199-0.079,0.39-0.22,0.53l-3.328,3.325C32.625,36.069,32.433,36.143,32.241,36.143z"/> + <path fill="#AA7733" d="M15.793,12.289l8.226,8.226l8.223-8.224l3.328,3.326l-8.224,8.224l8.224,8.227l-3.328,3.325l-8.223-8.226 + l-8.224,8.226l-3.327-3.325l8.224-8.227l-8.225-8.224L15.793,12.289 M15.793,10.789L15.793,10.789 + c-0.398,0-0.78,0.158-1.061,0.439l-3.326,3.328c-0.585,0.586-0.585,1.536,0,2.121l7.164,7.164l-7.164,7.166 + c-0.281,0.281-0.439,0.663-0.439,1.061c0,0.398,0.158,0.779,0.439,1.061l3.327,3.325c0.293,0.293,0.677,0.439,1.061,0.439 + s0.768-0.146,1.061-0.439l7.163-7.164l7.162,7.164c0.293,0.293,0.677,0.439,1.061,0.439s0.768-0.146,1.061-0.438l3.328-3.325 + c0.281-0.281,0.439-0.663,0.439-1.062c0-0.397-0.158-0.779-0.439-1.061l-7.163-7.166l7.163-7.163 + c0.281-0.281,0.439-0.663,0.439-1.061c0-0.398-0.158-0.78-0.439-1.061l-3.328-3.326c-0.293-0.292-0.677-0.439-1.061-0.439 + s-0.768,0.146-1.061,0.439l-7.162,7.163l-7.165-7.165C16.572,10.947,16.191,10.789,15.793,10.789L15.793,10.789z"/> + </g> +</g> +<g id="compensation" display="none"> + <g display="inline"> + <path fill="#FFFFFF" d="M21.819,32.988c-0.171,0-0.34-0.059-0.477-0.171l-10.366-8.548c-0.173-0.143-0.273-0.354-0.273-0.579 + s0.1-0.436,0.273-0.579l10.366-8.549c0.137-0.113,0.306-0.171,0.477-0.171c0.109,0,0.218,0.023,0.32,0.072 + c0.263,0.124,0.43,0.388,0.43,0.678v17.097c0,0.29-0.167,0.555-0.43,0.679C22.037,32.965,21.928,32.988,21.819,32.988z"/> + <path fill="#AA7733" d="M21.819,15.142v17.097L11.453,23.69L21.819,15.142 M21.82,13.642c-0.342,0-0.681,0.117-0.955,0.343 + l-10.367,8.549c-0.345,0.285-0.545,0.709-0.545,1.157s0.2,0.873,0.546,1.157l10.366,8.548c0.274,0.226,0.612,0.343,0.955,0.343 + c0.217,0,0.435-0.047,0.639-0.144c0.525-0.247,0.86-0.775,0.86-1.356V15.142c0-0.581-0.335-1.109-0.86-1.357 + C22.255,13.688,22.037,13.642,21.82,13.642L21.82,13.642z"/> + </g> + <g display="inline"> + <path fill="#FFFFFF" d="M33.659,32.988c-0.171,0-0.34-0.059-0.478-0.171l-10.366-8.548c-0.173-0.143-0.273-0.354-0.273-0.579 + s0.1-0.436,0.273-0.579l10.366-8.549c0.138-0.113,0.307-0.171,0.478-0.171c0.108,0,0.218,0.023,0.32,0.072 + c0.262,0.124,0.43,0.388,0.43,0.678v17.097c0,0.29-0.168,0.555-0.43,0.679C33.877,32.965,33.768,32.988,33.659,32.988z"/> + <path fill="#AA7733" d="M33.659,15.142v17.097L23.293,23.69L33.659,15.142 M33.659,13.642c-0.342,0-0.681,0.117-0.954,0.343 + l-10.367,8.549c-0.345,0.285-0.545,0.709-0.545,1.157s0.2,0.873,0.546,1.157l10.366,8.548c0.273,0.226,0.612,0.343,0.954,0.343 + c0.218,0,0.436-0.047,0.64-0.144c0.525-0.247,0.86-0.775,0.86-1.356V15.142c0-0.581-0.335-1.109-0.86-1.357 + C34.095,13.688,33.877,13.642,33.659,13.642L33.659,13.642z"/> + </g> +</g> +<g id="compensation_-_throwing" display="none"> + <g display="inline"> + <polygon fill="#AA7733" points="21.819,32.238 11.453,23.69 21.819,15.142 "/> + </g> + <g display="inline"> + <polygon fill="#AA7733" points="33.659,32.238 23.293,23.69 33.659,15.142 "/> + </g> +</g> +<g id="signal" display="none"> + + <polygon display="inline" fill="#FFFFFF" stroke="#AA7733" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" points=" + 12.33,31.239 23.992,11.043 35.654,31.239 "/> +</g> +<g id="signal_-_throwing" display="none"> + <polygon display="inline" fill="#AA7733" points="12.33,31.239 23.992,11.043 35.654,31.239 "/> +</g> +<g id="multiple" display="none"> + + <polygon display="inline" fill="#FFFFFF" stroke="#AA7733" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" points=" + 16.621,34.119 12.065,20.101 23.991,11.436 35.916,20.101 31.362,34.119 "/> +</g> +<g id="multiple_-_throwing" display="none"> + <polygon display="inline" fill="#AA7733" points="16.621,34.119 12.065,20.101 23.991,11.436 35.916,20.101 31.362,34.119 "/> +</g> +<g id="parallel_multiple" display="none"> + <g display="inline"> + <path fill="#FFFFFF" d="M22.124,35.815c-0.414,0-0.75-0.336-0.75-0.75v-8.576l-8.576,0.001c-0.414,0-0.75-0.336-0.75-0.75 + l-0.001-3.771c0-0.199,0.079-0.39,0.22-0.53s0.331-0.22,0.53-0.22l8.577-0.001l-0.001-8.575c0-0.199,0.079-0.39,0.22-0.53 + s0.332-0.22,0.53-0.22h3.772c0.414,0,0.75,0.336,0.75,0.75v8.575h8.575c0.414,0,0.75,0.335,0.75,0.75l0.001,3.772 + c0,0.199-0.079,0.39-0.22,0.53s-0.331,0.22-0.53,0.22h-8.576v8.577c0,0.199-0.079,0.39-0.22,0.53s-0.331,0.22-0.53,0.22 + L22.124,35.815z"/> + <path fill="#AA7733" d="M25.896,12.643v9.325h9.325l0.001,3.772h-9.326v9.327l-3.771-0.002v-9.326l-9.326,0.001l-0.001-3.771 + l9.327-0.001l-0.001-9.325H25.896 M25.896,11.143h-3.772c-0.398,0-0.779,0.158-1.061,0.439s-0.439,0.663-0.439,1.061l0.001,7.825 + l-7.827,0.001c-0.398,0-0.78,0.158-1.061,0.439s-0.439,0.663-0.439,1.061l0.001,3.771c0,0.829,0.672,1.5,1.5,1.5l0,0l7.826-0.001 + v7.826c0,0.828,0.671,1.5,1.499,1.5l3.771,0.002h0.001c0.397,0,0.779-0.158,1.061-0.439s0.439-0.662,0.439-1.061V27.24h7.826 + c0.397,0,0.779-0.158,1.061-0.439s0.439-0.663,0.439-1.061l-0.001-3.773c0-0.828-0.672-1.5-1.5-1.5h-7.825v-7.825 + C27.396,11.814,26.724,11.143,25.896,11.143L25.896,11.143z"/> + </g> +</g> +</svg> Added: trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/images/events_48px_intermediate_timer_catch.svg =================================================================== --- trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/images/events_48px_intermediate_timer_catch.svg (rev 0) +++ trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/images/events_48px_intermediate_timer_catch.svg 2011-02-09 09:46:27 UTC (rev 29074) @@ -0,0 +1,229 @@ +<?xml version="1.0" encoding="utf-8"?> + +<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"> +<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="48px" + height="48px" viewBox="0 0 48 48" enable-background="new 0 0 48 48" xml:space="preserve"> +<g id="Gradient_-_Red"> + <linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="23.9487" y1="7.604" x2="23.9487" y2="39.9212"> + <stop offset="0" style="stop-color:#F7E4CD"/> + <stop offset="0.1901" style="stop-color:#F1D3A6"/> + <stop offset="0.3897" style="stop-color:#ECC382"/> + <stop offset="0.4969" style="stop-color:#EABD75"/> + <stop offset="0.63" style="stop-color:#EDC588"/> + <stop offset="0.8987" style="stop-color:#F4DBB9"/> + <stop offset="1" style="stop-color:#F7E4CD"/> + </linearGradient> + <circle fill="url(#SVGID_1_)" cx="23.949" cy="23.977" r="18"/> +</g> +<g id="catching_x2F_boundary_interupting"> + <path fill="none" stroke="#AA7733" stroke-width="1.5" stroke-miterlimit="10" d="M23.949,46.476c-12.407,0-22.5-10.093-22.5-22.5 + c0-12.406,10.093-22.5,22.5-22.5c12.406,0,22.501,10.094,22.501,22.5C46.45,36.383,36.355,46.476,23.949,46.476z"/> + <circle fill="none" stroke="#AA7733" stroke-width="1.5" stroke-miterlimit="10" cx="23.95" cy="23.976" r="18"/> +</g> +<g id="boundary_non-interupting" display="none"> + <g display="inline"> + <path fill="none" stroke="#AA7733" stroke-width="1.5" stroke-miterlimit="10" stroke-dasharray="6.2111,4.6583" d=" + M23.949,46.476c-12.407,0-22.5-10.093-22.5-22.5c0-12.406,10.093-22.5,22.5-22.5c12.406,0,22.501,10.094,22.501,22.5 + C46.45,36.383,36.355,46.476,23.949,46.476z"/> + </g> + <g display="inline"> + + <circle fill="none" stroke="#AA7733" stroke-width="1.5" stroke-miterlimit="10" stroke-dasharray="5.8737,4.4053" cx="23.95" cy="23.976" r="18"/> + </g> +</g> +<g id="_x5F__x5F__x5F__x5F__x5F__x5F__x5F__x5F__x5F__x5F__x5F__x5F__x5F__x5F__x5F__x5F__x5F__x5F__x5F__x5F__x5F__x5F__x5F__x5F__x5F__x5F__x5F__x5F__x5F__x5F__x5F__x5F__x5F__x5F__x5F__x5F__x5F__x5F__x5F__x5F__x5F_" display="none"> +</g> +<g id="message_-_throwing" display="none"> + <g display="inline"> + <polygon fill="#AA7733" points="35.742,15.002 12.34,15.002 24.069,22.938 "/> + <path fill="#AA7733" d="M24.491,24.465c-0.127,0.087-0.274,0.13-0.422,0.13c-0.146,0-0.293-0.043-0.42-0.129l-12.442-8.419v15.862 + c0,0.414,0.335,0.75,0.75,0.75h24.236c0.414,0,0.75-0.336,0.75-0.75V16L24.491,24.465z"/> + </g> +</g> +<g id="message" display="none"> + + <rect x="11.957" y="15.752" display="inline" fill="#FFFFFF" stroke="#AA7733" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" width="24.236" height="16.157"/> + + <polyline display="inline" fill="none" stroke="#AA7733" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" points=" + 11.957,15.766 24.069,23.845 36.196,15.766 "/> +</g> +<g id="timer"> + <circle fill="#FFFFFF" stroke="#AA7733" stroke-width="1.5" stroke-miterlimit="10" cx="23.918" cy="24.004" r="14.37"/> + <g> + + <line fill="none" stroke="#AA7733" stroke-width="1.5" stroke-linecap="round" stroke-miterlimit="10" x1="23.918" y1="10.206" x2="23.918" y2="11.708"/> + + <line fill="none" stroke="#AA7733" stroke-width="1.5" stroke-linecap="round" stroke-miterlimit="10" x1="17.021" y1="12.055" x2="17.771" y2="13.354"/> + + <line fill="none" stroke="#AA7733" stroke-width="1.5" stroke-linecap="round" stroke-miterlimit="10" x1="11.97" y1="17.104" x2="13.269" y2="17.855"/> + + <line fill="none" stroke="#AA7733" stroke-width="1.5" stroke-linecap="round" stroke-miterlimit="10" x1="10.121" y1="24.004" x2="11.621" y2="24.004"/> + + <line fill="none" stroke="#AA7733" stroke-width="1.5" stroke-linecap="round" stroke-miterlimit="10" x1="11.97" y1="30.901" x2="13.269" y2="30.152"/> + + <line fill="none" stroke="#AA7733" stroke-width="1.5" stroke-linecap="round" stroke-miterlimit="10" x1="17.019" y1="35.952" x2="17.771" y2="34.654"/> + + <line fill="none" stroke="#AA7733" stroke-width="1.5" stroke-linecap="round" stroke-miterlimit="10" x1="23.917" y1="37.801" x2="23.92" y2="36.301"/> + + <line fill="none" stroke="#AA7733" stroke-width="1.5" stroke-linecap="round" stroke-miterlimit="10" x1="30.815" y1="35.952" x2="30.067" y2="34.652"/> + + <line fill="none" stroke="#AA7733" stroke-width="1.5" stroke-linecap="round" stroke-miterlimit="10" x1="35.866" y1="30.902" x2="34.568" y2="30.151"/> + + <line fill="none" stroke="#AA7733" stroke-width="1.5" stroke-linecap="round" stroke-miterlimit="10" x1="37.715" y1="24.004" x2="36.215" y2="24.003"/> + + <line fill="none" stroke="#AA7733" stroke-width="1.5" stroke-linecap="round" stroke-miterlimit="10" x1="35.866" y1="17.105" x2="34.567" y2="17.854"/> + + <line fill="none" stroke="#AA7733" stroke-width="1.5" stroke-linecap="round" stroke-miterlimit="10" x1="30.815" y1="12.056" x2="30.065" y2="13.354"/> + </g> + <path fill="#AA7733" d="M33.768,24.004l-8.686-0.933l0.963-9.793l-3.041,10.233c-0.08,0.148-0.139,0.311-0.139,0.492 + c0,0.581,0.472,1.053,1.053,1.053c0.013,0,0.023-0.007,0.036-0.007v0.009L33.768,24.004z"/> +</g> +<g id="escalation" display="none"> + <g display="inline"> + <path fill="#FFFFFF" d="M13.316,32.861c-0.148,0-0.298-0.044-0.427-0.134c-0.308-0.214-0.41-0.621-0.242-0.955L23.352,10.61 + c0.128-0.252,0.387-0.412,0.669-0.412l0,0c0.283,0,0.542,0.159,0.669,0.412l10.704,21.163c0.169,0.334,0.066,0.741-0.241,0.955 + c-0.13,0.09-0.279,0.134-0.428,0.134c-0.203,0-0.404-0.082-0.551-0.241L24.021,21.63L13.867,32.62 + C13.721,32.779,13.519,32.861,13.316,32.861z"/> + <path fill="#AA7733" d="M24.021,10.948l10.704,21.163L24.021,20.524L13.316,32.111L24.021,10.948 M24.021,9.448 + c-0.565,0-1.083,0.318-1.338,0.823L11.978,31.435c-0.338,0.667-0.132,1.481,0.483,1.909c0.259,0.18,0.558,0.268,0.855,0.268 + c0.406,0,0.809-0.164,1.102-0.482l9.604-10.394l9.603,10.394c0.293,0.317,0.696,0.482,1.103,0.482 + c0.297,0,0.596-0.088,0.854-0.268c0.615-0.428,0.82-1.242,0.483-1.909L25.36,10.271C25.104,9.767,24.587,9.448,24.021,9.448 + L24.021,9.448z"/> + </g> +</g> +<g id="escalation_-_throwing" display="none"> + <g display="inline"> + <polygon fill="#AA7733" points="24.021,20.524 34.726,32.111 24.021,10.948 13.316,32.111 "/> + </g> +</g> +<g id="conditional" display="none"> + <g display="inline"> + <path fill="#FFFFFF" d="M16.729,34.989c-0.414,0-0.75-0.336-0.75-0.75V14.431c0-0.414,0.336-0.75,0.75-0.75h15.563 + c0.414,0,0.75,0.336,0.75,0.75v19.809c0,0.414-0.336,0.75-0.75,0.75H16.729z"/> + <path fill="#AA7733" d="M32.292,14.431v19.809H16.729V14.431H32.292 M32.292,12.931H16.729c-0.829,0-1.5,0.671-1.5,1.5v19.809 + c0,0.828,0.671,1.5,1.5,1.5h15.563c0.828,0,1.5-0.672,1.5-1.5V14.431C33.792,13.602,33.12,12.931,32.292,12.931L32.292,12.931z"/> + </g> + + <line display="inline" fill="none" stroke="#AA7733" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" x1="18.754" y1="16.835" x2="30.268" y2="16.835"/> + + <line display="inline" fill="none" stroke="#AA7733" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" x1="18.754" y1="20.655" x2="30.268" y2="20.655"/> + + <line display="inline" fill="none" stroke="#AA7733" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" x1="18.754" y1="25.755" x2="30.268" y2="25.755"/> + + <line display="inline" fill="none" stroke="#AA7733" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" x1="18.754" y1="31.408" x2="30.268" y2="31.408"/> +</g> +<g id="link" display="none"> + <g display="inline"> + <path fill="#FFFFFF" d="M25.565,33.53c-0.101,0-0.201-0.021-0.297-0.062c-0.283-0.122-0.462-0.403-0.453-0.711l0.143-4.82H14.555 + c-0.253,0-0.489-0.128-0.627-0.34c-0.139-0.211-0.161-0.479-0.06-0.711l1.36-3.113l-1.346-2.726 + c-0.115-0.232-0.102-0.508,0.035-0.728c0.137-0.22,0.378-0.354,0.637-0.354h10.404l-0.143-4.821 + c-0.009-0.308,0.17-0.589,0.453-0.711c0.096-0.042,0.196-0.062,0.297-0.062c0.195,0,0.387,0.076,0.53,0.22l8.826,8.829 + c0.293,0.293,0.293,0.768,0,1.061l-8.826,8.829C25.952,33.454,25.761,33.53,25.565,33.53z"/> + <path fill="#AA7733" d="M25.565,15.122l8.826,8.829l-8.826,8.829l0.166-5.593H14.555l1.5-3.433l-1.5-3.039h11.177L25.565,15.122 + M25.565,13.622c-0.201,0-0.402,0.04-0.594,0.123c-0.564,0.243-0.923,0.807-0.905,1.421l0.12,4.049h-9.631 + c-0.519,0-1,0.268-1.274,0.708s-0.301,0.991-0.071,1.456l1.191,2.414l-1.221,2.793c-0.203,0.464-0.158,0.998,0.119,1.422 + c0.277,0.424,0.75,0.679,1.255,0.679h9.631l-0.12,4.048c-0.018,0.615,0.341,1.179,0.905,1.422 + c0.191,0.083,0.393,0.123,0.594,0.123c0.39,0,0.773-0.152,1.061-0.439l8.826-8.829c0.586-0.586,0.586-1.535,0-2.121l-8.826-8.829 + C26.339,13.774,25.955,13.622,25.565,13.622L25.565,13.622z"/> + </g> +</g> +<g id="link_-_throwing" display="none"> + <g display="inline"> + <polygon fill="#AA7733" points="34.392,23.951 25.565,15.122 25.731,20.716 14.555,20.716 16.055,23.755 14.555,27.188 + 25.731,27.188 25.565,32.78 "/> + </g> +</g> +<g id="error" display="none"> + <g display="inline"> + <path fill="#FFFFFF" d="M12.595,33.922c-0.135,0-0.272-0.037-0.395-0.112c-0.315-0.195-0.44-0.592-0.294-0.933l7.087-16.54 + c0.109-0.254,0.349-0.428,0.625-0.452c0.021-0.002,0.043-0.003,0.064-0.003c0.252,0,0.489,0.127,0.628,0.341l5.535,8.505 + l7.391-10.88c0.144-0.212,0.379-0.329,0.621-0.329c0.119,0,0.24,0.029,0.353,0.088c0.338,0.181,0.485,0.588,0.342,0.943 + l-7.087,17.476c-0.102,0.249-0.328,0.425-0.596,0.461c-0.033,0.005-0.066,0.007-0.1,0.007c-0.231,0-0.453-0.107-0.596-0.295 + l-5.572-7.286l-7.435,8.743C13.02,33.831,12.809,33.922,12.595,33.922z"/> + <path fill="#AA7733" d="M33.856,14.27h0.005 M33.856,14.27L26.77,31.745l-6.137-8.025l-8.037,9.452l7.087-16.539l6.149,9.45 + L33.856,14.27 M33.857,12.77c-0.042,0-0.083,0.001-0.125,0.005c-0.237,0.02-0.459,0.094-0.652,0.211 + c-0.148,0.09-0.283,0.206-0.396,0.348c-0.029,0.036-0.056,0.073-0.081,0.112l-6.745,9.929l-4.918-7.559 + c-0.278-0.428-0.753-0.682-1.257-0.682c-0.043,0-0.086,0.002-0.129,0.005c-0.551,0.048-1.032,0.395-1.25,0.904l-7.087,16.539 + c-0.292,0.682-0.042,1.475,0.589,1.866c0.245,0.151,0.518,0.225,0.789,0.225c0.428,0,0.85-0.183,1.144-0.528l6.833-8.035 + l5.007,6.548c0.286,0.374,0.728,0.589,1.191,0.589c0.066,0,0.133-0.005,0.2-0.014c0.533-0.071,0.987-0.424,1.189-0.923l7.057-17.4 + c0.092-0.194,0.144-0.41,0.144-0.639c0-0.811-0.642-1.472-1.445-1.499C33.895,12.77,33.876,12.77,33.857,12.77L33.857,12.77z"/> + </g> +</g> +<g id="cancel" display="none"> + <g display="inline"> + <path fill="#FFFFFF" d="M32.241,36.143c-0.192,0-0.384-0.073-0.53-0.22l-7.692-7.695l-7.693,7.695 + c-0.146,0.146-0.338,0.22-0.53,0.22s-0.384-0.073-0.53-0.22l-3.327-3.325c-0.141-0.141-0.22-0.331-0.22-0.53s0.079-0.39,0.22-0.53 + l7.693-7.696l-7.694-7.693c-0.293-0.293-0.293-0.768,0-1.061l3.326-3.328c0.141-0.141,0.331-0.22,0.53-0.22 + c0.199,0,0.39,0.079,0.53,0.22l7.695,7.695l7.692-7.693c0.146-0.146,0.338-0.22,0.53-0.22c0.191,0,0.384,0.073,0.53,0.22 + l3.328,3.326c0.141,0.141,0.22,0.331,0.22,0.53c0,0.199-0.079,0.39-0.22,0.53l-7.693,7.693l7.693,7.696 + c0.141,0.141,0.22,0.332,0.22,0.53c0,0.199-0.079,0.39-0.22,0.53l-3.328,3.325C32.625,36.069,32.433,36.143,32.241,36.143z"/> + <path fill="#AA7733" d="M15.793,12.289l8.226,8.226l8.223-8.224l3.328,3.326l-8.224,8.224l8.224,8.227l-3.328,3.325l-8.223-8.226 + l-8.224,8.226l-3.327-3.325l8.224-8.227l-8.225-8.224L15.793,12.289 M15.793,10.789L15.793,10.789 + c-0.398,0-0.78,0.158-1.061,0.439l-3.326,3.328c-0.585,0.586-0.585,1.536,0,2.121l7.164,7.164l-7.164,7.166 + c-0.281,0.281-0.439,0.663-0.439,1.061c0,0.398,0.158,0.779,0.439,1.061l3.327,3.325c0.293,0.293,0.677,0.439,1.061,0.439 + s0.768-0.146,1.061-0.439l7.163-7.164l7.162,7.164c0.293,0.293,0.677,0.439,1.061,0.439s0.768-0.146,1.061-0.438l3.328-3.325 + c0.281-0.281,0.439-0.663,0.439-1.062c0-0.397-0.158-0.779-0.439-1.061l-7.163-7.166l7.163-7.163 + c0.281-0.281,0.439-0.663,0.439-1.061c0-0.398-0.158-0.78-0.439-1.061l-3.328-3.326c-0.293-0.292-0.677-0.439-1.061-0.439 + s-0.768,0.146-1.061,0.439l-7.162,7.163l-7.165-7.165C16.572,10.947,16.191,10.789,15.793,10.789L15.793,10.789z"/> + </g> +</g> +<g id="compensation" display="none"> + <g display="inline"> + <path fill="#FFFFFF" d="M21.819,32.988c-0.171,0-0.34-0.059-0.477-0.171l-10.366-8.548c-0.173-0.143-0.273-0.354-0.273-0.579 + s0.1-0.436,0.273-0.579l10.366-8.549c0.137-0.113,0.306-0.171,0.477-0.171c0.109,0,0.218,0.023,0.32,0.072 + c0.263,0.124,0.43,0.388,0.43,0.678v17.097c0,0.29-0.167,0.555-0.43,0.679C22.037,32.965,21.928,32.988,21.819,32.988z"/> + <path fill="#AA7733" d="M21.819,15.142v17.097L11.453,23.69L21.819,15.142 M21.82,13.642c-0.342,0-0.681,0.117-0.955,0.343 + l-10.367,8.549c-0.345,0.285-0.545,0.709-0.545,1.157s0.2,0.873,0.546,1.157l10.366,8.548c0.274,0.226,0.612,0.343,0.955,0.343 + c0.217,0,0.435-0.047,0.639-0.144c0.525-0.247,0.86-0.775,0.86-1.356V15.142c0-0.581-0.335-1.109-0.86-1.357 + C22.255,13.688,22.037,13.642,21.82,13.642L21.82,13.642z"/> + </g> + <g display="inline"> + <path fill="#FFFFFF" d="M33.659,32.988c-0.171,0-0.34-0.059-0.478-0.171l-10.366-8.548c-0.173-0.143-0.273-0.354-0.273-0.579 + s0.1-0.436,0.273-0.579l10.366-8.549c0.138-0.113,0.307-0.171,0.478-0.171c0.108,0,0.218,0.023,0.32,0.072 + c0.262,0.124,0.43,0.388,0.43,0.678v17.097c0,0.29-0.168,0.555-0.43,0.679C33.877,32.965,33.768,32.988,33.659,32.988z"/> + <path fill="#AA7733" d="M33.659,15.142v17.097L23.293,23.69L33.659,15.142 M33.659,13.642c-0.342,0-0.681,0.117-0.954,0.343 + l-10.367,8.549c-0.345,0.285-0.545,0.709-0.545,1.157s0.2,0.873,0.546,1.157l10.366,8.548c0.273,0.226,0.612,0.343,0.954,0.343 + c0.218,0,0.436-0.047,0.64-0.144c0.525-0.247,0.86-0.775,0.86-1.356V15.142c0-0.581-0.335-1.109-0.86-1.357 + C34.095,13.688,33.877,13.642,33.659,13.642L33.659,13.642z"/> + </g> +</g> +<g id="compensation_-_throwing" display="none"> + <g display="inline"> + <polygon fill="#AA7733" points="21.819,32.238 11.453,23.69 21.819,15.142 "/> + </g> + <g display="inline"> + <polygon fill="#AA7733" points="33.659,32.238 23.293,23.69 33.659,15.142 "/> + </g> +</g> +<g id="signal" display="none"> + + <polygon display="inline" fill="#FFFFFF" stroke="#AA7733" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" points=" + 12.33,31.239 23.992,11.043 35.654,31.239 "/> +</g> +<g id="signal_-_throwing" display="none"> + <polygon display="inline" fill="#AA7733" points="12.33,31.239 23.992,11.043 35.654,31.239 "/> +</g> +<g id="multiple" display="none"> + + <polygon display="inline" fill="#FFFFFF" stroke="#AA7733" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" points=" + 16.621,34.119 12.065,20.101 23.991,11.436 35.916,20.101 31.362,34.119 "/> +</g> +<g id="multiple_-_throwing" display="none"> + <polygon display="inline" fill="#AA7733" points="16.621,34.119 12.065,20.101 23.991,11.436 35.916,20.101 31.362,34.119 "/> +</g> +<g id="parallel_multiple" display="none"> + <g display="inline"> + <path fill="#FFFFFF" d="M22.124,35.815c-0.414,0-0.75-0.336-0.75-0.75v-8.576l-8.576,0.001c-0.414,0-0.75-0.336-0.75-0.75 + l-0.001-3.771c0-0.199,0.079-0.39,0.22-0.53s0.331-0.22,0.53-0.22l8.577-0.001l-0.001-8.575c0-0.199,0.079-0.39,0.22-0.53 + s0.332-0.22,0.53-0.22h3.772c0.414,0,0.75,0.336,0.75,0.75v8.575h8.575c0.414,0,0.75,0.335,0.75,0.75l0.001,3.772 + c0,0.199-0.079,0.39-0.22,0.53s-0.331,0.22-0.53,0.22h-8.576v8.577c0,0.199-0.079,0.39-0.22,0.53s-0.331,0.22-0.53,0.22 + L22.124,35.815z"/> + <path fill="#AA7733" d="M25.896,12.643v9.325h9.325l0.001,3.772h-9.326v9.327l-3.771-0.002v-9.326l-9.326,0.001l-0.001-3.771 + l9.327-0.001l-0.001-9.325H25.896 M25.896,11.143h-3.772c-0.398,0-0.779,0.158-1.061,0.439s-0.439,0.663-0.439,1.061l0.001,7.825 + l-7.827,0.001c-0.398,0-0.78,0.158-1.061,0.439s-0.439,0.663-0.439,1.061l0.001,3.771c0,0.829,0.672,1.5,1.5,1.5l0,0l7.826-0.001 + v7.826c0,0.828,0.671,1.5,1.499,1.5l3.771,0.002h0.001c0.397,0,0.779-0.158,1.061-0.439s0.439-0.662,0.439-1.061V27.24h7.826 + c0.397,0,0.779-0.158,1.061-0.439s0.439-0.663,0.439-1.061l-0.001-3.773c0-0.828-0.672-1.5-1.5-1.5h-7.825v-7.825 + C27.396,11.814,26.724,11.143,25.896,11.143L25.896,11.143z"/> + </g> +</g> +</svg> Added: trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/images/events_48px_start_message.svg =================================================================== --- trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/images/events_48px_start_message.svg (rev 0) +++ trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/images/events_48px_start_message.svg 2011-02-09 09:46:27 UTC (rev 29074) @@ -0,0 +1,158 @@ +<?xml version="1.0" encoding="utf-8"?> + +<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"> +<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="48px" + height="48px" viewBox="0 0 48 48" enable-background="new 0 0 48 48" xml:space="preserve"> +<g id="Gradient_-_Red"> + <linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="23.9341" y1="7.6167" x2="23.9341" y2="39.9339"> + <stop offset="0" style="stop-color:#EFFCE5"/> + <stop offset="0.0596" style="stop-color:#E8F7DD"/> + <stop offset="0.3441" style="stop-color:#CAE1B9"/> + <stop offset="0.4969" style="stop-color:#BFD9AC"/> + <stop offset="0.6907" style="stop-color:#CFE5BF"/> + <stop offset="1" style="stop-color:#EFFCE5"/> + </linearGradient> + <circle fill="url(#SVGID_1_)" cx="23.934" cy="23.989" r="18"/> +</g> +<g id="top-level"> + <circle fill="none" stroke="#6D8B47" stroke-width="1.5" stroke-miterlimit="10" cx="23.935" cy="23.988" r="18"/> +</g> +<g id="sub_process_interupting" display="none"> + <g display="inline"> + + <circle fill="none" stroke="#6D8B47" stroke-width="1.5" stroke-miterlimit="10" stroke-dasharray="5.8737,4.4053" cx="23.958" cy="23.968" r="18"/> + </g> +</g> +<g id="_x5F__x5F__x5F__x5F__x5F__x5F__x5F__x5F__x5F__x5F__x5F__x5F__x5F__x5F__x5F__x5F__x5F__x5F__x5F__x5F__x5F__x5F__x5F__x5F__x5F__x5F__x5F__x5F__x5F__x5F__x5F__x5F__x5F__x5F__x5F__x5F__x5F__x5F__x5F__x5F__x5F_"> +</g> +<g id="message"> + + <rect x="11.965" y="15.744" fill="#FFFFFF" stroke="#6D8B47" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" width="24.236" height="16.157"/> + + <polyline fill="none" stroke="#6D8B47" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" points=" + 11.965,15.758 24.077,23.837 36.204,15.758 "/> +</g> +<g id="timer" display="none"> + + <circle display="inline" fill="#FFFFFF" stroke="#6D8B47" stroke-width="1.5" stroke-miterlimit="10" cx="23.926" cy="23.996" r="14.37"/> + <g display="inline"> + + <line fill="none" stroke="#6D8B47" stroke-width="1.5" stroke-linecap="round" stroke-miterlimit="10" x1="23.926" y1="10.198" x2="23.926" y2="11.7"/> + + <line fill="none" stroke="#6D8B47" stroke-width="1.5" stroke-linecap="round" stroke-miterlimit="10" x1="17.028" y1="12.047" x2="17.778" y2="13.347"/> + + <line fill="none" stroke="#6D8B47" stroke-width="1.5" stroke-linecap="round" stroke-miterlimit="10" x1="11.978" y1="17.097" x2="13.276" y2="17.848"/> + + <line fill="none" stroke="#6D8B47" stroke-width="1.5" stroke-linecap="round" stroke-miterlimit="10" x1="10.129" y1="23.996" x2="11.629" y2="23.996"/> + + <line fill="none" stroke="#6D8B47" stroke-width="1.5" stroke-linecap="round" stroke-miterlimit="10" x1="11.978" y1="30.894" x2="13.276" y2="30.145"/> + + <line fill="none" stroke="#6D8B47" stroke-width="1.5" stroke-linecap="round" stroke-miterlimit="10" x1="17.026" y1="35.944" x2="17.778" y2="34.646"/> + + <line fill="none" stroke="#6D8B47" stroke-width="1.5" stroke-linecap="round" stroke-miterlimit="10" x1="23.925" y1="37.793" x2="23.928" y2="36.293"/> + + <line fill="none" stroke="#6D8B47" stroke-width="1.5" stroke-linecap="round" stroke-miterlimit="10" x1="30.823" y1="35.944" x2="30.075" y2="34.645"/> + + <line fill="none" stroke="#6D8B47" stroke-width="1.5" stroke-linecap="round" stroke-miterlimit="10" x1="35.874" y1="30.895" x2="34.576" y2="30.144"/> + + <line fill="none" stroke="#6D8B47" stroke-width="1.5" stroke-linecap="round" stroke-miterlimit="10" x1="37.723" y1="23.996" x2="36.223" y2="23.995"/> + + <line fill="none" stroke="#6D8B47" stroke-width="1.5" stroke-linecap="round" stroke-miterlimit="10" x1="35.874" y1="17.098" x2="34.575" y2="17.847"/> + + <line fill="none" stroke="#6D8B47" stroke-width="1.5" stroke-linecap="round" stroke-miterlimit="10" x1="30.823" y1="12.048" x2="30.073" y2="13.346"/> + </g> + <path display="inline" fill="#6D8B47" d="M33.775,23.996l-8.686-0.933l0.963-9.793l-3.041,10.233 + c-0.08,0.148-0.139,0.311-0.139,0.492c0,0.581,0.472,1.053,1.053,1.053c0.013,0,0.023-0.007,0.036-0.007v0.009L33.775,23.996z"/> +</g> +<g id="escalation" display="none"> + <g display="inline"> + <path fill="#FFFFFF" d="M13.324,32.854c-0.148,0-0.298-0.044-0.427-0.134c-0.308-0.214-0.41-0.621-0.242-0.955L23.36,10.602 + c0.128-0.252,0.387-0.412,0.669-0.412l0,0c0.283,0,0.542,0.159,0.669,0.412l10.704,21.163c0.169,0.334,0.066,0.741-0.241,0.955 + c-0.13,0.09-0.279,0.134-0.428,0.134c-0.203,0-0.404-0.082-0.551-0.241l-10.153-10.99l-10.154,10.99 + C13.729,32.771,13.527,32.854,13.324,32.854z"/> + <path fill="#6D8B47" d="M24.029,10.94l10.704,21.163L24.029,20.517L13.324,32.104L24.029,10.94 M24.029,9.44 + c-0.565,0-1.083,0.318-1.338,0.823L11.986,31.427c-0.338,0.667-0.132,1.481,0.483,1.909c0.259,0.18,0.558,0.268,0.855,0.268 + c0.406,0,0.809-0.164,1.102-0.482l9.604-10.394l9.603,10.394c0.293,0.317,0.696,0.482,1.103,0.482 + c0.297,0,0.596-0.088,0.854-0.268c0.615-0.428,0.82-1.242,0.483-1.909L25.368,10.263C25.112,9.759,24.595,9.44,24.029,9.44 + L24.029,9.44z"/> + </g> +</g> +<g id="conditional" display="none"> + <g display="inline"> + <path fill="#FFFFFF" d="M16.736,34.981c-0.414,0-0.75-0.336-0.75-0.75V14.423c0-0.414,0.336-0.75,0.75-0.75H32.3 + c0.414,0,0.75,0.336,0.75,0.75v19.809c0,0.414-0.336,0.75-0.75,0.75H16.736z"/> + <path fill="#6D8B47" d="M32.3,14.423v19.809H16.736V14.423H32.3 M32.3,12.923H16.736c-0.829,0-1.5,0.671-1.5,1.5v19.809 + c0,0.828,0.671,1.5,1.5,1.5H32.3c0.828,0,1.5-0.672,1.5-1.5V14.423C33.8,13.594,33.128,12.923,32.3,12.923L32.3,12.923z"/> + </g> + + <line display="inline" fill="none" stroke="#6D8B47" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" x1="18.762" y1="16.827" x2="30.275" y2="16.827"/> + + <line display="inline" fill="none" stroke="#6D8B47" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" x1="18.762" y1="20.647" x2="30.275" y2="20.647"/> + + <line display="inline" fill="none" stroke="#6D8B47" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" x1="18.762" y1="25.747" x2="30.275" y2="25.747"/> + + <line display="inline" fill="none" stroke="#6D8B47" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" x1="18.762" y1="31.4" x2="30.275" y2="31.4"/> +</g> +<g id="error" display="none"> + <g display="inline"> + <path fill="#FFFFFF" d="M12.603,33.914c-0.135,0-0.272-0.037-0.395-0.112c-0.315-0.195-0.44-0.592-0.294-0.933l7.087-16.54 + c0.109-0.254,0.349-0.428,0.625-0.452c0.021-0.002,0.043-0.003,0.064-0.003c0.252,0,0.489,0.127,0.628,0.341l5.535,8.505 + l7.391-10.88c0.144-0.212,0.379-0.329,0.621-0.329c0.119,0,0.24,0.029,0.353,0.088c0.338,0.181,0.485,0.588,0.342,0.943 + L27.473,32.02c-0.102,0.249-0.328,0.425-0.596,0.461c-0.033,0.005-0.066,0.007-0.1,0.007c-0.231,0-0.453-0.107-0.596-0.295 + l-5.572-7.286l-7.435,8.743C13.028,33.823,12.817,33.914,12.603,33.914z"/> + <path fill="#6D8B47" d="M33.864,14.262h0.005 M33.864,14.262l-7.087,17.476l-6.137-8.025l-8.037,9.452l7.087-16.539l6.149,9.45 + L33.864,14.262 M33.865,12.762c-0.042,0-0.083,0.001-0.125,0.005c-0.237,0.02-0.459,0.094-0.652,0.211 + c-0.148,0.09-0.283,0.206-0.396,0.348c-0.029,0.036-0.056,0.073-0.081,0.112l-6.745,9.929l-4.918-7.559 + c-0.278-0.428-0.753-0.682-1.257-0.682c-0.043,0-0.086,0.002-0.129,0.005c-0.551,0.048-1.032,0.395-1.25,0.904l-7.087,16.539 + c-0.292,0.682-0.042,1.475,0.589,1.866c0.245,0.151,0.518,0.225,0.789,0.225c0.428,0,0.85-0.183,1.144-0.528l6.833-8.035 + l5.007,6.548c0.286,0.374,0.728,0.589,1.191,0.589c0.066,0,0.133-0.005,0.2-0.014c0.533-0.071,0.987-0.424,1.189-0.923l7.057-17.4 + c0.092-0.194,0.144-0.41,0.144-0.639c0-0.811-0.642-1.472-1.445-1.499C33.902,12.762,33.884,12.762,33.865,12.762L33.865,12.762z" + /> + </g> +</g> +<g id="compensation" display="none"> + <g display="inline"> + <path fill="#FFFFFF" d="M21.827,32.98c-0.171,0-0.34-0.059-0.477-0.171l-10.366-8.548c-0.173-0.143-0.273-0.354-0.273-0.579 + s0.1-0.436,0.273-0.579l10.366-8.549c0.137-0.113,0.306-0.171,0.477-0.171c0.109,0,0.218,0.023,0.32,0.072 + c0.263,0.124,0.43,0.388,0.43,0.678V32.23c0,0.29-0.167,0.555-0.43,0.679C22.045,32.957,21.936,32.98,21.827,32.98z"/> + <path fill="#6D8B47" d="M21.827,15.134V32.23l-10.366-8.548L21.827,15.134 M21.828,13.634c-0.342,0-0.681,0.117-0.955,0.343 + l-10.367,8.549c-0.345,0.285-0.545,0.709-0.545,1.157s0.2,0.873,0.546,1.157l10.366,8.548c0.274,0.226,0.612,0.343,0.955,0.343 + c0.217,0,0.435-0.047,0.639-0.144c0.525-0.247,0.86-0.775,0.86-1.356V15.134c0-0.581-0.335-1.109-0.86-1.357 + C22.263,13.681,22.044,13.634,21.828,13.634L21.828,13.634z"/> + </g> + <g display="inline"> + <path fill="#FFFFFF" d="M33.667,32.98c-0.171,0-0.34-0.059-0.478-0.171l-10.366-8.548c-0.173-0.143-0.273-0.354-0.273-0.579 + s0.1-0.436,0.273-0.579l10.366-8.549c0.138-0.113,0.307-0.171,0.478-0.171c0.108,0,0.218,0.023,0.32,0.072 + c0.262,0.124,0.43,0.388,0.43,0.678V32.23c0,0.29-0.168,0.555-0.43,0.679C33.885,32.957,33.775,32.98,33.667,32.98z"/> + <path fill="#6D8B47" d="M33.667,15.134V32.23l-10.366-8.548L33.667,15.134 M33.667,13.634c-0.342,0-0.681,0.117-0.954,0.343 + l-10.367,8.549c-0.345,0.285-0.545,0.709-0.545,1.157s0.2,0.873,0.546,1.157l10.366,8.548c0.273,0.226,0.612,0.343,0.954,0.343 + c0.218,0,0.436-0.047,0.64-0.144c0.525-0.247,0.86-0.775,0.86-1.356V15.134c0-0.581-0.335-1.109-0.86-1.357 + C34.103,13.681,33.885,13.634,33.667,13.634L33.667,13.634z"/> + </g> +</g> +<g id="signal" display="none"> + + <polygon display="inline" fill="#FFFFFF" stroke="#EFFCE5" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" points=" + 12.338,31.231 24,11.035 35.662,31.231 "/> +</g> +<g id="multiple" display="none"> + + <polygon display="inline" fill="#FFFFFF" stroke="#6D8B47" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" points=" + 16.629,34.111 12.073,20.093 23.999,11.428 35.924,20.093 31.37,34.111 "/> +</g> +<g id="parallel_multiple" display="none"> + <g display="inline"> + <path fill="#FFFFFF" d="M22.131,35.808c-0.414,0-0.75-0.336-0.75-0.75v-8.576l-8.576,0.001c-0.414,0-0.75-0.336-0.75-0.75 + l-0.001-3.771c0-0.199,0.079-0.39,0.22-0.53s0.331-0.22,0.53-0.22l8.577-0.001l-0.001-8.575c0-0.199,0.079-0.39,0.22-0.53 + s0.332-0.22,0.53-0.22h3.772c0.414,0,0.75,0.336,0.75,0.75v8.575h8.575c0.414,0,0.75,0.335,0.75,0.75l0.001,3.772 + c0,0.199-0.079,0.39-0.22,0.53s-0.331,0.22-0.53,0.22h-8.576v8.577c0,0.199-0.079,0.39-0.22,0.53s-0.331,0.22-0.53,0.22 + L22.131,35.808z"/> + <path fill="#6D8B47" d="M25.903,12.635v9.325h9.325l0.001,3.772h-9.326v9.327l-3.771-0.002v-9.326l-9.326,0.001l-0.001-3.771 + l9.327-0.001l-0.001-9.325H25.903 M25.903,11.135h-3.772c-0.398,0-0.779,0.158-1.061,0.439s-0.439,0.663-0.439,1.061l0.001,7.825 + l-7.827,0.001c-0.398,0-0.78,0.158-1.061,0.439s-0.439,0.663-0.439,1.061l0.001,3.771c0,0.829,0.672,1.5,1.5,1.5l0,0l7.826-0.001 + v7.826c0,0.828,0.671,1.5,1.499,1.5l3.771,0.002h0.001c0.397,0,0.779-0.158,1.061-0.439s0.439-0.662,0.439-1.061v-7.827h7.826 + c0.397,0,0.779-0.158,1.061-0.439s0.439-0.663,0.439-1.061l-0.001-3.773c0-0.828-0.672-1.5-1.5-1.5h-7.825v-7.825 + C27.403,11.806,26.731,11.135,25.903,11.135L25.903,11.135z"/> + </g> +</g> +</svg> Added: trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/images/events_48px_start_none.svg =================================================================== --- trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/images/events_48px_start_none.svg (rev 0) +++ trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/images/events_48px_start_none.svg 2011-02-09 09:46:27 UTC (rev 29074) @@ -0,0 +1,158 @@ +<?xml version="1.0" encoding="utf-8"?> + +<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"> +<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="48px" + height="48px" viewBox="0 0 48 48" enable-background="new 0 0 48 48" xml:space="preserve"> +<g id="Gradient_-_Red"> + <linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="23.9341" y1="7.6167" x2="23.9341" y2="39.9339"> + <stop offset="0" style="stop-color:#EFFCE5"/> + <stop offset="0.0596" style="stop-color:#E8F7DD"/> + <stop offset="0.3441" style="stop-color:#CAE1B9"/> + <stop offset="0.4969" style="stop-color:#BFD9AC"/> + <stop offset="0.6907" style="stop-color:#CFE5BF"/> + <stop offset="1" style="stop-color:#EFFCE5"/> + </linearGradient> + <circle fill="url(#SVGID_1_)" cx="23.934" cy="23.989" r="18"/> +</g> +<g id="top-level"> + <circle fill="none" stroke="#6D8B47" stroke-width="1.5" stroke-miterlimit="10" cx="23.935" cy="23.988" r="18"/> +</g> +<g id="sub_process_interupting" display="none"> + <g display="inline"> + + <circle fill="none" stroke="#6D8B47" stroke-width="1.5" stroke-miterlimit="10" stroke-dasharray="5.8737,4.4053" cx="23.958" cy="23.968" r="18"/> + </g> +</g> +<g id="_x5F__x5F__x5F__x5F__x5F__x5F__x5F__x5F__x5F__x5F__x5F__x5F__x5F__x5F__x5F__x5F__x5F__x5F__x5F__x5F__x5F__x5F__x5F__x5F__x5F__x5F__x5F__x5F__x5F__x5F__x5F__x5F__x5F__x5F__x5F__x5F__x5F__x5F__x5F__x5F__x5F_"> +</g> +<g id="message" display="none"> + + <rect x="11.965" y="15.744" display="inline" fill="#FFFFFF" stroke="#6D8B47" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" width="24.236" height="16.157"/> + + <polyline display="inline" fill="none" stroke="#6D8B47" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" points=" + 11.965,15.758 24.077,23.837 36.204,15.758 "/> +</g> +<g id="timer" display="none"> + + <circle display="inline" fill="#FFFFFF" stroke="#6D8B47" stroke-width="1.5" stroke-miterlimit="10" cx="23.926" cy="23.996" r="14.37"/> + <g display="inline"> + + <line fill="none" stroke="#6D8B47" stroke-width="1.5" stroke-linecap="round" stroke-miterlimit="10" x1="23.926" y1="10.198" x2="23.926" y2="11.7"/> + + <line fill="none" stroke="#6D8B47" stroke-width="1.5" stroke-linecap="round" stroke-miterlimit="10" x1="17.028" y1="12.047" x2="17.778" y2="13.347"/> + + <line fill="none" stroke="#6D8B47" stroke-width="1.5" stroke-linecap="round" stroke-miterlimit="10" x1="11.978" y1="17.097" x2="13.276" y2="17.848"/> + + <line fill="none" stroke="#6D8B47" stroke-width="1.5" stroke-linecap="round" stroke-miterlimit="10" x1="10.129" y1="23.996" x2="11.629" y2="23.996"/> + + <line fill="none" stroke="#6D8B47" stroke-width="1.5" stroke-linecap="round" stroke-miterlimit="10" x1="11.978" y1="30.894" x2="13.276" y2="30.145"/> + + <line fill="none" stroke="#6D8B47" stroke-width="1.5" stroke-linecap="round" stroke-miterlimit="10" x1="17.026" y1="35.944" x2="17.778" y2="34.646"/> + + <line fill="none" stroke="#6D8B47" stroke-width="1.5" stroke-linecap="round" stroke-miterlimit="10" x1="23.925" y1="37.793" x2="23.928" y2="36.293"/> + + <line fill="none" stroke="#6D8B47" stroke-width="1.5" stroke-linecap="round" stroke-miterlimit="10" x1="30.823" y1="35.944" x2="30.075" y2="34.645"/> + + <line fill="none" stroke="#6D8B47" stroke-width="1.5" stroke-linecap="round" stroke-miterlimit="10" x1="35.874" y1="30.895" x2="34.576" y2="30.144"/> + + <line fill="none" stroke="#6D8B47" stroke-width="1.5" stroke-linecap="round" stroke-miterlimit="10" x1="37.723" y1="23.996" x2="36.223" y2="23.995"/> + + <line fill="none" stroke="#6D8B47" stroke-width="1.5" stroke-linecap="round" stroke-miterlimit="10" x1="35.874" y1="17.098" x2="34.575" y2="17.847"/> + + <line fill="none" stroke="#6D8B47" stroke-width="1.5" stroke-linecap="round" stroke-miterlimit="10" x1="30.823" y1="12.048" x2="30.073" y2="13.346"/> + </g> + <path display="inline" fill="#6D8B47" d="M33.775,23.996l-8.686-0.933l0.963-9.793l-3.041,10.233 + c-0.08,0.148-0.139,0.311-0.139,0.492c0,0.581,0.472,1.053,1.053,1.053c0.013,0,0.023-0.007,0.036-0.007v0.009L33.775,23.996z"/> +</g> +<g id="escalation" display="none"> + <g display="inline"> + <path fill="#FFFFFF" d="M13.324,32.854c-0.148,0-0.298-0.044-0.427-0.134c-0.308-0.214-0.41-0.621-0.242-0.955L23.36,10.602 + c0.128-0.252,0.387-0.412,0.669-0.412l0,0c0.283,0,0.542,0.159,0.669,0.412l10.704,21.163c0.169,0.334,0.066,0.741-0.241,0.955 + c-0.13,0.09-0.279,0.134-0.428,0.134c-0.203,0-0.404-0.082-0.551-0.241l-10.153-10.99l-10.154,10.99 + C13.729,32.771,13.527,32.854,13.324,32.854z"/> + <path fill="#6D8B47" d="M24.029,10.94l10.704,21.163L24.029,20.517L13.324,32.104L24.029,10.94 M24.029,9.44 + c-0.565,0-1.083,0.318-1.338,0.823L11.986,31.427c-0.338,0.667-0.132,1.481,0.483,1.909c0.259,0.18,0.558,0.268,0.855,0.268 + c0.406,0,0.809-0.164,1.102-0.482l9.604-10.394l9.603,10.394c0.293,0.317,0.696,0.482,1.103,0.482 + c0.297,0,0.596-0.088,0.854-0.268c0.615-0.428,0.82-1.242,0.483-1.909L25.368,10.263C25.112,9.759,24.595,9.44,24.029,9.44 + L24.029,9.44z"/> + </g> +</g> +<g id="conditional" display="none"> + <g display="inline"> + <path fill="#FFFFFF" d="M16.736,34.981c-0.414,0-0.75-0.336-0.75-0.75V14.423c0-0.414,0.336-0.75,0.75-0.75H32.3 + c0.414,0,0.75,0.336,0.75,0.75v19.809c0,0.414-0.336,0.75-0.75,0.75H16.736z"/> + <path fill="#6D8B47" d="M32.3,14.423v19.809H16.736V14.423H32.3 M32.3,12.923H16.736c-0.829,0-1.5,0.671-1.5,1.5v19.809 + c0,0.828,0.671,1.5,1.5,1.5H32.3c0.828,0,1.5-0.672,1.5-1.5V14.423C33.8,13.594,33.128,12.923,32.3,12.923L32.3,12.923z"/> + </g> + + <line display="inline" fill="none" stroke="#6D8B47" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" x1="18.762" y1="16.827" x2="30.275" y2="16.827"/> + + <line display="inline" fill="none" stroke="#6D8B47" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" x1="18.762" y1="20.647" x2="30.275" y2="20.647"/> + + <line display="inline" fill="none" stroke="#6D8B47" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" x1="18.762" y1="25.747" x2="30.275" y2="25.747"/> + + <line display="inline" fill="none" stroke="#6D8B47" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" x1="18.762" y1="31.4" x2="30.275" y2="31.4"/> +</g> +<g id="error" display="none"> + <g display="inline"> + <path fill="#FFFFFF" d="M12.603,33.914c-0.135,0-0.272-0.037-0.395-0.112c-0.315-0.195-0.44-0.592-0.294-0.933l7.087-16.54 + c0.109-0.254,0.349-0.428,0.625-0.452c0.021-0.002,0.043-0.003,0.064-0.003c0.252,0,0.489,0.127,0.628,0.341l5.535,8.505 + l7.391-10.88c0.144-0.212,0.379-0.329,0.621-0.329c0.119,0,0.24,0.029,0.353,0.088c0.338,0.181,0.485,0.588,0.342,0.943 + L27.473,32.02c-0.102,0.249-0.328,0.425-0.596,0.461c-0.033,0.005-0.066,0.007-0.1,0.007c-0.231,0-0.453-0.107-0.596-0.295 + l-5.572-7.286l-7.435,8.743C13.028,33.823,12.817,33.914,12.603,33.914z"/> + <path fill="#6D8B47" d="M33.864,14.262h0.005 M33.864,14.262l-7.087,17.476l-6.137-8.025l-8.037,9.452l7.087-16.539l6.149,9.45 + L33.864,14.262 M33.865,12.762c-0.042,0-0.083,0.001-0.125,0.005c-0.237,0.02-0.459,0.094-0.652,0.211 + c-0.148,0.09-0.283,0.206-0.396,0.348c-0.029,0.036-0.056,0.073-0.081,0.112l-6.745,9.929l-4.918-7.559 + c-0.278-0.428-0.753-0.682-1.257-0.682c-0.043,0-0.086,0.002-0.129,0.005c-0.551,0.048-1.032,0.395-1.25,0.904l-7.087,16.539 + c-0.292,0.682-0.042,1.475,0.589,1.866c0.245,0.151,0.518,0.225,0.789,0.225c0.428,0,0.85-0.183,1.144-0.528l6.833-8.035 + l5.007,6.548c0.286,0.374,0.728,0.589,1.191,0.589c0.066,0,0.133-0.005,0.2-0.014c0.533-0.071,0.987-0.424,1.189-0.923l7.057-17.4 + c0.092-0.194,0.144-0.41,0.144-0.639c0-0.811-0.642-1.472-1.445-1.499C33.902,12.762,33.884,12.762,33.865,12.762L33.865,12.762z" + /> + </g> +</g> +<g id="compensation" display="none"> + <g display="inline"> + <path fill="#FFFFFF" d="M21.827,32.98c-0.171,0-0.34-0.059-0.477-0.171l-10.366-8.548c-0.173-0.143-0.273-0.354-0.273-0.579 + s0.1-0.436,0.273-0.579l10.366-8.549c0.137-0.113,0.306-0.171,0.477-0.171c0.109,0,0.218,0.023,0.32,0.072 + c0.263,0.124,0.43,0.388,0.43,0.678V32.23c0,0.29-0.167,0.555-0.43,0.679C22.045,32.957,21.936,32.98,21.827,32.98z"/> + <path fill="#6D8B47" d="M21.827,15.134V32.23l-10.366-8.548L21.827,15.134 M21.828,13.634c-0.342,0-0.681,0.117-0.955,0.343 + l-10.367,8.549c-0.345,0.285-0.545,0.709-0.545,1.157s0.2,0.873,0.546,1.157l10.366,8.548c0.274,0.226,0.612,0.343,0.955,0.343 + c0.217,0,0.435-0.047,0.639-0.144c0.525-0.247,0.86-0.775,0.86-1.356V15.134c0-0.581-0.335-1.109-0.86-1.357 + C22.263,13.681,22.044,13.634,21.828,13.634L21.828,13.634z"/> + </g> + <g display="inline"> + <path fill="#FFFFFF" d="M33.667,32.98c-0.171,0-0.34-0.059-0.478-0.171l-10.366-8.548c-0.173-0.143-0.273-0.354-0.273-0.579 + s0.1-0.436,0.273-0.579l10.366-8.549c0.138-0.113,0.307-0.171,0.478-0.171c0.108,0,0.218,0.023,0.32,0.072 + c0.262,0.124,0.43,0.388,0.43,0.678V32.23c0,0.29-0.168,0.555-0.43,0.679C33.885,32.957,33.775,32.98,33.667,32.98z"/> + <path fill="#6D8B47" d="M33.667,15.134V32.23l-10.366-8.548L33.667,15.134 M33.667,13.634c-0.342,0-0.681,0.117-0.954,0.343 + l-10.367,8.549c-0.345,0.285-0.545,0.709-0.545,1.157s0.2,0.873,0.546,1.157l10.366,8.548c0.273,0.226,0.612,0.343,0.954,0.343 + c0.218,0,0.436-0.047,0.64-0.144c0.525-0.247,0.86-0.775,0.86-1.356V15.134c0-0.581-0.335-1.109-0.86-1.357 + C34.103,13.681,33.885,13.634,33.667,13.634L33.667,13.634z"/> + </g> +</g> +<g id="signal" display="none"> + + <polygon display="inline" fill="#FFFFFF" stroke="#EFFCE5" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" points=" + 12.338,31.231 24,11.035 35.662,31.231 "/> +</g> +<g id="multiple" display="none"> + + <polygon display="inline" fill="#FFFFFF" stroke="#6D8B47" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" points=" + 16.629,34.111 12.073,20.093 23.999,11.428 35.924,20.093 31.37,34.111 "/> +</g> +<g id="parallel_multiple" display="none"> + <g display="inline"> + <path fill="#FFFFFF" d="M22.131,35.808c-0.414,0-0.75-0.336-0.75-0.75v-8.576l-8.576,0.001c-0.414,0-0.75-0.336-0.75-0.75 + l-0.001-3.771c0-0.199,0.079-0.39,0.22-0.53s0.331-0.22,0.53-0.22l8.577-0.001l-0.001-8.575c0-0.199,0.079-0.39,0.22-0.53 + s0.332-0.22,0.53-0.22h3.772c0.414,0,0.75,0.336,0.75,0.75v8.575h8.575c0.414,0,0.75,0.335,0.75,0.75l0.001,3.772 + c0,0.199-0.079,0.39-0.22,0.53s-0.331,0.22-0.53,0.22h-8.576v8.577c0,0.199-0.079,0.39-0.22,0.53s-0.331,0.22-0.53,0.22 + L22.131,35.808z"/> + <path fill="#6D8B47" d="M25.903,12.635v9.325h9.325l0.001,3.772h-9.326v9.327l-3.771-0.002v-9.326l-9.326,0.001l-0.001-3.771 + l9.327-0.001l-0.001-9.325H25.903 M25.903,11.135h-3.772c-0.398,0-0.779,0.158-1.061,0.439s-0.439,0.663-0.439,1.061l0.001,7.825 + l-7.827,0.001c-0.398,0-0.78,0.158-1.061,0.439s-0.439,0.663-0.439,1.061l0.001,3.771c0,0.829,0.672,1.5,1.5,1.5l0,0l7.826-0.001 + v7.826c0,0.828,0.671,1.5,1.499,1.5l3.771,0.002h0.001c0.397,0,0.779-0.158,1.061-0.439s0.439-0.662,0.439-1.061v-7.827h7.826 + c0.397,0,0.779-0.158,1.061-0.439s0.439-0.663,0.439-1.061l-0.001-3.773c0-0.828-0.672-1.5-1.5-1.5h-7.825v-7.825 + C27.403,11.806,26.731,11.135,25.903,11.135L25.903,11.135z"/> + </g> +</g> +</svg> Added: trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/images/gateways_48px_exclusive.svg =================================================================== --- trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/images/gateways_48px_exclusive.svg (rev 0) +++ trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/images/gateways_48px_exclusive.svg 2011-02-09 09:46:27 UTC (rev 29074) @@ -0,0 +1,27 @@ +<?xml version="1.0" encoding="utf-8"?> + +<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"> +<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="48px" + height="48px" viewBox="0 0 48 48" enable-background="new 0 0 48 48" xml:space="preserve"> +<g id="Gradient_diamond_-_green"> + <linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="23.9487" y1="4.4224" x2="23.9487" y2="42.3346"> + <stop offset="0" style="stop-color:#F3F6CD"/> + <stop offset="0.1089" style="stop-color:#E9EABC"/> + <stop offset="0.3614" style="stop-color:#D3D398"/> + <stop offset="0.4969" style="stop-color:#CBCA8B"/> + <stop offset="0.6676" style="stop-color:#D6D79E"/> + <stop offset="1" style="stop-color:#F3F6CD"/> + </linearGradient> + <polygon fill="url(#SVGID_1_)" points="46.729,23.979 23.949,46.759 1.17,23.979 23.949,1.199 "/> +</g> +<g id="outline_diamond_-_green"> + + <rect x="7.841" y="7.871" transform="matrix(0.7071 -0.7071 0.7071 0.7071 -9.9408 23.9585)" fill="none" stroke="#9D9221" stroke-miterlimit="10" width="32.215" height="32.215"/> +</g> +<g id="exclusive_gateway"> + <g> + <polygon fill="#9D9221" points="31.654,35.508 26.162,23.979 31.654,12.457 27.209,12.455 23.938,19.318 20.669,12.459 + 16.224,12.457 21.718,23.979 16.226,35.508 20.666,35.508 23.938,28.643 27.211,35.508 "/> + </g> +</g> +</svg> Added: trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/images/gateways_48px_parallel.svg =================================================================== --- trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/images/gateways_48px_parallel.svg (rev 0) +++ trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/images/gateways_48px_parallel.svg 2011-02-09 09:46:27 UTC (rev 29074) @@ -0,0 +1,27 @@ +<?xml version="1.0" encoding="utf-8"?> + +<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"> +<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="48px" + height="48px" viewBox="0 0 48 48" enable-background="new 0 0 48 48" xml:space="preserve"> +<g id="Gradient_diamond_-_green"> + <linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="23.9487" y1="4.4224" x2="23.9487" y2="42.3346"> + <stop offset="0" style="stop-color:#F3F6CD"/> + <stop offset="0.1089" style="stop-color:#E9EABC"/> + <stop offset="0.3614" style="stop-color:#D3D398"/> + <stop offset="0.4969" style="stop-color:#CBCA8B"/> + <stop offset="0.6676" style="stop-color:#D6D79E"/> + <stop offset="1" style="stop-color:#F3F6CD"/> + </linearGradient> + <polygon fill="url(#SVGID_1_)" points="46.729,23.979 23.949,46.759 1.17,23.979 23.949,1.199 "/> +</g> +<g id="outline_diamond_-_green"> + + <rect x="7.841" y="7.871" transform="matrix(0.7071 -0.7071 0.7071 0.7071 -9.9408 23.9585)" fill="none" stroke="#9D9221" stroke-miterlimit="10" width="32.215" height="32.215"/> +</g> +<g id="parallel_gateway"> + <g> + <polygon fill="#9D9221" points="25.91,35.787 25.912,25.957 35.74,25.957 35.739,21.98 25.911,21.981 25.911,12.151 + 21.935,12.152 21.936,21.981 12.105,21.983 12.106,25.958 21.936,25.957 21.934,35.786 "/> + </g> +</g> +</svg> Modified: trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/plugin.properties =================================================================== --- trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/plugin.properties 2011-02-09 09:42:57 UTC (rev 29073) +++ trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/plugin.properties 2011-02-09 09:46:27 UTC (rev 29074) @@ -22,11 +22,11 @@ tab.domain=Core # Preferences -prefpage.org.eclipse.bpmn2.diagram.general=bpmn2 Diagram -prefpage.org.eclipse.bpmn2.diagram.appearance=Appearance -prefpage.org.eclipse.bpmn2.diagram.connections=Connections -prefpage.org.eclipse.bpmn2.diagram.printing=Printing -prefpage.org.eclipse.bpmn2.diagram.rulersAndGrid=Rulers And Grid +prefpage.org.jboss.tools.bpmn2.process.diagram.general=bpmn2 Diagram +prefpage.org.jboss.tools.bpmn2.process.diagram.appearance=Appearance +prefpage.org.jboss.tools.bpmn2.process.diagram.connections=Connections +prefpage.org.jboss.tools.bpmn2.process.diagram.printing=Printing +prefpage.org.jboss.tools.bpmn2.process.diagram.rulersAndGrid=Rulers And Grid # Providers @@ -71,3 +71,8 @@ metatype.name.TextAnnotation_3015=TextAnnotation metatype.name.ScriptTask_2017=ScriptTask metatype.name.ScriptTask_3016=ScriptTask +prefpage.org.jboss.tools.bpmn2.process.diagram.general=bpmn2 Diagram +prefpage.org.jboss.tools.bpmn2.process.diagram.appearance=Appearance +prefpage.org.jboss.tools.bpmn2.process.diagram.connections=Connections +prefpage.org.jboss.tools.bpmn2.process.diagram.printing=Printing +prefpage.org.jboss.tools.bpmn2.process.diagram.rulersAndGrid=Rulers And Grid Modified: trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/plugin.xml =================================================================== --- trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/plugin.xml 2011-02-09 09:42:57 UTC (rev 29073) +++ trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/plugin.xml 2011-02-09 09:46:27 UTC (rev 29074) @@ -66,7 +66,7 @@ <extension point="org.eclipse.ui.popupMenus" id="init-diagram-action"> <?gmfgen generated="true"?> <objectContribution - id="org.eclipse.bpmn2.diagram.InitDiagram" + id="org.jboss.tools.bpmn2.process.diagram.InitDiagram" nameFilter="*.jbpmn" objectClass="org.eclipse.core.resources.IFile"> <action @@ -74,7 +74,7 @@ class="org.jboss.tools.bpmn2.process.diagram.part.Bpmn2InitDiagramFileAction" menubarPath="additions" enablesFor="1" - id="org.eclipse.bpmn2.diagram.InitDiagramAction"> + id="org.jboss.tools.bpmn2.process.diagram.InitDiagramAction"> </action> </objectContribution> </extension> @@ -127,32 +127,32 @@ <extension point="org.eclipse.ui.preferencePages" id="prefpages"> <?gmfgen generated="true"?> <page - id="org.eclipse.bpmn2.diagram.general" - name="%prefpage.org.eclipse.bpmn2.diagram.general" + id="org.jboss.tools.bpmn2.process.diagram.general" + name="%prefpage.org.jboss.tools.bpmn2.process.diagram.general" class="org.jboss.tools.bpmn2.process.diagram.preferences.DiagramGeneralPreferencePage"> </page> <page - id="org.eclipse.bpmn2.diagram.appearance" - name="%prefpage.org.eclipse.bpmn2.diagram.appearance" - category="org.eclipse.bpmn2.diagram.general" + id="org.jboss.tools.bpmn2.process.diagram.appearance" + name="%prefpage.org.jboss.tools.bpmn2.process.diagram.appearance" + category="org.jboss.tools.bpmn2.process.diagram.general" class="org.jboss.tools.bpmn2.process.diagram.preferences.DiagramAppearancePreferencePage"> </page> <page - id="org.eclipse.bpmn2.diagram.connections" - name="%prefpage.org.eclipse.bpmn2.diagram.connections" - category="org.eclipse.bpmn2.diagram.general" + id="org.jboss.tools.bpmn2.process.diagram.connections" + name="%prefpage.org.jboss.tools.bpmn2.process.diagram.connections" + category="org.jboss.tools.bpmn2.process.diagram.general" class="org.jboss.tools.bpmn2.process.diagram.preferences.DiagramConnectionsPreferencePage"> </page> <page - id="org.eclipse.bpmn2.diagram.printing" - name="%prefpage.org.eclipse.bpmn2.diagram.printing" - category="org.eclipse.bpmn2.diagram.general" + id="org.jboss.tools.bpmn2.process.diagram.printing" + name="%prefpage.org.jboss.tools.bpmn2.process.diagram.printing" + category="org.jboss.tools.bpmn2.process.diagram.general" class="org.jboss.tools.bpmn2.process.diagram.preferences.DiagramPrintingPreferencePage"> </page> <page - id="org.eclipse.bpmn2.diagram.rulersAndGrid" - name="%prefpage.org.eclipse.bpmn2.diagram.rulersAndGrid" - category="org.eclipse.bpmn2.diagram.general" + id="org.jboss.tools.bpmn2.process.diagram.rulersAndGrid" + name="%prefpage.org.jboss.tools.bpmn2.process.diagram.rulersAndGrid" + category="org.jboss.tools.bpmn2.process.diagram.general" class="org.jboss.tools.bpmn2.process.diagram.preferences.DiagramRulersAndGridPreferencePage"> </page> </extension> @@ -160,7 +160,7 @@ <extension point="org.eclipse.ui.views.properties.tabbed.propertyContributor" id="prop-contrib"> <?gmfgen generated="true"?> <propertyContributor - contributorId="org.eclipse.bpmn2.diagram" + contributorId="org.jboss.tools.bpmn2.process.diagram" labelProvider="org.jboss.tools.bpmn2.process.diagram.sheet.Bpmn2SheetLabelProvider"> <propertyCategory category="domain"/> <propertyCategory category="visual"/> @@ -170,7 +170,7 @@ <extension point="org.eclipse.ui.views.properties.tabbed.propertyTabs" id="proptabs"> <?gmfgen generated="true"?> - <propertyTabs contributorId="org.eclipse.bpmn2.diagram"> + <propertyTabs contributorId="org.jboss.tools.bpmn2.process.diagram"> <propertyTab category="visual" id="property.tab.AppearancePropertySection" @@ -187,7 +187,7 @@ </extension> <extension point="org.eclipse.ui.views.properties.tabbed.propertyTabs" id="bpmnTabs"> - <propertyTabs contributorId="org.eclipse.bpmn2.diagram"> + <propertyTabs contributorId="org.jboss.tools.bpmn2.process.diagram"> <propertyTab category="domain" id="property.tab.bpmn" @@ -197,7 +197,7 @@ <extension point="org.eclipse.ui.views.properties.tabbed.propertySections" id="propsections"> <?gmfgen generated="true"?> - <propertySections contributorId="org.eclipse.bpmn2.diagram"> + <propertySections contributorId="org.jboss.tools.bpmn2.process.diagram"> <propertySection id="property.section.ConnectorAppearancePropertySection" filter="org.eclipse.gmf.runtime.diagram.ui.properties.filters.ConnectionEditPartPropertySectionFilter" class="org.eclipse.gmf.runtime.diagram.ui.properties.sections.appearance.ConnectionAppearancePropertySection" @@ -221,7 +221,7 @@ <propertySection id="property.section.domain" tab="property.tab.domain" - class="org.jboss.tools.bpmn2.process.diagram.sheet.Bpmn2PropertySectionBis"> + class="org.jboss.tools.bpmn2.process.diagram.sheet.Bpmn2PropertySection"> <input type="org.eclipse.gmf.runtime.notation.View"/> <input type="org.eclipse.gef.EditPart"/> <input type="org.jboss.tools.bpmn2.process.diagram.navigator.Bpmn2AbstractNavigatorItem"/> @@ -230,7 +230,7 @@ </extension> <extension point="org.eclipse.ui.views.properties.tabbed.propertySections" id="bpmnSection"> - <propertySections contributorId="org.eclipse.bpmn2.diagram"> + <propertySections contributorId="org.jboss.tools.bpmn2.process.diagram"> <propertySection id="property.section.bpmn" tab="property.tab.bpmn" @@ -319,7 +319,7 @@ <?gmfgen generated="true"?> <metamodel nsURI="http://www.omg.org/spec/BPMN/20100524/MODEL-XMI"> <metamodelType - id="org.eclipse.bpmn2.diagram.Process_1000" + id="org.jboss.tools.bpmn2.process.diagram.Process_1000" name="%metatype.name.Process_1000" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" eclass="Process" @@ -329,7 +329,7 @@ </metamodel> <metamodel nsURI="http://www.omg.org/spec/BPMN/20100524/MODEL-XMI"> <metamodelType - id="org.eclipse.bpmn2.diagram.UserTask_2001" + id="org.jboss.tools.bpmn2.process.diagram.UserTask_2001" name="%metatype.name.UserTask_2001" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" eclass="UserTask" @@ -339,7 +339,7 @@ </metamodel> <metamodel nsURI="http://www.omg.org/spec/BPMN/20100524/MODEL-XMI"> <metamodelType - id="org.eclipse.bpmn2.diagram.ServiceTask_2002" + id="org.jboss.tools.bpmn2.process.diagram.ServiceTask_2002" name="%metatype.name.ServiceTask_2002" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" eclass="ServiceTask" @@ -349,7 +349,7 @@ </metamodel> <metamodel nsURI="http://www.omg.org/spec/BPMN/20100524/MODEL-XMI"> <metamodelType - id="org.eclipse.bpmn2.diagram.StartEvent_2003" + id="org.jboss.tools.bpmn2.process.diagram.StartEvent_2003" name="%metatype.name.StartEvent_2003" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" eclass="StartEvent" @@ -359,16 +359,16 @@ </metamodel> <metamodel nsURI="http://www.omg.org/spec/BPMN/20100524/MODEL-XMI"> <specializationType - id="org.eclipse.bpmn2.diagram.StartEvent_2007" + id="org.jboss.tools.bpmn2.process.diagram.StartEvent_2007" name="%metatype.name.StartEvent_2007" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"> - <specializes id="org.eclipse.bpmn2.diagram.StartEvent_2003"/> + <specializes id="org.jboss.tools.bpmn2.process.diagram.StartEvent_2003"/> <param name="semanticHint" value="2007"/> </specializationType> </metamodel> <metamodel nsURI="http://www.omg.org/spec/BPMN/20100524/MODEL-XMI"> <metamodelType - id="org.eclipse.bpmn2.diagram.EndEvent_2004" + id="org.jboss.tools.bpmn2.process.diagram.EndEvent_2004" name="%metatype.name.EndEvent_2004" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" eclass="EndEvent" @@ -378,7 +378,7 @@ </metamodel> <metamodel nsURI="http://www.omg.org/spec/BPMN/20100524/MODEL-XMI"> <metamodelType - id="org.eclipse.bpmn2.diagram.ExclusiveGateway_2005" + id="org.jboss.tools.bpmn2.process.diagram.ExclusiveGateway_2005" name="%metatype.name.ExclusiveGateway_2005" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" eclass="ExclusiveGateway" @@ -388,7 +388,7 @@ </metamodel> <metamodel nsURI="http://www.omg.org/spec/BPMN/20100524/MODEL-XMI"> <metamodelType - id="org.eclipse.bpmn2.diagram.ParallelGateway_2006" + id="org.jboss.tools.bpmn2.process.diagram.ParallelGateway_2006" name="%metatype.name.ParallelGateway_2006" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" eclass="ParallelGateway" @@ -398,25 +398,25 @@ </metamodel> <metamodel nsURI="http://www.omg.org/spec/BPMN/20100524/MODEL-XMI"> <specializationType - id="org.eclipse.bpmn2.diagram.EndEvent_2008" + id="org.jboss.tools.bpmn2.process.diagram.EndEvent_2008" name="%metatype.name.EndEvent_2008" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"> - <specializes id="org.eclipse.bpmn2.diagram.EndEvent_2004"/> + <specializes id="org.jboss.tools.bpmn2.process.diagram.EndEvent_2004"/> <param name="semanticHint" value="2008"/> </specializationType> </metamodel> <metamodel nsURI="http://www.omg.org/spec/BPMN/20100524/MODEL-XMI"> <specializationType - id="org.eclipse.bpmn2.diagram.EndEvent_2009" + id="org.jboss.tools.bpmn2.process.diagram.EndEvent_2009" name="%metatype.name.EndEvent_2009" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"> - <specializes id="org.eclipse.bpmn2.diagram.EndEvent_2004"/> + <specializes id="org.jboss.tools.bpmn2.process.diagram.EndEvent_2004"/> <param name="semanticHint" value="2009"/> </specializationType> </metamodel> <metamodel nsURI="http://www.omg.org/spec/BPMN/20100524/MODEL-XMI"> <metamodelType - id="org.eclipse.bpmn2.diagram.IntermediateCatchEvent_2010" + id="org.jboss.tools.bpmn2.process.diagram.IntermediateCatchEvent_2010" name="%metatype.name.IntermediateCatchEvent_2010" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" eclass="IntermediateCatchEvent" @@ -426,7 +426,7 @@ </metamodel> <metamodel nsURI="http://www.omg.org/spec/BPMN/20100524/MODEL-XMI"> <metamodelType - id="org.eclipse.bpmn2.diagram.IntermediateThrowEvent_2011" + id="org.jboss.tools.bpmn2.process.diagram.IntermediateThrowEvent_2011" name="%metatype.name.IntermediateThrowEvent_2011" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" eclass="IntermediateThrowEvent" @@ -436,25 +436,25 @@ </metamodel> <metamodel nsURI="http://www.omg.org/spec/BPMN/20100524/MODEL-XMI"> <specializationType - id="org.eclipse.bpmn2.diagram.IntermediateCatchEvent_2012" + id="org.jboss.tools.bpmn2.process.diagram.IntermediateCatchEvent_2012" name="%metatype.name.IntermediateCatchEvent_2012" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"> - <specializes id="org.eclipse.bpmn2.diagram.IntermediateCatchEvent_2010"/> + <specializes id="org.jboss.tools.bpmn2.process.diagram.IntermediateCatchEvent_2010"/> <param name="semanticHint" value="2012"/> </specializationType> </metamodel> <metamodel nsURI="http://www.omg.org/spec/BPMN/20100524/MODEL-XMI"> <specializationType - id="org.eclipse.bpmn2.diagram.IntermediateCatchEvent_2013" + id="org.jboss.tools.bpmn2.process.diagram.IntermediateCatchEvent_2013" name="%metatype.name.IntermediateCatchEvent_2013" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"> - <specializes id="org.eclipse.bpmn2.diagram.IntermediateCatchEvent_2010"/> + <specializes id="org.jboss.tools.bpmn2.process.diagram.IntermediateCatchEvent_2010"/> <param name="semanticHint" value="2013"/> </specializationType> </metamodel> <metamodel nsURI="http://www.omg.org/spec/BPMN/20100524/MODEL-XMI"> <metamodelType - id="org.eclipse.bpmn2.diagram.DataObject_2014" + id="org.jboss.tools.bpmn2.process.diagram.DataObject_2014" name="%metatype.name.DataObject_2014" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" eclass="DataObject" @@ -464,7 +464,7 @@ </metamodel> <metamodel nsURI="http://www.omg.org/spec/BPMN/20100524/MODEL-XMI"> <metamodelType - id="org.eclipse.bpmn2.diagram.TextAnnotation_2015" + id="org.jboss.tools.bpmn2.process.diagram.TextAnnotation_2015" name="%metatype.name.TextAnnotation_2015" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" eclass="TextAnnotation" @@ -474,7 +474,7 @@ </metamodel> <metamodel nsURI="http://www.omg.org/spec/BPMN/20100524/MODEL-XMI"> <metamodelType - id="org.eclipse.bpmn2.diagram.SubProcess_2016" + id="org.jboss.tools.bpmn2.process.diagram.SubProcess_2016" name="%metatype.name.SubProcess_2016" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" eclass="SubProcess" @@ -484,151 +484,151 @@ </metamodel> <metamodel nsURI="http://www.omg.org/spec/BPMN/20100524/MODEL-XMI"> <specializationType - id="org.eclipse.bpmn2.diagram.ScriptTask_2017" + id="org.jboss.tools.bpmn2.process.diagram.ScriptTask_2017" name="%metatype.name.ScriptTask_2017" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"> - <specializes id="org.eclipse.bpmn2.diagram.ScriptTask_3016"/> + <specializes id="org.jboss.tools.bpmn2.process.diagram.ScriptTask_3016"/> <param name="semanticHint" value="2017"/> </specializationType> </metamodel> <metamodel nsURI="http://www.omg.org/spec/BPMN/20100524/MODEL-XMI"> <specializationType - id="org.eclipse.bpmn2.diagram.SubProcess_3001" + id="org.jboss.tools.bpmn2.process.diagram.SubProcess_3001" name="%metatype.name.SubProcess_3001" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"> - <specializes id="org.eclipse.bpmn2.diagram.SubProcess_2016"/> + <specializes id="org.jboss.tools.bpmn2.process.diagram.SubProcess_2016"/> <param name="semanticHint" value="3001"/> </specializationType> </metamodel> <metamodel nsURI="http://www.omg.org/spec/BPMN/20100524/MODEL-XMI"> <specializationType - id="org.eclipse.bpmn2.diagram.UserTask_3002" + id="org.jboss.tools.bpmn2.process.diagram.UserTask_3002" name="%metatype.name.UserTask_3002" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"> - <specializes id="org.eclipse.bpmn2.diagram.UserTask_2001"/> + <specializes id="org.jboss.tools.bpmn2.process.diagram.UserTask_2001"/> <param name="semanticHint" value="3002"/> </specializationType> </metamodel> <metamodel nsURI="http://www.omg.org/spec/BPMN/20100524/MODEL-XMI"> <specializationType - id="org.eclipse.bpmn2.diagram.ServiceTask_3004" + id="org.jboss.tools.bpmn2.process.diagram.ServiceTask_3004" name="%metatype.name.ServiceTask_3004" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"> - <specializes id="org.eclipse.bpmn2.diagram.ServiceTask_2002"/> + <specializes id="org.jboss.tools.bpmn2.process.diagram.ServiceTask_2002"/> <param name="semanticHint" value="3004"/> </specializationType> </metamodel> <metamodel nsURI="http://www.omg.org/spec/BPMN/20100524/MODEL-XMI"> <specializationType - id="org.eclipse.bpmn2.diagram.StartEvent_3003" + id="org.jboss.tools.bpmn2.process.diagram.StartEvent_3003" name="%metatype.name.StartEvent_3003" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"> - <specializes id="org.eclipse.bpmn2.diagram.StartEvent_2003"/> + <specializes id="org.jboss.tools.bpmn2.process.diagram.StartEvent_2003"/> <param name="semanticHint" value="3003"/> </specializationType> </metamodel> <metamodel nsURI="http://www.omg.org/spec/BPMN/20100524/MODEL-XMI"> <specializationType - id="org.eclipse.bpmn2.diagram.StartEvent_3005" + id="org.jboss.tools.bpmn2.process.diagram.StartEvent_3005" name="%metatype.name.StartEvent_3005" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"> - <specializes id="org.eclipse.bpmn2.diagram.StartEvent_2003"/> + <specializes id="org.jboss.tools.bpmn2.process.diagram.StartEvent_2003"/> <param name="semanticHint" value="3005"/> </specializationType> </metamodel> <metamodel nsURI="http://www.omg.org/spec/BPMN/20100524/MODEL-XMI"> <specializationType - id="org.eclipse.bpmn2.diagram.EndEvent_3006" + id="org.jboss.tools.bpmn2.process.diagram.EndEvent_3006" name="%metatype.name.EndEvent_3006" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"> - <specializes id="org.eclipse.bpmn2.diagram.EndEvent_2004"/> + <specializes id="org.jboss.tools.bpmn2.process.diagram.EndEvent_2004"/> <param name="semanticHint" value="3006"/> </specializationType> </metamodel> <metamodel nsURI="http://www.omg.org/spec/BPMN/20100524/MODEL-XMI"> <specializationType - id="org.eclipse.bpmn2.diagram.ExclusiveGateway_3007" + id="org.jboss.tools.bpmn2.process.diagram.ExclusiveGateway_3007" name="%metatype.name.ExclusiveGateway_3007" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"> - <specializes id="org.eclipse.bpmn2.diagram.ExclusiveGateway_2005"/> + <specializes id="org.jboss.tools.bpmn2.process.diagram.ExclusiveGateway_2005"/> <param name="semanticHint" value="3007"/> </specializationType> </metamodel> <metamodel nsURI="http://www.omg.org/spec/BPMN/20100524/MODEL-XMI"> <specializationType - id="org.eclipse.bpmn2.diagram.ParallelGateway_3008" + id="org.jboss.tools.bpmn2.process.diagram.ParallelGateway_3008" name="%metatype.name.ParallelGateway_3008" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"> - <specializes id="org.eclipse.bpmn2.diagram.ParallelGateway_2006"/> + <specializes id="org.jboss.tools.bpmn2.process.diagram.ParallelGateway_2006"/> <param name="semanticHint" value="3008"/> </specializationType> </metamodel> <metamodel nsURI="http://www.omg.org/spec/BPMN/20100524/MODEL-XMI"> <specializationType - id="org.eclipse.bpmn2.diagram.EndEvent_3009" + id="org.jboss.tools.bpmn2.process.diagram.EndEvent_3009" name="%metatype.name.EndEvent_3009" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"> - <specializes id="org.eclipse.bpmn2.diagram.EndEvent_2004"/> + <specializes id="org.jboss.tools.bpmn2.process.diagram.EndEvent_2004"/> <param name="semanticHint" value="3009"/> </specializationType> </metamodel> <metamodel nsURI="http://www.omg.org/spec/BPMN/20100524/MODEL-XMI"> <specializationType - id="org.eclipse.bpmn2.diagram.EndEvent_3010" + id="org.jboss.tools.bpmn2.process.diagram.EndEvent_3010" name="%metatype.name.EndEvent_3010" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"> - <specializes id="org.eclipse.bpmn2.diagram.EndEvent_2004"/> + <specializes id="org.jboss.tools.bpmn2.process.diagram.EndEvent_2004"/> <param name="semanticHint" value="3010"/> </specializationType> </metamodel> <metamodel nsURI="http://www.omg.org/spec/BPMN/20100524/MODEL-XMI"> <specializationType - id="org.eclipse.bpmn2.diagram.IntermediateCatchEvent_3011" + id="org.jboss.tools.bpmn2.process.diagram.IntermediateCatchEvent_3011" name="%metatype.name.IntermediateCatchEvent_3011" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"> - <specializes id="org.eclipse.bpmn2.diagram.IntermediateCatchEvent_2010"/> + <specializes id="org.jboss.tools.bpmn2.process.diagram.IntermediateCatchEvent_2010"/> <param name="semanticHint" value="3011"/> </specializationType> </metamodel> <metamodel nsURI="http://www.omg.org/spec/BPMN/20100524/MODEL-XMI"> <specializationType - id="org.eclipse.bpmn2.diagram.IntermediateThrowEvent_3012" + id="org.jboss.tools.bpmn2.process.diagram.IntermediateThrowEvent_3012" name="%metatype.name.IntermediateThrowEvent_3012" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"> - <specializes id="org.eclipse.bpmn2.diagram.IntermediateThrowEvent_2011"/> + <specializes id="org.jboss.tools.bpmn2.process.diagram.IntermediateThrowEvent_2011"/> <param name="semanticHint" value="3012"/> </specializationType> </metamodel> <metamodel nsURI="http://www.omg.org/spec/BPMN/20100524/MODEL-XMI"> <specializationType - id="org.eclipse.bpmn2.diagram.IntermediateCatchEvent_3013" + id="org.jboss.tools.bpmn2.process.diagram.IntermediateCatchEvent_3013" name="%metatype.name.IntermediateCatchEvent_3013" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"> - <specializes id="org.eclipse.bpmn2.diagram.IntermediateCatchEvent_2010"/> + <specializes id="org.jboss.tools.bpmn2.process.diagram.IntermediateCatchEvent_2010"/> <param name="semanticHint" value="3013"/> </specializationType> </metamodel> <metamodel nsURI="http://www.omg.org/spec/BPMN/20100524/MODEL-XMI"> <specializationType - id="org.eclipse.bpmn2.diagram.DataObject_3014" + id="org.jboss.tools.bpmn2.process.diagram.DataObject_3014" name="%metatype.name.DataObject_3014" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"> - <specializes id="org.eclipse.bpmn2.diagram.DataObject_2014"/> + <specializes id="org.jboss.tools.bpmn2.process.diagram.DataObject_2014"/> <param name="semanticHint" value="3014"/> </specializationType> </metamodel> <metamodel nsURI="http://www.omg.org/spec/BPMN/20100524/MODEL-XMI"> <specializationType - id="org.eclipse.bpmn2.diagram.TextAnnotation_3015" + id="org.jboss.tools.bpmn2.process.diagram.TextAnnotation_3015" name="%metatype.name.TextAnnotation_3015" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"> - <specializes id="org.eclipse.bpmn2.diagram.TextAnnotation_2015"/> + <specializes id="org.jboss.tools.bpmn2.process.diagram.TextAnnotation_2015"/> <param name="semanticHint" value="3015"/> </specializationType> </metamodel> <metamodel nsURI="http://www.omg.org/spec/BPMN/20100524/MODEL-XMI"> <metamodelType - id="org.eclipse.bpmn2.diagram.ScriptTask_3016" + id="org.jboss.tools.bpmn2.process.diagram.ScriptTask_3016" name="%metatype.name.ScriptTask_3016" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" eclass="ScriptTask" @@ -638,7 +638,7 @@ </metamodel> <metamodel nsURI="http://www.omg.org/spec/BPMN/20100524/MODEL-XMI"> <metamodelType - id="org.eclipse.bpmn2.diagram.SequenceFlow_4001" + id="org.jboss.tools.bpmn2.process.diagram.SequenceFlow_4001" name="%metatype.name.SequenceFlow_4001" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" eclass="SequenceFlow" @@ -648,7 +648,7 @@ </metamodel> <metamodel nsURI="http://www.omg.org/spec/BPMN/20100524/MODEL-XMI"> <metamodelType - id="org.eclipse.bpmn2.diagram.Association_4002" + id="org.jboss.tools.bpmn2.process.diagram.Association_4002" name="%metatype.name.Association_4002" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" eclass="Association" @@ -660,59 +660,59 @@ <extension point="org.eclipse.gmf.runtime.emf.type.core.elementTypeBindings" id="element-types-bindings"> <?gmfgen generated="true"?> - <clientContext id="org.eclipse.bpmn2.diagram.TypeContext"> + <clientContext id="org.jboss.tools.bpmn2.process.diagram.TypeContext"> <enablement> <test property="org.eclipse.gmf.runtime.emf.core.editingDomain" - value="org.eclipse.bpmn2.diagram.EditingDomain"/> + value="org.jboss.tools.bpmn2.process.diagram.EditingDomain"/> </enablement> </clientContext> - <binding context="org.eclipse.bpmn2.diagram.TypeContext"> - <elementType ref="org.eclipse.bpmn2.diagram.Process_1000"/> - <elementType ref="org.eclipse.bpmn2.diagram.UserTask_2001"/> - <elementType ref="org.eclipse.bpmn2.diagram.ServiceTask_2002"/> - <elementType ref="org.eclipse.bpmn2.diagram.StartEvent_2003"/> - <elementType ref="org.eclipse.bpmn2.diagram.StartEvent_2007"/> - <elementType ref="org.eclipse.bpmn2.diagram.EndEvent_2004"/> - <elementType ref="org.eclipse.bpmn2.diagram.ExclusiveGateway_2005"/> - <elementType ref="org.eclipse.bpmn2.diagram.ParallelGateway_2006"/> - <elementType ref="org.eclipse.bpmn2.diagram.EndEvent_2008"/> - <elementType ref="org.eclipse.bpmn2.diagram.EndEvent_2009"/> - <elementType ref="org.eclipse.bpmn2.diagram.IntermediateCatchEvent_2010"/> - <elementType ref="org.eclipse.bpmn2.diagram.IntermediateThrowEvent_2011"/> - <elementType ref="org.eclipse.bpmn2.diagram.IntermediateCatchEvent_2012"/> - <elementType ref="org.eclipse.bpmn2.diagram.IntermediateCatchEvent_2013"/> - <elementType ref="org.eclipse.bpmn2.diagram.DataObject_2014"/> - <elementType ref="org.eclipse.bpmn2.diagram.TextAnnotation_2015"/> - <elementType ref="org.eclipse.bpmn2.diagram.SubProcess_2016"/> - <elementType ref="org.eclipse.bpmn2.diagram.ScriptTask_2017"/> - <elementType ref="org.eclipse.bpmn2.diagram.SubProcess_3001"/> - <elementType ref="org.eclipse.bpmn2.diagram.UserTask_3002"/> - <elementType ref="org.eclipse.bpmn2.diagram.ServiceTask_3004"/> - <elementType ref="org.eclipse.bpmn2.diagram.StartEvent_3003"/> - <elementType ref="org.eclipse.bpmn2.diagram.StartEvent_3005"/> - <elementType ref="org.eclipse.bpmn2.diagram.EndEvent_3006"/> - <elementType ref="org.eclipse.bpmn2.diagram.ExclusiveGateway_3007"/> - <elementType ref="org.eclipse.bpmn2.diagram.ParallelGateway_3008"/> - <elementType ref="org.eclipse.bpmn2.diagram.EndEvent_3009"/> - <elementType ref="org.eclipse.bpmn2.diagram.EndEvent_3010"/> - <elementType ref="org.eclipse.bpmn2.diagram.IntermediateCatchEvent_3011"/> - <elementType ref="org.eclipse.bpmn2.diagram.IntermediateThrowEvent_3012"/> - <elementType ref="org.eclipse.bpmn2.diagram.IntermediateCatchEvent_3013"/> - <elementType ref="org.eclipse.bpmn2.diagram.DataObject_3014"/> - <elementType ref="org.eclipse.bpmn2.diagram.TextAnnotation_3015"/> - <elementType ref="org.eclipse.bpmn2.diagram.ScriptTask_3016"/> - <elementType ref="org.eclipse.bpmn2.diagram.SequenceFlow_4001"/> - <elementType ref="org.eclipse.bpmn2.diagram.Association_4002"/> + <binding context="org.jboss.tools.bpmn2.process.diagram.TypeContext"> + <elementType ref="org.jboss.tools.bpmn2.process.diagram.Process_1000"/> + <elementType ref="org.jboss.tools.bpmn2.process.diagram.UserTask_2001"/> + <elementType ref="org.jboss.tools.bpmn2.process.diagram.ServiceTask_2002"/> + <elementType ref="org.jboss.tools.bpmn2.process.diagram.StartEvent_2003"/> + <elementType ref="org.jboss.tools.bpmn2.process.diagram.StartEvent_2007"/> + <elementType ref="org.jboss.tools.bpmn2.process.diagram.EndEvent_2004"/> + <elementType ref="org.jboss.tools.bpmn2.process.diagram.ExclusiveGateway_2005"/> + <elementType ref="org.jboss.tools.bpmn2.process.diagram.ParallelGateway_2006"/> + <elementType ref="org.jboss.tools.bpmn2.process.diagram.EndEvent_2008"/> + <elementType ref="org.jboss.tools.bpmn2.process.diagram.EndEvent_2009"/> + <elementType ref="org.jboss.tools.bpmn2.process.diagram.IntermediateCatchEvent_2010"/> + <elementType ref="org.jboss.tools.bpmn2.process.diagram.IntermediateThrowEvent_2011"/> + <elementType ref="org.jboss.tools.bpmn2.process.diagram.IntermediateCatchEvent_2012"/> + <elementType ref="org.jboss.tools.bpmn2.process.diagram.IntermediateCatchEvent_2013"/> + <elementType ref="org.jboss.tools.bpmn2.process.diagram.DataObject_2014"/> + <elementType ref="org.jboss.tools.bpmn2.process.diagram.TextAnnotation_2015"/> + <elementType ref="org.jboss.tools.bpmn2.process.diagram.SubProcess_2016"/> + <elementType ref="org.jboss.tools.bpmn2.process.diagram.ScriptTask_2017"/> + <elementType ref="org.jboss.tools.bpmn2.process.diagram.SubProcess_3001"/> + <elementType ref="org.jboss.tools.bpmn2.process.diagram.UserTask_3002"/> + <elementType ref="org.jboss.tools.bpmn2.process.diagram.ServiceTask_3004"/> + <elementType ref="org.jboss.tools.bpmn2.process.diagram.StartEvent_3003"/> + <elementType ref="org.jboss.tools.bpmn2.process.diagram.StartEvent_3005"/> + <elementType ref="org.jboss.tools.bpmn2.process.diagram.EndEvent_3006"/> + <elementType ref="org.jboss.tools.bpmn2.process.diagram.ExclusiveGateway_3007"/> + <elementType ref="org.jboss.tools.bpmn2.process.diagram.ParallelGateway_3008"/> + <elementType ref="org.jboss.tools.bpmn2.process.diagram.EndEvent_3009"/> + <elementType ref="org.jboss.tools.bpmn2.process.diagram.EndEvent_3010"/> + <elementType ref="org.jboss.tools.bpmn2.process.diagram.IntermediateCatchEvent_3011"/> + <elementType ref="org.jboss.tools.bpmn2.process.diagram.IntermediateThrowEvent_3012"/> + <elementType ref="org.jboss.tools.bpmn2.process.diagram.IntermediateCatchEvent_3013"/> + <elementType ref="org.jboss.tools.bpmn2.process.diagram.DataObject_3014"/> + <elementType ref="org.jboss.tools.bpmn2.process.diagram.TextAnnotation_3015"/> + <elementType ref="org.jboss.tools.bpmn2.process.diagram.ScriptTask_3016"/> + <elementType ref="org.jboss.tools.bpmn2.process.diagram.SequenceFlow_4001"/> + <elementType ref="org.jboss.tools.bpmn2.process.diagram.Association_4002"/> <advice ref="org.eclipse.gmf.runtime.diagram.core.advice.notationDepdendents"/> </binding> </extension> <extension point="org.eclipse.core.expressions.propertyTesters" id="navigator-proptest.isURIEditorInput"> <?gmfgen generated="true"?> <propertyTester - id="org.eclipse.bpmn2.diagram.URIEditorInputPropertyTester" + id="org.jboss.tools.bpmn2.process.diagram.URIEditorInputPropertyTester" type="org.eclipse.emf.common.ui.URIEditorInput" - namespace="org.eclipse.bpmn2.diagram" + namespace="org.jboss.tools.bpmn2.process.diagram" properties="isURIEditorInput" class="org.jboss.tools.bpmn2.process.diagram.part.Bpmn2UriEditorInputTester"> </propertyTester> @@ -722,14 +722,14 @@ <?gmfgen generated="true"?> <viewerContentBinding viewerId="org.eclipse.ui.navigator.ProjectExplorer"> <includes> - <contentExtension pattern="org.eclipse.bpmn2.diagram.resourceContent"/> - <contentExtension pattern="org.eclipse.bpmn2.diagram.domainResourceContent"/> - <contentExtension pattern="org.eclipse.bpmn2.diagram.navigatorLinkHelper"/> + <contentExtension pattern="org.jboss.tools.bpmn2.process.diagram.resourceContent"/> + <contentExtension pattern="org.jboss.tools.bpmn2.process.diagram.domainResourceContent"/> + <contentExtension pattern="org.jboss.tools.bpmn2.process.diagram.navigatorLinkHelper"/> </includes> </viewerContentBinding> <viewerActionBinding viewerId="org.eclipse.ui.navigator.ProjectExplorer"> <includes> - <actionExtension pattern="org.eclipse.bpmn2.diagram.navigatorActionProvider"/> + <actionExtension pattern="org.jboss.tools.bpmn2.process.diagram.navigatorActionProvider"/> </includes> </viewerActionBinding> </extension> @@ -737,7 +737,7 @@ <extension point="org.eclipse.ui.navigator.navigatorContent" id="navigator-content"> <?gmfgen generated="true"?> <navigatorContent - id="org.eclipse.bpmn2.diagram.resourceContent" + id="org.jboss.tools.bpmn2.process.diagram.resourceContent" name="%navigatorContentName" priority="normal" contentProvider="org.jboss.tools.bpmn2.process.diagram.navigator.Bpmn2NavigatorContentProvider" @@ -759,7 +759,7 @@ </or> </possibleChildren> <commonSorter - id="org.eclipse.bpmn2.diagram.navigatorSorter" + id="org.jboss.tools.bpmn2.process.diagram.navigatorSorter" class="org.jboss.tools.bpmn2.process.diagram.navigator.Bpmn2NavigatorSorter"> <parentExpression> <or> @@ -773,7 +773,7 @@ </commonSorter> </navigatorContent> <navigatorContent - id="org.eclipse.bpmn2.diagram.domainResourceContent" + id="org.jboss.tools.bpmn2.process.diagram.domainResourceContent" name="%domainNavigatorContentName" priority="normal" contentProvider="org.jboss.tools.bpmn2.process.diagram.navigator.Bpmn2DomainNavigatorContentProvider" @@ -794,7 +794,7 @@ </possibleChildren> </navigatorContent> <actionProvider - id="org.eclipse.bpmn2.diagram.navigatorActionProvider" + id="org.jboss.tools.bpmn2.process.diagram.navigatorActionProvider" class="org.jboss.tools.bpmn2.process.diagram.navigator.Bpmn2NavigatorActionProvider"> <enablement> <or> @@ -807,12 +807,12 @@ <extension point="org.eclipse.ui.navigator.linkHelper" id="navigator-linkhelper"> <?gmfgen generated="true"?> <linkHelper - id="org.eclipse.bpmn2.diagram.navigatorLinkHelper" + id="org.jboss.tools.bpmn2.process.diagram.navigatorLinkHelper" class="org.jboss.tools.bpmn2.process.diagram.navigator.Bpmn2NavigatorLinkHelper"> <editorInputEnablement> <and> <instanceof value="org.eclipse.emf.common.ui.URIEditorInput"/> - <test property="org.eclipse.bpmn2.diagram.isURIEditorInput"/> + <test property="org.jboss.tools.bpmn2.process.diagram.isURIEditorInput"/> </and> </editorInputEnablement> <selectionEnablement> @@ -846,7 +846,7 @@ <menuContribution locationURI="toolbar:org.eclipse.ui.main.toolbar?after="> </menuContribution --> <menuContribution locationURI="popup:org.eclipse.gmf.runtime.diagram.ui.DiagramEditorContextMenu"> - <command commandId="org.eclipse.bpmn2.diagram.LoadResourceAction"> + <command commandId="org.jboss.tools.bpmn2.process.diagram.LoadResourceAction"> <visibleWhen> <and> <with variable="activePartId"><equals value="org.jboss.tools.bpmn2.process.diagram.part.Bpmn2DiagramEditorID"/></with> @@ -862,7 +862,7 @@ <extension point="org.eclipse.ui.commands" id="menu-commands"> <?gmfgen generated="true"?> <category id="org.jboss.tools.bpmn2.process.diagram.part.Bpmn2DiagramEditorID" name="%cmdcategory.name" description="%cmdcategory.desc"/> - <command id="org.eclipse.bpmn2.diagram.LoadResourceAction" + <command id="org.jboss.tools.bpmn2.process.diagram.LoadResourceAction" name="Load Resource" categoryId="org.jboss.tools.bpmn2.process.diagram.part.Bpmn2DiagramEditorID" defaultHandler="org.jboss.tools.bpmn2.process.diagram.part.LoadResourceAction"/> Modified: trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/edit/parts/AssociationEditPart.java =================================================================== --- trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/edit/parts/AssociationEditPart.java 2011-02-09 09:42:57 UTC (rev 29073) +++ trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/edit/parts/AssociationEditPart.java 2011-02-09 09:46:27 UTC (rev 29074) @@ -1,5 +1,6 @@ package org.jboss.tools.bpmn2.process.diagram.edit.parts; +import org.eclipse.draw2d.ColorConstants; import org.eclipse.draw2d.Connection; import org.eclipse.draw2d.Graphics; import org.eclipse.draw2d.PolylineShape; Modified: trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/edit/parts/DataObject2EditPart.java =================================================================== --- trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/edit/parts/DataObject2EditPart.java 2011-02-09 09:42:57 UTC (rev 29073) +++ trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/edit/parts/DataObject2EditPart.java 2011-02-09 09:46:27 UTC (rev 29074) @@ -5,6 +5,7 @@ import java.util.LinkedList; import java.util.List; +import org.eclipse.draw2d.ColorConstants; import org.eclipse.draw2d.IFigure; import org.eclipse.draw2d.PolygonShape; import org.eclipse.draw2d.PositionConstants; Modified: trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/edit/parts/DataObjectEditPart.java =================================================================== --- trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/edit/parts/DataObjectEditPart.java 2011-02-09 09:42:57 UTC (rev 29073) +++ trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/edit/parts/DataObjectEditPart.java 2011-02-09 09:46:27 UTC (rev 29074) @@ -5,6 +5,7 @@ import java.util.LinkedList; import java.util.List; +import org.eclipse.draw2d.ColorConstants; import org.eclipse.draw2d.Ellipse; import org.eclipse.draw2d.IFigure; import org.eclipse.draw2d.PolygonShape; Modified: trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/edit/parts/EndEvent2EditPart.java =================================================================== --- trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/edit/parts/EndEvent2EditPart.java 2011-02-09 09:42:57 UTC (rev 29073) +++ trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/edit/parts/EndEvent2EditPart.java 2011-02-09 09:46:27 UTC (rev 29074) @@ -28,6 +28,7 @@ import org.eclipse.gmf.runtime.emf.type.core.IElementType; import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure; import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure; +import org.eclipse.gmf.runtime.lite.svg.SVGFigure; import org.eclipse.gmf.runtime.notation.View; import org.eclipse.swt.graphics.Color; import org.jboss.tools.bpmn2.process.diagram.edit.policies.EndEvent2ItemSemanticEditPolicy; @@ -116,7 +117,7 @@ * @generated */ protected NodeFigure createNodePlate() { - DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(20, 20); + DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(48, 48); return result; } @@ -569,54 +570,15 @@ /** * @generated */ - public class MessageEndEventFigureDescriptor extends RectangleFigure { + public class MessageEndEventFigureDescriptor extends SVGFigure { /** * @generated */ public MessageEndEventFigureDescriptor() { - this.setLayoutManager(new StackLayout()); - this.setFill(false); - this.setOutline(false); - createContents(); + this.setURI("platform:/plugin/org.jboss.tools.bpmn2.process.diagram/images/events_48px_end_message.svg"); } - /** - * @generated - */ - private void createContents() { - - Ellipse circle0 = new Ellipse(); - circle0.setLineWidth(3); - - circle0.setBorder(new MarginBorder(getMapMode().DPtoLP(6), - getMapMode().DPtoLP(5), getMapMode().DPtoLP(6), - getMapMode().DPtoLP(5))); - - this.add(circle0); - circle0.setLayoutManager(new StackLayout()); - - RectangleFigure rectangle1 = new RectangleFigure(); - rectangle1.setBackgroundColor(ColorConstants.lightGray); - - circle0.add(rectangle1); - rectangle1.setLayoutManager(new StackLayout()); - - PolylineShape blackEnvelope2 = new PolylineShape(); - blackEnvelope2.addPoint(new Point(getMapMode().DPtoLP(0), - getMapMode().DPtoLP(0))); - blackEnvelope2.addPoint(new Point(getMapMode().DPtoLP(4), - getMapMode().DPtoLP(4))); - blackEnvelope2.addPoint(new Point(getMapMode().DPtoLP(5), - getMapMode().DPtoLP(4))); - blackEnvelope2.addPoint(new Point(getMapMode().DPtoLP(9), - getMapMode().DPtoLP(0))); - blackEnvelope2.setForegroundColor(ColorConstants.white); - - rectangle1.add(blackEnvelope2); - - } - } } Modified: trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/edit/parts/EndEvent3EditPart.java =================================================================== --- trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/edit/parts/EndEvent3EditPart.java 2011-02-09 09:42:57 UTC (rev 29073) +++ trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/edit/parts/EndEvent3EditPart.java 2011-02-09 09:46:27 UTC (rev 29074) @@ -26,6 +26,7 @@ import org.eclipse.gmf.runtime.emf.type.core.IElementType; import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure; import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure; +import org.eclipse.gmf.runtime.lite.svg.SVGFigure; import org.eclipse.gmf.runtime.notation.View; import org.eclipse.swt.graphics.Color; import org.jboss.tools.bpmn2.process.diagram.edit.policies.EndEvent3ItemSemanticEditPolicy; @@ -114,7 +115,7 @@ * @generated */ protected NodeFigure createNodePlate() { - DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(20, 20); + DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(48, 48); return result; } @@ -567,40 +568,15 @@ /** * @generated */ - public class TerminateEndEventFigureDescriptor extends RectangleFigure { + public class TerminateEndEventFigureDescriptor extends SVGFigure { /** * @generated */ public TerminateEndEventFigureDescriptor() { - this.setLayoutManager(new StackLayout()); - this.setFill(false); - this.setOutline(false); - createContents(); + this.setURI("platform:/plugin/org.jboss.tools.bpmn2.process.diagram/images/events_48px_end_terminate.svg"); } - /** - * @generated - */ - private void createContents() { - - Ellipse circle0 = new Ellipse(); - circle0.setLineWidth(3); - - circle0.setBorder(new MarginBorder(getMapMode().DPtoLP(6), - getMapMode().DPtoLP(6), getMapMode().DPtoLP(6), - getMapMode().DPtoLP(6))); - - this.add(circle0); - circle0.setLayoutManager(new StackLayout()); - - Ellipse circle1 = new Ellipse(); - circle1.setBackgroundColor(ColorConstants.lightGray); - - circle0.add(circle1); - - } - } } Modified: trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/edit/parts/EndEvent4EditPart.java =================================================================== --- trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/edit/parts/EndEvent4EditPart.java 2011-02-09 09:42:57 UTC (rev 29073) +++ trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/edit/parts/EndEvent4EditPart.java 2011-02-09 09:46:27 UTC (rev 29074) @@ -24,6 +24,7 @@ import org.eclipse.gmf.runtime.emf.type.core.IElementType; import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure; import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure; +import org.eclipse.gmf.runtime.lite.svg.SVGFigure; import org.eclipse.gmf.runtime.notation.View; import org.eclipse.swt.graphics.Color; import org.jboss.tools.bpmn2.process.diagram.edit.policies.EndEvent4ItemSemanticEditPolicy; @@ -112,7 +113,7 @@ * @generated */ protected NodeFigure createNodePlate() { - DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(20, 20); + DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(48, 48); return result; } @@ -565,30 +566,15 @@ /** * @generated */ - public class EndEventFigureDescriptor extends RectangleFigure { + public class EndEventFigureDescriptor extends SVGFigure { /** * @generated */ public EndEventFigureDescriptor() { - this.setLayoutManager(new StackLayout()); - this.setFill(false); - this.setOutline(false); - createContents(); + this.setURI("platform:/plugin/org.jboss.tools.bpmn2.process.diagram/images/events_48px_end_none.svg"); } - /** - * @generated - */ - private void createContents() { - - Ellipse circle0 = new Ellipse(); - circle0.setLineWidth(3); - - this.add(circle0); - - } - } } Modified: trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/edit/parts/EndEvent5EditPart.java =================================================================== --- trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/edit/parts/EndEvent5EditPart.java 2011-02-09 09:42:57 UTC (rev 29073) +++ trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/edit/parts/EndEvent5EditPart.java 2011-02-09 09:46:27 UTC (rev 29074) @@ -28,6 +28,7 @@ import org.eclipse.gmf.runtime.emf.type.core.IElementType; import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure; import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure; +import org.eclipse.gmf.runtime.lite.svg.SVGFigure; import org.eclipse.gmf.runtime.notation.View; import org.eclipse.swt.graphics.Color; import org.jboss.tools.bpmn2.process.diagram.edit.policies.EndEvent5ItemSemanticEditPolicy; @@ -116,7 +117,7 @@ * @generated */ protected NodeFigure createNodePlate() { - DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(20, 20); + DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(48, 48); return result; } @@ -569,54 +570,15 @@ /** * @generated */ - public class MessageEndEventFigureDescriptor extends RectangleFigure { + public class MessageEndEventFigureDescriptor extends SVGFigure { /** * @generated */ public MessageEndEventFigureDescriptor() { - this.setLayoutManager(new StackLayout()); - this.setFill(false); - this.setOutline(false); - createContents(); + this.setURI("platform:/plugin/org.jboss.tools.bpmn2.process.diagram/images/events_48px_end_message.svg"); } - /** - * @generated - */ - private void createContents() { - - Ellipse circle0 = new Ellipse(); - circle0.setLineWidth(3); - - circle0.setBorder(new MarginBorder(getMapMode().DPtoLP(6), - getMapMode().DPtoLP(5), getMapMode().DPtoLP(6), - getMapMode().DPtoLP(5))); - - this.add(circle0); - circle0.setLayoutManager(new StackLayout()); - - RectangleFigure rectangle1 = new RectangleFigure(); - rectangle1.setBackgroundColor(ColorConstants.lightGray); - - circle0.add(rectangle1); - rectangle1.setLayoutManager(new StackLayout()); - - PolylineShape blackEnvelope2 = new PolylineShape(); - blackEnvelope2.addPoint(new Point(getMapMode().DPtoLP(0), - getMapMode().DPtoLP(0))); - blackEnvelope2.addPoint(new Point(getMapMode().DPtoLP(4), - getMapMode().DPtoLP(4))); - blackEnvelope2.addPoint(new Point(getMapMode().DPtoLP(5), - getMapMode().DPtoLP(4))); - blackEnvelope2.addPoint(new Point(getMapMode().DPtoLP(9), - getMapMode().DPtoLP(0))); - blackEnvelope2.setForegroundColor(ColorConstants.white); - - rectangle1.add(blackEnvelope2); - - } - } } Modified: trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/edit/parts/EndEvent6EditPart.java =================================================================== --- trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/edit/parts/EndEvent6EditPart.java 2011-02-09 09:42:57 UTC (rev 29073) +++ trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/edit/parts/EndEvent6EditPart.java 2011-02-09 09:46:27 UTC (rev 29074) @@ -26,6 +26,7 @@ import org.eclipse.gmf.runtime.emf.type.core.IElementType; import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure; import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure; +import org.eclipse.gmf.runtime.lite.svg.SVGFigure; import org.eclipse.gmf.runtime.notation.View; import org.eclipse.swt.graphics.Color; import org.jboss.tools.bpmn2.process.diagram.edit.policies.EndEvent6ItemSemanticEditPolicy; @@ -114,7 +115,7 @@ * @generated */ protected NodeFigure createNodePlate() { - DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(20, 20); + DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(48, 48); return result; } @@ -567,40 +568,15 @@ /** * @generated */ - public class TerminateEndEventFigureDescriptor extends RectangleFigure { + public class TerminateEndEventFigureDescriptor extends SVGFigure { /** * @generated */ public TerminateEndEventFigureDescriptor() { - this.setLayoutManager(new StackLayout()); - this.setFill(false); - this.setOutline(false); - createContents(); + this.setURI("platform:/plugin/org.jboss.tools.bpmn2.process.diagram/images/events_48px_end_terminate.svg"); } - /** - * @generated - */ - private void createContents() { - - Ellipse circle0 = new Ellipse(); - circle0.setLineWidth(3); - - circle0.setBorder(new MarginBorder(getMapMode().DPtoLP(6), - getMapMode().DPtoLP(6), getMapMode().DPtoLP(6), - getMapMode().DPtoLP(6))); - - this.add(circle0); - circle0.setLayoutManager(new StackLayout()); - - Ellipse circle1 = new Ellipse(); - circle1.setBackgroundColor(ColorConstants.lightGray); - - circle0.add(circle1); - - } - } } Modified: trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/edit/parts/EndEventEditPart.java =================================================================== --- trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/edit/parts/EndEventEditPart.java 2011-02-09 09:42:57 UTC (rev 29073) +++ trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/edit/parts/EndEventEditPart.java 2011-02-09 09:46:27 UTC (rev 29074) @@ -24,6 +24,7 @@ import org.eclipse.gmf.runtime.emf.type.core.IElementType; import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure; import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure; +import org.eclipse.gmf.runtime.lite.svg.SVGFigure; import org.eclipse.gmf.runtime.notation.View; import org.eclipse.swt.graphics.Color; import org.jboss.tools.bpmn2.process.diagram.edit.policies.EndEventItemSemanticEditPolicy; @@ -112,7 +113,7 @@ * @generated */ protected NodeFigure createNodePlate() { - DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(20, 20); + DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(48, 48); return result; } @@ -565,30 +566,15 @@ /** * @generated */ - public class EndEventFigureDescriptor extends RectangleFigure { + public class EndEventFigureDescriptor extends SVGFigure { /** * @generated */ public EndEventFigureDescriptor() { - this.setLayoutManager(new StackLayout()); - this.setFill(false); - this.setOutline(false); - createContents(); + this.setURI("platform:/plugin/org.jboss.tools.bpmn2.process.diagram/images/events_48px_end_none.svg"); } - /** - * @generated - */ - private void createContents() { - - Ellipse circle0 = new Ellipse(); - circle0.setLineWidth(3); - - this.add(circle0); - - } - } } Modified: trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/edit/parts/ExclusiveGateway2EditPart.java =================================================================== --- trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/edit/parts/ExclusiveGateway2EditPart.java 2011-02-09 09:42:57 UTC (rev 29073) +++ trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/edit/parts/ExclusiveGateway2EditPart.java 2011-02-09 09:46:27 UTC (rev 29074) @@ -25,6 +25,7 @@ import org.eclipse.gmf.runtime.emf.type.core.IElementType; import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure; import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure; +import org.eclipse.gmf.runtime.lite.svg.SVGFigure; import org.eclipse.gmf.runtime.notation.View; import org.eclipse.swt.graphics.Color; import org.jboss.tools.bpmn2.process.diagram.edit.policies.ExclusiveGateway2ItemSemanticEditPolicy; @@ -113,7 +114,7 @@ * @generated */ protected NodeFigure createNodePlate() { - DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(31, 31); + DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(48, 48); return result; } @@ -566,38 +567,15 @@ /** * @generated */ - public class ExclusiveGatewayFigureDescriptor extends RectangleFigure { + public class ExclusiveGatewayFigureDescriptor extends SVGFigure { /** * @generated */ public ExclusiveGatewayFigureDescriptor() { - this.setLayoutManager(new StackLayout()); - this.setFill(false); - this.setOutline(false); - createContents(); + this.setURI("platform:/plugin/org.jboss.tools.bpmn2.process.diagram/images/gateways_48px_exclusive.svg"); } - /** - * @generated - */ - private void createContents() { - - PolygonShape diamond0 = new PolygonShape(); - diamond0.addPoint(new Point(getMapMode().DPtoLP(15), getMapMode() - .DPtoLP(0))); - diamond0.addPoint(new Point(getMapMode().DPtoLP(0), getMapMode() - .DPtoLP(15))); - diamond0.addPoint(new Point(getMapMode().DPtoLP(15), getMapMode() - .DPtoLP(30))); - diamond0.addPoint(new Point(getMapMode().DPtoLP(30), getMapMode() - .DPtoLP(15))); - diamond0.setFill(true); - - this.add(diamond0); - - } - } } Modified: trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/edit/parts/ExclusiveGatewayEditPart.java =================================================================== --- trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/edit/parts/ExclusiveGatewayEditPart.java 2011-02-09 09:42:57 UTC (rev 29073) +++ trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/edit/parts/ExclusiveGatewayEditPart.java 2011-02-09 09:46:27 UTC (rev 29074) @@ -25,6 +25,7 @@ import org.eclipse.gmf.runtime.emf.type.core.IElementType; import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure; import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure; +import org.eclipse.gmf.runtime.lite.svg.SVGFigure; import org.eclipse.gmf.runtime.notation.View; import org.eclipse.swt.graphics.Color; import org.jboss.tools.bpmn2.process.diagram.edit.policies.ExclusiveGatewayItemSemanticEditPolicy; @@ -113,7 +114,7 @@ * @generated */ protected NodeFigure createNodePlate() { - DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(31, 31); + DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(48, 48); return result; } @@ -566,38 +567,15 @@ /** * @generated */ - public class ExclusiveGatewayFigureDescriptor extends RectangleFigure { + public class ExclusiveGatewayFigureDescriptor extends SVGFigure { /** * @generated */ public ExclusiveGatewayFigureDescriptor() { - this.setLayoutManager(new StackLayout()); - this.setFill(false); - this.setOutline(false); - createContents(); + this.setURI("platform:/plugin/org.jboss.tools.bpmn2.process.diagram/images/gateways_48px_exclusive.svg"); } - /** - * @generated - */ - private void createContents() { - - PolygonShape diamond0 = new PolygonShape(); - diamond0.addPoint(new Point(getMapMode().DPtoLP(15), getMapMode() - .DPtoLP(0))); - diamond0.addPoint(new Point(getMapMode().DPtoLP(0), getMapMode() - .DPtoLP(15))); - diamond0.addPoint(new Point(getMapMode().DPtoLP(15), getMapMode() - .DPtoLP(30))); - diamond0.addPoint(new Point(getMapMode().DPtoLP(30), getMapMode() - .DPtoLP(15))); - diamond0.setFill(true); - - this.add(diamond0); - - } - } } Modified: trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/edit/parts/IntermediateCatchEvent2EditPart.java =================================================================== --- trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/edit/parts/IntermediateCatchEvent2EditPart.java 2011-02-09 09:42:57 UTC (rev 29073) +++ trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/edit/parts/IntermediateCatchEvent2EditPart.java 2011-02-09 09:46:27 UTC (rev 29074) @@ -27,6 +27,7 @@ import org.eclipse.gmf.runtime.emf.type.core.IElementType; import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure; import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure; +import org.eclipse.gmf.runtime.lite.svg.SVGFigure; import org.eclipse.gmf.runtime.notation.View; import org.eclipse.swt.graphics.Color; import org.jboss.tools.bpmn2.process.diagram.edit.policies.IntermediateCatchEvent2ItemSemanticEditPolicy; @@ -115,7 +116,7 @@ * @generated */ protected NodeFigure createNodePlate() { - DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(20, 20); + DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(48, 48); return result; } @@ -568,96 +569,15 @@ /** * @generated */ - public class TimerCatchIntermediateEventFigureDescriptor extends - RectangleFigure { + public class TimerCatchIntermediateEventFigureDescriptor extends SVGFigure { /** * @generated */ public TimerCatchIntermediateEventFigureDescriptor() { - this.setLayoutManager(new StackLayout()); - this.setFill(false); - this.setOutline(false); - createContents(); + this.setURI("platform:/plugin/org.jboss.tools.bpmn2.process.diagram/images/events_48px_intermediate_timer_catch.svg"); } - /** - * @generated - */ - private void createContents() { - - Ellipse outerCircle0 = new Ellipse(); - - outerCircle0.setBorder(new MarginBorder(getMapMode().DPtoLP(2), - getMapMode().DPtoLP(2), getMapMode().DPtoLP(2), - getMapMode().DPtoLP(2))); - - this.add(outerCircle0); - outerCircle0.setLayoutManager(new StackLayout()); - - Ellipse innerCircle1 = new Ellipse(); - - innerCircle1.setBorder(new MarginBorder(getMapMode().DPtoLP(3), - getMapMode().DPtoLP(3), getMapMode().DPtoLP(3), - getMapMode().DPtoLP(3))); - - outerCircle0.add(innerCircle1); - innerCircle1.setLayoutManager(new StackLayout()); - - Ellipse clock2 = new Ellipse(); - - innerCircle1.add(clock2); - - PolylineShape twelve2 = new PolylineShape(); - twelve2.addPoint(new Point(getMapMode().DPtoLP(4), getMapMode() - .DPtoLP(0))); - twelve2.addPoint(new Point(getMapMode().DPtoLP(4), getMapMode() - .DPtoLP(2))); - - innerCircle1.add(twelve2); - - PolylineShape three2 = new PolylineShape(); - three2.addPoint(new Point(getMapMode().DPtoLP(7), getMapMode() - .DPtoLP(4))); - three2.addPoint(new Point(getMapMode().DPtoLP(9), getMapMode() - .DPtoLP(4))); - - innerCircle1.add(three2); - - PolylineShape six2 = new PolylineShape(); - six2.addPoint(new Point(getMapMode().DPtoLP(4), getMapMode() - .DPtoLP(7))); - six2.addPoint(new Point(getMapMode().DPtoLP(4), getMapMode() - .DPtoLP(9))); - - innerCircle1.add(six2); - - PolylineShape nine2 = new PolylineShape(); - nine2.addPoint(new Point(getMapMode().DPtoLP(0), getMapMode() - .DPtoLP(4))); - nine2.addPoint(new Point(getMapMode().DPtoLP(2), getMapMode() - .DPtoLP(4))); - - innerCircle1.add(nine2); - - PolylineShape big2 = new PolylineShape(); - big2.addPoint(new Point(getMapMode().DPtoLP(4), getMapMode() - .DPtoLP(4))); - big2.addPoint(new Point(getMapMode().DPtoLP(6), getMapMode() - .DPtoLP(1))); - - innerCircle1.add(big2); - - PolylineShape small2 = new PolylineShape(); - small2.addPoint(new Point(getMapMode().DPtoLP(4), getMapMode() - .DPtoLP(4))); - small2.addPoint(new Point(getMapMode().DPtoLP(7), getMapMode() - .DPtoLP(7))); - - innerCircle1.add(small2); - - } - } } Modified: trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/edit/parts/IntermediateCatchEvent3EditPart.java =================================================================== --- trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/edit/parts/IntermediateCatchEvent3EditPart.java 2011-02-09 09:42:57 UTC (rev 29073) +++ trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/edit/parts/IntermediateCatchEvent3EditPart.java 2011-02-09 09:46:27 UTC (rev 29074) @@ -27,6 +27,7 @@ import org.eclipse.gmf.runtime.emf.type.core.IElementType; import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure; import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure; +import org.eclipse.gmf.runtime.lite.svg.SVGFigure; import org.eclipse.gmf.runtime.notation.View; import org.eclipse.swt.graphics.Color; import org.jboss.tools.bpmn2.process.diagram.edit.policies.IntermediateCatchEvent3ItemSemanticEditPolicy; @@ -115,7 +116,7 @@ * @generated */ protected NodeFigure createNodePlate() { - DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(20, 20); + DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(48, 48); return result; } @@ -568,61 +569,15 @@ /** * @generated */ - public class ErrorCatchIntermediateEventFigureDescriptor extends - RectangleFigure { + public class ErrorCatchIntermediateEventFigureDescriptor extends SVGFigure { /** * @generated */ public ErrorCatchIntermediateEventFigureDescriptor() { - this.setLayoutManager(new StackLayout()); - this.setFill(false); - this.setOutline(false); - createContents(); + this.setURI("platform:/plugin/org.jboss.tools.bpmn2.process.diagram/images/events_48px_intermediate_error_catch.svg"); } - /** - * @generated - */ - private void createContents() { - - Ellipse outerCircle0 = new Ellipse(); - - outerCircle0.setBorder(new MarginBorder(getMapMode().DPtoLP(2), - getMapMode().DPtoLP(2), getMapMode().DPtoLP(2), - getMapMode().DPtoLP(2))); - - this.add(outerCircle0); - outerCircle0.setLayoutManager(new StackLayout()); - - Ellipse innerCircle1 = new Ellipse(); - - innerCircle1.setBorder(new MarginBorder(getMapMode().DPtoLP(3), - getMapMode().DPtoLP(3), getMapMode().DPtoLP(3), - getMapMode().DPtoLP(3))); - - outerCircle0.add(innerCircle1); - innerCircle1.setLayoutManager(new StackLayout()); - - PolygonShape flash2 = new PolygonShape(); - flash2.addPoint(new Point(getMapMode().DPtoLP(0), getMapMode() - .DPtoLP(9))); - flash2.addPoint(new Point(getMapMode().DPtoLP(3), getMapMode() - .DPtoLP(0))); - flash2.addPoint(new Point(getMapMode().DPtoLP(7), getMapMode() - .DPtoLP(6))); - flash2.addPoint(new Point(getMapMode().DPtoLP(10), getMapMode() - .DPtoLP(1))); - flash2.addPoint(new Point(getMapMode().DPtoLP(7), getMapMode() - .DPtoLP(10))); - flash2.addPoint(new Point(getMapMode().DPtoLP(3), getMapMode() - .DPtoLP(3))); - flash2.setFill(true); - - innerCircle1.add(flash2); - - } - } } Modified: trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/edit/parts/IntermediateCatchEvent4EditPart.java =================================================================== --- trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/edit/parts/IntermediateCatchEvent4EditPart.java 2011-02-09 09:42:57 UTC (rev 29073) +++ trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/edit/parts/IntermediateCatchEvent4EditPart.java 2011-02-09 09:46:27 UTC (rev 29074) @@ -8,6 +8,7 @@ import org.eclipse.draw2d.IFigure; import org.eclipse.draw2d.MarginBorder; import org.eclipse.draw2d.PolylineShape; +import org.eclipse.draw2d.PositionConstants; import org.eclipse.draw2d.RectangleFigure; import org.eclipse.draw2d.Shape; import org.eclipse.draw2d.StackLayout; @@ -18,6 +19,7 @@ import org.eclipse.gef.commands.Command; import org.eclipse.gef.editpolicies.LayoutEditPolicy; import org.eclipse.gef.editpolicies.NonResizableEditPolicy; +import org.eclipse.gef.editpolicies.ResizableEditPolicy; import org.eclipse.gef.requests.CreateRequest; import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart; import org.eclipse.gmf.runtime.diagram.ui.editparts.ShapeNodeEditPart; @@ -25,6 +27,7 @@ import org.eclipse.gmf.runtime.emf.type.core.IElementType; import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure; import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure; +import org.eclipse.gmf.runtime.lite.svg.SVGFigure; import org.eclipse.gmf.runtime.notation.View; import org.eclipse.swt.graphics.Color; import org.jboss.tools.bpmn2.process.diagram.edit.policies.IntermediateCatchEvent4ItemSemanticEditPolicy; @@ -113,11 +116,23 @@ * @generated */ protected NodeFigure createNodePlate() { - DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(20, 20); + DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(48, 48); return result; } /** + * @generated + */ + public EditPolicy getPrimaryDragEditPolicy() { + EditPolicy result = super.getPrimaryDragEditPolicy(); + if (result instanceof ResizableEditPolicy) { + ResizableEditPolicy ep = (ResizableEditPolicy) result; + ep.setResizeDirections(PositionConstants.NONE); + } + return result; + } + + /** * Creates figure for this edit part. * * Body of this method does not depend on settings in generation model @@ -555,60 +570,15 @@ * @generated */ public class MessageCatchIntermediateEventFigureDescriptor extends - RectangleFigure { + SVGFigure { /** * @generated */ public MessageCatchIntermediateEventFigureDescriptor() { - this.setLayoutManager(new StackLayout()); - this.setFill(false); - this.setOutline(false); - createContents(); + this.setURI("platform:/plugin/org.jboss.tools.bpmn2.process.diagram/images/events_48px_intermediate_message_catch.svg"); } - /** - * @generated - */ - private void createContents() { - - Ellipse outerCircle0 = new Ellipse(); - - outerCircle0.setBorder(new MarginBorder(getMapMode().DPtoLP(2), - getMapMode().DPtoLP(2), getMapMode().DPtoLP(2), - getMapMode().DPtoLP(2))); - - this.add(outerCircle0); - outerCircle0.setLayoutManager(new StackLayout()); - - Ellipse innerCircle1 = new Ellipse(); - - innerCircle1.setBorder(new MarginBorder(getMapMode().DPtoLP(4), - getMapMode().DPtoLP(3), getMapMode().DPtoLP(4), - getMapMode().DPtoLP(3))); - - outerCircle0.add(innerCircle1); - innerCircle1.setLayoutManager(new StackLayout()); - - RectangleFigure rectangle2 = new RectangleFigure(); - - innerCircle1.add(rectangle2); - rectangle2.setLayoutManager(new StackLayout()); - - PolylineShape envelope3 = new PolylineShape(); - envelope3.addPoint(new Point(getMapMode().DPtoLP(0), getMapMode() - .DPtoLP(0))); - envelope3.addPoint(new Point(getMapMode().DPtoLP(4), getMapMode() - .DPtoLP(4))); - envelope3.addPoint(new Point(getMapMode().DPtoLP(5), getMapMode() - .DPtoLP(4))); - envelope3.addPoint(new Point(getMapMode().DPtoLP(9), getMapMode() - .DPtoLP(0))); - - rectangle2.add(envelope3); - - } - } } Modified: trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/edit/parts/IntermediateCatchEvent5EditPart.java =================================================================== --- trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/edit/parts/IntermediateCatchEvent5EditPart.java 2011-02-09 09:42:57 UTC (rev 29073) +++ trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/edit/parts/IntermediateCatchEvent5EditPart.java 2011-02-09 09:46:27 UTC (rev 29074) @@ -27,6 +27,7 @@ import org.eclipse.gmf.runtime.emf.type.core.IElementType; import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure; import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure; +import org.eclipse.gmf.runtime.lite.svg.SVGFigure; import org.eclipse.gmf.runtime.notation.View; import org.eclipse.swt.graphics.Color; import org.jboss.tools.bpmn2.process.diagram.edit.policies.IntermediateCatchEvent5ItemSemanticEditPolicy; @@ -115,7 +116,7 @@ * @generated */ protected NodeFigure createNodePlate() { - DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(20, 20); + DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(48, 48); return result; } @@ -568,96 +569,15 @@ /** * @generated */ - public class TimerCatchIntermediateEventFigureDescriptor extends - RectangleFigure { + public class TimerCatchIntermediateEventFigureDescriptor extends SVGFigure { /** * @generated */ public TimerCatchIntermediateEventFigureDescriptor() { - this.setLayoutManager(new StackLayout()); - this.setFill(false); - this.setOutline(false); - createContents(); + this.setURI("platform:/plugin/org.jboss.tools.bpmn2.process.diagram/images/events_48px_intermediate_timer_catch.svg"); } - /** - * @generated - */ - private void createContents() { - - Ellipse outerCircle0 = new Ellipse(); - - outerCircle0.setBorder(new MarginBorder(getMapMode().DPtoLP(2), - getMapMode().DPtoLP(2), getMapMode().DPtoLP(2), - getMapMode().DPtoLP(2))); - - this.add(outerCircle0); - outerCircle0.setLayoutManager(new StackLayout()); - - Ellipse innerCircle1 = new Ellipse(); - - innerCircle1.setBorder(new MarginBorder(getMapMode().DPtoLP(3), - getMapMode().DPtoLP(3), getMapMode().DPtoLP(3), - getMapMode().DPtoLP(3))); - - outerCircle0.add(innerCircle1); - innerCircle1.setLayoutManager(new StackLayout()); - - Ellipse clock2 = new Ellipse(); - - innerCircle1.add(clock2); - - PolylineShape twelve2 = new PolylineShape(); - twelve2.addPoint(new Point(getMapMode().DPtoLP(4), getMapMode() - .DPtoLP(0))); - twelve2.addPoint(new Point(getMapMode().DPtoLP(4), getMapMode() - .DPtoLP(2))); - - innerCircle1.add(twelve2); - - PolylineShape three2 = new PolylineShape(); - three2.addPoint(new Point(getMapMode().DPtoLP(7), getMapMode() - .DPtoLP(4))); - three2.addPoint(new Point(getMapMode().DPtoLP(9), getMapMode() - .DPtoLP(4))); - - innerCircle1.add(three2); - - PolylineShape six2 = new PolylineShape(); - six2.addPoint(new Point(getMapMode().DPtoLP(4), getMapMode() - .DPtoLP(7))); - six2.addPoint(new Point(getMapMode().DPtoLP(4), getMapMode() - .DPtoLP(9))); - - innerCircle1.add(six2); - - PolylineShape nine2 = new PolylineShape(); - nine2.addPoint(new Point(getMapMode().DPtoLP(0), getMapMode() - .DPtoLP(4))); - nine2.addPoint(new Point(getMapMode().DPtoLP(2), getMapMode() - .DPtoLP(4))); - - innerCircle1.add(nine2); - - PolylineShape big2 = new PolylineShape(); - big2.addPoint(new Point(getMapMode().DPtoLP(4), getMapMode() - .DPtoLP(4))); - big2.addPoint(new Point(getMapMode().DPtoLP(6), getMapMode() - .DPtoLP(1))); - - innerCircle1.add(big2); - - PolylineShape small2 = new PolylineShape(); - small2.addPoint(new Point(getMapMode().DPtoLP(4), getMapMode() - .DPtoLP(4))); - small2.addPoint(new Point(getMapMode().DPtoLP(7), getMapMode() - .DPtoLP(7))); - - innerCircle1.add(small2); - - } - } } Modified: trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/edit/parts/IntermediateCatchEventEditPart.java =================================================================== --- trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/edit/parts/IntermediateCatchEventEditPart.java 2011-02-09 09:42:57 UTC (rev 29073) +++ trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/edit/parts/IntermediateCatchEventEditPart.java 2011-02-09 09:46:27 UTC (rev 29074) @@ -8,6 +8,7 @@ import org.eclipse.draw2d.IFigure; import org.eclipse.draw2d.MarginBorder; import org.eclipse.draw2d.PolylineShape; +import org.eclipse.draw2d.PositionConstants; import org.eclipse.draw2d.RectangleFigure; import org.eclipse.draw2d.Shape; import org.eclipse.draw2d.StackLayout; @@ -18,6 +19,7 @@ import org.eclipse.gef.commands.Command; import org.eclipse.gef.editpolicies.LayoutEditPolicy; import org.eclipse.gef.editpolicies.NonResizableEditPolicy; +import org.eclipse.gef.editpolicies.ResizableEditPolicy; import org.eclipse.gef.requests.CreateRequest; import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart; import org.eclipse.gmf.runtime.diagram.ui.editparts.ShapeNodeEditPart; @@ -25,6 +27,7 @@ import org.eclipse.gmf.runtime.emf.type.core.IElementType; import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure; import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure; +import org.eclipse.gmf.runtime.lite.svg.SVGFigure; import org.eclipse.gmf.runtime.notation.View; import org.eclipse.swt.graphics.Color; import org.jboss.tools.bpmn2.process.diagram.edit.policies.IntermediateCatchEventItemSemanticEditPolicy; @@ -113,11 +116,23 @@ * @generated */ protected NodeFigure createNodePlate() { - DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(20, 20); + DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(48, 48); return result; } /** + * @generated + */ + public EditPolicy getPrimaryDragEditPolicy() { + EditPolicy result = super.getPrimaryDragEditPolicy(); + if (result instanceof ResizableEditPolicy) { + ResizableEditPolicy ep = (ResizableEditPolicy) result; + ep.setResizeDirections(PositionConstants.NONE); + } + return result; + } + + /** * Creates figure for this edit part. * * Body of this method does not depend on settings in generation model @@ -555,60 +570,15 @@ * @generated */ public class MessageCatchIntermediateEventFigureDescriptor extends - RectangleFigure { + SVGFigure { /** * @generated */ public MessageCatchIntermediateEventFigureDescriptor() { - this.setLayoutManager(new StackLayout()); - this.setFill(false); - this.setOutline(false); - createContents(); + this.setURI("platform:/plugin/org.jboss.tools.bpmn2.process.diagram/images/events_48px_intermediate_message_catch.svg"); } - /** - * @generated - */ - private void createContents() { - - Ellipse outerCircle0 = new Ellipse(); - - outerCircle0.setBorder(new MarginBorder(getMapMode().DPtoLP(2), - getMapMode().DPtoLP(2), getMapMode().DPtoLP(2), - getMapMode().DPtoLP(2))); - - this.add(outerCircle0); - outerCircle0.setLayoutManager(new StackLayout()); - - Ellipse innerCircle1 = new Ellipse(); - - innerCircle1.setBorder(new MarginBorder(getMapMode().DPtoLP(4), - getMapMode().DPtoLP(3), getMapMode().DPtoLP(4), - getMapMode().DPtoLP(3))); - - outerCircle0.add(innerCircle1); - innerCircle1.setLayoutManager(new StackLayout()); - - RectangleFigure rectangle2 = new RectangleFigure(); - - innerCircle1.add(rectangle2); - rectangle2.setLayoutManager(new StackLayout()); - - PolylineShape envelope3 = new PolylineShape(); - envelope3.addPoint(new Point(getMapMode().DPtoLP(0), getMapMode() - .DPtoLP(0))); - envelope3.addPoint(new Point(getMapMode().DPtoLP(4), getMapMode() - .DPtoLP(4))); - envelope3.addPoint(new Point(getMapMode().DPtoLP(5), getMapMode() - .DPtoLP(4))); - envelope3.addPoint(new Point(getMapMode().DPtoLP(9), getMapMode() - .DPtoLP(0))); - - rectangle2.add(envelope3); - - } - } } Modified: trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/edit/parts/IntermediateThrowEvent2EditPart.java =================================================================== --- trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/edit/parts/IntermediateThrowEvent2EditPart.java 2011-02-09 09:42:57 UTC (rev 29073) +++ trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/edit/parts/IntermediateThrowEvent2EditPart.java 2011-02-09 09:46:27 UTC (rev 29074) @@ -28,6 +28,7 @@ import org.eclipse.gmf.runtime.emf.type.core.IElementType; import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure; import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure; +import org.eclipse.gmf.runtime.lite.svg.SVGFigure; import org.eclipse.gmf.runtime.notation.View; import org.eclipse.swt.graphics.Color; import org.jboss.tools.bpmn2.process.diagram.edit.policies.IntermediateThrowEvent2ItemSemanticEditPolicy; @@ -116,7 +117,7 @@ * @generated */ protected NodeFigure createNodePlate() { - DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(20, 20); + DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(48, 48); return result; } @@ -570,62 +571,15 @@ * @generated */ public class MessageThrowIntermediateEventFigureDescriptor extends - RectangleFigure { + SVGFigure { /** * @generated */ public MessageThrowIntermediateEventFigureDescriptor() { - this.setLayoutManager(new StackLayout()); - this.setFill(false); - this.setOutline(false); - createContents(); + this.setURI("platform:/plugin/org.jboss.tools.bpmn2.process.diagram/images/events_48px_intermediate_message_throw.svg"); } - /** - * @generated - */ - private void createContents() { - - Ellipse outerCircle0 = new Ellipse(); - - outerCircle0.setBorder(new MarginBorder(getMapMode().DPtoLP(2), - getMapMode().DPtoLP(2), getMapMode().DPtoLP(2), - getMapMode().DPtoLP(2))); - - this.add(outerCircle0); - outerCircle0.setLayoutManager(new StackLayout()); - - Ellipse innerCircle1 = new Ellipse(); - - innerCircle1.setBorder(new MarginBorder(getMapMode().DPtoLP(4), - getMapMode().DPtoLP(3), getMapMode().DPtoLP(4), - getMapMode().DPtoLP(3))); - - outerCircle0.add(innerCircle1); - innerCircle1.setLayoutManager(new StackLayout()); - - RectangleFigure rectangle2 = new RectangleFigure(); - rectangle2.setBackgroundColor(ColorConstants.lightGray); - - innerCircle1.add(rectangle2); - rectangle2.setLayoutManager(new StackLayout()); - - PolylineShape envelope3 = new PolylineShape(); - envelope3.addPoint(new Point(getMapMode().DPtoLP(0), getMapMode() - .DPtoLP(0))); - envelope3.addPoint(new Point(getMapMode().DPtoLP(4), getMapMode() - .DPtoLP(4))); - envelope3.addPoint(new Point(getMapMode().DPtoLP(5), getMapMode() - .DPtoLP(4))); - envelope3.addPoint(new Point(getMapMode().DPtoLP(9), getMapMode() - .DPtoLP(0))); - envelope3.setForegroundColor(ColorConstants.white); - - rectangle2.add(envelope3); - - } - } } Modified: trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/edit/parts/IntermediateThrowEventEditPart.java =================================================================== --- trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/edit/parts/IntermediateThrowEventEditPart.java 2011-02-09 09:42:57 UTC (rev 29073) +++ trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/edit/parts/IntermediateThrowEventEditPart.java 2011-02-09 09:46:27 UTC (rev 29074) @@ -28,6 +28,7 @@ import org.eclipse.gmf.runtime.emf.type.core.IElementType; import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure; import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure; +import org.eclipse.gmf.runtime.lite.svg.SVGFigure; import org.eclipse.gmf.runtime.notation.View; import org.eclipse.swt.graphics.Color; import org.jboss.tools.bpmn2.process.diagram.edit.policies.IntermediateThrowEventItemSemanticEditPolicy; @@ -116,7 +117,7 @@ * @generated */ protected NodeFigure createNodePlate() { - DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(20, 20); + DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(48, 48); return result; } @@ -570,62 +571,15 @@ * @generated */ public class MessageThrowIntermediateEventFigureDescriptor extends - RectangleFigure { + SVGFigure { /** * @generated */ public MessageThrowIntermediateEventFigureDescriptor() { - this.setLayoutManager(new StackLayout()); - this.setFill(false); - this.setOutline(false); - createContents(); + this.setURI("platform:/plugin/org.jboss.tools.bpmn2.process.diagram/images/events_48px_intermediate_message_throw.svg"); } - /** - * @generated - */ - private void createContents() { - - Ellipse outerCircle0 = new Ellipse(); - - outerCircle0.setBorder(new MarginBorder(getMapMode().DPtoLP(2), - getMapMode().DPtoLP(2), getMapMode().DPtoLP(2), - getMapMode().DPtoLP(2))); - - this.add(outerCircle0); - outerCircle0.setLayoutManager(new StackLayout()); - - Ellipse innerCircle1 = new Ellipse(); - - innerCircle1.setBorder(new MarginBorder(getMapMode().DPtoLP(4), - getMapMode().DPtoLP(3), getMapMode().DPtoLP(4), - getMapMode().DPtoLP(3))); - - outerCircle0.add(innerCircle1); - innerCircle1.setLayoutManager(new StackLayout()); - - RectangleFigure rectangle2 = new RectangleFigure(); - rectangle2.setBackgroundColor(ColorConstants.lightGray); - - innerCircle1.add(rectangle2); - rectangle2.setLayoutManager(new StackLayout()); - - PolylineShape envelope3 = new PolylineShape(); - envelope3.addPoint(new Point(getMapMode().DPtoLP(0), getMapMode() - .DPtoLP(0))); - envelope3.addPoint(new Point(getMapMode().DPtoLP(4), getMapMode() - .DPtoLP(4))); - envelope3.addPoint(new Point(getMapMode().DPtoLP(5), getMapMode() - .DPtoLP(4))); - envelope3.addPoint(new Point(getMapMode().DPtoLP(9), getMapMode() - .DPtoLP(0))); - envelope3.setForegroundColor(ColorConstants.white); - - rectangle2.add(envelope3); - - } - } } Modified: trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/edit/parts/ParallelGateway2EditPart.java =================================================================== --- trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/edit/parts/ParallelGateway2EditPart.java 2011-02-09 09:42:57 UTC (rev 29073) +++ trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/edit/parts/ParallelGateway2EditPart.java 2011-02-09 09:46:27 UTC (rev 29074) @@ -26,6 +26,7 @@ import org.eclipse.gmf.runtime.emf.type.core.IElementType; import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure; import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure; +import org.eclipse.gmf.runtime.lite.svg.SVGFigure; import org.eclipse.gmf.runtime.notation.View; import org.eclipse.swt.graphics.Color; import org.jboss.tools.bpmn2.process.diagram.edit.policies.ParallelGateway2ItemSemanticEditPolicy; @@ -114,7 +115,7 @@ * @generated */ protected NodeFigure createNodePlate() { - DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(31, 31); + DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(48, 48); return result; } @@ -567,54 +568,15 @@ /** * @generated */ - public class ParallelGatewayFigureDescriptor extends RectangleFigure { + public class ParallelGatewayFigureDescriptor extends SVGFigure { /** * @generated */ public ParallelGatewayFigureDescriptor() { - this.setLayoutManager(new StackLayout()); - this.setFill(false); - this.setOutline(false); - createContents(); + this.setURI("platform:/plugin/org.jboss.tools.bpmn2.process.diagram/images/gateways_48px_parallel.svg"); } - /** - * @generated - */ - private void createContents() { - - PolygonShape diamond0 = new PolygonShape(); - diamond0.addPoint(new Point(getMapMode().DPtoLP(15), getMapMode() - .DPtoLP(0))); - diamond0.addPoint(new Point(getMapMode().DPtoLP(0), getMapMode() - .DPtoLP(15))); - diamond0.addPoint(new Point(getMapMode().DPtoLP(15), getMapMode() - .DPtoLP(30))); - diamond0.addPoint(new Point(getMapMode().DPtoLP(30), getMapMode() - .DPtoLP(15))); - diamond0.setFill(true); - - this.add(diamond0); - - PolylineShape vertical0 = new PolylineShape(); - vertical0.addPoint(new Point(getMapMode().DPtoLP(15), getMapMode() - .DPtoLP(8))); - vertical0.addPoint(new Point(getMapMode().DPtoLP(15), getMapMode() - .DPtoLP(22))); - - this.add(vertical0); - - PolylineShape horizontal0 = new PolylineShape(); - horizontal0.addPoint(new Point(getMapMode().DPtoLP(8), getMapMode() - .DPtoLP(15))); - horizontal0.addPoint(new Point(getMapMode().DPtoLP(22), - getMapMode().DPtoLP(15))); - - this.add(horizontal0); - - } - } } Modified: trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/edit/parts/ParallelGatewayEditPart.java =================================================================== --- trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/edit/parts/ParallelGatewayEditPart.java 2011-02-09 09:42:57 UTC (rev 29073) +++ trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/edit/parts/ParallelGatewayEditPart.java 2011-02-09 09:46:27 UTC (rev 29074) @@ -26,6 +26,7 @@ import org.eclipse.gmf.runtime.emf.type.core.IElementType; import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure; import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure; +import org.eclipse.gmf.runtime.lite.svg.SVGFigure; import org.eclipse.gmf.runtime.notation.View; import org.eclipse.swt.graphics.Color; import org.jboss.tools.bpmn2.process.diagram.edit.policies.ParallelGatewayItemSemanticEditPolicy; @@ -114,7 +115,7 @@ * @generated */ protected NodeFigure createNodePlate() { - DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(31, 31); + DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(48, 48); return result; } @@ -567,54 +568,15 @@ /** * @generated */ - public class ParallelGatewayFigureDescriptor extends RectangleFigure { + public class ParallelGatewayFigureDescriptor extends SVGFigure { /** * @generated */ public ParallelGatewayFigureDescriptor() { - this.setLayoutManager(new StackLayout()); - this.setFill(false); - this.setOutline(false); - createContents(); + this.setURI("platform:/plugin/org.jboss.tools.bpmn2.process.diagram/images/gateways_48px_parallel.svg"); } - /** - * @generated - */ - private void createContents() { - - PolygonShape diamond0 = new PolygonShape(); - diamond0.addPoint(new Point(getMapMode().DPtoLP(15), getMapMode() - .DPtoLP(0))); - diamond0.addPoint(new Point(getMapMode().DPtoLP(0), getMapMode() - .DPtoLP(15))); - diamond0.addPoint(new Point(getMapMode().DPtoLP(15), getMapMode() - .DPtoLP(30))); - diamond0.addPoint(new Point(getMapMode().DPtoLP(30), getMapMode() - .DPtoLP(15))); - diamond0.setFill(true); - - this.add(diamond0); - - PolylineShape vertical0 = new PolylineShape(); - vertical0.addPoint(new Point(getMapMode().DPtoLP(15), getMapMode() - .DPtoLP(8))); - vertical0.addPoint(new Point(getMapMode().DPtoLP(15), getMapMode() - .DPtoLP(22))); - - this.add(vertical0); - - PolylineShape horizontal0 = new PolylineShape(); - horizontal0.addPoint(new Point(getMapMode().DPtoLP(8), getMapMode() - .DPtoLP(15))); - horizontal0.addPoint(new Point(getMapMode().DPtoLP(22), - getMapMode().DPtoLP(15))); - - this.add(horizontal0); - - } - } } Modified: trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/edit/parts/ScriptTask2EditPart.java =================================================================== --- trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/edit/parts/ScriptTask2EditPart.java 2011-02-09 09:42:57 UTC (rev 29073) +++ trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/edit/parts/ScriptTask2EditPart.java 2011-02-09 09:46:27 UTC (rev 29074) @@ -4,6 +4,7 @@ import java.util.LinkedList; import java.util.List; +import org.eclipse.draw2d.ColorConstants; import org.eclipse.draw2d.IFigure; import org.eclipse.draw2d.MarginBorder; import org.eclipse.draw2d.RoundedRectangle; Modified: trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/edit/parts/ScriptTaskEditPart.java =================================================================== --- trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/edit/parts/ScriptTaskEditPart.java 2011-02-09 09:42:57 UTC (rev 29073) +++ trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/edit/parts/ScriptTaskEditPart.java 2011-02-09 09:46:27 UTC (rev 29074) @@ -4,6 +4,7 @@ import java.util.LinkedList; import java.util.List; +import org.eclipse.draw2d.ColorConstants; import org.eclipse.draw2d.IFigure; import org.eclipse.draw2d.MarginBorder; import org.eclipse.draw2d.RoundedRectangle; Modified: trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/edit/parts/ServiceTask2EditPart.java =================================================================== --- trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/edit/parts/ServiceTask2EditPart.java 2011-02-09 09:42:57 UTC (rev 29073) +++ trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/edit/parts/ServiceTask2EditPart.java 2011-02-09 09:46:27 UTC (rev 29074) @@ -4,6 +4,7 @@ import java.util.LinkedList; import java.util.List; +import org.eclipse.draw2d.ColorConstants; import org.eclipse.draw2d.IFigure; import org.eclipse.draw2d.MarginBorder; import org.eclipse.draw2d.RoundedRectangle; Modified: trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/edit/parts/ServiceTaskEditPart.java =================================================================== --- trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/edit/parts/ServiceTaskEditPart.java 2011-02-09 09:42:57 UTC (rev 29073) +++ trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/edit/parts/ServiceTaskEditPart.java 2011-02-09 09:46:27 UTC (rev 29074) @@ -4,6 +4,7 @@ import java.util.LinkedList; import java.util.List; +import org.eclipse.draw2d.ColorConstants; import org.eclipse.draw2d.IFigure; import org.eclipse.draw2d.MarginBorder; import org.eclipse.draw2d.RoundedRectangle; Modified: trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/edit/parts/StartEvent2EditPart.java =================================================================== --- trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/edit/parts/StartEvent2EditPart.java 2011-02-09 09:42:57 UTC (rev 29073) +++ trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/edit/parts/StartEvent2EditPart.java 2011-02-09 09:46:27 UTC (rev 29074) @@ -29,6 +29,7 @@ import org.eclipse.gmf.runtime.emf.type.core.IElementType; import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure; import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure; +import org.eclipse.gmf.runtime.lite.svg.SVGFigure; import org.eclipse.gmf.runtime.notation.View; import org.eclipse.swt.graphics.Color; import org.jboss.tools.bpmn2.process.diagram.edit.policies.StartEvent2ItemSemanticEditPolicy; @@ -117,7 +118,7 @@ * @generated */ protected NodeFigure createNodePlate() { - DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(20, 20); + DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(48, 48); return result; } @@ -570,51 +571,15 @@ /** * @generated */ - public class MessageStartEventFigureDescriptor extends RectangleFigure { + public class MessageStartEventFigureDescriptor extends SVGFigure { /** * @generated */ public MessageStartEventFigureDescriptor() { - this.setLayoutManager(new StackLayout()); - this.setFill(false); - this.setOutline(false); - createContents(); + this.setURI("platform:/plugin/org.jboss.tools.bpmn2.process.diagram/images/events_48px_start_message.svg"); } - /** - * @generated - */ - private void createContents() { - - Ellipse circle0 = new Ellipse(); - - circle0.setBorder(new MarginBorder(getMapMode().DPtoLP(6), - getMapMode().DPtoLP(5), getMapMode().DPtoLP(6), - getMapMode().DPtoLP(5))); - - this.add(circle0); - circle0.setLayoutManager(new StackLayout()); - - RectangleFigure rectangle1 = new RectangleFigure(); - - circle0.add(rectangle1); - rectangle1.setLayoutManager(new StackLayout()); - - PolylineShape whiteEnvelope2 = new PolylineShape(); - whiteEnvelope2.addPoint(new Point(getMapMode().DPtoLP(0), - getMapMode().DPtoLP(0))); - whiteEnvelope2.addPoint(new Point(getMapMode().DPtoLP(4), - getMapMode().DPtoLP(4))); - whiteEnvelope2.addPoint(new Point(getMapMode().DPtoLP(5), - getMapMode().DPtoLP(4))); - whiteEnvelope2.addPoint(new Point(getMapMode().DPtoLP(9), - getMapMode().DPtoLP(0))); - - rectangle1.add(whiteEnvelope2); - - } - } } Modified: trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/edit/parts/StartEvent3EditPart.java =================================================================== --- trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/edit/parts/StartEvent3EditPart.java 2011-02-09 09:42:57 UTC (rev 29073) +++ trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/edit/parts/StartEvent3EditPart.java 2011-02-09 09:46:27 UTC (rev 29074) @@ -4,7 +4,6 @@ import java.util.LinkedList; import java.util.List; -import org.eclipse.draw2d.Ellipse; import org.eclipse.draw2d.IFigure; import org.eclipse.draw2d.PositionConstants; import org.eclipse.draw2d.RectangleFigure; @@ -24,6 +23,7 @@ import org.eclipse.gmf.runtime.emf.type.core.IElementType; import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure; import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure; +import org.eclipse.gmf.runtime.lite.svg.SVGFigure; import org.eclipse.gmf.runtime.notation.View; import org.eclipse.swt.graphics.Color; import org.jboss.tools.bpmn2.process.diagram.edit.policies.StartEvent3ItemSemanticEditPolicy; @@ -112,7 +112,7 @@ * @generated */ protected NodeFigure createNodePlate() { - DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(20, 20); + DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(48, 48); return result; } @@ -565,29 +565,15 @@ /** * @generated */ - public class StartEventFigureDescriptor extends RectangleFigure { + public class StartEventFigureDescriptor extends SVGFigure { /** * @generated */ public StartEventFigureDescriptor() { - this.setLayoutManager(new StackLayout()); - this.setFill(false); - this.setOutline(false); - createContents(); + this.setURI("platform:/plugin/org.jboss.tools.bpmn2.process.diagram/images/events_48px_start_none.svg"); } - /** - * @generated - */ - private void createContents() { - - Ellipse circle0 = new Ellipse(); - - this.add(circle0); - - } - } } Modified: trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/edit/parts/StartEvent4EditPart.java =================================================================== --- trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/edit/parts/StartEvent4EditPart.java 2011-02-09 09:42:57 UTC (rev 29073) +++ trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/edit/parts/StartEvent4EditPart.java 2011-02-09 09:46:27 UTC (rev 29074) @@ -27,6 +27,7 @@ import org.eclipse.gmf.runtime.emf.type.core.IElementType; import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure; import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure; +import org.eclipse.gmf.runtime.lite.svg.SVGFigure; import org.eclipse.gmf.runtime.notation.View; import org.eclipse.swt.graphics.Color; import org.jboss.tools.bpmn2.process.diagram.edit.policies.StartEvent4ItemSemanticEditPolicy; @@ -115,7 +116,7 @@ * @generated */ protected NodeFigure createNodePlate() { - DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(20, 20); + DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(48, 48); return result; } @@ -568,51 +569,15 @@ /** * @generated */ - public class MessageStartEventFigureDescriptor extends RectangleFigure { + public class MessageStartEventFigureDescriptor extends SVGFigure { /** * @generated */ public MessageStartEventFigureDescriptor() { - this.setLayoutManager(new StackLayout()); - this.setFill(false); - this.setOutline(false); - createContents(); + this.setURI("platform:/plugin/org.jboss.tools.bpmn2.process.diagram/images/events_48px_start_message.svg"); } - /** - * @generated - */ - private void createContents() { - - Ellipse circle0 = new Ellipse(); - - circle0.setBorder(new MarginBorder(getMapMode().DPtoLP(6), - getMapMode().DPtoLP(5), getMapMode().DPtoLP(6), - getMapMode().DPtoLP(5))); - - this.add(circle0); - circle0.setLayoutManager(new StackLayout()); - - RectangleFigure rectangle1 = new RectangleFigure(); - - circle0.add(rectangle1); - rectangle1.setLayoutManager(new StackLayout()); - - PolylineShape whiteEnvelope2 = new PolylineShape(); - whiteEnvelope2.addPoint(new Point(getMapMode().DPtoLP(0), - getMapMode().DPtoLP(0))); - whiteEnvelope2.addPoint(new Point(getMapMode().DPtoLP(4), - getMapMode().DPtoLP(4))); - whiteEnvelope2.addPoint(new Point(getMapMode().DPtoLP(5), - getMapMode().DPtoLP(4))); - whiteEnvelope2.addPoint(new Point(getMapMode().DPtoLP(9), - getMapMode().DPtoLP(0))); - - rectangle1.add(whiteEnvelope2); - - } - } } Modified: trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/edit/parts/StartEventEditPart.java =================================================================== --- trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/edit/parts/StartEventEditPart.java 2011-02-09 09:42:57 UTC (rev 29073) +++ trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/edit/parts/StartEventEditPart.java 2011-02-09 09:46:27 UTC (rev 29074) @@ -4,15 +4,11 @@ import java.util.LinkedList; import java.util.List; -import org.eclipse.draw2d.Ellipse; import org.eclipse.draw2d.IFigure; -import org.eclipse.draw2d.PolylineShape; import org.eclipse.draw2d.PositionConstants; import org.eclipse.draw2d.RectangleFigure; import org.eclipse.draw2d.Shape; import org.eclipse.draw2d.StackLayout; -import org.eclipse.draw2d.geometry.Dimension; -import org.eclipse.draw2d.geometry.Point; import org.eclipse.gef.EditPart; import org.eclipse.gef.EditPolicy; import org.eclipse.gef.Request; @@ -27,6 +23,7 @@ import org.eclipse.gmf.runtime.emf.type.core.IElementType; import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure; import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure; +import org.eclipse.gmf.runtime.lite.svg.SVGFigure; import org.eclipse.gmf.runtime.notation.View; import org.eclipse.swt.graphics.Color; import org.jboss.tools.bpmn2.process.diagram.edit.policies.StartEventItemSemanticEditPolicy; @@ -115,7 +112,7 @@ * @generated */ protected NodeFigure createNodePlate() { - DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(20, 20); + DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(48, 48); return result; } @@ -568,29 +565,15 @@ /** * @generated */ - public class StartEventFigureDescriptor extends RectangleFigure { + public class StartEventFigureDescriptor extends SVGFigure { /** * @generated */ public StartEventFigureDescriptor() { - this.setLayoutManager(new StackLayout()); - this.setFill(false); - this.setOutline(false); - createContents(); + this.setURI("platform:/plugin/org.jboss.tools.bpmn2.process.diagram/images/events_48px_start_none.svg"); } - /** - * @generated - */ - private void createContents() { - - Ellipse circle0 = new Ellipse(); - - this.add(circle0); - - } - } } Modified: trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/edit/parts/SubProcess2EditPart.java =================================================================== --- trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/edit/parts/SubProcess2EditPart.java 2011-02-09 09:42:57 UTC (rev 29073) +++ trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/edit/parts/SubProcess2EditPart.java 2011-02-09 09:46:27 UTC (rev 29074) @@ -4,6 +4,7 @@ import java.util.LinkedList; import java.util.List; +import org.eclipse.draw2d.ColorConstants; import org.eclipse.draw2d.FreeformLayout; import org.eclipse.draw2d.IFigure; import org.eclipse.draw2d.RoundedRectangle; Modified: trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/edit/parts/SubProcessEditPart.java =================================================================== --- trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/edit/parts/SubProcessEditPart.java 2011-02-09 09:42:57 UTC (rev 29073) +++ trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/edit/parts/SubProcessEditPart.java 2011-02-09 09:46:27 UTC (rev 29074) @@ -4,6 +4,7 @@ import java.util.LinkedList; import java.util.List; +import org.eclipse.draw2d.ColorConstants; import org.eclipse.draw2d.FreeformLayout; import org.eclipse.draw2d.IFigure; import org.eclipse.draw2d.RoundedRectangle; Modified: trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/edit/parts/TextAnnotation2EditPart.java =================================================================== --- trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/edit/parts/TextAnnotation2EditPart.java 2011-02-09 09:42:57 UTC (rev 29073) +++ trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/edit/parts/TextAnnotation2EditPart.java 2011-02-09 09:46:27 UTC (rev 29074) @@ -5,6 +5,7 @@ import java.util.List; import org.eclipse.draw2d.Border; +import org.eclipse.draw2d.ColorConstants; import org.eclipse.draw2d.Graphics; import org.eclipse.draw2d.IFigure; import org.eclipse.draw2d.MarginBorder; Modified: trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/edit/parts/TextAnnotationEditPart.java =================================================================== --- trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/edit/parts/TextAnnotationEditPart.java 2011-02-09 09:42:57 UTC (rev 29073) +++ trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/edit/parts/TextAnnotationEditPart.java 2011-02-09 09:46:27 UTC (rev 29074) @@ -5,6 +5,7 @@ import java.util.List; import org.eclipse.draw2d.Border; +import org.eclipse.draw2d.ColorConstants; import org.eclipse.draw2d.Graphics; import org.eclipse.draw2d.IFigure; import org.eclipse.draw2d.MarginBorder; Modified: trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/edit/parts/UserTask2EditPart.java =================================================================== --- trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/edit/parts/UserTask2EditPart.java 2011-02-09 09:42:57 UTC (rev 29073) +++ trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/edit/parts/UserTask2EditPart.java 2011-02-09 09:46:27 UTC (rev 29074) @@ -4,6 +4,7 @@ import java.util.LinkedList; import java.util.List; +import org.eclipse.draw2d.ColorConstants; import org.eclipse.draw2d.IFigure; import org.eclipse.draw2d.MarginBorder; import org.eclipse.draw2d.RoundedRectangle; Modified: trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/edit/parts/UserTaskEditPart.java =================================================================== --- trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/edit/parts/UserTaskEditPart.java 2011-02-09 09:42:57 UTC (rev 29073) +++ trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/edit/parts/UserTaskEditPart.java 2011-02-09 09:46:27 UTC (rev 29074) @@ -4,6 +4,7 @@ import java.util.LinkedList; import java.util.List; +import org.eclipse.draw2d.ColorConstants; import org.eclipse.draw2d.IFigure; import org.eclipse.draw2d.MarginBorder; import org.eclipse.draw2d.RoundedRectangle; Modified: trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/edit/policies/Bpmn2BaseItemSemanticEditPolicy.java =================================================================== --- trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/edit/policies/Bpmn2BaseItemSemanticEditPolicy.java 2011-02-09 09:42:57 UTC (rev 29073) +++ trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/edit/policies/Bpmn2BaseItemSemanticEditPolicy.java 2011-02-09 09:46:27 UTC (rev 29074) @@ -38,6 +38,7 @@ import org.eclipse.gmf.runtime.notation.View; import org.jboss.tools.bpmn2.process.diagram.edit.helpers.Bpmn2BaseEditHelper; import org.jboss.tools.bpmn2.process.diagram.part.Bpmn2DiagramEditorPlugin; +import org.jboss.tools.bpmn2.process.diagram.part.Bpmn2ProcessDiagramEditorPlugin; import org.jboss.tools.bpmn2.process.diagram.part.Bpmn2VisualIDRegistry; import org.jboss.tools.bpmn2.process.diagram.providers.Bpmn2ElementTypes; @@ -303,10 +304,10 @@ * @generated */ public static LinkConstraints getLinkConstraints() { - LinkConstraints cached = Bpmn2DiagramEditorPlugin.getInstance() + LinkConstraints cached = Bpmn2ProcessDiagramEditorPlugin.getInstance() .getLinkConstraints(); if (cached == null) { - Bpmn2DiagramEditorPlugin.getInstance().setLinkConstraints( + Bpmn2ProcessDiagramEditorPlugin.getInstance().setLinkConstraints( cached = new LinkConstraints()); } return cached; Modified: trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/navigator/Bpmn2AbstractNavigatorItem.java =================================================================== --- trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/navigator/Bpmn2AbstractNavigatorItem.java 2011-02-09 09:42:57 UTC (rev 29073) +++ trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/navigator/Bpmn2AbstractNavigatorItem.java 2011-02-09 09:46:27 UTC (rev 29074) @@ -17,7 +17,7 @@ final Class[] supportedTypes = new Class[] { ITabbedPropertySheetPageContributor.class }; final ITabbedPropertySheetPageContributor propertySheetPageContributor = new ITabbedPropertySheetPageContributor() { public String getContributorId() { - return "org.eclipse.bpmn2.diagram"; //$NON-NLS-1$ + return "org.jboss.tools.bpmn2.process.diagram"; //$NON-NLS-1$ } }; Platform.getAdapterManager().registerAdapters( Modified: trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/navigator/Bpmn2DomainNavigatorContentProvider.java =================================================================== --- trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/navigator/Bpmn2DomainNavigatorContentProvider.java 2011-02-09 09:42:57 UTC (rev 29073) +++ trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/navigator/Bpmn2DomainNavigatorContentProvider.java 2011-02-09 09:46:27 UTC (rev 29074) @@ -18,6 +18,7 @@ import org.eclipse.ui.navigator.ICommonContentExtensionSite; import org.eclipse.ui.navigator.ICommonContentProvider; import org.jboss.tools.bpmn2.process.diagram.part.Bpmn2DiagramEditorPlugin; +import org.jboss.tools.bpmn2.process.diagram.part.Bpmn2ProcessDiagramEditorPlugin; /** * @generated @@ -60,7 +61,7 @@ */ public Bpmn2DomainNavigatorContentProvider() { myAdapterFctoryContentProvier = new AdapterFactoryContentProvider( - Bpmn2DiagramEditorPlugin.getInstance() + Bpmn2ProcessDiagramEditorPlugin.getInstance() .getItemProvidersAdapterFactory()); TransactionalEditingDomain editingDomain = GMFEditingDomainFactory.INSTANCE .createEditingDomain(); Modified: trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/navigator/Bpmn2DomainNavigatorLabelProvider.java =================================================================== --- trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/navigator/Bpmn2DomainNavigatorLabelProvider.java 2011-02-09 09:42:57 UTC (rev 29073) +++ trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/navigator/Bpmn2DomainNavigatorLabelProvider.java 2011-02-09 09:46:27 UTC (rev 29074) @@ -7,6 +7,7 @@ import org.eclipse.ui.navigator.ICommonContentExtensionSite; import org.eclipse.ui.navigator.ICommonLabelProvider; import org.jboss.tools.bpmn2.process.diagram.part.Bpmn2DiagramEditorPlugin; +import org.jboss.tools.bpmn2.process.diagram.part.Bpmn2ProcessDiagramEditorPlugin; /** * @generated @@ -17,7 +18,7 @@ * @generated */ private AdapterFactoryLabelProvider myAdapterFactoryLabelProvider = new AdapterFactoryLabelProvider( - Bpmn2DiagramEditorPlugin.getInstance() + Bpmn2ProcessDiagramEditorPlugin.getInstance() .getItemProvidersAdapterFactory()); /** Modified: trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/navigator/Bpmn2NavigatorActionProvider.java =================================================================== --- trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/navigator/Bpmn2NavigatorActionProvider.java 2011-02-09 09:42:57 UTC (rev 29073) +++ trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/navigator/Bpmn2NavigatorActionProvider.java 2011-02-09 09:46:27 UTC (rev 29074) @@ -24,6 +24,7 @@ import org.jboss.tools.bpmn2.process.diagram.edit.parts.ProcessEditPart; import org.jboss.tools.bpmn2.process.diagram.part.Bpmn2DiagramEditor; import org.jboss.tools.bpmn2.process.diagram.part.Bpmn2DiagramEditorPlugin; +import org.jboss.tools.bpmn2.process.diagram.part.Bpmn2ProcessDiagramEditorPlugin; import org.jboss.tools.bpmn2.process.diagram.part.Bpmn2VisualIDRegistry; import org.jboss.tools.bpmn2.process.diagram.part.Messages; @@ -145,7 +146,7 @@ try { page.openEditor(editorInput, Bpmn2DiagramEditor.ID); } catch (PartInitException e) { - Bpmn2DiagramEditorPlugin.getInstance().logError( + Bpmn2ProcessDiagramEditorPlugin.getInstance().logError( "Exception while openning diagram", e); //$NON-NLS-1$ } } Modified: trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/navigator/Bpmn2NavigatorContentProvider.java =================================================================== --- trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/navigator/Bpmn2NavigatorContentProvider.java 2011-02-09 09:42:57 UTC (rev 29073) +++ trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/navigator/Bpmn2NavigatorContentProvider.java 2011-02-09 09:46:27 UTC (rev 29074) @@ -251,28 +251,18 @@ private Object[] getViewChildren(View view, Object parentElement) { switch (Bpmn2VisualIDRegistry.getVisualID(view)) { - case ExclusiveGateway2EditPart.VISUAL_ID: { + case TextAnnotation2EditPart.VISUAL_ID: { LinkedList<Bpmn2AbstractNavigatorItem> result = new LinkedList<Bpmn2AbstractNavigatorItem>(); Node sv = (Node) view; Bpmn2NavigatorGroup incominglinks = new Bpmn2NavigatorGroup( - Messages.NavigatorGroupName_ExclusiveGateway_3007_incominglinks, + Messages.NavigatorGroupName_TextAnnotation_3015_incominglinks, "icons/incomingLinksNavigatorGroup.gif", parentElement); //$NON-NLS-1$ Bpmn2NavigatorGroup outgoinglinks = new Bpmn2NavigatorGroup( - Messages.NavigatorGroupName_ExclusiveGateway_3007_outgoinglinks, + Messages.NavigatorGroupName_TextAnnotation_3015_outgoinglinks, "icons/outgoingLinksNavigatorGroup.gif", parentElement); //$NON-NLS-1$ Collection<View> connectedViews; connectedViews = getIncomingLinksByType(Collections.singleton(sv), Bpmn2VisualIDRegistry - .getType(SequenceFlowEditPart.VISUAL_ID)); - incominglinks.addChildren(createNavigatorItems(connectedViews, - incominglinks, true)); - connectedViews = getOutgoingLinksByType(Collections.singleton(sv), - Bpmn2VisualIDRegistry - .getType(SequenceFlowEditPart.VISUAL_ID)); - outgoinglinks.addChildren(createNavigatorItems(connectedViews, - outgoinglinks, true)); - connectedViews = getIncomingLinksByType(Collections.singleton(sv), - Bpmn2VisualIDRegistry .getType(AssociationEditPart.VISUAL_ID)); incominglinks.addChildren(createNavigatorItems(connectedViews, incominglinks, true)); @@ -290,28 +280,18 @@ return result.toArray(); } - case StartEvent3EditPart.VISUAL_ID: { + case DataObjectEditPart.VISUAL_ID: { LinkedList<Bpmn2AbstractNavigatorItem> result = new LinkedList<Bpmn2AbstractNavigatorItem>(); Node sv = (Node) view; Bpmn2NavigatorGroup incominglinks = new Bpmn2NavigatorGroup( - Messages.NavigatorGroupName_StartEvent_3003_incominglinks, + Messages.NavigatorGroupName_DataObject_2014_incominglinks, "icons/incomingLinksNavigatorGroup.gif", parentElement); //$NON-NLS-1$ Bpmn2NavigatorGroup outgoinglinks = new Bpmn2NavigatorGroup( - Messages.NavigatorGroupName_StartEvent_3003_outgoinglinks, + Messages.NavigatorGroupName_DataObject_2014_outgoinglinks, "icons/outgoingLinksNavigatorGroup.gif", parentElement); //$NON-NLS-1$ Collection<View> connectedViews; connectedViews = getIncomingLinksByType(Collections.singleton(sv), Bpmn2VisualIDRegistry - .getType(SequenceFlowEditPart.VISUAL_ID)); - incominglinks.addChildren(createNavigatorItems(connectedViews, - incominglinks, true)); - connectedViews = getOutgoingLinksByType(Collections.singleton(sv), - Bpmn2VisualIDRegistry - .getType(SequenceFlowEditPart.VISUAL_ID)); - outgoinglinks.addChildren(createNavigatorItems(connectedViews, - outgoinglinks, true)); - connectedViews = getIncomingLinksByType(Collections.singleton(sv), - Bpmn2VisualIDRegistry .getType(AssociationEditPart.VISUAL_ID)); incominglinks.addChildren(createNavigatorItems(connectedViews, incominglinks, true)); @@ -329,14 +309,14 @@ return result.toArray(); } - case ParallelGatewayEditPart.VISUAL_ID: { + case EndEvent2EditPart.VISUAL_ID: { LinkedList<Bpmn2AbstractNavigatorItem> result = new LinkedList<Bpmn2AbstractNavigatorItem>(); Node sv = (Node) view; Bpmn2NavigatorGroup incominglinks = new Bpmn2NavigatorGroup( - Messages.NavigatorGroupName_ParallelGateway_2006_incominglinks, + Messages.NavigatorGroupName_EndEvent_2008_incominglinks, "icons/incomingLinksNavigatorGroup.gif", parentElement); //$NON-NLS-1$ Bpmn2NavigatorGroup outgoinglinks = new Bpmn2NavigatorGroup( - Messages.NavigatorGroupName_ParallelGateway_2006_outgoinglinks, + Messages.NavigatorGroupName_EndEvent_2008_outgoinglinks, "icons/outgoingLinksNavigatorGroup.gif", parentElement); //$NON-NLS-1$ Collection<View> connectedViews; connectedViews = getIncomingLinksByType(Collections.singleton(sv), @@ -368,14 +348,14 @@ return result.toArray(); } - case ExclusiveGatewayEditPart.VISUAL_ID: { + case StartEvent2EditPart.VISUAL_ID: { LinkedList<Bpmn2AbstractNavigatorItem> result = new LinkedList<Bpmn2AbstractNavigatorItem>(); Node sv = (Node) view; Bpmn2NavigatorGroup incominglinks = new Bpmn2NavigatorGroup( - Messages.NavigatorGroupName_ExclusiveGateway_2005_incominglinks, + Messages.NavigatorGroupName_StartEvent_2007_incominglinks, "icons/incomingLinksNavigatorGroup.gif", parentElement); //$NON-NLS-1$ Bpmn2NavigatorGroup outgoinglinks = new Bpmn2NavigatorGroup( - Messages.NavigatorGroupName_ExclusiveGateway_2005_outgoinglinks, + Messages.NavigatorGroupName_StartEvent_2007_outgoinglinks, "icons/outgoingLinksNavigatorGroup.gif", parentElement); //$NON-NLS-1$ Collection<View> connectedViews; connectedViews = getIncomingLinksByType(Collections.singleton(sv), @@ -407,45 +387,6 @@ return result.toArray(); } - case IntermediateCatchEventEditPart.VISUAL_ID: { - LinkedList<Bpmn2AbstractNavigatorItem> result = new LinkedList<Bpmn2AbstractNavigatorItem>(); - Node sv = (Node) view; - Bpmn2NavigatorGroup incominglinks = new Bpmn2NavigatorGroup( - Messages.NavigatorGroupName_IntermediateCatchEvent_2010_incominglinks, - "icons/incomingLinksNavigatorGroup.gif", parentElement); //$NON-NLS-1$ - Bpmn2NavigatorGroup outgoinglinks = new Bpmn2NavigatorGroup( - Messages.NavigatorGroupName_IntermediateCatchEvent_2010_outgoinglinks, - "icons/outgoingLinksNavigatorGroup.gif", parentElement); //$NON-NLS-1$ - Collection<View> connectedViews; - connectedViews = getIncomingLinksByType(Collections.singleton(sv), - Bpmn2VisualIDRegistry - .getType(SequenceFlowEditPart.VISUAL_ID)); - incominglinks.addChildren(createNavigatorItems(connectedViews, - incominglinks, true)); - connectedViews = getOutgoingLinksByType(Collections.singleton(sv), - Bpmn2VisualIDRegistry - .getType(SequenceFlowEditPart.VISUAL_ID)); - outgoinglinks.addChildren(createNavigatorItems(connectedViews, - outgoinglinks, true)); - connectedViews = getIncomingLinksByType(Collections.singleton(sv), - Bpmn2VisualIDRegistry - .getType(AssociationEditPart.VISUAL_ID)); - incominglinks.addChildren(createNavigatorItems(connectedViews, - incominglinks, true)); - connectedViews = getOutgoingLinksByType(Collections.singleton(sv), - Bpmn2VisualIDRegistry - .getType(AssociationEditPart.VISUAL_ID)); - outgoinglinks.addChildren(createNavigatorItems(connectedViews, - outgoinglinks, true)); - if (!incominglinks.isEmpty()) { - result.add(incominglinks); - } - if (!outgoinglinks.isEmpty()) { - result.add(outgoinglinks); - } - return result.toArray(); - } - case SubProcessEditPart.VISUAL_ID: { LinkedList<Bpmn2AbstractNavigatorItem> result = new LinkedList<Bpmn2AbstractNavigatorItem>(); Node sv = (Node) view; @@ -566,351 +507,14 @@ return result.toArray(); } - case AssociationEditPart.VISUAL_ID: { + case IntermediateCatchEvent2EditPart.VISUAL_ID: { LinkedList<Bpmn2AbstractNavigatorItem> result = new LinkedList<Bpmn2AbstractNavigatorItem>(); - Edge sv = (Edge) view; - Bpmn2NavigatorGroup target = new Bpmn2NavigatorGroup( - Messages.NavigatorGroupName_Association_4002_target, - "icons/linkTargetNavigatorGroup.gif", parentElement); //$NON-NLS-1$ - Bpmn2NavigatorGroup incominglinks = new Bpmn2NavigatorGroup( - Messages.NavigatorGroupName_Association_4002_incominglinks, - "icons/incomingLinksNavigatorGroup.gif", parentElement); //$NON-NLS-1$ - Bpmn2NavigatorGroup source = new Bpmn2NavigatorGroup( - Messages.NavigatorGroupName_Association_4002_source, - "icons/linkSourceNavigatorGroup.gif", parentElement); //$NON-NLS-1$ - Bpmn2NavigatorGroup outgoinglinks = new Bpmn2NavigatorGroup( - Messages.NavigatorGroupName_Association_4002_outgoinglinks, - "icons/outgoingLinksNavigatorGroup.gif", parentElement); //$NON-NLS-1$ - Collection<View> connectedViews; - connectedViews = getLinksTargetByType(Collections.singleton(sv), - Bpmn2VisualIDRegistry.getType(UserTaskEditPart.VISUAL_ID)); - target.addChildren(createNavigatorItems(connectedViews, target, - true)); - connectedViews = getLinksTargetByType(Collections.singleton(sv), - Bpmn2VisualIDRegistry - .getType(ServiceTaskEditPart.VISUAL_ID)); - target.addChildren(createNavigatorItems(connectedViews, target, - true)); - connectedViews = getLinksTargetByType(Collections.singleton(sv), - Bpmn2VisualIDRegistry.getType(StartEventEditPart.VISUAL_ID)); - target.addChildren(createNavigatorItems(connectedViews, target, - true)); - connectedViews = getLinksTargetByType(Collections.singleton(sv), - Bpmn2VisualIDRegistry - .getType(StartEvent2EditPart.VISUAL_ID)); - target.addChildren(createNavigatorItems(connectedViews, target, - true)); - connectedViews = getLinksTargetByType(Collections.singleton(sv), - Bpmn2VisualIDRegistry.getType(EndEventEditPart.VISUAL_ID)); - target.addChildren(createNavigatorItems(connectedViews, target, - true)); - connectedViews = getLinksTargetByType(Collections.singleton(sv), - Bpmn2VisualIDRegistry - .getType(ExclusiveGatewayEditPart.VISUAL_ID)); - target.addChildren(createNavigatorItems(connectedViews, target, - true)); - connectedViews = getLinksTargetByType(Collections.singleton(sv), - Bpmn2VisualIDRegistry - .getType(ParallelGatewayEditPart.VISUAL_ID)); - target.addChildren(createNavigatorItems(connectedViews, target, - true)); - connectedViews = getLinksTargetByType(Collections.singleton(sv), - Bpmn2VisualIDRegistry.getType(EndEvent2EditPart.VISUAL_ID)); - target.addChildren(createNavigatorItems(connectedViews, target, - true)); - connectedViews = getLinksTargetByType(Collections.singleton(sv), - Bpmn2VisualIDRegistry.getType(EndEvent3EditPart.VISUAL_ID)); - target.addChildren(createNavigatorItems(connectedViews, target, - true)); - connectedViews = getLinksTargetByType(Collections.singleton(sv), - Bpmn2VisualIDRegistry - .getType(IntermediateCatchEventEditPart.VISUAL_ID)); - target.addChildren(createNavigatorItems(connectedViews, target, - true)); - connectedViews = getLinksTargetByType(Collections.singleton(sv), - Bpmn2VisualIDRegistry - .getType(IntermediateThrowEventEditPart.VISUAL_ID)); - target.addChildren(createNavigatorItems(connectedViews, target, - true)); - connectedViews = getLinksTargetByType(Collections.singleton(sv), - Bpmn2VisualIDRegistry - .getType(IntermediateCatchEvent2EditPart.VISUAL_ID)); - target.addChildren(createNavigatorItems(connectedViews, target, - true)); - connectedViews = getLinksTargetByType(Collections.singleton(sv), - Bpmn2VisualIDRegistry - .getType(IntermediateCatchEvent3EditPart.VISUAL_ID)); - target.addChildren(createNavigatorItems(connectedViews, target, - true)); - connectedViews = getLinksTargetByType(Collections.singleton(sv), - Bpmn2VisualIDRegistry.getType(DataObjectEditPart.VISUAL_ID)); - target.addChildren(createNavigatorItems(connectedViews, target, - true)); - connectedViews = getLinksTargetByType(Collections.singleton(sv), - Bpmn2VisualIDRegistry - .getType(TextAnnotationEditPart.VISUAL_ID)); - target.addChildren(createNavigatorItems(connectedViews, target, - true)); - connectedViews = getLinksTargetByType(Collections.singleton(sv), - Bpmn2VisualIDRegistry.getType(SubProcessEditPart.VISUAL_ID)); - target.addChildren(createNavigatorItems(connectedViews, target, - true)); - connectedViews = getLinksTargetByType(Collections.singleton(sv), - Bpmn2VisualIDRegistry.getType(ScriptTaskEditPart.VISUAL_ID)); - target.addChildren(createNavigatorItems(connectedViews, target, - true)); - connectedViews = getLinksTargetByType(Collections.singleton(sv), - Bpmn2VisualIDRegistry - .getType(SubProcess2EditPart.VISUAL_ID)); - target.addChildren(createNavigatorItems(connectedViews, target, - true)); - connectedViews = getLinksTargetByType(Collections.singleton(sv), - Bpmn2VisualIDRegistry.getType(UserTask2EditPart.VISUAL_ID)); - target.addChildren(createNavigatorItems(connectedViews, target, - true)); - connectedViews = getLinksTargetByType(Collections.singleton(sv), - Bpmn2VisualIDRegistry - .getType(ServiceTask2EditPart.VISUAL_ID)); - target.addChildren(createNavigatorItems(connectedViews, target, - true)); - connectedViews = getLinksTargetByType(Collections.singleton(sv), - Bpmn2VisualIDRegistry - .getType(StartEvent3EditPart.VISUAL_ID)); - target.addChildren(createNavigatorItems(connectedViews, target, - true)); - connectedViews = getLinksTargetByType(Collections.singleton(sv), - Bpmn2VisualIDRegistry - .getType(StartEvent4EditPart.VISUAL_ID)); - target.addChildren(createNavigatorItems(connectedViews, target, - true)); - connectedViews = getLinksTargetByType(Collections.singleton(sv), - Bpmn2VisualIDRegistry.getType(EndEvent4EditPart.VISUAL_ID)); - target.addChildren(createNavigatorItems(connectedViews, target, - true)); - connectedViews = getLinksTargetByType(Collections.singleton(sv), - Bpmn2VisualIDRegistry - .getType(ExclusiveGateway2EditPart.VISUAL_ID)); - target.addChildren(createNavigatorItems(connectedViews, target, - true)); - connectedViews = getLinksTargetByType(Collections.singleton(sv), - Bpmn2VisualIDRegistry - .getType(ParallelGateway2EditPart.VISUAL_ID)); - target.addChildren(createNavigatorItems(connectedViews, target, - true)); - connectedViews = getLinksTargetByType(Collections.singleton(sv), - Bpmn2VisualIDRegistry.getType(EndEvent5EditPart.VISUAL_ID)); - target.addChildren(createNavigatorItems(connectedViews, target, - true)); - connectedViews = getLinksTargetByType(Collections.singleton(sv), - Bpmn2VisualIDRegistry.getType(EndEvent6EditPart.VISUAL_ID)); - target.addChildren(createNavigatorItems(connectedViews, target, - true)); - connectedViews = getLinksTargetByType(Collections.singleton(sv), - Bpmn2VisualIDRegistry - .getType(IntermediateCatchEvent4EditPart.VISUAL_ID)); - target.addChildren(createNavigatorItems(connectedViews, target, - true)); - connectedViews = getLinksTargetByType(Collections.singleton(sv), - Bpmn2VisualIDRegistry - .getType(IntermediateThrowEvent2EditPart.VISUAL_ID)); - target.addChildren(createNavigatorItems(connectedViews, target, - true)); - connectedViews = getLinksTargetByType(Collections.singleton(sv), - Bpmn2VisualIDRegistry - .getType(IntermediateCatchEvent5EditPart.VISUAL_ID)); - target.addChildren(createNavigatorItems(connectedViews, target, - true)); - connectedViews = getLinksTargetByType(Collections.singleton(sv), - Bpmn2VisualIDRegistry - .getType(DataObject2EditPart.VISUAL_ID)); - target.addChildren(createNavigatorItems(connectedViews, target, - true)); - connectedViews = getLinksTargetByType(Collections.singleton(sv), - Bpmn2VisualIDRegistry - .getType(TextAnnotation2EditPart.VISUAL_ID)); - target.addChildren(createNavigatorItems(connectedViews, target, - true)); - connectedViews = getLinksTargetByType(Collections.singleton(sv), - Bpmn2VisualIDRegistry - .getType(ScriptTask2EditPart.VISUAL_ID)); - target.addChildren(createNavigatorItems(connectedViews, target, - true)); - connectedViews = getLinksSourceByType(Collections.singleton(sv), - Bpmn2VisualIDRegistry.getType(UserTaskEditPart.VISUAL_ID)); - source.addChildren(createNavigatorItems(connectedViews, source, - true)); - connectedViews = getLinksSourceByType(Collections.singleton(sv), - Bpmn2VisualIDRegistry - .getType(ServiceTaskEditPart.VISUAL_ID)); - source.addChildren(createNavigatorItems(connectedViews, source, - true)); - connectedViews = getLinksSourceByType(Collections.singleton(sv), - Bpmn2VisualIDRegistry.getType(StartEventEditPart.VISUAL_ID)); - source.addChildren(createNavigatorItems(connectedViews, source, - true)); - connectedViews = getLinksSourceByType(Collections.singleton(sv), - Bpmn2VisualIDRegistry - .getType(StartEvent2EditPart.VISUAL_ID)); - source.addChildren(createNavigatorItems(connectedViews, source, - true)); - connectedViews = getLinksSourceByType(Collections.singleton(sv), - Bpmn2VisualIDRegistry.getType(EndEventEditPart.VISUAL_ID)); - source.addChildren(createNavigatorItems(connectedViews, source, - true)); - connectedViews = getLinksSourceByType(Collections.singleton(sv), - Bpmn2VisualIDRegistry - .getType(ExclusiveGatewayEditPart.VISUAL_ID)); - source.addChildren(createNavigatorItems(connectedViews, source, - true)); - connectedViews = getLinksSourceByType(Collections.singleton(sv), - Bpmn2VisualIDRegistry - .getType(ParallelGatewayEditPart.VISUAL_ID)); - source.addChildren(createNavigatorItems(connectedViews, source, - true)); - connectedViews = getLinksSourceByType(Collections.singleton(sv), - Bpmn2VisualIDRegistry.getType(EndEvent2EditPart.VISUAL_ID)); - source.addChildren(createNavigatorItems(connectedViews, source, - true)); - connectedViews = getLinksSourceByType(Collections.singleton(sv), - Bpmn2VisualIDRegistry.getType(EndEvent3EditPart.VISUAL_ID)); - source.addChildren(createNavigatorItems(connectedViews, source, - true)); - connectedViews = getLinksSourceByType(Collections.singleton(sv), - Bpmn2VisualIDRegistry - .getType(IntermediateCatchEventEditPart.VISUAL_ID)); - source.addChildren(createNavigatorItems(connectedViews, source, - true)); - connectedViews = getLinksSourceByType(Collections.singleton(sv), - Bpmn2VisualIDRegistry - .getType(IntermediateThrowEventEditPart.VISUAL_ID)); - source.addChildren(createNavigatorItems(connectedViews, source, - true)); - connectedViews = getLinksSourceByType(Collections.singleton(sv), - Bpmn2VisualIDRegistry - .getType(IntermediateCatchEvent2EditPart.VISUAL_ID)); - source.addChildren(createNavigatorItems(connectedViews, source, - true)); - connectedViews = getLinksSourceByType(Collections.singleton(sv), - Bpmn2VisualIDRegistry - .getType(IntermediateCatchEvent3EditPart.VISUAL_ID)); - source.addChildren(createNavigatorItems(connectedViews, source, - true)); - connectedViews = getLinksSourceByType(Collections.singleton(sv), - Bpmn2VisualIDRegistry.getType(DataObjectEditPart.VISUAL_ID)); - source.addChildren(createNavigatorItems(connectedViews, source, - true)); - connectedViews = getLinksSourceByType(Collections.singleton(sv), - Bpmn2VisualIDRegistry - .getType(TextAnnotationEditPart.VISUAL_ID)); - source.addChildren(createNavigatorItems(connectedViews, source, - true)); - connectedViews = getLinksSourceByType(Collections.singleton(sv), - Bpmn2VisualIDRegistry.getType(SubProcessEditPart.VISUAL_ID)); - source.addChildren(createNavigatorItems(connectedViews, source, - true)); - connectedViews = getLinksSourceByType(Collections.singleton(sv), - Bpmn2VisualIDRegistry.getType(ScriptTaskEditPart.VISUAL_ID)); - source.addChildren(createNavigatorItems(connectedViews, source, - true)); - connectedViews = getLinksSourceByType(Collections.singleton(sv), - Bpmn2VisualIDRegistry - .getType(SubProcess2EditPart.VISUAL_ID)); - source.addChildren(createNavigatorItems(connectedViews, source, - true)); - connectedViews = getLinksSourceByType(Collections.singleton(sv), - Bpmn2VisualIDRegistry.getType(UserTask2EditPart.VISUAL_ID)); - source.addChildren(createNavigatorItems(connectedViews, source, - true)); - connectedViews = getLinksSourceByType(Collections.singleton(sv), - Bpmn2VisualIDRegistry - .getType(ServiceTask2EditPart.VISUAL_ID)); - source.addChildren(createNavigatorItems(connectedViews, source, - true)); - connectedViews = getLinksSourceByType(Collections.singleton(sv), - Bpmn2VisualIDRegistry - .getType(StartEvent3EditPart.VISUAL_ID)); - source.addChildren(createNavigatorItems(connectedViews, source, - true)); - connectedViews = getLinksSourceByType(Collections.singleton(sv), - Bpmn2VisualIDRegistry - .getType(StartEvent4EditPart.VISUAL_ID)); - source.addChildren(createNavigatorItems(connectedViews, source, - true)); - connectedViews = getLinksSourceByType(Collections.singleton(sv), - Bpmn2VisualIDRegistry.getType(EndEvent4EditPart.VISUAL_ID)); - source.addChildren(createNavigatorItems(connectedViews, source, - true)); - connectedViews = getLinksSourceByType(Collections.singleton(sv), - Bpmn2VisualIDRegistry - .getType(ExclusiveGateway2EditPart.VISUAL_ID)); - source.addChildren(createNavigatorItems(connectedViews, source, - true)); - connectedViews = getLinksSourceByType(Collections.singleton(sv), - Bpmn2VisualIDRegistry - .getType(ParallelGateway2EditPart.VISUAL_ID)); - source.addChildren(createNavigatorItems(connectedViews, source, - true)); - connectedViews = getLinksSourceByType(Collections.singleton(sv), - Bpmn2VisualIDRegistry.getType(EndEvent5EditPart.VISUAL_ID)); - source.addChildren(createNavigatorItems(connectedViews, source, - true)); - connectedViews = getLinksSourceByType(Collections.singleton(sv), - Bpmn2VisualIDRegistry.getType(EndEvent6EditPart.VISUAL_ID)); - source.addChildren(createNavigatorItems(connectedViews, source, - true)); - connectedViews = getLinksSourceByType(Collections.singleton(sv), - Bpmn2VisualIDRegistry - .getType(IntermediateCatchEvent4EditPart.VISUAL_ID)); - source.addChildren(createNavigatorItems(connectedViews, source, - true)); - connectedViews = getLinksSourceByType(Collections.singleton(sv), - Bpmn2VisualIDRegistry - .getType(IntermediateThrowEvent2EditPart.VISUAL_ID)); - source.addChildren(createNavigatorItems(connectedViews, source, - true)); - connectedViews = getLinksSourceByType(Collections.singleton(sv), - Bpmn2VisualIDRegistry - .getType(IntermediateCatchEvent5EditPart.VISUAL_ID)); - source.addChildren(createNavigatorItems(connectedViews, source, - true)); - connectedViews = getLinksSourceByType(Collections.singleton(sv), - Bpmn2VisualIDRegistry - .getType(DataObject2EditPart.VISUAL_ID)); - source.addChildren(createNavigatorItems(connectedViews, source, - true)); - connectedViews = getLinksSourceByType(Collections.singleton(sv), - Bpmn2VisualIDRegistry - .getType(TextAnnotation2EditPart.VISUAL_ID)); - source.addChildren(createNavigatorItems(connectedViews, source, - true)); - connectedViews = getLinksSourceByType(Collections.singleton(sv), - Bpmn2VisualIDRegistry - .getType(ScriptTask2EditPart.VISUAL_ID)); - source.addChildren(createNavigatorItems(connectedViews, source, - true)); - if (!target.isEmpty()) { - result.add(target); - } - if (!incominglinks.isEmpty()) { - result.add(incominglinks); - } - if (!source.isEmpty()) { - result.add(source); - } - if (!outgoinglinks.isEmpty()) { - result.add(outgoinglinks); - } - return result.toArray(); - } - - case EndEvent4EditPart.VISUAL_ID: { - LinkedList<Bpmn2AbstractNavigatorItem> result = new LinkedList<Bpmn2AbstractNavigatorItem>(); Node sv = (Node) view; Bpmn2NavigatorGroup incominglinks = new Bpmn2NavigatorGroup( - Messages.NavigatorGroupName_EndEvent_3006_incominglinks, + Messages.NavigatorGroupName_IntermediateCatchEvent_2012_incominglinks, "icons/incomingLinksNavigatorGroup.gif", parentElement); //$NON-NLS-1$ Bpmn2NavigatorGroup outgoinglinks = new Bpmn2NavigatorGroup( - Messages.NavigatorGroupName_EndEvent_3006_outgoinglinks, + Messages.NavigatorGroupName_IntermediateCatchEvent_2012_outgoinglinks, "icons/outgoingLinksNavigatorGroup.gif", parentElement); //$NON-NLS-1$ Collection<View> connectedViews; connectedViews = getIncomingLinksByType(Collections.singleton(sv), @@ -942,14 +546,14 @@ return result.toArray(); } - case IntermediateCatchEvent2EditPart.VISUAL_ID: { + case ExclusiveGateway2EditPart.VISUAL_ID: { LinkedList<Bpmn2AbstractNavigatorItem> result = new LinkedList<Bpmn2AbstractNavigatorItem>(); Node sv = (Node) view; Bpmn2NavigatorGroup incominglinks = new Bpmn2NavigatorGroup( - Messages.NavigatorGroupName_IntermediateCatchEvent_2012_incominglinks, + Messages.NavigatorGroupName_ExclusiveGateway_3007_incominglinks, "icons/incomingLinksNavigatorGroup.gif", parentElement); //$NON-NLS-1$ Bpmn2NavigatorGroup outgoinglinks = new Bpmn2NavigatorGroup( - Messages.NavigatorGroupName_IntermediateCatchEvent_2012_outgoinglinks, + Messages.NavigatorGroupName_ExclusiveGateway_3007_outgoinglinks, "icons/outgoingLinksNavigatorGroup.gif", parentElement); //$NON-NLS-1$ Collection<View> connectedViews; connectedViews = getIncomingLinksByType(Collections.singleton(sv), @@ -981,18 +585,28 @@ return result.toArray(); } - case TextAnnotation2EditPart.VISUAL_ID: { + case EndEventEditPart.VISUAL_ID: { LinkedList<Bpmn2AbstractNavigatorItem> result = new LinkedList<Bpmn2AbstractNavigatorItem>(); Node sv = (Node) view; Bpmn2NavigatorGroup incominglinks = new Bpmn2NavigatorGroup( - Messages.NavigatorGroupName_TextAnnotation_3015_incominglinks, + Messages.NavigatorGroupName_EndEvent_2004_incominglinks, "icons/incomingLinksNavigatorGroup.gif", parentElement); //$NON-NLS-1$ Bpmn2NavigatorGroup outgoinglinks = new Bpmn2NavigatorGroup( - Messages.NavigatorGroupName_TextAnnotation_3015_outgoinglinks, + Messages.NavigatorGroupName_EndEvent_2004_outgoinglinks, "icons/outgoingLinksNavigatorGroup.gif", parentElement); //$NON-NLS-1$ Collection<View> connectedViews; connectedViews = getIncomingLinksByType(Collections.singleton(sv), Bpmn2VisualIDRegistry + .getType(SequenceFlowEditPart.VISUAL_ID)); + incominglinks.addChildren(createNavigatorItems(connectedViews, + incominglinks, true)); + connectedViews = getOutgoingLinksByType(Collections.singleton(sv), + Bpmn2VisualIDRegistry + .getType(SequenceFlowEditPart.VISUAL_ID)); + outgoinglinks.addChildren(createNavigatorItems(connectedViews, + outgoinglinks, true)); + connectedViews = getIncomingLinksByType(Collections.singleton(sv), + Bpmn2VisualIDRegistry .getType(AssociationEditPart.VISUAL_ID)); incominglinks.addChildren(createNavigatorItems(connectedViews, incominglinks, true)); @@ -1010,14 +624,14 @@ return result.toArray(); } - case IntermediateCatchEvent3EditPart.VISUAL_ID: { + case EndEvent3EditPart.VISUAL_ID: { LinkedList<Bpmn2AbstractNavigatorItem> result = new LinkedList<Bpmn2AbstractNavigatorItem>(); Node sv = (Node) view; Bpmn2NavigatorGroup incominglinks = new Bpmn2NavigatorGroup( - Messages.NavigatorGroupName_IntermediateCatchEvent_2013_incominglinks, + Messages.NavigatorGroupName_EndEvent_2009_incominglinks, "icons/incomingLinksNavigatorGroup.gif", parentElement); //$NON-NLS-1$ Bpmn2NavigatorGroup outgoinglinks = new Bpmn2NavigatorGroup( - Messages.NavigatorGroupName_IntermediateCatchEvent_2013_outgoinglinks, + Messages.NavigatorGroupName_EndEvent_2009_outgoinglinks, "icons/outgoingLinksNavigatorGroup.gif", parentElement); //$NON-NLS-1$ Collection<View> connectedViews; connectedViews = getIncomingLinksByType(Collections.singleton(sv), @@ -1049,14 +663,14 @@ return result.toArray(); } - case IntermediateCatchEvent4EditPart.VISUAL_ID: { + case StartEvent4EditPart.VISUAL_ID: { LinkedList<Bpmn2AbstractNavigatorItem> result = new LinkedList<Bpmn2AbstractNavigatorItem>(); Node sv = (Node) view; Bpmn2NavigatorGroup incominglinks = new Bpmn2NavigatorGroup( - Messages.NavigatorGroupName_IntermediateCatchEvent_3011_incominglinks, + Messages.NavigatorGroupName_StartEvent_3005_incominglinks, "icons/incomingLinksNavigatorGroup.gif", parentElement); //$NON-NLS-1$ Bpmn2NavigatorGroup outgoinglinks = new Bpmn2NavigatorGroup( - Messages.NavigatorGroupName_IntermediateCatchEvent_3011_outgoinglinks, + Messages.NavigatorGroupName_StartEvent_3005_outgoinglinks, "icons/outgoingLinksNavigatorGroup.gif", parentElement); //$NON-NLS-1$ Collection<View> connectedViews; connectedViews = getIncomingLinksByType(Collections.singleton(sv), @@ -1088,14 +702,14 @@ return result.toArray(); } - case IntermediateThrowEvent2EditPart.VISUAL_ID: { + case StartEventEditPart.VISUAL_ID: { LinkedList<Bpmn2AbstractNavigatorItem> result = new LinkedList<Bpmn2AbstractNavigatorItem>(); Node sv = (Node) view; Bpmn2NavigatorGroup incominglinks = new Bpmn2NavigatorGroup( - Messages.NavigatorGroupName_IntermediateThrowEvent_3012_incominglinks, + Messages.NavigatorGroupName_StartEvent_2003_incominglinks, "icons/incomingLinksNavigatorGroup.gif", parentElement); //$NON-NLS-1$ Bpmn2NavigatorGroup outgoinglinks = new Bpmn2NavigatorGroup( - Messages.NavigatorGroupName_IntermediateThrowEvent_3012_outgoinglinks, + Messages.NavigatorGroupName_StartEvent_2003_outgoinglinks, "icons/outgoingLinksNavigatorGroup.gif", parentElement); //$NON-NLS-1$ Collection<View> connectedViews; connectedViews = getIncomingLinksByType(Collections.singleton(sv), @@ -1127,14 +741,14 @@ return result.toArray(); } - case IntermediateThrowEventEditPart.VISUAL_ID: { + case IntermediateCatchEvent5EditPart.VISUAL_ID: { LinkedList<Bpmn2AbstractNavigatorItem> result = new LinkedList<Bpmn2AbstractNavigatorItem>(); Node sv = (Node) view; Bpmn2NavigatorGroup incominglinks = new Bpmn2NavigatorGroup( - Messages.NavigatorGroupName_IntermediateThrowEvent_2011_incominglinks, + Messages.NavigatorGroupName_IntermediateCatchEvent_3013_incominglinks, "icons/incomingLinksNavigatorGroup.gif", parentElement); //$NON-NLS-1$ Bpmn2NavigatorGroup outgoinglinks = new Bpmn2NavigatorGroup( - Messages.NavigatorGroupName_IntermediateThrowEvent_2011_outgoinglinks, + Messages.NavigatorGroupName_IntermediateCatchEvent_3013_outgoinglinks, "icons/outgoingLinksNavigatorGroup.gif", parentElement); //$NON-NLS-1$ Collection<View> connectedViews; connectedViews = getIncomingLinksByType(Collections.singleton(sv), @@ -1166,14 +780,14 @@ return result.toArray(); } - case StartEventEditPart.VISUAL_ID: { + case ServiceTaskEditPart.VISUAL_ID: { LinkedList<Bpmn2AbstractNavigatorItem> result = new LinkedList<Bpmn2AbstractNavigatorItem>(); Node sv = (Node) view; Bpmn2NavigatorGroup incominglinks = new Bpmn2NavigatorGroup( - Messages.NavigatorGroupName_StartEvent_2003_incominglinks, + Messages.NavigatorGroupName_ServiceTask_2002_incominglinks, "icons/incomingLinksNavigatorGroup.gif", parentElement); //$NON-NLS-1$ Bpmn2NavigatorGroup outgoinglinks = new Bpmn2NavigatorGroup( - Messages.NavigatorGroupName_StartEvent_2003_outgoinglinks, + Messages.NavigatorGroupName_ServiceTask_2002_outgoinglinks, "icons/outgoingLinksNavigatorGroup.gif", parentElement); //$NON-NLS-1$ Collection<View> connectedViews; connectedViews = getIncomingLinksByType(Collections.singleton(sv), @@ -1205,14 +819,14 @@ return result.toArray(); } - case UserTaskEditPart.VISUAL_ID: { + case EndEvent6EditPart.VISUAL_ID: { LinkedList<Bpmn2AbstractNavigatorItem> result = new LinkedList<Bpmn2AbstractNavigatorItem>(); Node sv = (Node) view; Bpmn2NavigatorGroup incominglinks = new Bpmn2NavigatorGroup( - Messages.NavigatorGroupName_UserTask_2001_incominglinks, + Messages.NavigatorGroupName_EndEvent_3010_incominglinks, "icons/incomingLinksNavigatorGroup.gif", parentElement); //$NON-NLS-1$ Bpmn2NavigatorGroup outgoinglinks = new Bpmn2NavigatorGroup( - Messages.NavigatorGroupName_UserTask_2001_outgoinglinks, + Messages.NavigatorGroupName_EndEvent_3010_outgoinglinks, "icons/outgoingLinksNavigatorGroup.gif", parentElement); //$NON-NLS-1$ Collection<View> connectedViews; connectedViews = getIncomingLinksByType(Collections.singleton(sv), @@ -1244,14 +858,14 @@ return result.toArray(); } - case ParallelGateway2EditPart.VISUAL_ID: { + case EndEvent4EditPart.VISUAL_ID: { LinkedList<Bpmn2AbstractNavigatorItem> result = new LinkedList<Bpmn2AbstractNavigatorItem>(); Node sv = (Node) view; Bpmn2NavigatorGroup incominglinks = new Bpmn2NavigatorGroup( - Messages.NavigatorGroupName_ParallelGateway_3008_incominglinks, + Messages.NavigatorGroupName_EndEvent_3006_incominglinks, "icons/incomingLinksNavigatorGroup.gif", parentElement); //$NON-NLS-1$ Bpmn2NavigatorGroup outgoinglinks = new Bpmn2NavigatorGroup( - Messages.NavigatorGroupName_ParallelGateway_3008_outgoinglinks, + Messages.NavigatorGroupName_EndEvent_3006_outgoinglinks, "icons/outgoingLinksNavigatorGroup.gif", parentElement); //$NON-NLS-1$ Collection<View> connectedViews; connectedViews = getIncomingLinksByType(Collections.singleton(sv), @@ -1283,28 +897,18 @@ return result.toArray(); } - case IntermediateCatchEvent5EditPart.VISUAL_ID: { + case TextAnnotationEditPart.VISUAL_ID: { LinkedList<Bpmn2AbstractNavigatorItem> result = new LinkedList<Bpmn2AbstractNavigatorItem>(); Node sv = (Node) view; Bpmn2NavigatorGroup incominglinks = new Bpmn2NavigatorGroup( - Messages.NavigatorGroupName_IntermediateCatchEvent_3013_incominglinks, + Messages.NavigatorGroupName_TextAnnotation_2015_incominglinks, "icons/incomingLinksNavigatorGroup.gif", parentElement); //$NON-NLS-1$ Bpmn2NavigatorGroup outgoinglinks = new Bpmn2NavigatorGroup( - Messages.NavigatorGroupName_IntermediateCatchEvent_3013_outgoinglinks, + Messages.NavigatorGroupName_TextAnnotation_2015_outgoinglinks, "icons/outgoingLinksNavigatorGroup.gif", parentElement); //$NON-NLS-1$ Collection<View> connectedViews; connectedViews = getIncomingLinksByType(Collections.singleton(sv), Bpmn2VisualIDRegistry - .getType(SequenceFlowEditPart.VISUAL_ID)); - incominglinks.addChildren(createNavigatorItems(connectedViews, - incominglinks, true)); - connectedViews = getOutgoingLinksByType(Collections.singleton(sv), - Bpmn2VisualIDRegistry - .getType(SequenceFlowEditPart.VISUAL_ID)); - outgoinglinks.addChildren(createNavigatorItems(connectedViews, - outgoinglinks, true)); - connectedViews = getIncomingLinksByType(Collections.singleton(sv), - Bpmn2VisualIDRegistry .getType(AssociationEditPart.VISUAL_ID)); incominglinks.addChildren(createNavigatorItems(connectedViews, incominglinks, true)); @@ -1322,14 +926,14 @@ return result.toArray(); } - case ScriptTask2EditPart.VISUAL_ID: { + case ExclusiveGatewayEditPart.VISUAL_ID: { LinkedList<Bpmn2AbstractNavigatorItem> result = new LinkedList<Bpmn2AbstractNavigatorItem>(); Node sv = (Node) view; Bpmn2NavigatorGroup incominglinks = new Bpmn2NavigatorGroup( - Messages.NavigatorGroupName_ScriptTask_3016_incominglinks, + Messages.NavigatorGroupName_ExclusiveGateway_2005_incominglinks, "icons/incomingLinksNavigatorGroup.gif", parentElement); //$NON-NLS-1$ Bpmn2NavigatorGroup outgoinglinks = new Bpmn2NavigatorGroup( - Messages.NavigatorGroupName_ScriptTask_3016_outgoinglinks, + Messages.NavigatorGroupName_ExclusiveGateway_2005_outgoinglinks, "icons/outgoingLinksNavigatorGroup.gif", parentElement); //$NON-NLS-1$ Collection<View> connectedViews; connectedViews = getIncomingLinksByType(Collections.singleton(sv), @@ -1361,28 +965,18 @@ return result.toArray(); } - case StartEvent4EditPart.VISUAL_ID: { + case DataObject2EditPart.VISUAL_ID: { LinkedList<Bpmn2AbstractNavigatorItem> result = new LinkedList<Bpmn2AbstractNavigatorItem>(); Node sv = (Node) view; Bpmn2NavigatorGroup incominglinks = new Bpmn2NavigatorGroup( - Messages.NavigatorGroupName_StartEvent_3005_incominglinks, + Messages.NavigatorGroupName_DataObject_3014_incominglinks, "icons/incomingLinksNavigatorGroup.gif", parentElement); //$NON-NLS-1$ Bpmn2NavigatorGroup outgoinglinks = new Bpmn2NavigatorGroup( - Messages.NavigatorGroupName_StartEvent_3005_outgoinglinks, + Messages.NavigatorGroupName_DataObject_3014_outgoinglinks, "icons/outgoingLinksNavigatorGroup.gif", parentElement); //$NON-NLS-1$ Collection<View> connectedViews; connectedViews = getIncomingLinksByType(Collections.singleton(sv), Bpmn2VisualIDRegistry - .getType(SequenceFlowEditPart.VISUAL_ID)); - incominglinks.addChildren(createNavigatorItems(connectedViews, - incominglinks, true)); - connectedViews = getOutgoingLinksByType(Collections.singleton(sv), - Bpmn2VisualIDRegistry - .getType(SequenceFlowEditPart.VISUAL_ID)); - outgoinglinks.addChildren(createNavigatorItems(connectedViews, - outgoinglinks, true)); - connectedViews = getIncomingLinksByType(Collections.singleton(sv), - Bpmn2VisualIDRegistry .getType(AssociationEditPart.VISUAL_ID)); incominglinks.addChildren(createNavigatorItems(connectedViews, incominglinks, true)); @@ -1400,14 +994,14 @@ return result.toArray(); } - case EndEvent2EditPart.VISUAL_ID: { + case ScriptTask2EditPart.VISUAL_ID: { LinkedList<Bpmn2AbstractNavigatorItem> result = new LinkedList<Bpmn2AbstractNavigatorItem>(); Node sv = (Node) view; Bpmn2NavigatorGroup incominglinks = new Bpmn2NavigatorGroup( - Messages.NavigatorGroupName_EndEvent_2008_incominglinks, + Messages.NavigatorGroupName_ScriptTask_3016_incominglinks, "icons/incomingLinksNavigatorGroup.gif", parentElement); //$NON-NLS-1$ Bpmn2NavigatorGroup outgoinglinks = new Bpmn2NavigatorGroup( - Messages.NavigatorGroupName_EndEvent_2008_outgoinglinks, + Messages.NavigatorGroupName_ScriptTask_3016_outgoinglinks, "icons/outgoingLinksNavigatorGroup.gif", parentElement); //$NON-NLS-1$ Collection<View> connectedViews; connectedViews = getIncomingLinksByType(Collections.singleton(sv), @@ -1439,14 +1033,14 @@ return result.toArray(); } - case EndEvent6EditPart.VISUAL_ID: { + case ServiceTask2EditPart.VISUAL_ID: { LinkedList<Bpmn2AbstractNavigatorItem> result = new LinkedList<Bpmn2AbstractNavigatorItem>(); Node sv = (Node) view; Bpmn2NavigatorGroup incominglinks = new Bpmn2NavigatorGroup( - Messages.NavigatorGroupName_EndEvent_3010_incominglinks, + Messages.NavigatorGroupName_ServiceTask_3004_incominglinks, "icons/incomingLinksNavigatorGroup.gif", parentElement); //$NON-NLS-1$ Bpmn2NavigatorGroup outgoinglinks = new Bpmn2NavigatorGroup( - Messages.NavigatorGroupName_EndEvent_3010_outgoinglinks, + Messages.NavigatorGroupName_ServiceTask_3004_outgoinglinks, "icons/outgoingLinksNavigatorGroup.gif", parentElement); //$NON-NLS-1$ Collection<View> connectedViews; connectedViews = getIncomingLinksByType(Collections.singleton(sv), @@ -1478,14 +1072,14 @@ return result.toArray(); } - case EndEventEditPart.VISUAL_ID: { + case IntermediateThrowEventEditPart.VISUAL_ID: { LinkedList<Bpmn2AbstractNavigatorItem> result = new LinkedList<Bpmn2AbstractNavigatorItem>(); Node sv = (Node) view; Bpmn2NavigatorGroup incominglinks = new Bpmn2NavigatorGroup( - Messages.NavigatorGroupName_EndEvent_2004_incominglinks, + Messages.NavigatorGroupName_IntermediateThrowEvent_2011_incominglinks, "icons/incomingLinksNavigatorGroup.gif", parentElement); //$NON-NLS-1$ Bpmn2NavigatorGroup outgoinglinks = new Bpmn2NavigatorGroup( - Messages.NavigatorGroupName_EndEvent_2004_outgoinglinks, + Messages.NavigatorGroupName_IntermediateThrowEvent_2011_outgoinglinks, "icons/outgoingLinksNavigatorGroup.gif", parentElement); //$NON-NLS-1$ Collection<View> connectedViews; connectedViews = getIncomingLinksByType(Collections.singleton(sv), @@ -1517,14 +1111,14 @@ return result.toArray(); } - case UserTask2EditPart.VISUAL_ID: { + case ScriptTaskEditPart.VISUAL_ID: { LinkedList<Bpmn2AbstractNavigatorItem> result = new LinkedList<Bpmn2AbstractNavigatorItem>(); Node sv = (Node) view; Bpmn2NavigatorGroup incominglinks = new Bpmn2NavigatorGroup( - Messages.NavigatorGroupName_UserTask_3002_incominglinks, + Messages.NavigatorGroupName_ScriptTask_2017_incominglinks, "icons/incomingLinksNavigatorGroup.gif", parentElement); //$NON-NLS-1$ Bpmn2NavigatorGroup outgoinglinks = new Bpmn2NavigatorGroup( - Messages.NavigatorGroupName_UserTask_3002_outgoinglinks, + Messages.NavigatorGroupName_ScriptTask_2017_outgoinglinks, "icons/outgoingLinksNavigatorGroup.gif", parentElement); //$NON-NLS-1$ Collection<View> connectedViews; connectedViews = getIncomingLinksByType(Collections.singleton(sv), @@ -1556,43 +1150,112 @@ return result.toArray(); } - case TextAnnotationEditPart.VISUAL_ID: { + case ProcessEditPart.VISUAL_ID: { LinkedList<Bpmn2AbstractNavigatorItem> result = new LinkedList<Bpmn2AbstractNavigatorItem>(); - Node sv = (Node) view; - Bpmn2NavigatorGroup incominglinks = new Bpmn2NavigatorGroup( - Messages.NavigatorGroupName_TextAnnotation_2015_incominglinks, - "icons/incomingLinksNavigatorGroup.gif", parentElement); //$NON-NLS-1$ - Bpmn2NavigatorGroup outgoinglinks = new Bpmn2NavigatorGroup( - Messages.NavigatorGroupName_TextAnnotation_2015_outgoinglinks, - "icons/outgoingLinksNavigatorGroup.gif", parentElement); //$NON-NLS-1$ + Diagram sv = (Diagram) view; + Bpmn2NavigatorGroup links = new Bpmn2NavigatorGroup( + Messages.NavigatorGroupName_Process_1000_links, + "icons/linksNavigatorGroup.gif", parentElement); //$NON-NLS-1$ Collection<View> connectedViews; - connectedViews = getIncomingLinksByType(Collections.singleton(sv), + connectedViews = getChildrenByType(Collections.singleton(sv), + Bpmn2VisualIDRegistry.getType(UserTaskEditPart.VISUAL_ID)); + result.addAll(createNavigatorItems(connectedViews, parentElement, + false)); + connectedViews = getChildrenByType(Collections.singleton(sv), Bpmn2VisualIDRegistry - .getType(AssociationEditPart.VISUAL_ID)); - incominglinks.addChildren(createNavigatorItems(connectedViews, - incominglinks, true)); - connectedViews = getOutgoingLinksByType(Collections.singleton(sv), + .getType(ServiceTaskEditPart.VISUAL_ID)); + result.addAll(createNavigatorItems(connectedViews, parentElement, + false)); + connectedViews = getChildrenByType(Collections.singleton(sv), + Bpmn2VisualIDRegistry.getType(StartEventEditPart.VISUAL_ID)); + result.addAll(createNavigatorItems(connectedViews, parentElement, + false)); + connectedViews = getChildrenByType(Collections.singleton(sv), Bpmn2VisualIDRegistry + .getType(StartEvent2EditPart.VISUAL_ID)); + result.addAll(createNavigatorItems(connectedViews, parentElement, + false)); + connectedViews = getChildrenByType(Collections.singleton(sv), + Bpmn2VisualIDRegistry.getType(EndEventEditPart.VISUAL_ID)); + result.addAll(createNavigatorItems(connectedViews, parentElement, + false)); + connectedViews = getChildrenByType(Collections.singleton(sv), + Bpmn2VisualIDRegistry + .getType(ExclusiveGatewayEditPart.VISUAL_ID)); + result.addAll(createNavigatorItems(connectedViews, parentElement, + false)); + connectedViews = getChildrenByType(Collections.singleton(sv), + Bpmn2VisualIDRegistry + .getType(ParallelGatewayEditPart.VISUAL_ID)); + result.addAll(createNavigatorItems(connectedViews, parentElement, + false)); + connectedViews = getChildrenByType(Collections.singleton(sv), + Bpmn2VisualIDRegistry.getType(EndEvent2EditPart.VISUAL_ID)); + result.addAll(createNavigatorItems(connectedViews, parentElement, + false)); + connectedViews = getChildrenByType(Collections.singleton(sv), + Bpmn2VisualIDRegistry.getType(EndEvent3EditPart.VISUAL_ID)); + result.addAll(createNavigatorItems(connectedViews, parentElement, + false)); + connectedViews = getChildrenByType(Collections.singleton(sv), + Bpmn2VisualIDRegistry + .getType(IntermediateCatchEventEditPart.VISUAL_ID)); + result.addAll(createNavigatorItems(connectedViews, parentElement, + false)); + connectedViews = getChildrenByType(Collections.singleton(sv), + Bpmn2VisualIDRegistry + .getType(IntermediateThrowEventEditPart.VISUAL_ID)); + result.addAll(createNavigatorItems(connectedViews, parentElement, + false)); + connectedViews = getChildrenByType(Collections.singleton(sv), + Bpmn2VisualIDRegistry + .getType(IntermediateCatchEvent2EditPart.VISUAL_ID)); + result.addAll(createNavigatorItems(connectedViews, parentElement, + false)); + connectedViews = getChildrenByType(Collections.singleton(sv), + Bpmn2VisualIDRegistry + .getType(IntermediateCatchEvent3EditPart.VISUAL_ID)); + result.addAll(createNavigatorItems(connectedViews, parentElement, + false)); + connectedViews = getChildrenByType(Collections.singleton(sv), + Bpmn2VisualIDRegistry.getType(DataObjectEditPart.VISUAL_ID)); + result.addAll(createNavigatorItems(connectedViews, parentElement, + false)); + connectedViews = getChildrenByType(Collections.singleton(sv), + Bpmn2VisualIDRegistry + .getType(TextAnnotationEditPart.VISUAL_ID)); + result.addAll(createNavigatorItems(connectedViews, parentElement, + false)); + connectedViews = getChildrenByType(Collections.singleton(sv), + Bpmn2VisualIDRegistry.getType(SubProcessEditPart.VISUAL_ID)); + result.addAll(createNavigatorItems(connectedViews, parentElement, + false)); + connectedViews = getChildrenByType(Collections.singleton(sv), + Bpmn2VisualIDRegistry.getType(ScriptTaskEditPart.VISUAL_ID)); + result.addAll(createNavigatorItems(connectedViews, parentElement, + false)); + connectedViews = getDiagramLinksByType(Collections.singleton(sv), + Bpmn2VisualIDRegistry + .getType(SequenceFlowEditPart.VISUAL_ID)); + links.addChildren(createNavigatorItems(connectedViews, links, false)); + connectedViews = getDiagramLinksByType(Collections.singleton(sv), + Bpmn2VisualIDRegistry .getType(AssociationEditPart.VISUAL_ID)); - outgoinglinks.addChildren(createNavigatorItems(connectedViews, - outgoinglinks, true)); - if (!incominglinks.isEmpty()) { - result.add(incominglinks); + links.addChildren(createNavigatorItems(connectedViews, links, false)); + if (!links.isEmpty()) { + result.add(links); } - if (!outgoinglinks.isEmpty()) { - result.add(outgoinglinks); - } return result.toArray(); } - case EndEvent3EditPart.VISUAL_ID: { + case IntermediateCatchEventEditPart.VISUAL_ID: { LinkedList<Bpmn2AbstractNavigatorItem> result = new LinkedList<Bpmn2AbstractNavigatorItem>(); Node sv = (Node) view; Bpmn2NavigatorGroup incominglinks = new Bpmn2NavigatorGroup( - Messages.NavigatorGroupName_EndEvent_2009_incominglinks, + Messages.NavigatorGroupName_IntermediateCatchEvent_2010_incominglinks, "icons/incomingLinksNavigatorGroup.gif", parentElement); //$NON-NLS-1$ Bpmn2NavigatorGroup outgoinglinks = new Bpmn2NavigatorGroup( - Messages.NavigatorGroupName_EndEvent_2009_outgoinglinks, + Messages.NavigatorGroupName_IntermediateCatchEvent_2010_outgoinglinks, "icons/outgoingLinksNavigatorGroup.gif", parentElement); //$NON-NLS-1$ Collection<View> connectedViews; connectedViews = getIncomingLinksByType(Collections.singleton(sv), @@ -1624,14 +1287,14 @@ return result.toArray(); } - case StartEvent2EditPart.VISUAL_ID: { + case UserTaskEditPart.VISUAL_ID: { LinkedList<Bpmn2AbstractNavigatorItem> result = new LinkedList<Bpmn2AbstractNavigatorItem>(); Node sv = (Node) view; Bpmn2NavigatorGroup incominglinks = new Bpmn2NavigatorGroup( - Messages.NavigatorGroupName_StartEvent_2007_incominglinks, + Messages.NavigatorGroupName_UserTask_2001_incominglinks, "icons/incomingLinksNavigatorGroup.gif", parentElement); //$NON-NLS-1$ Bpmn2NavigatorGroup outgoinglinks = new Bpmn2NavigatorGroup( - Messages.NavigatorGroupName_StartEvent_2007_outgoinglinks, + Messages.NavigatorGroupName_UserTask_2001_outgoinglinks, "icons/outgoingLinksNavigatorGroup.gif", parentElement); //$NON-NLS-1$ Collection<View> connectedViews; connectedViews = getIncomingLinksByType(Collections.singleton(sv), @@ -1663,112 +1326,352 @@ return result.toArray(); } - case ProcessEditPart.VISUAL_ID: { + case SequenceFlowEditPart.VISUAL_ID: { LinkedList<Bpmn2AbstractNavigatorItem> result = new LinkedList<Bpmn2AbstractNavigatorItem>(); - Diagram sv = (Diagram) view; - Bpmn2NavigatorGroup links = new Bpmn2NavigatorGroup( - Messages.NavigatorGroupName_Process_1000_links, - "icons/linksNavigatorGroup.gif", parentElement); //$NON-NLS-1$ + Edge sv = (Edge) view; + Bpmn2NavigatorGroup target = new Bpmn2NavigatorGroup( + Messages.NavigatorGroupName_SequenceFlow_4001_target, + "icons/linkTargetNavigatorGroup.gif", parentElement); //$NON-NLS-1$ + Bpmn2NavigatorGroup source = new Bpmn2NavigatorGroup( + Messages.NavigatorGroupName_SequenceFlow_4001_source, + "icons/linkSourceNavigatorGroup.gif", parentElement); //$NON-NLS-1$ + Bpmn2NavigatorGroup incominglinks = new Bpmn2NavigatorGroup( + Messages.NavigatorGroupName_SequenceFlow_4001_incominglinks, + "icons/incomingLinksNavigatorGroup.gif", parentElement); //$NON-NLS-1$ + Bpmn2NavigatorGroup outgoinglinks = new Bpmn2NavigatorGroup( + Messages.NavigatorGroupName_SequenceFlow_4001_outgoinglinks, + "icons/outgoingLinksNavigatorGroup.gif", parentElement); //$NON-NLS-1$ Collection<View> connectedViews; - connectedViews = getChildrenByType(Collections.singleton(sv), + connectedViews = getLinksTargetByType(Collections.singleton(sv), Bpmn2VisualIDRegistry.getType(UserTaskEditPart.VISUAL_ID)); - result.addAll(createNavigatorItems(connectedViews, parentElement, - false)); - connectedViews = getChildrenByType(Collections.singleton(sv), + target.addChildren(createNavigatorItems(connectedViews, target, + true)); + connectedViews = getLinksTargetByType(Collections.singleton(sv), Bpmn2VisualIDRegistry .getType(ServiceTaskEditPart.VISUAL_ID)); - result.addAll(createNavigatorItems(connectedViews, parentElement, - false)); - connectedViews = getChildrenByType(Collections.singleton(sv), + target.addChildren(createNavigatorItems(connectedViews, target, + true)); + connectedViews = getLinksTargetByType(Collections.singleton(sv), Bpmn2VisualIDRegistry.getType(StartEventEditPart.VISUAL_ID)); - result.addAll(createNavigatorItems(connectedViews, parentElement, - false)); - connectedViews = getChildrenByType(Collections.singleton(sv), + target.addChildren(createNavigatorItems(connectedViews, target, + true)); + connectedViews = getLinksTargetByType(Collections.singleton(sv), Bpmn2VisualIDRegistry .getType(StartEvent2EditPart.VISUAL_ID)); - result.addAll(createNavigatorItems(connectedViews, parentElement, - false)); - connectedViews = getChildrenByType(Collections.singleton(sv), + target.addChildren(createNavigatorItems(connectedViews, target, + true)); + connectedViews = getLinksTargetByType(Collections.singleton(sv), Bpmn2VisualIDRegistry.getType(EndEventEditPart.VISUAL_ID)); - result.addAll(createNavigatorItems(connectedViews, parentElement, - false)); - connectedViews = getChildrenByType(Collections.singleton(sv), + target.addChildren(createNavigatorItems(connectedViews, target, + true)); + connectedViews = getLinksTargetByType(Collections.singleton(sv), Bpmn2VisualIDRegistry .getType(ExclusiveGatewayEditPart.VISUAL_ID)); - result.addAll(createNavigatorItems(connectedViews, parentElement, - false)); - connectedViews = getChildrenByType(Collections.singleton(sv), + target.addChildren(createNavigatorItems(connectedViews, target, + true)); + connectedViews = getLinksTargetByType(Collections.singleton(sv), Bpmn2VisualIDRegistry .getType(ParallelGatewayEditPart.VISUAL_ID)); - result.addAll(createNavigatorItems(connectedViews, parentElement, - false)); - connectedViews = getChildrenByType(Collections.singleton(sv), + target.addChildren(createNavigatorItems(connectedViews, target, + true)); + connectedViews = getLinksTargetByType(Collections.singleton(sv), Bpmn2VisualIDRegistry.getType(EndEvent2EditPart.VISUAL_ID)); - result.addAll(createNavigatorItems(connectedViews, parentElement, - false)); - connectedViews = getChildrenByType(Collections.singleton(sv), + target.addChildren(createNavigatorItems(connectedViews, target, + true)); + connectedViews = getLinksTargetByType(Collections.singleton(sv), Bpmn2VisualIDRegistry.getType(EndEvent3EditPart.VISUAL_ID)); - result.addAll(createNavigatorItems(connectedViews, parentElement, - false)); - connectedViews = getChildrenByType(Collections.singleton(sv), + target.addChildren(createNavigatorItems(connectedViews, target, + true)); + connectedViews = getLinksTargetByType(Collections.singleton(sv), Bpmn2VisualIDRegistry .getType(IntermediateCatchEventEditPart.VISUAL_ID)); - result.addAll(createNavigatorItems(connectedViews, parentElement, - false)); - connectedViews = getChildrenByType(Collections.singleton(sv), + target.addChildren(createNavigatorItems(connectedViews, target, + true)); + connectedViews = getLinksTargetByType(Collections.singleton(sv), Bpmn2VisualIDRegistry .getType(IntermediateThrowEventEditPart.VISUAL_ID)); - result.addAll(createNavigatorItems(connectedViews, parentElement, - false)); - connectedViews = getChildrenByType(Collections.singleton(sv), + target.addChildren(createNavigatorItems(connectedViews, target, + true)); + connectedViews = getLinksTargetByType(Collections.singleton(sv), Bpmn2VisualIDRegistry .getType(IntermediateCatchEvent2EditPart.VISUAL_ID)); - result.addAll(createNavigatorItems(connectedViews, parentElement, - false)); - connectedViews = getChildrenByType(Collections.singleton(sv), + target.addChildren(createNavigatorItems(connectedViews, target, + true)); + connectedViews = getLinksTargetByType(Collections.singleton(sv), Bpmn2VisualIDRegistry .getType(IntermediateCatchEvent3EditPart.VISUAL_ID)); - result.addAll(createNavigatorItems(connectedViews, parentElement, - false)); - connectedViews = getChildrenByType(Collections.singleton(sv), - Bpmn2VisualIDRegistry.getType(DataObjectEditPart.VISUAL_ID)); - result.addAll(createNavigatorItems(connectedViews, parentElement, - false)); - connectedViews = getChildrenByType(Collections.singleton(sv), + target.addChildren(createNavigatorItems(connectedViews, target, + true)); + connectedViews = getLinksTargetByType(Collections.singleton(sv), + Bpmn2VisualIDRegistry.getType(SubProcessEditPart.VISUAL_ID)); + target.addChildren(createNavigatorItems(connectedViews, target, + true)); + connectedViews = getLinksTargetByType(Collections.singleton(sv), + Bpmn2VisualIDRegistry.getType(ScriptTaskEditPart.VISUAL_ID)); + target.addChildren(createNavigatorItems(connectedViews, target, + true)); + connectedViews = getLinksTargetByType(Collections.singleton(sv), Bpmn2VisualIDRegistry - .getType(TextAnnotationEditPart.VISUAL_ID)); - result.addAll(createNavigatorItems(connectedViews, parentElement, - false)); - connectedViews = getChildrenByType(Collections.singleton(sv), + .getType(SubProcess2EditPart.VISUAL_ID)); + target.addChildren(createNavigatorItems(connectedViews, target, + true)); + connectedViews = getLinksTargetByType(Collections.singleton(sv), + Bpmn2VisualIDRegistry.getType(UserTask2EditPart.VISUAL_ID)); + target.addChildren(createNavigatorItems(connectedViews, target, + true)); + connectedViews = getLinksTargetByType(Collections.singleton(sv), + Bpmn2VisualIDRegistry + .getType(ServiceTask2EditPart.VISUAL_ID)); + target.addChildren(createNavigatorItems(connectedViews, target, + true)); + connectedViews = getLinksTargetByType(Collections.singleton(sv), + Bpmn2VisualIDRegistry + .getType(StartEvent3EditPart.VISUAL_ID)); + target.addChildren(createNavigatorItems(connectedViews, target, + true)); + connectedViews = getLinksTargetByType(Collections.singleton(sv), + Bpmn2VisualIDRegistry + .getType(StartEvent4EditPart.VISUAL_ID)); + target.addChildren(createNavigatorItems(connectedViews, target, + true)); + connectedViews = getLinksTargetByType(Collections.singleton(sv), + Bpmn2VisualIDRegistry.getType(EndEvent4EditPart.VISUAL_ID)); + target.addChildren(createNavigatorItems(connectedViews, target, + true)); + connectedViews = getLinksTargetByType(Collections.singleton(sv), + Bpmn2VisualIDRegistry + .getType(ExclusiveGateway2EditPart.VISUAL_ID)); + target.addChildren(createNavigatorItems(connectedViews, target, + true)); + connectedViews = getLinksTargetByType(Collections.singleton(sv), + Bpmn2VisualIDRegistry + .getType(ParallelGateway2EditPart.VISUAL_ID)); + target.addChildren(createNavigatorItems(connectedViews, target, + true)); + connectedViews = getLinksTargetByType(Collections.singleton(sv), + Bpmn2VisualIDRegistry.getType(EndEvent5EditPart.VISUAL_ID)); + target.addChildren(createNavigatorItems(connectedViews, target, + true)); + connectedViews = getLinksTargetByType(Collections.singleton(sv), + Bpmn2VisualIDRegistry.getType(EndEvent6EditPart.VISUAL_ID)); + target.addChildren(createNavigatorItems(connectedViews, target, + true)); + connectedViews = getLinksTargetByType(Collections.singleton(sv), + Bpmn2VisualIDRegistry + .getType(IntermediateCatchEvent4EditPart.VISUAL_ID)); + target.addChildren(createNavigatorItems(connectedViews, target, + true)); + connectedViews = getLinksTargetByType(Collections.singleton(sv), + Bpmn2VisualIDRegistry + .getType(IntermediateThrowEvent2EditPart.VISUAL_ID)); + target.addChildren(createNavigatorItems(connectedViews, target, + true)); + connectedViews = getLinksTargetByType(Collections.singleton(sv), + Bpmn2VisualIDRegistry + .getType(IntermediateCatchEvent5EditPart.VISUAL_ID)); + target.addChildren(createNavigatorItems(connectedViews, target, + true)); + connectedViews = getLinksTargetByType(Collections.singleton(sv), + Bpmn2VisualIDRegistry + .getType(ScriptTask2EditPart.VISUAL_ID)); + target.addChildren(createNavigatorItems(connectedViews, target, + true)); + connectedViews = getLinksSourceByType(Collections.singleton(sv), + Bpmn2VisualIDRegistry.getType(UserTaskEditPart.VISUAL_ID)); + source.addChildren(createNavigatorItems(connectedViews, source, + true)); + connectedViews = getLinksSourceByType(Collections.singleton(sv), + Bpmn2VisualIDRegistry + .getType(ServiceTaskEditPart.VISUAL_ID)); + source.addChildren(createNavigatorItems(connectedViews, source, + true)); + connectedViews = getLinksSourceByType(Collections.singleton(sv), + Bpmn2VisualIDRegistry.getType(StartEventEditPart.VISUAL_ID)); + source.addChildren(createNavigatorItems(connectedViews, source, + true)); + connectedViews = getLinksSourceByType(Collections.singleton(sv), + Bpmn2VisualIDRegistry + .getType(StartEvent2EditPart.VISUAL_ID)); + source.addChildren(createNavigatorItems(connectedViews, source, + true)); + connectedViews = getLinksSourceByType(Collections.singleton(sv), + Bpmn2VisualIDRegistry.getType(EndEventEditPart.VISUAL_ID)); + source.addChildren(createNavigatorItems(connectedViews, source, + true)); + connectedViews = getLinksSourceByType(Collections.singleton(sv), + Bpmn2VisualIDRegistry + .getType(ExclusiveGatewayEditPart.VISUAL_ID)); + source.addChildren(createNavigatorItems(connectedViews, source, + true)); + connectedViews = getLinksSourceByType(Collections.singleton(sv), + Bpmn2VisualIDRegistry + .getType(ParallelGatewayEditPart.VISUAL_ID)); + source.addChildren(createNavigatorItems(connectedViews, source, + true)); + connectedViews = getLinksSourceByType(Collections.singleton(sv), + Bpmn2VisualIDRegistry.getType(EndEvent2EditPart.VISUAL_ID)); + source.addChildren(createNavigatorItems(connectedViews, source, + true)); + connectedViews = getLinksSourceByType(Collections.singleton(sv), + Bpmn2VisualIDRegistry.getType(EndEvent3EditPart.VISUAL_ID)); + source.addChildren(createNavigatorItems(connectedViews, source, + true)); + connectedViews = getLinksSourceByType(Collections.singleton(sv), + Bpmn2VisualIDRegistry + .getType(IntermediateCatchEventEditPart.VISUAL_ID)); + source.addChildren(createNavigatorItems(connectedViews, source, + true)); + connectedViews = getLinksSourceByType(Collections.singleton(sv), + Bpmn2VisualIDRegistry + .getType(IntermediateThrowEventEditPart.VISUAL_ID)); + source.addChildren(createNavigatorItems(connectedViews, source, + true)); + connectedViews = getLinksSourceByType(Collections.singleton(sv), + Bpmn2VisualIDRegistry + .getType(IntermediateCatchEvent2EditPart.VISUAL_ID)); + source.addChildren(createNavigatorItems(connectedViews, source, + true)); + connectedViews = getLinksSourceByType(Collections.singleton(sv), + Bpmn2VisualIDRegistry + .getType(IntermediateCatchEvent3EditPart.VISUAL_ID)); + source.addChildren(createNavigatorItems(connectedViews, source, + true)); + connectedViews = getLinksSourceByType(Collections.singleton(sv), Bpmn2VisualIDRegistry.getType(SubProcessEditPart.VISUAL_ID)); - result.addAll(createNavigatorItems(connectedViews, parentElement, - false)); - connectedViews = getChildrenByType(Collections.singleton(sv), + source.addChildren(createNavigatorItems(connectedViews, source, + true)); + connectedViews = getLinksSourceByType(Collections.singleton(sv), Bpmn2VisualIDRegistry.getType(ScriptTaskEditPart.VISUAL_ID)); - result.addAll(createNavigatorItems(connectedViews, parentElement, - false)); - connectedViews = getDiagramLinksByType(Collections.singleton(sv), + source.addChildren(createNavigatorItems(connectedViews, source, + true)); + connectedViews = getLinksSourceByType(Collections.singleton(sv), Bpmn2VisualIDRegistry + .getType(SubProcess2EditPart.VISUAL_ID)); + source.addChildren(createNavigatorItems(connectedViews, source, + true)); + connectedViews = getLinksSourceByType(Collections.singleton(sv), + Bpmn2VisualIDRegistry.getType(UserTask2EditPart.VISUAL_ID)); + source.addChildren(createNavigatorItems(connectedViews, source, + true)); + connectedViews = getLinksSourceByType(Collections.singleton(sv), + Bpmn2VisualIDRegistry + .getType(ServiceTask2EditPart.VISUAL_ID)); + source.addChildren(createNavigatorItems(connectedViews, source, + true)); + connectedViews = getLinksSourceByType(Collections.singleton(sv), + Bpmn2VisualIDRegistry + .getType(StartEvent3EditPart.VISUAL_ID)); + source.addChildren(createNavigatorItems(connectedViews, source, + true)); + connectedViews = getLinksSourceByType(Collections.singleton(sv), + Bpmn2VisualIDRegistry + .getType(StartEvent4EditPart.VISUAL_ID)); + source.addChildren(createNavigatorItems(connectedViews, source, + true)); + connectedViews = getLinksSourceByType(Collections.singleton(sv), + Bpmn2VisualIDRegistry.getType(EndEvent4EditPart.VISUAL_ID)); + source.addChildren(createNavigatorItems(connectedViews, source, + true)); + connectedViews = getLinksSourceByType(Collections.singleton(sv), + Bpmn2VisualIDRegistry + .getType(ExclusiveGateway2EditPart.VISUAL_ID)); + source.addChildren(createNavigatorItems(connectedViews, source, + true)); + connectedViews = getLinksSourceByType(Collections.singleton(sv), + Bpmn2VisualIDRegistry + .getType(ParallelGateway2EditPart.VISUAL_ID)); + source.addChildren(createNavigatorItems(connectedViews, source, + true)); + connectedViews = getLinksSourceByType(Collections.singleton(sv), + Bpmn2VisualIDRegistry.getType(EndEvent5EditPart.VISUAL_ID)); + source.addChildren(createNavigatorItems(connectedViews, source, + true)); + connectedViews = getLinksSourceByType(Collections.singleton(sv), + Bpmn2VisualIDRegistry.getType(EndEvent6EditPart.VISUAL_ID)); + source.addChildren(createNavigatorItems(connectedViews, source, + true)); + connectedViews = getLinksSourceByType(Collections.singleton(sv), + Bpmn2VisualIDRegistry + .getType(IntermediateCatchEvent4EditPart.VISUAL_ID)); + source.addChildren(createNavigatorItems(connectedViews, source, + true)); + connectedViews = getLinksSourceByType(Collections.singleton(sv), + Bpmn2VisualIDRegistry + .getType(IntermediateThrowEvent2EditPart.VISUAL_ID)); + source.addChildren(createNavigatorItems(connectedViews, source, + true)); + connectedViews = getLinksSourceByType(Collections.singleton(sv), + Bpmn2VisualIDRegistry + .getType(IntermediateCatchEvent5EditPart.VISUAL_ID)); + source.addChildren(createNavigatorItems(connectedViews, source, + true)); + connectedViews = getLinksSourceByType(Collections.singleton(sv), + Bpmn2VisualIDRegistry + .getType(ScriptTask2EditPart.VISUAL_ID)); + source.addChildren(createNavigatorItems(connectedViews, source, + true)); + if (!target.isEmpty()) { + result.add(target); + } + if (!source.isEmpty()) { + result.add(source); + } + if (!incominglinks.isEmpty()) { + result.add(incominglinks); + } + if (!outgoinglinks.isEmpty()) { + result.add(outgoinglinks); + } + return result.toArray(); + } + + case ParallelGatewayEditPart.VISUAL_ID: { + LinkedList<Bpmn2AbstractNavigatorItem> result = new LinkedList<Bpmn2AbstractNavigatorItem>(); + Node sv = (Node) view; + Bpmn2NavigatorGroup incominglinks = new Bpmn2NavigatorGroup( + Messages.NavigatorGroupName_ParallelGateway_2006_incominglinks, + "icons/incomingLinksNavigatorGroup.gif", parentElement); //$NON-NLS-1$ + Bpmn2NavigatorGroup outgoinglinks = new Bpmn2NavigatorGroup( + Messages.NavigatorGroupName_ParallelGateway_2006_outgoinglinks, + "icons/outgoingLinksNavigatorGroup.gif", parentElement); //$NON-NLS-1$ + Collection<View> connectedViews; + connectedViews = getIncomingLinksByType(Collections.singleton(sv), + Bpmn2VisualIDRegistry .getType(SequenceFlowEditPart.VISUAL_ID)); - links.addChildren(createNavigatorItems(connectedViews, links, false)); - connectedViews = getDiagramLinksByType(Collections.singleton(sv), + incominglinks.addChildren(createNavigatorItems(connectedViews, + incominglinks, true)); + connectedViews = getOutgoingLinksByType(Collections.singleton(sv), Bpmn2VisualIDRegistry + .getType(SequenceFlowEditPart.VISUAL_ID)); + outgoinglinks.addChildren(createNavigatorItems(connectedViews, + outgoinglinks, true)); + connectedViews = getIncomingLinksByType(Collections.singleton(sv), + Bpmn2VisualIDRegistry .getType(AssociationEditPart.VISUAL_ID)); - links.addChildren(createNavigatorItems(connectedViews, links, false)); - if (!links.isEmpty()) { - result.add(links); + incominglinks.addChildren(createNavigatorItems(connectedViews, + incominglinks, true)); + connectedViews = getOutgoingLinksByType(Collections.singleton(sv), + Bpmn2VisualIDRegistry + .getType(AssociationEditPart.VISUAL_ID)); + outgoinglinks.addChildren(createNavigatorItems(connectedViews, + outgoinglinks, true)); + if (!incominglinks.isEmpty()) { + result.add(incominglinks); } + if (!outgoinglinks.isEmpty()) { + result.add(outgoinglinks); + } return result.toArray(); } - case ScriptTaskEditPart.VISUAL_ID: { + case IntermediateCatchEvent4EditPart.VISUAL_ID: { LinkedList<Bpmn2AbstractNavigatorItem> result = new LinkedList<Bpmn2AbstractNavigatorItem>(); Node sv = (Node) view; Bpmn2NavigatorGroup incominglinks = new Bpmn2NavigatorGroup( - Messages.NavigatorGroupName_ScriptTask_2017_incominglinks, + Messages.NavigatorGroupName_IntermediateCatchEvent_3011_incominglinks, "icons/incomingLinksNavigatorGroup.gif", parentElement); //$NON-NLS-1$ Bpmn2NavigatorGroup outgoinglinks = new Bpmn2NavigatorGroup( - Messages.NavigatorGroupName_ScriptTask_2017_outgoinglinks, + Messages.NavigatorGroupName_IntermediateCatchEvent_3011_outgoinglinks, "icons/outgoingLinksNavigatorGroup.gif", parentElement); //$NON-NLS-1$ Collection<View> connectedViews; connectedViews = getIncomingLinksByType(Collections.singleton(sv), @@ -1800,18 +1703,28 @@ return result.toArray(); } - case DataObjectEditPart.VISUAL_ID: { + case EndEvent5EditPart.VISUAL_ID: { LinkedList<Bpmn2AbstractNavigatorItem> result = new LinkedList<Bpmn2AbstractNavigatorItem>(); Node sv = (Node) view; Bpmn2NavigatorGroup incominglinks = new Bpmn2NavigatorGroup( - Messages.NavigatorGroupName_DataObject_2014_incominglinks, + Messages.NavigatorGroupName_EndEvent_3009_incominglinks, "icons/incomingLinksNavigatorGroup.gif", parentElement); //$NON-NLS-1$ Bpmn2NavigatorGroup outgoinglinks = new Bpmn2NavigatorGroup( - Messages.NavigatorGroupName_DataObject_2014_outgoinglinks, + Messages.NavigatorGroupName_EndEvent_3009_outgoinglinks, "icons/outgoingLinksNavigatorGroup.gif", parentElement); //$NON-NLS-1$ Collection<View> connectedViews; connectedViews = getIncomingLinksByType(Collections.singleton(sv), Bpmn2VisualIDRegistry + .getType(SequenceFlowEditPart.VISUAL_ID)); + incominglinks.addChildren(createNavigatorItems(connectedViews, + incominglinks, true)); + connectedViews = getOutgoingLinksByType(Collections.singleton(sv), + Bpmn2VisualIDRegistry + .getType(SequenceFlowEditPart.VISUAL_ID)); + outgoinglinks.addChildren(createNavigatorItems(connectedViews, + outgoinglinks, true)); + connectedViews = getIncomingLinksByType(Collections.singleton(sv), + Bpmn2VisualIDRegistry .getType(AssociationEditPart.VISUAL_ID)); incominglinks.addChildren(createNavigatorItems(connectedViews, incominglinks, true)); @@ -1949,20 +1862,20 @@ return result.toArray(); } - case SequenceFlowEditPart.VISUAL_ID: { + case AssociationEditPart.VISUAL_ID: { LinkedList<Bpmn2AbstractNavigatorItem> result = new LinkedList<Bpmn2AbstractNavigatorItem>(); Edge sv = (Edge) view; Bpmn2NavigatorGroup target = new Bpmn2NavigatorGroup( - Messages.NavigatorGroupName_SequenceFlow_4001_target, + Messages.NavigatorGroupName_Association_4002_target, "icons/linkTargetNavigatorGroup.gif", parentElement); //$NON-NLS-1$ + Bpmn2NavigatorGroup incominglinks = new Bpmn2NavigatorGroup( + Messages.NavigatorGroupName_Association_4002_incominglinks, + "icons/incomingLinksNavigatorGroup.gif", parentElement); //$NON-NLS-1$ Bpmn2NavigatorGroup source = new Bpmn2NavigatorGroup( - Messages.NavigatorGroupName_SequenceFlow_4001_source, + Messages.NavigatorGroupName_Association_4002_source, "icons/linkSourceNavigatorGroup.gif", parentElement); //$NON-NLS-1$ - Bpmn2NavigatorGroup incominglinks = new Bpmn2NavigatorGroup( - Messages.NavigatorGroupName_SequenceFlow_4001_incominglinks, - "icons/incomingLinksNavigatorGroup.gif", parentElement); //$NON-NLS-1$ Bpmn2NavigatorGroup outgoinglinks = new Bpmn2NavigatorGroup( - Messages.NavigatorGroupName_SequenceFlow_4001_outgoinglinks, + Messages.NavigatorGroupName_Association_4002_outgoinglinks, "icons/outgoingLinksNavigatorGroup.gif", parentElement); //$NON-NLS-1$ Collection<View> connectedViews; connectedViews = getLinksTargetByType(Collections.singleton(sv), @@ -2026,6 +1939,15 @@ target.addChildren(createNavigatorItems(connectedViews, target, true)); connectedViews = getLinksTargetByType(Collections.singleton(sv), + Bpmn2VisualIDRegistry.getType(DataObjectEditPart.VISUAL_ID)); + target.addChildren(createNavigatorItems(connectedViews, target, + true)); + connectedViews = getLinksTargetByType(Collections.singleton(sv), + Bpmn2VisualIDRegistry + .getType(TextAnnotationEditPart.VISUAL_ID)); + target.addChildren(createNavigatorItems(connectedViews, target, + true)); + connectedViews = getLinksTargetByType(Collections.singleton(sv), Bpmn2VisualIDRegistry.getType(SubProcessEditPart.VISUAL_ID)); target.addChildren(createNavigatorItems(connectedViews, target, true)); @@ -2096,6 +2018,16 @@ true)); connectedViews = getLinksTargetByType(Collections.singleton(sv), Bpmn2VisualIDRegistry + .getType(DataObject2EditPart.VISUAL_ID)); + target.addChildren(createNavigatorItems(connectedViews, target, + true)); + connectedViews = getLinksTargetByType(Collections.singleton(sv), + Bpmn2VisualIDRegistry + .getType(TextAnnotation2EditPart.VISUAL_ID)); + target.addChildren(createNavigatorItems(connectedViews, target, + true)); + connectedViews = getLinksTargetByType(Collections.singleton(sv), + Bpmn2VisualIDRegistry .getType(ScriptTask2EditPart.VISUAL_ID)); target.addChildren(createNavigatorItems(connectedViews, target, true)); @@ -2160,6 +2092,15 @@ source.addChildren(createNavigatorItems(connectedViews, source, true)); connectedViews = getLinksSourceByType(Collections.singleton(sv), + Bpmn2VisualIDRegistry.getType(DataObjectEditPart.VISUAL_ID)); + source.addChildren(createNavigatorItems(connectedViews, source, + true)); + connectedViews = getLinksSourceByType(Collections.singleton(sv), + Bpmn2VisualIDRegistry + .getType(TextAnnotationEditPart.VISUAL_ID)); + source.addChildren(createNavigatorItems(connectedViews, source, + true)); + connectedViews = getLinksSourceByType(Collections.singleton(sv), Bpmn2VisualIDRegistry.getType(SubProcessEditPart.VISUAL_ID)); source.addChildren(createNavigatorItems(connectedViews, source, true)); @@ -2230,15 +2171,64 @@ true)); connectedViews = getLinksSourceByType(Collections.singleton(sv), Bpmn2VisualIDRegistry + .getType(DataObject2EditPart.VISUAL_ID)); + source.addChildren(createNavigatorItems(connectedViews, source, + true)); + connectedViews = getLinksSourceByType(Collections.singleton(sv), + Bpmn2VisualIDRegistry + .getType(TextAnnotation2EditPart.VISUAL_ID)); + source.addChildren(createNavigatorItems(connectedViews, source, + true)); + connectedViews = getLinksSourceByType(Collections.singleton(sv), + Bpmn2VisualIDRegistry .getType(ScriptTask2EditPart.VISUAL_ID)); source.addChildren(createNavigatorItems(connectedViews, source, true)); if (!target.isEmpty()) { result.add(target); } + if (!incominglinks.isEmpty()) { + result.add(incominglinks); + } if (!source.isEmpty()) { result.add(source); } + if (!outgoinglinks.isEmpty()) { + result.add(outgoinglinks); + } + return result.toArray(); + } + + case StartEvent3EditPart.VISUAL_ID: { + LinkedList<Bpmn2AbstractNavigatorItem> result = new LinkedList<Bpmn2AbstractNavigatorItem>(); + Node sv = (Node) view; + Bpmn2NavigatorGroup incominglinks = new Bpmn2NavigatorGroup( + Messages.NavigatorGroupName_StartEvent_3003_incominglinks, + "icons/incomingLinksNavigatorGroup.gif", parentElement); //$NON-NLS-1$ + Bpmn2NavigatorGroup outgoinglinks = new Bpmn2NavigatorGroup( + Messages.NavigatorGroupName_StartEvent_3003_outgoinglinks, + "icons/outgoingLinksNavigatorGroup.gif", parentElement); //$NON-NLS-1$ + Collection<View> connectedViews; + connectedViews = getIncomingLinksByType(Collections.singleton(sv), + Bpmn2VisualIDRegistry + .getType(SequenceFlowEditPart.VISUAL_ID)); + incominglinks.addChildren(createNavigatorItems(connectedViews, + incominglinks, true)); + connectedViews = getOutgoingLinksByType(Collections.singleton(sv), + Bpmn2VisualIDRegistry + .getType(SequenceFlowEditPart.VISUAL_ID)); + outgoinglinks.addChildren(createNavigatorItems(connectedViews, + outgoinglinks, true)); + connectedViews = getIncomingLinksByType(Collections.singleton(sv), + Bpmn2VisualIDRegistry + .getType(AssociationEditPart.VISUAL_ID)); + incominglinks.addChildren(createNavigatorItems(connectedViews, + incominglinks, true)); + connectedViews = getOutgoingLinksByType(Collections.singleton(sv), + Bpmn2VisualIDRegistry + .getType(AssociationEditPart.VISUAL_ID)); + outgoinglinks.addChildren(createNavigatorItems(connectedViews, + outgoinglinks, true)); if (!incominglinks.isEmpty()) { result.add(incominglinks); } @@ -2248,14 +2238,14 @@ return result.toArray(); } - case ServiceTaskEditPart.VISUAL_ID: { + case UserTask2EditPart.VISUAL_ID: { LinkedList<Bpmn2AbstractNavigatorItem> result = new LinkedList<Bpmn2AbstractNavigatorItem>(); Node sv = (Node) view; Bpmn2NavigatorGroup incominglinks = new Bpmn2NavigatorGroup( - Messages.NavigatorGroupName_ServiceTask_2002_incominglinks, + Messages.NavigatorGroupName_UserTask_3002_incominglinks, "icons/incomingLinksNavigatorGroup.gif", parentElement); //$NON-NLS-1$ Bpmn2NavigatorGroup outgoinglinks = new Bpmn2NavigatorGroup( - Messages.NavigatorGroupName_ServiceTask_2002_outgoinglinks, + Messages.NavigatorGroupName_UserTask_3002_outgoinglinks, "icons/outgoingLinksNavigatorGroup.gif", parentElement); //$NON-NLS-1$ Collection<View> connectedViews; connectedViews = getIncomingLinksByType(Collections.singleton(sv), @@ -2287,18 +2277,28 @@ return result.toArray(); } - case DataObject2EditPart.VISUAL_ID: { + case IntermediateCatchEvent3EditPart.VISUAL_ID: { LinkedList<Bpmn2AbstractNavigatorItem> result = new LinkedList<Bpmn2AbstractNavigatorItem>(); Node sv = (Node) view; Bpmn2NavigatorGroup incominglinks = new Bpmn2NavigatorGroup( - Messages.NavigatorGroupName_DataObject_3014_incominglinks, + Messages.NavigatorGroupName_IntermediateCatchEvent_2013_incominglinks, "icons/incomingLinksNavigatorGroup.gif", parentElement); //$NON-NLS-1$ Bpmn2NavigatorGroup outgoinglinks = new Bpmn2NavigatorGroup( - Messages.NavigatorGroupName_DataObject_3014_outgoinglinks, + Messages.NavigatorGroupName_IntermediateCatchEvent_2013_outgoinglinks, "icons/outgoingLinksNavigatorGroup.gif", parentElement); //$NON-NLS-1$ Collection<View> connectedViews; connectedViews = getIncomingLinksByType(Collections.singleton(sv), Bpmn2VisualIDRegistry + .getType(SequenceFlowEditPart.VISUAL_ID)); + incominglinks.addChildren(createNavigatorItems(connectedViews, + incominglinks, true)); + connectedViews = getOutgoingLinksByType(Collections.singleton(sv), + Bpmn2VisualIDRegistry + .getType(SequenceFlowEditPart.VISUAL_ID)); + outgoinglinks.addChildren(createNavigatorItems(connectedViews, + outgoinglinks, true)); + connectedViews = getIncomingLinksByType(Collections.singleton(sv), + Bpmn2VisualIDRegistry .getType(AssociationEditPart.VISUAL_ID)); incominglinks.addChildren(createNavigatorItems(connectedViews, incominglinks, true)); @@ -2316,14 +2316,14 @@ return result.toArray(); } - case ServiceTask2EditPart.VISUAL_ID: { + case IntermediateThrowEvent2EditPart.VISUAL_ID: { LinkedList<Bpmn2AbstractNavigatorItem> result = new LinkedList<Bpmn2AbstractNavigatorItem>(); Node sv = (Node) view; Bpmn2NavigatorGroup incominglinks = new Bpmn2NavigatorGroup( - Messages.NavigatorGroupName_ServiceTask_3004_incominglinks, + Messages.NavigatorGroupName_IntermediateThrowEvent_3012_incominglinks, "icons/incomingLinksNavigatorGroup.gif", parentElement); //$NON-NLS-1$ Bpmn2NavigatorGroup outgoinglinks = new Bpmn2NavigatorGroup( - Messages.NavigatorGroupName_ServiceTask_3004_outgoinglinks, + Messages.NavigatorGroupName_IntermediateThrowEvent_3012_outgoinglinks, "icons/outgoingLinksNavigatorGroup.gif", parentElement); //$NON-NLS-1$ Collection<View> connectedViews; connectedViews = getIncomingLinksByType(Collections.singleton(sv), @@ -2355,14 +2355,14 @@ return result.toArray(); } - case EndEvent5EditPart.VISUAL_ID: { + case ParallelGateway2EditPart.VISUAL_ID: { LinkedList<Bpmn2AbstractNavigatorItem> result = new LinkedList<Bpmn2AbstractNavigatorItem>(); Node sv = (Node) view; Bpmn2NavigatorGroup incominglinks = new Bpmn2NavigatorGroup( - Messages.NavigatorGroupName_EndEvent_3009_incominglinks, + Messages.NavigatorGroupName_ParallelGateway_3008_incominglinks, "icons/incomingLinksNavigatorGroup.gif", parentElement); //$NON-NLS-1$ Bpmn2NavigatorGroup outgoinglinks = new Bpmn2NavigatorGroup( - Messages.NavigatorGroupName_EndEvent_3009_outgoinglinks, + Messages.NavigatorGroupName_ParallelGateway_3008_outgoinglinks, "icons/outgoingLinksNavigatorGroup.gif", parentElement); //$NON-NLS-1$ Collection<View> connectedViews; connectedViews = getIncomingLinksByType(Collections.singleton(sv), Modified: trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/navigator/Bpmn2NavigatorLabelProvider.java =================================================================== --- trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/navigator/Bpmn2NavigatorLabelProvider.java 2011-02-09 09:42:57 UTC (rev 29073) +++ trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/navigator/Bpmn2NavigatorLabelProvider.java 2011-02-09 09:46:27 UTC (rev 29074) @@ -72,6 +72,7 @@ import org.jboss.tools.bpmn2.process.diagram.edit.parts.UserTaskName2EditPart; import org.jboss.tools.bpmn2.process.diagram.edit.parts.UserTaskNameEditPart; import org.jboss.tools.bpmn2.process.diagram.part.Bpmn2DiagramEditorPlugin; +import org.jboss.tools.bpmn2.process.diagram.part.Bpmn2ProcessDiagramEditorPlugin; import org.jboss.tools.bpmn2.process.diagram.part.Bpmn2VisualIDRegistry; import org.jboss.tools.bpmn2.process.diagram.providers.Bpmn2ElementTypes; import org.jboss.tools.bpmn2.process.diagram.providers.Bpmn2ParserProvider; @@ -86,11 +87,11 @@ * @generated */ static { - Bpmn2DiagramEditorPlugin + Bpmn2ProcessDiagramEditorPlugin .getInstance() .getImageRegistry() .put("Navigator?UnknownElement", ImageDescriptor.getMissingImageDescriptor()); //$NON-NLS-1$ - Bpmn2DiagramEditorPlugin + Bpmn2ProcessDiagramEditorPlugin .getInstance() .getImageRegistry() .put("Navigator?ImageNotFound", ImageDescriptor.getMissingImageDescriptor()); //$NON-NLS-1$ @@ -115,8 +116,8 @@ public Image getImage(Object element) { if (element instanceof Bpmn2NavigatorGroup) { Bpmn2NavigatorGroup group = (Bpmn2NavigatorGroup) element; - return Bpmn2DiagramEditorPlugin.getInstance().getBundledImage( - group.getIcon()); + return Bpmn2ProcessDiagramEditorPlugin.getInstance() + .getBundledImage(group.getIcon()); } if (element instanceof Bpmn2NavigatorItem) { @@ -135,114 +136,114 @@ */ public Image getImage(View view) { switch (Bpmn2VisualIDRegistry.getVisualID(view)) { - case ExclusiveGateway2EditPart.VISUAL_ID: + case TextAnnotation2EditPart.VISUAL_ID: return getImage( - "Navigator?Node?http://www.omg.org/spec/BPMN/20100524/MODEL-XMI?ExclusiveG...", Bpmn2ElementTypes.ExclusiveGateway_3007); //$NON-NLS-1$ - case StartEvent3EditPart.VISUAL_ID: + "Navigator?Node?http://www.omg.org/spec/BPMN/20100524/MODEL-XMI?TextAnnota...", Bpmn2ElementTypes.TextAnnotation_3015); //$NON-NLS-1$ + case DataObjectEditPart.VISUAL_ID: return getImage( - "Navigator?Node?http://www.omg.org/spec/BPMN/20100524/MODEL-XMI?StartEvent", Bpmn2ElementTypes.StartEvent_3003); //$NON-NLS-1$ - case ParallelGatewayEditPart.VISUAL_ID: + "Navigator?TopLevelNode?http://www.omg.org/spec/BPMN/20100524/MODEL-XMI?Da...", Bpmn2ElementTypes.DataObject_2014); //$NON-NLS-1$ + case EndEvent2EditPart.VISUAL_ID: return getImage( - "Navigator?TopLevelNode?http://www.omg.org/spec/BPMN/20100524/MODEL-XMI?Pa...", Bpmn2ElementTypes.ParallelGateway_2006); //$NON-NLS-1$ - case ExclusiveGatewayEditPart.VISUAL_ID: + "Navigator?TopLevelNode?http://www.omg.org/spec/BPMN/20100524/MODEL-XMI?En...", Bpmn2ElementTypes.EndEvent_2008); //$NON-NLS-1$ + case StartEvent2EditPart.VISUAL_ID: return getImage( - "Navigator?TopLevelNode?http://www.omg.org/spec/BPMN/20100524/MODEL-XMI?Ex...", Bpmn2ElementTypes.ExclusiveGateway_2005); //$NON-NLS-1$ - case IntermediateCatchEventEditPart.VISUAL_ID: - return getImage( - "Navigator?TopLevelNode?http://www.omg.org/spec/BPMN/20100524/MODEL-XMI?In...", Bpmn2ElementTypes.IntermediateCatchEvent_2010); //$NON-NLS-1$ + "Navigator?TopLevelNode?http://www.omg.org/spec/BPMN/20100524/MODEL-XMI?St...", Bpmn2ElementTypes.StartEvent_2007); //$NON-NLS-1$ case SubProcessEditPart.VISUAL_ID: return getImage( "Navigator?TopLevelNode?http://www.omg.org/spec/BPMN/20100524/MODEL-XMI?Su...", Bpmn2ElementTypes.SubProcess_2016); //$NON-NLS-1$ - case AssociationEditPart.VISUAL_ID: - return getImage( - "Navigator?Link?http://www.omg.org/spec/BPMN/20100524/MODEL-XMI?Association", Bpmn2ElementTypes.Association_4002); //$NON-NLS-1$ - case EndEvent4EditPart.VISUAL_ID: - return getImage( - "Navigator?Node?http://www.omg.org/spec/BPMN/20100524/MODEL-XMI?EndEvent", Bpmn2ElementTypes.EndEvent_3006); //$NON-NLS-1$ case IntermediateCatchEvent2EditPart.VISUAL_ID: return getImage( "Navigator?TopLevelNode?http://www.omg.org/spec/BPMN/20100524/MODEL-XMI?In...", Bpmn2ElementTypes.IntermediateCatchEvent_2012); //$NON-NLS-1$ - case TextAnnotation2EditPart.VISUAL_ID: + case ExclusiveGateway2EditPart.VISUAL_ID: return getImage( - "Navigator?Node?http://www.omg.org/spec/BPMN/20100524/MODEL-XMI?TextAnnota...", Bpmn2ElementTypes.TextAnnotation_3015); //$NON-NLS-1$ - case IntermediateCatchEvent3EditPart.VISUAL_ID: + "Navigator?Node?http://www.omg.org/spec/BPMN/20100524/MODEL-XMI?ExclusiveG...", Bpmn2ElementTypes.ExclusiveGateway_3007); //$NON-NLS-1$ + case EndEventEditPart.VISUAL_ID: return getImage( - "Navigator?TopLevelNode?http://www.omg.org/spec/BPMN/20100524/MODEL-XMI?In...", Bpmn2ElementTypes.IntermediateCatchEvent_2013); //$NON-NLS-1$ - case IntermediateCatchEvent4EditPart.VISUAL_ID: + "Navigator?TopLevelNode?http://www.omg.org/spec/BPMN/20100524/MODEL-XMI?En...", Bpmn2ElementTypes.EndEvent_2004); //$NON-NLS-1$ + case EndEvent3EditPart.VISUAL_ID: return getImage( - "Navigator?Node?http://www.omg.org/spec/BPMN/20100524/MODEL-XMI?Intermedia...", Bpmn2ElementTypes.IntermediateCatchEvent_3011); //$NON-NLS-1$ - case IntermediateThrowEvent2EditPart.VISUAL_ID: + "Navigator?TopLevelNode?http://www.omg.org/spec/BPMN/20100524/MODEL-XMI?En...", Bpmn2ElementTypes.EndEvent_2009); //$NON-NLS-1$ + case StartEvent4EditPart.VISUAL_ID: return getImage( - "Navigator?Node?http://www.omg.org/spec/BPMN/20100524/MODEL-XMI?Intermedia...", Bpmn2ElementTypes.IntermediateThrowEvent_3012); //$NON-NLS-1$ - case IntermediateThrowEventEditPart.VISUAL_ID: - return getImage( - "Navigator?TopLevelNode?http://www.omg.org/spec/BPMN/20100524/MODEL-XMI?In...", Bpmn2ElementTypes.IntermediateThrowEvent_2011); //$NON-NLS-1$ + "Navigator?Node?http://www.omg.org/spec/BPMN/20100524/MODEL-XMI?StartEvent", Bpmn2ElementTypes.StartEvent_3005); //$NON-NLS-1$ case StartEventEditPart.VISUAL_ID: return getImage( "Navigator?TopLevelNode?http://www.omg.org/spec/BPMN/20100524/MODEL-XMI?St...", Bpmn2ElementTypes.StartEvent_2003); //$NON-NLS-1$ - case UserTaskEditPart.VISUAL_ID: - return getImage( - "Navigator?TopLevelNode?http://www.omg.org/spec/BPMN/20100524/MODEL-XMI?Us...", Bpmn2ElementTypes.UserTask_2001); //$NON-NLS-1$ - case ParallelGateway2EditPart.VISUAL_ID: - return getImage( - "Navigator?Node?http://www.omg.org/spec/BPMN/20100524/MODEL-XMI?ParallelGa...", Bpmn2ElementTypes.ParallelGateway_3008); //$NON-NLS-1$ case IntermediateCatchEvent5EditPart.VISUAL_ID: return getImage( "Navigator?Node?http://www.omg.org/spec/BPMN/20100524/MODEL-XMI?Intermedia...", Bpmn2ElementTypes.IntermediateCatchEvent_3013); //$NON-NLS-1$ - case ScriptTask2EditPart.VISUAL_ID: + case ServiceTaskEditPart.VISUAL_ID: return getImage( - "Navigator?Node?http://www.omg.org/spec/BPMN/20100524/MODEL-XMI?ScriptTask", Bpmn2ElementTypes.ScriptTask_3016); //$NON-NLS-1$ - case StartEvent4EditPart.VISUAL_ID: - return getImage( - "Navigator?Node?http://www.omg.org/spec/BPMN/20100524/MODEL-XMI?StartEvent", Bpmn2ElementTypes.StartEvent_3005); //$NON-NLS-1$ - case EndEvent2EditPart.VISUAL_ID: - return getImage( - "Navigator?TopLevelNode?http://www.omg.org/spec/BPMN/20100524/MODEL-XMI?En...", Bpmn2ElementTypes.EndEvent_2008); //$NON-NLS-1$ + "Navigator?TopLevelNode?http://www.omg.org/spec/BPMN/20100524/MODEL-XMI?Se...", Bpmn2ElementTypes.ServiceTask_2002); //$NON-NLS-1$ case EndEvent6EditPart.VISUAL_ID: return getImage( "Navigator?Node?http://www.omg.org/spec/BPMN/20100524/MODEL-XMI?EndEvent", Bpmn2ElementTypes.EndEvent_3010); //$NON-NLS-1$ - case EndEventEditPart.VISUAL_ID: + case EndEvent4EditPart.VISUAL_ID: return getImage( - "Navigator?TopLevelNode?http://www.omg.org/spec/BPMN/20100524/MODEL-XMI?En...", Bpmn2ElementTypes.EndEvent_2004); //$NON-NLS-1$ - case UserTask2EditPart.VISUAL_ID: - return getImage( - "Navigator?Node?http://www.omg.org/spec/BPMN/20100524/MODEL-XMI?UserTask", Bpmn2ElementTypes.UserTask_3002); //$NON-NLS-1$ + "Navigator?Node?http://www.omg.org/spec/BPMN/20100524/MODEL-XMI?EndEvent", Bpmn2ElementTypes.EndEvent_3006); //$NON-NLS-1$ case TextAnnotationEditPart.VISUAL_ID: return getImage( "Navigator?TopLevelNode?http://www.omg.org/spec/BPMN/20100524/MODEL-XMI?Te...", Bpmn2ElementTypes.TextAnnotation_2015); //$NON-NLS-1$ - case EndEvent3EditPart.VISUAL_ID: + case ExclusiveGatewayEditPart.VISUAL_ID: return getImage( - "Navigator?TopLevelNode?http://www.omg.org/spec/BPMN/20100524/MODEL-XMI?En...", Bpmn2ElementTypes.EndEvent_2009); //$NON-NLS-1$ - case StartEvent2EditPart.VISUAL_ID: + "Navigator?TopLevelNode?http://www.omg.org/spec/BPMN/20100524/MODEL-XMI?Ex...", Bpmn2ElementTypes.ExclusiveGateway_2005); //$NON-NLS-1$ + case DataObject2EditPart.VISUAL_ID: return getImage( - "Navigator?TopLevelNode?http://www.omg.org/spec/BPMN/20100524/MODEL-XMI?St...", Bpmn2ElementTypes.StartEvent_2007); //$NON-NLS-1$ - case ProcessEditPart.VISUAL_ID: + "Navigator?Node?http://www.omg.org/spec/BPMN/20100524/MODEL-XMI?DataObject", Bpmn2ElementTypes.DataObject_3014); //$NON-NLS-1$ + case ScriptTask2EditPart.VISUAL_ID: return getImage( - "Navigator?Diagram?http://www.omg.org/spec/BPMN/20100524/MODEL-XMI?Process", Bpmn2ElementTypes.Process_1000); //$NON-NLS-1$ + "Navigator?Node?http://www.omg.org/spec/BPMN/20100524/MODEL-XMI?ScriptTask", Bpmn2ElementTypes.ScriptTask_3016); //$NON-NLS-1$ + case ServiceTask2EditPart.VISUAL_ID: + return getImage( + "Navigator?Node?http://www.omg.org/spec/BPMN/20100524/MODEL-XMI?ServiceTask", Bpmn2ElementTypes.ServiceTask_3004); //$NON-NLS-1$ + case IntermediateThrowEventEditPart.VISUAL_ID: + return getImage( + "Navigator?TopLevelNode?http://www.omg.org/spec/BPMN/20100524/MODEL-XMI?In...", Bpmn2ElementTypes.IntermediateThrowEvent_2011); //$NON-NLS-1$ case ScriptTaskEditPart.VISUAL_ID: return getImage( "Navigator?TopLevelNode?http://www.omg.org/spec/BPMN/20100524/MODEL-XMI?Sc...", Bpmn2ElementTypes.ScriptTask_2017); //$NON-NLS-1$ - case DataObjectEditPart.VISUAL_ID: + case ProcessEditPart.VISUAL_ID: return getImage( - "Navigator?TopLevelNode?http://www.omg.org/spec/BPMN/20100524/MODEL-XMI?Da...", Bpmn2ElementTypes.DataObject_2014); //$NON-NLS-1$ - case SubProcess2EditPart.VISUAL_ID: + "Navigator?Diagram?http://www.omg.org/spec/BPMN/20100524/MODEL-XMI?Process", Bpmn2ElementTypes.Process_1000); //$NON-NLS-1$ + case IntermediateCatchEventEditPart.VISUAL_ID: return getImage( - "Navigator?Node?http://www.omg.org/spec/BPMN/20100524/MODEL-XMI?SubProcess", Bpmn2ElementTypes.SubProcess_3001); //$NON-NLS-1$ + "Navigator?TopLevelNode?http://www.omg.org/spec/BPMN/20100524/MODEL-XMI?In...", Bpmn2ElementTypes.IntermediateCatchEvent_2010); //$NON-NLS-1$ + case UserTaskEditPart.VISUAL_ID: + return getImage( + "Navigator?TopLevelNode?http://www.omg.org/spec/BPMN/20100524/MODEL-XMI?Us...", Bpmn2ElementTypes.UserTask_2001); //$NON-NLS-1$ case SequenceFlowEditPart.VISUAL_ID: return getImage( "Navigator?Link?http://www.omg.org/spec/BPMN/20100524/MODEL-XMI?SequenceFlow", Bpmn2ElementTypes.SequenceFlow_4001); //$NON-NLS-1$ - case ServiceTaskEditPart.VISUAL_ID: + case ParallelGatewayEditPart.VISUAL_ID: return getImage( - "Navigator?TopLevelNode?http://www.omg.org/spec/BPMN/20100524/MODEL-XMI?Se...", Bpmn2ElementTypes.ServiceTask_2002); //$NON-NLS-1$ - case DataObject2EditPart.VISUAL_ID: + "Navigator?TopLevelNode?http://www.omg.org/spec/BPMN/20100524/MODEL-XMI?Pa...", Bpmn2ElementTypes.ParallelGateway_2006); //$NON-NLS-1$ + case IntermediateCatchEvent4EditPart.VISUAL_ID: return getImage( - "Navigator?Node?http://www.omg.org/spec/BPMN/20100524/MODEL-XMI?DataObject", Bpmn2ElementTypes.DataObject_3014); //$NON-NLS-1$ - case ServiceTask2EditPart.VISUAL_ID: - return getImage( - "Navigator?Node?http://www.omg.org/spec/BPMN/20100524/MODEL-XMI?ServiceTask", Bpmn2ElementTypes.ServiceTask_3004); //$NON-NLS-1$ + "Navigator?Node?http://www.omg.org/spec/BPMN/20100524/MODEL-XMI?Intermedia...", Bpmn2ElementTypes.IntermediateCatchEvent_3011); //$NON-NLS-1$ case EndEvent5EditPart.VISUAL_ID: return getImage( "Navigator?Node?http://www.omg.org/spec/BPMN/20100524/MODEL-XMI?EndEvent", Bpmn2ElementTypes.EndEvent_3009); //$NON-NLS-1$ + case SubProcess2EditPart.VISUAL_ID: + return getImage( + "Navigator?Node?http://www.omg.org/spec/BPMN/20100524/MODEL-XMI?SubProcess", Bpmn2ElementTypes.SubProcess_3001); //$NON-NLS-1$ + case AssociationEditPart.VISUAL_ID: + return getImage( + "Navigator?Link?http://www.omg.org/spec/BPMN/20100524/MODEL-XMI?Association", Bpmn2ElementTypes.Association_4002); //$NON-NLS-1$ + case StartEvent3EditPart.VISUAL_ID: + return getImage( + "Navigator?Node?http://www.omg.org/spec/BPMN/20100524/MODEL-XMI?StartEvent", Bpmn2ElementTypes.StartEvent_3003); //$NON-NLS-1$ + case UserTask2EditPart.VISUAL_ID: + return getImage( + "Navigator?Node?http://www.omg.org/spec/BPMN/20100524/MODEL-XMI?UserTask", Bpmn2ElementTypes.UserTask_3002); //$NON-NLS-1$ + case IntermediateCatchEvent3EditPart.VISUAL_ID: + return getImage( + "Navigator?TopLevelNode?http://www.omg.org/spec/BPMN/20100524/MODEL-XMI?In...", Bpmn2ElementTypes.IntermediateCatchEvent_2013); //$NON-NLS-1$ + case IntermediateThrowEvent2EditPart.VISUAL_ID: + return getImage( + "Navigator?Node?http://www.omg.org/spec/BPMN/20100524/MODEL-XMI?Intermedia...", Bpmn2ElementTypes.IntermediateThrowEvent_3012); //$NON-NLS-1$ + case ParallelGateway2EditPart.VISUAL_ID: + return getImage( + "Navigator?Node?http://www.omg.org/spec/BPMN/20100524/MODEL-XMI?ParallelGa...", Bpmn2ElementTypes.ParallelGateway_3008); //$NON-NLS-1$ } return getImage("Navigator?UnknownElement", null); //$NON-NLS-1$ } @@ -251,8 +252,8 @@ * @generated */ private Image getImage(String key, IElementType elementType) { - ImageRegistry imageRegistry = Bpmn2DiagramEditorPlugin.getInstance() - .getImageRegistry(); + ImageRegistry imageRegistry = Bpmn2ProcessDiagramEditorPlugin + .getInstance().getImageRegistry(); Image image = imageRegistry.get(key); if (image == null && elementType != null && Bpmn2ElementTypes.isKnownElementType(elementType)) { @@ -295,78 +296,78 @@ return getUnresolvedDomainElementProxyText(view); } switch (Bpmn2VisualIDRegistry.getVisualID(view)) { - case ExclusiveGateway2EditPart.VISUAL_ID: - return getExclusiveGateway_3007Text(view); - case StartEvent3EditPart.VISUAL_ID: - return getStartEvent_3003Text(view); - case ParallelGatewayEditPart.VISUAL_ID: - return getParallelGateway_2006Text(view); - case ExclusiveGatewayEditPart.VISUAL_ID: - return getExclusiveGateway_2005Text(view); - case IntermediateCatchEventEditPart.VISUAL_ID: - return getIntermediateCatchEvent_2010Text(view); + case TextAnnotation2EditPart.VISUAL_ID: + return getTextAnnotation_3015Text(view); + case DataObjectEditPart.VISUAL_ID: + return getDataObject_2014Text(view); + case EndEvent2EditPart.VISUAL_ID: + return getEndEvent_2008Text(view); + case StartEvent2EditPart.VISUAL_ID: + return getStartEvent_2007Text(view); case SubProcessEditPart.VISUAL_ID: return getSubProcess_2016Text(view); - case AssociationEditPart.VISUAL_ID: - return getAssociation_4002Text(view); - case EndEvent4EditPart.VISUAL_ID: - return getEndEvent_3006Text(view); case IntermediateCatchEvent2EditPart.VISUAL_ID: return getIntermediateCatchEvent_2012Text(view); - case TextAnnotation2EditPart.VISUAL_ID: - return getTextAnnotation_3015Text(view); - case IntermediateCatchEvent3EditPart.VISUAL_ID: - return getIntermediateCatchEvent_2013Text(view); - case IntermediateCatchEvent4EditPart.VISUAL_ID: - return getIntermediateCatchEvent_3011Text(view); - case IntermediateThrowEvent2EditPart.VISUAL_ID: - return getIntermediateThrowEvent_3012Text(view); - case IntermediateThrowEventEditPart.VISUAL_ID: - return getIntermediateThrowEvent_2011Text(view); + case ExclusiveGateway2EditPart.VISUAL_ID: + return getExclusiveGateway_3007Text(view); + case EndEventEditPart.VISUAL_ID: + return getEndEvent_2004Text(view); + case EndEvent3EditPart.VISUAL_ID: + return getEndEvent_2009Text(view); + case StartEvent4EditPart.VISUAL_ID: + return getStartEvent_3005Text(view); case StartEventEditPart.VISUAL_ID: return getStartEvent_2003Text(view); - case UserTaskEditPart.VISUAL_ID: - return getUserTask_2001Text(view); - case ParallelGateway2EditPart.VISUAL_ID: - return getParallelGateway_3008Text(view); case IntermediateCatchEvent5EditPart.VISUAL_ID: return getIntermediateCatchEvent_3013Text(view); - case ScriptTask2EditPart.VISUAL_ID: - return getScriptTask_3016Text(view); - case StartEvent4EditPart.VISUAL_ID: - return getStartEvent_3005Text(view); - case EndEvent2EditPart.VISUAL_ID: - return getEndEvent_2008Text(view); + case ServiceTaskEditPart.VISUAL_ID: + return getServiceTask_2002Text(view); case EndEvent6EditPart.VISUAL_ID: return getEndEvent_3010Text(view); - case EndEventEditPart.VISUAL_ID: - return getEndEvent_2004Text(view); - case UserTask2EditPart.VISUAL_ID: - return getUserTask_3002Text(view); + case EndEvent4EditPart.VISUAL_ID: + return getEndEvent_3006Text(view); case TextAnnotationEditPart.VISUAL_ID: return getTextAnnotation_2015Text(view); - case EndEvent3EditPart.VISUAL_ID: - return getEndEvent_2009Text(view); - case StartEvent2EditPart.VISUAL_ID: - return getStartEvent_2007Text(view); + case ExclusiveGatewayEditPart.VISUAL_ID: + return getExclusiveGateway_2005Text(view); + case DataObject2EditPart.VISUAL_ID: + return getDataObject_3014Text(view); + case ScriptTask2EditPart.VISUAL_ID: + return getScriptTask_3016Text(view); + case ServiceTask2EditPart.VISUAL_ID: + return getServiceTask_3004Text(view); + case IntermediateThrowEventEditPart.VISUAL_ID: + return getIntermediateThrowEvent_2011Text(view); + case ScriptTaskEditPart.VISUAL_ID: + return getScriptTask_2017Text(view); case ProcessEditPart.VISUAL_ID: return getProcess_1000Text(view); - case ScriptTaskEditPart.VISUAL_ID: - return getScriptTask_2017Text(view); - case DataObjectEditPart.VISUAL_ID: - return getDataObject_2014Text(view); - case SubProcess2EditPart.VISUAL_ID: - return getSubProcess_3001Text(view); + case IntermediateCatchEventEditPart.VISUAL_ID: + return getIntermediateCatchEvent_2010Text(view); + case UserTaskEditPart.VISUAL_ID: + return getUserTask_2001Text(view); case SequenceFlowEditPart.VISUAL_ID: return getSequenceFlow_4001Text(view); - case ServiceTaskEditPart.VISUAL_ID: - return getServiceTask_2002Text(view); - case DataObject2EditPart.VISUAL_ID: - return getDataObject_3014Text(view); - case ServiceTask2EditPart.VISUAL_ID: - return getServiceTask_3004Text(view); + case ParallelGatewayEditPart.VISUAL_ID: + return getParallelGateway_2006Text(view); + case IntermediateCatchEvent4EditPart.VISUAL_ID: + return getIntermediateCatchEvent_3011Text(view); case EndEvent5EditPart.VISUAL_ID: return getEndEvent_3009Text(view); + case SubProcess2EditPart.VISUAL_ID: + return getSubProcess_3001Text(view); + case AssociationEditPart.VISUAL_ID: + return getAssociation_4002Text(view); + case StartEvent3EditPart.VISUAL_ID: + return getStartEvent_3003Text(view); + case UserTask2EditPart.VISUAL_ID: + return getUserTask_3002Text(view); + case IntermediateCatchEvent3EditPart.VISUAL_ID: + return getIntermediateCatchEvent_2013Text(view); + case IntermediateThrowEvent2EditPart.VISUAL_ID: + return getIntermediateThrowEvent_3012Text(view); + case ParallelGateway2EditPart.VISUAL_ID: + return getParallelGateway_3008Text(view); } return getUnknownElementText(view); } @@ -380,7 +381,7 @@ if (domainModelElement != null) { return domainModelElement.getName(); } else { - Bpmn2DiagramEditorPlugin.getInstance().logError( + Bpmn2ProcessDiagramEditorPlugin.getInstance().logError( "No domain element for view with visualID = " + 2010); //$NON-NLS-1$ return ""; //$NON-NLS-1$ } @@ -400,7 +401,7 @@ view.getElement() != null ? view.getElement() : view), ParserOptions.NONE.intValue()); } else { - Bpmn2DiagramEditorPlugin.getInstance().logError( + Bpmn2ProcessDiagramEditorPlugin.getInstance().logError( "Parser was not found for label " + 5009); //$NON-NLS-1$ return ""; //$NON-NLS-1$ } @@ -414,7 +415,7 @@ if (domainModelElement != null) { return domainModelElement.getName(); } else { - Bpmn2DiagramEditorPlugin.getInstance().logError( + Bpmn2ProcessDiagramEditorPlugin.getInstance().logError( "No domain element for view with visualID = " + 2009); //$NON-NLS-1$ return ""; //$NON-NLS-1$ } @@ -429,7 +430,7 @@ if (domainModelElement != null) { return domainModelElement.getName(); } else { - Bpmn2DiagramEditorPlugin.getInstance().logError( + Bpmn2ProcessDiagramEditorPlugin.getInstance().logError( "No domain element for view with visualID = " + 2012); //$NON-NLS-1$ return ""; //$NON-NLS-1$ } @@ -449,7 +450,7 @@ view.getElement() != null ? view.getElement() : view), ParserOptions.NONE.intValue()); } else { - Bpmn2DiagramEditorPlugin.getInstance().logError( + Bpmn2ProcessDiagramEditorPlugin.getInstance().logError( "Parser was not found for label " + 5003); //$NON-NLS-1$ return ""; //$NON-NLS-1$ } @@ -464,7 +465,7 @@ if (domainModelElement != null) { return domainModelElement.getName(); } else { - Bpmn2DiagramEditorPlugin.getInstance().logError( + Bpmn2ProcessDiagramEditorPlugin.getInstance().logError( "No domain element for view with visualID = " + 3011); //$NON-NLS-1$ return ""; //$NON-NLS-1$ } @@ -478,7 +479,7 @@ if (domainModelElement != null) { return domainModelElement.getName(); } else { - Bpmn2DiagramEditorPlugin.getInstance().logError( + Bpmn2ProcessDiagramEditorPlugin.getInstance().logError( "No domain element for view with visualID = " + 2007); //$NON-NLS-1$ return ""; //$NON-NLS-1$ } @@ -493,7 +494,7 @@ if (domainModelElement != null) { return domainModelElement.getName(); } else { - Bpmn2DiagramEditorPlugin.getInstance().logError( + Bpmn2ProcessDiagramEditorPlugin.getInstance().logError( "No domain element for view with visualID = " + 3013); //$NON-NLS-1$ return ""; //$NON-NLS-1$ } @@ -508,7 +509,7 @@ if (domainModelElement != null) { return domainModelElement.getName(); } else { - Bpmn2DiagramEditorPlugin.getInstance().logError( + Bpmn2ProcessDiagramEditorPlugin.getInstance().logError( "No domain element for view with visualID = " + 3008); //$NON-NLS-1$ return ""; //$NON-NLS-1$ } @@ -523,7 +524,7 @@ if (domainModelElement != null) { return domainModelElement.getName(); } else { - Bpmn2DiagramEditorPlugin.getInstance().logError( + Bpmn2ProcessDiagramEditorPlugin.getInstance().logError( "No domain element for view with visualID = " + 2006); //$NON-NLS-1$ return ""; //$NON-NLS-1$ } @@ -538,7 +539,7 @@ if (domainModelElement != null) { return domainModelElement.getName(); } else { - Bpmn2DiagramEditorPlugin.getInstance().logError( + Bpmn2ProcessDiagramEditorPlugin.getInstance().logError( "No domain element for view with visualID = " + 3012); //$NON-NLS-1$ return ""; //$NON-NLS-1$ } @@ -558,7 +559,7 @@ view.getElement() != null ? view.getElement() : view), ParserOptions.NONE.intValue()); } else { - Bpmn2DiagramEditorPlugin.getInstance().logError( + Bpmn2ProcessDiagramEditorPlugin.getInstance().logError( "Parser was not found for label " + 5004); //$NON-NLS-1$ return ""; //$NON-NLS-1$ } @@ -573,7 +574,7 @@ if (domainModelElement != null) { return domainModelElement.getName(); } else { - Bpmn2DiagramEditorPlugin.getInstance().logError( + Bpmn2ProcessDiagramEditorPlugin.getInstance().logError( "No domain element for view with visualID = " + 3007); //$NON-NLS-1$ return ""; //$NON-NLS-1$ } @@ -588,7 +589,7 @@ if (domainModelElement != null) { return domainModelElement.getName(); } else { - Bpmn2DiagramEditorPlugin.getInstance().logError( + Bpmn2ProcessDiagramEditorPlugin.getInstance().logError( "No domain element for view with visualID = " + 2005); //$NON-NLS-1$ return ""; //$NON-NLS-1$ } @@ -608,7 +609,7 @@ view.getElement() != null ? view.getElement() : view), ParserOptions.NONE.intValue()); } else { - Bpmn2DiagramEditorPlugin.getInstance().logError( + Bpmn2ProcessDiagramEditorPlugin.getInstance().logError( "Parser was not found for label " + 5010); //$NON-NLS-1$ return ""; //$NON-NLS-1$ } @@ -622,7 +623,7 @@ if (domainModelElement != null) { return domainModelElement.getName(); } else { - Bpmn2DiagramEditorPlugin.getInstance().logError( + Bpmn2ProcessDiagramEditorPlugin.getInstance().logError( "No domain element for view with visualID = " + 1000); //$NON-NLS-1$ return ""; //$NON-NLS-1$ } @@ -636,7 +637,7 @@ if (domainModelElement != null) { return domainModelElement.getName(); } else { - Bpmn2DiagramEditorPlugin.getInstance().logError( + Bpmn2ProcessDiagramEditorPlugin.getInstance().logError( "No domain element for view with visualID = " + 2008); //$NON-NLS-1$ return ""; //$NON-NLS-1$ } @@ -651,7 +652,7 @@ if (domainModelElement != null) { return domainModelElement.getName(); } else { - Bpmn2DiagramEditorPlugin.getInstance().logError( + Bpmn2ProcessDiagramEditorPlugin.getInstance().logError( "No domain element for view with visualID = " + 2011); //$NON-NLS-1$ return ""; //$NON-NLS-1$ } @@ -665,7 +666,7 @@ if (domainModelElement != null) { return domainModelElement.getName(); } else { - Bpmn2DiagramEditorPlugin.getInstance().logError( + Bpmn2ProcessDiagramEditorPlugin.getInstance().logError( "No domain element for view with visualID = " + 2016); //$NON-NLS-1$ return ""; //$NON-NLS-1$ } @@ -679,7 +680,7 @@ if (domainModelElement != null) { return domainModelElement.getName(); } else { - Bpmn2DiagramEditorPlugin.getInstance().logError( + Bpmn2ProcessDiagramEditorPlugin.getInstance().logError( "No domain element for view with visualID = " + 3010); //$NON-NLS-1$ return ""; //$NON-NLS-1$ } @@ -698,7 +699,7 @@ view.getElement() != null ? view.getElement() : view), ParserOptions.NONE.intValue()); } else { - Bpmn2DiagramEditorPlugin.getInstance().logError( + Bpmn2ProcessDiagramEditorPlugin.getInstance().logError( "Parser was not found for label " + 5001); //$NON-NLS-1$ return ""; //$NON-NLS-1$ } @@ -718,7 +719,7 @@ view.getElement() != null ? view.getElement() : view), ParserOptions.NONE.intValue()); } else { - Bpmn2DiagramEditorPlugin.getInstance().logError( + Bpmn2ProcessDiagramEditorPlugin.getInstance().logError( "Parser was not found for label " + 5007); //$NON-NLS-1$ return ""; //$NON-NLS-1$ } @@ -732,7 +733,7 @@ if (domainModelElement != null) { return domainModelElement.getName(); } else { - Bpmn2DiagramEditorPlugin.getInstance().logError( + Bpmn2ProcessDiagramEditorPlugin.getInstance().logError( "No domain element for view with visualID = " + 2004); //$NON-NLS-1$ return ""; //$NON-NLS-1$ } @@ -752,7 +753,7 @@ view.getElement() != null ? view.getElement() : view), ParserOptions.NONE.intValue()); } else { - Bpmn2DiagramEditorPlugin.getInstance().logError( + Bpmn2ProcessDiagramEditorPlugin.getInstance().logError( "Parser was not found for label " + 5008); //$NON-NLS-1$ return ""; //$NON-NLS-1$ } @@ -766,7 +767,7 @@ if (domainModelElement != null) { return domainModelElement.getName(); } else { - Bpmn2DiagramEditorPlugin.getInstance().logError( + Bpmn2ProcessDiagramEditorPlugin.getInstance().logError( "No domain element for view with visualID = " + 3003); //$NON-NLS-1$ return ""; //$NON-NLS-1$ } @@ -786,7 +787,7 @@ view.getElement() != null ? view.getElement() : view), ParserOptions.NONE.intValue()); } else { - Bpmn2DiagramEditorPlugin.getInstance().logError( + Bpmn2ProcessDiagramEditorPlugin.getInstance().logError( "Parser was not found for label " + 5006); //$NON-NLS-1$ return ""; //$NON-NLS-1$ } @@ -800,7 +801,7 @@ if (domainModelElement != null) { return domainModelElement.getName(); } else { - Bpmn2DiagramEditorPlugin.getInstance().logError( + Bpmn2ProcessDiagramEditorPlugin.getInstance().logError( "No domain element for view with visualID = " + 3001); //$NON-NLS-1$ return ""; //$NON-NLS-1$ } @@ -814,7 +815,7 @@ if (domainModelElement != null) { return domainModelElement.getName(); } else { - Bpmn2DiagramEditorPlugin.getInstance().logError( + Bpmn2ProcessDiagramEditorPlugin.getInstance().logError( "No domain element for view with visualID = " + 3005); //$NON-NLS-1$ return ""; //$NON-NLS-1$ } @@ -828,7 +829,7 @@ if (domainModelElement != null) { return domainModelElement.getName(); } else { - Bpmn2DiagramEditorPlugin.getInstance().logError( + Bpmn2ProcessDiagramEditorPlugin.getInstance().logError( "No domain element for view with visualID = " + 4001); //$NON-NLS-1$ return ""; //$NON-NLS-1$ } @@ -842,7 +843,7 @@ if (domainModelElement != null) { return domainModelElement.getName(); } else { - Bpmn2DiagramEditorPlugin.getInstance().logError( + Bpmn2ProcessDiagramEditorPlugin.getInstance().logError( "No domain element for view with visualID = " + 2003); //$NON-NLS-1$ return ""; //$NON-NLS-1$ } @@ -861,7 +862,7 @@ view.getElement() != null ? view.getElement() : view), ParserOptions.NONE.intValue()); } else { - Bpmn2DiagramEditorPlugin.getInstance().logError( + Bpmn2ProcessDiagramEditorPlugin.getInstance().logError( "Parser was not found for label " + 5005); //$NON-NLS-1$ return ""; //$NON-NLS-1$ } @@ -875,7 +876,7 @@ if (domainModelElement != null) { return domainModelElement.getName(); } else { - Bpmn2DiagramEditorPlugin.getInstance().logError( + Bpmn2ProcessDiagramEditorPlugin.getInstance().logError( "No domain element for view with visualID = " + 3009); //$NON-NLS-1$ return ""; //$NON-NLS-1$ } @@ -889,7 +890,7 @@ if (domainModelElement != null) { return domainModelElement.getId(); } else { - Bpmn2DiagramEditorPlugin.getInstance().logError( + Bpmn2ProcessDiagramEditorPlugin.getInstance().logError( "No domain element for view with visualID = " + 4002); //$NON-NLS-1$ return ""; //$NON-NLS-1$ } @@ -903,7 +904,7 @@ if (domainModelElement != null) { return domainModelElement.getName(); } else { - Bpmn2DiagramEditorPlugin.getInstance().logError( + Bpmn2ProcessDiagramEditorPlugin.getInstance().logError( "No domain element for view with visualID = " + 3006); //$NON-NLS-1$ return ""; //$NON-NLS-1$ } @@ -923,7 +924,7 @@ view.getElement() != null ? view.getElement() : view), ParserOptions.NONE.intValue()); } else { - Bpmn2DiagramEditorPlugin.getInstance().logError( + Bpmn2ProcessDiagramEditorPlugin.getInstance().logError( "Parser was not found for label " + 5002); //$NON-NLS-1$ return ""; //$NON-NLS-1$ } @@ -938,7 +939,7 @@ if (domainModelElement != null) { return domainModelElement.getName(); } else { - Bpmn2DiagramEditorPlugin.getInstance().logError( + Bpmn2ProcessDiagramEditorPlugin.getInstance().logError( "No domain element for view with visualID = " + 2013); //$NON-NLS-1$ return ""; //$NON-NLS-1$ } Modified: trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/navigator/Bpmn2NavigatorLinkHelper.java =================================================================== --- trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/navigator/Bpmn2NavigatorLinkHelper.java 2011-02-09 09:42:57 UTC (rev 29073) +++ trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/navigator/Bpmn2NavigatorLinkHelper.java 2011-02-09 09:46:27 UTC (rev 29074) @@ -22,6 +22,7 @@ import org.eclipse.ui.navigator.ILinkHelper; import org.eclipse.ui.part.FileEditorInput; import org.jboss.tools.bpmn2.process.diagram.part.Bpmn2DiagramEditorPlugin; +import org.jboss.tools.bpmn2.process.diagram.part.Bpmn2ProcessDiagramEditorPlugin; /** * @generated @@ -53,8 +54,9 @@ * @generated */ public IStructuredSelection findSelection(IEditorInput anInput) { - IDiagramDocument document = Bpmn2DiagramEditorPlugin.getInstance() - .getDocumentProvider().getDiagramDocument(anInput); + IDiagramDocument document = Bpmn2ProcessDiagramEditorPlugin + .getInstance().getDocumentProvider() + .getDiagramDocument(anInput); if (document == null) { return StructuredSelection.EMPTY; } Modified: trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/parsers/AbstractParser.java =================================================================== --- trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/parsers/AbstractParser.java 2011-02-09 09:42:57 UTC (rev 29073) +++ trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/parsers/AbstractParser.java 2011-02-09 09:46:27 UTC (rev 29074) @@ -23,6 +23,7 @@ import org.eclipse.jface.text.contentassist.IContentAssistProcessor; import org.eclipse.osgi.util.NLS; import org.jboss.tools.bpmn2.process.diagram.part.Bpmn2DiagramEditorPlugin; +import org.jboss.tools.bpmn2.process.diagram.part.Bpmn2ProcessDiagramEditorPlugin; import org.jboss.tools.bpmn2.process.diagram.part.Messages; /** @@ -234,7 +235,7 @@ for (int i = 0; i < values.length; i++) { Object value = getValidNewValue(editableFeatures[i], values[i]); if (value instanceof InvalidValue) { - return new ParserEditStatus(Bpmn2DiagramEditorPlugin.ID, + return new ParserEditStatus(Bpmn2ProcessDiagramEditorPlugin.ID, IParserEditStatus.UNEDITABLE, value.toString()); } } Modified: trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/parsers/MessageFormatParser.java =================================================================== --- trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/parsers/MessageFormatParser.java 2011-02-09 09:42:57 UTC (rev 29073) +++ trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/parsers/MessageFormatParser.java 2011-02-09 09:46:27 UTC (rev 29074) @@ -12,6 +12,7 @@ import org.eclipse.gmf.runtime.common.ui.services.parser.ParserEditStatus; import org.eclipse.osgi.util.NLS; import org.jboss.tools.bpmn2.process.diagram.part.Bpmn2DiagramEditorPlugin; +import org.jboss.tools.bpmn2.process.diagram.part.Bpmn2ProcessDiagramEditorPlugin; import org.jboss.tools.bpmn2.process.diagram.part.Messages; /** @@ -174,7 +175,7 @@ ParsePosition pos = new ParsePosition(0); Object[] values = getEditProcessor().parse(editString, pos); if (values == null) { - return new ParserEditStatus(Bpmn2DiagramEditorPlugin.ID, + return new ParserEditStatus(Bpmn2ProcessDiagramEditorPlugin.ID, IParserEditStatus.UNEDITABLE, NLS.bind( Messages.MessageFormatParser_InvalidInputError, new Integer(pos.getErrorIndex()))); Modified: trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/part/Bpmn2CreationWizard.java =================================================================== --- trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/part/Bpmn2CreationWizard.java 2011-02-09 09:42:57 UTC (rev 29073) +++ trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/part/Bpmn2CreationWizard.java 2011-02-09 09:46:27 UTC (rev 29074) @@ -87,7 +87,7 @@ this.workbench = workbench; this.selection = selection; setWindowTitle(Messages.Bpmn2CreationWizardTitle); - setDefaultPageImageDescriptor(Bpmn2DiagramEditorPlugin + setDefaultPageImageDescriptor(Bpmn2ProcessDiagramEditorPlugin .getBundledImageDescriptor("icons/wizban/NewBpmn2Wizard.gif")); //$NON-NLS-1$ setNeedsProgressMonitor(true); } @@ -136,7 +136,7 @@ Messages.Bpmn2CreationWizardCreationError, null, ((CoreException) e.getTargetException()).getStatus()); } else { - Bpmn2DiagramEditorPlugin.getInstance().logError( + Bpmn2ProcessDiagramEditorPlugin.getInstance().logError( "Error creating diagram", e.getTargetException()); //$NON-NLS-1$ } return false; Modified: trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/part/Bpmn2DiagramEditor.java =================================================================== --- trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/part/Bpmn2DiagramEditor.java 2011-02-09 09:42:57 UTC (rev 29073) +++ trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/part/Bpmn2DiagramEditor.java 2011-02-09 09:46:27 UTC (rev 29074) @@ -92,14 +92,14 @@ * @generated */ protected PreferencesHint getPreferencesHint() { - return Bpmn2DiagramEditorPlugin.DIAGRAM_PREFERENCES_HINT; + return Bpmn2ProcessDiagramEditorPlugin.DIAGRAM_PREFERENCES_HINT; } /** * @generated */ public String getContributorId() { - return Bpmn2DiagramEditorPlugin.ID; + return Bpmn2ProcessDiagramEditorPlugin.ID; } /** @@ -122,14 +122,15 @@ } return super.getAdapter(type); } - + /** * @generated */ protected IDocumentProvider getDocumentProvider(IEditorInput input) { if (input instanceof IFileEditorInput || input instanceof URIEditorInput) { - return Bpmn2DiagramEditorPlugin.getInstance().getDocumentProvider(); + return Bpmn2ProcessDiagramEditorPlugin.getInstance() + .getDocumentProvider(); } return super.getDocumentProvider(input); } @@ -152,7 +153,7 @@ protected void setDocumentProvider(IEditorInput input) { if (input instanceof IFileEditorInput || input instanceof URIEditorInput) { - setDocumentProvider(Bpmn2DiagramEditorPlugin.getInstance() + setDocumentProvider(Bpmn2ProcessDiagramEditorPlugin.getInstance() .getDocumentProvider()); } else { super.setDocumentProvider(input); @@ -297,8 +298,9 @@ getSite().registerContextMenu(ActionIds.DIAGRAM_EDITOR_CONTEXT_MENU, provider, getDiagramGraphicalViewer()); } - + private FormToolkit formToolkit; + public FormToolkit getFormToolkit() { if (formToolkit == null) { formToolkit = new FormToolkit(getSite().getShell().getDisplay()); Modified: trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/part/Bpmn2DiagramEditorUtil.java =================================================================== --- trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/part/Bpmn2DiagramEditorUtil.java 2011-02-09 09:42:57 UTC (rev 29073) +++ trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/part/Bpmn2DiagramEditorUtil.java 2011-02-09 09:46:27 UTC (rev 29074) @@ -110,7 +110,7 @@ try { file.setCharset("UTF-8", new NullProgressMonitor()); //$NON-NLS-1$ } catch (CoreException e) { - Bpmn2DiagramEditorPlugin.getInstance().logError( + Bpmn2ProcessDiagramEditorPlugin.getInstance().logError( "Unable to set charset for file " + file.getFullPath(), e); //$NON-NLS-1$ } } @@ -149,7 +149,7 @@ * @generated */ public static void runWizard(Shell shell, Wizard wizard, String settingsKey) { - IDialogSettings pluginDialogSettings = Bpmn2DiagramEditorPlugin + IDialogSettings pluginDialogSettings = Bpmn2ProcessDiagramEditorPlugin .getInstance().getDialogSettings(); IDialogSettings wizardDialogSettings = pluginDialogSettings .getSection(settingsKey); Modified: trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/part/Bpmn2DocumentProvider.java =================================================================== --- trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/part/Bpmn2DocumentProvider.java 2011-02-09 09:42:57 UTC (rev 29073) +++ trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/part/Bpmn2DocumentProvider.java 2011-02-09 09:46:27 UTC (rev 29074) @@ -70,7 +70,7 @@ throw new CoreException( new Status( IStatus.ERROR, - Bpmn2DiagramEditorPlugin.ID, + Bpmn2ProcessDiagramEditorPlugin.ID, 0, NLS.bind( Messages.Bpmn2DocumentProvider_IncorrectInputError, @@ -97,7 +97,7 @@ throw new CoreException( new Status( IStatus.ERROR, - Bpmn2DiagramEditorPlugin.ID, + Bpmn2ProcessDiagramEditorPlugin.ID, 0, NLS.bind( Messages.Bpmn2DocumentProvider_IncorrectInputError, @@ -160,7 +160,8 @@ private TransactionalEditingDomain createEditingDomain() { TransactionalEditingDomain editingDomain = DiagramEditingDomainFactory .getInstance().createEditingDomain(); - editingDomain.setID("org.eclipse.bpmn2.diagram.EditingDomain"); //$NON-NLS-1$ + editingDomain + .setID("org.jboss.tools.bpmn2.process.diagram.EditingDomain"); //$NON-NLS-1$ final NotificationFilter diagramResourceModifiedFilter = NotificationFilter .createNotifierFilter(editingDomain.getResourceSet()) .and(NotificationFilter.createEventTypeFilter(Notification.ADD)) @@ -257,7 +258,7 @@ thrownExcp = new CoreException( new Status( IStatus.ERROR, - Bpmn2DiagramEditorPlugin.ID, + Bpmn2ProcessDiagramEditorPlugin.ID, 0, msg != null ? msg : Messages.Bpmn2DocumentProvider_DiagramLoadingError, @@ -269,7 +270,7 @@ throw new CoreException( new Status( IStatus.ERROR, - Bpmn2DiagramEditorPlugin.ID, + Bpmn2ProcessDiagramEditorPlugin.ID, 0, NLS.bind( Messages.Bpmn2DocumentProvider_IncorrectInputError, @@ -359,7 +360,7 @@ try { updateCache(element); } catch (CoreException ex) { - Bpmn2DiagramEditorPlugin.getInstance().logError( + Bpmn2ProcessDiagramEditorPlugin.getInstance().logError( Messages.Bpmn2DocumentProvider_isModifiable, ex); // Error message to log was initially taken from org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide.internal.l10n.EditorMessages.StorageDocumentProvider_isModifiable } @@ -385,7 +386,7 @@ try { updateCache(element); } catch (CoreException ex) { - Bpmn2DiagramEditorPlugin.getInstance().logError( + Bpmn2ProcessDiagramEditorPlugin.getInstance().logError( Messages.Bpmn2DocumentProvider_isModifiable, ex); // Error message to log was initially taken from org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide.internal.l10n.EditorMessages.StorageDocumentProvider_isModifiable } @@ -583,7 +584,7 @@ throw new CoreException( new Status( IStatus.ERROR, - Bpmn2DiagramEditorPlugin.ID, + Bpmn2ProcessDiagramEditorPlugin.ID, IResourceStatus.OUT_OF_SYNC_LOCAL, Messages.Bpmn2DocumentProvider_UnsynchronizedFileSaveError, null)); @@ -609,7 +610,7 @@ } catch (IOException e) { fireElementStateChangeFailed(element); throw new CoreException(new Status(IStatus.ERROR, - Bpmn2DiagramEditorPlugin.ID, + Bpmn2ProcessDiagramEditorPlugin.ID, EditorStatusCodes.RESOURCE_FAILURE, e.getLocalizedMessage(), null)); } @@ -639,7 +640,7 @@ throw new CoreException( new Status( IStatus.ERROR, - Bpmn2DiagramEditorPlugin.ID, + Bpmn2ProcessDiagramEditorPlugin.ID, 0, NLS.bind( Messages.Bpmn2DocumentProvider_IncorrectInputError, @@ -653,7 +654,7 @@ throw new CoreException( new Status( IStatus.ERROR, - Bpmn2DiagramEditorPlugin.ID, + Bpmn2ProcessDiagramEditorPlugin.ID, 0, "Incorrect document used: " + document + " instead of org.eclipse.gmf.runtime.diagram.ui.resources.editor.document.IDiagramDocument", null)); //$NON-NLS-1$ //$NON-NLS-2$ } @@ -678,12 +679,12 @@ } catch (ExecutionException e) { fireElementStateChangeFailed(element); throw new CoreException(new Status(IStatus.ERROR, - Bpmn2DiagramEditorPlugin.ID, 0, + Bpmn2ProcessDiagramEditorPlugin.ID, 0, e.getLocalizedMessage(), null)); } catch (IOException e) { fireElementStateChangeFailed(element); throw new CoreException(new Status(IStatus.ERROR, - Bpmn2DiagramEditorPlugin.ID, 0, + Bpmn2ProcessDiagramEditorPlugin.ID, 0, e.getLocalizedMessage(), null)); } newResource.unload(); @@ -700,7 +701,7 @@ try { file.refreshLocal(IResource.DEPTH_INFINITE, monitor); } catch (CoreException ex) { - Bpmn2DiagramEditorPlugin + Bpmn2ProcessDiagramEditorPlugin .getInstance() .logError( Messages.Bpmn2DocumentProvider_handleElementContentChanged, Modified: trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/part/Bpmn2InitDiagramFileAction.java =================================================================== --- trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/part/Bpmn2InitDiagramFileAction.java 2011-02-09 09:42:57 UTC (rev 29073) +++ trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/part/Bpmn2InitDiagramFileAction.java 2011-02-09 09:46:27 UTC (rev 29074) @@ -78,7 +78,7 @@ Resource resource = resourceSet.getResource(domainModelURI, true); diagramRoot = (EObject) resource.getContents().get(0); } catch (WrappedException ex) { - Bpmn2DiagramEditorPlugin.getInstance().logError( + Bpmn2ProcessDiagramEditorPlugin.getInstance().logError( "Unable to load resource: " + domainModelURI, ex); //$NON-NLS-1$ } if (diagramRoot == null) { Modified: trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/part/Bpmn2NewDiagramFileWizard.java =================================================================== --- trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/part/Bpmn2NewDiagramFileWizard.java 2011-02-09 09:42:57 UTC (rev 29073) +++ trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/part/Bpmn2NewDiagramFileWizard.java 2011-02-09 09:46:27 UTC (rev 29074) @@ -130,10 +130,12 @@ return CommandResult .newErrorCommandResult(Messages.Bpmn2NewDiagramFileWizard_IncorrectRootError); } - Diagram diagram = ViewService.createDiagram( - diagramRootElementSelectionPage.getModelElement(), - ProcessEditPart.MODEL_ID, - Bpmn2DiagramEditorPlugin.DIAGRAM_PREFERENCES_HINT); + Diagram diagram = ViewService + .createDiagram( + diagramRootElementSelectionPage + .getModelElement(), + ProcessEditPart.MODEL_ID, + Bpmn2ProcessDiagramEditorPlugin.DIAGRAM_PREFERENCES_HINT); diagramResource.getContents().add(diagram); diagramResource.getContents().add(diagram.getElement()); return CommandResult.newOKCommandResult(); @@ -145,13 +147,13 @@ diagramResource.save(Bpmn2DiagramEditorUtil.getSaveOptions()); Bpmn2DiagramEditorUtil.openDiagram(diagramResource); } catch (ExecutionException e) { - Bpmn2DiagramEditorPlugin.getInstance().logError( + Bpmn2ProcessDiagramEditorPlugin.getInstance().logError( "Unable to create model and diagram", e); //$NON-NLS-1$ } catch (IOException ex) { - Bpmn2DiagramEditorPlugin.getInstance().logError( + Bpmn2ProcessDiagramEditorPlugin.getInstance().logError( "Save operation failed for: " + diagramModelURI, ex); //$NON-NLS-1$ } catch (PartInitException ex) { - Bpmn2DiagramEditorPlugin.getInstance().logError( + Bpmn2ProcessDiagramEditorPlugin.getInstance().logError( "Unable to open editor", ex); //$NON-NLS-1$ } return true; @@ -185,10 +187,13 @@ setErrorMessage(Messages.Bpmn2NewDiagramFileWizard_RootSelectionPageNoSelectionMessage); return false; } - boolean result = ViewService.getInstance().provides( - new CreateDiagramViewOperation(new EObjectAdapter( - selectedModelElement), ProcessEditPart.MODEL_ID, - Bpmn2DiagramEditorPlugin.DIAGRAM_PREFERENCES_HINT)); + boolean result = ViewService + .getInstance() + .provides( + new CreateDiagramViewOperation( + new EObjectAdapter(selectedModelElement), + ProcessEditPart.MODEL_ID, + Bpmn2ProcessDiagramEditorPlugin.DIAGRAM_PREFERENCES_HINT)); setErrorMessage(result ? null : Messages.Bpmn2NewDiagramFileWizard_RootSelectionPageInvalidSelectionMessage); return result; Modified: trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/part/Bpmn2PaletteFactory.java =================================================================== --- trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/part/Bpmn2PaletteFactory.java 2011-02-09 09:42:57 UTC (rev 29073) +++ trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/part/Bpmn2PaletteFactory.java 2011-02-09 09:46:27 UTC (rev 29074) @@ -190,9 +190,10 @@ NodeToolEntry entry = new NodeToolEntry( Messages.UserTask1CreationTool_title, null, types); entry.setId("createUserTask1CreationTool"); //$NON-NLS-1$ - entry.setSmallIcon(Bpmn2ElementTypes - .getImageDescriptor(Bpmn2ElementTypes.UserTask_2001)); - entry.setLargeIcon(entry.getSmallIcon()); + entry.setSmallIcon(Bpmn2ProcessDiagramEditorPlugin + .findImageDescriptor("/org.jboss.tools.bpmn2.process.diagram/icons/obj16/tasks_16px_user.png")); //$NON-NLS-1$ + entry.setLargeIcon(Bpmn2ProcessDiagramEditorPlugin + .findImageDescriptor("/org.jboss.tools.bpmn2.process.diagram/icons/obj32/tasks_32px_user.png")); //$NON-NLS-1$ return entry; } @@ -206,9 +207,10 @@ NodeToolEntry entry = new NodeToolEntry( Messages.ServiceTask2CreationTool_title, null, types); entry.setId("createServiceTask2CreationTool"); //$NON-NLS-1$ - entry.setSmallIcon(Bpmn2ElementTypes - .getImageDescriptor(Bpmn2ElementTypes.ServiceTask_2002)); - entry.setLargeIcon(entry.getSmallIcon()); + entry.setSmallIcon(Bpmn2ProcessDiagramEditorPlugin + .findImageDescriptor("/org.jboss.tools.bpmn2.process.diagram/icons/obj16/tasks_16px_service.png")); //$NON-NLS-1$ + entry.setLargeIcon(Bpmn2ProcessDiagramEditorPlugin + .findImageDescriptor("/org.jboss.tools.bpmn2.process.diagram/icons/obj32/tasks_32px_service.png")); //$NON-NLS-1$ return entry; } @@ -222,9 +224,10 @@ NodeToolEntry entry = new NodeToolEntry( Messages.ScriptTask3CreationTool_title, null, types); entry.setId("createScriptTask3CreationTool"); //$NON-NLS-1$ - entry.setSmallIcon(Bpmn2ElementTypes - .getImageDescriptor(Bpmn2ElementTypes.ScriptTask_3016)); - entry.setLargeIcon(entry.getSmallIcon()); + entry.setSmallIcon(Bpmn2ProcessDiagramEditorPlugin + .findImageDescriptor("/org.jboss.tools.bpmn2.process.diagram/icons/obj16/tasks_16px_script.png")); //$NON-NLS-1$ + entry.setLargeIcon(Bpmn2ProcessDiagramEditorPlugin + .findImageDescriptor("/org.jboss.tools.bpmn2.process.diagram/icons/obj32/tasks_32px_service.png")); //$NON-NLS-1$ return entry; } @@ -238,9 +241,10 @@ NodeToolEntry entry = new NodeToolEntry( Messages.SubProcess4CreationTool_title, null, types); entry.setId("createSubProcess4CreationTool"); //$NON-NLS-1$ - entry.setSmallIcon(Bpmn2ElementTypes - .getImageDescriptor(Bpmn2ElementTypes.SubProcess_2016)); - entry.setLargeIcon(entry.getSmallIcon()); + entry.setSmallIcon(Bpmn2ProcessDiagramEditorPlugin + .findImageDescriptor("/org.jboss.tools.bpmn2.process.diagram/icons/obj16/activity_16px_subprocess.png")); //$NON-NLS-1$ + entry.setLargeIcon(Bpmn2ProcessDiagramEditorPlugin + .findImageDescriptor("/org.jboss.tools.bpmn2.process.diagram/icons/obj32/activity_32px_subprocess.png")); //$NON-NLS-1$ return entry; } @@ -286,9 +290,10 @@ NodeToolEntry entry = new NodeToolEntry( Messages.Exclusive1CreationTool_title, null, types); entry.setId("createExclusive1CreationTool"); //$NON-NLS-1$ - entry.setSmallIcon(Bpmn2ElementTypes - .getImageDescriptor(Bpmn2ElementTypes.ExclusiveGateway_2005)); - entry.setLargeIcon(entry.getSmallIcon()); + entry.setSmallIcon(Bpmn2ProcessDiagramEditorPlugin + .findImageDescriptor("/org.jboss.tools.bpmn2.process.diagram/icons/obj16/gateways_16px_exclusive.png")); //$NON-NLS-1$ + entry.setLargeIcon(Bpmn2ProcessDiagramEditorPlugin + .findImageDescriptor("/org.jboss.tools.bpmn2.process.diagram/icons/obj32/gateways_32px_exclusive.png")); //$NON-NLS-1$ return entry; } @@ -302,9 +307,10 @@ NodeToolEntry entry = new NodeToolEntry( Messages.Parallel2CreationTool_title, null, types); entry.setId("createParallel2CreationTool"); //$NON-NLS-1$ - entry.setSmallIcon(Bpmn2ElementTypes - .getImageDescriptor(Bpmn2ElementTypes.ParallelGateway_2006)); - entry.setLargeIcon(entry.getSmallIcon()); + entry.setSmallIcon(Bpmn2ProcessDiagramEditorPlugin + .findImageDescriptor("/org.jboss.tools.bpmn2.process.diagram/icons/obj16/gateways_16px_parallel.png")); //$NON-NLS-1$ + entry.setLargeIcon(Bpmn2ProcessDiagramEditorPlugin + .findImageDescriptor("/org.jboss.tools.bpmn2.process.diagram/icons/obj32/gateways_32px_parallel.png")); //$NON-NLS-1$ return entry; } @@ -318,9 +324,10 @@ NodeToolEntry entry = new NodeToolEntry( Messages.Start1CreationTool_title, null, types); entry.setId("createStart1CreationTool"); //$NON-NLS-1$ - entry.setSmallIcon(Bpmn2ElementTypes - .getImageDescriptor(Bpmn2ElementTypes.StartEvent_2003)); - entry.setLargeIcon(entry.getSmallIcon()); + entry.setSmallIcon(Bpmn2ProcessDiagramEditorPlugin + .findImageDescriptor("/org.jboss.tools.bpmn2.process.diagram/icons/obj16/events_16px_start_none.png")); //$NON-NLS-1$ + entry.setLargeIcon(Bpmn2ProcessDiagramEditorPlugin + .findImageDescriptor("/org.jboss.tools.bpmn2.process.diagram/icons/obj32/events_32px_start_none.png")); //$NON-NLS-1$ return entry; } @@ -334,9 +341,10 @@ NodeToolEntry entry = new NodeToolEntry( Messages.MessageStart2CreationTool_title, null, types); entry.setId("createMessageStart2CreationTool"); //$NON-NLS-1$ - entry.setSmallIcon(Bpmn2ElementTypes - .getImageDescriptor(Bpmn2ElementTypes.StartEvent_2007)); - entry.setLargeIcon(entry.getSmallIcon()); + entry.setSmallIcon(Bpmn2ProcessDiagramEditorPlugin + .findImageDescriptor("/org.jboss.tools.bpmn2.process.diagram/icons/obj16/events_16px_start_message.png")); //$NON-NLS-1$ + entry.setLargeIcon(Bpmn2ProcessDiagramEditorPlugin + .findImageDescriptor("/org.jboss.tools.bpmn2.process.diagram/icons/obj32/events_32px_start_message.png")); //$NON-NLS-1$ return entry; } @@ -350,9 +358,10 @@ NodeToolEntry entry = new NodeToolEntry( Messages.MessageCatch1CreationTool_title, null, types); entry.setId("createMessageCatch1CreationTool"); //$NON-NLS-1$ - entry.setSmallIcon(Bpmn2ElementTypes - .getImageDescriptor(Bpmn2ElementTypes.IntermediateCatchEvent_2010)); - entry.setLargeIcon(entry.getSmallIcon()); + entry.setSmallIcon(Bpmn2ProcessDiagramEditorPlugin + .findImageDescriptor("/org.jboss.tools.bpmn2.process.diagram/icons/obj16/events_16px_intermediate_message_catch.png")); //$NON-NLS-1$ + entry.setLargeIcon(Bpmn2ProcessDiagramEditorPlugin + .findImageDescriptor("/org.jboss.tools.bpmn2.process.diagram/icons/obj32/events_32px_intermediate_message_catch.png")); //$NON-NLS-1$ return entry; } @@ -366,9 +375,10 @@ NodeToolEntry entry = new NodeToolEntry( Messages.MessageThrow2CreationTool_title, null, types); entry.setId("createMessageThrow2CreationTool"); //$NON-NLS-1$ - entry.setSmallIcon(Bpmn2ElementTypes - .getImageDescriptor(Bpmn2ElementTypes.IntermediateThrowEvent_2011)); - entry.setLargeIcon(entry.getSmallIcon()); + entry.setSmallIcon(Bpmn2ProcessDiagramEditorPlugin + .findImageDescriptor("/org.jboss.tools.bpmn2.process.diagram/icons/obj16/events_16px_intermediate_message_throw.png")); //$NON-NLS-1$ + entry.setLargeIcon(Bpmn2ProcessDiagramEditorPlugin + .findImageDescriptor("/org.jboss.tools.bpmn2.process.diagram/icons/obj32/events_32px_intermediate_message_throw.png")); //$NON-NLS-1$ return entry; } @@ -383,9 +393,10 @@ Messages.TimerCatch3CreationTool_title, Messages.TimerCatch3CreationTool_desc, types); entry.setId("createTimerCatch3CreationTool"); //$NON-NLS-1$ - entry.setSmallIcon(Bpmn2ElementTypes - .getImageDescriptor(Bpmn2ElementTypes.IntermediateCatchEvent_2012)); - entry.setLargeIcon(entry.getSmallIcon()); + entry.setSmallIcon(Bpmn2ProcessDiagramEditorPlugin + .findImageDescriptor("/org.jboss.tools.bpmn2.process.diagram/icons/obj16/events_16px_intermediate_timer_catch.png")); //$NON-NLS-1$ + entry.setLargeIcon(Bpmn2ProcessDiagramEditorPlugin + .findImageDescriptor("/org.jboss.tools.bpmn2.process.diagram/icons/obj32/events_32px_intermediate_timer_catch.png")); //$NON-NLS-1$ return entry; } @@ -399,9 +410,10 @@ Collections .singletonList(Bpmn2ElementTypes.IntermediateCatchEvent_2013)); entry.setId("createErrorCatch4CreationTool"); //$NON-NLS-1$ - entry.setSmallIcon(Bpmn2ElementTypes - .getImageDescriptor(Bpmn2ElementTypes.IntermediateCatchEvent_2013)); - entry.setLargeIcon(entry.getSmallIcon()); + entry.setSmallIcon(Bpmn2ProcessDiagramEditorPlugin + .findImageDescriptor("/org.jboss.tools.bpmn2.process.diagram/icons/obj16/events_16px_intermediate_error_catch.png")); //$NON-NLS-1$ + entry.setLargeIcon(Bpmn2ProcessDiagramEditorPlugin + .findImageDescriptor("/org.jboss.tools.bpmn2.process.diagram/icons/obj32/events_32px_intermediate_error_catch.png")); //$NON-NLS-1$ return entry; } @@ -415,9 +427,10 @@ NodeToolEntry entry = new NodeToolEntry( Messages.End1CreationTool_title, null, types); entry.setId("createEnd1CreationTool"); //$NON-NLS-1$ - entry.setSmallIcon(Bpmn2ElementTypes - .getImageDescriptor(Bpmn2ElementTypes.EndEvent_2004)); - entry.setLargeIcon(entry.getSmallIcon()); + entry.setSmallIcon(Bpmn2ProcessDiagramEditorPlugin + .findImageDescriptor("/org.jboss.tools.bpmn2.process.diagram/icons/obj16/events_16px_end_none.png")); //$NON-NLS-1$ + entry.setLargeIcon(Bpmn2ProcessDiagramEditorPlugin + .findImageDescriptor("/org.jboss.tools.bpmn2.process.diagram/icons/obj32/events_32px_end_none.png")); //$NON-NLS-1$ return entry; } @@ -431,9 +444,10 @@ NodeToolEntry entry = new NodeToolEntry( Messages.MessageEnd2CreationTool_title, null, types); entry.setId("createMessageEnd2CreationTool"); //$NON-NLS-1$ - entry.setSmallIcon(Bpmn2ElementTypes - .getImageDescriptor(Bpmn2ElementTypes.EndEvent_2008)); - entry.setLargeIcon(entry.getSmallIcon()); + entry.setSmallIcon(Bpmn2ProcessDiagramEditorPlugin + .findImageDescriptor("/org.jboss.tools.bpmn2.process.diagram/icons/obj16/events_16px_end_message.png")); //$NON-NLS-1$ + entry.setLargeIcon(Bpmn2ProcessDiagramEditorPlugin + .findImageDescriptor("/org.jboss.tools.bpmn2.process.diagram/icons/obj32/events_32px_end_message.png")); //$NON-NLS-1$ return entry; } @@ -447,9 +461,10 @@ NodeToolEntry entry = new NodeToolEntry( Messages.Terminate3CreationTool_title, null, types); entry.setId("createTerminate3CreationTool"); //$NON-NLS-1$ - entry.setSmallIcon(Bpmn2ElementTypes - .getImageDescriptor(Bpmn2ElementTypes.EndEvent_2009)); - entry.setLargeIcon(entry.getSmallIcon()); + entry.setSmallIcon(Bpmn2ProcessDiagramEditorPlugin + .findImageDescriptor("/org.jboss.tools.bpmn2.process.diagram/icons/obj16/events_16px_end_terminate.png")); //$NON-NLS-1$ + entry.setLargeIcon(Bpmn2ProcessDiagramEditorPlugin + .findImageDescriptor("/org.jboss.tools.bpmn2.process.diagram/icons/obj32/events_32px_end_terminate.png")); //$NON-NLS-1$ return entry; } Added: trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/part/Bpmn2ProcessDiagramEditorPlugin.java =================================================================== --- trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/part/Bpmn2ProcessDiagramEditorPlugin.java (rev 0) +++ trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/part/Bpmn2ProcessDiagramEditorPlugin.java 2011-02-09 09:46:27 UTC (rev 29074) @@ -0,0 +1,297 @@ +package org.jboss.tools.bpmn2.process.diagram.part; + +import java.util.ArrayList; +import java.util.List; + +import org.eclipse.bpmn2.di.provider.BpmnDiItemProviderAdapterFactory; +import org.eclipse.bpmn2.provider.Bpmn2ItemProviderAdapterFactory; +import org.eclipse.core.runtime.IPath; +import org.eclipse.core.runtime.IStatus; +import org.eclipse.core.runtime.Path; +import org.eclipse.core.runtime.Platform; +import org.eclipse.core.runtime.Status; +import org.eclipse.dd.dc.provider.DcItemProviderAdapterFactory; +import org.eclipse.dd.di.provider.DiItemProviderAdapterFactory; +import org.eclipse.emf.common.notify.AdapterFactory; +import org.eclipse.emf.edit.provider.ComposedAdapterFactory; +import org.eclipse.emf.edit.provider.IItemLabelProvider; +import org.eclipse.emf.edit.provider.ReflectiveItemProviderAdapterFactory; +import org.eclipse.emf.edit.provider.resource.ResourceItemProviderAdapterFactory; +import org.eclipse.emf.edit.ui.provider.ExtendedImageRegistry; +import org.eclipse.gmf.runtime.diagram.core.preferences.PreferencesHint; +import org.eclipse.jface.resource.ImageDescriptor; +import org.eclipse.swt.graphics.Image; +import org.eclipse.ui.plugin.AbstractUIPlugin; +import org.jboss.tools.bpmn2.process.diagram.edit.policies.Bpmn2BaseItemSemanticEditPolicy; +import org.jboss.tools.bpmn2.process.diagram.providers.ElementInitializers; +import org.osgi.framework.BundleContext; + +/** + * @generated + */ +public class Bpmn2ProcessDiagramEditorPlugin extends AbstractUIPlugin { + + /** + * @generated + */ + public static final String ID = "org.jboss.tools.bpmn2.process.diagram"; //$NON-NLS-1$ + + /** + * @generated + */ + public static final PreferencesHint DIAGRAM_PREFERENCES_HINT = new PreferencesHint( + ID); + + /** + * @generated + */ + private static Bpmn2ProcessDiagramEditorPlugin instance; + + /** + * @generated + */ + private ComposedAdapterFactory adapterFactory; + + /** + * @generated + */ + private Bpmn2DocumentProvider documentProvider; + + /** + * @generated + */ + private Bpmn2BaseItemSemanticEditPolicy.LinkConstraints linkConstraints; + + /** + * @generated + */ + private ElementInitializers initializers; + + /** + * @generated + */ + public Bpmn2ProcessDiagramEditorPlugin() { + } + + /** + * @generated + */ + public void start(BundleContext context) throws Exception { + super.start(context); + instance = this; + PreferencesHint.registerPreferenceStore(DIAGRAM_PREFERENCES_HINT, + getPreferenceStore()); + adapterFactory = createAdapterFactory(); + } + + /** + * @generated + */ + public void stop(BundleContext context) throws Exception { + adapterFactory.dispose(); + adapterFactory = null; + linkConstraints = null; + initializers = null; + instance = null; + super.stop(context); + } + + /** + * @generated + */ + public static Bpmn2ProcessDiagramEditorPlugin getInstance() { + return instance; + } + + /** + * @generated + */ + protected ComposedAdapterFactory createAdapterFactory() { + ArrayList<AdapterFactory> factories = new ArrayList<AdapterFactory>(); + fillItemProviderFactories(factories); + return new ComposedAdapterFactory(factories); + } + + /** + * @generated + */ + protected void fillItemProviderFactories(List<AdapterFactory> factories) { + factories.add(new Bpmn2ItemProviderAdapterFactory()); + factories.add(new BpmnDiItemProviderAdapterFactory()); + factories.add(new DiItemProviderAdapterFactory()); + factories.add(new DcItemProviderAdapterFactory()); + factories.add(new ResourceItemProviderAdapterFactory()); + factories.add(new ReflectiveItemProviderAdapterFactory()); + } + + /** + * @generated + */ + public AdapterFactory getItemProvidersAdapterFactory() { + return adapterFactory; + } + + /** + * @generated + */ + public ImageDescriptor getItemImageDescriptor(Object item) { + IItemLabelProvider labelProvider = (IItemLabelProvider) adapterFactory + .adapt(item, IItemLabelProvider.class); + if (labelProvider != null) { + return ExtendedImageRegistry.getInstance().getImageDescriptor( + labelProvider.getImage(item)); + } + return null; + } + + /** + * Returns an image descriptor for the image file at the given + * plug-in relative path. + * + * @generated + * @param path the path + * @return the image descriptor + */ + public static ImageDescriptor getBundledImageDescriptor(String path) { + return AbstractUIPlugin.imageDescriptorFromPlugin(ID, path); + } + + /** + * Respects images residing in any plug-in. If path is relative, + * then this bundle is looked up for the image, otherwise, for absolute + * path, first segment is taken as id of plug-in with image + * + * @generated + * @param path the path to image, either absolute (with plug-in id as first segment), or relative for bundled images + * @return the image descriptor + */ + public static ImageDescriptor findImageDescriptor(String path) { + final IPath p = new Path(path); + if (p.isAbsolute() && p.segmentCount() > 1) { + return AbstractUIPlugin.imageDescriptorFromPlugin(p.segment(0), p + .removeFirstSegments(1).makeAbsolute().toString()); + } else { + return getBundledImageDescriptor(p.makeAbsolute().toString()); + } + } + + /** + * Returns an image for the image file at the given plug-in relative path. + * Client do not need to dispose this image. Images will be disposed automatically. + * + * @generated + * @param path the path + * @return image instance + */ + public Image getBundledImage(String path) { + Image image = getImageRegistry().get(path); + if (image == null) { + getImageRegistry().put(path, getBundledImageDescriptor(path)); + image = getImageRegistry().get(path); + } + return image; + } + + /** + * Returns string from plug-in's resource bundle + * + * @generated + */ + public static String getString(String key) { + return Platform.getResourceString(getInstance().getBundle(), "%" + key); //$NON-NLS-1$ + } + + /** + * @generated + */ + public Bpmn2DocumentProvider getDocumentProvider() { + if (documentProvider == null) { + documentProvider = new Bpmn2DocumentProvider(); + } + return documentProvider; + } + + /** + * @generated + */ + public Bpmn2BaseItemSemanticEditPolicy.LinkConstraints getLinkConstraints() { + return linkConstraints; + } + + /** + * @generated + */ + public void setLinkConstraints( + Bpmn2BaseItemSemanticEditPolicy.LinkConstraints lc) { + this.linkConstraints = lc; + } + + /** + * @generated + */ + public ElementInitializers getElementInitializers() { + return initializers; + } + + /** + * @generated + */ + public void setElementInitializers(ElementInitializers i) { + this.initializers = i; + } + + /** + * @generated + */ + public void logError(String error) { + logError(error, null); + } + + /** + * @generated + */ + public void logError(String error, Throwable throwable) { + if (error == null && throwable != null) { + error = throwable.getMessage(); + } + getLog().log( + new Status(IStatus.ERROR, Bpmn2ProcessDiagramEditorPlugin.ID, + IStatus.OK, error, throwable)); + debug(error, throwable); + } + + /** + * @generated + */ + public void logInfo(String message) { + logInfo(message, null); + } + + /** + * @generated + */ + public void logInfo(String message, Throwable throwable) { + if (message == null && throwable != null) { + message = throwable.getMessage(); + } + getLog().log( + new Status(IStatus.INFO, Bpmn2ProcessDiagramEditorPlugin.ID, + IStatus.OK, message, throwable)); + debug(message, throwable); + } + + /** + * @generated + */ + private void debug(String message, Throwable throwable) { + if (!isDebugging()) { + return; + } + if (message != null) { + System.err.println(message); + } + if (throwable != null) { + throwable.printStackTrace(); + } + } +} Property changes on: trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/part/Bpmn2ProcessDiagramEditorPlugin.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/part/Bpmn2VisualIDRegistry.java =================================================================== --- trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/part/Bpmn2VisualIDRegistry.java 2011-02-09 09:42:57 UTC (rev 29073) +++ trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/part/Bpmn2VisualIDRegistry.java 2011-02-09 09:46:27 UTC (rev 29074) @@ -80,7 +80,7 @@ /** * @generated */ - private static final String DEBUG_KEY = "org.eclipse.bpmn2.diagram/debug/visualID"; //$NON-NLS-1$ + private static final String DEBUG_KEY = "org.jboss.tools.bpmn2.process.diagram/debug/visualID"; //$NON-NLS-1$ /** * @generated @@ -121,7 +121,7 @@ } catch (NumberFormatException e) { if (Boolean.TRUE.toString().equalsIgnoreCase( Platform.getDebugOption(DEBUG_KEY))) { - Bpmn2DiagramEditorPlugin.getInstance().logError( + Bpmn2ProcessDiagramEditorPlugin.getInstance().logError( "Unable to parse view type as a visualID number: " + type); } Modified: trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/part/DiagramEditorContextMenuProvider.java =================================================================== --- trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/part/DiagramEditorContextMenuProvider.java 2011-02-09 09:42:57 UTC (rev 29073) +++ trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/part/DiagramEditorContextMenuProvider.java 2011-02-09 09:46:27 UTC (rev 29074) @@ -68,7 +68,7 @@ } }); } catch (Exception e) { - Bpmn2DiagramEditorPlugin.getInstance().logError( + Bpmn2ProcessDiagramEditorPlugin.getInstance().logError( "Error building context menu", e); } } Modified: trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/part/ModelElementSelectionPage.java =================================================================== --- trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/part/ModelElementSelectionPage.java 2011-02-09 09:42:57 UTC (rev 29073) +++ trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/part/ModelElementSelectionPage.java 2011-02-09 09:46:27 UTC (rev 29074) @@ -87,10 +87,10 @@ layoutData.widthHint = 300; modelViewer.getTree().setLayoutData(layoutData); modelViewer.setContentProvider(new AdapterFactoryContentProvider( - Bpmn2DiagramEditorPlugin.getInstance() + Bpmn2ProcessDiagramEditorPlugin.getInstance() .getItemProvidersAdapterFactory())); modelViewer.setLabelProvider(new AdapterFactoryLabelProvider( - Bpmn2DiagramEditorPlugin.getInstance() + Bpmn2ProcessDiagramEditorPlugin.getInstance() .getItemProvidersAdapterFactory())); if (selectedModelElement != null) { modelViewer.setInput(selectedModelElement.eResource()); Modified: trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/preferences/DiagramAppearancePreferencePage.java =================================================================== --- trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/preferences/DiagramAppearancePreferencePage.java 2011-02-09 09:42:57 UTC (rev 29073) +++ trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/preferences/DiagramAppearancePreferencePage.java 2011-02-09 09:46:27 UTC (rev 29074) @@ -2,6 +2,7 @@ import org.eclipse.gmf.runtime.diagram.ui.preferences.AppearancePreferencePage; import org.jboss.tools.bpmn2.process.diagram.part.Bpmn2DiagramEditorPlugin; +import org.jboss.tools.bpmn2.process.diagram.part.Bpmn2ProcessDiagramEditorPlugin; /** * @generated @@ -12,7 +13,7 @@ * @generated */ public DiagramAppearancePreferencePage() { - setPreferenceStore(Bpmn2DiagramEditorPlugin.getInstance() + setPreferenceStore(Bpmn2ProcessDiagramEditorPlugin.getInstance() .getPreferenceStore()); } } Modified: trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/preferences/DiagramConnectionsPreferencePage.java =================================================================== --- trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/preferences/DiagramConnectionsPreferencePage.java 2011-02-09 09:42:57 UTC (rev 29073) +++ trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/preferences/DiagramConnectionsPreferencePage.java 2011-02-09 09:46:27 UTC (rev 29074) @@ -2,6 +2,7 @@ import org.eclipse.gmf.runtime.diagram.ui.preferences.ConnectionsPreferencePage; import org.jboss.tools.bpmn2.process.diagram.part.Bpmn2DiagramEditorPlugin; +import org.jboss.tools.bpmn2.process.diagram.part.Bpmn2ProcessDiagramEditorPlugin; /** * @generated @@ -12,7 +13,7 @@ * @generated */ public DiagramConnectionsPreferencePage() { - setPreferenceStore(Bpmn2DiagramEditorPlugin.getInstance() + setPreferenceStore(Bpmn2ProcessDiagramEditorPlugin.getInstance() .getPreferenceStore()); } } Modified: trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/preferences/DiagramGeneralPreferencePage.java =================================================================== --- trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/preferences/DiagramGeneralPreferencePage.java 2011-02-09 09:42:57 UTC (rev 29073) +++ trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/preferences/DiagramGeneralPreferencePage.java 2011-02-09 09:46:27 UTC (rev 29074) @@ -2,6 +2,7 @@ import org.eclipse.gmf.runtime.diagram.ui.preferences.DiagramsPreferencePage; import org.jboss.tools.bpmn2.process.diagram.part.Bpmn2DiagramEditorPlugin; +import org.jboss.tools.bpmn2.process.diagram.part.Bpmn2ProcessDiagramEditorPlugin; /** * @generated @@ -12,7 +13,7 @@ * @generated */ public DiagramGeneralPreferencePage() { - setPreferenceStore(Bpmn2DiagramEditorPlugin.getInstance() + setPreferenceStore(Bpmn2ProcessDiagramEditorPlugin.getInstance() .getPreferenceStore()); } } Modified: trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/preferences/DiagramPreferenceInitializer.java =================================================================== --- trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/preferences/DiagramPreferenceInitializer.java 2011-02-09 09:42:57 UTC (rev 29073) +++ trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/preferences/DiagramPreferenceInitializer.java 2011-02-09 09:46:27 UTC (rev 29074) @@ -3,6 +3,7 @@ import org.eclipse.core.runtime.preferences.AbstractPreferenceInitializer; import org.eclipse.jface.preference.IPreferenceStore; import org.jboss.tools.bpmn2.process.diagram.part.Bpmn2DiagramEditorPlugin; +import org.jboss.tools.bpmn2.process.diagram.part.Bpmn2ProcessDiagramEditorPlugin; /** * @generated @@ -26,6 +27,7 @@ * @generated */ protected IPreferenceStore getPreferenceStore() { - return Bpmn2DiagramEditorPlugin.getInstance().getPreferenceStore(); + return Bpmn2ProcessDiagramEditorPlugin.getInstance() + .getPreferenceStore(); } } Modified: trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/preferences/DiagramPrintingPreferencePage.java =================================================================== --- trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/preferences/DiagramPrintingPreferencePage.java 2011-02-09 09:42:57 UTC (rev 29073) +++ trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/preferences/DiagramPrintingPreferencePage.java 2011-02-09 09:46:27 UTC (rev 29074) @@ -2,6 +2,7 @@ import org.eclipse.gmf.runtime.diagram.ui.preferences.PrintingPreferencePage; import org.jboss.tools.bpmn2.process.diagram.part.Bpmn2DiagramEditorPlugin; +import org.jboss.tools.bpmn2.process.diagram.part.Bpmn2ProcessDiagramEditorPlugin; /** * @generated @@ -12,7 +13,7 @@ * @generated */ public DiagramPrintingPreferencePage() { - setPreferenceStore(Bpmn2DiagramEditorPlugin.getInstance() + setPreferenceStore(Bpmn2ProcessDiagramEditorPlugin.getInstance() .getPreferenceStore()); } } Modified: trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/preferences/DiagramRulersAndGridPreferencePage.java =================================================================== --- trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/preferences/DiagramRulersAndGridPreferencePage.java 2011-02-09 09:42:57 UTC (rev 29073) +++ trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/preferences/DiagramRulersAndGridPreferencePage.java 2011-02-09 09:46:27 UTC (rev 29074) @@ -2,6 +2,7 @@ import org.eclipse.gmf.runtime.diagram.ui.preferences.RulerGridPreferencePage; import org.jboss.tools.bpmn2.process.diagram.part.Bpmn2DiagramEditorPlugin; +import org.jboss.tools.bpmn2.process.diagram.part.Bpmn2ProcessDiagramEditorPlugin; /** * @generated @@ -12,7 +13,7 @@ * @generated */ public DiagramRulersAndGridPreferencePage() { - setPreferenceStore(Bpmn2DiagramEditorPlugin.getInstance() + setPreferenceStore(Bpmn2ProcessDiagramEditorPlugin.getInstance() .getPreferenceStore()); } } Modified: trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/providers/Bpmn2ElementTypes.java =================================================================== --- trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/providers/Bpmn2ElementTypes.java 2011-02-09 09:42:57 UTC (rev 29073) +++ trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/providers/Bpmn2ElementTypes.java 2011-02-09 09:46:27 UTC (rev 29074) @@ -53,6 +53,7 @@ import org.jboss.tools.bpmn2.process.diagram.edit.parts.UserTask2EditPart; import org.jboss.tools.bpmn2.process.diagram.edit.parts.UserTaskEditPart; import org.jboss.tools.bpmn2.process.diagram.part.Bpmn2DiagramEditorPlugin; +import org.jboss.tools.bpmn2.process.diagram.part.Bpmn2ProcessDiagramEditorPlugin; /** * @generated @@ -83,179 +84,179 @@ /** * @generated */ - public static final IElementType Process_1000 = getElementType("org.eclipse.bpmn2.diagram.Process_1000"); //$NON-NLS-1$ + public static final IElementType Process_1000 = getElementType("org.jboss.tools.bpmn2.process.diagram.Process_1000"); //$NON-NLS-1$ /** * @generated */ - public static final IElementType UserTask_2001 = getElementType("org.eclipse.bpmn2.diagram.UserTask_2001"); //$NON-NLS-1$ + public static final IElementType UserTask_2001 = getElementType("org.jboss.tools.bpmn2.process.diagram.UserTask_2001"); //$NON-NLS-1$ /** * @generated */ - public static final IElementType ServiceTask_2002 = getElementType("org.eclipse.bpmn2.diagram.ServiceTask_2002"); //$NON-NLS-1$ + public static final IElementType ServiceTask_2002 = getElementType("org.jboss.tools.bpmn2.process.diagram.ServiceTask_2002"); //$NON-NLS-1$ /** * @generated */ - public static final IElementType StartEvent_2003 = getElementType("org.eclipse.bpmn2.diagram.StartEvent_2003"); //$NON-NLS-1$ + public static final IElementType StartEvent_2003 = getElementType("org.jboss.tools.bpmn2.process.diagram.StartEvent_2003"); //$NON-NLS-1$ /** * @generated */ - public static final IElementType StartEvent_2007 = getElementType("org.eclipse.bpmn2.diagram.StartEvent_2007"); //$NON-NLS-1$ + public static final IElementType StartEvent_2007 = getElementType("org.jboss.tools.bpmn2.process.diagram.StartEvent_2007"); //$NON-NLS-1$ /** * @generated */ - public static final IElementType EndEvent_2004 = getElementType("org.eclipse.bpmn2.diagram.EndEvent_2004"); //$NON-NLS-1$ + public static final IElementType EndEvent_2004 = getElementType("org.jboss.tools.bpmn2.process.diagram.EndEvent_2004"); //$NON-NLS-1$ /** * @generated */ - public static final IElementType ExclusiveGateway_2005 = getElementType("org.eclipse.bpmn2.diagram.ExclusiveGateway_2005"); //$NON-NLS-1$ + public static final IElementType ExclusiveGateway_2005 = getElementType("org.jboss.tools.bpmn2.process.diagram.ExclusiveGateway_2005"); //$NON-NLS-1$ /** * @generated */ - public static final IElementType ParallelGateway_2006 = getElementType("org.eclipse.bpmn2.diagram.ParallelGateway_2006"); //$NON-NLS-1$ + public static final IElementType ParallelGateway_2006 = getElementType("org.jboss.tools.bpmn2.process.diagram.ParallelGateway_2006"); //$NON-NLS-1$ /** * @generated */ - public static final IElementType EndEvent_2008 = getElementType("org.eclipse.bpmn2.diagram.EndEvent_2008"); //$NON-NLS-1$ + public static final IElementType EndEvent_2008 = getElementType("org.jboss.tools.bpmn2.process.diagram.EndEvent_2008"); //$NON-NLS-1$ /** * @generated */ - public static final IElementType EndEvent_2009 = getElementType("org.eclipse.bpmn2.diagram.EndEvent_2009"); //$NON-NLS-1$ + public static final IElementType EndEvent_2009 = getElementType("org.jboss.tools.bpmn2.process.diagram.EndEvent_2009"); //$NON-NLS-1$ /** * @generated */ - public static final IElementType IntermediateCatchEvent_2010 = getElementType("org.eclipse.bpmn2.diagram.IntermediateCatchEvent_2010"); //$NON-NLS-1$ + public static final IElementType IntermediateCatchEvent_2010 = getElementType("org.jboss.tools.bpmn2.process.diagram.IntermediateCatchEvent_2010"); //$NON-NLS-1$ /** * @generated */ - public static final IElementType IntermediateThrowEvent_2011 = getElementType("org.eclipse.bpmn2.diagram.IntermediateThrowEvent_2011"); //$NON-NLS-1$ + public static final IElementType IntermediateThrowEvent_2011 = getElementType("org.jboss.tools.bpmn2.process.diagram.IntermediateThrowEvent_2011"); //$NON-NLS-1$ /** * @generated */ - public static final IElementType IntermediateCatchEvent_2012 = getElementType("org.eclipse.bpmn2.diagram.IntermediateCatchEvent_2012"); //$NON-NLS-1$ + public static final IElementType IntermediateCatchEvent_2012 = getElementType("org.jboss.tools.bpmn2.process.diagram.IntermediateCatchEvent_2012"); //$NON-NLS-1$ /** * @generated */ - public static final IElementType IntermediateCatchEvent_2013 = getElementType("org.eclipse.bpmn2.diagram.IntermediateCatchEvent_2013"); //$NON-NLS-1$ + public static final IElementType IntermediateCatchEvent_2013 = getElementType("org.jboss.tools.bpmn2.process.diagram.IntermediateCatchEvent_2013"); //$NON-NLS-1$ /** * @generated */ - public static final IElementType DataObject_2014 = getElementType("org.eclipse.bpmn2.diagram.DataObject_2014"); //$NON-NLS-1$ + public static final IElementType DataObject_2014 = getElementType("org.jboss.tools.bpmn2.process.diagram.DataObject_2014"); //$NON-NLS-1$ /** * @generated */ - public static final IElementType TextAnnotation_2015 = getElementType("org.eclipse.bpmn2.diagram.TextAnnotation_2015"); //$NON-NLS-1$ + public static final IElementType TextAnnotation_2015 = getElementType("org.jboss.tools.bpmn2.process.diagram.TextAnnotation_2015"); //$NON-NLS-1$ /** * @generated */ - public static final IElementType SubProcess_2016 = getElementType("org.eclipse.bpmn2.diagram.SubProcess_2016"); //$NON-NLS-1$ + public static final IElementType SubProcess_2016 = getElementType("org.jboss.tools.bpmn2.process.diagram.SubProcess_2016"); //$NON-NLS-1$ /** * @generated */ - public static final IElementType ScriptTask_2017 = getElementType("org.eclipse.bpmn2.diagram.ScriptTask_2017"); //$NON-NLS-1$ + public static final IElementType ScriptTask_2017 = getElementType("org.jboss.tools.bpmn2.process.diagram.ScriptTask_2017"); //$NON-NLS-1$ /** * @generated */ - public static final IElementType SubProcess_3001 = getElementType("org.eclipse.bpmn2.diagram.SubProcess_3001"); //$NON-NLS-1$ + public static final IElementType SubProcess_3001 = getElementType("org.jboss.tools.bpmn2.process.diagram.SubProcess_3001"); //$NON-NLS-1$ /** * @generated */ - public static final IElementType UserTask_3002 = getElementType("org.eclipse.bpmn2.diagram.UserTask_3002"); //$NON-NLS-1$ + public static final IElementType UserTask_3002 = getElementType("org.jboss.tools.bpmn2.process.diagram.UserTask_3002"); //$NON-NLS-1$ /** * @generated */ - public static final IElementType ServiceTask_3004 = getElementType("org.eclipse.bpmn2.diagram.ServiceTask_3004"); //$NON-NLS-1$ + public static final IElementType ServiceTask_3004 = getElementType("org.jboss.tools.bpmn2.process.diagram.ServiceTask_3004"); //$NON-NLS-1$ /** * @generated */ - public static final IElementType StartEvent_3003 = getElementType("org.eclipse.bpmn2.diagram.StartEvent_3003"); //$NON-NLS-1$ + public static final IElementType StartEvent_3003 = getElementType("org.jboss.tools.bpmn2.process.diagram.StartEvent_3003"); //$NON-NLS-1$ /** * @generated */ - public static final IElementType StartEvent_3005 = getElementType("org.eclipse.bpmn2.diagram.StartEvent_3005"); //$NON-NLS-1$ + public static final IElementType StartEvent_3005 = getElementType("org.jboss.tools.bpmn2.process.diagram.StartEvent_3005"); //$NON-NLS-1$ /** * @generated */ - public static final IElementType EndEvent_3006 = getElementType("org.eclipse.bpmn2.diagram.EndEvent_3006"); //$NON-NLS-1$ + public static final IElementType EndEvent_3006 = getElementType("org.jboss.tools.bpmn2.process.diagram.EndEvent_3006"); //$NON-NLS-1$ /** * @generated */ - public static final IElementType ExclusiveGateway_3007 = getElementType("org.eclipse.bpmn2.diagram.ExclusiveGateway_3007"); //$NON-NLS-1$ + public static final IElementType ExclusiveGateway_3007 = getElementType("org.jboss.tools.bpmn2.process.diagram.ExclusiveGateway_3007"); //$NON-NLS-1$ /** * @generated */ - public static final IElementType ParallelGateway_3008 = getElementType("org.eclipse.bpmn2.diagram.ParallelGateway_3008"); //$NON-NLS-1$ + public static final IElementType ParallelGateway_3008 = getElementType("org.jboss.tools.bpmn2.process.diagram.ParallelGateway_3008"); //$NON-NLS-1$ /** * @generated */ - public static final IElementType EndEvent_3009 = getElementType("org.eclipse.bpmn2.diagram.EndEvent_3009"); //$NON-NLS-1$ + public static final IElementType EndEvent_3009 = getElementType("org.jboss.tools.bpmn2.process.diagram.EndEvent_3009"); //$NON-NLS-1$ /** * @generated */ - public static final IElementType EndEvent_3010 = getElementType("org.eclipse.bpmn2.diagram.EndEvent_3010"); //$NON-NLS-1$ + public static final IElementType EndEvent_3010 = getElementType("org.jboss.tools.bpmn2.process.diagram.EndEvent_3010"); //$NON-NLS-1$ /** * @generated */ - public static final IElementType IntermediateCatchEvent_3011 = getElementType("org.eclipse.bpmn2.diagram.IntermediateCatchEvent_3011"); //$NON-NLS-1$ + public static final IElementType IntermediateCatchEvent_3011 = getElementType("org.jboss.tools.bpmn2.process.diagram.IntermediateCatchEvent_3011"); //$NON-NLS-1$ /** * @generated */ - public static final IElementType IntermediateThrowEvent_3012 = getElementType("org.eclipse.bpmn2.diagram.IntermediateThrowEvent_3012"); //$NON-NLS-1$ + public static final IElementType IntermediateThrowEvent_3012 = getElementType("org.jboss.tools.bpmn2.process.diagram.IntermediateThrowEvent_3012"); //$NON-NLS-1$ /** * @generated */ - public static final IElementType IntermediateCatchEvent_3013 = getElementType("org.eclipse.bpmn2.diagram.IntermediateCatchEvent_3013"); //$NON-NLS-1$ + public static final IElementType IntermediateCatchEvent_3013 = getElementType("org.jboss.tools.bpmn2.process.diagram.IntermediateCatchEvent_3013"); //$NON-NLS-1$ /** * @generated */ - public static final IElementType DataObject_3014 = getElementType("org.eclipse.bpmn2.diagram.DataObject_3014"); //$NON-NLS-1$ + public static final IElementType DataObject_3014 = getElementType("org.jboss.tools.bpmn2.process.diagram.DataObject_3014"); //$NON-NLS-1$ /** * @generated */ - public static final IElementType TextAnnotation_3015 = getElementType("org.eclipse.bpmn2.diagram.TextAnnotation_3015"); //$NON-NLS-1$ + public static final IElementType TextAnnotation_3015 = getElementType("org.jboss.tools.bpmn2.process.diagram.TextAnnotation_3015"); //$NON-NLS-1$ /** * @generated */ - public static final IElementType ScriptTask_3016 = getElementType("org.eclipse.bpmn2.diagram.ScriptTask_3016"); //$NON-NLS-1$ + public static final IElementType ScriptTask_3016 = getElementType("org.jboss.tools.bpmn2.process.diagram.ScriptTask_3016"); //$NON-NLS-1$ /** * @generated */ - public static final IElementType SequenceFlow_4001 = getElementType("org.eclipse.bpmn2.diagram.SequenceFlow_4001"); //$NON-NLS-1$ + public static final IElementType SequenceFlow_4001 = getElementType("org.jboss.tools.bpmn2.process.diagram.SequenceFlow_4001"); //$NON-NLS-1$ /** * @generated */ - public static final IElementType Association_4002 = getElementType("org.eclipse.bpmn2.diagram.Association_4002"); //$NON-NLS-1$ + public static final IElementType Association_4002 = getElementType("org.jboss.tools.bpmn2.process.diagram.Association_4002"); //$NON-NLS-1$ /** * @generated @@ -293,7 +294,7 @@ if (element instanceof EClass) { EClass eClass = (EClass) element; if (!eClass.isAbstract()) { - return Bpmn2DiagramEditorPlugin.getInstance() + return Bpmn2ProcessDiagramEditorPlugin.getInstance() .getItemImageDescriptor( eClass.getEPackage().getEFactoryInstance() .create(eClass)); Modified: trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/providers/Bpmn2ModelingAssistantProvider.java =================================================================== --- trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/providers/Bpmn2ModelingAssistantProvider.java 2011-02-09 09:42:57 UTC (rev 29073) +++ trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/providers/Bpmn2ModelingAssistantProvider.java 2011-02-09 09:46:27 UTC (rev 29074) @@ -55,6 +55,7 @@ import org.jboss.tools.bpmn2.process.diagram.edit.parts.UserTask2EditPart; import org.jboss.tools.bpmn2.process.diagram.edit.parts.UserTaskEditPart; import org.jboss.tools.bpmn2.process.diagram.part.Bpmn2DiagramEditorPlugin; +import org.jboss.tools.bpmn2.process.diagram.part.Bpmn2ProcessDiagramEditorPlugin; import org.jboss.tools.bpmn2.process.diagram.part.Messages; /** @@ -887,7 +888,7 @@ protected EObject selectElement(EObject[] elements) { Shell shell = Display.getCurrent().getActiveShell(); ILabelProvider labelProvider = new AdapterFactoryLabelProvider( - Bpmn2DiagramEditorPlugin.getInstance() + Bpmn2ProcessDiagramEditorPlugin.getInstance() .getItemProvidersAdapterFactory()); ElementListSelectionDialog dialog = new ElementListSelectionDialog( shell, labelProvider); Modified: trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/providers/Bpmn2ViewProvider.java =================================================================== --- trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/providers/Bpmn2ViewProvider.java 2011-02-09 09:42:57 UTC (rev 29073) +++ trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/providers/Bpmn2ViewProvider.java 2011-02-09 09:46:27 UTC (rev 29074) @@ -444,6 +444,9 @@ public Node createUserTask_2001(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) { Shape node = BpmnNotationFactory.INSTANCE.createShape(); + node.getStyles() + .add(NotationFactory.eINSTANCE.createDescriptionStyle()); + node.getStyles().add(NotationFactory.eINSTANCE.createFontStyle()); node.setLayoutConstraint(BpmnNotationFactory.INSTANCE.createBounds()); node.setType(Bpmn2VisualIDRegistry.getType(UserTaskEditPart.VISUAL_ID)); ViewUtil.insertChildView(containerView, node, index, persisted); @@ -452,12 +455,6 @@ // initializeFromPreferences final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint .getPreferenceStore(); - - org.eclipse.swt.graphics.RGB lineRGB = PreferenceConverter.getColor( - prefStore, IPreferenceConstants.PREF_LINE_COLOR); - ViewUtil.setStructuralFeatureValue(node, - NotationPackage.eINSTANCE.getLineStyle_LineColor(), - FigureUtilities.RGBToInteger(lineRGB)); FontStyle nodeFontStyle = (FontStyle) node .getStyle(NotationPackage.Literals.FONT_STYLE); if (nodeFontStyle != null) { @@ -472,11 +469,6 @@ nodeFontStyle.setFontColor(FigureUtilities.RGBToInteger(fontRGB) .intValue()); } - org.eclipse.swt.graphics.RGB fillRGB = PreferenceConverter.getColor( - prefStore, IPreferenceConstants.PREF_FILL_COLOR); - ViewUtil.setStructuralFeatureValue(node, - NotationPackage.eINSTANCE.getFillStyle_FillColor(), - FigureUtilities.RGBToInteger(fillRGB)); Node label5001 = createLabel(node, Bpmn2VisualIDRegistry.getType(UserTaskNameEditPart.VISUAL_ID)); return node; @@ -489,6 +481,9 @@ View containerView, int index, boolean persisted, PreferencesHint preferencesHint) { Shape node = BpmnNotationFactory.INSTANCE.createShape(); + node.getStyles() + .add(NotationFactory.eINSTANCE.createDescriptionStyle()); + node.getStyles().add(NotationFactory.eINSTANCE.createFontStyle()); node.setLayoutConstraint(BpmnNotationFactory.INSTANCE.createBounds()); node.setType(Bpmn2VisualIDRegistry .getType(ServiceTaskEditPart.VISUAL_ID)); @@ -498,12 +493,6 @@ // initializeFromPreferences final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint .getPreferenceStore(); - - org.eclipse.swt.graphics.RGB lineRGB = PreferenceConverter.getColor( - prefStore, IPreferenceConstants.PREF_LINE_COLOR); - ViewUtil.setStructuralFeatureValue(node, - NotationPackage.eINSTANCE.getLineStyle_LineColor(), - FigureUtilities.RGBToInteger(lineRGB)); FontStyle nodeFontStyle = (FontStyle) node .getStyle(NotationPackage.Literals.FONT_STYLE); if (nodeFontStyle != null) { @@ -518,11 +507,6 @@ nodeFontStyle.setFontColor(FigureUtilities.RGBToInteger(fontRGB) .intValue()); } - org.eclipse.swt.graphics.RGB fillRGB = PreferenceConverter.getColor( - prefStore, IPreferenceConstants.PREF_FILL_COLOR); - ViewUtil.setStructuralFeatureValue(node, - NotationPackage.eINSTANCE.getFillStyle_FillColor(), - FigureUtilities.RGBToInteger(fillRGB)); Node label5002 = createLabel(node, Bpmn2VisualIDRegistry .getType(ServiceTaskNameEditPart.VISUAL_ID)); @@ -1065,6 +1049,10 @@ View containerView, int index, boolean persisted, PreferencesHint preferencesHint) { Shape node = BpmnNotationFactory.INSTANCE.createShape(); + node.getStyles() + .add(NotationFactory.eINSTANCE.createDescriptionStyle()); + node.getStyles().add(NotationFactory.eINSTANCE.createFontStyle()); + node.getStyles().add(NotationFactory.eINSTANCE.createFillStyle()); node.setLayoutConstraint(BpmnNotationFactory.INSTANCE.createBounds()); node.setType(Bpmn2VisualIDRegistry .getType(TextAnnotationEditPart.VISUAL_ID)); @@ -1074,12 +1062,6 @@ // initializeFromPreferences final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint .getPreferenceStore(); - - org.eclipse.swt.graphics.RGB lineRGB = PreferenceConverter.getColor( - prefStore, IPreferenceConstants.PREF_LINE_COLOR); - ViewUtil.setStructuralFeatureValue(node, - NotationPackage.eINSTANCE.getLineStyle_LineColor(), - FigureUtilities.RGBToInteger(lineRGB)); FontStyle nodeFontStyle = (FontStyle) node .getStyle(NotationPackage.Literals.FONT_STYLE); if (nodeFontStyle != null) { @@ -1112,6 +1094,10 @@ View containerView, int index, boolean persisted, PreferencesHint preferencesHint) { Shape node = BpmnNotationFactory.INSTANCE.createShape(); + node.getStyles() + .add(NotationFactory.eINSTANCE.createDescriptionStyle()); + node.getStyles().add(NotationFactory.eINSTANCE.createFontStyle()); + node.getStyles().add(NotationFactory.eINSTANCE.createFillStyle()); node.setLayoutConstraint(BpmnNotationFactory.INSTANCE.createBounds()); node.setType(Bpmn2VisualIDRegistry .getType(SubProcessEditPart.VISUAL_ID)); @@ -1121,12 +1107,6 @@ // initializeFromPreferences final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint .getPreferenceStore(); - - org.eclipse.swt.graphics.RGB lineRGB = PreferenceConverter.getColor( - prefStore, IPreferenceConstants.PREF_LINE_COLOR); - ViewUtil.setStructuralFeatureValue(node, - NotationPackage.eINSTANCE.getLineStyle_LineColor(), - FigureUtilities.RGBToInteger(lineRGB)); FontStyle nodeFontStyle = (FontStyle) node .getStyle(NotationPackage.Literals.FONT_STYLE); if (nodeFontStyle != null) { @@ -1156,6 +1136,9 @@ View containerView, int index, boolean persisted, PreferencesHint preferencesHint) { Shape node = BpmnNotationFactory.INSTANCE.createShape(); + node.getStyles() + .add(NotationFactory.eINSTANCE.createDescriptionStyle()); + node.getStyles().add(NotationFactory.eINSTANCE.createFontStyle()); node.setLayoutConstraint(BpmnNotationFactory.INSTANCE.createBounds()); node.setType(Bpmn2VisualIDRegistry .getType(ScriptTaskEditPart.VISUAL_ID)); @@ -1165,12 +1148,6 @@ // initializeFromPreferences final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint .getPreferenceStore(); - - org.eclipse.swt.graphics.RGB lineRGB = PreferenceConverter.getColor( - prefStore, IPreferenceConstants.PREF_LINE_COLOR); - ViewUtil.setStructuralFeatureValue(node, - NotationPackage.eINSTANCE.getLineStyle_LineColor(), - FigureUtilities.RGBToInteger(lineRGB)); FontStyle nodeFontStyle = (FontStyle) node .getStyle(NotationPackage.Literals.FONT_STYLE); if (nodeFontStyle != null) { @@ -1185,11 +1162,6 @@ nodeFontStyle.setFontColor(FigureUtilities.RGBToInteger(fontRGB) .intValue()); } - org.eclipse.swt.graphics.RGB fillRGB = PreferenceConverter.getColor( - prefStore, IPreferenceConstants.PREF_FILL_COLOR); - ViewUtil.setStructuralFeatureValue(node, - NotationPackage.eINSTANCE.getFillStyle_FillColor(), - FigureUtilities.RGBToInteger(fillRGB)); Node label5009 = createLabel(node, Bpmn2VisualIDRegistry.getType(ScriptTaskNameEditPart.VISUAL_ID)); return node; @@ -1202,6 +1174,10 @@ View containerView, int index, boolean persisted, PreferencesHint preferencesHint) { Shape node = BpmnNotationFactory.INSTANCE.createShape(); + node.getStyles() + .add(NotationFactory.eINSTANCE.createDescriptionStyle()); + node.getStyles().add(NotationFactory.eINSTANCE.createFontStyle()); + node.getStyles().add(NotationFactory.eINSTANCE.createFillStyle()); node.setLayoutConstraint(BpmnNotationFactory.INSTANCE.createBounds()); node.setType(Bpmn2VisualIDRegistry .getType(SubProcess2EditPart.VISUAL_ID)); @@ -1210,12 +1186,6 @@ // initializeFromPreferences final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint .getPreferenceStore(); - - org.eclipse.swt.graphics.RGB lineRGB = PreferenceConverter.getColor( - prefStore, IPreferenceConstants.PREF_LINE_COLOR); - ViewUtil.setStructuralFeatureValue(node, - NotationPackage.eINSTANCE.getLineStyle_LineColor(), - FigureUtilities.RGBToInteger(lineRGB)); FontStyle nodeFontStyle = (FontStyle) node .getStyle(NotationPackage.Literals.FONT_STYLE); if (nodeFontStyle != null) { @@ -1244,6 +1214,9 @@ public Node createUserTask_3002(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) { Shape node = BpmnNotationFactory.INSTANCE.createShape(); + node.getStyles() + .add(NotationFactory.eINSTANCE.createDescriptionStyle()); + node.getStyles().add(NotationFactory.eINSTANCE.createFontStyle()); node.setLayoutConstraint(BpmnNotationFactory.INSTANCE.createBounds()); node.setType(Bpmn2VisualIDRegistry.getType(UserTask2EditPart.VISUAL_ID)); ViewUtil.insertChildView(containerView, node, index, persisted); @@ -1251,12 +1224,6 @@ // initializeFromPreferences final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint .getPreferenceStore(); - - org.eclipse.swt.graphics.RGB lineRGB = PreferenceConverter.getColor( - prefStore, IPreferenceConstants.PREF_LINE_COLOR); - ViewUtil.setStructuralFeatureValue(node, - NotationPackage.eINSTANCE.getLineStyle_LineColor(), - FigureUtilities.RGBToInteger(lineRGB)); FontStyle nodeFontStyle = (FontStyle) node .getStyle(NotationPackage.Literals.FONT_STYLE); if (nodeFontStyle != null) { @@ -1271,11 +1238,6 @@ nodeFontStyle.setFontColor(FigureUtilities.RGBToInteger(fontRGB) .intValue()); } - org.eclipse.swt.graphics.RGB fillRGB = PreferenceConverter.getColor( - prefStore, IPreferenceConstants.PREF_FILL_COLOR); - ViewUtil.setStructuralFeatureValue(node, - NotationPackage.eINSTANCE.getFillStyle_FillColor(), - FigureUtilities.RGBToInteger(fillRGB)); Node label5005 = createLabel(node, Bpmn2VisualIDRegistry.getType(UserTaskName2EditPart.VISUAL_ID)); return node; @@ -1288,6 +1250,9 @@ View containerView, int index, boolean persisted, PreferencesHint preferencesHint) { Shape node = BpmnNotationFactory.INSTANCE.createShape(); + node.getStyles() + .add(NotationFactory.eINSTANCE.createDescriptionStyle()); + node.getStyles().add(NotationFactory.eINSTANCE.createFontStyle()); node.setLayoutConstraint(BpmnNotationFactory.INSTANCE.createBounds()); node.setType(Bpmn2VisualIDRegistry .getType(ServiceTask2EditPart.VISUAL_ID)); @@ -1296,12 +1261,6 @@ // initializeFromPreferences final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint .getPreferenceStore(); - - org.eclipse.swt.graphics.RGB lineRGB = PreferenceConverter.getColor( - prefStore, IPreferenceConstants.PREF_LINE_COLOR); - ViewUtil.setStructuralFeatureValue(node, - NotationPackage.eINSTANCE.getLineStyle_LineColor(), - FigureUtilities.RGBToInteger(lineRGB)); FontStyle nodeFontStyle = (FontStyle) node .getStyle(NotationPackage.Literals.FONT_STYLE); if (nodeFontStyle != null) { @@ -1316,11 +1275,6 @@ nodeFontStyle.setFontColor(FigureUtilities.RGBToInteger(fontRGB) .intValue()); } - org.eclipse.swt.graphics.RGB fillRGB = PreferenceConverter.getColor( - prefStore, IPreferenceConstants.PREF_FILL_COLOR); - ViewUtil.setStructuralFeatureValue(node, - NotationPackage.eINSTANCE.getFillStyle_FillColor(), - FigureUtilities.RGBToInteger(fillRGB)); Node label5006 = createLabel(node, Bpmn2VisualIDRegistry .getType(ServiceTaskName2EditPart.VISUAL_ID)); @@ -1809,6 +1763,10 @@ View containerView, int index, boolean persisted, PreferencesHint preferencesHint) { Shape node = BpmnNotationFactory.INSTANCE.createShape(); + node.getStyles() + .add(NotationFactory.eINSTANCE.createDescriptionStyle()); + node.getStyles().add(NotationFactory.eINSTANCE.createFontStyle()); + node.getStyles().add(NotationFactory.eINSTANCE.createFillStyle()); node.setLayoutConstraint(BpmnNotationFactory.INSTANCE.createBounds()); node.setType(Bpmn2VisualIDRegistry .getType(TextAnnotation2EditPart.VISUAL_ID)); @@ -1817,12 +1775,6 @@ // initializeFromPreferences final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint .getPreferenceStore(); - - org.eclipse.swt.graphics.RGB lineRGB = PreferenceConverter.getColor( - prefStore, IPreferenceConstants.PREF_LINE_COLOR); - ViewUtil.setStructuralFeatureValue(node, - NotationPackage.eINSTANCE.getLineStyle_LineColor(), - FigureUtilities.RGBToInteger(lineRGB)); FontStyle nodeFontStyle = (FontStyle) node .getStyle(NotationPackage.Literals.FONT_STYLE); if (nodeFontStyle != null) { @@ -1855,6 +1807,9 @@ View containerView, int index, boolean persisted, PreferencesHint preferencesHint) { Shape node = BpmnNotationFactory.INSTANCE.createShape(); + node.getStyles() + .add(NotationFactory.eINSTANCE.createDescriptionStyle()); + node.getStyles().add(NotationFactory.eINSTANCE.createFontStyle()); node.setLayoutConstraint(BpmnNotationFactory.INSTANCE.createBounds()); node.setType(Bpmn2VisualIDRegistry .getType(ScriptTask2EditPart.VISUAL_ID)); @@ -1863,12 +1818,6 @@ // initializeFromPreferences final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint .getPreferenceStore(); - - org.eclipse.swt.graphics.RGB lineRGB = PreferenceConverter.getColor( - prefStore, IPreferenceConstants.PREF_LINE_COLOR); - ViewUtil.setStructuralFeatureValue(node, - NotationPackage.eINSTANCE.getLineStyle_LineColor(), - FigureUtilities.RGBToInteger(lineRGB)); FontStyle nodeFontStyle = (FontStyle) node .getStyle(NotationPackage.Literals.FONT_STYLE); if (nodeFontStyle != null) { @@ -1883,11 +1832,6 @@ nodeFontStyle.setFontColor(FigureUtilities.RGBToInteger(fontRGB) .intValue()); } - org.eclipse.swt.graphics.RGB fillRGB = PreferenceConverter.getColor( - prefStore, IPreferenceConstants.PREF_FILL_COLOR); - ViewUtil.setStructuralFeatureValue(node, - NotationPackage.eINSTANCE.getFillStyle_FillColor(), - FigureUtilities.RGBToInteger(fillRGB)); Node label5010 = createLabel(node, Bpmn2VisualIDRegistry .getType(ScriptTaskName2EditPart.VISUAL_ID)); @@ -1956,7 +1900,8 @@ public Edge createAssociation_4002(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) { - Connector edge = NotationFactory.eINSTANCE.createConnector(); + Edge edge = NotationFactory.eINSTANCE.createEdge(); + edge.getStyles().add(NotationFactory.eINSTANCE.createRoutingStyle()); edge.getStyles().add(NotationFactory.eINSTANCE.createFontStyle()); RelativeBendpoints bendpoints = NotationFactory.eINSTANCE .createRelativeBendpoints(); @@ -1973,12 +1918,6 @@ // initializePreferences final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint .getPreferenceStore(); - - org.eclipse.swt.graphics.RGB lineRGB = PreferenceConverter.getColor( - prefStore, IPreferenceConstants.PREF_LINE_COLOR); - ViewUtil.setStructuralFeatureValue(edge, - NotationPackage.eINSTANCE.getLineStyle_LineColor(), - FigureUtilities.RGBToInteger(lineRGB)); FontStyle edgeFontStyle = (FontStyle) edge .getStyle(NotationPackage.Literals.FONT_STYLE); if (edgeFontStyle != null) { Modified: trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/providers/ElementInitializers.java =================================================================== --- trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/providers/ElementInitializers.java 2011-02-09 09:42:57 UTC (rev 29073) +++ trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/providers/ElementInitializers.java 2011-02-09 09:46:27 UTC (rev 29074) @@ -22,6 +22,7 @@ import org.eclipse.bpmn2.UserTask; import org.eclipse.emf.ecore.util.EcoreUtil; import org.jboss.tools.bpmn2.process.diagram.part.Bpmn2DiagramEditorPlugin; +import org.jboss.tools.bpmn2.process.diagram.part.Bpmn2ProcessDiagramEditorPlugin; /** * @generated @@ -40,7 +41,7 @@ Object value_0 = id_UserTask_2001(instance); instance.setId((String) value_0); } catch (RuntimeException e) { - Bpmn2DiagramEditorPlugin.getInstance().logError( + Bpmn2ProcessDiagramEditorPlugin.getInstance().logError( "Element initialization failed", e); //$NON-NLS-1$ } } @@ -53,7 +54,7 @@ Object value_0 = id_ServiceTask_2002(instance); instance.setId((String) value_0); } catch (RuntimeException e) { - Bpmn2DiagramEditorPlugin.getInstance().logError( + Bpmn2ProcessDiagramEditorPlugin.getInstance().logError( "Element initialization failed", e); //$NON-NLS-1$ } } @@ -66,7 +67,7 @@ Object value_0 = id_StartEvent_2003(instance); instance.setId((String) value_0); } catch (RuntimeException e) { - Bpmn2DiagramEditorPlugin.getInstance().logError( + Bpmn2ProcessDiagramEditorPlugin.getInstance().logError( "Element initialization failed", e); //$NON-NLS-1$ } } @@ -86,7 +87,7 @@ instance.getEventDefinitions().add((EventDefinition) value_1); } } catch (RuntimeException e) { - Bpmn2DiagramEditorPlugin.getInstance().logError( + Bpmn2ProcessDiagramEditorPlugin.getInstance().logError( "Element initialization failed", e); //$NON-NLS-1$ } } @@ -99,7 +100,7 @@ Object value_0 = id_EndEvent_2004(instance); instance.setId((String) value_0); } catch (RuntimeException e) { - Bpmn2DiagramEditorPlugin.getInstance().logError( + Bpmn2ProcessDiagramEditorPlugin.getInstance().logError( "Element initialization failed", e); //$NON-NLS-1$ } } @@ -112,7 +113,7 @@ Object value_0 = id_ExclusiveGateway_2005(instance); instance.setId((String) value_0); } catch (RuntimeException e) { - Bpmn2DiagramEditorPlugin.getInstance().logError( + Bpmn2ProcessDiagramEditorPlugin.getInstance().logError( "Element initialization failed", e); //$NON-NLS-1$ } } @@ -125,7 +126,7 @@ Object value_0 = id_ParallelGateway_2006(instance); instance.setId((String) value_0); } catch (RuntimeException e) { - Bpmn2DiagramEditorPlugin.getInstance().logError( + Bpmn2ProcessDiagramEditorPlugin.getInstance().logError( "Element initialization failed", e); //$NON-NLS-1$ } } @@ -145,7 +146,7 @@ instance.getEventDefinitions().add((EventDefinition) value_1); } } catch (RuntimeException e) { - Bpmn2DiagramEditorPlugin.getInstance().logError( + Bpmn2ProcessDiagramEditorPlugin.getInstance().logError( "Element initialization failed", e); //$NON-NLS-1$ } } @@ -165,7 +166,7 @@ instance.getEventDefinitions().add((EventDefinition) value_1); } } catch (RuntimeException e) { - Bpmn2DiagramEditorPlugin.getInstance().logError( + Bpmn2ProcessDiagramEditorPlugin.getInstance().logError( "Element initialization failed", e); //$NON-NLS-1$ } } @@ -185,7 +186,7 @@ instance.getEventDefinitions().add((EventDefinition) value_1); } } catch (RuntimeException e) { - Bpmn2DiagramEditorPlugin.getInstance().logError( + Bpmn2ProcessDiagramEditorPlugin.getInstance().logError( "Element initialization failed", e); //$NON-NLS-1$ } } @@ -205,7 +206,7 @@ instance.getEventDefinitions().add((EventDefinition) value_1); } } catch (RuntimeException e) { - Bpmn2DiagramEditorPlugin.getInstance().logError( + Bpmn2ProcessDiagramEditorPlugin.getInstance().logError( "Element initialization failed", e); //$NON-NLS-1$ } } @@ -225,7 +226,7 @@ instance.getEventDefinitions().add((EventDefinition) value_1); } } catch (RuntimeException e) { - Bpmn2DiagramEditorPlugin.getInstance().logError( + Bpmn2ProcessDiagramEditorPlugin.getInstance().logError( "Element initialization failed", e); //$NON-NLS-1$ } } @@ -245,7 +246,7 @@ instance.getEventDefinitions().add((EventDefinition) value_1); } } catch (RuntimeException e) { - Bpmn2DiagramEditorPlugin.getInstance().logError( + Bpmn2ProcessDiagramEditorPlugin.getInstance().logError( "Element initialization failed", e); //$NON-NLS-1$ } } @@ -258,7 +259,7 @@ Object value_0 = id_DataObject_2014(instance); instance.setId((String) value_0); } catch (RuntimeException e) { - Bpmn2DiagramEditorPlugin.getInstance().logError( + Bpmn2ProcessDiagramEditorPlugin.getInstance().logError( "Element initialization failed", e); //$NON-NLS-1$ } } @@ -271,7 +272,7 @@ Object value_0 = id_TextAnnotation_2015(instance); instance.setId((String) value_0); } catch (RuntimeException e) { - Bpmn2DiagramEditorPlugin.getInstance().logError( + Bpmn2ProcessDiagramEditorPlugin.getInstance().logError( "Element initialization failed", e); //$NON-NLS-1$ } } @@ -284,7 +285,7 @@ Object value_0 = id_SubProcess_2016(instance); instance.setId((String) value_0); } catch (RuntimeException e) { - Bpmn2DiagramEditorPlugin.getInstance().logError( + Bpmn2ProcessDiagramEditorPlugin.getInstance().logError( "Element initialization failed", e); //$NON-NLS-1$ } } @@ -297,7 +298,7 @@ Object value_0 = id_ScriptTask_2017(instance); instance.setId((String) value_0); } catch (RuntimeException e) { - Bpmn2DiagramEditorPlugin.getInstance().logError( + Bpmn2ProcessDiagramEditorPlugin.getInstance().logError( "Element initialization failed", e); //$NON-NLS-1$ } } @@ -310,7 +311,7 @@ Object value_0 = id_SubProcess_3001(instance); instance.setId((String) value_0); } catch (RuntimeException e) { - Bpmn2DiagramEditorPlugin.getInstance().logError( + Bpmn2ProcessDiagramEditorPlugin.getInstance().logError( "Element initialization failed", e); //$NON-NLS-1$ } } @@ -323,7 +324,7 @@ Object value_0 = id_UserTask_3002(instance); instance.setId((String) value_0); } catch (RuntimeException e) { - Bpmn2DiagramEditorPlugin.getInstance().logError( + Bpmn2ProcessDiagramEditorPlugin.getInstance().logError( "Element initialization failed", e); //$NON-NLS-1$ } } @@ -336,7 +337,7 @@ Object value_0 = id_ServiceTask_3004(instance); instance.setId((String) value_0); } catch (RuntimeException e) { - Bpmn2DiagramEditorPlugin.getInstance().logError( + Bpmn2ProcessDiagramEditorPlugin.getInstance().logError( "Element initialization failed", e); //$NON-NLS-1$ } } @@ -349,7 +350,7 @@ Object value_0 = id_StartEvent_3003(instance); instance.setId((String) value_0); } catch (RuntimeException e) { - Bpmn2DiagramEditorPlugin.getInstance().logError( + Bpmn2ProcessDiagramEditorPlugin.getInstance().logError( "Element initialization failed", e); //$NON-NLS-1$ } } @@ -369,7 +370,7 @@ instance.getEventDefinitions().add((EventDefinition) value_1); } } catch (RuntimeException e) { - Bpmn2DiagramEditorPlugin.getInstance().logError( + Bpmn2ProcessDiagramEditorPlugin.getInstance().logError( "Element initialization failed", e); //$NON-NLS-1$ } } @@ -382,7 +383,7 @@ Object value_0 = id_EndEvent_3006(instance); instance.setId((String) value_0); } catch (RuntimeException e) { - Bpmn2DiagramEditorPlugin.getInstance().logError( + Bpmn2ProcessDiagramEditorPlugin.getInstance().logError( "Element initialization failed", e); //$NON-NLS-1$ } } @@ -395,7 +396,7 @@ Object value_0 = id_ExclusiveGateway_3007(instance); instance.setId((String) value_0); } catch (RuntimeException e) { - Bpmn2DiagramEditorPlugin.getInstance().logError( + Bpmn2ProcessDiagramEditorPlugin.getInstance().logError( "Element initialization failed", e); //$NON-NLS-1$ } } @@ -408,7 +409,7 @@ Object value_0 = id_ParallelGateway_3008(instance); instance.setId((String) value_0); } catch (RuntimeException e) { - Bpmn2DiagramEditorPlugin.getInstance().logError( + Bpmn2ProcessDiagramEditorPlugin.getInstance().logError( "Element initialization failed", e); //$NON-NLS-1$ } } @@ -428,7 +429,7 @@ instance.getEventDefinitions().add((EventDefinition) value_1); } } catch (RuntimeException e) { - Bpmn2DiagramEditorPlugin.getInstance().logError( + Bpmn2ProcessDiagramEditorPlugin.getInstance().logError( "Element initialization failed", e); //$NON-NLS-1$ } } @@ -448,7 +449,7 @@ instance.getEventDefinitions().add((EventDefinition) value_1); } } catch (RuntimeException e) { - Bpmn2DiagramEditorPlugin.getInstance().logError( + Bpmn2ProcessDiagramEditorPlugin.getInstance().logError( "Element initialization failed", e); //$NON-NLS-1$ } } @@ -468,7 +469,7 @@ instance.getEventDefinitions().add((EventDefinition) value_1); } } catch (RuntimeException e) { - Bpmn2DiagramEditorPlugin.getInstance().logError( + Bpmn2ProcessDiagramEditorPlugin.getInstance().logError( "Element initialization failed", e); //$NON-NLS-1$ } } @@ -488,7 +489,7 @@ instance.getEventDefinitions().add((EventDefinition) value_1); } } catch (RuntimeException e) { - Bpmn2DiagramEditorPlugin.getInstance().logError( + Bpmn2ProcessDiagramEditorPlugin.getInstance().logError( "Element initialization failed", e); //$NON-NLS-1$ } } @@ -508,7 +509,7 @@ instance.getEventDefinitions().add((EventDefinition) value_1); } } catch (RuntimeException e) { - Bpmn2DiagramEditorPlugin.getInstance().logError( + Bpmn2ProcessDiagramEditorPlugin.getInstance().logError( "Element initialization failed", e); //$NON-NLS-1$ } } @@ -521,7 +522,7 @@ Object value_0 = id_DataObject_3014(instance); instance.setId((String) value_0); } catch (RuntimeException e) { - Bpmn2DiagramEditorPlugin.getInstance().logError( + Bpmn2ProcessDiagramEditorPlugin.getInstance().logError( "Element initialization failed", e); //$NON-NLS-1$ } } @@ -534,7 +535,7 @@ Object value_0 = id_TextAnnotation_3015(instance); instance.setId((String) value_0); } catch (RuntimeException e) { - Bpmn2DiagramEditorPlugin.getInstance().logError( + Bpmn2ProcessDiagramEditorPlugin.getInstance().logError( "Element initialization failed", e); //$NON-NLS-1$ } } @@ -547,7 +548,7 @@ Object value_0 = id_ScriptTask_3016(instance); instance.setId((String) value_0); } catch (RuntimeException e) { - Bpmn2DiagramEditorPlugin.getInstance().logError( + Bpmn2ProcessDiagramEditorPlugin.getInstance().logError( "Element initialization failed", e); //$NON-NLS-1$ } } @@ -560,7 +561,7 @@ Object value_0 = id_SequenceFlow_4001(instance); instance.setId((String) value_0); } catch (RuntimeException e) { - Bpmn2DiagramEditorPlugin.getInstance().logError( + Bpmn2ProcessDiagramEditorPlugin.getInstance().logError( "Element initialization failed", e); //$NON-NLS-1$ } } @@ -573,7 +574,7 @@ Object value_0 = id_Association_4002(instance); instance.setId((String) value_0); } catch (RuntimeException e) { - Bpmn2DiagramEditorPlugin.getInstance().logError( + Bpmn2ProcessDiagramEditorPlugin.getInstance().logError( "Element initialization failed", e); //$NON-NLS-1$ } } @@ -993,11 +994,11 @@ * @generated */ public static ElementInitializers getInstance() { - ElementInitializers cached = Bpmn2DiagramEditorPlugin.getInstance() - .getElementInitializers(); + ElementInitializers cached = Bpmn2ProcessDiagramEditorPlugin + .getInstance().getElementInitializers(); if (cached == null) { - Bpmn2DiagramEditorPlugin.getInstance().setElementInitializers( - cached = new ElementInitializers()); + Bpmn2ProcessDiagramEditorPlugin.getInstance() + .setElementInitializers(cached = new ElementInitializers()); } return cached; }

13 years, 11 months

1
0
0 / 0

JBoss Tools SVN: r29073 - in trunk/bpmn/plugins/org.jboss.tools.bpmn2.model: .settings and 2 other directories.

by jbosstools-commits＠lists.jboss.org

Author: koen.aers(a)jboss.com Date: 2011-02-09 04:42:57 -0500 (Wed, 09 Feb 2011) New Revision: 29073 Added: trunk/bpmn/plugins/org.jboss.tools.bpmn2.model/.settings/ trunk/bpmn/plugins/org.jboss.tools.bpmn2.model/.settings/org.eclipse.gmf.bridge.ui.dashboard.prefs trunk/bpmn/plugins/org.jboss.tools.bpmn2.model/model/bpmn2.gmfgraph Modified: trunk/bpmn/plugins/org.jboss.tools.bpmn2.model/gmf-templates/xpt/providers/ViewProvider.xpt trunk/bpmn/plugins/org.jboss.tools.bpmn2.model/model/bpmn.gmfgraph trunk/bpmn/plugins/org.jboss.tools.bpmn2.model/model/bpmn.process.gmfgen trunk/bpmn/plugins/org.jboss.tools.bpmn2.model/model/bpmn.process.gmftool trunk/bpmn/plugins/org.jboss.tools.bpmn2.model/model/bpmn.process.trace Log: james' icons Added: trunk/bpmn/plugins/org.jboss.tools.bpmn2.model/.settings/org.eclipse.gmf.bridge.ui.dashboard.prefs =================================================================== --- trunk/bpmn/plugins/org.jboss.tools.bpmn2.model/.settings/org.eclipse.gmf.bridge.ui.dashboard.prefs (rev 0) +++ trunk/bpmn/plugins/org.jboss.tools.bpmn2.model/.settings/org.eclipse.gmf.bridge.ui.dashboard.prefs 2011-02-09 09:42:57 UTC (rev 29073) @@ -0,0 +1,8 @@ +#Sun Jan 23 15:34:09 CET 2011 +eclipse.preferences.version=1 +gmf_dashboard/domainGenerationModel=platform\:/resource/org.eclipse.bpmn2/model/BPMN20.genmodel +gmf_dashboard/domainModel=platform\:/resource/org.eclipse.bpmn2/model/BPMN20.ecore +gmf_dashboard/generationModel=platform\:/resource/org.jboss.tools.bpmn2.model/model/bpmn.process.gmfgen +gmf_dashboard/graphicalDefinitionModel=platform\:/resource/org.jboss.tools.bpmn2.model/model/bpmn.gmfgraph +gmf_dashboard/mappingModel=platform\:/resource/org.jboss.tools.bpmn2.model/model/bpmn.process.gmfmap +gmf_dashboard/toolingDefinitionModel=platform\:/resource/org.jboss.tools.bpmn2.model/model/bpmn.process.gmftool Property changes on: trunk/bpmn/plugins/org.jboss.tools.bpmn2.model/.settings/org.eclipse.gmf.bridge.ui.dashboard.prefs ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/bpmn/plugins/org.jboss.tools.bpmn2.model/gmf-templates/xpt/providers/ViewProvider.xpt =================================================================== --- trunk/bpmn/plugins/org.jboss.tools.bpmn2.model/gmf-templates/xpt/providers/ViewProvider.xpt 2011-02-09 09:04:11 UTC (rev 29072) +++ trunk/bpmn/plugins/org.jboss.tools.bpmn2.model/gmf-templates/xpt/providers/ViewProvider.xpt 2011-02-09 09:42:57 UTC (rev 29073) @@ -251,7 +251,7 @@ «IF viewmap.canUseShapeStyle()-» org.eclipse.gmf.runtime.notation.Shape node = org.jboss.tools.bpmn2.gmf.notation.BpmnNotationFactory.INSTANCE.createShape(); «ELSE-» - org.eclipse.gmf.runtime.notation.Node node = org.eclipse.gmf.runtime.notation.NotationFactory.eINSTANCE.createNode(); + org.eclipse.gmf.runtime.notation.Shape node = org.jboss.tools.bpmn2.gmf.notation.BpmnNotationFactory.INSTANCE.createShape(); node.getStyles().add(org.eclipse.gmf.runtime.notation.NotationFactory.eINSTANCE.createDescriptionStyle());«REM»FIXME Contionally add this style, whether toolsmith needs Notes or not«ENDREM» «EXPAND xpt::diagram::views::Utils::addFontLineFillStylesConditionally('node.getStyles()') FOR viewmap-» «ENDIF-» Modified: trunk/bpmn/plugins/org.jboss.tools.bpmn2.model/model/bpmn.gmfgraph =================================================================== --- trunk/bpmn/plugins/org.jboss.tools.bpmn2.model/model/bpmn.gmfgraph 2011-02-09 09:04:11 UTC (rev 29072) +++ trunk/bpmn/plugins/org.jboss.tools.bpmn2.model/model/bpmn.gmfgraph 2011-02-09 09:42:57 UTC (rev 29073) @@ -60,475 +60,79 @@ <descriptors name="StartEventFigureDescriptor"> <actualFigure - xsi:type="gmfgraph:Rectangle" + xsi:type="gmfgraph:SVGFigure" name="StartEventFigure" - outline="false" - fill="false"> - <layout - xsi:type="gmfgraph:StackLayout"/> - <children - xsi:type="gmfgraph:Ellipse" - name="Circle"/> - </actualFigure> + documentURI="platform:/plugin/org.jboss.tools.bpmn2.process.diagram/images/events_48px_start_none.svg"/> </descriptors> <descriptors name="EndEventFigureDescriptor"> <actualFigure - xsi:type="gmfgraph:Rectangle" + xsi:type="gmfgraph:SVGFigure" name="EndEventFigure" - outline="false" - fill="false"> - <layout - xsi:type="gmfgraph:StackLayout"/> - <children - xsi:type="gmfgraph:Ellipse" - name="Circle" - lineWidth="3"/> - </actualFigure> + documentURI="platform:/plugin/org.jboss.tools.bpmn2.process.diagram/images/events_48px_end_none.svg"/> </descriptors> <descriptors name="ExclusiveGatewayFigureDescriptor"> <actualFigure - xsi:type="gmfgraph:Rectangle" + xsi:type="gmfgraph:SVGFigure" name="ExclusiveGatewayFigure" - outline="false" - fill="false"> - <layout - xsi:type="gmfgraph:StackLayout"/> - <children - xsi:type="gmfgraph:Polygon" - name="Diamond"> - <template - x="15"/> - <template - y="15"/> - <template - x="15" - y="30"/> - <template - x="30" - y="15"/> - </children> - </actualFigure> + documentURI="platform:/plugin/org.jboss.tools.bpmn2.process.diagram/images/gateways_48px_exclusive.svg"/> </descriptors> <descriptors name="ParallelGatewayFigureDescriptor"> <actualFigure - xsi:type="gmfgraph:Rectangle" + xsi:type="gmfgraph:SVGFigure" name="ParallelGatewayFigure" - outline="false" - fill="false"> - <layout - xsi:type="gmfgraph:StackLayout"/> - <children - xsi:type="gmfgraph:Polygon" - name="Diamond"> - <template - x="15"/> - <template - y="15"/> - <template - x="15" - y="30"/> - <template - x="30" - y="15"/> - </children> - <children - xsi:type="gmfgraph:Polyline" - name="Vertical"> - <template - x="15" - y="8"/> - <template - x="15" - y="22"/> - </children> - <children - xsi:type="gmfgraph:Polyline" - name="Horizontal"> - <template - x="8" - y="15"/> - <template - x="22" - y="15"/> - </children> - </actualFigure> + documentURI="platform:/plugin/org.jboss.tools.bpmn2.process.diagram/images/gateways_48px_parallel.svg"/> </descriptors> <descriptors name="MessageStartEventFigureDescriptor"> <actualFigure - xsi:type="gmfgraph:Rectangle" + xsi:type="gmfgraph:SVGFigure" name="MessageStartEventFigure" - outline="false" - fill="false"> - <layout - xsi:type="gmfgraph:StackLayout"/> - <children - xsi:type="gmfgraph:Ellipse" - name="Circle"> - <layout - xsi:type="gmfgraph:StackLayout"/> - <insets - top="6" - left="5" - bottom="6" - right="5"/> - <children - xsi:type="gmfgraph:Rectangle" - name="Rectangle"> - <layout - xsi:type="gmfgraph:StackLayout"/> - <children - xsi:type="gmfgraph:Polyline" - name="WhiteEnvelope"> - <template/> - <template - x="4" - y="4"/> - <template - x="5" - y="4"/> - <template - x="9"/> - </children> - </children> - </children> - </actualFigure> + documentURI="platform:/plugin/org.jboss.tools.bpmn2.process.diagram/images/events_48px_start_message.svg"/> </descriptors> <descriptors name="MessageEndEventFigureDescriptor"> <actualFigure - xsi:type="gmfgraph:Rectangle" + xsi:type="gmfgraph:SVGFigure" name="MessageEndEventFigure" - outline="false" - fill="false"> - <layout - xsi:type="gmfgraph:StackLayout"/> - <children - xsi:type="gmfgraph:Ellipse" - name="Circle" - lineWidth="3"> - <layout - xsi:type="gmfgraph:StackLayout"/> - <insets - top="6" - left="5" - bottom="6" - right="5"/> - <children - xsi:type="gmfgraph:Rectangle" - name="Rectangle"> - <layout - xsi:type="gmfgraph:StackLayout"/> - <backgroundColor - xsi:type="gmfgraph:ConstantColor" - value="lightGray"/> - <children - xsi:type="gmfgraph:Polyline" - name="BlackEnvelope"> - <foregroundColor - xsi:type="gmfgraph:ConstantColor"/> - <template/> - <template - x="4" - y="4"/> - <template - x="5" - y="4"/> - <template - x="9"/> - </children> - </children> - </children> - </actualFigure> + documentURI="platform:/plugin/org.jboss.tools.bpmn2.process.diagram/images/events_48px_end_message.svg"/> </descriptors> <descriptors name="TerminateEndEventFigureDescriptor"> <actualFigure - xsi:type="gmfgraph:Rectangle" + xsi:type="gmfgraph:SVGFigure" name="TerminateEndEventFigure" - outline="false" - fill="false"> - <layout - xsi:type="gmfgraph:StackLayout"/> - <children - xsi:type="gmfgraph:Ellipse" - name="Circle" - lineWidth="3"> - <layout - xsi:type="gmfgraph:StackLayout"/> - <insets - top="6" - left="6" - bottom="6" - right="6"/> - <children - xsi:type="gmfgraph:Ellipse" - name="Circle"> - <backgroundColor - xsi:type="gmfgraph:ConstantColor" - value="lightGray"/> - </children> - </children> - </actualFigure> + documentURI="platform:/plugin/org.jboss.tools.bpmn2.process.diagram/images/events_48px_end_terminate.svg"/> </descriptors> <descriptors name="MessageCatchIntermediateEventFigureDescriptor"> <actualFigure - xsi:type="gmfgraph:Rectangle" - name="MessageCatchIntermediageEventFigure" - outline="false" - fill="false"> - <layout - xsi:type="gmfgraph:StackLayout"/> - <children - xsi:type="gmfgraph:Ellipse" - name="OuterCircle"> - <layout - xsi:type="gmfgraph:StackLayout"/> - <insets - top="2" - left="2" - bottom="2" - right="2"/> - <children - xsi:type="gmfgraph:Ellipse" - name="InnerCircle"> - <layout - xsi:type="gmfgraph:StackLayout"/> - <insets - top="4" - left="3" - bottom="4" - right="3"/> - <children - xsi:type="gmfgraph:Rectangle" - name="Rectangle"> - <layout - xsi:type="gmfgraph:StackLayout"/> - <children - xsi:type="gmfgraph:Polyline" - name="Envelope"> - <template/> - <template - x="4" - y="4"/> - <template - x="5" - y="4"/> - <template - x="9"/> - </children> - </children> - </children> - </children> - </actualFigure> + xsi:type="gmfgraph:SVGFigure" + name="MessageCatchIntermediateEventFigure" + documentURI="platform:/plugin/org.jboss.tools.bpmn2.process.diagram/images/events_48px_intermediate_message_catch.svg"/> </descriptors> <descriptors name="MessageThrowIntermediateEventFigureDescriptor"> <actualFigure - xsi:type="gmfgraph:Rectangle" + xsi:type="gmfgraph:SVGFigure" name="MessageThrowIntermediateEventFigure" - outline="false" - fill="false"> - <layout - xsi:type="gmfgraph:StackLayout"/> - <children - xsi:type="gmfgraph:Ellipse" - name="OuterCircle"> - <layout - xsi:type="gmfgraph:StackLayout"/> - <insets - top="2" - left="2" - bottom="2" - right="2"/> - <children - xsi:type="gmfgraph:Ellipse" - name="InnerCircle"> - <layout - xsi:type="gmfgraph:StackLayout"/> - <insets - top="4" - left="3" - bottom="4" - right="3"/> - <children - xsi:type="gmfgraph:Rectangle" - name="Rectangle"> - <layout - xsi:type="gmfgraph:StackLayout"/> - <backgroundColor - xsi:type="gmfgraph:ConstantColor" - value="lightGray"/> - <children - xsi:type="gmfgraph:Polyline" - name="Envelope"> - <foregroundColor - xsi:type="gmfgraph:ConstantColor"/> - <template/> - <template - x="4" - y="4"/> - <template - x="5" - y="4"/> - <template - x="9"/> - </children> - </children> - </children> - </children> - </actualFigure> + documentURI="platform:/plugin/org.jboss.tools.bpmn2.process.diagram/images/events_48px_intermediate_message_throw.svg"/> </descriptors> <descriptors name="TimerCatchIntermediateEventFigureDescriptor"> <actualFigure - xsi:type="gmfgraph:Rectangle" + xsi:type="gmfgraph:SVGFigure" name="TimerCatchIntermediateEventFigure" - outline="false" - fill="false"> - <layout - xsi:type="gmfgraph:StackLayout"/> - <children - xsi:type="gmfgraph:Ellipse" - name="OuterCircle"> - <layout - xsi:type="gmfgraph:StackLayout"/> - <insets - top="2" - left="2" - bottom="2" - right="2"/> - <children - xsi:type="gmfgraph:Ellipse" - name="InnerCircle"> - <layout - xsi:type="gmfgraph:StackLayout"/> - <insets - top="3" - left="3" - bottom="3" - right="3"/> - <children - xsi:type="gmfgraph:Ellipse" - name="Clock"/> - <children - xsi:type="gmfgraph:Polyline" - name="Twelve"> - <template - x="4"/> - <template - x="4" - y="2"/> - </children> - <children - xsi:type="gmfgraph:Polyline" - name="Three"> - <template - x="7" - y="4"/> - <template - x="9" - y="4"/> - </children> - <children - xsi:type="gmfgraph:Polyline" - name="Six"> - <template - x="4" - y="7"/> - <template - x="4" - y="9"/> - </children> - <children - xsi:type="gmfgraph:Polyline" - name="Nine"> - <template - y="4"/> - <template - x="2" - y="4"/> - </children> - <children - xsi:type="gmfgraph:Polyline" - name="Big"> - <template - x="4" - y="4"/> - <template - x="6" - y="1"/> - </children> - <children - xsi:type="gmfgraph:Polyline" - name="Small"> - <template - x="4" - y="4"/> - <template - x="7" - y="7"/> - </children> - </children> - </children> - </actualFigure> + documentURI="platform:/plugin/org.jboss.tools.bpmn2.process.diagram/images/events_48px_intermediate_timer_catch.svg"/> </descriptors> <descriptors name="ErrorCatchIntermediateEventFigureDescriptor"> <actualFigure - xsi:type="gmfgraph:Rectangle" + xsi:type="gmfgraph:SVGFigure" name="ErrorCatchIntermediateEventFigure" - outline="false" - fill="false"> - <layout - xsi:type="gmfgraph:StackLayout"/> - <children - xsi:type="gmfgraph:Ellipse" - name="OuterCircle"> - <layout - xsi:type="gmfgraph:StackLayout"/> - <insets - top="2" - left="2" - bottom="2" - right="2"/> - <children - xsi:type="gmfgraph:Ellipse" - name="InnerCircle"> - <layout - xsi:type="gmfgraph:StackLayout"/> - <insets - top="3" - left="3" - bottom="3" - right="3"/> - <children - xsi:type="gmfgraph:Polygon" - name="Flash"> - <template - y="9"/> - <template - x="3"/> - <template - x="7" - y="6"/> - <template - x="10" - y="1"/> - <template - x="7" - y="10"/> - <template - x="3" - y="3"/> - </children> - </children> - </children> - </actualFigure> + documentURI="platform:/plugin/org.jboss.tools.bpmn2.process.diagram/images/events_48px_intermediate_error_catch.svg"/> </descriptors> <descriptors name="DataObjectFigureDescriptor"> @@ -631,8 +235,6 @@ <accessors figure="//@figures.0/@descriptors.18/(a)actualFigure"/> </descriptors> - <descriptors - name="EventBasedGatewayFigureDescriptor"/> </figures> <nodes name="UserTask" @@ -650,8 +252,8 @@ <facets xsi:type="gmfgraph:DefaultSizeFacet"> <defaultSize - dx="20" - dy="20"/> + dx="48" + dy="48"/> </facets> </nodes> <nodes @@ -661,8 +263,8 @@ <facets xsi:type="gmfgraph:DefaultSizeFacet"> <defaultSize - dx="20" - dy="20"/> + dx="48" + dy="48"/> </facets> </nodes> <nodes @@ -672,8 +274,8 @@ <facets xsi:type="gmfgraph:DefaultSizeFacet"> <defaultSize - dx="31" - dy="31"/> + dx="48" + dy="48"/> </facets> </nodes> <nodes @@ -683,8 +285,8 @@ <facets xsi:type="gmfgraph:DefaultSizeFacet"> <defaultSize - dx="31" - dy="31"/> + dx="48" + dy="48"/> </facets> </nodes> <nodes @@ -694,8 +296,8 @@ <facets xsi:type="gmfgraph:DefaultSizeFacet"> <defaultSize - dx="20" - dy="20"/> + dx="48" + dy="48"/> </facets> </nodes> <nodes @@ -705,8 +307,8 @@ <facets xsi:type="gmfgraph:DefaultSizeFacet"> <defaultSize - dx="20" - dy="20"/> + dx="48" + dy="48"/> </facets> </nodes> <nodes @@ -716,8 +318,8 @@ <facets xsi:type="gmfgraph:DefaultSizeFacet"> <defaultSize - dx="20" - dy="20"/> + dx="48" + dy="48"/> </facets> </nodes> <nodes @@ -727,8 +329,8 @@ <facets xsi:type="gmfgraph:DefaultSizeFacet"> <defaultSize - dx="20" - dy="20"/> + dx="48" + dy="48"/> </facets> </nodes> <nodes @@ -738,8 +340,8 @@ <facets xsi:type="gmfgraph:DefaultSizeFacet"> <defaultSize - dx="20" - dy="20"/> + dx="48" + dy="48"/> </facets> </nodes> <nodes @@ -749,8 +351,8 @@ <facets xsi:type="gmfgraph:DefaultSizeFacet"> <defaultSize - dx="20" - dy="20"/> + dx="48" + dy="48"/> </facets> </nodes> <nodes @@ -760,8 +362,8 @@ <facets xsi:type="gmfgraph:DefaultSizeFacet"> <defaultSize - dx="20" - dy="20"/> + dx="48" + dy="48"/> </facets> </nodes> <nodes Modified: trunk/bpmn/plugins/org.jboss.tools.bpmn2.model/model/bpmn.process.gmfgen =================================================================== --- trunk/bpmn/plugins/org.jboss.tools.bpmn2.model/model/bpmn.process.gmfgen 2011-02-09 09:04:11 UTC (rev 29072) +++ trunk/bpmn/plugins/org.jboss.tools.bpmn2.model/model/bpmn.process.gmfgen 2011-02-09 09:42:57 UTC (rev 29073) @@ -51,6 +51,9 @@ xsi:type="gmfgen:DefaultSizeAttributes" width="240" height="240"/> + <attributes + xsi:type="gmfgen:StyleAttributes" + fixedForeground="true"/> </viewmap> <modelFacet> <metaClass @@ -92,6 +95,10 @@ xsi:type="gmfgen:DefaultSizeAttributes" width="80" height="40"/> + <attributes + xsi:type="gmfgen:StyleAttributes" + fixedForeground="true" + fixedBackground="true"/> </viewmap> <modelFacet> <metaClass @@ -152,6 +159,10 @@ xsi:type="gmfgen:DefaultSizeAttributes" width="80" height="40"/> + <attributes + xsi:type="gmfgen:StyleAttributes" + fixedForeground="true" + fixedBackground="true"/> </viewmap> <modelFacet> <metaClass @@ -207,13 +218,13 @@ <viewmap xsi:type="gmfgen:InnerClassViewmap" className="StartEventFigureDescriptor" - classBody="
/**
 * @generated
 */
public class StartEventFigureDescriptor extends org.eclipse.draw2d.RectangleFigure {




	/**
	 * @generated
	 */
	public StartEventFigureDescriptor() {
		this.setLayoutManager(new org.eclipse.draw2d.StackLayout());
		this.setFill(false);
this.setOutline(false);
		createContents();
	}
	/**
	 * @generated
	 */
	private void createContents(){


org.eclipse.draw2d.Ellipse circle0 = new org.eclipse.draw2d.Ellipse();

this.add(circle0);


	}







}

"> + classBody="
/**
 * @generated
 */
public class StartEventFigureDescriptor extends org.eclipse.gmf.runtime.lite.svg.SVGFigure {




	/**
	 * @generated
	 */
	public StartEventFigureDescriptor() {
				this.setURI("platform:/plugin/org.jboss.tools.bpmn2.process.diagram/images/events_48px_start_none.svg");
	}





}

"> <attributes xsi:type="gmfgen:ResizeConstraints"/> <attributes xsi:type="gmfgen:DefaultSizeAttributes" - width="20" - height="20"/> + width="48" + height="48"/> </viewmap> <modelFacet modelElementSelector="//@expressionProviders/@providers.0/(a)expressions.2"> @@ -251,13 +262,13 @@ <viewmap xsi:type="gmfgen:InnerClassViewmap" className="MessageStartEventFigureDescriptor" - classBody="
/**
 * @generated
 */
public class MessageStartEventFigureDescriptor extends org.eclipse.draw2d.RectangleFigure {




	/**
	 * @generated
	 */
	public MessageStartEventFigureDescriptor() {
		this.setLayoutManager(new org.eclipse.draw2d.StackLayout());
		this.setFill(false);
this.setOutline(false);
		createContents();
	}
	/**
	 * @generated
	 */
	private void createContents(){


org.eclipse.draw2d.Ellipse circle0 = new org.eclipse.draw2d.Ellipse();

circle0.setBorder(new org.eclipse.draw2d.MarginBorder(getMapMode().DPtoLP(6)
, getMapMode().DPtoLP(5)
, getMapMode().DPtoLP(6)
, getMapMode().DPtoLP(5)
));

this.add(circle0);
circle0.setLayoutManager(new org.eclipse.draw2d.StackLayout());


org.eclipse.draw2d.RectangleFigure rectangle1 = new org.eclipse.dra! w2d.RectangleFigure();

circle0.add(rectangle1);
rectangle1.setLayoutManager(new org.eclipse.draw2d.StackLayout());


org.eclipse.draw2d.PolylineShape whiteEnvelope2 = new org.eclipse.draw2d.PolylineShape();
whiteEnvelope2.addPoint(new org.eclipse.draw2d.geometry.Point(getMapMode().DPtoLP(0)
, getMapMode().DPtoLP(0)
));
whiteEnvelope2.addPoint(new org.eclipse.draw2d.geometry.Point(getMapMode().DPtoLP(4)
, getMapMode().DPtoLP(4)
));
whiteEnvelope2.addPoint(new org.eclipse.draw2d.geometry.Point(getMapMode().DPtoLP(5)
, getMapMode().DPtoLP(4)
));
whiteEnvelope2.addPoint(new org.eclipse.draw2d.geometry.Point(getMapMode().DPtoLP(9)
, getMapMode().DPtoLP(0)
));

rectangle1.add(whiteEnvelope2);




	}







}

"> + classBody="
/**
 * @generated
 */
public class MessageStartEventFigureDescriptor extends org.eclipse.gmf.runtime.lite.svg.SVGFigure {




	/**
	 * @generated
	 */
	public MessageStartEventFigureDescriptor() {
				this.setURI("platform:/plugin/org.jboss.tools.bpmn2.process.diagram/images/events_48px_start_message.svg");
	}





}

"> <attributes xsi:type="gmfgen:ResizeConstraints"/> <attributes xsi:type="gmfgen:DefaultSizeAttributes" - width="20" - height="20"/> + width="48" + height="48"/> </viewmap> <modelFacet modelElementSelector="//@expressionProviders/@providers.0/(a)expressions.4"> @@ -301,13 +312,13 @@ <viewmap xsi:type="gmfgen:InnerClassViewmap" className="EndEventFigureDescriptor" - classBody="
/**
 * @generated
 */
public class EndEventFigureDescriptor extends org.eclipse.draw2d.RectangleFigure {




	/**
	 * @generated
	 */
	public EndEventFigureDescriptor() {
		this.setLayoutManager(new org.eclipse.draw2d.StackLayout());
		this.setFill(false);
this.setOutline(false);
		createContents();
	}
	/**
	 * @generated
	 */
	private void createContents(){


org.eclipse.draw2d.Ellipse circle0 = new org.eclipse.draw2d.Ellipse();
circle0.setLineWidth(3);

this.add(circle0);


	}







}

"> + classBody="
/**
 * @generated
 */
public class EndEventFigureDescriptor extends org.eclipse.gmf.runtime.lite.svg.SVGFigure {




	/**
	 * @generated
	 */
	public EndEventFigureDescriptor() {
				this.setURI("platform:/plugin/org.jboss.tools.bpmn2.process.diagram/images/events_48px_end_none.svg");
	}





}

"> <attributes xsi:type="gmfgen:ResizeConstraints"/> <attributes xsi:type="gmfgen:DefaultSizeAttributes" - width="20" - height="20"/> + width="48" + height="48"/> </viewmap> <modelFacet modelElementSelector="//@expressionProviders/@providers.0/(a)expressions.7"> @@ -345,13 +356,13 @@ <viewmap xsi:type="gmfgen:InnerClassViewmap" className="ExclusiveGatewayFigureDescriptor" - classBody="
/**
 * @generated
 */
public class ExclusiveGatewayFigureDescriptor extends org.eclipse.draw2d.RectangleFigure {




	/**
	 * @generated
	 */
	public ExclusiveGatewayFigureDescriptor() {
		this.setLayoutManager(new org.eclipse.draw2d.StackLayout());
		this.setFill(false);
this.setOutline(false);
		createContents();
	}
	/**
	 * @generated
	 */
	private void createContents(){


org.eclipse.draw2d.PolygonShape diamond0 = new org.eclipse.draw2d.PolygonShape();
diamond0.addPoint(new org.eclipse.draw2d.geometry.Point(getMapMode().DPtoLP(15)
, getMapMode().DPtoLP(0)
));
diamond0.addPoint(new org.eclipse.draw2d.geometry.Point(getMapMode().DPtoLP(0)
, getMapMode().DPtoLP(15)
));
diamond0.addPoint(new org.eclipse.draw2d.geometry.Point(getMapMode().DPtoLP(15)
, getMapMode().DPto! LP(30)
));
diamond0.addPoint(new org.eclipse.draw2d.geometry.Point(getMapMode().DPtoLP(30)
, getMapMode().DPtoLP(15)
));
diamond0.setFill(true);

this.add(diamond0);


	}







}

"> + classBody="
/**
 * @generated
 */
public class ExclusiveGatewayFigureDescriptor extends org.eclipse.gmf.runtime.lite.svg.SVGFigure {




	/**
	 * @generated
	 */
	public ExclusiveGatewayFigureDescriptor() {
				this.setURI("platform:/plugin/org.jboss.tools.bpmn2.process.diagram/images/gateways_48px_exclusive.svg");
	}





}

"> <attributes xsi:type="gmfgen:ResizeConstraints"/> <attributes xsi:type="gmfgen:DefaultSizeAttributes" - width="31" - height="31"/> + width="48" + height="48"/> </viewmap> <modelFacet> <metaClass @@ -388,13 +399,13 @@ <viewmap xsi:type="gmfgen:InnerClassViewmap" className="ParallelGatewayFigureDescriptor" - classBody="
/**
 * @generated
 */
public class ParallelGatewayFigureDescriptor extends org.eclipse.draw2d.RectangleFigure {




	/**
	 * @generated
	 */
	public ParallelGatewayFigureDescriptor() {
		this.setLayoutManager(new org.eclipse.draw2d.StackLayout());
		this.setFill(false);
this.setOutline(false);
		createContents();
	}
	/**
	 * @generated
	 */
	private void createContents(){


org.eclipse.draw2d.PolygonShape diamond0 = new org.eclipse.draw2d.PolygonShape();
diamond0.addPoint(new org.eclipse.draw2d.geometry.Point(getMapMode().DPtoLP(15)
, getMapMode().DPtoLP(0)
));
diamond0.addPoint(new org.eclipse.draw2d.geometry.Point(getMapMode().DPtoLP(0)
, getMapMode().DPtoLP(15)
));
diamond0.addPoint(new org.eclipse.draw2d.geometry.Point(getMapMode().DPtoLP(15)
, getMapMode().DPtoLP! (30)
));
diamond0.addPoint(new org.eclipse.draw2d.geometry.Point(getMapMode().DPtoLP(30)
, getMapMode().DPtoLP(15)
));
diamond0.setFill(true);

this.add(diamond0);



org.eclipse.draw2d.PolylineShape vertical0 = new org.eclipse.draw2d.PolylineShape();
vertical0.addPoint(new org.eclipse.draw2d.geometry.Point(getMapMode().DPtoLP(15)
, getMapMode().DPtoLP(8)
));
vertical0.addPoint(new org.eclipse.draw2d.geometry.Point(getMapMode().DPtoLP(15)
, getMapMode().DPtoLP(22)
));

this.add(vertical0);



org.eclipse.draw2d.PolylineShape horizontal0 = new org.eclipse.draw2d.PolylineShape();
horizontal0.addPoint(new org.eclipse.draw2d.geometry.Point(getMapMode().DPtoLP(8)
, getMapMode().DPtoLP(15)
));
horizontal0.addPoint(new org.eclipse.draw2d.geometry.Point(getMapMode().DPtoLP(22)
, getMapMode().DPtoLP(15)
));

this.add(horizontal0);


	}

! 





}

"> + classBody="
/**
 * @generated
 */
public class ParallelGatewayFigureDescriptor extends org.eclipse.gmf.runtime.lite.svg.SVGFigure {




	/**
	 * @generated
	 */
	public ParallelGatewayFigureDescriptor() {
				this.setURI("platform:/plugin/org.jboss.tools.bpmn2.process.diagram/images/gateways_48px_parallel.svg");
	}





}

"> <attributes xsi:type="gmfgen:ResizeConstraints"/> <attributes xsi:type="gmfgen:DefaultSizeAttributes" - width="31" - height="31"/> + width="48" + height="48"/> </viewmap> <modelFacet> <metaClass @@ -431,13 +442,13 @@ <viewmap xsi:type="gmfgen:InnerClassViewmap" className="MessageEndEventFigureDescriptor" - classBody="
/**
 * @generated
 */
public class MessageEndEventFigureDescriptor extends org.eclipse.draw2d.RectangleFigure {




	/**
	 * @generated
	 */
	public MessageEndEventFigureDescriptor() {
		this.setLayoutManager(new org.eclipse.draw2d.StackLayout());
		this.setFill(false);
this.setOutline(false);
		createContents();
	}
	/**
	 * @generated
	 */
	private void createContents(){


org.eclipse.draw2d.Ellipse circle0 = new org.eclipse.draw2d.Ellipse();
circle0.setLineWidth(3);

circle0.setBorder(new org.eclipse.draw2d.MarginBorder(getMapMode().DPtoLP(6)
, getMapMode().DPtoLP(5)
, getMapMode().DPtoLP(6)
, getMapMode().DPtoLP(5)
));

this.add(circle0);
circle0.setLayoutManager(new org.eclipse.draw2d.StackLayout());


org.eclipse.draw2d.RectangleFigure rectang! le1 = new org.eclipse.draw2d.RectangleFigure();
	rectangle1.setBackgroundColor(org.eclipse.draw2d.ColorConstants.lightGray);

circle0.add(rectangle1);
rectangle1.setLayoutManager(new org.eclipse.draw2d.StackLayout());


org.eclipse.draw2d.PolylineShape blackEnvelope2 = new org.eclipse.draw2d.PolylineShape();
blackEnvelope2.addPoint(new org.eclipse.draw2d.geometry.Point(getMapMode().DPtoLP(0)
, getMapMode().DPtoLP(0)
));
blackEnvelope2.addPoint(new org.eclipse.draw2d.geometry.Point(getMapMode().DPtoLP(4)
, getMapMode().DPtoLP(4)
));
blackEnvelope2.addPoint(new org.eclipse.draw2d.geometry.Point(getMapMode().DPtoLP(5)
, getMapMode().DPtoLP(4)
));
blackEnvelope2.addPoint(new org.eclipse.draw2d.geometry.Point(getMapMode().DPtoLP(9)
, getMapMode().DPtoLP(0)
));
	blackEnvelope2.setForegroundColor(org.eclipse.draw2d.ColorConstants.white);

rectangle1.add(blackEnvelope2);


&#! xA;
	}







}
&#! xA;"> + classBody="
/**
 * @generated
 */
public class MessageEndEventFigureDescriptor extends org.eclipse.gmf.runtime.lite.svg.SVGFigure {




	/**
	 * @generated
	 */
	public MessageEndEventFigureDescriptor() {
				this.setURI("platform:/plugin/org.jboss.tools.bpmn2.process.diagram/images/events_48px_end_message.svg");
	}





}

"> <attributes xsi:type="gmfgen:ResizeConstraints"/> <attributes xsi:type="gmfgen:DefaultSizeAttributes" - width="20" - height="20"/> + width="48" + height="48"/> </viewmap> <modelFacet modelElementSelector="//@expressionProviders/@providers.0/(a)expressions.11"> @@ -481,13 +492,13 @@ <viewmap xsi:type="gmfgen:InnerClassViewmap" className="TerminateEndEventFigureDescriptor" - classBody="
/**
 * @generated
 */
public class TerminateEndEventFigureDescriptor extends org.eclipse.draw2d.RectangleFigure {




	/**
	 * @generated
	 */
	public TerminateEndEventFigureDescriptor() {
		this.setLayoutManager(new org.eclipse.draw2d.StackLayout());
		this.setFill(false);
this.setOutline(false);
		createContents();
	}
	/**
	 * @generated
	 */
	private void createContents(){


org.eclipse.draw2d.Ellipse circle0 = new org.eclipse.draw2d.Ellipse();
circle0.setLineWidth(3);

circle0.setBorder(new org.eclipse.draw2d.MarginBorder(getMapMode().DPtoLP(6)
, getMapMode().DPtoLP(6)
, getMapMode().DPtoLP(6)
, getMapMode().DPtoLP(6)
));

this.add(circle0);
circle0.setLayoutManager(new org.eclipse.draw2d.StackLayout());


org.eclipse.draw2d.Ellipse circle1 = n! ew org.eclipse.draw2d.Ellipse();
	circle1.setBackgroundColor(org.eclipse.draw2d.ColorConstants.lightGray);

circle0.add(circle1);



	}







}

"> + classBody="
/**
 * @generated
 */
public class TerminateEndEventFigureDescriptor extends org.eclipse.gmf.runtime.lite.svg.SVGFigure {




	/**
	 * @generated
	 */
	public TerminateEndEventFigureDescriptor() {
				this.setURI("platform:/plugin/org.jboss.tools.bpmn2.process.diagram/images/events_48px_end_terminate.svg");
	}





}

"> <attributes xsi:type="gmfgen:ResizeConstraints"/> <attributes xsi:type="gmfgen:DefaultSizeAttributes" - width="20" - height="20"/> + width="48" + height="48"/> </viewmap> <modelFacet modelElementSelector="//@expressionProviders/@providers.0/(a)expressions.14"> @@ -531,11 +542,13 @@ <viewmap xsi:type="gmfgen:InnerClassViewmap" className="MessageCatchIntermediateEventFigureDescriptor" - classBody="
/**
 * @generated
 */
public class MessageCatchIntermediateEventFigureDescriptor extends org.eclipse.draw2d.RectangleFigure {




	/**
	 * @generated
	 */
	public MessageCatchIntermediateEventFigureDescriptor() {
		this.setLayoutManager(new org.eclipse.draw2d.StackLayout());
		this.setFill(false);
this.setOutline(false);
		createContents();
	}
	/**
	 * @generated
	 */
	private void createContents(){


org.eclipse.draw2d.Ellipse outerCircle0 = new org.eclipse.draw2d.Ellipse();

outerCircle0.setBorder(new org.eclipse.draw2d.MarginBorder(getMapMode().DPtoLP(2)
, getMapMode().DPtoLP(2)
, getMapMode().DPtoLP(2)
, getMapMode().DPtoLP(2)
));

this.add(outerCircle0);
outerCircle0.setLayoutManager(new org.eclipse.draw2d.StackLayout());


org.eclipse.draw2d.Elli! pse innerCircle1 = new org.eclipse.draw2d.Ellipse();

innerCircle1.setBorder(new org.eclipse.draw2d.MarginBorder(getMapMode().DPtoLP(4)
, getMapMode().DPtoLP(3)
, getMapMode().DPtoLP(4)
, getMapMode().DPtoLP(3)
));

outerCircle0.add(innerCircle1);
innerCircle1.setLayoutManager(new org.eclipse.draw2d.StackLayout());


org.eclipse.draw2d.RectangleFigure rectangle2 = new org.eclipse.draw2d.RectangleFigure();

innerCircle1.add(rectangle2);
rectangle2.setLayoutManager(new org.eclipse.draw2d.StackLayout());


org.eclipse.draw2d.PolylineShape envelope3 = new org.eclipse.draw2d.PolylineShape();
envelope3.addPoint(new org.eclipse.draw2d.geometry.Point(getMapMode().DPtoLP(0)
, getMapMode().DPtoLP(0)
));
envelope3.addPoint(new org.eclipse.draw2d.geometry.Point(getMapMode().DPtoLP(4)
, getMapMode().DPtoLP(4)
));
envelope3.addPoint(new org.eclipse.draw2d.geometry.Point(getMapMode().DPtoLP! (5)
, getMapMode().DPtoLP(4)
));
envelope3.addPoin! t(new or g.eclipse.draw2d.geometry.Point(getMapMode().DPtoLP(9)
, getMapMode().DPtoLP(0)
));

rectangle2.add(envelope3);





	}







}

"> + classBody="
/**
 * @generated
 */
public class MessageCatchIntermediateEventFigureDescriptor extends org.eclipse.gmf.runtime.lite.svg.SVGFigure {




	/**
	 * @generated
	 */
	public MessageCatchIntermediateEventFigureDescriptor() {
				this.setURI("platform:/plugin/org.jboss.tools.bpmn2.process.diagram/images/events_48px_intermediate_message_catch.svg");
	}





}

"> <attributes + xsi:type="gmfgen:ResizeConstraints"/> + <attributes xsi:type="gmfgen:DefaultSizeAttributes" - width="20" - height="20"/> + width="48" + height="48"/> </viewmap> <modelFacet modelElementSelector="//@expressionProviders/@providers.0/(a)expressions.17"> @@ -579,13 +592,13 @@ <viewmap xsi:type="gmfgen:InnerClassViewmap" className="MessageThrowIntermediateEventFigureDescriptor" - classBody="
/**
 * @generated
 */
public class MessageThrowIntermediateEventFigureDescriptor extends org.eclipse.draw2d.RectangleFigure {




	/**
	 * @generated
	 */
	public MessageThrowIntermediateEventFigureDescriptor() {
		this.setLayoutManager(new org.eclipse.draw2d.StackLayout());
		this.setFill(false);
this.setOutline(false);
		createContents();
	}
	/**
	 * @generated
	 */
	private void createContents(){


org.eclipse.draw2d.Ellipse outerCircle0 = new org.eclipse.draw2d.Ellipse();

outerCircle0.setBorder(new org.eclipse.draw2d.MarginBorder(getMapMode().DPtoLP(2)
, getMapMode().DPtoLP(2)
, getMapMode().DPtoLP(2)
, getMapMode().DPtoLP(2)
));

this.add(outerCircle0);
outerCircle0.setLayoutManager(new org.eclipse.draw2d.StackLayout());


org.eclipse.draw2d.Elli! pse innerCircle1 = new org.eclipse.draw2d.Ellipse();

innerCircle1.setBorder(new org.eclipse.draw2d.MarginBorder(getMapMode().DPtoLP(4)
, getMapMode().DPtoLP(3)
, getMapMode().DPtoLP(4)
, getMapMode().DPtoLP(3)
));

outerCircle0.add(innerCircle1);
innerCircle1.setLayoutManager(new org.eclipse.draw2d.StackLayout());


org.eclipse.draw2d.RectangleFigure rectangle2 = new org.eclipse.draw2d.RectangleFigure();
	rectangle2.setBackgroundColor(org.eclipse.draw2d.ColorConstants.lightGray);

innerCircle1.add(rectangle2);
rectangle2.setLayoutManager(new org.eclipse.draw2d.StackLayout());


org.eclipse.draw2d.PolylineShape envelope3 = new org.eclipse.draw2d.PolylineShape();
envelope3.addPoint(new org.eclipse.draw2d.geometry.Point(getMapMode().DPtoLP(0)
, getMapMode().DPtoLP(0)
));
envelope3.addPoint(new org.eclipse.draw2d.geometry.Point(getMapMode().DPtoLP(4)
, getMapMode().DPtoLP(4)&#xA! ;));
envelope3.addPoint(new org.eclipse.draw2d.geometry.Po! int(getM apMode().DPtoLP(5)
, getMapMode().DPtoLP(4)
));
envelope3.addPoint(new org.eclipse.draw2d.geometry.Point(getMapMode().DPtoLP(9)
, getMapMode().DPtoLP(0)
));
	envelope3.setForegroundColor(org.eclipse.draw2d.ColorConstants.white);

rectangle2.add(envelope3);





	}







}

"> + classBody="
/**
 * @generated
 */
public class MessageThrowIntermediateEventFigureDescriptor extends org.eclipse.gmf.runtime.lite.svg.SVGFigure {




	/**
	 * @generated
	 */
	public MessageThrowIntermediateEventFigureDescriptor() {
				this.setURI("platform:/plugin/org.jboss.tools.bpmn2.process.diagram/images/events_48px_intermediate_message_throw.svg");
	}





}

"> <attributes xsi:type="gmfgen:ResizeConstraints"/> <attributes xsi:type="gmfgen:DefaultSizeAttributes" - width="20" - height="20"/> + width="48" + height="48"/> </viewmap> <modelFacet modelElementSelector="//@expressionProviders/@providers.0/(a)expressions.20"> @@ -629,13 +642,13 @@ <viewmap xsi:type="gmfgen:InnerClassViewmap" className="TimerCatchIntermediateEventFigureDescriptor" - classBody="
/**
 * @generated
 */
public class TimerCatchIntermediateEventFigureDescriptor extends org.eclipse.draw2d.RectangleFigure {




	/**
	 * @generated
	 */
	public TimerCatchIntermediateEventFigureDescriptor() {
		this.setLayoutManager(new org.eclipse.draw2d.StackLayout());
		this.setFill(false);
this.setOutline(false);
		createContents();
	}
	/**
	 * @generated
	 */
	private void createContents(){


org.eclipse.draw2d.Ellipse outerCircle0 = new org.eclipse.draw2d.Ellipse();

outerCircle0.setBorder(new org.eclipse.draw2d.MarginBorder(getMapMode().DPtoLP(2)
, getMapMode().DPtoLP(2)
, getMapMode().DPtoLP(2)
, getMapMode().DPtoLP(2)
));

this.add(outerCircle0);
outerCircle0.setLayoutManager(new org.eclipse.draw2d.StackLayout());


org.eclipse.draw2d.Ellipse ! innerCircle1 = new org.eclipse.draw2d.Ellipse();

innerCircle1.setBorder(new org.eclipse.draw2d.MarginBorder(getMapMode().DPtoLP(3)
, getMapMode().DPtoLP(3)
, getMapMode().DPtoLP(3)
, getMapMode().DPtoLP(3)
));

outerCircle0.add(innerCircle1);
innerCircle1.setLayoutManager(new org.eclipse.draw2d.StackLayout());


org.eclipse.draw2d.Ellipse clock2 = new org.eclipse.draw2d.Ellipse();

innerCircle1.add(clock2);



org.eclipse.draw2d.PolylineShape twelve2 = new org.eclipse.draw2d.PolylineShape();
twelve2.addPoint(new org.eclipse.draw2d.geometry.Point(getMapMode().DPtoLP(4)
, getMapMode().DPtoLP(0)
));
twelve2.addPoint(new org.eclipse.draw2d.geometry.Point(getMapMode().DPtoLP(4)
, getMapMode().DPtoLP(2)
));

innerCircle1.add(twelve2);



org.eclipse.draw2d.PolylineShape three2 = new org.eclipse.draw2d.PolylineShape();
three2.addPoint(new org.eclipse.draw2d.! geometry.Point(getMapMode().DPtoLP(7)
, getMapMode().DPtoL! P(4)&#xA ;));
three2.addPoint(new org.eclipse.draw2d.geometry.Point(getMapMode().DPtoLP(9)
, getMapMode().DPtoLP(4)
));

innerCircle1.add(three2);



org.eclipse.draw2d.PolylineShape six2 = new org.eclipse.draw2d.PolylineShape();
six2.addPoint(new org.eclipse.draw2d.geometry.Point(getMapMode().DPtoLP(4)
, getMapMode().DPtoLP(7)
));
six2.addPoint(new org.eclipse.draw2d.geometry.Point(getMapMode().DPtoLP(4)
, getMapMode().DPtoLP(9)
));

innerCircle1.add(six2);



org.eclipse.draw2d.PolylineShape nine2 = new org.eclipse.draw2d.PolylineShape();
nine2.addPoint(new org.eclipse.draw2d.geometry.Point(getMapMode().DPtoLP(0)
, getMapMode().DPtoLP(4)
));
nine2.addPoint(new org.eclipse.draw2d.geometry.Point(getMapMode().DPtoLP(2)
, getMapMode().DPtoLP(4)
));

innerCircle1.add(nine2);



org.eclipse.draw2d.PolylineShape big2 = new org.eclipse.draw2d.PolylineShape();&! #xA;big2.addPoint(new org.eclipse.draw2d.geometry.Point(getMapMode().DPtoLP(4)
, getMapMode().DPtoLP(4)
));
big2.addPoint(new org.eclipse.draw2d.geometry.Point(getMapMode().DPtoLP(6)
, getMapMode().DPtoLP(1)
));

innerCircle1.add(big2);



org.eclipse.draw2d.PolylineShape small2 = new org.eclipse.draw2d.PolylineShape();
small2.addPoint(new org.eclipse.draw2d.geometry.Point(getMapMode().DPtoLP(4)
, getMapMode().DPtoLP(4)
));
small2.addPoint(new org.eclipse.draw2d.geometry.Point(getMapMode().DPtoLP(7)
, getMapMode().DPtoLP(7)
));

innerCircle1.add(small2);




	}







}

"> + classBody="
/**
 * @generated
 */
public class TimerCatchIntermediateEventFigureDescriptor extends org.eclipse.gmf.runtime.lite.svg.SVGFigure {




	/**
	 * @generated
	 */
	public TimerCatchIntermediateEventFigureDescriptor() {
				this.setURI("platform:/plugin/org.jboss.tools.bpmn2.process.diagram/images/events_48px_intermediate_timer_catch.svg");
	}





}

"> <attributes xsi:type="gmfgen:ResizeConstraints"/> <attributes xsi:type="gmfgen:DefaultSizeAttributes" - width="20" - height="20"/> + width="48" + height="48"/> </viewmap> <modelFacet modelElementSelector="//@expressionProviders/@providers.0/(a)expressions.23"> @@ -745,6 +758,9 @@ xsi:type="gmfgen:DefaultSizeAttributes" width="120" height="20"/> + <attributes + xsi:type="gmfgen:StyleAttributes" + fixedForeground="true"/> </viewmap> <modelFacet> <metaClass @@ -805,6 +821,10 @@ xsi:type="gmfgen:DefaultSizeAttributes" width="80" height="40"/> + <attributes + xsi:type="gmfgen:StyleAttributes" + fixedForeground="true" + fixedBackground="true"/> </viewmap> <modelFacet> <metaClass @@ -864,6 +884,10 @@ xsi:type="gmfgen:DefaultSizeAttributes" width="80" height="40"/> + <attributes + xsi:type="gmfgen:StyleAttributes" + fixedForeground="true" + fixedBackground="true"/> </viewmap> <modelFacet> <metaClass @@ -923,6 +947,10 @@ xsi:type="gmfgen:DefaultSizeAttributes" width="80" height="40"/> + <attributes + xsi:type="gmfgen:StyleAttributes" + fixedForeground="true" + fixedBackground="true"/> </viewmap> <modelFacet> <metaClass @@ -977,13 +1005,13 @@ <viewmap xsi:type="gmfgen:InnerClassViewmap" className="StartEventFigureDescriptor" - classBody="
/**
 * @generated
 */
public class StartEventFigureDescriptor extends org.eclipse.draw2d.RectangleFigure {




	/**
	 * @generated
	 */
	public StartEventFigureDescriptor() {
		this.setLayoutManager(new org.eclipse.draw2d.StackLayout());
		this.setFill(false);
this.setOutline(false);
		createContents();
	}
	/**
	 * @generated
	 */
	private void createContents(){


org.eclipse.draw2d.Ellipse circle0 = new org.eclipse.draw2d.Ellipse();

this.add(circle0);


	}







}

"> + classBody="
/**
 * @generated
 */
public class StartEventFigureDescriptor extends org.eclipse.gmf.runtime.lite.svg.SVGFigure {




	/**
	 * @generated
	 */
	public StartEventFigureDescriptor() {
				this.setURI("platform:/plugin/org.jboss.tools.bpmn2.process.diagram/images/events_48px_start_none.svg");
	}





}

"> <attributes xsi:type="gmfgen:ResizeConstraints"/> <attributes xsi:type="gmfgen:DefaultSizeAttributes" - width="20" - height="20"/> + width="48" + height="48"/> </viewmap> <modelFacet modelElementSelector="//@expressionProviders/@providers.0/(a)expressions.2"> @@ -1020,13 +1048,13 @@ <viewmap xsi:type="gmfgen:InnerClassViewmap" className="MessageStartEventFigureDescriptor" - classBody="
/**
 * @generated
 */
public class MessageStartEventFigureDescriptor extends org.eclipse.draw2d.RectangleFigure {




	/**
	 * @generated
	 */
	public MessageStartEventFigureDescriptor() {
		this.setLayoutManager(new org.eclipse.draw2d.StackLayout());
		this.setFill(false);
this.setOutline(false);
		createContents();
	}
	/**
	 * @generated
	 */
	private void createContents(){


org.eclipse.draw2d.Ellipse circle0 = new org.eclipse.draw2d.Ellipse();

circle0.setBorder(new org.eclipse.draw2d.MarginBorder(getMapMode().DPtoLP(6)
, getMapMode().DPtoLP(5)
, getMapMode().DPtoLP(6)
, getMapMode().DPtoLP(5)
));

this.add(circle0);
circle0.setLayoutManager(new org.eclipse.draw2d.StackLayout());


org.eclipse.draw2d.RectangleFigure rectangle1 = new org.eclipse.dra! w2d.RectangleFigure();

circle0.add(rectangle1);
rectangle1.setLayoutManager(new org.eclipse.draw2d.StackLayout());


org.eclipse.draw2d.PolylineShape whiteEnvelope2 = new org.eclipse.draw2d.PolylineShape();
whiteEnvelope2.addPoint(new org.eclipse.draw2d.geometry.Point(getMapMode().DPtoLP(0)
, getMapMode().DPtoLP(0)
));
whiteEnvelope2.addPoint(new org.eclipse.draw2d.geometry.Point(getMapMode().DPtoLP(4)
, getMapMode().DPtoLP(4)
));
whiteEnvelope2.addPoint(new org.eclipse.draw2d.geometry.Point(getMapMode().DPtoLP(5)
, getMapMode().DPtoLP(4)
));
whiteEnvelope2.addPoint(new org.eclipse.draw2d.geometry.Point(getMapMode().DPtoLP(9)
, getMapMode().DPtoLP(0)
));

rectangle1.add(whiteEnvelope2);




	}







}

"> + classBody="
/**
 * @generated
 */
public class MessageStartEventFigureDescriptor extends org.eclipse.gmf.runtime.lite.svg.SVGFigure {




	/**
	 * @generated
	 */
	public MessageStartEventFigureDescriptor() {
				this.setURI("platform:/plugin/org.jboss.tools.bpmn2.process.diagram/images/events_48px_start_message.svg");
	}





}

"> <attributes xsi:type="gmfgen:ResizeConstraints"/> <attributes xsi:type="gmfgen:DefaultSizeAttributes" - width="20" - height="20"/> + width="48" + height="48"/> </viewmap> <modelFacet modelElementSelector="//@expressionProviders/@providers.0/(a)expressions.4"> @@ -1069,13 +1097,13 @@ <viewmap xsi:type="gmfgen:InnerClassViewmap" className="EndEventFigureDescriptor" - classBody="
/**
 * @generated
 */
public class EndEventFigureDescriptor extends org.eclipse.draw2d.RectangleFigure {




	/**
	 * @generated
	 */
	public EndEventFigureDescriptor() {
		this.setLayoutManager(new org.eclipse.draw2d.StackLayout());
		this.setFill(false);
this.setOutline(false);
		createContents();
	}
	/**
	 * @generated
	 */
	private void createContents(){


org.eclipse.draw2d.Ellipse circle0 = new org.eclipse.draw2d.Ellipse();
circle0.setLineWidth(3);

this.add(circle0);


	}







}

"> + classBody="
/**
 * @generated
 */
public class EndEventFigureDescriptor extends org.eclipse.gmf.runtime.lite.svg.SVGFigure {




	/**
	 * @generated
	 */
	public EndEventFigureDescriptor() {
				this.setURI("platform:/plugin/org.jboss.tools.bpmn2.process.diagram/images/events_48px_end_none.svg");
	}





}

"> <attributes xsi:type="gmfgen:ResizeConstraints"/> <attributes xsi:type="gmfgen:DefaultSizeAttributes" - width="20" - height="20"/> + width="48" + height="48"/> </viewmap> <modelFacet modelElementSelector="//@expressionProviders/@providers.0/(a)expressions.7"> @@ -1112,13 +1140,13 @@ <viewmap xsi:type="gmfgen:InnerClassViewmap" className="ExclusiveGatewayFigureDescriptor" - classBody="
/**
 * @generated
 */
public class ExclusiveGatewayFigureDescriptor extends org.eclipse.draw2d.RectangleFigure {




	/**
	 * @generated
	 */
	public ExclusiveGatewayFigureDescriptor() {
		this.setLayoutManager(new org.eclipse.draw2d.StackLayout());
		this.setFill(false);
this.setOutline(false);
		createContents();
	}
	/**
	 * @generated
	 */
	private void createContents(){


org.eclipse.draw2d.PolygonShape diamond0 = new org.eclipse.draw2d.PolygonShape();
diamond0.addPoint(new org.eclipse.draw2d.geometry.Point(getMapMode().DPtoLP(15)
, getMapMode().DPtoLP(0)
));
diamond0.addPoint(new org.eclipse.draw2d.geometry.Point(getMapMode().DPtoLP(0)
, getMapMode().DPtoLP(15)
));
diamond0.addPoint(new org.eclipse.draw2d.geometry.Point(getMapMode().DPtoLP(15)
, getMapMode().DPto! LP(30)
));
diamond0.addPoint(new org.eclipse.draw2d.geometry.Point(getMapMode().DPtoLP(30)
, getMapMode().DPtoLP(15)
));
diamond0.setFill(true);

this.add(diamond0);


	}







}

"> + classBody="
/**
 * @generated
 */
public class ExclusiveGatewayFigureDescriptor extends org.eclipse.gmf.runtime.lite.svg.SVGFigure {




	/**
	 * @generated
	 */
	public ExclusiveGatewayFigureDescriptor() {
				this.setURI("platform:/plugin/org.jboss.tools.bpmn2.process.diagram/images/gateways_48px_exclusive.svg");
	}





}

"> <attributes xsi:type="gmfgen:ResizeConstraints"/> <attributes xsi:type="gmfgen:DefaultSizeAttributes" - width="31" - height="31"/> + width="48" + height="48"/> </viewmap> <modelFacet> <metaClass @@ -1154,13 +1182,13 @@ <viewmap xsi:type="gmfgen:InnerClassViewmap" className="ParallelGatewayFigureDescriptor" - classBody="
/**
 * @generated
 */
public class ParallelGatewayFigureDescriptor extends org.eclipse.draw2d.RectangleFigure {




	/**
	 * @generated
	 */
	public ParallelGatewayFigureDescriptor() {
		this.setLayoutManager(new org.eclipse.draw2d.StackLayout());
		this.setFill(false);
this.setOutline(false);
		createContents();
	}
	/**
	 * @generated
	 */
	private void createContents(){


org.eclipse.draw2d.PolygonShape diamond0 = new org.eclipse.draw2d.PolygonShape();
diamond0.addPoint(new org.eclipse.draw2d.geometry.Point(getMapMode().DPtoLP(15)
, getMapMode().DPtoLP(0)
));
diamond0.addPoint(new org.eclipse.draw2d.geometry.Point(getMapMode().DPtoLP(0)
, getMapMode().DPtoLP(15)
));
diamond0.addPoint(new org.eclipse.draw2d.geometry.Point(getMapMode().DPtoLP(15)
, getMapMode().DPtoLP! (30)
));
diamond0.addPoint(new org.eclipse.draw2d.geometry.Point(getMapMode().DPtoLP(30)
, getMapMode().DPtoLP(15)
));
diamond0.setFill(true);

this.add(diamond0);



org.eclipse.draw2d.PolylineShape vertical0 = new org.eclipse.draw2d.PolylineShape();
vertical0.addPoint(new org.eclipse.draw2d.geometry.Point(getMapMode().DPtoLP(15)
, getMapMode().DPtoLP(8)
));
vertical0.addPoint(new org.eclipse.draw2d.geometry.Point(getMapMode().DPtoLP(15)
, getMapMode().DPtoLP(22)
));

this.add(vertical0);



org.eclipse.draw2d.PolylineShape horizontal0 = new org.eclipse.draw2d.PolylineShape();
horizontal0.addPoint(new org.eclipse.draw2d.geometry.Point(getMapMode().DPtoLP(8)
, getMapMode().DPtoLP(15)
));
horizontal0.addPoint(new org.eclipse.draw2d.geometry.Point(getMapMode().DPtoLP(22)
, getMapMode().DPtoLP(15)
));

this.add(horizontal0);


	}

! 





}

"> + classBody="
/**
 * @generated
 */
public class ParallelGatewayFigureDescriptor extends org.eclipse.gmf.runtime.lite.svg.SVGFigure {




	/**
	 * @generated
	 */
	public ParallelGatewayFigureDescriptor() {
				this.setURI("platform:/plugin/org.jboss.tools.bpmn2.process.diagram/images/gateways_48px_parallel.svg");
	}





}

"> <attributes xsi:type="gmfgen:ResizeConstraints"/> <attributes xsi:type="gmfgen:DefaultSizeAttributes" - width="31" - height="31"/> + width="48" + height="48"/> </viewmap> <modelFacet> <metaClass @@ -1196,13 +1224,13 @@ <viewmap xsi:type="gmfgen:InnerClassViewmap" className="MessageEndEventFigureDescriptor" - classBody="
/**
 * @generated
 */
public class MessageEndEventFigureDescriptor extends org.eclipse.draw2d.RectangleFigure {




	/**
	 * @generated
	 */
	public MessageEndEventFigureDescriptor() {
		this.setLayoutManager(new org.eclipse.draw2d.StackLayout());
		this.setFill(false);
this.setOutline(false);
		createContents();
	}
	/**
	 * @generated
	 */
	private void createContents(){


org.eclipse.draw2d.Ellipse circle0 = new org.eclipse.draw2d.Ellipse();
circle0.setLineWidth(3);

circle0.setBorder(new org.eclipse.draw2d.MarginBorder(getMapMode().DPtoLP(6)
, getMapMode().DPtoLP(5)
, getMapMode().DPtoLP(6)
, getMapMode().DPtoLP(5)
));

this.add(circle0);
circle0.setLayoutManager(new org.eclipse.draw2d.StackLayout());


org.eclipse.draw2d.RectangleFigure rectang! le1 = new org.eclipse.draw2d.RectangleFigure();
	rectangle1.setBackgroundColor(org.eclipse.draw2d.ColorConstants.lightGray);

circle0.add(rectangle1);
rectangle1.setLayoutManager(new org.eclipse.draw2d.StackLayout());


org.eclipse.draw2d.PolylineShape blackEnvelope2 = new org.eclipse.draw2d.PolylineShape();
blackEnvelope2.addPoint(new org.eclipse.draw2d.geometry.Point(getMapMode().DPtoLP(0)
, getMapMode().DPtoLP(0)
));
blackEnvelope2.addPoint(new org.eclipse.draw2d.geometry.Point(getMapMode().DPtoLP(4)
, getMapMode().DPtoLP(4)
));
blackEnvelope2.addPoint(new org.eclipse.draw2d.geometry.Point(getMapMode().DPtoLP(5)
, getMapMode().DPtoLP(4)
));
blackEnvelope2.addPoint(new org.eclipse.draw2d.geometry.Point(getMapMode().DPtoLP(9)
, getMapMode().DPtoLP(0)
));
	blackEnvelope2.setForegroundColor(org.eclipse.draw2d.ColorConstants.white);

rectangle1.add(blackEnvelope2);


&#! xA;
	}







}
&#! xA;"> + classBody="
/**
 * @generated
 */
public class MessageEndEventFigureDescriptor extends org.eclipse.gmf.runtime.lite.svg.SVGFigure {




	/**
	 * @generated
	 */
	public MessageEndEventFigureDescriptor() {
				this.setURI("platform:/plugin/org.jboss.tools.bpmn2.process.diagram/images/events_48px_end_message.svg");
	}





}

"> <attributes xsi:type="gmfgen:ResizeConstraints"/> <attributes xsi:type="gmfgen:DefaultSizeAttributes" - width="20" - height="20"/> + width="48" + height="48"/> </viewmap> <modelFacet modelElementSelector="//@expressionProviders/@providers.0/(a)expressions.11"> @@ -1245,13 +1273,13 @@ <viewmap xsi:type="gmfgen:InnerClassViewmap" className="TerminateEndEventFigureDescriptor" - classBody="
/**
 * @generated
 */
public class TerminateEndEventFigureDescriptor extends org.eclipse.draw2d.RectangleFigure {




	/**
	 * @generated
	 */
	public TerminateEndEventFigureDescriptor() {
		this.setLayoutManager(new org.eclipse.draw2d.StackLayout());
		this.setFill(false);
this.setOutline(false);
		createContents();
	}
	/**
	 * @generated
	 */
	private void createContents(){


org.eclipse.draw2d.Ellipse circle0 = new org.eclipse.draw2d.Ellipse();
circle0.setLineWidth(3);

circle0.setBorder(new org.eclipse.draw2d.MarginBorder(getMapMode().DPtoLP(6)
, getMapMode().DPtoLP(6)
, getMapMode().DPtoLP(6)
, getMapMode().DPtoLP(6)
));

this.add(circle0);
circle0.setLayoutManager(new org.eclipse.draw2d.StackLayout());


org.eclipse.draw2d.Ellipse circle1 = n! ew org.eclipse.draw2d.Ellipse();
	circle1.setBackgroundColor(org.eclipse.draw2d.ColorConstants.lightGray);

circle0.add(circle1);



	}







}

"> + classBody="
/**
 * @generated
 */
public class TerminateEndEventFigureDescriptor extends org.eclipse.gmf.runtime.lite.svg.SVGFigure {




	/**
	 * @generated
	 */
	public TerminateEndEventFigureDescriptor() {
				this.setURI("platform:/plugin/org.jboss.tools.bpmn2.process.diagram/images/events_48px_end_terminate.svg");
	}





}

"> <attributes xsi:type="gmfgen:ResizeConstraints"/> <attributes xsi:type="gmfgen:DefaultSizeAttributes" - width="20" - height="20"/> + width="48" + height="48"/> </viewmap> <modelFacet modelElementSelector="//@expressionProviders/@providers.0/(a)expressions.14"> @@ -1294,11 +1322,13 @@ <viewmap xsi:type="gmfgen:InnerClassViewmap" className="MessageCatchIntermediateEventFigureDescriptor" - classBody="
/**
 * @generated
 */
public class MessageCatchIntermediateEventFigureDescriptor extends org.eclipse.draw2d.RectangleFigure {




	/**
	 * @generated
	 */
	public MessageCatchIntermediateEventFigureDescriptor() {
		this.setLayoutManager(new org.eclipse.draw2d.StackLayout());
		this.setFill(false);
this.setOutline(false);
		createContents();
	}
	/**
	 * @generated
	 */
	private void createContents(){


org.eclipse.draw2d.Ellipse outerCircle0 = new org.eclipse.draw2d.Ellipse();

outerCircle0.setBorder(new org.eclipse.draw2d.MarginBorder(getMapMode().DPtoLP(2)
, getMapMode().DPtoLP(2)
, getMapMode().DPtoLP(2)
, getMapMode().DPtoLP(2)
));

this.add(outerCircle0);
outerCircle0.setLayoutManager(new org.eclipse.draw2d.StackLayout());


org.eclipse.draw2d.Elli! pse innerCircle1 = new org.eclipse.draw2d.Ellipse();

innerCircle1.setBorder(new org.eclipse.draw2d.MarginBorder(getMapMode().DPtoLP(4)
, getMapMode().DPtoLP(3)
, getMapMode().DPtoLP(4)
, getMapMode().DPtoLP(3)
));

outerCircle0.add(innerCircle1);
innerCircle1.setLayoutManager(new org.eclipse.draw2d.StackLayout());


org.eclipse.draw2d.RectangleFigure rectangle2 = new org.eclipse.draw2d.RectangleFigure();

innerCircle1.add(rectangle2);
rectangle2.setLayoutManager(new org.eclipse.draw2d.StackLayout());


org.eclipse.draw2d.PolylineShape envelope3 = new org.eclipse.draw2d.PolylineShape();
envelope3.addPoint(new org.eclipse.draw2d.geometry.Point(getMapMode().DPtoLP(0)
, getMapMode().DPtoLP(0)
));
envelope3.addPoint(new org.eclipse.draw2d.geometry.Point(getMapMode().DPtoLP(4)
, getMapMode().DPtoLP(4)
));
envelope3.addPoint(new org.eclipse.draw2d.geometry.Point(getMapMode().DPtoLP! (5)
, getMapMode().DPtoLP(4)
));
envelope3.addPoin! t(new or g.eclipse.draw2d.geometry.Point(getMapMode().DPtoLP(9)
, getMapMode().DPtoLP(0)
));

rectangle2.add(envelope3);





	}







}

"> + classBody="
/**
 * @generated
 */
public class MessageCatchIntermediateEventFigureDescriptor extends org.eclipse.gmf.runtime.lite.svg.SVGFigure {




	/**
	 * @generated
	 */
	public MessageCatchIntermediateEventFigureDescriptor() {
				this.setURI("platform:/plugin/org.jboss.tools.bpmn2.process.diagram/images/events_48px_intermediate_message_catch.svg");
	}





}

"> <attributes + xsi:type="gmfgen:ResizeConstraints"/> + <attributes xsi:type="gmfgen:DefaultSizeAttributes" - width="20" - height="20"/> + width="48" + height="48"/> </viewmap> <modelFacet modelElementSelector="//@expressionProviders/@providers.0/(a)expressions.17"> @@ -1341,13 +1371,13 @@ <viewmap xsi:type="gmfgen:InnerClassViewmap" className="MessageThrowIntermediateEventFigureDescriptor" - classBody="
/**
 * @generated
 */
public class MessageThrowIntermediateEventFigureDescriptor extends org.eclipse.draw2d.RectangleFigure {




	/**
	 * @generated
	 */
	public MessageThrowIntermediateEventFigureDescriptor() {
		this.setLayoutManager(new org.eclipse.draw2d.StackLayout());
		this.setFill(false);
this.setOutline(false);
		createContents();
	}
	/**
	 * @generated
	 */
	private void createContents(){


org.eclipse.draw2d.Ellipse outerCircle0 = new org.eclipse.draw2d.Ellipse();

outerCircle0.setBorder(new org.eclipse.draw2d.MarginBorder(getMapMode().DPtoLP(2)
, getMapMode().DPtoLP(2)
, getMapMode().DPtoLP(2)
, getMapMode().DPtoLP(2)
));

this.add(outerCircle0);
outerCircle0.setLayoutManager(new org.eclipse.draw2d.StackLayout());


org.eclipse.draw2d.Elli! pse innerCircle1 = new org.eclipse.draw2d.Ellipse();

innerCircle1.setBorder(new org.eclipse.draw2d.MarginBorder(getMapMode().DPtoLP(4)
, getMapMode().DPtoLP(3)
, getMapMode().DPtoLP(4)
, getMapMode().DPtoLP(3)
));

outerCircle0.add(innerCircle1);
innerCircle1.setLayoutManager(new org.eclipse.draw2d.StackLayout());


org.eclipse.draw2d.RectangleFigure rectangle2 = new org.eclipse.draw2d.RectangleFigure();
	rectangle2.setBackgroundColor(org.eclipse.draw2d.ColorConstants.lightGray);

innerCircle1.add(rectangle2);
rectangle2.setLayoutManager(new org.eclipse.draw2d.StackLayout());


org.eclipse.draw2d.PolylineShape envelope3 = new org.eclipse.draw2d.PolylineShape();
envelope3.addPoint(new org.eclipse.draw2d.geometry.Point(getMapMode().DPtoLP(0)
, getMapMode().DPtoLP(0)
));
envelope3.addPoint(new org.eclipse.draw2d.geometry.Point(getMapMode().DPtoLP(4)
, getMapMode().DPtoLP(4)&#xA! ;));
envelope3.addPoint(new org.eclipse.draw2d.geometry.Po! int(getM apMode().DPtoLP(5)
, getMapMode().DPtoLP(4)
));
envelope3.addPoint(new org.eclipse.draw2d.geometry.Point(getMapMode().DPtoLP(9)
, getMapMode().DPtoLP(0)
));
	envelope3.setForegroundColor(org.eclipse.draw2d.ColorConstants.white);

rectangle2.add(envelope3);





	}







}

"> + classBody="
/**
 * @generated
 */
public class MessageThrowIntermediateEventFigureDescriptor extends org.eclipse.gmf.runtime.lite.svg.SVGFigure {




	/**
	 * @generated
	 */
	public MessageThrowIntermediateEventFigureDescriptor() {
				this.setURI("platform:/plugin/org.jboss.tools.bpmn2.process.diagram/images/events_48px_intermediate_message_throw.svg");
	}





}

"> <attributes xsi:type="gmfgen:ResizeConstraints"/> <attributes xsi:type="gmfgen:DefaultSizeAttributes" - width="20" - height="20"/> + width="48" + height="48"/> </viewmap> <modelFacet modelElementSelector="//@expressionProviders/@providers.0/(a)expressions.20"> @@ -1390,13 +1420,13 @@ <viewmap xsi:type="gmfgen:InnerClassViewmap" className="TimerCatchIntermediateEventFigureDescriptor" - classBody="
/**
 * @generated
 */
public class TimerCatchIntermediateEventFigureDescriptor extends org.eclipse.draw2d.RectangleFigure {




	/**
	 * @generated
	 */
	public TimerCatchIntermediateEventFigureDescriptor() {
		this.setLayoutManager(new org.eclipse.draw2d.StackLayout());
		this.setFill(false);
this.setOutline(false);
		createContents();
	}
	/**
	 * @generated
	 */
	private void createContents(){


org.eclipse.draw2d.Ellipse outerCircle0 = new org.eclipse.draw2d.Ellipse();

outerCircle0.setBorder(new org.eclipse.draw2d.MarginBorder(getMapMode().DPtoLP(2)
, getMapMode().DPtoLP(2)
, getMapMode().DPtoLP(2)
, getMapMode().DPtoLP(2)
));

this.add(outerCircle0);
outerCircle0.setLayoutManager(new org.eclipse.draw2d.StackLayout());


org.eclipse.draw2d.Ellipse ! innerCircle1 = new org.eclipse.draw2d.Ellipse();

innerCircle1.setBorder(new org.eclipse.draw2d.MarginBorder(getMapMode().DPtoLP(3)
, getMapMode().DPtoLP(3)
, getMapMode().DPtoLP(3)
, getMapMode().DPtoLP(3)
));

outerCircle0.add(innerCircle1);
innerCircle1.setLayoutManager(new org.eclipse.draw2d.StackLayout());


org.eclipse.draw2d.Ellipse clock2 = new org.eclipse.draw2d.Ellipse();

innerCircle1.add(clock2);



org.eclipse.draw2d.PolylineShape twelve2 = new org.eclipse.draw2d.PolylineShape();
twelve2.addPoint(new org.eclipse.draw2d.geometry.Point(getMapMode().DPtoLP(4)
, getMapMode().DPtoLP(0)
));
twelve2.addPoint(new org.eclipse.draw2d.geometry.Point(getMapMode().DPtoLP(4)
, getMapMode().DPtoLP(2)
));

innerCircle1.add(twelve2);



org.eclipse.draw2d.PolylineShape three2 = new org.eclipse.draw2d.PolylineShape();
three2.addPoint(new org.eclipse.draw2d.! geometry.Point(getMapMode().DPtoLP(7)
, getMapMode().DPtoL! P(4)&#xA ;));
three2.addPoint(new org.eclipse.draw2d.geometry.Point(getMapMode().DPtoLP(9)
, getMapMode().DPtoLP(4)
));

innerCircle1.add(three2);



org.eclipse.draw2d.PolylineShape six2 = new org.eclipse.draw2d.PolylineShape();
six2.addPoint(new org.eclipse.draw2d.geometry.Point(getMapMode().DPtoLP(4)
, getMapMode().DPtoLP(7)
));
six2.addPoint(new org.eclipse.draw2d.geometry.Point(getMapMode().DPtoLP(4)
, getMapMode().DPtoLP(9)
));

innerCircle1.add(six2);



org.eclipse.draw2d.PolylineShape nine2 = new org.eclipse.draw2d.PolylineShape();
nine2.addPoint(new org.eclipse.draw2d.geometry.Point(getMapMode().DPtoLP(0)
, getMapMode().DPtoLP(4)
));
nine2.addPoint(new org.eclipse.draw2d.geometry.Point(getMapMode().DPtoLP(2)
, getMapMode().DPtoLP(4)
));

innerCircle1.add(nine2);



org.eclipse.draw2d.PolylineShape big2 = new org.eclipse.draw2d.PolylineShape();&! #xA;big2.addPoint(new org.eclipse.draw2d.geometry.Point(getMapMode().DPtoLP(4)
, getMapMode().DPtoLP(4)
));
big2.addPoint(new org.eclipse.draw2d.geometry.Point(getMapMode().DPtoLP(6)
, getMapMode().DPtoLP(1)
));

innerCircle1.add(big2);



org.eclipse.draw2d.PolylineShape small2 = new org.eclipse.draw2d.PolylineShape();
small2.addPoint(new org.eclipse.draw2d.geometry.Point(getMapMode().DPtoLP(4)
, getMapMode().DPtoLP(4)
));
small2.addPoint(new org.eclipse.draw2d.geometry.Point(getMapMode().DPtoLP(7)
, getMapMode().DPtoLP(7)
));

innerCircle1.add(small2);




	}







}

"> + classBody="
/**
 * @generated
 */
public class TimerCatchIntermediateEventFigureDescriptor extends org.eclipse.gmf.runtime.lite.svg.SVGFigure {




	/**
	 * @generated
	 */
	public TimerCatchIntermediateEventFigureDescriptor() {
				this.setURI("platform:/plugin/org.jboss.tools.bpmn2.process.diagram/images/events_48px_intermediate_timer_catch.svg");
	}





}

"> <attributes xsi:type="gmfgen:ResizeConstraints"/> <attributes xsi:type="gmfgen:DefaultSizeAttributes" - width="20" - height="20"/> + width="48" + height="48"/> </viewmap> <modelFacet modelElementSelector="//@expressionProviders/@providers.0/(a)expressions.23"> @@ -1439,13 +1469,13 @@ <viewmap xsi:type="gmfgen:InnerClassViewmap" className="ErrorCatchIntermediateEventFigureDescriptor" - classBody="
/**
 * @generated
 */
public class ErrorCatchIntermediateEventFigureDescriptor extends org.eclipse.draw2d.RectangleFigure {




	/**
	 * @generated
	 */
	public ErrorCatchIntermediateEventFigureDescriptor() {
		this.setLayoutManager(new org.eclipse.draw2d.StackLayout());
		this.setFill(false);
this.setOutline(false);
		createContents();
	}
	/**
	 * @generated
	 */
	private void createContents(){


org.eclipse.draw2d.Ellipse outerCircle0 = new org.eclipse.draw2d.Ellipse();

outerCircle0.setBorder(new org.eclipse.draw2d.MarginBorder(getMapMode().DPtoLP(2)
, getMapMode().DPtoLP(2)
, getMapMode().DPtoLP(2)
, getMapMode().DPtoLP(2)
));

this.add(outerCircle0);
outerCircle0.setLayoutManager(new org.eclipse.draw2d.StackLayout());


org.eclipse.draw2d.Ellipse ! innerCircle1 = new org.eclipse.draw2d.Ellipse();

innerCircle1.setBorder(new org.eclipse.draw2d.MarginBorder(getMapMode().DPtoLP(3)
, getMapMode().DPtoLP(3)
, getMapMode().DPtoLP(3)
, getMapMode().DPtoLP(3)
));

outerCircle0.add(innerCircle1);
innerCircle1.setLayoutManager(new org.eclipse.draw2d.StackLayout());


org.eclipse.draw2d.PolygonShape flash2 = new org.eclipse.draw2d.PolygonShape();
flash2.addPoint(new org.eclipse.draw2d.geometry.Point(getMapMode().DPtoLP(0)
, getMapMode().DPtoLP(9)
));
flash2.addPoint(new org.eclipse.draw2d.geometry.Point(getMapMode().DPtoLP(3)
, getMapMode().DPtoLP(0)
));
flash2.addPoint(new org.eclipse.draw2d.geometry.Point(getMapMode().DPtoLP(7)
, getMapMode().DPtoLP(6)
));
flash2.addPoint(new org.eclipse.draw2d.geometry.Point(getMapMode().DPtoLP(10)
, getMapMode().DPtoLP(1)
));
flash2.addPoint(new org.eclipse.draw2d.geometry.Point(getMapMode().D! PtoLP(7)
, getMapMode().DPtoLP(10)
));
flash2.addP! oint(new org.eclipse.draw2d.geometry.Point(getMapMode().DPtoLP(3)
, getMapMode().DPtoLP(3)
));
flash2.setFill(true);

innerCircle1.add(flash2);




	}







}

"> + classBody="
/**
 * @generated
 */
public class ErrorCatchIntermediateEventFigureDescriptor extends org.eclipse.gmf.runtime.lite.svg.SVGFigure {




	/**
	 * @generated
	 */
	public ErrorCatchIntermediateEventFigureDescriptor() {
				this.setURI("platform:/plugin/org.jboss.tools.bpmn2.process.diagram/images/events_48px_intermediate_error_catch.svg");
	}





}

"> <attributes xsi:type="gmfgen:ResizeConstraints"/> <attributes xsi:type="gmfgen:DefaultSizeAttributes" - width="20" - height="20"/> + width="48" + height="48"/> </viewmap> <modelFacet modelElementSelector="//@expressionProviders/@providers.0/(a)expressions.26"> @@ -1553,6 +1583,9 @@ xsi:type="gmfgen:DefaultSizeAttributes" width="120" height="20"/> + <attributes + xsi:type="gmfgen:StyleAttributes" + fixedForeground="true"/> </viewmap> <modelFacet> <metaClass @@ -1614,6 +1647,9 @@ xsi:type="gmfgen:DefaultSizeAttributes" width="240" height="240"/> + <attributes + xsi:type="gmfgen:StyleAttributes" + fixedForeground="true"/> </viewmap> <modelFacet> <metaClass @@ -1654,6 +1690,10 @@ xsi:type="gmfgen:DefaultSizeAttributes" width="80" height="40"/> + <attributes + xsi:type="gmfgen:StyleAttributes" + fixedForeground="true" + fixedBackground="true"/> </viewmap> <modelFacet> <metaClass @@ -1707,7 +1747,11 @@ <viewmap xsi:type="gmfgen:InnerClassViewmap" className="SequenceFlowFigureDescriptor" - classBody="
/**
 * @generated
 */
public class SequenceFlowFigureDescriptor extends org.eclipse.gmf.runtime.draw2d.ui.figures.PolylineConnectionEx {




	/**
	 * @generated
	 */
	public SequenceFlowFigureDescriptor() {
		
		setTargetDecoration(createTargetDecoration());
	}

	/**
	 * @generated
	 */
	private org.eclipse.draw2d.RotatableDecoration createTargetDecoration() {
		org.eclipse.draw2d.PolygonDecoration df = new org.eclipse.draw2d.PolygonDecoration();
df.setFill(true);
org.eclipse.draw2d.geometry.PointList pl = new org.eclipse.draw2d.geometry.PointList();
pl.addPoint(getMapMode().DPtoLP(0)
, getMapMode().DPtoLP(0)
);
pl.addPoint(getMapMode().DPtoLP(-1)
, getMapMode().DPtoLP(1)
);
pl.addPoint(getMapMode().DPtoLP(-1)
, getMapMode().DPtoLP(-1)
);
pl.addPoint(getMapMode().! DPtoLP(0)
, getMapMode().DPtoLP(0)
);
df.setTemplate(pl);
df.setScale(getMapMode().DPtoLP(7)
, getMapMode().DPtoLP(3)
);
		return df;
	}




}

"/> + classBody="
/**
 * @generated
 */
public class SequenceFlowFigureDescriptor extends org.eclipse.gmf.runtime.draw2d.ui.figures.PolylineConnectionEx {




	/**
	 * @generated
	 */
	public SequenceFlowFigureDescriptor() {
		
		setTargetDecoration(createTargetDecoration());
	}

	/**
	 * @generated
	 */
	private org.eclipse.draw2d.RotatableDecoration createTargetDecoration() {
		org.eclipse.draw2d.PolygonDecoration df = new org.eclipse.draw2d.PolygonDecoration();
df.setFill(true);
org.eclipse.draw2d.geometry.PointList pl = new org.eclipse.draw2d.geometry.PointList();
pl.addPoint(getMapMode().DPtoLP(0)
, getMapMode().DPtoLP(0)
);
pl.addPoint(getMapMode().DPtoLP(-1)
, getMapMode().DPtoLP(1)
);
pl.addPoint(getMapMode().DPtoLP(-1)
, getMapMode().DPtoLP(-1)
);
pl.addPoint(getMapMode().! DPtoLP(0)
, getMapMode().DPtoLP(0)
);
df.setTemplate(pl);
df.setScale(getMapMode().DPtoLP(7)
, getMapMode().DPtoLP(3)
);
		return df;
	}




}

"> + <attributes + xsi:type="gmfgen:StyleAttributes" + fixedForeground="true"/> + </viewmap> <modelFacet xsi:type="gmfgen:TypeLinkModelFacet"> <metaClass @@ -1746,7 +1790,11 @@ <viewmap xsi:type="gmfgen:InnerClassViewmap" className="AssociationFigureDescriptor" - classBody="
/**
 * @generated
 */
public class AssociationFigureDescriptor extends org.eclipse.gmf.runtime.draw2d.ui.figures.PolylineConnectionEx {




	/**
	 * @generated
	 */
	public AssociationFigureDescriptor() {
		this.setLineStyle(org.eclipse.draw2d.Graphics.LINE_DOT);

	}




}

"/> + classBody="
/**
 * @generated
 */
public class AssociationFigureDescriptor extends org.eclipse.gmf.runtime.draw2d.ui.figures.PolylineConnectionEx {




	/**
	 * @generated
	 */
	public AssociationFigureDescriptor() {
		this.setLineStyle(org.eclipse.draw2d.Graphics.LINE_DOT);

	}




}

"> + <attributes + xsi:type="gmfgen:StyleAttributes" + fixedForeground="true"/> + </viewmap> <modelFacet xsi:type="gmfgen:TypeLinkModelFacet"> <metaClass @@ -1780,18 +1828,26 @@ <entries xsi:type="gmfgen:ToolEntry" title="User Task" + largeIconPath="/org.jboss.tools.bpmn2.process.diagram/icons/obj32/tasks_32px_user.png" + smallIconPath="/org.jboss.tools.bpmn2.process.diagram/icons/obj16/tasks_16px_user.png" genNodes="//@diagram/(a)topLevelNodes.0 //@diagram/(a)childNodes.1"/> <entries xsi:type="gmfgen:ToolEntry" title="Service Task" + largeIconPath="/org.jboss.tools.bpmn2.process.diagram/icons/obj32/tasks_32px_service.png" + smallIconPath="/org.jboss.tools.bpmn2.process.diagram/icons/obj16/tasks_16px_service.png" genNodes="//@diagram/(a)topLevelNodes.1 //@diagram/(a)childNodes.2"/> <entries xsi:type="gmfgen:ToolEntry" title="Script Task" + largeIconPath="/org.jboss.tools.bpmn2.process.diagram/icons/obj32/tasks_32px_service.png" + smallIconPath="/org.jboss.tools.bpmn2.process.diagram/icons/obj16/tasks_16px_script.png" genNodes="//@diagram/(a)childNodes.15 //@diagram/(a)topLevelNodes.16"/> <entries xsi:type="gmfgen:ToolEntry" title="Sub-Process" + largeIconPath="/org.jboss.tools.bpmn2.process.diagram/icons/obj32/activity_32px_subprocess.png" + smallIconPath="/org.jboss.tools.bpmn2.process.diagram/icons/obj16/activity_16px_subprocess.png" genNodes="//@diagram/(a)topLevelNodes.15 //@diagram/(a)childNodes.0"/> </entries> <entries @@ -1802,10 +1858,14 @@ <entries xsi:type="gmfgen:ToolEntry" title="Exclusive" + largeIconPath="/org.jboss.tools.bpmn2.process.diagram/icons/obj32/gateways_32px_exclusive.png" + smallIconPath="/org.jboss.tools.bpmn2.process.diagram/icons/obj16/gateways_16px_exclusive.png" genNodes="//@diagram/(a)topLevelNodes.5 //@diagram/(a)childNodes.6"/> <entries xsi:type="gmfgen:ToolEntry" title="Parallel" + largeIconPath="/org.jboss.tools.bpmn2.process.diagram/icons/obj32/gateways_32px_parallel.png" + smallIconPath="/org.jboss.tools.bpmn2.process.diagram/icons/obj16/gateways_16px_parallel.png" genNodes="//@diagram/(a)topLevelNodes.6 //@diagram/(a)childNodes.7"/> </entries> <entries @@ -1818,10 +1878,14 @@ <entries xsi:type="gmfgen:ToolEntry" title="Start" + largeIconPath="/org.jboss.tools.bpmn2.process.diagram/icons/obj32/events_32px_start_none.png" + smallIconPath="/org.jboss.tools.bpmn2.process.diagram/icons/obj16/events_16px_start_none.png" genNodes="//@diagram/(a)topLevelNodes.2 //@diagram/(a)childNodes.3"/> <entries xsi:type="gmfgen:ToolEntry" title="Message Start" + largeIconPath="/org.jboss.tools.bpmn2.process.diagram/icons/obj32/events_32px_start_message.png" + smallIconPath="/org.jboss.tools.bpmn2.process.diagram/icons/obj16/events_16px_start_message.png" genNodes="//@diagram/(a)topLevelNodes.3 //@diagram/(a)childNodes.4"/> </entries> <entries @@ -1831,19 +1895,27 @@ <entries xsi:type="gmfgen:ToolEntry" title="Message Catch" + largeIconPath="/org.jboss.tools.bpmn2.process.diagram/icons/obj32/events_32px_intermediate_message_catch.png" + smallIconPath="/org.jboss.tools.bpmn2.process.diagram/icons/obj16/events_16px_intermediate_message_catch.png" genNodes="//@diagram/(a)topLevelNodes.9 //@diagram/(a)childNodes.10"/> <entries xsi:type="gmfgen:ToolEntry" title="Message Throw" + largeIconPath="/org.jboss.tools.bpmn2.process.diagram/icons/obj32/events_32px_intermediate_message_throw.png" + smallIconPath="/org.jboss.tools.bpmn2.process.diagram/icons/obj16/events_16px_intermediate_message_throw.png" genNodes="//@diagram/(a)topLevelNodes.10 //@diagram/(a)childNodes.11"/> <entries xsi:type="gmfgen:ToolEntry" title="Timer Catch" description="" + largeIconPath="/org.jboss.tools.bpmn2.process.diagram/icons/obj32/events_32px_intermediate_timer_catch.png" + smallIconPath="/org.jboss.tools.bpmn2.process.diagram/icons/obj16/events_16px_intermediate_timer_catch.png" genNodes="//@diagram/(a)topLevelNodes.11 //@diagram/(a)childNodes.12"/> <entries xsi:type="gmfgen:ToolEntry" title="Error Catch" + largeIconPath="/org.jboss.tools.bpmn2.process.diagram/icons/obj32/events_32px_intermediate_error_catch.png" + smallIconPath="/org.jboss.tools.bpmn2.process.diagram/icons/obj16/events_16px_intermediate_error_catch.png" genNodes="//@diagram/(a)topLevelNodes.12"/> </entries> <entries @@ -1853,14 +1925,20 @@ <entries xsi:type="gmfgen:ToolEntry" title="End" + largeIconPath="/org.jboss.tools.bpmn2.process.diagram/icons/obj32/events_32px_end_none.png" + smallIconPath="/org.jboss.tools.bpmn2.process.diagram/icons/obj16/events_16px_end_none.png" genNodes="//@diagram/(a)topLevelNodes.4 //@diagram/(a)childNodes.5"/> <entries xsi:type="gmfgen:ToolEntry" title="Message End" + largeIconPath="/org.jboss.tools.bpmn2.process.diagram/icons/obj32/events_32px_end_message.png" + smallIconPath="/org.jboss.tools.bpmn2.process.diagram/icons/obj16/events_16px_end_message.png" genNodes="//@diagram/(a)topLevelNodes.7 //@diagram/(a)childNodes.8"/> <entries xsi:type="gmfgen:ToolEntry" title="Terminate" + largeIconPath="/org.jboss.tools.bpmn2.process.diagram/icons/obj32/events_32px_end_terminate.png" + smallIconPath="/org.jboss.tools.bpmn2.process.diagram/icons/obj16/events_16px_end_terminate.png" genNodes="//@diagram/(a)topLevelNodes.8 //@diagram/(a)childNodes.9"/> </entries> </entries> @@ -1899,31 +1977,34 @@ </palette> <preferencePages xsi:type="gmfgen:GenStandardPreferencePage" - iD="org.eclipse.bpmn2.diagram.general" + iD="org.jboss.tools.bpmn2.process.diagram.general" name="bpmn2 Diagram"> <children xsi:type="gmfgen:GenStandardPreferencePage" - iD="org.eclipse.bpmn2.diagram.appearance" + iD="org.jboss.tools.bpmn2.process.diagram.appearance" name="Appearance" kind="Appearance"/> <children xsi:type="gmfgen:GenStandardPreferencePage" - iD="org.eclipse.bpmn2.diagram.connections" + iD="org.jboss.tools.bpmn2.process.diagram.connections" name="Connections" kind="Connections"/> <children xsi:type="gmfgen:GenStandardPreferencePage" - iD="org.eclipse.bpmn2.diagram.printing" + iD="org.jboss.tools.bpmn2.process.diagram.printing" name="Printing" kind="Printing"/> <children xsi:type="gmfgen:GenStandardPreferencePage" - iD="org.eclipse.bpmn2.diagram.rulersAndGrid" + iD="org.jboss.tools.bpmn2.process.diagram.rulersAndGrid" name="Rulers And Grid" kind="RulersAndGrid"/> </preferencePages> </diagram> - <plugin> + <plugin + iD="org.jboss.tools.bpmn2.process.diagram" + name="Bpmn2 Process Plugin" + activatorClassName="Bpmn2ProcessDiagramEditorPlugin"> <requiredPlugins>org.eclipse.draw2d</requiredPlugins> <requiredPlugins>org.eclipse.gmf.runtime.draw2d.ui</requiredPlugins> </plugin> Modified: trunk/bpmn/plugins/org.jboss.tools.bpmn2.model/model/bpmn.process.gmftool =================================================================== --- trunk/bpmn/plugins/org.jboss.tools.bpmn2.model/model/bpmn.process.gmftool 2011-02-09 09:04:11 UTC (rev 29072) +++ trunk/bpmn/plugins/org.jboss.tools.bpmn2.model/model/bpmn.process.gmftool 2011-02-09 09:42:57 UTC (rev 29073) @@ -14,16 +14,52 @@ stack="true"> <tools xsi:type="gmftool:CreationTool" - title="User Task"/> + title="User Task"> + <smallIcon + xsi:type="gmftool:BundleImage" + path="icons/obj16/tasks_16px_user.png" + bundle="org.jboss.tools.bpmn2.process.diagram"/> + <largeIcon + xsi:type="gmftool:BundleImage" + path="icons/obj32/tasks_32px_user.png" + bundle="org.jboss.tools.bpmn2.process.diagram"/> + </tools> <tools xsi:type="gmftool:CreationTool" - title="Service Task"/> + title="Service Task"> + <smallIcon + xsi:type="gmftool:BundleImage" + path="icons/obj16/tasks_16px_service.png" + bundle="org.jboss.tools.bpmn2.process.diagram"/> + <largeIcon + xsi:type="gmftool:BundleImage" + path="icons/obj32/tasks_32px_service.png" + bundle="org.jboss.tools.bpmn2.process.diagram"/> + </tools> <tools xsi:type="gmftool:CreationTool" - title="Script Task"/> + title="Script Task"> + <smallIcon + xsi:type="gmftool:BundleImage" + path="icons/obj16/tasks_16px_script.png" + bundle="org.jboss.tools.bpmn2.process.diagram"/> + <largeIcon + xsi:type="gmftool:BundleImage" + path="icons/obj32/tasks_32px_service.png" + bundle="org.jboss.tools.bpmn2.process.diagram"/> + </tools> <tools xsi:type="gmftool:CreationTool" - title="Sub-Process"/> + title="Sub-Process"> + <smallIcon + xsi:type="gmftool:BundleImage" + path="icons/obj16/activity_16px_subprocess.png" + bundle="org.jboss.tools.bpmn2.process.diagram"/> + <largeIcon + xsi:type="gmftool:BundleImage" + path="icons/obj32/activity_32px_subprocess.png" + bundle="org.jboss.tools.bpmn2.process.diagram"/> + </tools> </tools> <tools xsi:type="gmftool:ToolGroup" @@ -32,10 +68,28 @@ stack="true"> <tools xsi:type="gmftool:CreationTool" - title="Exclusive"/> + title="Exclusive"> + <smallIcon + xsi:type="gmftool:BundleImage" + path="icons/obj16/gateways_16px_exclusive.png" + bundle="org.jboss.tools.bpmn2.process.diagram"/> + <largeIcon + xsi:type="gmftool:BundleImage" + path="icons/obj32/gateways_32px_exclusive.png" + bundle="org.jboss.tools.bpmn2.process.diagram"/> + </tools> <tools xsi:type="gmftool:CreationTool" - title="Parallel"/> + title="Parallel"> + <smallIcon + xsi:type="gmftool:BundleImage" + path="icons/obj16/gateways_16px_parallel.png" + bundle="org.jboss.tools.bpmn2.process.diagram"/> + <largeIcon + xsi:type="gmftool:BundleImage" + path="icons/obj32/gateways_32px_parallel.png" + bundle="org.jboss.tools.bpmn2.process.diagram"/> + </tools> </tools> <tools xsi:type="gmftool:ToolGroup" @@ -46,10 +100,28 @@ stack="true"> <tools xsi:type="gmftool:CreationTool" - title="Start"/> + title="Start"> + <smallIcon + xsi:type="gmftool:BundleImage" + path="icons/obj16/events_16px_start_none.png" + bundle="org.jboss.tools.bpmn2.process.diagram"/> + <largeIcon + xsi:type="gmftool:BundleImage" + path="icons/obj32/events_32px_start_none.png" + bundle="org.jboss.tools.bpmn2.process.diagram"/> + </tools> <tools xsi:type="gmftool:CreationTool" - title="Message Start"/> + title="Message Start"> + <smallIcon + xsi:type="gmftool:BundleImage" + path="icons/obj16/events_16px_start_message.png" + bundle="org.jboss.tools.bpmn2.process.diagram"/> + <largeIcon + xsi:type="gmftool:BundleImage" + path="icons/obj32/events_32px_start_message.png" + bundle="org.jboss.tools.bpmn2.process.diagram"/> + </tools> </tools> <tools xsi:type="gmftool:ToolGroup" @@ -57,17 +129,53 @@ stack="true"> <tools xsi:type="gmftool:CreationTool" - title="Message Catch"/> + title="Message Catch"> + <smallIcon + xsi:type="gmftool:BundleImage" + path="icons/obj16/events_16px_intermediate_message_catch.png" + bundle="org.jboss.tools.bpmn2.process.diagram"/> + <largeIcon + xsi:type="gmftool:BundleImage" + path="icons/obj32/events_32px_intermediate_message_catch.png" + bundle="org.jboss.tools.bpmn2.process.diagram"/> + </tools> <tools xsi:type="gmftool:CreationTool" - title="Message Throw"/> + title="Message Throw"> + <smallIcon + xsi:type="gmftool:BundleImage" + path="icons/obj16/events_16px_intermediate_message_throw.png" + bundle="org.jboss.tools.bpmn2.process.diagram"/> + <largeIcon + xsi:type="gmftool:BundleImage" + path="icons/obj32/events_32px_intermediate_message_throw.png" + bundle="org.jboss.tools.bpmn2.process.diagram"/> + </tools> <tools xsi:type="gmftool:CreationTool" title="Timer Catch" - description=""/> + description=""> + <smallIcon + xsi:type="gmftool:BundleImage" + path="icons/obj16/events_16px_intermediate_timer_catch.png" + bundle="org.jboss.tools.bpmn2.process.diagram"/> + <largeIcon + xsi:type="gmftool:BundleImage" + path="icons/obj32/events_32px_intermediate_timer_catch.png" + bundle="org.jboss.tools.bpmn2.process.diagram"/> + </tools> <tools xsi:type="gmftool:CreationTool" - title="Error Catch"/> + title="Error Catch"> + <smallIcon + xsi:type="gmftool:BundleImage" + path="icons/obj16/events_16px_intermediate_error_catch.png" + bundle="org.jboss.tools.bpmn2.process.diagram"/> + <largeIcon + xsi:type="gmftool:BundleImage" + path="icons/obj32/events_32px_intermediate_error_catch.png" + bundle="org.jboss.tools.bpmn2.process.diagram"/> + </tools> </tools> <tools xsi:type="gmftool:ToolGroup" @@ -75,13 +183,40 @@ stack="true"> <tools xsi:type="gmftool:CreationTool" - title="End"/> + title="End"> + <smallIcon + xsi:type="gmftool:BundleImage" + path="icons/obj16/events_16px_end_none.png" + bundle="org.jboss.tools.bpmn2.process.diagram"/> + <largeIcon + xsi:type="gmftool:BundleImage" + path="icons/obj32/events_32px_end_none.png" + bundle="org.jboss.tools.bpmn2.process.diagram"/> + </tools> <tools xsi:type="gmftool:CreationTool" - title="Message End"/> + title="Message End"> + <smallIcon + xsi:type="gmftool:BundleImage" + path="icons/obj16/events_16px_end_message.png" + bundle="org.jboss.tools.bpmn2.process.diagram"/> + <largeIcon + xsi:type="gmftool:BundleImage" + path="icons/obj32/events_32px_end_message.png" + bundle="org.jboss.tools.bpmn2.process.diagram"/> + </tools> <tools xsi:type="gmftool:CreationTool" - title="Terminate"/> + title="Terminate"> + <smallIcon + xsi:type="gmftool:BundleImage" + path="icons/obj16/events_16px_end_terminate.png" + bundle="org.jboss.tools.bpmn2.process.diagram"/> + <largeIcon + xsi:type="gmftool:BundleImage" + path="icons/obj32/events_32px_end_terminate.png" + bundle="org.jboss.tools.bpmn2.process.diagram"/> + </tools> </tools> </tools> <tools Modified: trunk/bpmn/plugins/org.jboss.tools.bpmn2.model/model/bpmn.process.trace =================================================================== --- trunk/bpmn/plugins/org.jboss.tools.bpmn2.model/model/bpmn.process.trace 2011-02-09 09:04:11 UTC (rev 29072) +++ trunk/bpmn/plugins/org.jboss.tools.bpmn2.model/model/bpmn.process.trace 2011-02-09 09:42:57 UTC (rev 29073) @@ -1,58 +1,150 @@ <?xml version="1.0" encoding="UTF-8"?> -<trace:TraceModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:trace="http://www.eclipse.org/gmf/2006/Trace"> - <nodeTraces visualID="2001" queryText="(let _eClass_:ecore::EClass = modelFacet.metaClass.ecoreClass in _eClass_.ePackage.nsURI = 'http://www.omg.org/spec/BPMN/20100524/MODEL-XMI' and _eClass_.name = 'UserTask') and (let _containmentMF_:ecore::EStructuralFeature = modelFacet.containmentMetaFeature.ecoreFeature in (let _eClass_:ecore::EClass = _containmentMF_.eContainingClass in _eClass_.ePackage.nsURI = 'http://www.omg.org/spec/BPMN/20100524/MODEL-XMI' and _eClass_.name = 'FlowElementsContainer') and _containmentMF_.name = 'flowElements')"> - <nodeLabelTraces visualID="5001" queryText="true"/> +<trace:TraceModel xmi:version="2.0" + xmlns:xmi="http://www.omg.org/XMI" + xmlns:trace="http://www.eclipse.org/gmf/2006/Trace"> + <nodeTraces + visualID="2001" + queryText="(let _eClass_:ecore::EClass = modelFacet.metaClass.ecoreClass in _eClass_.ePackage.nsURI = 'http://www.omg.org/spec/BPMN/20100524/MODEL-XMI' and _eClass_.name = 'UserTask') and (let _containmentMF_:ecore::EStructuralFeature = modelFacet.containmentMetaFeature.ecoreFeature in (let _eClass_:ecore::EClass = _containmentMF_.eContainingClass in _eClass_.ePackage.nsURI = 'http://www.omg.org/spec/BPMN/20100524/MODEL-XMI' and _eClass_.name = 'FlowElementsContainer') and _containmentMF_.name = 'flowElements')"> + <nodeLabelTraces + visualID="5001" + queryText="true"/> </nodeTraces> - <nodeTraces visualID="2002" queryText="(let _eClass_:ecore::EClass = modelFacet.metaClass.ecoreClass in _eClass_.ePackage.nsURI = 'http://www.omg.org/spec/BPMN/20100524/MODEL-XMI' and _eClass_.name = 'ServiceTask') and (let _containmentMF_:ecore::EStructuralFeature = modelFacet.containmentMetaFeature.ecoreFeature in (let _eClass_:ecore::EClass = _containmentMF_.eContainingClass in _eClass_.ePackage.nsURI = 'http://www.omg.org/spec/BPMN/20100524/MODEL-XMI' and _eClass_.name = 'FlowElementsContainer') and _containmentMF_.name = 'flowElements')"> - <nodeLabelTraces visualID="5002" queryText="true"/> + <nodeTraces + visualID="2002" + queryText="(let _eClass_:ecore::EClass = modelFacet.metaClass.ecoreClass in _eClass_.ePackage.nsURI = 'http://www.omg.org/spec/BPMN/20100524/MODEL-XMI' and _eClass_.name = 'ServiceTask') and (let _containmentMF_:ecore::EStructuralFeature = modelFacet.containmentMetaFeature.ecoreFeature in (let _eClass_:ecore::EClass = _containmentMF_.eContainingClass in _eClass_.ePackage.nsURI = 'http://www.omg.org/spec/BPMN/20100524/MODEL-XMI' and _eClass_.name = 'FlowElementsContainer') and _containmentMF_.name = 'flowElements')"> + <nodeLabelTraces + visualID="5002" + queryText="true"/> </nodeTraces> - <nodeTraces visualID="2003" queryText="(let _eClass_:ecore::EClass = modelFacet.metaClass.ecoreClass in _eClass_.ePackage.nsURI = 'http://www.omg.org/spec/BPMN/20100524/MODEL-XMI' and _eClass_.name = 'StartEvent') and (let _containmentMF_:ecore::EStructuralFeature = modelFacet.containmentMetaFeature.ecoreFeature in (let _eClass_:ecore::EClass = _containmentMF_.eContainingClass in _eClass_.ePackage.nsURI = 'http://www.omg.org/spec/BPMN/20100524/MODEL-XMI' and _eClass_.name = 'FlowElementsContainer') and _containmentMF_.name = 'flowElements')"/> - <nodeTraces visualID="2004" queryText="(let _eClass_:ecore::EClass = modelFacet.metaClass.ecoreClass in _eClass_.ePackage.nsURI = 'http://www.omg.org/spec/BPMN/20100524/MODEL-XMI' and _eClass_.name = 'EndEvent') and (let _containmentMF_:ecore::EStructuralFeature = modelFacet.containmentMetaFeature.ecoreFeature in (let _eClass_:ecore::EClass = _containmentMF_.eContainingClass in _eClass_.ePackage.nsURI = 'http://www.omg.org/spec/BPMN/20100524/MODEL-XMI' and _eClass_.name = 'FlowElementsContainer') and _containmentMF_.name = 'flowElements')"/> - <nodeTraces visualID="2005" queryText="(let _eClass_:ecore::EClass = modelFacet.metaClass.ecoreClass in _eClass_.ePackage.nsURI = 'http://www.omg.org/spec/BPMN/20100524/MODEL-XMI' and _eClass_.name = 'ExclusiveGateway') and (let _containmentMF_:ecore::EStructuralFeature = modelFacet.containmentMetaFeature.ecoreFeature in (let _eClass_:ecore::EClass = _containmentMF_.eContainingClass in _eClass_.ePackage.nsURI = 'http://www.omg.org/spec/BPMN/20100524/MODEL-XMI' and _eClass_.name = 'FlowElementsContainer') and _containmentMF_.name = 'flowElements')"/> - <nodeTraces visualID="2006" queryText="(let _eClass_:ecore::EClass = modelFacet.metaClass.ecoreClass in _eClass_.ePackage.nsURI = 'http://www.omg.org/spec/BPMN/20100524/MODEL-XMI' and _eClass_.name = 'ParallelGateway') and (let _containmentMF_:ecore::EStructuralFeature = modelFacet.containmentMetaFeature.ecoreFeature in (let _eClass_:ecore::EClass = _containmentMF_.eContainingClass in _eClass_.ePackage.nsURI = 'http://www.omg.org/spec/BPMN/20100524/MODEL-XMI' and _eClass_.name = 'FlowElementsContainer') and _containmentMF_.name = 'flowElements')"/> - <nodeTraces visualID="2007" queryText="(let _eClass_:ecore::EClass = modelFacet.metaClass.ecoreClass in _eClass_.ePackage.nsURI = 'http://www.omg.org/spec/BPMN/20100524/MODEL-XMI' and _eClass_.name = 'StartEvent') and (let _containmentMF_:ecore::EStructuralFeature = modelFacet.containmentMetaFeature.ecoreFeature in (let _eClass_:ecore::EClass = _containmentMF_.eContainingClass in _eClass_.ePackage.nsURI = 'http://www.omg.org/spec/BPMN/20100524/MODEL-XMI' and _eClass_.name = 'FlowElementsContainer') and _containmentMF_.name = 'flowElements')"/> - <nodeTraces visualID="2008" queryText="(let _eClass_:ecore::EClass = modelFacet.metaClass.ecoreClass in _eClass_.ePackage.nsURI = 'http://www.omg.org/spec/BPMN/20100524/MODEL-XMI' and _eClass_.name = 'EndEvent') and (let _containmentMF_:ecore::EStructuralFeature = modelFacet.containmentMetaFeature.ecoreFeature in (let _eClass_:ecore::EClass = _containmentMF_.eContainingClass in _eClass_.ePackage.nsURI = 'http://www.omg.org/spec/BPMN/20100524/MODEL-XMI' and _eClass_.name = 'FlowElementsContainer') and _containmentMF_.name = 'flowElements')"/> - <nodeTraces visualID="2009" queryText="(let _eClass_:ecore::EClass = modelFacet.metaClass.ecoreClass in _eClass_.ePackage.nsURI = 'http://www.omg.org/spec/BPMN/20100524/MODEL-XMI' and _eClass_.name = 'EndEvent') and (let _containmentMF_:ecore::EStructuralFeature = modelFacet.containmentMetaFeature.ecoreFeature in (let _eClass_:ecore::EClass = _containmentMF_.eContainingClass in _eClass_.ePackage.nsURI = 'http://www.omg.org/spec/BPMN/20100524/MODEL-XMI' and _eClass_.name = 'FlowElementsContainer') and _containmentMF_.name = 'flowElements')"/> - <nodeTraces visualID="2010" queryText="(let _eClass_:ecore::EClass = modelFacet.metaClass.ecoreClass in _eClass_.ePackage.nsURI = 'http://www.omg.org/spec/BPMN/20100524/MODEL-XMI' and _eClass_.name = 'IntermediateCatchEvent') and (let _containmentMF_:ecore::EStructuralFeature = modelFacet.containmentMetaFeature.ecoreFeature in (let _eClass_:ecore::EClass = _containmentMF_.eContainingClass in _eClass_.ePackage.nsURI = 'http://www.omg.org/spec/BPMN/20100524/MODEL-XMI' and _eClass_.name = 'FlowElementsContainer') and _containmentMF_.name = 'flowElements')"/> - <nodeTraces visualID="2011" queryText="(let _eClass_:ecore::EClass = modelFacet.metaClass.ecoreClass in _eClass_.ePackage.nsURI = 'http://www.omg.org/spec/BPMN/20100524/MODEL-XMI' and _eClass_.name = 'IntermediateThrowEvent') and (let _containmentMF_:ecore::EStructuralFeature = modelFacet.containmentMetaFeature.ecoreFeature in (let _eClass_:ecore::EClass = _containmentMF_.eContainingClass in _eClass_.ePackage.nsURI = 'http://www.omg.org/spec/BPMN/20100524/MODEL-XMI' and _eClass_.name = 'FlowElementsContainer') and _containmentMF_.name = 'flowElements')"/> - <nodeTraces visualID="2012" queryText="(let _eClass_:ecore::EClass = modelFacet.metaClass.ecoreClass in _eClass_.ePackage.nsURI = 'http://www.omg.org/spec/BPMN/20100524/MODEL-XMI' and _eClass_.name = 'IntermediateCatchEvent') and (let _containmentMF_:ecore::EStructuralFeature = modelFacet.containmentMetaFeature.ecoreFeature in (let _eClass_:ecore::EClass = _containmentMF_.eContainingClass in _eClass_.ePackage.nsURI = 'http://www.omg.org/spec/BPMN/20100524/MODEL-XMI' and _eClass_.name = 'FlowElementsContainer') and _containmentMF_.name = 'flowElements')"/> - <nodeTraces visualID="2013" queryText="(let _eClass_:ecore::EClass = modelFacet.metaClass.ecoreClass in _eClass_.ePackage.nsURI = 'http://www.omg.org/spec/BPMN/20100524/MODEL-XMI' and _eClass_.name = 'IntermediateCatchEvent') and (let _containmentMF_:ecore::EStructuralFeature = modelFacet.containmentMetaFeature.ecoreFeature in (let _eClass_:ecore::EClass = _containmentMF_.eContainingClass in _eClass_.ePackage.nsURI = 'http://www.omg.org/spec/BPMN/20100524/MODEL-XMI' and _eClass_.name = 'FlowElementsContainer') and _containmentMF_.name = 'flowElements')"/> - <nodeTraces visualID="2014" queryText="(let _eClass_:ecore::EClass = modelFacet.metaClass.ecoreClass in _eClass_.ePackage.nsURI = 'http://www.omg.org/spec/BPMN/20100524/MODEL-XMI' and _eClass_.name = 'DataObject') and (let _containmentMF_:ecore::EStructuralFeature = modelFacet.containmentMetaFeature.ecoreFeature in (let _eClass_:ecore::EClass = _containmentMF_.eContainingClass in _eClass_.ePackage.nsURI = 'http://www.omg.org/spec/BPMN/20100524/MODEL-XMI' and _eClass_.name = 'FlowElementsContainer') and _containmentMF_.name = 'flowElements')"> - <nodeLabelTraces visualID="5003" queryText="true"/> + <nodeTraces + visualID="2003" + queryText="(let _eClass_:ecore::EClass = modelFacet.metaClass.ecoreClass in _eClass_.ePackage.nsURI = 'http://www.omg.org/spec/BPMN/20100524/MODEL-XMI' and _eClass_.name = 'StartEvent') and (let _containmentMF_:ecore::EStructuralFeature = modelFacet.containmentMetaFeature.ecoreFeature in (let _eClass_:ecore::EClass = _containmentMF_.eContainingClass in _eClass_.ePackage.nsURI = 'http://www.omg.org/spec/BPMN/20100524/MODEL-XMI' and _eClass_.name = 'FlowElementsContainer') and _containmentMF_.name = 'flowElements')"/> + <nodeTraces + visualID="2004" + queryText="(let _eClass_:ecore::EClass = modelFacet.metaClass.ecoreClass in _eClass_.ePackage.nsURI = 'http://www.omg.org/spec/BPMN/20100524/MODEL-XMI' and _eClass_.name = 'EndEvent') and (let _containmentMF_:ecore::EStructuralFeature = modelFacet.containmentMetaFeature.ecoreFeature in (let _eClass_:ecore::EClass = _containmentMF_.eContainingClass in _eClass_.ePackage.nsURI = 'http://www.omg.org/spec/BPMN/20100524/MODEL-XMI' and _eClass_.name = 'FlowElementsContainer') and _containmentMF_.name = 'flowElements')"/> + <nodeTraces + visualID="2005" + queryText="(let _eClass_:ecore::EClass = modelFacet.metaClass.ecoreClass in _eClass_.ePackage.nsURI = 'http://www.omg.org/spec/BPMN/20100524/MODEL-XMI' and _eClass_.name = 'ExclusiveGateway') and (let _containmentMF_:ecore::EStructuralFeature = modelFacet.containmentMetaFeature.ecoreFeature in (let _eClass_:ecore::EClass = _containmentMF_.eContainingClass in _eClass_.ePackage.nsURI = 'http://www.omg.org/spec/BPMN/20100524/MODEL-XMI' and _eClass_.name = 'FlowElementsContainer') and _containmentMF_.name = 'flowElements')"/> + <nodeTraces + visualID="2006" + queryText="(let _eClass_:ecore::EClass = modelFacet.metaClass.ecoreClass in _eClass_.ePackage.nsURI = 'http://www.omg.org/spec/BPMN/20100524/MODEL-XMI' and _eClass_.name = 'ParallelGateway') and (let _containmentMF_:ecore::EStructuralFeature = modelFacet.containmentMetaFeature.ecoreFeature in (let _eClass_:ecore::EClass = _containmentMF_.eContainingClass in _eClass_.ePackage.nsURI = 'http://www.omg.org/spec/BPMN/20100524/MODEL-XMI' and _eClass_.name = 'FlowElementsContainer') and _containmentMF_.name = 'flowElements')"/> + <nodeTraces + visualID="2007" + queryText="(let _eClass_:ecore::EClass = modelFacet.metaClass.ecoreClass in _eClass_.ePackage.nsURI = 'http://www.omg.org/spec/BPMN/20100524/MODEL-XMI' and _eClass_.name = 'StartEvent') and (let _containmentMF_:ecore::EStructuralFeature = modelFacet.containmentMetaFeature.ecoreFeature in (let _eClass_:ecore::EClass = _containmentMF_.eContainingClass in _eClass_.ePackage.nsURI = 'http://www.omg.org/spec/BPMN/20100524/MODEL-XMI' and _eClass_.name = 'FlowElementsContainer') and _containmentMF_.name = 'flowElements')"/> + <nodeTraces + visualID="2008" + queryText="(let _eClass_:ecore::EClass = modelFacet.metaClass.ecoreClass in _eClass_.ePackage.nsURI = 'http://www.omg.org/spec/BPMN/20100524/MODEL-XMI' and _eClass_.name = 'EndEvent') and (let _containmentMF_:ecore::EStructuralFeature = modelFacet.containmentMetaFeature.ecoreFeature in (let _eClass_:ecore::EClass = _containmentMF_.eContainingClass in _eClass_.ePackage.nsURI = 'http://www.omg.org/spec/BPMN/20100524/MODEL-XMI' and _eClass_.name = 'FlowElementsContainer') and _containmentMF_.name = 'flowElements')"/> + <nodeTraces + visualID="2009" + queryText="(let _eClass_:ecore::EClass = modelFacet.metaClass.ecoreClass in _eClass_.ePackage.nsURI = 'http://www.omg.org/spec/BPMN/20100524/MODEL-XMI' and _eClass_.name = 'EndEvent') and (let _containmentMF_:ecore::EStructuralFeature = modelFacet.containmentMetaFeature.ecoreFeature in (let _eClass_:ecore::EClass = _containmentMF_.eContainingClass in _eClass_.ePackage.nsURI = 'http://www.omg.org/spec/BPMN/20100524/MODEL-XMI' and _eClass_.name = 'FlowElementsContainer') and _containmentMF_.name = 'flowElements')"/> + <nodeTraces + visualID="2010" + queryText="(let _eClass_:ecore::EClass = modelFacet.metaClass.ecoreClass in _eClass_.ePackage.nsURI = 'http://www.omg.org/spec/BPMN/20100524/MODEL-XMI' and _eClass_.name = 'IntermediateCatchEvent') and (let _containmentMF_:ecore::EStructuralFeature = modelFacet.containmentMetaFeature.ecoreFeature in (let _eClass_:ecore::EClass = _containmentMF_.eContainingClass in _eClass_.ePackage.nsURI = 'http://www.omg.org/spec/BPMN/20100524/MODEL-XMI' and _eClass_.name = 'FlowElementsContainer') and _containmentMF_.name = 'flowElements')"/> + <nodeTraces + visualID="2011" + queryText="(let _eClass_:ecore::EClass = modelFacet.metaClass.ecoreClass in _eClass_.ePackage.nsURI = 'http://www.omg.org/spec/BPMN/20100524/MODEL-XMI' and _eClass_.name = 'IntermediateThrowEvent') and (let _containmentMF_:ecore::EStructuralFeature = modelFacet.containmentMetaFeature.ecoreFeature in (let _eClass_:ecore::EClass = _containmentMF_.eContainingClass in _eClass_.ePackage.nsURI = 'http://www.omg.org/spec/BPMN/20100524/MODEL-XMI' and _eClass_.name = 'FlowElementsContainer') and _containmentMF_.name = 'flowElements')"/> + <nodeTraces + visualID="2012" + queryText="(let _eClass_:ecore::EClass = modelFacet.metaClass.ecoreClass in _eClass_.ePackage.nsURI = 'http://www.omg.org/spec/BPMN/20100524/MODEL-XMI' and _eClass_.name = 'IntermediateCatchEvent') and (let _containmentMF_:ecore::EStructuralFeature = modelFacet.containmentMetaFeature.ecoreFeature in (let _eClass_:ecore::EClass = _containmentMF_.eContainingClass in _eClass_.ePackage.nsURI = 'http://www.omg.org/spec/BPMN/20100524/MODEL-XMI' and _eClass_.name = 'FlowElementsContainer') and _containmentMF_.name = 'flowElements')"/> + <nodeTraces + visualID="2013" + queryText="(let _eClass_:ecore::EClass = modelFacet.metaClass.ecoreClass in _eClass_.ePackage.nsURI = 'http://www.omg.org/spec/BPMN/20100524/MODEL-XMI' and _eClass_.name = 'IntermediateCatchEvent') and (let _containmentMF_:ecore::EStructuralFeature = modelFacet.containmentMetaFeature.ecoreFeature in (let _eClass_:ecore::EClass = _containmentMF_.eContainingClass in _eClass_.ePackage.nsURI = 'http://www.omg.org/spec/BPMN/20100524/MODEL-XMI' and _eClass_.name = 'FlowElementsContainer') and _containmentMF_.name = 'flowElements')"/> + <nodeTraces + visualID="2014" + queryText="(let _eClass_:ecore::EClass = modelFacet.metaClass.ecoreClass in _eClass_.ePackage.nsURI = 'http://www.omg.org/spec/BPMN/20100524/MODEL-XMI' and _eClass_.name = 'DataObject') and (let _containmentMF_:ecore::EStructuralFeature = modelFacet.containmentMetaFeature.ecoreFeature in (let _eClass_:ecore::EClass = _containmentMF_.eContainingClass in _eClass_.ePackage.nsURI = 'http://www.omg.org/spec/BPMN/20100524/MODEL-XMI' and _eClass_.name = 'FlowElementsContainer') and _containmentMF_.name = 'flowElements')"> + <nodeLabelTraces + visualID="5003" + queryText="true"/> </nodeTraces> - <nodeTraces visualID="2015" queryText="(let _eClass_:ecore::EClass = modelFacet.metaClass.ecoreClass in _eClass_.ePackage.nsURI = 'http://www.omg.org/spec/BPMN/20100524/MODEL-XMI' and _eClass_.name = 'TextAnnotation') and (let _containmentMF_:ecore::EStructuralFeature = modelFacet.containmentMetaFeature.ecoreFeature in (let _eClass_:ecore::EClass = _containmentMF_.eContainingClass in _eClass_.ePackage.nsURI = 'http://www.omg.org/spec/BPMN/20100524/MODEL-XMI' and _eClass_.name = 'Process') and _containmentMF_.name = 'artifacts')"> - <nodeLabelTraces visualID="5004" queryText="true"/> + <nodeTraces + visualID="2015" + queryText="(let _eClass_:ecore::EClass = modelFacet.metaClass.ecoreClass in _eClass_.ePackage.nsURI = 'http://www.omg.org/spec/BPMN/20100524/MODEL-XMI' and _eClass_.name = 'TextAnnotation') and (let _containmentMF_:ecore::EStructuralFeature = modelFacet.containmentMetaFeature.ecoreFeature in (let _eClass_:ecore::EClass = _containmentMF_.eContainingClass in _eClass_.ePackage.nsURI = 'http://www.omg.org/spec/BPMN/20100524/MODEL-XMI' and _eClass_.name = 'Process') and _containmentMF_.name = 'artifacts')"> + <nodeLabelTraces + visualID="5004" + queryText="true"/> </nodeTraces> - <nodeTraces visualID="2016" queryText="(let _eClass_:ecore::EClass = modelFacet.metaClass.ecoreClass in _eClass_.ePackage.nsURI = 'http://www.omg.org/spec/BPMN/20100524/MODEL-XMI' and _eClass_.name = 'SubProcess') and (let _containmentMF_:ecore::EStructuralFeature = modelFacet.containmentMetaFeature.ecoreFeature in (let _eClass_:ecore::EClass = _containmentMF_.eContainingClass in _eClass_.ePackage.nsURI = 'http://www.omg.org/spec/BPMN/20100524/MODEL-XMI' and _eClass_.name = 'FlowElementsContainer') and _containmentMF_.name = 'flowElements')"/> - <nodeTraces visualID="2017" queryText="(let _eClass_:ecore::EClass = modelFacet.metaClass.ecoreClass in _eClass_.ePackage.nsURI = 'http://www.omg.org/spec/BPMN/20100524/MODEL-XMI' and _eClass_.name = 'ScriptTask') and (let _containmentMF_:ecore::EStructuralFeature = modelFacet.containmentMetaFeature.ecoreFeature in (let _eClass_:ecore::EClass = _containmentMF_.eContainingClass in _eClass_.ePackage.nsURI = 'http://www.omg.org/spec/BPMN/20100524/MODEL-XMI' and _eClass_.name = 'FlowElementsContainer') and _containmentMF_.name = 'flowElements')"> - <nodeLabelTraces visualID="5009" queryText="true"/> + <nodeTraces + visualID="2016" + queryText="(let _eClass_:ecore::EClass = modelFacet.metaClass.ecoreClass in _eClass_.ePackage.nsURI = 'http://www.omg.org/spec/BPMN/20100524/MODEL-XMI' and _eClass_.name = 'SubProcess') and (let _containmentMF_:ecore::EStructuralFeature = modelFacet.containmentMetaFeature.ecoreFeature in (let _eClass_:ecore::EClass = _containmentMF_.eContainingClass in _eClass_.ePackage.nsURI = 'http://www.omg.org/spec/BPMN/20100524/MODEL-XMI' and _eClass_.name = 'FlowElementsContainer') and _containmentMF_.name = 'flowElements')"/> + <nodeTraces + visualID="2017" + queryText="(let _eClass_:ecore::EClass = modelFacet.metaClass.ecoreClass in _eClass_.ePackage.nsURI = 'http://www.omg.org/spec/BPMN/20100524/MODEL-XMI' and _eClass_.name = 'ScriptTask') and (let _containmentMF_:ecore::EStructuralFeature = modelFacet.containmentMetaFeature.ecoreFeature in (let _eClass_:ecore::EClass = _containmentMF_.eContainingClass in _eClass_.ePackage.nsURI = 'http://www.omg.org/spec/BPMN/20100524/MODEL-XMI' and _eClass_.name = 'FlowElementsContainer') and _containmentMF_.name = 'flowElements')"> + <nodeLabelTraces + visualID="5009" + queryText="true"/> </nodeTraces> - <childNodeTraces visualID="3001" queryText="(let _eClass_:ecore::EClass = modelFacet.metaClass.ecoreClass in _eClass_.ePackage.nsURI = 'http://www.omg.org/spec/BPMN/20100524/MODEL-XMI' and _eClass_.name = 'SubProcess') and (let _containmentMF_:ecore::EStructuralFeature = modelFacet.containmentMetaFeature.ecoreFeature in (let _eClass_:ecore::EClass = _containmentMF_.eContainingClass in _eClass_.ePackage.nsURI = 'http://www.omg.org/spec/BPMN/20100524/MODEL-XMI' and _eClass_.name = 'FlowElementsContainer') and _containmentMF_.name = 'flowElements')"/> - <childNodeTraces visualID="3002" queryText="(let _eClass_:ecore::EClass = modelFacet.metaClass.ecoreClass in _eClass_.ePackage.nsURI = 'http://www.omg.org/spec/BPMN/20100524/MODEL-XMI' and _eClass_.name = 'UserTask') and (let _containmentMF_:ecore::EStructuralFeature = modelFacet.containmentMetaFeature.ecoreFeature in (let _eClass_:ecore::EClass = _containmentMF_.eContainingClass in _eClass_.ePackage.nsURI = 'http://www.omg.org/spec/BPMN/20100524/MODEL-XMI' and _eClass_.name = 'FlowElementsContainer') and _containmentMF_.name = 'flowElements')"> - <nodeLabelTraces visualID="5005" queryText="true"/> + <childNodeTraces + visualID="3001" + queryText="(let _eClass_:ecore::EClass = modelFacet.metaClass.ecoreClass in _eClass_.ePackage.nsURI = 'http://www.omg.org/spec/BPMN/20100524/MODEL-XMI' and _eClass_.name = 'SubProcess') and (let _containmentMF_:ecore::EStructuralFeature = modelFacet.containmentMetaFeature.ecoreFeature in (let _eClass_:ecore::EClass = _containmentMF_.eContainingClass in _eClass_.ePackage.nsURI = 'http://www.omg.org/spec/BPMN/20100524/MODEL-XMI' and _eClass_.name = 'FlowElementsContainer') and _containmentMF_.name = 'flowElements')"/> + <childNodeTraces + visualID="3002" + queryText="(let _eClass_:ecore::EClass = modelFacet.metaClass.ecoreClass in _eClass_.ePackage.nsURI = 'http://www.omg.org/spec/BPMN/20100524/MODEL-XMI' and _eClass_.name = 'UserTask') and (let _containmentMF_:ecore::EStructuralFeature = modelFacet.containmentMetaFeature.ecoreFeature in (let _eClass_:ecore::EClass = _containmentMF_.eContainingClass in _eClass_.ePackage.nsURI = 'http://www.omg.org/spec/BPMN/20100524/MODEL-XMI' and _eClass_.name = 'FlowElementsContainer') and _containmentMF_.name = 'flowElements')"> + <nodeLabelTraces + visualID="5005" + queryText="true"/> </childNodeTraces> - <childNodeTraces visualID="3003" queryText="(let _eClass_:ecore::EClass = modelFacet.metaClass.ecoreClass in _eClass_.ePackage.nsURI = 'http://www.omg.org/spec/BPMN/20100524/MODEL-XMI' and _eClass_.name = 'StartEvent') and (let _containmentMF_:ecore::EStructuralFeature = modelFacet.containmentMetaFeature.ecoreFeature in (let _eClass_:ecore::EClass = _containmentMF_.eContainingClass in _eClass_.ePackage.nsURI = 'http://www.omg.org/spec/BPMN/20100524/MODEL-XMI' and _eClass_.name = 'FlowElementsContainer') and _containmentMF_.name = 'flowElements')"/> - <childNodeTraces visualID="3004" queryText="(let _eClass_:ecore::EClass = modelFacet.metaClass.ecoreClass in _eClass_.ePackage.nsURI = 'http://www.omg.org/spec/BPMN/20100524/MODEL-XMI' and _eClass_.name = 'ServiceTask') and (let _containmentMF_:ecore::EStructuralFeature = modelFacet.containmentMetaFeature.ecoreFeature in (let _eClass_:ecore::EClass = _containmentMF_.eContainingClass in _eClass_.ePackage.nsURI = 'http://www.omg.org/spec/BPMN/20100524/MODEL-XMI' and _eClass_.name = 'FlowElementsContainer') and _containmentMF_.name = 'flowElements')"> - <nodeLabelTraces visualID="5006" queryText="true"/> + <childNodeTraces + visualID="3003" + queryText="(let _eClass_:ecore::EClass = modelFacet.metaClass.ecoreClass in _eClass_.ePackage.nsURI = 'http://www.omg.org/spec/BPMN/20100524/MODEL-XMI' and _eClass_.name = 'StartEvent') and (let _containmentMF_:ecore::EStructuralFeature = modelFacet.containmentMetaFeature.ecoreFeature in (let _eClass_:ecore::EClass = _containmentMF_.eContainingClass in _eClass_.ePackage.nsURI = 'http://www.omg.org/spec/BPMN/20100524/MODEL-XMI' and _eClass_.name = 'FlowElementsContainer') and _containmentMF_.name = 'flowElements')"/> + <childNodeTraces + visualID="3004" + queryText="(let _eClass_:ecore::EClass = modelFacet.metaClass.ecoreClass in _eClass_.ePackage.nsURI = 'http://www.omg.org/spec/BPMN/20100524/MODEL-XMI' and _eClass_.name = 'ServiceTask') and (let _containmentMF_:ecore::EStructuralFeature = modelFacet.containmentMetaFeature.ecoreFeature in (let _eClass_:ecore::EClass = _containmentMF_.eContainingClass in _eClass_.ePackage.nsURI = 'http://www.omg.org/spec/BPMN/20100524/MODEL-XMI' and _eClass_.name = 'FlowElementsContainer') and _containmentMF_.name = 'flowElements')"> + <nodeLabelTraces + visualID="5006" + queryText="true"/> </childNodeTraces> - <childNodeTraces visualID="3005" queryText="(let _eClass_:ecore::EClass = modelFacet.metaClass.ecoreClass in _eClass_.ePackage.nsURI = 'http://www.omg.org/spec/BPMN/20100524/MODEL-XMI' and _eClass_.name = 'StartEvent') and (let _containmentMF_:ecore::EStructuralFeature = modelFacet.containmentMetaFeature.ecoreFeature in (let _eClass_:ecore::EClass = _containmentMF_.eContainingClass in _eClass_.ePackage.nsURI = 'http://www.omg.org/spec/BPMN/20100524/MODEL-XMI' and _eClass_.name = 'FlowElementsContainer') and _containmentMF_.name = 'flowElements')"/> - <childNodeTraces visualID="3006" queryText="(let _eClass_:ecore::EClass = modelFacet.metaClass.ecoreClass in _eClass_.ePackage.nsURI = 'http://www.omg.org/spec/BPMN/20100524/MODEL-XMI' and _eClass_.name = 'EndEvent') and (let _containmentMF_:ecore::EStructuralFeature = modelFacet.containmentMetaFeature.ecoreFeature in (let _eClass_:ecore::EClass = _containmentMF_.eContainingClass in _eClass_.ePackage.nsURI = 'http://www.omg.org/spec/BPMN/20100524/MODEL-XMI' and _eClass_.name = 'FlowElementsContainer') and _containmentMF_.name = 'flowElements')"/> - <childNodeTraces visualID="3007" queryText="(let _eClass_:ecore::EClass = modelFacet.metaClass.ecoreClass in _eClass_.ePackage.nsURI = 'http://www.omg.org/spec/BPMN/20100524/MODEL-XMI' and _eClass_.name = 'ExclusiveGateway') and (let _containmentMF_:ecore::EStructuralFeature = modelFacet.containmentMetaFeature.ecoreFeature in (let _eClass_:ecore::EClass = _containmentMF_.eContainingClass in _eClass_.ePackage.nsURI = 'http://www.omg.org/spec/BPMN/20100524/MODEL-XMI' and _eClass_.name = 'FlowElementsContainer') and _containmentMF_.name = 'flowElements')"/> - <childNodeTraces visualID="3008" queryText="(let _eClass_:ecore::EClass = modelFacet.metaClass.ecoreClass in _eClass_.ePackage.nsURI = 'http://www.omg.org/spec/BPMN/20100524/MODEL-XMI' and _eClass_.name = 'ParallelGateway') and (let _containmentMF_:ecore::EStructuralFeature = modelFacet.containmentMetaFeature.ecoreFeature in (let _eClass_:ecore::EClass = _containmentMF_.eContainingClass in _eClass_.ePackage.nsURI = 'http://www.omg.org/spec/BPMN/20100524/MODEL-XMI' and _eClass_.name = 'FlowElementsContainer') and _containmentMF_.name = 'flowElements')"/> - <childNodeTraces visualID="3009" queryText="(let _eClass_:ecore::EClass = modelFacet.metaClass.ecoreClass in _eClass_.ePackage.nsURI = 'http://www.omg.org/spec/BPMN/20100524/MODEL-XMI' and _eClass_.name = 'EndEvent') and (let _containmentMF_:ecore::EStructuralFeature = modelFacet.containmentMetaFeature.ecoreFeature in (let _eClass_:ecore::EClass = _containmentMF_.eContainingClass in _eClass_.ePackage.nsURI = 'http://www.omg.org/spec/BPMN/20100524/MODEL-XMI' and _eClass_.name = 'FlowElementsContainer') and _containmentMF_.name = 'flowElements')"/> - <childNodeTraces visualID="3010" queryText="(let _eClass_:ecore::EClass = modelFacet.metaClass.ecoreClass in _eClass_.ePackage.nsURI = 'http://www.omg.org/spec/BPMN/20100524/MODEL-XMI' and _eClass_.name = 'EndEvent') and (let _containmentMF_:ecore::EStructuralFeature = modelFacet.containmentMetaFeature.ecoreFeature in (let _eClass_:ecore::EClass = _containmentMF_.eContainingClass in _eClass_.ePackage.nsURI = 'http://www.omg.org/spec/BPMN/20100524/MODEL-XMI' and _eClass_.name = 'FlowElementsContainer') and _containmentMF_.name = 'flowElements')"/> - <childNodeTraces visualID="3011" queryText="(let _eClass_:ecore::EClass = modelFacet.metaClass.ecoreClass in _eClass_.ePackage.nsURI = 'http://www.omg.org/spec/BPMN/20100524/MODEL-XMI' and _eClass_.name = 'IntermediateCatchEvent') and (let _containmentMF_:ecore::EStructuralFeature = modelFacet.containmentMetaFeature.ecoreFeature in (let _eClass_:ecore::EClass = _containmentMF_.eContainingClass in _eClass_.ePackage.nsURI = 'http://www.omg.org/spec/BPMN/20100524/MODEL-XMI' and _eClass_.name = 'FlowElementsContainer') and _containmentMF_.name = 'flowElements')"/> - <childNodeTraces visualID="3012" queryText="(let _eClass_:ecore::EClass = modelFacet.metaClass.ecoreClass in _eClass_.ePackage.nsURI = 'http://www.omg.org/spec/BPMN/20100524/MODEL-XMI' and _eClass_.name = 'IntermediateThrowEvent') and (let _containmentMF_:ecore::EStructuralFeature = modelFacet.containmentMetaFeature.ecoreFeature in (let _eClass_:ecore::EClass = _containmentMF_.eContainingClass in _eClass_.ePackage.nsURI = 'http://www.omg.org/spec/BPMN/20100524/MODEL-XMI' and _eClass_.name = 'FlowElementsContainer') and _containmentMF_.name = 'flowElements')"/> - <childNodeTraces visualID="3013" queryText="(let _eClass_:ecore::EClass = modelFacet.metaClass.ecoreClass in _eClass_.ePackage.nsURI = 'http://www.omg.org/spec/BPMN/20100524/MODEL-XMI' and _eClass_.name = 'IntermediateCatchEvent') and (let _containmentMF_:ecore::EStructuralFeature = modelFacet.containmentMetaFeature.ecoreFeature in (let _eClass_:ecore::EClass = _containmentMF_.eContainingClass in _eClass_.ePackage.nsURI = 'http://www.omg.org/spec/BPMN/20100524/MODEL-XMI' and _eClass_.name = 'FlowElementsContainer') and _containmentMF_.name = 'flowElements')"/> - <childNodeTraces visualID="3014" queryText="(let _eClass_:ecore::EClass = modelFacet.metaClass.ecoreClass in _eClass_.ePackage.nsURI = 'http://www.omg.org/spec/BPMN/20100524/MODEL-XMI' and _eClass_.name = 'DataObject') and (let _containmentMF_:ecore::EStructuralFeature = modelFacet.containmentMetaFeature.ecoreFeature in (let _eClass_:ecore::EClass = _containmentMF_.eContainingClass in _eClass_.ePackage.nsURI = 'http://www.omg.org/spec/BPMN/20100524/MODEL-XMI' and _eClass_.name = 'FlowElementsContainer') and _containmentMF_.name = 'flowElements')"> - <nodeLabelTraces visualID="5007" queryText="true"/> + <childNodeTraces + visualID="3005" + queryText="(let _eClass_:ecore::EClass = modelFacet.metaClass.ecoreClass in _eClass_.ePackage.nsURI = 'http://www.omg.org/spec/BPMN/20100524/MODEL-XMI' and _eClass_.name = 'StartEvent') and (let _containmentMF_:ecore::EStructuralFeature = modelFacet.containmentMetaFeature.ecoreFeature in (let _eClass_:ecore::EClass = _containmentMF_.eContainingClass in _eClass_.ePackage.nsURI = 'http://www.omg.org/spec/BPMN/20100524/MODEL-XMI' and _eClass_.name = 'FlowElementsContainer') and _containmentMF_.name = 'flowElements')"/> + <childNodeTraces + visualID="3006" + queryText="(let _eClass_:ecore::EClass = modelFacet.metaClass.ecoreClass in _eClass_.ePackage.nsURI = 'http://www.omg.org/spec/BPMN/20100524/MODEL-XMI' and _eClass_.name = 'EndEvent') and (let _containmentMF_:ecore::EStructuralFeature = modelFacet.containmentMetaFeature.ecoreFeature in (let _eClass_:ecore::EClass = _containmentMF_.eContainingClass in _eClass_.ePackage.nsURI = 'http://www.omg.org/spec/BPMN/20100524/MODEL-XMI' and _eClass_.name = 'FlowElementsContainer') and _containmentMF_.name = 'flowElements')"/> + <childNodeTraces + visualID="3007" + queryText="(let _eClass_:ecore::EClass = modelFacet.metaClass.ecoreClass in _eClass_.ePackage.nsURI = 'http://www.omg.org/spec/BPMN/20100524/MODEL-XMI' and _eClass_.name = 'ExclusiveGateway') and (let _containmentMF_:ecore::EStructuralFeature = modelFacet.containmentMetaFeature.ecoreFeature in (let _eClass_:ecore::EClass = _containmentMF_.eContainingClass in _eClass_.ePackage.nsURI = 'http://www.omg.org/spec/BPMN/20100524/MODEL-XMI' and _eClass_.name = 'FlowElementsContainer') and _containmentMF_.name = 'flowElements')"/> + <childNodeTraces + visualID="3008" + queryText="(let _eClass_:ecore::EClass = modelFacet.metaClass.ecoreClass in _eClass_.ePackage.nsURI = 'http://www.omg.org/spec/BPMN/20100524/MODEL-XMI' and _eClass_.name = 'ParallelGateway') and (let _containmentMF_:ecore::EStructuralFeature = modelFacet.containmentMetaFeature.ecoreFeature in (let _eClass_:ecore::EClass = _containmentMF_.eContainingClass in _eClass_.ePackage.nsURI = 'http://www.omg.org/spec/BPMN/20100524/MODEL-XMI' and _eClass_.name = 'FlowElementsContainer') and _containmentMF_.name = 'flowElements')"/> + <childNodeTraces + visualID="3009" + queryText="(let _eClass_:ecore::EClass = modelFacet.metaClass.ecoreClass in _eClass_.ePackage.nsURI = 'http://www.omg.org/spec/BPMN/20100524/MODEL-XMI' and _eClass_.name = 'EndEvent') and (let _containmentMF_:ecore::EStructuralFeature = modelFacet.containmentMetaFeature.ecoreFeature in (let _eClass_:ecore::EClass = _containmentMF_.eContainingClass in _eClass_.ePackage.nsURI = 'http://www.omg.org/spec/BPMN/20100524/MODEL-XMI' and _eClass_.name = 'FlowElementsContainer') and _containmentMF_.name = 'flowElements')"/> + <childNodeTraces + visualID="3010" + queryText="(let _eClass_:ecore::EClass = modelFacet.metaClass.ecoreClass in _eClass_.ePackage.nsURI = 'http://www.omg.org/spec/BPMN/20100524/MODEL-XMI' and _eClass_.name = 'EndEvent') and (let _containmentMF_:ecore::EStructuralFeature = modelFacet.containmentMetaFeature.ecoreFeature in (let _eClass_:ecore::EClass = _containmentMF_.eContainingClass in _eClass_.ePackage.nsURI = 'http://www.omg.org/spec/BPMN/20100524/MODEL-XMI' and _eClass_.name = 'FlowElementsContainer') and _containmentMF_.name = 'flowElements')"/> + <childNodeTraces + visualID="3011" + queryText="(let _eClass_:ecore::EClass = modelFacet.metaClass.ecoreClass in _eClass_.ePackage.nsURI = 'http://www.omg.org/spec/BPMN/20100524/MODEL-XMI' and _eClass_.name = 'IntermediateCatchEvent') and (let _containmentMF_:ecore::EStructuralFeature = modelFacet.containmentMetaFeature.ecoreFeature in (let _eClass_:ecore::EClass = _containmentMF_.eContainingClass in _eClass_.ePackage.nsURI = 'http://www.omg.org/spec/BPMN/20100524/MODEL-XMI' and _eClass_.name = 'FlowElementsContainer') and _containmentMF_.name = 'flowElements')"/> + <childNodeTraces + visualID="3012" + queryText="(let _eClass_:ecore::EClass = modelFacet.metaClass.ecoreClass in _eClass_.ePackage.nsURI = 'http://www.omg.org/spec/BPMN/20100524/MODEL-XMI' and _eClass_.name = 'IntermediateThrowEvent') and (let _containmentMF_:ecore::EStructuralFeature = modelFacet.containmentMetaFeature.ecoreFeature in (let _eClass_:ecore::EClass = _containmentMF_.eContainingClass in _eClass_.ePackage.nsURI = 'http://www.omg.org/spec/BPMN/20100524/MODEL-XMI' and _eClass_.name = 'FlowElementsContainer') and _containmentMF_.name = 'flowElements')"/> + <childNodeTraces + visualID="3013" + queryText="(let _eClass_:ecore::EClass = modelFacet.metaClass.ecoreClass in _eClass_.ePackage.nsURI = 'http://www.omg.org/spec/BPMN/20100524/MODEL-XMI' and _eClass_.name = 'IntermediateCatchEvent') and (let _containmentMF_:ecore::EStructuralFeature = modelFacet.containmentMetaFeature.ecoreFeature in (let _eClass_:ecore::EClass = _containmentMF_.eContainingClass in _eClass_.ePackage.nsURI = 'http://www.omg.org/spec/BPMN/20100524/MODEL-XMI' and _eClass_.name = 'FlowElementsContainer') and _containmentMF_.name = 'flowElements')"/> + <childNodeTraces + visualID="3014" + queryText="(let _eClass_:ecore::EClass = modelFacet.metaClass.ecoreClass in _eClass_.ePackage.nsURI = 'http://www.omg.org/spec/BPMN/20100524/MODEL-XMI' and _eClass_.name = 'DataObject') and (let _containmentMF_:ecore::EStructuralFeature = modelFacet.containmentMetaFeature.ecoreFeature in (let _eClass_:ecore::EClass = _containmentMF_.eContainingClass in _eClass_.ePackage.nsURI = 'http://www.omg.org/spec/BPMN/20100524/MODEL-XMI' and _eClass_.name = 'FlowElementsContainer') and _containmentMF_.name = 'flowElements')"> + <nodeLabelTraces + visualID="5007" + queryText="true"/> </childNodeTraces> - <childNodeTraces visualID="3015" queryText="(let _eClass_:ecore::EClass = modelFacet.metaClass.ecoreClass in _eClass_.ePackage.nsURI = 'http://www.omg.org/spec/BPMN/20100524/MODEL-XMI' and _eClass_.name = 'TextAnnotation') and (let _containmentMF_:ecore::EStructuralFeature = modelFacet.containmentMetaFeature.ecoreFeature in (let _eClass_:ecore::EClass = _containmentMF_.eContainingClass in _eClass_.ePackage.nsURI = 'http://www.omg.org/spec/BPMN/20100524/MODEL-XMI' and _eClass_.name = 'SubProcess') and _containmentMF_.name = 'artifacts')"> - <nodeLabelTraces visualID="5008" queryText="true"/> + <childNodeTraces + visualID="3015" + queryText="(let _eClass_:ecore::EClass = modelFacet.metaClass.ecoreClass in _eClass_.ePackage.nsURI = 'http://www.omg.org/spec/BPMN/20100524/MODEL-XMI' and _eClass_.name = 'TextAnnotation') and (let _containmentMF_:ecore::EStructuralFeature = modelFacet.containmentMetaFeature.ecoreFeature in (let _eClass_:ecore::EClass = _containmentMF_.eContainingClass in _eClass_.ePackage.nsURI = 'http://www.omg.org/spec/BPMN/20100524/MODEL-XMI' and _eClass_.name = 'SubProcess') and _containmentMF_.name = 'artifacts')"> + <nodeLabelTraces + visualID="5008" + queryText="true"/> </childNodeTraces> - <childNodeTraces visualID="3016" queryText="(let _eClass_:ecore::EClass = modelFacet.metaClass.ecoreClass in _eClass_.ePackage.nsURI = 'http://www.omg.org/spec/BPMN/20100524/MODEL-XMI' and _eClass_.name = 'ScriptTask') and (let _containmentMF_:ecore::EStructuralFeature = modelFacet.containmentMetaFeature.ecoreFeature in (let _eClass_:ecore::EClass = _containmentMF_.eContainingClass in _eClass_.ePackage.nsURI = 'http://www.omg.org/spec/BPMN/20100524/MODEL-XMI' and _eClass_.name = 'FlowElementsContainer') and _containmentMF_.name = 'flowElements')"> - <nodeLabelTraces visualID="5010" queryText="true"/> + <childNodeTraces + visualID="3016" + queryText="(let _eClass_:ecore::EClass = modelFacet.metaClass.ecoreClass in _eClass_.ePackage.nsURI = 'http://www.omg.org/spec/BPMN/20100524/MODEL-XMI' and _eClass_.name = 'ScriptTask') and (let _containmentMF_:ecore::EStructuralFeature = modelFacet.containmentMetaFeature.ecoreFeature in (let _eClass_:ecore::EClass = _containmentMF_.eContainingClass in _eClass_.ePackage.nsURI = 'http://www.omg.org/spec/BPMN/20100524/MODEL-XMI' and _eClass_.name = 'FlowElementsContainer') and _containmentMF_.name = 'flowElements')"> + <nodeLabelTraces + visualID="5010" + queryText="true"/> </childNodeTraces> - <linkTraces visualID="4001" queryText="modelFacet.oclIsKindOf(gmfgen::TypeLinkModelFacet) and (let _eClass_:ecore::EClass = modelFacet.oclAsType(gmfgen::TypeLinkModelFacet).metaClass.ecoreClass in _eClass_.ePackage.nsURI = 'http://www.omg.org/spec/BPMN/20100524/MODEL-XMI' and _eClass_.name = 'SequenceFlow')"/> - <linkTraces visualID="4002" queryText="modelFacet.oclIsKindOf(gmfgen::TypeLinkModelFacet) and (let _eClass_:ecore::EClass = modelFacet.oclAsType(gmfgen::TypeLinkModelFacet).metaClass.ecoreClass in _eClass_.ePackage.nsURI = 'http://www.omg.org/spec/BPMN/20100524/MODEL-XMI' and _eClass_.name = 'Association')"/> + <linkTraces + visualID="4001" + queryText="modelFacet.oclIsKindOf(gmfgen::TypeLinkModelFacet) and (let _eClass_:ecore::EClass = modelFacet.oclAsType(gmfgen::TypeLinkModelFacet).metaClass.ecoreClass in _eClass_.ePackage.nsURI = 'http://www.omg.org/spec/BPMN/20100524/MODEL-XMI' and _eClass_.name = 'SequenceFlow')"/> + <linkTraces + visualID="4002" + queryText="modelFacet.oclIsKindOf(gmfgen::TypeLinkModelFacet) and (let _eClass_:ecore::EClass = modelFacet.oclAsType(gmfgen::TypeLinkModelFacet).metaClass.ecoreClass in _eClass_.ePackage.nsURI = 'http://www.omg.org/spec/BPMN/20100524/MODEL-XMI' and _eClass_.name = 'Association')"/> </trace:TraceModel> Added: trunk/bpmn/plugins/org.jboss.tools.bpmn2.model/model/bpmn2.gmfgraph =================================================================== --- trunk/bpmn/plugins/org.jboss.tools.bpmn2.model/model/bpmn2.gmfgraph (rev 0) +++ trunk/bpmn/plugins/org.jboss.tools.bpmn2.model/model/bpmn2.gmfgraph 2011-02-09 09:42:57 UTC (rev 29073) @@ -0,0 +1,809 @@ +<?xml version="1.0" encoding="UTF-8"?> +<gmfgraph:Canvas xmi:version="2.0" + xmlns:xmi="http://www.omg.org/XMI" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xmlns:gmfgraph="http://www.eclipse.org/gmf/2006/GraphicalDefinition" name="BPMN"> + <figures + name="BPMN Figures"> + <descriptors + name="TaskFigureDescriptor"> + <actualFigure + xsi:type="gmfgraph:RoundedRectangle" + name="TaskFigure"> + <layout + xsi:type="gmfgraph:StackLayout"/> + <minimumSize + dx="80" + dy="40"/> + <preferredSize + dx="80" + dy="40"/> + <insets + top="5" + left="5" + bottom="5" + right="5"/> + <children + xsi:type="gmfgraph:Label" + name="Name"/> + </actualFigure> + <accessors + figure="//@figures.0/@descriptors.0/@actualFigure/(a)children.0"/> + </descriptors> + <descriptors + name="SequenceFlowFigureDescriptor"> + <actualFigure + xsi:type="gmfgraph:PolylineConnection" + name="SequenceFlowFigure" + targetDecoration="//@figures.0/@descriptors.1/@actualFigure/(a)children.0"> + <children + xsi:type="gmfgraph:PolygonDecoration" + name="ClosedArrow"> + <template/> + <template + x="-1" + y="1"/> + <template + x="-1" + y="-1"/> + <template/> + </children> + </actualFigure> + </descriptors> + <descriptors + name="SimpleLabel"> + <actualFigure + xsi:type="gmfgraph:Label" + name="SimpleLabel" + text=""/> + </descriptors> + <descriptors + name="StartEventFigureDescriptor"> + <actualFigure + xsi:type="gmfgraph:Rectangle" + name="StartEventFigure" + outline="false" + fill="false"> + <layout + xsi:type="gmfgraph:StackLayout"/> + <children + xsi:type="gmfgraph:Ellipse" + name="Circle"/> + </actualFigure> + </descriptors> + <descriptors + name="EndEventFigureDescriptor"> + <actualFigure + xsi:type="gmfgraph:Rectangle" + name="EndEventFigure" + outline="false" + fill="false"> + <layout + xsi:type="gmfgraph:StackLayout"/> + <children + xsi:type="gmfgraph:Ellipse" + name="Circle" + lineWidth="3"/> + </actualFigure> + </descriptors> + <descriptors + name="ExclusiveGatewayFigureDescriptor"> + <actualFigure + xsi:type="gmfgraph:Rectangle" + name="ExclusiveGatewayFigure" + outline="false" + fill="false"> + <layout + xsi:type="gmfgraph:StackLayout"/> + <children + xsi:type="gmfgraph:Polygon" + name="Diamond"> + <template + x="15"/> + <template + y="15"/> + <template + x="15" + y="30"/> + <template + x="30" + y="15"/> + </children> + </actualFigure> + </descriptors> + <descriptors + name="ParallelGatewayFigureDescriptor"> + <actualFigure + xsi:type="gmfgraph:Rectangle" + name="ParallelGatewayFigure" + outline="false" + fill="false"> + <layout + xsi:type="gmfgraph:StackLayout"/> + <children + xsi:type="gmfgraph:Polygon" + name="Diamond"> + <template + x="15"/> + <template + y="15"/> + <template + x="15" + y="30"/> + <template + x="30" + y="15"/> + </children> + <children + xsi:type="gmfgraph:Polyline" + name="Vertical"> + <template + x="15" + y="8"/> + <template + x="15" + y="22"/> + </children> + <children + xsi:type="gmfgraph:Polyline" + name="Horizontal"> + <template + x="8" + y="15"/> + <template + x="22" + y="15"/> + </children> + </actualFigure> + </descriptors> + <descriptors + name="MessageStartEventFigureDescriptor"> + <actualFigure + xsi:type="gmfgraph:Rectangle" + name="MessageStartEventFigure" + outline="false" + fill="false"> + <layout + xsi:type="gmfgraph:StackLayout"/> + <children + xsi:type="gmfgraph:Ellipse" + name="Circle"> + <layout + xsi:type="gmfgraph:StackLayout"/> + <insets + top="6" + left="5" + bottom="6" + right="5"/> + <children + xsi:type="gmfgraph:Rectangle" + name="Rectangle"> + <layout + xsi:type="gmfgraph:StackLayout"/> + <children + xsi:type="gmfgraph:Polyline" + name="WhiteEnvelope"> + <template/> + <template + x="4" + y="4"/> + <template + x="5" + y="4"/> + <template + x="9"/> + </children> + </children> + </children> + </actualFigure> + </descriptors> + <descriptors + name="MessageEndEventFigureDescriptor"> + <actualFigure + xsi:type="gmfgraph:Rectangle" + name="MessageEndEventFigure" + outline="false" + fill="false"> + <layout + xsi:type="gmfgraph:StackLayout"/> + <children + xsi:type="gmfgraph:Ellipse" + name="Circle" + lineWidth="3"> + <layout + xsi:type="gmfgraph:StackLayout"/> + <insets + top="6" + left="5" + bottom="6" + right="5"/> + <children + xsi:type="gmfgraph:Rectangle" + name="Rectangle"> + <layout + xsi:type="gmfgraph:StackLayout"/> + <backgroundColor + xsi:type="gmfgraph:ConstantColor" + value="lightGray"/> + <children + xsi:type="gmfgraph:Polyline" + name="BlackEnvelope"> + <foregroundColor + xsi:type="gmfgraph:ConstantColor"/> + <template/> + <template + x="4" + y="4"/> + <template + x="5" + y="4"/> + <template + x="9"/> + </children> + </children> + </children> + </actualFigure> + </descriptors> + <descriptors + name="TerminateEndEventFigureDescriptor"> + <actualFigure + xsi:type="gmfgraph:Rectangle" + name="TerminateEndEventFigure" + outline="false" + fill="false"> + <layout + xsi:type="gmfgraph:StackLayout"/> + <children + xsi:type="gmfgraph:Ellipse" + name="Circle" + lineWidth="3"> + <layout + xsi:type="gmfgraph:StackLayout"/> + <insets + top="6" + left="6" + bottom="6" + right="6"/> + <children + xsi:type="gmfgraph:Ellipse" + name="Circle"> + <backgroundColor + xsi:type="gmfgraph:ConstantColor" + value="lightGray"/> + </children> + </children> + </actualFigure> + </descriptors> + <descriptors + name="MessageCatchIntermediateEventFigureDescriptor"> + <actualFigure + xsi:type="gmfgraph:Rectangle" + name="MessageCatchIntermediageEventFigure" + outline="false" + fill="false"> + <layout + xsi:type="gmfgraph:StackLayout"/> + <children + xsi:type="gmfgraph:Ellipse" + name="OuterCircle"> + <layout + xsi:type="gmfgraph:StackLayout"/> + <insets + top="2" + left="2" + bottom="2" + right="2"/> + <children + xsi:type="gmfgraph:Ellipse" + name="InnerCircle"> + <layout + xsi:type="gmfgraph:StackLayout"/> + <insets + top="4" + left="3" + bottom="4" + right="3"/> + <children + xsi:type="gmfgraph:Rectangle" + name="Rectangle"> + <layout + xsi:type="gmfgraph:StackLayout"/> + <children + xsi:type="gmfgraph:Polyline" + name="Envelope"> + <template/> + <template + x="4" + y="4"/> + <template + x="5" + y="4"/> + <template + x="9"/> + </children> + </children> + </children> + </children> + </actualFigure> + </descriptors> + <descriptors + name="MessageThrowIntermediateEventFigureDescriptor"> + <actualFigure + xsi:type="gmfgraph:Rectangle" + name="MessageThrowIntermediateEventFigure" + outline="false" + fill="false"> + <layout + xsi:type="gmfgraph:StackLayout"/> + <children + xsi:type="gmfgraph:Ellipse" + name="OuterCircle"> + <layout + xsi:type="gmfgraph:StackLayout"/> + <insets + top="2" + left="2" + bottom="2" + right="2"/> + <children + xsi:type="gmfgraph:Ellipse" + name="InnerCircle"> + <layout + xsi:type="gmfgraph:StackLayout"/> + <insets + top="4" + left="3" + bottom="4" + right="3"/> + <children + xsi:type="gmfgraph:Rectangle" + name="Rectangle"> + <layout + xsi:type="gmfgraph:StackLayout"/> + <backgroundColor + xsi:type="gmfgraph:ConstantColor" + value="lightGray"/> + <children + xsi:type="gmfgraph:Polyline" + name="Envelope"> + <foregroundColor + xsi:type="gmfgraph:ConstantColor"/> + <template/> + <template + x="4" + y="4"/> + <template + x="5" + y="4"/> + <template + x="9"/> + </children> + </children> + </children> + </children> + </actualFigure> + </descriptors> + <descriptors + name="TimerCatchIntermediateEventFigureDescriptor"> + <actualFigure + xsi:type="gmfgraph:Rectangle" + name="TimerCatchIntermediateEventFigure" + outline="false" + fill="false"> + <layout + xsi:type="gmfgraph:StackLayout"/> + <children + xsi:type="gmfgraph:Ellipse" + name="OuterCircle"> + <layout + xsi:type="gmfgraph:StackLayout"/> + <insets + top="2" + left="2" + bottom="2" + right="2"/> + <children + xsi:type="gmfgraph:Ellipse" + name="InnerCircle"> + <layout + xsi:type="gmfgraph:StackLayout"/> + <insets + top="3" + left="3" + bottom="3" + right="3"/> + <children + xsi:type="gmfgraph:Ellipse" + name="Clock"/> + <children + xsi:type="gmfgraph:Polyline" + name="Twelve"> + <template + x="4"/> + <template + x="4" + y="2"/> + </children> + <children + xsi:type="gmfgraph:Polyline" + name="Three"> + <template + x="7" + y="4"/> + <template + x="9" + y="4"/> + </children> + <children + xsi:type="gmfgraph:Polyline" + name="Six"> + <template + x="4" + y="7"/> + <template + x="4" + y="9"/> + </children> + <children + xsi:type="gmfgraph:Polyline" + name="Nine"> + <template + y="4"/> + <template + x="2" + y="4"/> + </children> + <children + xsi:type="gmfgraph:Polyline" + name="Big"> + <template + x="4" + y="4"/> + <template + x="6" + y="1"/> + </children> + <children + xsi:type="gmfgraph:Polyline" + name="Small"> + <template + x="4" + y="4"/> + <template + x="7" + y="7"/> + </children> + </children> + </children> + </actualFigure> + </descriptors> + <descriptors + name="ErrorCatchIntermediateEventFigureDescriptor"> + <actualFigure + xsi:type="gmfgraph:Rectangle" + name="ErrorCatchIntermediateEventFigure" + outline="false" + fill="false"> + <layout + xsi:type="gmfgraph:StackLayout"/> + <children + xsi:type="gmfgraph:Ellipse" + name="OuterCircle"> + <layout + xsi:type="gmfgraph:StackLayout"/> + <insets + top="2" + left="2" + bottom="2" + right="2"/> + <children + xsi:type="gmfgraph:Ellipse" + name="InnerCircle"> + <layout + xsi:type="gmfgraph:StackLayout"/> + <insets + top="3" + left="3" + bottom="3" + right="3"/> + <children + xsi:type="gmfgraph:Polygon" + name="Flash"> + <template + y="9"/> + <template + x="3"/> + <template + x="7" + y="6"/> + <template + x="10" + y="1"/> + <template + x="7" + y="10"/> + <template + x="3" + y="3"/> + </children> + </children> + </children> + </actualFigure> + </descriptors> + <descriptors + name="DataObjectFigureDescriptor"> + <actualFigure + xsi:type="gmfgraph:Rectangle" + name="DataObjectFigure" + outline="false" + fill="false"> + <layout + xsi:type="gmfgraph:StackLayout"/> + <children + xsi:type="gmfgraph:Polygon" + name="DogEarPage"> + <template + x="12"/> + <template + x="20" + y="8"/> + <template + x="20" + y="25"/> + <template + y="25"/> + <template/> + <template + x="12"/> + <template + x="12" + y="8"/> + <template + x="20" + y="8"/> + </children> + </actualFigure> + </descriptors> + <descriptors + name="DataObjectLabelFigureDescriptor"> + <actualFigure + xsi:type="gmfgraph:Label" + name="DataObjectLabelFigure"/> + </descriptors> + <descriptors + name="AssociationFigureDescriptor"> + <actualFigure + xsi:type="gmfgraph:PolylineConnection" + name="AssociationFigure" + lineKind="LINE_DOT"/> + </descriptors> + <descriptors + name="TextAnnotationFigureDescriptor"> + <actualFigure + xsi:type="gmfgraph:Rectangle" + name="TextAnnotationFigure" + outline="false" + fill="false"> + <layout + xsi:type="gmfgraph:StackLayout"/> + <minimumSize + dx="50" + dy="20"/> + <preferredSize + dx="120" + dy="20"/> + <border + xsi:type="gmfgraph:CustomBorder" + qualifiedClassName="org.jboss.tools.bpmn2.process.diagram.figures.TextAnnotationFigureBorder"/> + <children + xsi:type="gmfgraph:Rectangle" + name="TextAnnotationRectangle" + outline="false" + fill="false" + lineKind="LINE_DOT"> + <layout + xsi:type="gmfgraph:StackLayout"/> + <insets + top="4" + left="5" + bottom="5" + right="4"/> + <children + xsi:type="gmfgraph:Label" + name="TextAnnotationLabel" + text=""/> + </children> + </actualFigure> + <accessors + figure="//@figures.0/@descriptors.17/@actualFigure/@children.0/(a)children.0"/> + </descriptors> + <descriptors + name="ExpandedSubprocessFigureDescriptor"> + <actualFigure + xsi:type="gmfgraph:RoundedRectangle" + name="ExpandedSubprocessFigure"> + <layout + xsi:type="gmfgraph:XYLayout"/> + <preferredSize + dx="240" + dy="240"/> + </actualFigure> + <accessors + figure="//@figures.0/@descriptors.18/(a)actualFigure"/> + </descriptors> + <descriptors + name="EventBasedGatewayFigureDescriptor"/> + </figures> + <nodes + name="UserTask" + figure="TaskFigureDescriptor"/> + <nodes + name="ServiceTask" + figure="TaskFigureDescriptor"/> + <nodes + name="ScriptTask" + figure="TaskFigureDescriptor"/> + <nodes + name="StartEvent" + figure="StartEventFigureDescriptor" + resizeConstraint="NONE"> + <facets + xsi:type="gmfgraph:DefaultSizeFacet"> + <defaultSize + dx="20" + dy="20"/> + </facets> + </nodes> + <nodes + name="EndEvent" + figure="EndEventFigureDescriptor" + resizeConstraint="NONE"> + <facets + xsi:type="gmfgraph:DefaultSizeFacet"> + <defaultSize + dx="20" + dy="20"/> + </facets> + </nodes> + <nodes + name="ExclusiveGateway" + figure="ExclusiveGatewayFigureDescriptor" + resizeConstraint="NONE"> + <facets + xsi:type="gmfgraph:DefaultSizeFacet"> + <defaultSize + dx="31" + dy="31"/> + </facets> + </nodes> + <nodes + name="ParallelGateway" + figure="ParallelGatewayFigureDescriptor" + resizeConstraint="NONE"> + <facets + xsi:type="gmfgraph:DefaultSizeFacet"> + <defaultSize + dx="31" + dy="31"/> + </facets> + </nodes> + <nodes + name="MessageStartEvent" + figure="MessageStartEventFigureDescriptor" + resizeConstraint="NONE"> + <facets + xsi:type="gmfgraph:DefaultSizeFacet"> + <defaultSize + dx="20" + dy="20"/> + </facets> + </nodes> + <nodes + name="MessageEndEvent" + figure="MessageEndEventFigureDescriptor" + resizeConstraint="NONE"> + <facets + xsi:type="gmfgraph:DefaultSizeFacet"> + <defaultSize + dx="20" + dy="20"/> + </facets> + </nodes> + <nodes + name="TerminateEndEvent" + figure="TerminateEndEventFigureDescriptor" + resizeConstraint="NONE"> + <facets + xsi:type="gmfgraph:DefaultSizeFacet"> + <defaultSize + dx="20" + dy="20"/> + </facets> + </nodes> + <nodes + name="MessageCatchIntermediateEvent" + figure="MessageCatchIntermediateEventFigureDescriptor" + resizeConstraint="NONE"> + <facets + xsi:type="gmfgraph:DefaultSizeFacet"> + <defaultSize + dx="20" + dy="20"/> + </facets> + </nodes> + <nodes + name="MessageThrowIntermediateEvent" + figure="MessageThrowIntermediateEventFigureDescriptor" + resizeConstraint="NONE"> + <facets + xsi:type="gmfgraph:DefaultSizeFacet"> + <defaultSize + dx="20" + dy="20"/> + </facets> + </nodes> + <nodes + name="TimerCatchIntermediateEvent" + figure="TimerCatchIntermediateEventFigureDescriptor" + resizeConstraint="NONE"> + <facets + xsi:type="gmfgraph:DefaultSizeFacet"> + <defaultSize + dx="20" + dy="20"/> + </facets> + </nodes> + <nodes + name="ErrorCatchIntermediateEvent" + figure="ErrorCatchIntermediateEventFigureDescriptor" + resizeConstraint="NONE"> + <facets + xsi:type="gmfgraph:DefaultSizeFacet"> + <defaultSize + dx="20" + dy="20"/> + </facets> + </nodes> + <nodes + name="DataObject" + figure="DataObjectFigureDescriptor" + resizeConstraint="NONE"> + <facets + xsi:type="gmfgraph:DefaultSizeFacet"> + <defaultSize + dx="21" + dy="26"/> + </facets> + </nodes> + <nodes + name="TextAnnotation" + figure="TextAnnotationFigureDescriptor"/> + <nodes + name="ExpandedSubprocess" + figure="ExpandedSubprocessFigureDescriptor" + contentPane="//@figures.0/@descriptors.18/(a)accessors.0"/> + <connections + name="SequenceFlow" + figure="SequenceFlowFigureDescriptor"/> + <connections + name="Association" + figure="AssociationFigureDescriptor"/> + <labels + name="RoundedRectangleLabel" + figure="TaskFigureDescriptor" + accessor="//@figures.0/@descriptors.0/(a)accessors.0"/> + <labels + name="Element Name" + figure="TextAnnotationFigureDescriptor" + elementIcon="false" + accessor="//@figures.0/@descriptors.17/(a)accessors.0"/> + <labels + name="DataObjectLabel" + figure="DataObjectLabelFigureDescriptor" + elementIcon="false"/> + <labels + name="TextAnnotationLabel" + figure="TextAnnotationFigureDescriptor" + elementIcon="false" + accessor="//@figures.0/@descriptors.17/(a)accessors.0"/> +</gmfgraph:Canvas> Property changes on: trunk/bpmn/plugins/org.jboss.tools.bpmn2.model/model/bpmn2.gmfgraph ___________________________________________________________________ Name: svn:mime-type + text/plain

13 years, 11 months

1
0
0 / 0

JBoss Tools SVN: r29072 - trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/adapter.

by jbosstools-commits＠lists.jboss.org

Author: scabanovich Date: 2011-02-09 04:04:11 -0500 (Wed, 09 Feb 2011) New Revision: 29072 Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/adapter/JavaClassContentAssistProvider.java Log: JBIDE-8328 https://issues.jboss.org/browse/JBIDE-8328 Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/adapter/JavaClassContentAssistProvider.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/adapter/JavaClassContentAssistProvider.java 2011-02-08 20:56:37 UTC (rev 29071) +++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/adapter/JavaClassContentAssistProvider.java 2011-02-09 09:04:11 UTC (rev 29072) @@ -17,14 +17,23 @@ import java.util.ListIterator; import org.eclipse.core.resources.IProject; -import org.eclipse.jdt.core.IJavaProject; -import org.eclipse.jdt.core.IType; +import org.eclipse.core.runtime.NullProgressMonitor; +import org.eclipse.jdt.core.CompletionProposal; +import org.eclipse.jdt.core.CompletionRequestor; +import org.eclipse.jdt.core.Flags; +import org.eclipse.jdt.core.IBuffer; +import org.eclipse.jdt.core.ICompilationUnit; +import org.eclipse.jdt.core.IJavaElement; +import org.eclipse.jdt.core.IPackageFragment; +import org.eclipse.jdt.core.IPackageFragmentRoot; +import org.eclipse.jdt.core.JavaCore; import org.eclipse.jdt.core.JavaModelException; import org.eclipse.jdt.core.search.IJavaSearchConstants; import org.eclipse.jface.fieldassist.ContentProposalAdapter; import org.eclipse.jface.fieldassist.IContentProposal; import org.eclipse.jface.fieldassist.IContentProposalProvider; import org.eclipse.jface.viewers.LabelProvider; +import org.eclipse.pde.internal.ui.PDEPluginImages; import org.eclipse.pde.internal.ui.editor.contentassist.TypeContentProposal; import org.eclipse.pde.internal.ui.editor.contentassist.TypePackageCompletionProcessor; import org.eclipse.swt.graphics.Image; @@ -35,9 +44,7 @@ import org.jboss.tools.common.model.ui.attribute.IAttributeContentProposalProvider; import org.jboss.tools.common.model.ui.attribute.IValueFilter; import org.jboss.tools.common.model.ui.attribute.editor.JavaHyperlinkCueLabelProvider; -import org.jboss.tools.common.model.util.EclipseResourceUtil; import org.jboss.tools.common.model.util.ModelFeatureFactory; -import org.jboss.tools.common.util.EclipseJavaUtil; public class JavaClassContentAssistProvider implements IAttributeContentProposalProvider { @@ -233,38 +240,12 @@ // Sort the proposals alphabetically Arrays.sort(proposals, fComparator); - restoreDefaultPackage(proposals); - } else { proposals = new IContentProposal[0]; } return proposals; } - private void restoreDefaultPackage(IContentProposal[] proposals) { - for (int i = 0; i < proposals.length; i++) { - IContentProposal p = proposals[i]; - String content = p.getContent(); - if(content == null || content.indexOf('.') >= 0) continue; - String label = p.getLabel(); - if(label != null && label.indexOf("- null") >= 0 && p instanceof TypeContentProposal) { - String qn = "java.lang." + content; - IJavaProject jp = EclipseResourceUtil.getJavaProject(fProject); - IType t = null; - try { - t = EclipseJavaUtil.findType(jp, qn); - } catch (JavaModelException e) { - e.printStackTrace(); - } - int k = label.indexOf("- null"); - String pack = t != null ? "java.lang" : "(default)"; - label = label.substring(0, k + 2) + pack; - TypeContentProposal p1 = new TypeContentProposal(label, content, p.getDescription(), ((TypeContentProposal)p).getImage()); - proposals[i] = p1; - } - } - } - /** * @param currentContent * @return @@ -315,4 +296,89 @@ return filteredContentProposals; } + + protected void generateTypePackageProposals(String currentContent, IProject project, Collection c, int startOffset, int typeScope, boolean replaceEntireContents) { + currentContent = removeLeadingSpaces(currentContent); + if (c == null || currentContent.length() == 0) + return; + int length = (replaceEntireContents) ? -1 : currentContent.length(); + generateProposals(currentContent, project, c, startOffset, length, typeScope); + } + + private void generateProposals(String currentContent, IProject project, final Collection c, final int startOffset, final int length, final int typeScope) { + + class TypePackageCompletionRequestor extends CompletionRequestor { + + public TypePackageCompletionRequestor() { + super(true); + setIgnored(CompletionProposal.PACKAGE_REF, false); + setIgnored(CompletionProposal.TYPE_REF, false); + } + + public void accept(CompletionProposal proposal) { + if (proposal.getKind() == CompletionProposal.PACKAGE_REF) { + String pkgName = new String(proposal.getCompletion()); + addProposalToCollection(c, startOffset, length, pkgName, pkgName, PDEPluginImages.get(PDEPluginImages.OBJ_DESC_PACKAGE)); + } else { + boolean isInterface = Flags.isInterface(proposal.getFlags()); + String completion = new String(proposal.getCompletion()); + if (isInterface && typeScope == IJavaSearchConstants.CLASS || (!isInterface && typeScope == IJavaSearchConstants.INTERFACE) || completion.equals("Dummy2")) //$NON-NLS-1$ + // don't want Dummy class showing up as option. + return; + int period = completion.lastIndexOf('.'); + String cName = null, pName = null; + if (period == -1) { + cName = completion; + } else { + cName = completion.substring(period + 1); + pName = completion.substring(0, period); + } + if(pName == null) { + char[] declaration = proposal.getDeclarationSignature(); + pName = declaration == null || declaration.length == 0 ? "(default)" : new String(declaration); + } + Image image = isInterface ? PDEPluginImages.get(PDEPluginImages.OBJ_DESC_GENERATE_INTERFACE) : PDEPluginImages.get(PDEPluginImages.OBJ_DESC_GENERATE_CLASS); + addProposalToCollection(c, startOffset, length, cName + " - " + pName, //$NON-NLS-1$ + completion, image); + } + } + + } + + try { + ICompilationUnit unit = getWorkingCopy(project); + if (unit == null) { + generateTypeProposals(currentContent, project, c, startOffset, length, 1); + return; + } + IBuffer buff = unit.getBuffer(); + buff.setContents("class Dummy2 { " + currentContent); //$NON-NLS-1$ + + CompletionRequestor req = new TypePackageCompletionRequestor(); + unit.codeComplete(15 + currentContent.length(), req); + unit.discardWorkingCopy(); + } catch (JavaModelException e) { + ModelUIPlugin.getPluginLog().logError(e); + } + } + + private ICompilationUnit getWorkingCopy(IProject project) throws JavaModelException { + IPackageFragmentRoot[] roots = JavaCore.create(project).getPackageFragmentRoots(); + if (roots.length > 0) { + IPackageFragment frag = null; + for (int i = 0; i < roots.length; i++) + if (roots[i].getKind() == IPackageFragmentRoot.K_SOURCE || project.equals(roots[i].getCorrespondingResource()) || (roots[i].isArchive() && !roots[i].isExternal())) { + IJavaElement[] elems = roots[i].getChildren(); + if ((elems.length > 0) && (i < elems.length) && (elems[i] instanceof IPackageFragment)) { + frag = (IPackageFragment) elems[i]; + break; + } + } + if (frag != null) + return frag.getCompilationUnit("Dummy2.java").getWorkingCopy(new NullProgressMonitor()); //$NON-NLS-1$ + } + return null; + } + + }

13 years, 11 months

1
0
0 / 0

JBoss Tools SVN: r29071 - trunk/documentation/guides/JBDS_Release_Notes/en-US.

by jbosstools-commits＠lists.jboss.org

Author: mcaspers Date: 2011-02-08 15:56:37 -0500 (Tue, 08 Feb 2011) New Revision: 29071 Modified: trunk/documentation/guides/JBDS_Release_Notes/en-US/Known_Issues_4_0_0.xml Log: Added new known issues JBDS-1273 and JBRULES-2884 Modified: trunk/documentation/guides/JBDS_Release_Notes/en-US/Known_Issues_4_0_0.xml =================================================================== --- trunk/documentation/guides/JBDS_Release_Notes/en-US/Known_Issues_4_0_0.xml 2011-02-08 20:38:05 UTC (rev 29070) +++ trunk/documentation/guides/JBDS_Release_Notes/en-US/Known_Issues_4_0_0.xml 2011-02-08 20:56:37 UTC (rev 29071) @@ -12,6 +12,16 @@ <itemizedlist> <listitem> <para> + <ulink url="https://issues.jboss.org/browse/JBDS-1273">JBDS-1273</ulink>: Smooks Editor does not support mapping to Virtual Models. + </para> + </listitem> + <listitem> + <para> + <ulink url="https://issues.jboss.org/browse/JBRULES-2884">JBRULES-2884</ulink>: JavaDoc and source locations can not be specified for a Drools classpath container. + </para> + </listitem> + <listitem> + <para> <ulink url="https://issues.jboss.org/browse/JBDS-1554">JBDS-1554</ulink>: The new project wizards do not display their associated Eclipse perspective. </para> </listitem>

13 years, 11 months

1
0
0 / 0

JBoss Tools SVN: r29070 - trunk/bpel/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/util.

by jbosstools-commits＠lists.jboss.org

Author: bbrodt Date: 2011-02-08 15:38:05 -0500 (Tue, 08 Feb 2011) New Revision: 29070 Modified: trunk/bpel/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/util/ElementPlacer.java Log: https://issues.jboss.org/browse/JBIDE-8246 Remove unsupported DOM API call in earlier versions of org.eclipse.wst.xml.core See also https://bugs.eclipse.org/bugs/show_bug.cgi?id=335458 Modified: trunk/bpel/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/util/ElementPlacer.java =================================================================== --- trunk/bpel/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/util/ElementPlacer.java 2011-02-08 18:43:09 UTC (rev 29069) +++ trunk/bpel/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/util/ElementPlacer.java 2011-02-08 20:38:05 UTC (rev 29070) @@ -225,8 +225,8 @@ Node nextInnerChild = innerChild; while (nextInnerChild != null) { boolean textNodeIsWhitespaceOnly = false; - if (nextInnerChild.getNodeType() == Node.TEXT_NODE) { - String content = nextInnerChild.getTextContent(); + if (nextInnerChild instanceof Text) { + String content = ((Text)nextInnerChild).getData(); textNodeIsWhitespaceOnly = (content==null || content.trim().isEmpty()); } if (textNodeIsWhitespaceOnly) {

13 years, 11 months

1
0
0 / 0

JBoss Tools SVN: r29069 - trunk/forge/plugins/org.jboss.tools.seam.forge/src/org/jboss/tools/seam/forge/console.

by jbosstools-commits＠lists.jboss.org

Author: koen.aers(a)jboss.com Date: 2011-02-08 13:43:09 -0500 (Tue, 08 Feb 2011) New Revision: 29069 Modified: trunk/forge/plugins/org.jboss.tools.seam.forge/src/org/jboss/tools/seam/forge/console/Console.java trunk/forge/plugins/org.jboss.tools.seam.forge/src/org/jboss/tools/seam/forge/console/ConsoleInputStream.java trunk/forge/plugins/org.jboss.tools.seam.forge/src/org/jboss/tools/seam/forge/console/ConsoleOutputStream.java trunk/forge/plugins/org.jboss.tools.seam.forge/src/org/jboss/tools/seam/forge/console/ConsolePartitioner.java trunk/forge/plugins/org.jboss.tools.seam.forge/src/org/jboss/tools/seam/forge/console/StreamListener.java Log: cleanup and refactorings Modified: trunk/forge/plugins/org.jboss.tools.seam.forge/src/org/jboss/tools/seam/forge/console/Console.java =================================================================== --- trunk/forge/plugins/org.jboss.tools.seam.forge/src/org/jboss/tools/seam/forge/console/Console.java 2011-02-08 17:27:53 UTC (rev 29068) +++ trunk/forge/plugins/org.jboss.tools.seam.forge/src/org/jboss/tools/seam/forge/console/Console.java 2011-02-08 18:43:09 UTC (rev 29069) @@ -1,8 +1,6 @@ package org.jboss.tools.seam.forge.console; import java.io.IOException; -import java.util.ArrayList; -import java.util.List; import org.eclipse.debug.core.DebugEvent; import org.eclipse.debug.core.DebugPlugin; @@ -10,12 +8,6 @@ import org.eclipse.debug.core.model.IProcess; import org.eclipse.debug.core.model.IStreamMonitor; import org.eclipse.debug.core.model.IStreamsProxy; -import org.eclipse.debug.ui.IDebugUIConstants; -import org.eclipse.jface.resource.JFaceResources; -import org.eclipse.swt.graphics.Color; -import org.eclipse.swt.graphics.RGB; -import org.eclipse.swt.widgets.Display; -import org.eclipse.ui.WorkbenchEncoding; import org.eclipse.ui.console.IConsoleDocumentPartitioner; import org.eclipse.ui.console.IConsoleView; import org.eclipse.ui.console.TextConsole; @@ -23,84 +15,61 @@ public class Console extends TextConsole implements IDebugEventSetListener { - private static final RGB INPUT_STREAM_RGB = new RGB(25, 225, 25); - private static final RGB ERROR_STREAM_RGB = new RGB(225, 25, 25); - private static final RGB OUTPUT_STREAM_RGB = new RGB(0, 0, 0); - private static final RGB CONSOLE_BACKGROUND_RGB = new RGB(255, 255, 255); - private ConsolePartitioner partitioner; private ConsoleInputStream inputStream; - private List<Object> openStreams; - private String encoding = WorkbenchEncoding.getWorkbenchDefaultEncoding(); + private ConsoleOutputStream outputStream; private IProcess process = null; - private List<StreamListener> streamListeners = new ArrayList<StreamListener>(); + private StreamListener outputStreamListener; public Console(IProcess process) { super("Forge Console", null, null, true); this.process = process; - openStreams = new ArrayList<Object>(); - inputStream = new ConsoleInputStream(this); - synchronized (openStreams) { - openStreams.add(inputStream); - } - partitioner = new ConsolePartitioner(inputStream, this); - partitioner.connect(getDocument()); -// inputStream.setColor(ColorManager.getInstance().getColor(INPUT_STREAM_RGB)); - connect(); + initInputStream(); + initPartitioner(); + initOutputStream(); + initInputReadJob(); } - - public void connect() { + + private void initInputStream() { + inputStream = new ConsoleInputStream(); + } + + private void initOutputStream() { + outputStream = new ConsoleOutputStream(partitioner); + IStreamMonitor streamMonitor = getOutputStreamMonitor(); + if (streamMonitor != null) { + synchronized(streamMonitor) { + outputStreamListener = new StreamListener(outputStream); + streamMonitor.addListener(outputStreamListener); + } + } + } + + private IStreamMonitor getOutputStreamMonitor() { + IStreamMonitor streamMonitor = null; IStreamsProxy streamsProxy = process.getStreamsProxy(); - IStreamMonitor streamMonitor = streamsProxy.getErrorStreamMonitor(); - if (streamMonitor != null) { - connect(streamMonitor, IDebugUIConstants.ID_STANDARD_ERROR_STREAM); - } - streamMonitor = streamsProxy.getOutputStreamMonitor(); - if (streamMonitor != null) { - connect(streamMonitor, IDebugUIConstants.ID_STANDARD_OUTPUT_STREAM); - } - InputReadJob inputReadJob = new InputReadJob(streamsProxy, inputStream); - inputReadJob.setSystem(true); - inputReadJob.schedule(); + if (streamsProxy != null) { + streamMonitor = streamsProxy.getOutputStreamMonitor(); + } + return streamMonitor; } - private void connect(IStreamMonitor streamMonitor, String streamIdentifier) { - ConsoleOutputStream stream = newOutputStream(); - Color color = getColor(streamIdentifier); - stream.setColor(color); - synchronized (streamMonitor) { - StreamListener listener = new StreamListener(streamIdentifier, streamMonitor, stream, getEncoding()); - streamListeners.add(listener); - } + private void initInputReadJob() { + InputReadJob inputReadJob = new InputReadJob(process.getStreamsProxy(), inputStream); + inputReadJob.setSystem(true); + inputReadJob.schedule(); } + + private void initPartitioner() { + partitioner = new ConsolePartitioner(inputStream, this); + partitioner.connect(getDocument()); + } - private Color getColor(String streamIdentifer) { - if (IDebugUIConstants.ID_STANDARD_OUTPUT_STREAM.equals(streamIdentifer)) { - return ColorManager.getInstance().getColor(OUTPUT_STREAM_RGB); - } - if (IDebugUIConstants.ID_STANDARD_ERROR_STREAM.equals(streamIdentifer)) { - return ColorManager.getInstance().getColor(ERROR_STREAM_RGB); - } - if (IDebugUIConstants.ID_STANDARD_INPUT_STREAM.equals(streamIdentifer)) { - return ColorManager.getInstance().getColor(INPUT_STREAM_RGB); - } - return null; - } - public IPageBookViewPage createPage(IConsoleView view) { throw new UnsupportedOperationException(); } - public ConsoleOutputStream newOutputStream() { - ConsoleOutputStream outputStream = new ConsoleOutputStream(this); - outputStream.setEncoding(encoding); - synchronized(openStreams) { - openStreams.add(outputStream); - } - return outputStream; - } - public ConsoleInputStream getInputStream() { return inputStream; } @@ -109,26 +78,6 @@ return partitioner; } - private void checkFinished() { - if (openStreams.isEmpty()) { - partitioner.streamsClosed(); - } - } - - void streamClosed(ConsoleOutputStream stream) { - synchronized (openStreams) { - openStreams.remove(stream); - checkFinished(); - } - } - - void streamClosed(ConsoleInputStream stream) { - synchronized (openStreams) { - openStreams.remove(stream); - checkFinished(); - } - } - public void dispose() { super.dispose(); partitioner.disconnect(); @@ -138,51 +87,27 @@ } private synchronized void closeStreams() { - Object[] allStreams= openStreams.toArray(); - for (int i = 0; i < allStreams.length; i++) { - Object stream = allStreams[i]; - if (stream instanceof ConsoleInputStream) { - ConsoleInputStream is = (ConsoleInputStream) stream; - try { - is.close(); - } catch (IOException e) { - } - } else if (stream instanceof ConsoleOutputStream) { - ConsoleOutputStream os = (ConsoleOutputStream) stream; - try { - os.close(); - } catch (IOException e) { - } - } - } -// inputStream = null; + try { + inputStream.close(); + outputStream.close(); + partitioner.streamsClosed(); + } catch (IOException e) {} } private synchronized void disposeStreams() { - for (StreamListener listener : streamListeners) { - listener.dispose(); - } + IStreamMonitor streamMonitor = getOutputStreamMonitor(); + if (streamMonitor != null) { + synchronized(streamMonitor) { + if (outputStreamListener != null) { + streamMonitor.removeListener(outputStreamListener); + } + } + } + outputStreamListener = null; + outputStream = null; inputStream = null; } -// private synchronized void closeStreams() { -// if (streamsClosed) { -// return; -// } -// for (StreamListener listener : streamListeners) { -// listener.closeStream(); -// } -// try { -// input.close(); -// } catch (IOException e) { -// } -// streamsClosed = true; -// } - - public String getEncoding() { - return encoding; - } - public void handleDebugEvents(DebugEvent[] events) { for (int i = 0; i < events.length; i++) { DebugEvent event = events[i]; @@ -202,21 +127,6 @@ } else { DebugPlugin.getDefault().addDebugEventListener(this); } - Display.getDefault().asyncExec(new Runnable() { - public void run() { - setFont(JFaceResources.getFont(IDebugUIConstants.PREF_CONSOLE_FONT)); - setBackground(ColorManager.getInstance().getColor(CONSOLE_BACKGROUND_RGB)); - } - }); } - public ConsoleOutputStream getStream(String streamIdentifier) { - for (StreamListener listener : streamListeners) { - if (listener.getStreamId().equals(streamIdentifier)) { - return listener.getStream(); - } - } - return null; - } - } Modified: trunk/forge/plugins/org.jboss.tools.seam.forge/src/org/jboss/tools/seam/forge/console/ConsoleInputStream.java =================================================================== --- trunk/forge/plugins/org.jboss.tools.seam.forge/src/org/jboss/tools/seam/forge/console/ConsoleInputStream.java 2011-02-08 17:27:53 UTC (rev 29068) +++ trunk/forge/plugins/org.jboss.tools.seam.forge/src/org/jboss/tools/seam/forge/console/ConsoleInputStream.java 2011-02-08 18:43:09 UTC (rev 29069) @@ -10,10 +10,8 @@ private int size = 0; private boolean eofSent = false; private boolean closed = false; - private Console console; - ConsoleInputStream(Console console) { - this.console = console; + ConsoleInputStream() { } public synchronized int read() throws IOException { @@ -66,7 +64,6 @@ } closed = true; notifyAll(); - console.streamClosed(this); } } Modified: trunk/forge/plugins/org.jboss.tools.seam.forge/src/org/jboss/tools/seam/forge/console/ConsoleOutputStream.java =================================================================== --- trunk/forge/plugins/org.jboss.tools.seam.forge/src/org/jboss/tools/seam/forge/console/ConsoleOutputStream.java 2011-02-08 17:27:53 UTC (rev 29068) +++ trunk/forge/plugins/org.jboss.tools.seam.forge/src/org/jboss/tools/seam/forge/console/ConsoleOutputStream.java 2011-02-08 18:43:09 UTC (rev 29069) @@ -3,243 +3,58 @@ import java.io.IOException; import java.io.OutputStream; -import org.eclipse.swt.graphics.Color; -import org.eclipse.ui.WorkbenchEncoding; -import org.eclipse.ui.console.ConsolePlugin; -import org.eclipse.ui.console.IConsoleConstants; - -/** - * OutputStream used to write to an IOConsole. - * <p> - * Clients are not intended to instantiate this class directly, instead - * use <code>IOConsole.newOutputStream()</code>. - * </p> - * <p> - * Clients should avoid writing large amounts of output to this stream in the UI - * thread. The console needs to process the output in the UI thread and if the client - * hogs the UI thread writing output to the console, the console will not be able - * to process the output. - * </p> - * @since 3.1 - * @noinstantiate This class is not intended to be instantiated by clients. - * @noextend This class is not intended to be subclassed by clients. - */ public class ConsoleOutputStream extends OutputStream { - /** - * Flag indicating whether this stream has been closed. - */ - private boolean closed = false; - /** - * The console's document partitioner. - */ + private boolean closed = false; private ConsolePartitioner partitioner; - /** - * The console this stream is attached to. - */ - private Console console; - - /** - * Flag indicating that the console should be activated when data - * is written to this stream. - */ - private boolean activateOnWrite = false; - - /** - * The color used to decorate data written to this stream. - */ - private Color color; - - /** - * The font style used to decorate data written to this stream. - */ - private int fontStyle; - - private String fEncoding; - private String fDefaultEncoding = WorkbenchEncoding.getWorkbenchDefaultEncoding(); - - private boolean fNeedsEncoding = false; - - private boolean prependCR; - - /** - * Constructs a new output stream on the given console. - * - * @param console I/O console - */ - ConsoleOutputStream(Console console) { - this.console = console; - this.partitioner = (ConsolePartitioner) console.getPartitioner(); + ConsoleOutputStream(ConsolePartitioner partitioner) { + this.partitioner = partitioner; } - /** - * Returns the font style used to decorate data written to this stream. - * - * @return the font style used to decorate data written to this stream - */ - public int getFontStyle() { - return fontStyle; - } - - /** - * Sets the font style to be used to decorate data written to this stream. - * - * @param newFontStyle the font style to be used to decorate data written to this stream - */ - public void setFontStyle(int newFontStyle) { - if (newFontStyle != fontStyle) { - int old = fontStyle; - fontStyle = newFontStyle; - console.firePropertyChange(this, IConsoleConstants.P_FONT_STYLE, new Integer(old), new Integer(fontStyle)); - } - } - - /** - * Returns whether the console this stream is writing to will be activated when this stream - * is written to. - * - * @return whether the console this stream is writing to will be activated when this stream - * is written to. - */ - public boolean isActivateOnWrite() { - return activateOnWrite; - } - - /** - * Sets whether to activate the console this stream is writing to when this stream - * is written to. - * - * @param activateOnWrite whether the console this stream is writing to will be activated when this stream - * is written to. - */ - public void setActivateOnWrite(boolean activateOnWrite) { - this.activateOnWrite = activateOnWrite; - } - - /** - * Sets the color of this stream. Use <code>null</code> to indicate - * the default color. - * - * @param newColor color of this stream, or <code>null</code> - */ - public void setColor(Color newColor) { - Color old = color; - if (old == null || !old.equals(newColor)) { - color = newColor; - console.firePropertyChange(this, IConsoleConstants.P_STREAM_COLOR, old, newColor); - } - } - - /** - * Returns the color of this stream, or <code>null</code> - * if default. - * - * @return the color of this stream, or <code>null</code> - */ - public Color getColor() { - return color; - } - - /** - * Returns true if the stream has been closed - * @return true is the stream has been closed, false otherwise. - */ public synchronized boolean isClosed() { return closed; } - /* - * (non-Javadoc) - * @see java.io.OutputStream#close() - */ public synchronized void close() throws IOException { if(closed) { - throw new IOException("Output Stream is closed"); //$NON-NLS-1$ + throw new IOException("Output Stream is closed"); } - if (prependCR) { // force writing of last /r - prependCR = false; - notifyParitioner("\r"); //$NON-NLS-1$ - } - console.streamClosed(this); closed = true; partitioner = null; } - /* - * (non-Javadoc) - * @see java.io.OutputStream#flush() - */ public void flush() throws IOException { if(closed) { - throw new IOException("Output Stream is closed"); //$NON-NLS-1$ + throw new IOException("Output Stream is closed"); } } - /* - * (non-Javadoc) - * @see java.io.OutputStream#write(byte[], int, int) - */ public void write(byte[] b, int off, int len) throws IOException { - if (fNeedsEncoding) { - encodedWrite(new String(b, off, len, fEncoding)); - } else { - encodedWrite(new String(b, off, len)); + if(closed) { + throw new IOException("Output Stream is closed"); } + notifyParitioner(new String(b, off, len)); } - /* - * (non-Javadoc) - * @see java.io.OutputStream#write(byte[]) - */ + public void write(byte[] b) throws IOException { write(b, 0, b.length); } - /* - * (non-Javadoc) - * @see java.io.OutputStream#write(int) - */ + public void write(int b) throws IOException { write(new byte[] {(byte)b}, 0, 1); } - - /** - * Writes a string to the attached console. - * - * @param str the string to write to the attached console. - * @throws IOException if the stream is closed. - */ + public synchronized void write(String str) throws IOException { - if (fNeedsEncoding) { - byte[] defaultBytes = str.getBytes(); - str = new String(defaultBytes, fEncoding); - } - encodedWrite(str); - } - - private void encodedWrite(String encodedString) throws IOException { if(closed) { - throw new IOException("Output Stream is closed"); //$NON-NLS-1$ + throw new IOException("Output Stream is closed"); } - if (prependCR){ - encodedString="\r"+encodedString; //$NON-NLS-1$ - prependCR=false; - } - if (encodedString.endsWith("\r")) { //$NON-NLS-1$ - prependCR = true; - encodedString = new String(encodedString.substring(0, encodedString.length()-1)); - } - notifyParitioner(encodedString); + notifyParitioner(str); } - - private void notifyParitioner(String encodedString) throws IOException { + + private void notifyParitioner(String str) throws IOException { try { - partitioner.streamAppended(this, encodedString); - - if (activateOnWrite) { - console.activate(); - } else { - ConsolePlugin.getDefault().getConsoleManager().warnOfContentChange(console); - } + partitioner.streamAppended(this, str); } catch (IOException e) { if (!closed) { close(); @@ -248,13 +63,4 @@ } } - /** - * Sets the character encoding used to interpret characters written to this steam. - * - * @param encoding encoding identifier - */ - public void setEncoding(String encoding) { - fEncoding = encoding; - fNeedsEncoding = (fEncoding!=null) && (!fEncoding.equals(fDefaultEncoding)); - } } Modified: trunk/forge/plugins/org.jboss.tools.seam.forge/src/org/jboss/tools/seam/forge/console/ConsolePartitioner.java =================================================================== --- trunk/forge/plugins/org.jboss.tools.seam.forge/src/org/jboss/tools/seam/forge/console/ConsolePartitioner.java 2011-02-08 17:27:53 UTC (rev 29068) +++ trunk/forge/plugins/org.jboss.tools.seam.forge/src/org/jboss/tools/seam/forge/console/ConsolePartitioner.java 2011-02-08 18:43:09 UTC (rev 29069) @@ -31,6 +31,7 @@ * */ public class ConsolePartitioner implements IConsoleDocumentPartitioner, IDocumentPartitionerExtension { + private PendingPartition consoleClosedPartition; private IDocument document; private ArrayList partitions; Modified: trunk/forge/plugins/org.jboss.tools.seam.forge/src/org/jboss/tools/seam/forge/console/StreamListener.java =================================================================== --- trunk/forge/plugins/org.jboss.tools.seam.forge/src/org/jboss/tools/seam/forge/console/StreamListener.java 2011-02-08 17:27:53 UTC (rev 29068) +++ trunk/forge/plugins/org.jboss.tools.seam.forge/src/org/jboss/tools/seam/forge/console/StreamListener.java 2011-02-08 18:43:09 UTC (rev 29069) @@ -3,98 +3,24 @@ import java.io.IOException; import org.eclipse.debug.core.IStreamListener; -import org.eclipse.debug.core.model.IFlushableStreamMonitor; import org.eclipse.debug.core.model.IStreamMonitor; import org.jboss.tools.seam.forge.Activator; class StreamListener implements IStreamListener { private ConsoleOutputStream stream; - private IStreamMonitor streamMonitor; - private String streamId; - private boolean flushed = false; - private boolean listenerRemoved = false; - private String encoding; - StreamListener(String streamIdentifier, IStreamMonitor monitor, ConsoleOutputStream stream, String encoding) { - this.streamId = streamIdentifier; - this.streamMonitor = monitor; + StreamListener(ConsoleOutputStream stream) { this.stream = stream; - this.encoding = encoding; - streamMonitor.addListener(this); - streamAppended(null, monitor); } - String getStreamId() { - return streamId; - } - - ConsoleOutputStream getStream() { - return stream; - } - - public void streamAppended(String text, IStreamMonitor monitor) { - if (flushed) { - try { - if (stream != null) { - if (encoding == null) - stream.write(text); - else - stream.write(text.getBytes(encoding)); - } - } catch (IOException e) { - Activator.log(e); - } - } else { - String contents = null; - synchronized (streamMonitor) { - flushed = true; - contents = streamMonitor.getContents(); - if (streamMonitor instanceof IFlushableStreamMonitor) { - IFlushableStreamMonitor m = (IFlushableStreamMonitor) streamMonitor; - m.flushContents(); - m.setBuffered(false); - } - } - try { - if (contents != null && contents.length() > 0) { - if (stream != null) { - stream.write(contents); - } - } - } catch (IOException e) { - Activator.log(e); - } + public void streamAppended(String text, IStreamMonitor streamMonitor) { + try { + stream.write(text); + } catch (IOException e) { + Activator.log(e); } } - void closeStream() { - if (streamMonitor == null) { - return; - } - synchronized (streamMonitor) { - streamMonitor.removeListener(this); - if (!flushed) { - String contents = streamMonitor.getContents(); - streamAppended(contents, streamMonitor); - } - listenerRemoved = true; - try { - if (stream != null) { - stream.close(); - } - } catch (IOException e) { - } - } - } - - void dispose() { - if (!listenerRemoved) { - closeStream(); - } - stream = null; - streamMonitor = null; - streamId = null; - } }

13 years, 11 months

1
0
0 / 0

JBoss Tools SVN: r29068 - trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/src/org/jboss/tools/internal/deltacloud/test/ui/preferences.

by jbosstools-commits＠lists.jboss.org

Author: adietish Date: 2011-02-08 12:27:53 -0500 (Tue, 08 Feb 2011) New Revision: 29068 Modified: trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/src/org/jboss/tools/internal/deltacloud/test/ui/preferences/StringsPreferenceValueTest.java Log: [JBIDE-8357] Modified: trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/src/org/jboss/tools/internal/deltacloud/test/ui/preferences/StringsPreferenceValueTest.java =================================================================== --- trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/src/org/jboss/tools/internal/deltacloud/test/ui/preferences/StringsPreferenceValueTest.java 2011-02-08 17:27:38 UTC (rev 29067) +++ trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/src/org/jboss/tools/internal/deltacloud/test/ui/preferences/StringsPreferenceValueTest.java 2011-02-08 17:27:53 UTC (rev 29068) @@ -79,4 +79,16 @@ stringValues.add(DELIMITER + ""); assertEquals(2, stringValues.get().length); } + + @Test + public void delimiterValueIsReturnedCorrectly() { + stringValues.add("11"); + assertEquals(1, stringValues.get().length); + String delimiterValue = DELIMITER + ""; + stringValues.add(delimiterValue); + String[] values = stringValues.get(); + assertEquals(2, values.length); + values[1] = delimiterValue; + } + }

13 years, 11 months

1
0
0 / 0

JBoss Tools SVN: r29067 - trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/preferences.

by jbosstools-commits＠lists.jboss.org

Author: adietish Date: 2011-02-08 12:27:38 -0500 (Tue, 08 Feb 2011) New Revision: 29067 Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/preferences/StringsPreferenceValue.java Log: [JBIDE-8357] Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/preferences/StringsPreferenceValue.java =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/preferences/StringsPreferenceValue.java 2011-02-08 16:55:21 UTC (rev 29066) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/preferences/StringsPreferenceValue.java 2011-02-08 17:27:38 UTC (rev 29067) @@ -10,6 +10,8 @@ ******************************************************************************/ package org.jboss.tools.internal.deltacloud.ui.preferences; +import java.io.UnsupportedEncodingException; +import java.net.URLEncoder; import java.util.ArrayList; import java.util.StringTokenizer; @@ -22,10 +24,16 @@ public class StringsPreferenceValue extends AbstractPreferenceValue<String[]> { private String delimiter; + private String escapedDelimiter; public StringsPreferenceValue(char delimiter, String prefsKey, String pluginId) { super(prefsKey, pluginId); this.delimiter = String.valueOf(delimiter); + try { + this.escapedDelimiter = URLEncoder.encode(String.valueOf(delimiter), "UTF-8"); + } catch (UnsupportedEncodingException e) { + // cannot happen since we use a fixed, known encoding + } } public String[] get() { @@ -43,7 +51,9 @@ ArrayList<String> values = new ArrayList<String>(); StringTokenizer tokenizer = new StringTokenizer(string, delimiter); while (tokenizer.hasMoreTokens()) { - values.add(tokenizer.nextToken()); + String value = tokenizer.nextToken(); + String unescapedValue = unescapeDelimiterCharacter(value); + values.add(unescapedValue); } return values.toArray(new String[values.size()]); } @@ -73,6 +83,7 @@ public void add(String value) { String currentValues = doGet(); StringBuilder builder = new StringBuilder(currentValues); + value = escapeDelimiterCharacter(value); if (!contains(value, currentValues)) { if (hasValues(currentValues)) { builder.append(delimiter); @@ -82,6 +93,36 @@ } } + private String escapeDelimiterCharacter(String value) { + if (value == null || value.length() == 0) { + return value; + } + + int index = value.indexOf(delimiter); + if (index < 0) { + return value; + } + StringBuilder builder = new StringBuilder(value.substring(0, index)); + builder.append(escapedDelimiter); + builder.append(value.substring(index + 1)); + return builder.toString(); + } + + private String unescapeDelimiterCharacter(String value) { + if (value == null || value.length() == 0) { + return value; + } + + int index = value.indexOf(escapedDelimiter); + if (index < 0) { + return value; + } + StringBuilder builder = new StringBuilder(value.substring(0, index)); + builder.append(delimiter); + builder.append(value.substring(index + 1)); + return builder.toString(); + } + private boolean contains(String value, String currentValues) { return currentValues != null && currentValues.length() > 0

13 years, 11 months

1
0
0 / 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

jbosstools-commits February 2011