November 2010 - jbosstools-commits

JBoss Tools SVN: r26828 - in trunk: build and 1 other directory.

by jbosstools-commits＠lists.jboss.org

Author: dgolovin Date: 2010-11-22 15:01:56 -0500 (Mon, 22 Nov 2010) New Revision: 26828 Modified: trunk/build/pom.xml trunk/pom.xml Log: https://jira.jboss.org/browse/JBIDE-7440 Between build #79 and #80, 874 tests disappeared fix for latest test build errors. now root pom.xml in trunk work the same way as build/pom.xml mo coverage property required anymore coverage profile should be used Modified: trunk/build/pom.xml =================================================================== --- trunk/build/pom.xml 2010-11-22 17:34:54 UTC (rev 26827) +++ trunk/build/pom.xml 2010-11-22 20:01:56 UTC (rev 26828) @@ -13,9 +13,7 @@ <profile> <id>libs</id> <activation> - <property> - <name>coverage</name> - </property> + <activeByDefault>true</activeByDefault> </activation> <modules> <module>libs</module> @@ -614,6 +612,16 @@ </modules> </profile> + <profile> + <id>aggregate-coverage</id> + <activation> + <activeByDefault>true</activeByDefault> + </activation> + <modules> + <module>reports/emma-coverage</module> + </modules> + </profile> + </profiles> </project> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-11-22 17:34:54 UTC (rev 26827) +++ trunk/pom.xml 2010-11-22 20:01:56 UTC (rev 26828) @@ -8,10 +8,7 @@ <packaging>pom</packaging> <modules> <module>build/parent</module> -  <module>build</module> - <module>build/reports/emma-coverage</module> </modules> - </project>

15 years, 5 months

1
0
0 / 0

JBoss Tools SVN: r26827 - in trunk/documentation/whatsnew/esb: images and 1 other directory.

by jbosstools-commits＠lists.jboss.org

Author: bfitzpat Date: 2010-11-22 12:34:54 -0500 (Mon, 22 Nov 2010) New Revision: 26827 Added: trunk/documentation/whatsnew/esb/images/BusinessRulesProcessor_validation.jpg Removed: trunk/documentation/whatsnew/esb/images/BusinessRulesProcessor_validation.png Modified: trunk/documentation/whatsnew/esb/esb-news-1.4.0.Beta2.html Log: JBIDE-7652 - updating ESB N&N for beta2 Modified: trunk/documentation/whatsnew/esb/esb-news-1.4.0.Beta2.html =================================================================== --- trunk/documentation/whatsnew/esb/esb-news-1.4.0.Beta2.html 2010-11-22 17:31:46 UTC (rev 26826) +++ trunk/documentation/whatsnew/esb/esb-news-1.4.0.Beta2.html 2010-11-22 17:34:54 UTC (rev 26827) @@ -27,7 +27,7 @@ <td valign="top" align="right"><a name="itemname3" id="itemname3"></a><b>Configuration Validation</b></td> <td valign="top"> <p>Began implementing some basic validation for ESB configurations. The BusinessRulesProcessor action now. You can see validation errors and messages in the editor as yellow popups.</p> - <img src="./images/BusinessRulesProcessor_validation.png" alt="" style="width : 523px; height : 327px;"/> + <img src="./images/BusinessRulesProcessor_validation.jpg" alt="" style="width : 523px; height : 327px;"/> <p>The plan is to use the BusinessRulesProcessor as a test to see how validation would work within the editor. If it works well, we'll go ahead and extend it in future releases.</p> <p><small>Related Jira: <a href="https://jira.jboss.org/browse/JBIDE-7193">JBIDE-7193</a>, <a href="https://jira.jboss.org/browse/JBIDE-7235">JBIDE-7235</a></small></p> </td> Added: trunk/documentation/whatsnew/esb/images/BusinessRulesProcessor_validation.jpg =================================================================== (Binary files differ) Property changes on: trunk/documentation/whatsnew/esb/images/BusinessRulesProcessor_validation.jpg ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Deleted: trunk/documentation/whatsnew/esb/images/BusinessRulesProcessor_validation.png =================================================================== (Binary files differ)

15 years, 5 months

1
0
0 / 0

JBoss Tools SVN: r26826 - in trunk/documentation/whatsnew/esb: images and 1 other directory.

by jbosstools-commits＠lists.jboss.org

Author: bfitzpat Date: 2010-11-22 12:31:46 -0500 (Mon, 22 Nov 2010) New Revision: 26826 Added: trunk/documentation/whatsnew/esb/.project trunk/documentation/whatsnew/esb/esb-news-1.4.0.Beta2.html trunk/documentation/whatsnew/esb/images/BusinessRulesProcessor_validation.png Log: JBIDE-7652 - adding ESB N&N for beta2 Added: trunk/documentation/whatsnew/esb/.project =================================================================== --- trunk/documentation/whatsnew/esb/.project (rev 0) +++ trunk/documentation/whatsnew/esb/.project 2010-11-22 17:31:46 UTC (rev 26826) @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>esb</name> + <comment></comment> + <projects> + </projects> + <buildSpec> + </buildSpec> + <natures> + </natures> +</projectDescription> Property changes on: trunk/documentation/whatsnew/esb/.project ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/documentation/whatsnew/esb/esb-news-1.4.0.Beta2.html =================================================================== --- trunk/documentation/whatsnew/esb/esb-news-1.4.0.Beta2.html (rev 0) +++ trunk/documentation/whatsnew/esb/esb-news-1.4.0.Beta2.html 2010-11-22 17:31:46 UTC (rev 26826) @@ -0,0 +1,50 @@ + <p><a href="smooks/smooks-news-1.1.0.CR1.html">Smooks Tools</a></p> <?xml version="1.0" encoding="iso-8859-1"?> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" + "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml"> +<head> +<meta http-equiv="Content-Language" content="en-us" /> +<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" /> +<link rel="stylesheet" href="../whatsnew.css"/> +<title>ESB tools 1.4.0.Beta2 What's New</title> +</head> +<body> +<h1>ESB tools 1.4.0.Beta2 What's New</h1> + +<p align="right"><a href="../index.html">< Main Index</a> <a href="../ws/ws-news-1.2.0.Beta1.html">Webservice Tools ></a></p> + +<table border="0" cellpadding="10" cellspacing="0" width="80%"> + + <tr> + <td colspan="2"> + <hr/> + <h3>Editors</h3> + <hr/> + </td> + </tr> + + <tr> + <td valign="top" align="right"><a name="itemname3" id="itemname3"></a><b>Configuration Validation</b></td> + <td valign="top"> + <p>Began implementing some basic validation for ESB configurations. The BusinessRulesProcessor action now. You can see validation errors and messages in the editor as yellow popups.</p> + <img src="./images/BusinessRulesProcessor_validation.png" alt="" style="width : 523px; height : 327px;"/> + <p>The plan is to use the BusinessRulesProcessor as a test to see how validation would work within the editor. If it works well, we'll go ahead and extend it in future releases.</p> + <p><small>Related Jira: <a href="https://jira.jboss.org/browse/JBIDE-7193">JBIDE-7193</a>, <a href="https://jira.jboss.org/browse/JBIDE-7235">JBIDE-7235</a></small></p> + </td> + </tr> + <tr> + <td colspan="2"> + <hr/> + </td> + </tr> + <tr> + <td colspan="2"> + <hr/> + </td> + </tr> +</table> +</body> + +</html> + + Property changes on: trunk/documentation/whatsnew/esb/esb-news-1.4.0.Beta2.html ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/documentation/whatsnew/esb/images/BusinessRulesProcessor_validation.png =================================================================== (Binary files differ) Property changes on: trunk/documentation/whatsnew/esb/images/BusinessRulesProcessor_validation.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream

15 years, 5 months

1
0
0 / 0

JBoss Tools SVN: r26825 - trunk/build/target-platform.

by jbosstools-commits＠lists.jboss.org

Author: nickboldt Date: 2010-11-22 12:26:01 -0500 (Mon, 22 Nov 2010) New Revision: 26825 Modified: trunk/build/target-platform/multiple.target trunk/build/target-platform/unified.target Log: JBIDE-7700 update to newer m2eclipse Modified: trunk/build/target-platform/multiple.target =================================================================== --- trunk/build/target-platform/multiple.target 2010-11-22 16:54:55 UTC (rev 26824) +++ trunk/build/target-platform/multiple.target 2010-11-22 17:26:01 UTC (rev 26825) @@ -8,11 +8,11 @@ --> <locations> <location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit"> - <unit id="org.maven.ide.eclipse.feature.feature.group" version="0.10.2.20100623-1649"/> + <unit id="org.maven.ide.eclipse.feature.feature.group" version="0.12.0.20101115-1102"/> <repository location="http://m2eclipse.sonatype.org/sites/m2e/"/> </location> <location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit"> - <unit id="org.maven.ide.eclipse.wtp.feature.feature.group" version="0.11.0.20101024-0955"/> + <unit id="org.maven.ide.eclipse.wtp.feature.feature.group" version="0.11.1.20101108-1810"/> <repository location="http://m2eclipse.sonatype.org/sites/m2e-extras/"/> </location> <location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit"> @@ -228,4 +228,4 @@ <feature id="org.mozilla.xpcom.feature"/> </includeBundles> <targetJRE path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/> -</target> \ No newline at end of file +</target> Modified: trunk/build/target-platform/unified.target =================================================================== --- trunk/build/target-platform/unified.target 2010-11-22 16:54:55 UTC (rev 26824) +++ trunk/build/target-platform/unified.target 2010-11-22 17:26:01 UTC (rev 26825) @@ -8,11 +8,11 @@ --> <locations> <location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit"> - <unit id="org.maven.ide.eclipse.feature.feature.group" version="0.10.2.20100623-1649"/> + <unit id="org.maven.ide.eclipse.feature.feature.group" version="0.12.0.20101115-1102"/> <repository location="http://download.jboss.org/jbosstools/updates/target-platform/latest/"/> </location> <location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit"> - <unit id="org.maven.ide.eclipse.wtp.feature.feature.group" version="0.11.0.20101024-0955"/> + <unit id="org.maven.ide.eclipse.wtp.feature.feature.group" version="0.11.1.20101108-1810"/> <repository location="http://download.jboss.org/jbosstools/updates/target-platform/latest/"/> </location> <location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit"> @@ -228,4 +228,4 @@ <feature id="org.mozilla.xpcom.feature"/> </includeBundles> <targetJRE path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/> -</target> \ No newline at end of file +</target>

15 years, 5 months

1
0
0 / 0

JBoss Tools SVN: r26824 - trunk/documentation/whatsnew/drools.

by jbosstools-commits＠lists.jboss.org

Author: bfitzpat Date: 2010-11-22 11:54:55 -0500 (Mon, 22 Nov 2010) New Revision: 26824 Modified: trunk/documentation/whatsnew/drools/guvnor-tools-news-5.1.0.Beta2.html Log: JBIDE-7662 - updated the grammar/language for the beta2 guvnor tools N&N file Modified: trunk/documentation/whatsnew/drools/guvnor-tools-news-5.1.0.Beta2.html =================================================================== --- trunk/documentation/whatsnew/drools/guvnor-tools-news-5.1.0.Beta2.html 2010-11-22 16:36:09 UTC (rev 26823) +++ trunk/documentation/whatsnew/drools/guvnor-tools-news-5.1.0.Beta2.html 2010-11-22 16:54:55 UTC (rev 26824) @@ -24,9 +24,9 @@ </tr> <tr> - <td valign="top" align="right"><a name="itemname3" id="itemname3"></a><b>Guvnor Tools will not cause validation errors</b></td> + <td valign="top" align="right"><a name="itemname3" id="itemname3"></a><b>Guvnor Tools will not cause validation errors from meta files</b></td> <td valign="top"> - <p>In previous Guvnor tools versions, Guvnor meta files caused validation errors for certain file types, and all those meta files is visible in resources explorer, from this version, the meta fies is invisible and will not cause any validation errors. </p> + <p>In previous Guvnor tools versions, Guvnor meta files caused validation errors for certain file types, and all those meta files were visible in resources explorer. Now the meta fies are invisible and will not cause any validation errors. </p> <p></p> @@ -53,17 +53,17 @@ </tr> <tr> - <td valign="top" align="right"><a name="itemname3" id="itemname3"></a><b>Not Allowed to Add Reosurces without File Extension</b></td> + <td valign="top" align="right"><a name="itemname3" id="itemname3"></a><b>Not Allowed to Add Resources without File Extension</b></td> <td valign="top"> - <p>Because Guvnor server use file extension as Guvnor resource type, if there is no file extesion for a resource, Guvnor server can not classfy it by resource types .</p> + <p>Because Guvnor server uses the file extension to determine the resource type of a particular resource, there was a problem for files with no file extension. Now we validate and present an error if there is no file extesion for a resource.</p> <p><small><a href="https://jira.jboss.org/browse/JBIDE-7032">Related jira</a></p> </td> </tr> <tr> - <td valign="top" align="right"><a name="itemname3" id="itemname3"></a><b>Not Allowed to Upload Two Resource with Same Name bu a Different Extension</b></td> + <td valign="top" align="right"><a name="itemname3" id="itemname3"></a><b>Not Allowed to Upload Two Resource with Same Name but a Different Extension</b></td> <td valign="top"> - <p>Guvnor server identify a resource use the resource name without file extension, so if there are two resources with same name but different extension wll be considered as one resource.</p> + <p>Guvnor server uses the resource name to identify a resource. So previously if there were two resources with the same file name but different extensions, it was confused and considered them to be the same resource. Now we validate and don't allow you to upload two resources with the same file name but different extensions.</p> <p><small><a href="https://jira.jboss.org/browse/JBIDE-7032">Related jira</a></p> </td> </tr>

15 years, 5 months

1
0
0 / 0

JBoss Tools SVN: r26823 - trunk/documentation/whatsnew/smooks.

by jbosstools-commits＠lists.jboss.org

Author: bfitzpat Date: 2010-11-22 11:36:09 -0500 (Mon, 22 Nov 2010) New Revision: 26823 Added: trunk/documentation/whatsnew/smooks/smooks-news-1.2.0.beta2.html Log: JBIDE-7707 - adding smooks N&N for beta2 Added: trunk/documentation/whatsnew/smooks/smooks-news-1.2.0.beta2.html =================================================================== --- trunk/documentation/whatsnew/smooks/smooks-news-1.2.0.beta2.html (rev 0) +++ trunk/documentation/whatsnew/smooks/smooks-news-1.2.0.beta2.html 2010-11-22 16:36:09 UTC (rev 26823) @@ -0,0 +1,55 @@ +<?xml version="1.0" encoding="iso-8859-1"?> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" + "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml"> +<head> +<meta http-equiv="Content-Language" content="en-us" /> +<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" /> +<link rel="stylesheet" href="../whatsnew.css" /> +<title>Smooks tools 1.2.0.beta2 What's New</title> +</head> +<body> +<h1>Smooks tools 1.2.0.beta2 What's New</h1> + +<p align="right"><a href="../index.html">< Main Index</a></p> + + +<table border="0" cellpadding="10" cellspacing="0" width="80%"> + + <tr> + <td colspan="2"> + <hr /> + <h3>Smooks Configuration Editor</h3> + <hr /> + </td> + </tr> + <tr> + <td valign="top" align="right"><a name="itemname1" id="itemname1"></a><b>Direct Source to Target Templating</b></td> + <td valign="top"> + <p>Added support for transforming directly from a source message (XML, EDI, Java, CSV etc) to a target (XML or CSV) + without requiring an intermediate Java Mapping Model. Though some support was included in beta1, it has become much + more stable in beta2.</p> + + <img src="images/Smooks_direct-mapping.png"> + + <p> + The last version of this plugin required an intermediate Java Mapping Model in situations + where the user simply wanted to apply a templating transformation e.g. XML-<i>A</i> to XML-<i>B</i>. This + is no longer a requirement. The user can now apply a template drectly to the input data + model. + </p> + </td> + </tr> + <tr> + <td colspan="2"> + <hr /> + </td> + </tr> + +</table> + +</body> + +</html> + + Property changes on: trunk/documentation/whatsnew/smooks/smooks-news-1.2.0.beta2.html ___________________________________________________________________ Name: svn:mime-type + text/plain

15 years, 5 months

1
0
0 / 0

JBoss Tools SVN: r26822 - trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck.

by jbosstools-commits＠lists.jboss.org

Author: akazakov Date: 2010-11-22 11:32:56 -0500 (Mon, 22 Nov 2010) New Revision: 26822 Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/DecoratorDefinitionTest.java Log: https://jira.jboss.org/browse/JBIDE-5808 Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/DecoratorDefinitionTest.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/DecoratorDefinitionTest.java 2010-11-22 16:08:50 UTC (rev 26821) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/DecoratorDefinitionTest.java 2010-11-22 16:32:56 UTC (rev 26822) @@ -55,5 +55,11 @@ assertNotNull("Can't find @Delegate annotation.", injection.getDelegateAnnotation()); } - // TODO continue implementing tests + /** + * section 8.2 a) + */ + public void testNonEnabledDecoratorNotResolved() throws JavaModelException, CoreException { + IDecorator decorator = getDecorator("JavaSource/org/jboss/jsr299/tck/tests/decorators/definition/FieldDecorator.java"); + assertFalse("Decorator is enabled.", decorator.isEnabled()); + } } \ No newline at end of file

15 years, 5 months

1
0
0 / 0

JBoss Tools SVN: r26821 - in trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram: src/org/jboss/tools/bpmn2/process/diagram/navigator and 2 other directories.

by jbosstools-commits＠lists.jboss.org

Author: koen.aers(a)jboss.com Date: 2010-11-22 11:08:50 -0500 (Mon, 22 Nov 2010) New Revision: 26821 Modified: 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/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/part/Bpmn2DiagramEditorUtil.java trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/part/Bpmn2UriEditorInputTester.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/providers/Bpmn2ViewProvider.java Log: after regeneration Modified: trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/plugin.xml =================================================================== --- trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/plugin.xml 2010-11-22 16:07:35 UTC (rev 26820) +++ trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/plugin.xml 2010-11-22 16:08:50 UTC (rev 26821) @@ -10,7 +10,7 @@ <extension point="org.eclipse.emf.ecore.extension_parser" id="resource-factory"> <?gmfgen generated="true"?> <parser - type="prd" + type="jbpmn" class="org.eclipse.gmf.runtime.emf.core.resources.GMFResourceFactory"> </parser> </extension> 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 2010-11-22 16:07:35 UTC (rev 26820) +++ trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/navigator/Bpmn2NavigatorContentProvider.java 2010-11-22 16:08:50 UTC (rev 26821) @@ -251,14 +251,14 @@ private Object[] getViewChildren(View view, Object parentElement) { switch (Bpmn2VisualIDRegistry.getVisualID(view)) { - case EndEventEditPart.VISUAL_ID: { + case ExclusiveGateway2EditPart.VISUAL_ID: { LinkedList<Bpmn2AbstractNavigatorItem> result = new LinkedList<Bpmn2AbstractNavigatorItem>(); Node sv = (Node) view; Bpmn2NavigatorGroup incominglinks = new Bpmn2NavigatorGroup( - Messages.NavigatorGroupName_EndEvent_2004_incominglinks, + Messages.NavigatorGroupName_ExclusiveGateway_3007_incominglinks, "icons/incomingLinksNavigatorGroup.gif", parentElement); //$NON-NLS-1$ Bpmn2NavigatorGroup outgoinglinks = new Bpmn2NavigatorGroup( - Messages.NavigatorGroupName_EndEvent_2004_outgoinglinks, + Messages.NavigatorGroupName_ExclusiveGateway_3007_outgoinglinks, "icons/outgoingLinksNavigatorGroup.gif", parentElement); //$NON-NLS-1$ Collection<View> connectedViews; connectedViews = getIncomingLinksByType(Collections.singleton(sv), @@ -290,14 +290,14 @@ return result.toArray(); } - case ParallelGatewayEditPart.VISUAL_ID: { + case StartEvent3EditPart.VISUAL_ID: { LinkedList<Bpmn2AbstractNavigatorItem> result = new LinkedList<Bpmn2AbstractNavigatorItem>(); Node sv = (Node) view; Bpmn2NavigatorGroup incominglinks = new Bpmn2NavigatorGroup( - Messages.NavigatorGroupName_ParallelGateway_2006_incominglinks, + Messages.NavigatorGroupName_StartEvent_3003_incominglinks, "icons/incomingLinksNavigatorGroup.gif", parentElement); //$NON-NLS-1$ Bpmn2NavigatorGroup outgoinglinks = new Bpmn2NavigatorGroup( - Messages.NavigatorGroupName_ParallelGateway_2006_outgoinglinks, + Messages.NavigatorGroupName_StartEvent_3003_outgoinglinks, "icons/outgoingLinksNavigatorGroup.gif", parentElement); //$NON-NLS-1$ Collection<View> connectedViews; connectedViews = getIncomingLinksByType(Collections.singleton(sv), @@ -329,14 +329,14 @@ return result.toArray(); } - case EndEvent5EditPart.VISUAL_ID: { + case ParallelGatewayEditPart.VISUAL_ID: { LinkedList<Bpmn2AbstractNavigatorItem> result = new LinkedList<Bpmn2AbstractNavigatorItem>(); Node sv = (Node) view; Bpmn2NavigatorGroup incominglinks = new Bpmn2NavigatorGroup( - Messages.NavigatorGroupName_EndEvent_3009_incominglinks, + Messages.NavigatorGroupName_ParallelGateway_2006_incominglinks, "icons/incomingLinksNavigatorGroup.gif", parentElement); //$NON-NLS-1$ Bpmn2NavigatorGroup outgoinglinks = new Bpmn2NavigatorGroup( - Messages.NavigatorGroupName_EndEvent_3009_outgoinglinks, + Messages.NavigatorGroupName_ParallelGateway_2006_outgoinglinks, "icons/outgoingLinksNavigatorGroup.gif", parentElement); //$NON-NLS-1$ Collection<View> connectedViews; connectedViews = getIncomingLinksByType(Collections.singleton(sv), @@ -368,97 +368,16 @@ return result.toArray(); } - case SubProcessEditPart.VISUAL_ID: { + case ExclusiveGatewayEditPart.VISUAL_ID: { LinkedList<Bpmn2AbstractNavigatorItem> result = new LinkedList<Bpmn2AbstractNavigatorItem>(); Node sv = (Node) view; Bpmn2NavigatorGroup incominglinks = new Bpmn2NavigatorGroup( - Messages.NavigatorGroupName_SubProcess_2016_incominglinks, + Messages.NavigatorGroupName_ExclusiveGateway_2005_incominglinks, "icons/incomingLinksNavigatorGroup.gif", parentElement); //$NON-NLS-1$ Bpmn2NavigatorGroup outgoinglinks = new Bpmn2NavigatorGroup( - Messages.NavigatorGroupName_SubProcess_2016_outgoinglinks, + Messages.NavigatorGroupName_ExclusiveGateway_2005_outgoinglinks, "icons/outgoingLinksNavigatorGroup.gif", parentElement); //$NON-NLS-1$ Collection<View> connectedViews; - connectedViews = getChildrenByType(Collections.singleton(sv), - Bpmn2VisualIDRegistry - .getType(SubProcess2EditPart.VISUAL_ID)); - result.addAll(createNavigatorItems(connectedViews, parentElement, - false)); - connectedViews = getChildrenByType(Collections.singleton(sv), - Bpmn2VisualIDRegistry.getType(UserTask2EditPart.VISUAL_ID)); - result.addAll(createNavigatorItems(connectedViews, parentElement, - false)); - connectedViews = getChildrenByType(Collections.singleton(sv), - Bpmn2VisualIDRegistry - .getType(ServiceTask2EditPart.VISUAL_ID)); - result.addAll(createNavigatorItems(connectedViews, parentElement, - false)); - connectedViews = getChildrenByType(Collections.singleton(sv), - Bpmn2VisualIDRegistry - .getType(StartEvent3EditPart.VISUAL_ID)); - result.addAll(createNavigatorItems(connectedViews, parentElement, - false)); - connectedViews = getChildrenByType(Collections.singleton(sv), - Bpmn2VisualIDRegistry - .getType(StartEvent4EditPart.VISUAL_ID)); - result.addAll(createNavigatorItems(connectedViews, parentElement, - false)); - connectedViews = getChildrenByType(Collections.singleton(sv), - Bpmn2VisualIDRegistry.getType(EndEvent4EditPart.VISUAL_ID)); - result.addAll(createNavigatorItems(connectedViews, parentElement, - false)); - connectedViews = getChildrenByType(Collections.singleton(sv), - Bpmn2VisualIDRegistry - .getType(ExclusiveGateway2EditPart.VISUAL_ID)); - result.addAll(createNavigatorItems(connectedViews, parentElement, - false)); - connectedViews = getChildrenByType(Collections.singleton(sv), - Bpmn2VisualIDRegistry - .getType(ParallelGateway2EditPart.VISUAL_ID)); - result.addAll(createNavigatorItems(connectedViews, parentElement, - false)); - connectedViews = getChildrenByType(Collections.singleton(sv), - Bpmn2VisualIDRegistry.getType(EndEvent5EditPart.VISUAL_ID)); - result.addAll(createNavigatorItems(connectedViews, parentElement, - false)); - connectedViews = getChildrenByType(Collections.singleton(sv), - Bpmn2VisualIDRegistry.getType(EndEvent6EditPart.VISUAL_ID)); - result.addAll(createNavigatorItems(connectedViews, parentElement, - false)); - connectedViews = getChildrenByType(Collections.singleton(sv), - Bpmn2VisualIDRegistry - .getType(IntermediateCatchEvent4EditPart.VISUAL_ID)); - result.addAll(createNavigatorItems(connectedViews, parentElement, - false)); - connectedViews = getChildrenByType(Collections.singleton(sv), - Bpmn2VisualIDRegistry - .getType(IntermediateThrowEvent2EditPart.VISUAL_ID)); - result.addAll(createNavigatorItems(connectedViews, parentElement, - false)); - connectedViews = getChildrenByType(Collections.singleton(sv), - Bpmn2VisualIDRegistry - .getType(IntermediateCatchEvent5EditPart.VISUAL_ID)); - result.addAll(createNavigatorItems(connectedViews, parentElement, - false)); - connectedViews = getChildrenByType(Collections.singleton(sv), - Bpmn2VisualIDRegistry - .getType(IntermediateCatchEvent4EditPart.VISUAL_ID)); - result.addAll(createNavigatorItems(connectedViews, parentElement, - false)); - connectedViews = getChildrenByType(Collections.singleton(sv), - Bpmn2VisualIDRegistry - .getType(DataObject2EditPart.VISUAL_ID)); - result.addAll(createNavigatorItems(connectedViews, parentElement, - false)); - connectedViews = getChildrenByType(Collections.singleton(sv), - Bpmn2VisualIDRegistry - .getType(TextAnnotation2EditPart.VISUAL_ID)); - result.addAll(createNavigatorItems(connectedViews, parentElement, - false)); - connectedViews = getChildrenByType(Collections.singleton(sv), - Bpmn2VisualIDRegistry - .getType(ScriptTask2EditPart.VISUAL_ID)); - result.addAll(createNavigatorItems(connectedViews, parentElement, - false)); connectedViews = getIncomingLinksByType(Collections.singleton(sv), Bpmn2VisualIDRegistry .getType(SequenceFlowEditPart.VISUAL_ID)); @@ -488,97 +407,16 @@ return result.toArray(); } - case SubProcess2EditPart.VISUAL_ID: { + case IntermediateCatchEventEditPart.VISUAL_ID: { LinkedList<Bpmn2AbstractNavigatorItem> result = new LinkedList<Bpmn2AbstractNavigatorItem>(); Node sv = (Node) view; Bpmn2NavigatorGroup incominglinks = new Bpmn2NavigatorGroup( - Messages.NavigatorGroupName_SubProcess_3001_incominglinks, + Messages.NavigatorGroupName_IntermediateCatchEvent_2010_incominglinks, "icons/incomingLinksNavigatorGroup.gif", parentElement); //$NON-NLS-1$ Bpmn2NavigatorGroup outgoinglinks = new Bpmn2NavigatorGroup( - Messages.NavigatorGroupName_SubProcess_3001_outgoinglinks, + Messages.NavigatorGroupName_IntermediateCatchEvent_2010_outgoinglinks, "icons/outgoingLinksNavigatorGroup.gif", parentElement); //$NON-NLS-1$ Collection<View> connectedViews; - connectedViews = getChildrenByType(Collections.singleton(sv), - Bpmn2VisualIDRegistry - .getType(SubProcess2EditPart.VISUAL_ID)); - result.addAll(createNavigatorItems(connectedViews, parentElement, - false)); - connectedViews = getChildrenByType(Collections.singleton(sv), - Bpmn2VisualIDRegistry.getType(UserTask2EditPart.VISUAL_ID)); - result.addAll(createNavigatorItems(connectedViews, parentElement, - false)); - connectedViews = getChildrenByType(Collections.singleton(sv), - Bpmn2VisualIDRegistry - .getType(ServiceTask2EditPart.VISUAL_ID)); - result.addAll(createNavigatorItems(connectedViews, parentElement, - false)); - connectedViews = getChildrenByType(Collections.singleton(sv), - Bpmn2VisualIDRegistry - .getType(StartEvent3EditPart.VISUAL_ID)); - result.addAll(createNavigatorItems(connectedViews, parentElement, - false)); - connectedViews = getChildrenByType(Collections.singleton(sv), - Bpmn2VisualIDRegistry - .getType(StartEvent4EditPart.VISUAL_ID)); - result.addAll(createNavigatorItems(connectedViews, parentElement, - false)); - connectedViews = getChildrenByType(Collections.singleton(sv), - Bpmn2VisualIDRegistry.getType(EndEvent4EditPart.VISUAL_ID)); - result.addAll(createNavigatorItems(connectedViews, parentElement, - false)); - connectedViews = getChildrenByType(Collections.singleton(sv), - Bpmn2VisualIDRegistry - .getType(ExclusiveGateway2EditPart.VISUAL_ID)); - result.addAll(createNavigatorItems(connectedViews, parentElement, - false)); - connectedViews = getChildrenByType(Collections.singleton(sv), - Bpmn2VisualIDRegistry - .getType(ParallelGateway2EditPart.VISUAL_ID)); - result.addAll(createNavigatorItems(connectedViews, parentElement, - false)); - connectedViews = getChildrenByType(Collections.singleton(sv), - Bpmn2VisualIDRegistry.getType(EndEvent5EditPart.VISUAL_ID)); - result.addAll(createNavigatorItems(connectedViews, parentElement, - false)); - connectedViews = getChildrenByType(Collections.singleton(sv), - Bpmn2VisualIDRegistry.getType(EndEvent6EditPart.VISUAL_ID)); - result.addAll(createNavigatorItems(connectedViews, parentElement, - false)); - connectedViews = getChildrenByType(Collections.singleton(sv), - Bpmn2VisualIDRegistry - .getType(IntermediateCatchEvent4EditPart.VISUAL_ID)); - result.addAll(createNavigatorItems(connectedViews, parentElement, - false)); - connectedViews = getChildrenByType(Collections.singleton(sv), - Bpmn2VisualIDRegistry - .getType(IntermediateThrowEvent2EditPart.VISUAL_ID)); - result.addAll(createNavigatorItems(connectedViews, parentElement, - false)); - connectedViews = getChildrenByType(Collections.singleton(sv), - Bpmn2VisualIDRegistry - .getType(IntermediateCatchEvent5EditPart.VISUAL_ID)); - result.addAll(createNavigatorItems(connectedViews, parentElement, - false)); - connectedViews = getChildrenByType(Collections.singleton(sv), - Bpmn2VisualIDRegistry - .getType(IntermediateCatchEvent4EditPart.VISUAL_ID)); - result.addAll(createNavigatorItems(connectedViews, parentElement, - false)); - connectedViews = getChildrenByType(Collections.singleton(sv), - Bpmn2VisualIDRegistry - .getType(DataObject2EditPart.VISUAL_ID)); - result.addAll(createNavigatorItems(connectedViews, parentElement, - false)); - connectedViews = getChildrenByType(Collections.singleton(sv), - Bpmn2VisualIDRegistry - .getType(TextAnnotation2EditPart.VISUAL_ID)); - result.addAll(createNavigatorItems(connectedViews, parentElement, - false)); - connectedViews = getChildrenByType(Collections.singleton(sv), - Bpmn2VisualIDRegistry - .getType(ScriptTask2EditPart.VISUAL_ID)); - result.addAll(createNavigatorItems(connectedViews, parentElement, - false)); connectedViews = getIncomingLinksByType(Collections.singleton(sv), Bpmn2VisualIDRegistry .getType(SequenceFlowEditPart.VISUAL_ID)); @@ -608,221 +446,97 @@ return result.toArray(); } - case ServiceTask2EditPart.VISUAL_ID: { + case SubProcessEditPart.VISUAL_ID: { LinkedList<Bpmn2AbstractNavigatorItem> result = new LinkedList<Bpmn2AbstractNavigatorItem>(); Node sv = (Node) view; Bpmn2NavigatorGroup incominglinks = new Bpmn2NavigatorGroup( - Messages.NavigatorGroupName_ServiceTask_3004_incominglinks, + Messages.NavigatorGroupName_SubProcess_2016_incominglinks, "icons/incomingLinksNavigatorGroup.gif", parentElement); //$NON-NLS-1$ Bpmn2NavigatorGroup outgoinglinks = new Bpmn2NavigatorGroup( - Messages.NavigatorGroupName_ServiceTask_3004_outgoinglinks, + Messages.NavigatorGroupName_SubProcess_2016_outgoinglinks, "icons/outgoingLinksNavigatorGroup.gif", parentElement); //$NON-NLS-1$ Collection<View> connectedViews; - connectedViews = getIncomingLinksByType(Collections.singleton(sv), + connectedViews = getChildrenByType(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 UserTask2EditPart.VISUAL_ID: { - LinkedList<Bpmn2AbstractNavigatorItem> result = new LinkedList<Bpmn2AbstractNavigatorItem>(); - Node sv = (Node) view; - Bpmn2NavigatorGroup incominglinks = new Bpmn2NavigatorGroup( - Messages.NavigatorGroupName_UserTask_3002_incominglinks, - "icons/incomingLinksNavigatorGroup.gif", parentElement); //$NON-NLS-1$ - Bpmn2NavigatorGroup outgoinglinks = new Bpmn2NavigatorGroup( - Messages.NavigatorGroupName_UserTask_3002_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 DataObjectEditPart.VISUAL_ID: { - LinkedList<Bpmn2AbstractNavigatorItem> result = new LinkedList<Bpmn2AbstractNavigatorItem>(); - Node sv = (Node) view; - Bpmn2NavigatorGroup incominglinks = new Bpmn2NavigatorGroup( - Messages.NavigatorGroupName_DataObject_2014_incominglinks, - "icons/incomingLinksNavigatorGroup.gif", parentElement); //$NON-NLS-1$ - Bpmn2NavigatorGroup outgoinglinks = new Bpmn2NavigatorGroup( - Messages.NavigatorGroupName_DataObject_2014_outgoinglinks, - "icons/outgoingLinksNavigatorGroup.gif", parentElement); //$NON-NLS-1$ - Collection<View> connectedViews; - 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 ProcessEditPart.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$ - Collection<View> connectedViews; + .getType(SubProcess2EditPart.VISUAL_ID)); + result.addAll(createNavigatorItems(connectedViews, parentElement, + false)); connectedViews = getChildrenByType(Collections.singleton(sv), - Bpmn2VisualIDRegistry.getType(UserTaskEditPart.VISUAL_ID)); + Bpmn2VisualIDRegistry.getType(UserTask2EditPart.VISUAL_ID)); result.addAll(createNavigatorItems(connectedViews, parentElement, false)); connectedViews = getChildrenByType(Collections.singleton(sv), Bpmn2VisualIDRegistry - .getType(ServiceTaskEditPart.VISUAL_ID)); + .getType(ServiceTask2EditPart.VISUAL_ID)); result.addAll(createNavigatorItems(connectedViews, parentElement, false)); connectedViews = getChildrenByType(Collections.singleton(sv), - Bpmn2VisualIDRegistry.getType(StartEventEditPart.VISUAL_ID)); + Bpmn2VisualIDRegistry + .getType(StartEvent3EditPart.VISUAL_ID)); result.addAll(createNavigatorItems(connectedViews, parentElement, false)); connectedViews = getChildrenByType(Collections.singleton(sv), Bpmn2VisualIDRegistry - .getType(StartEvent2EditPart.VISUAL_ID)); + .getType(StartEvent4EditPart.VISUAL_ID)); result.addAll(createNavigatorItems(connectedViews, parentElement, false)); connectedViews = getChildrenByType(Collections.singleton(sv), - Bpmn2VisualIDRegistry.getType(EndEventEditPart.VISUAL_ID)); + Bpmn2VisualIDRegistry.getType(EndEvent4EditPart.VISUAL_ID)); result.addAll(createNavigatorItems(connectedViews, parentElement, false)); connectedViews = getChildrenByType(Collections.singleton(sv), Bpmn2VisualIDRegistry - .getType(ExclusiveGatewayEditPart.VISUAL_ID)); + .getType(ExclusiveGateway2EditPart.VISUAL_ID)); result.addAll(createNavigatorItems(connectedViews, parentElement, false)); connectedViews = getChildrenByType(Collections.singleton(sv), Bpmn2VisualIDRegistry - .getType(ParallelGatewayEditPart.VISUAL_ID)); + .getType(ParallelGateway2EditPart.VISUAL_ID)); result.addAll(createNavigatorItems(connectedViews, parentElement, false)); connectedViews = getChildrenByType(Collections.singleton(sv), - Bpmn2VisualIDRegistry.getType(EndEvent2EditPart.VISUAL_ID)); + Bpmn2VisualIDRegistry.getType(EndEvent5EditPart.VISUAL_ID)); result.addAll(createNavigatorItems(connectedViews, parentElement, false)); connectedViews = getChildrenByType(Collections.singleton(sv), - Bpmn2VisualIDRegistry.getType(EndEvent3EditPart.VISUAL_ID)); + Bpmn2VisualIDRegistry.getType(EndEvent6EditPart.VISUAL_ID)); result.addAll(createNavigatorItems(connectedViews, parentElement, false)); connectedViews = getChildrenByType(Collections.singleton(sv), Bpmn2VisualIDRegistry - .getType(IntermediateCatchEventEditPart.VISUAL_ID)); + .getType(IntermediateCatchEvent4EditPart.VISUAL_ID)); result.addAll(createNavigatorItems(connectedViews, parentElement, false)); connectedViews = getChildrenByType(Collections.singleton(sv), Bpmn2VisualIDRegistry - .getType(IntermediateThrowEventEditPart.VISUAL_ID)); + .getType(IntermediateThrowEvent2EditPart.VISUAL_ID)); result.addAll(createNavigatorItems(connectedViews, parentElement, false)); connectedViews = getChildrenByType(Collections.singleton(sv), Bpmn2VisualIDRegistry - .getType(IntermediateCatchEvent2EditPart.VISUAL_ID)); + .getType(IntermediateCatchEvent5EditPart.VISUAL_ID)); result.addAll(createNavigatorItems(connectedViews, parentElement, false)); connectedViews = getChildrenByType(Collections.singleton(sv), Bpmn2VisualIDRegistry - .getType(IntermediateCatchEvent3EditPart.VISUAL_ID)); + .getType(IntermediateCatchEvent4EditPart.VISUAL_ID)); result.addAll(createNavigatorItems(connectedViews, parentElement, false)); connectedViews = getChildrenByType(Collections.singleton(sv), - Bpmn2VisualIDRegistry.getType(DataObjectEditPart.VISUAL_ID)); + Bpmn2VisualIDRegistry + .getType(DataObject2EditPart.VISUAL_ID)); result.addAll(createNavigatorItems(connectedViews, parentElement, false)); connectedViews = getChildrenByType(Collections.singleton(sv), Bpmn2VisualIDRegistry - .getType(TextAnnotationEditPart.VISUAL_ID)); + .getType(TextAnnotation2EditPart.VISUAL_ID)); result.addAll(createNavigatorItems(connectedViews, parentElement, false)); connectedViews = getChildrenByType(Collections.singleton(sv), - Bpmn2VisualIDRegistry.getType(SubProcessEditPart.VISUAL_ID)); + Bpmn2VisualIDRegistry + .getType(ScriptTask2EditPart.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)); - links.addChildren(createNavigatorItems(connectedViews, links, false)); - if (!links.isEmpty()) { - result.add(links); - } - return result.toArray(); - } - - case IntermediateCatchEvent3EditPart.VISUAL_ID: { - LinkedList<Bpmn2AbstractNavigatorItem> result = new LinkedList<Bpmn2AbstractNavigatorItem>(); - Node sv = (Node) view; - Bpmn2NavigatorGroup incominglinks = new Bpmn2NavigatorGroup( - Messages.NavigatorGroupName_IntermediateCatchEvent_2013_incominglinks, - "icons/incomingLinksNavigatorGroup.gif", parentElement); //$NON-NLS-1$ - Bpmn2NavigatorGroup outgoinglinks = new Bpmn2NavigatorGroup( - 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)); @@ -852,363 +566,6 @@ return result.toArray(); } - case TextAnnotation2EditPart.VISUAL_ID: { - LinkedList<Bpmn2AbstractNavigatorItem> result = new LinkedList<Bpmn2AbstractNavigatorItem>(); - Node sv = (Node) view; - Bpmn2NavigatorGroup incominglinks = new Bpmn2NavigatorGroup( - Messages.NavigatorGroupName_TextAnnotation_3015_incominglinks, - "icons/incomingLinksNavigatorGroup.gif", parentElement); //$NON-NLS-1$ - Bpmn2NavigatorGroup outgoinglinks = new Bpmn2NavigatorGroup( - Messages.NavigatorGroupName_TextAnnotation_3015_outgoinglinks, - "icons/outgoingLinksNavigatorGroup.gif", parentElement); //$NON-NLS-1$ - Collection<View> connectedViews; - 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 DataObject2EditPart.VISUAL_ID: { - LinkedList<Bpmn2AbstractNavigatorItem> result = new LinkedList<Bpmn2AbstractNavigatorItem>(); - Node sv = (Node) view; - Bpmn2NavigatorGroup incominglinks = new Bpmn2NavigatorGroup( - Messages.NavigatorGroupName_DataObject_3014_incominglinks, - "icons/incomingLinksNavigatorGroup.gif", parentElement); //$NON-NLS-1$ - Bpmn2NavigatorGroup outgoinglinks = new Bpmn2NavigatorGroup( - Messages.NavigatorGroupName_DataObject_3014_outgoinglinks, - "icons/outgoingLinksNavigatorGroup.gif", parentElement); //$NON-NLS-1$ - Collection<View> connectedViews; - 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 SequenceFlowEditPart.VISUAL_ID: { - LinkedList<Bpmn2AbstractNavigatorItem> result = new LinkedList<Bpmn2AbstractNavigatorItem>(); - 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 = 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(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(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)); - 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(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 AssociationEditPart.VISUAL_ID: { LinkedList<Bpmn2AbstractNavigatorItem> result = new LinkedList<Bpmn2AbstractNavigatorItem>(); Edge sv = (Edge) view; @@ -1546,14 +903,14 @@ return result.toArray(); } - case StartEventEditPart.VISUAL_ID: { + case EndEvent4EditPart.VISUAL_ID: { LinkedList<Bpmn2AbstractNavigatorItem> result = new LinkedList<Bpmn2AbstractNavigatorItem>(); Node sv = (Node) view; Bpmn2NavigatorGroup incominglinks = new Bpmn2NavigatorGroup( - Messages.NavigatorGroupName_StartEvent_2003_incominglinks, + Messages.NavigatorGroupName_EndEvent_3006_incominglinks, "icons/incomingLinksNavigatorGroup.gif", parentElement); //$NON-NLS-1$ Bpmn2NavigatorGroup outgoinglinks = new Bpmn2NavigatorGroup( - Messages.NavigatorGroupName_StartEvent_2003_outgoinglinks, + Messages.NavigatorGroupName_EndEvent_3006_outgoinglinks, "icons/outgoingLinksNavigatorGroup.gif", parentElement); //$NON-NLS-1$ Collection<View> connectedViews; connectedViews = getIncomingLinksByType(Collections.singleton(sv), @@ -1585,14 +942,14 @@ return result.toArray(); } - case EndEvent4EditPart.VISUAL_ID: { + case IntermediateCatchEvent2EditPart.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), @@ -1624,18 +981,47 @@ return result.toArray(); } - case ExclusiveGatewayEditPart.VISUAL_ID: { + case TextAnnotation2EditPart.VISUAL_ID: { LinkedList<Bpmn2AbstractNavigatorItem> result = new LinkedList<Bpmn2AbstractNavigatorItem>(); Node sv = (Node) view; Bpmn2NavigatorGroup incominglinks = new Bpmn2NavigatorGroup( - Messages.NavigatorGroupName_ExclusiveGateway_2005_incominglinks, + Messages.NavigatorGroupName_TextAnnotation_3015_incominglinks, "icons/incomingLinksNavigatorGroup.gif", parentElement); //$NON-NLS-1$ Bpmn2NavigatorGroup outgoinglinks = new Bpmn2NavigatorGroup( - Messages.NavigatorGroupName_ExclusiveGateway_2005_outgoinglinks, + Messages.NavigatorGroupName_TextAnnotation_3015_outgoinglinks, "icons/outgoingLinksNavigatorGroup.gif", parentElement); //$NON-NLS-1$ Collection<View> connectedViews; 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 IntermediateCatchEvent3EditPart.VISUAL_ID: { + LinkedList<Bpmn2AbstractNavigatorItem> result = new LinkedList<Bpmn2AbstractNavigatorItem>(); + Node sv = (Node) view; + Bpmn2NavigatorGroup incominglinks = new Bpmn2NavigatorGroup( + Messages.NavigatorGroupName_IntermediateCatchEvent_2013_incominglinks, + "icons/incomingLinksNavigatorGroup.gif", parentElement); //$NON-NLS-1$ + Bpmn2NavigatorGroup outgoinglinks = new Bpmn2NavigatorGroup( + 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)); @@ -1663,18 +1049,28 @@ return result.toArray(); } - case TextAnnotationEditPart.VISUAL_ID: { + case IntermediateCatchEvent4EditPart.VISUAL_ID: { LinkedList<Bpmn2AbstractNavigatorItem> result = new LinkedList<Bpmn2AbstractNavigatorItem>(); Node sv = (Node) view; Bpmn2NavigatorGroup incominglinks = new Bpmn2NavigatorGroup( - Messages.NavigatorGroupName_TextAnnotation_2015_incominglinks, + Messages.NavigatorGroupName_IntermediateCatchEvent_3011_incominglinks, "icons/incomingLinksNavigatorGroup.gif", parentElement); //$NON-NLS-1$ Bpmn2NavigatorGroup outgoinglinks = new Bpmn2NavigatorGroup( - Messages.NavigatorGroupName_TextAnnotation_2015_outgoinglinks, + Messages.NavigatorGroupName_IntermediateCatchEvent_3011_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)); @@ -1692,14 +1088,14 @@ return result.toArray(); } - case EndEvent6EditPart.VISUAL_ID: { + case IntermediateThrowEvent2EditPart.VISUAL_ID: { LinkedList<Bpmn2AbstractNavigatorItem> result = new LinkedList<Bpmn2AbstractNavigatorItem>(); Node sv = (Node) view; Bpmn2NavigatorGroup incominglinks = new Bpmn2NavigatorGroup( - Messages.NavigatorGroupName_EndEvent_3010_incominglinks, + Messages.NavigatorGroupName_IntermediateThrowEvent_3012_incominglinks, "icons/incomingLinksNavigatorGroup.gif", parentElement); //$NON-NLS-1$ Bpmn2NavigatorGroup outgoinglinks = new Bpmn2NavigatorGroup( - Messages.NavigatorGroupName_EndEvent_3010_outgoinglinks, + Messages.NavigatorGroupName_IntermediateThrowEvent_3012_outgoinglinks, "icons/outgoingLinksNavigatorGroup.gif", parentElement); //$NON-NLS-1$ Collection<View> connectedViews; connectedViews = getIncomingLinksByType(Collections.singleton(sv), @@ -1731,14 +1127,14 @@ return result.toArray(); } - case IntermediateCatchEvent2EditPart.VISUAL_ID: { + case IntermediateThrowEventEditPart.VISUAL_ID: { LinkedList<Bpmn2AbstractNavigatorItem> result = new LinkedList<Bpmn2AbstractNavigatorItem>(); Node sv = (Node) view; Bpmn2NavigatorGroup incominglinks = new Bpmn2NavigatorGroup( - Messages.NavigatorGroupName_IntermediateCatchEvent_2012_incominglinks, + Messages.NavigatorGroupName_IntermediateThrowEvent_2011_incominglinks, "icons/incomingLinksNavigatorGroup.gif", parentElement); //$NON-NLS-1$ Bpmn2NavigatorGroup outgoinglinks = new Bpmn2NavigatorGroup( - Messages.NavigatorGroupName_IntermediateCatchEvent_2012_outgoinglinks, + Messages.NavigatorGroupName_IntermediateThrowEvent_2011_outgoinglinks, "icons/outgoingLinksNavigatorGroup.gif", parentElement); //$NON-NLS-1$ Collection<View> connectedViews; connectedViews = getIncomingLinksByType(Collections.singleton(sv), @@ -1770,14 +1166,14 @@ return result.toArray(); } - case EndEvent2EditPart.VISUAL_ID: { + case StartEventEditPart.VISUAL_ID: { LinkedList<Bpmn2AbstractNavigatorItem> result = new LinkedList<Bpmn2AbstractNavigatorItem>(); Node sv = (Node) view; Bpmn2NavigatorGroup incominglinks = new Bpmn2NavigatorGroup( - Messages.NavigatorGroupName_EndEvent_2008_incominglinks, + Messages.NavigatorGroupName_StartEvent_2003_incominglinks, "icons/incomingLinksNavigatorGroup.gif", parentElement); //$NON-NLS-1$ Bpmn2NavigatorGroup outgoinglinks = new Bpmn2NavigatorGroup( - Messages.NavigatorGroupName_EndEvent_2008_outgoinglinks, + Messages.NavigatorGroupName_StartEvent_2003_outgoinglinks, "icons/outgoingLinksNavigatorGroup.gif", parentElement); //$NON-NLS-1$ Collection<View> connectedViews; connectedViews = getIncomingLinksByType(Collections.singleton(sv), @@ -1809,14 +1205,14 @@ return result.toArray(); } - case IntermediateCatchEvent4EditPart.VISUAL_ID: { + case UserTaskEditPart.VISUAL_ID: { LinkedList<Bpmn2AbstractNavigatorItem> result = new LinkedList<Bpmn2AbstractNavigatorItem>(); Node sv = (Node) view; Bpmn2NavigatorGroup incominglinks = new Bpmn2NavigatorGroup( - Messages.NavigatorGroupName_IntermediateCatchEvent_3011_incominglinks, + Messages.NavigatorGroupName_UserTask_2001_incominglinks, "icons/incomingLinksNavigatorGroup.gif", parentElement); //$NON-NLS-1$ Bpmn2NavigatorGroup outgoinglinks = new Bpmn2NavigatorGroup( - Messages.NavigatorGroupName_IntermediateCatchEvent_3011_outgoinglinks, + Messages.NavigatorGroupName_UserTask_2001_outgoinglinks, "icons/outgoingLinksNavigatorGroup.gif", parentElement); //$NON-NLS-1$ Collection<View> connectedViews; connectedViews = getIncomingLinksByType(Collections.singleton(sv), @@ -1848,14 +1244,14 @@ return result.toArray(); } - case IntermediateThrowEventEditPart.VISUAL_ID: { + case ParallelGateway2EditPart.VISUAL_ID: { LinkedList<Bpmn2AbstractNavigatorItem> result = new LinkedList<Bpmn2AbstractNavigatorItem>(); Node sv = (Node) view; Bpmn2NavigatorGroup incominglinks = new Bpmn2NavigatorGroup( - Messages.NavigatorGroupName_IntermediateThrowEvent_2011_incominglinks, + Messages.NavigatorGroupName_ParallelGateway_3008_incominglinks, "icons/incomingLinksNavigatorGroup.gif", parentElement); //$NON-NLS-1$ Bpmn2NavigatorGroup outgoinglinks = new Bpmn2NavigatorGroup( - Messages.NavigatorGroupName_IntermediateThrowEvent_2011_outgoinglinks, + Messages.NavigatorGroupName_ParallelGateway_3008_outgoinglinks, "icons/outgoingLinksNavigatorGroup.gif", parentElement); //$NON-NLS-1$ Collection<View> connectedViews; connectedViews = getIncomingLinksByType(Collections.singleton(sv), @@ -1887,14 +1283,14 @@ return result.toArray(); } - case UserTaskEditPart.VISUAL_ID: { + case IntermediateCatchEvent5EditPart.VISUAL_ID: { LinkedList<Bpmn2AbstractNavigatorItem> result = new LinkedList<Bpmn2AbstractNavigatorItem>(); Node sv = (Node) view; Bpmn2NavigatorGroup incominglinks = new Bpmn2NavigatorGroup( - Messages.NavigatorGroupName_UserTask_2001_incominglinks, + Messages.NavigatorGroupName_IntermediateCatchEvent_3013_incominglinks, "icons/incomingLinksNavigatorGroup.gif", parentElement); //$NON-NLS-1$ Bpmn2NavigatorGroup outgoinglinks = new Bpmn2NavigatorGroup( - Messages.NavigatorGroupName_UserTask_2001_outgoinglinks, + Messages.NavigatorGroupName_IntermediateCatchEvent_3013_outgoinglinks, "icons/outgoingLinksNavigatorGroup.gif", parentElement); //$NON-NLS-1$ Collection<View> connectedViews; connectedViews = getIncomingLinksByType(Collections.singleton(sv), @@ -1965,14 +1361,14 @@ return result.toArray(); } - case EndEvent3EditPart.VISUAL_ID: { + case StartEvent4EditPart.VISUAL_ID: { LinkedList<Bpmn2AbstractNavigatorItem> result = new LinkedList<Bpmn2AbstractNavigatorItem>(); Node sv = (Node) view; Bpmn2NavigatorGroup incominglinks = new Bpmn2NavigatorGroup( - Messages.NavigatorGroupName_EndEvent_2009_incominglinks, + Messages.NavigatorGroupName_StartEvent_3005_incominglinks, "icons/incomingLinksNavigatorGroup.gif", parentElement); //$NON-NLS-1$ Bpmn2NavigatorGroup outgoinglinks = new Bpmn2NavigatorGroup( - Messages.NavigatorGroupName_EndEvent_2009_outgoinglinks, + Messages.NavigatorGroupName_StartEvent_3005_outgoinglinks, "icons/outgoingLinksNavigatorGroup.gif", parentElement); //$NON-NLS-1$ Collection<View> connectedViews; connectedViews = getIncomingLinksByType(Collections.singleton(sv), @@ -2004,14 +1400,14 @@ return result.toArray(); } - case StartEvent4EditPart.VISUAL_ID: { + case EndEvent2EditPart.VISUAL_ID: { LinkedList<Bpmn2AbstractNavigatorItem> result = new LinkedList<Bpmn2AbstractNavigatorItem>(); Node sv = (Node) view; Bpmn2NavigatorGroup incominglinks = new Bpmn2NavigatorGroup( - Messages.NavigatorGroupName_StartEvent_3005_incominglinks, + Messages.NavigatorGroupName_EndEvent_2008_incominglinks, "icons/incomingLinksNavigatorGroup.gif", parentElement); //$NON-NLS-1$ Bpmn2NavigatorGroup outgoinglinks = new Bpmn2NavigatorGroup( - Messages.NavigatorGroupName_StartEvent_3005_outgoinglinks, + Messages.NavigatorGroupName_EndEvent_2008_outgoinglinks, "icons/outgoingLinksNavigatorGroup.gif", parentElement); //$NON-NLS-1$ Collection<View> connectedViews; connectedViews = getIncomingLinksByType(Collections.singleton(sv), @@ -2043,14 +1439,14 @@ return result.toArray(); } - case IntermediateCatchEventEditPart.VISUAL_ID: { + case EndEvent6EditPart.VISUAL_ID: { LinkedList<Bpmn2AbstractNavigatorItem> result = new LinkedList<Bpmn2AbstractNavigatorItem>(); Node sv = (Node) view; Bpmn2NavigatorGroup incominglinks = new Bpmn2NavigatorGroup( - Messages.NavigatorGroupName_IntermediateCatchEvent_2010_incominglinks, + Messages.NavigatorGroupName_EndEvent_3010_incominglinks, "icons/incomingLinksNavigatorGroup.gif", parentElement); //$NON-NLS-1$ Bpmn2NavigatorGroup outgoinglinks = new Bpmn2NavigatorGroup( - Messages.NavigatorGroupName_IntermediateCatchEvent_2010_outgoinglinks, + Messages.NavigatorGroupName_EndEvent_3010_outgoinglinks, "icons/outgoingLinksNavigatorGroup.gif", parentElement); //$NON-NLS-1$ Collection<View> connectedViews; connectedViews = getIncomingLinksByType(Collections.singleton(sv), @@ -2082,14 +1478,14 @@ return result.toArray(); } - case IntermediateCatchEvent5EditPart.VISUAL_ID: { + case EndEventEditPart.VISUAL_ID: { LinkedList<Bpmn2AbstractNavigatorItem> result = new LinkedList<Bpmn2AbstractNavigatorItem>(); Node sv = (Node) view; Bpmn2NavigatorGroup incominglinks = new Bpmn2NavigatorGroup( - Messages.NavigatorGroupName_IntermediateCatchEvent_3013_incominglinks, + Messages.NavigatorGroupName_EndEvent_2004_incominglinks, "icons/incomingLinksNavigatorGroup.gif", parentElement); //$NON-NLS-1$ Bpmn2NavigatorGroup outgoinglinks = new Bpmn2NavigatorGroup( - Messages.NavigatorGroupName_IntermediateCatchEvent_3013_outgoinglinks, + Messages.NavigatorGroupName_EndEvent_2004_outgoinglinks, "icons/outgoingLinksNavigatorGroup.gif", parentElement); //$NON-NLS-1$ Collection<View> connectedViews; connectedViews = getIncomingLinksByType(Collections.singleton(sv), @@ -2121,14 +1517,14 @@ return result.toArray(); } - case IntermediateThrowEvent2EditPart.VISUAL_ID: { + case UserTask2EditPart.VISUAL_ID: { LinkedList<Bpmn2AbstractNavigatorItem> result = new LinkedList<Bpmn2AbstractNavigatorItem>(); Node sv = (Node) view; Bpmn2NavigatorGroup incominglinks = new Bpmn2NavigatorGroup( - Messages.NavigatorGroupName_IntermediateThrowEvent_3012_incominglinks, + Messages.NavigatorGroupName_UserTask_3002_incominglinks, "icons/incomingLinksNavigatorGroup.gif", parentElement); //$NON-NLS-1$ Bpmn2NavigatorGroup outgoinglinks = new Bpmn2NavigatorGroup( - Messages.NavigatorGroupName_IntermediateThrowEvent_3012_outgoinglinks, + Messages.NavigatorGroupName_UserTask_3002_outgoinglinks, "icons/outgoingLinksNavigatorGroup.gif", parentElement); //$NON-NLS-1$ Collection<View> connectedViews; connectedViews = getIncomingLinksByType(Collections.singleton(sv), @@ -2160,18 +1556,47 @@ return result.toArray(); } - case ScriptTaskEditPart.VISUAL_ID: { + case TextAnnotationEditPart.VISUAL_ID: { LinkedList<Bpmn2AbstractNavigatorItem> result = new LinkedList<Bpmn2AbstractNavigatorItem>(); Node sv = (Node) view; Bpmn2NavigatorGroup incominglinks = new Bpmn2NavigatorGroup( - Messages.NavigatorGroupName_ScriptTask_2017_incominglinks, + Messages.NavigatorGroupName_TextAnnotation_2015_incominglinks, "icons/incomingLinksNavigatorGroup.gif", parentElement); //$NON-NLS-1$ Bpmn2NavigatorGroup outgoinglinks = new Bpmn2NavigatorGroup( - Messages.NavigatorGroupName_ScriptTask_2017_outgoinglinks, + Messages.NavigatorGroupName_TextAnnotation_2015_outgoinglinks, "icons/outgoingLinksNavigatorGroup.gif", parentElement); //$NON-NLS-1$ Collection<View> connectedViews; 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 EndEvent3EditPart.VISUAL_ID: { + LinkedList<Bpmn2AbstractNavigatorItem> result = new LinkedList<Bpmn2AbstractNavigatorItem>(); + Node sv = (Node) view; + Bpmn2NavigatorGroup incominglinks = new Bpmn2NavigatorGroup( + Messages.NavigatorGroupName_EndEvent_2009_incominglinks, + "icons/incomingLinksNavigatorGroup.gif", parentElement); //$NON-NLS-1$ + Bpmn2NavigatorGroup outgoinglinks = new Bpmn2NavigatorGroup( + Messages.NavigatorGroupName_EndEvent_2009_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)); @@ -2238,14 +1663,112 @@ return result.toArray(); } - case StartEvent3EditPart.VISUAL_ID: { + case ProcessEditPart.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$ + Collection<View> connectedViews; + connectedViews = getChildrenByType(Collections.singleton(sv), + Bpmn2VisualIDRegistry.getType(UserTaskEditPart.VISUAL_ID)); + result.addAll(createNavigatorItems(connectedViews, parentElement, + false)); + connectedViews = getChildrenByType(Collections.singleton(sv), + Bpmn2VisualIDRegistry + .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)); + links.addChildren(createNavigatorItems(connectedViews, links, false)); + if (!links.isEmpty()) { + result.add(links); + } + return result.toArray(); + } + + case ScriptTaskEditPart.VISUAL_ID: { + LinkedList<Bpmn2AbstractNavigatorItem> result = new LinkedList<Bpmn2AbstractNavigatorItem>(); Node sv = (Node) view; Bpmn2NavigatorGroup incominglinks = new Bpmn2NavigatorGroup( - Messages.NavigatorGroupName_StartEvent_3003_incominglinks, + Messages.NavigatorGroupName_ScriptTask_2017_incominglinks, "icons/incomingLinksNavigatorGroup.gif", parentElement); //$NON-NLS-1$ Bpmn2NavigatorGroup outgoinglinks = new Bpmn2NavigatorGroup( - Messages.NavigatorGroupName_StartEvent_3003_outgoinglinks, + Messages.NavigatorGroupName_ScriptTask_2017_outgoinglinks, "icons/outgoingLinksNavigatorGroup.gif", parentElement); //$NON-NLS-1$ Collection<View> connectedViews; connectedViews = getIncomingLinksByType(Collections.singleton(sv), @@ -2277,18 +1800,128 @@ return result.toArray(); } - case ExclusiveGateway2EditPart.VISUAL_ID: { + case DataObjectEditPart.VISUAL_ID: { LinkedList<Bpmn2AbstractNavigatorItem> result = new LinkedList<Bpmn2AbstractNavigatorItem>(); Node sv = (Node) view; Bpmn2NavigatorGroup incominglinks = new Bpmn2NavigatorGroup( - Messages.NavigatorGroupName_ExclusiveGateway_3007_incominglinks, + Messages.NavigatorGroupName_DataObject_2014_incominglinks, "icons/incomingLinksNavigatorGroup.gif", parentElement); //$NON-NLS-1$ Bpmn2NavigatorGroup outgoinglinks = new Bpmn2NavigatorGroup( - Messages.NavigatorGroupName_ExclusiveGateway_3007_outgoinglinks, + Messages.NavigatorGroupName_DataObject_2014_outgoinglinks, "icons/outgoingLinksNavigatorGroup.gif", parentElement); //$NON-NLS-1$ Collection<View> connectedViews; 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 SubProcess2EditPart.VISUAL_ID: { + LinkedList<Bpmn2AbstractNavigatorItem> result = new LinkedList<Bpmn2AbstractNavigatorItem>(); + Node sv = (Node) view; + Bpmn2NavigatorGroup incominglinks = new Bpmn2NavigatorGroup( + Messages.NavigatorGroupName_SubProcess_3001_incominglinks, + "icons/incomingLinksNavigatorGroup.gif", parentElement); //$NON-NLS-1$ + Bpmn2NavigatorGroup outgoinglinks = new Bpmn2NavigatorGroup( + Messages.NavigatorGroupName_SubProcess_3001_outgoinglinks, + "icons/outgoingLinksNavigatorGroup.gif", parentElement); //$NON-NLS-1$ + Collection<View> connectedViews; + connectedViews = getChildrenByType(Collections.singleton(sv), + Bpmn2VisualIDRegistry + .getType(SubProcess2EditPart.VISUAL_ID)); + result.addAll(createNavigatorItems(connectedViews, parentElement, + false)); + connectedViews = getChildrenByType(Collections.singleton(sv), + Bpmn2VisualIDRegistry.getType(UserTask2EditPart.VISUAL_ID)); + result.addAll(createNavigatorItems(connectedViews, parentElement, + false)); + connectedViews = getChildrenByType(Collections.singleton(sv), + Bpmn2VisualIDRegistry + .getType(ServiceTask2EditPart.VISUAL_ID)); + result.addAll(createNavigatorItems(connectedViews, parentElement, + false)); + connectedViews = getChildrenByType(Collections.singleton(sv), + Bpmn2VisualIDRegistry + .getType(StartEvent3EditPart.VISUAL_ID)); + result.addAll(createNavigatorItems(connectedViews, parentElement, + false)); + connectedViews = getChildrenByType(Collections.singleton(sv), + Bpmn2VisualIDRegistry + .getType(StartEvent4EditPart.VISUAL_ID)); + result.addAll(createNavigatorItems(connectedViews, parentElement, + false)); + connectedViews = getChildrenByType(Collections.singleton(sv), + Bpmn2VisualIDRegistry.getType(EndEvent4EditPart.VISUAL_ID)); + result.addAll(createNavigatorItems(connectedViews, parentElement, + false)); + connectedViews = getChildrenByType(Collections.singleton(sv), + Bpmn2VisualIDRegistry + .getType(ExclusiveGateway2EditPart.VISUAL_ID)); + result.addAll(createNavigatorItems(connectedViews, parentElement, + false)); + connectedViews = getChildrenByType(Collections.singleton(sv), + Bpmn2VisualIDRegistry + .getType(ParallelGateway2EditPart.VISUAL_ID)); + result.addAll(createNavigatorItems(connectedViews, parentElement, + false)); + connectedViews = getChildrenByType(Collections.singleton(sv), + Bpmn2VisualIDRegistry.getType(EndEvent5EditPart.VISUAL_ID)); + result.addAll(createNavigatorItems(connectedViews, parentElement, + false)); + connectedViews = getChildrenByType(Collections.singleton(sv), + Bpmn2VisualIDRegistry.getType(EndEvent6EditPart.VISUAL_ID)); + result.addAll(createNavigatorItems(connectedViews, parentElement, + false)); + connectedViews = getChildrenByType(Collections.singleton(sv), + Bpmn2VisualIDRegistry + .getType(IntermediateCatchEvent4EditPart.VISUAL_ID)); + result.addAll(createNavigatorItems(connectedViews, parentElement, + false)); + connectedViews = getChildrenByType(Collections.singleton(sv), + Bpmn2VisualIDRegistry + .getType(IntermediateThrowEvent2EditPart.VISUAL_ID)); + result.addAll(createNavigatorItems(connectedViews, parentElement, + false)); + connectedViews = getChildrenByType(Collections.singleton(sv), + Bpmn2VisualIDRegistry + .getType(IntermediateCatchEvent5EditPart.VISUAL_ID)); + result.addAll(createNavigatorItems(connectedViews, parentElement, + false)); + connectedViews = getChildrenByType(Collections.singleton(sv), + Bpmn2VisualIDRegistry + .getType(IntermediateCatchEvent4EditPart.VISUAL_ID)); + result.addAll(createNavigatorItems(connectedViews, parentElement, + false)); + connectedViews = getChildrenByType(Collections.singleton(sv), + Bpmn2VisualIDRegistry + .getType(DataObject2EditPart.VISUAL_ID)); + result.addAll(createNavigatorItems(connectedViews, parentElement, + false)); + connectedViews = getChildrenByType(Collections.singleton(sv), + Bpmn2VisualIDRegistry + .getType(TextAnnotation2EditPart.VISUAL_ID)); + result.addAll(createNavigatorItems(connectedViews, parentElement, + false)); + connectedViews = getChildrenByType(Collections.singleton(sv), + Bpmn2VisualIDRegistry + .getType(ScriptTask2EditPart.VISUAL_ID)); + result.addAll(createNavigatorItems(connectedViews, parentElement, + false)); + connectedViews = getIncomingLinksByType(Collections.singleton(sv), + Bpmn2VisualIDRegistry .getType(SequenceFlowEditPart.VISUAL_ID)); incominglinks.addChildren(createNavigatorItems(connectedViews, incominglinks, true)); @@ -2316,6 +1949,305 @@ return result.toArray(); } + case SequenceFlowEditPart.VISUAL_ID: { + LinkedList<Bpmn2AbstractNavigatorItem> result = new LinkedList<Bpmn2AbstractNavigatorItem>(); + 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 = 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(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(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)); + 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(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 ServiceTaskEditPart.VISUAL_ID: { LinkedList<Bpmn2AbstractNavigatorItem> result = new LinkedList<Bpmn2AbstractNavigatorItem>(); Node sv = (Node) view; @@ -2355,18 +2287,47 @@ return result.toArray(); } - case ParallelGateway2EditPart.VISUAL_ID: { + case DataObject2EditPart.VISUAL_ID: { LinkedList<Bpmn2AbstractNavigatorItem> result = new LinkedList<Bpmn2AbstractNavigatorItem>(); Node sv = (Node) view; Bpmn2NavigatorGroup incominglinks = new Bpmn2NavigatorGroup( - Messages.NavigatorGroupName_ParallelGateway_3008_incominglinks, + Messages.NavigatorGroupName_DataObject_3014_incominglinks, "icons/incomingLinksNavigatorGroup.gif", parentElement); //$NON-NLS-1$ Bpmn2NavigatorGroup outgoinglinks = new Bpmn2NavigatorGroup( - Messages.NavigatorGroupName_ParallelGateway_3008_outgoinglinks, + Messages.NavigatorGroupName_DataObject_3014_outgoinglinks, "icons/outgoingLinksNavigatorGroup.gif", parentElement); //$NON-NLS-1$ Collection<View> connectedViews; 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 ServiceTask2EditPart.VISUAL_ID: { + LinkedList<Bpmn2AbstractNavigatorItem> result = new LinkedList<Bpmn2AbstractNavigatorItem>(); + Node sv = (Node) view; + Bpmn2NavigatorGroup incominglinks = new Bpmn2NavigatorGroup( + Messages.NavigatorGroupName_ServiceTask_3004_incominglinks, + "icons/incomingLinksNavigatorGroup.gif", parentElement); //$NON-NLS-1$ + Bpmn2NavigatorGroup outgoinglinks = new Bpmn2NavigatorGroup( + Messages.NavigatorGroupName_ServiceTask_3004_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)); @@ -2393,7 +2354,46 @@ } return result.toArray(); } + + case EndEvent5EditPart.VISUAL_ID: { + LinkedList<Bpmn2AbstractNavigatorItem> result = new LinkedList<Bpmn2AbstractNavigatorItem>(); + Node sv = (Node) view; + Bpmn2NavigatorGroup incominglinks = new Bpmn2NavigatorGroup( + Messages.NavigatorGroupName_EndEvent_3009_incominglinks, + "icons/incomingLinksNavigatorGroup.gif", parentElement); //$NON-NLS-1$ + Bpmn2NavigatorGroup outgoinglinks = new Bpmn2NavigatorGroup( + 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)); + 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(); } + } return EMPTY_ARRAY; } 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 2010-11-22 16:07:35 UTC (rev 26820) +++ trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/navigator/Bpmn2NavigatorLabelProvider.java 2010-11-22 16:08:50 UTC (rev 26821) @@ -135,114 +135,114 @@ */ public Image getImage(View view) { switch (Bpmn2VisualIDRegistry.getVisualID(view)) { - case EndEventEditPart.VISUAL_ID: + case ExclusiveGateway2EditPart.VISUAL_ID: return getImage( - "Navigator?TopLevelNode?http://www.omg.org/spec/BPMN/20100524/MODEL-XMI?En...", Bpmn2ElementTypes.EndEvent_2004); //$NON-NLS-1$ + "Navigator?Node?http://www.omg.org/spec/BPMN/20100524/MODEL-XMI?ExclusiveG...", Bpmn2ElementTypes.ExclusiveGateway_3007); //$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 ParallelGatewayEditPart.VISUAL_ID: return getImage( "Navigator?TopLevelNode?http://www.omg.org/spec/BPMN/20100524/MODEL-XMI?Pa...", Bpmn2ElementTypes.ParallelGateway_2006); //$NON-NLS-1$ - case EndEvent5EditPart.VISUAL_ID: + case ExclusiveGatewayEditPart.VISUAL_ID: return getImage( - "Navigator?Node?http://www.omg.org/spec/BPMN/20100524/MODEL-XMI?EndEvent", Bpmn2ElementTypes.EndEvent_3009); //$NON-NLS-1$ + "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$ 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 SubProcess2EditPart.VISUAL_ID: + case AssociationEditPart.VISUAL_ID: return getImage( - "Navigator?Node?http://www.omg.org/spec/BPMN/20100524/MODEL-XMI?SubProcess", Bpmn2ElementTypes.SubProcess_3001); //$NON-NLS-1$ - case ServiceTask2EditPart.VISUAL_ID: + "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?ServiceTask", Bpmn2ElementTypes.ServiceTask_3004); //$NON-NLS-1$ - case UserTask2EditPart.VISUAL_ID: + "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?Node?http://www.omg.org/spec/BPMN/20100524/MODEL-XMI?UserTask", Bpmn2ElementTypes.UserTask_3002); //$NON-NLS-1$ - case DataObjectEditPart.VISUAL_ID: + "Navigator?TopLevelNode?http://www.omg.org/spec/BPMN/20100524/MODEL-XMI?In...", Bpmn2ElementTypes.IntermediateCatchEvent_2012); //$NON-NLS-1$ + case TextAnnotation2EditPart.VISUAL_ID: return getImage( - "Navigator?TopLevelNode?http://www.omg.org/spec/BPMN/20100524/MODEL-XMI?Da...", Bpmn2ElementTypes.DataObject_2014); //$NON-NLS-1$ - case ProcessEditPart.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?TextAnnota...", Bpmn2ElementTypes.TextAnnotation_3015); //$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 TextAnnotation2EditPart.VISUAL_ID: + case IntermediateCatchEvent4EditPart.VISUAL_ID: return getImage( - "Navigator?Node?http://www.omg.org/spec/BPMN/20100524/MODEL-XMI?TextAnnota...", Bpmn2ElementTypes.TextAnnotation_3015); //$NON-NLS-1$ - case DataObject2EditPart.VISUAL_ID: + "Navigator?Node?http://www.omg.org/spec/BPMN/20100524/MODEL-XMI?Intermedia...", Bpmn2ElementTypes.IntermediateCatchEvent_3011); //$NON-NLS-1$ + case IntermediateThrowEvent2EditPart.VISUAL_ID: return getImage( - "Navigator?Node?http://www.omg.org/spec/BPMN/20100524/MODEL-XMI?DataObject", Bpmn2ElementTypes.DataObject_3014); //$NON-NLS-1$ - case SequenceFlowEditPart.VISUAL_ID: + "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?Link?http://www.omg.org/spec/BPMN/20100524/MODEL-XMI?SequenceFlow", Bpmn2ElementTypes.SequenceFlow_4001); //$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$ + "Navigator?TopLevelNode?http://www.omg.org/spec/BPMN/20100524/MODEL-XMI?In...", Bpmn2ElementTypes.IntermediateThrowEvent_2011); //$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 EndEvent4EditPart.VISUAL_ID: + case UserTaskEditPart.VISUAL_ID: return getImage( - "Navigator?Node?http://www.omg.org/spec/BPMN/20100524/MODEL-XMI?EndEvent", Bpmn2ElementTypes.EndEvent_3006); //$NON-NLS-1$ - case ExclusiveGatewayEditPart.VISUAL_ID: + "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?TopLevelNode?http://www.omg.org/spec/BPMN/20100524/MODEL-XMI?Ex...", Bpmn2ElementTypes.ExclusiveGateway_2005); //$NON-NLS-1$ - case TextAnnotationEditPart.VISUAL_ID: + "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?TopLevelNode?http://www.omg.org/spec/BPMN/20100524/MODEL-XMI?Te...", Bpmn2ElementTypes.TextAnnotation_2015); //$NON-NLS-1$ - case EndEvent6EditPart.VISUAL_ID: + "Navigator?Node?http://www.omg.org/spec/BPMN/20100524/MODEL-XMI?Intermedia...", Bpmn2ElementTypes.IntermediateCatchEvent_3013); //$NON-NLS-1$ + case ScriptTask2EditPart.VISUAL_ID: return getImage( - "Navigator?Node?http://www.omg.org/spec/BPMN/20100524/MODEL-XMI?EndEvent", Bpmn2ElementTypes.EndEvent_3010); //$NON-NLS-1$ - case IntermediateCatchEvent2EditPart.VISUAL_ID: + "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?TopLevelNode?http://www.omg.org/spec/BPMN/20100524/MODEL-XMI?In...", Bpmn2ElementTypes.IntermediateCatchEvent_2012); //$NON-NLS-1$ + "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$ - case IntermediateCatchEvent4EditPart.VISUAL_ID: + case EndEvent6EditPart.VISUAL_ID: return getImage( - "Navigator?Node?http://www.omg.org/spec/BPMN/20100524/MODEL-XMI?Intermedia...", Bpmn2ElementTypes.IntermediateCatchEvent_3011); //$NON-NLS-1$ - case IntermediateThrowEventEditPart.VISUAL_ID: + "Navigator?Node?http://www.omg.org/spec/BPMN/20100524/MODEL-XMI?EndEvent", Bpmn2ElementTypes.EndEvent_3010); //$NON-NLS-1$ + case EndEventEditPart.VISUAL_ID: return getImage( - "Navigator?TopLevelNode?http://www.omg.org/spec/BPMN/20100524/MODEL-XMI?In...", Bpmn2ElementTypes.IntermediateThrowEvent_2011); //$NON-NLS-1$ - case UserTaskEditPart.VISUAL_ID: + "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?TopLevelNode?http://www.omg.org/spec/BPMN/20100524/MODEL-XMI?Us...", Bpmn2ElementTypes.UserTask_2001); //$NON-NLS-1$ - case ScriptTask2EditPart.VISUAL_ID: + "Navigator?Node?http://www.omg.org/spec/BPMN/20100524/MODEL-XMI?UserTask", Bpmn2ElementTypes.UserTask_3002); //$NON-NLS-1$ + case TextAnnotationEditPart.VISUAL_ID: return getImage( - "Navigator?Node?http://www.omg.org/spec/BPMN/20100524/MODEL-XMI?ScriptTask", Bpmn2ElementTypes.ScriptTask_3016); //$NON-NLS-1$ + "Navigator?TopLevelNode?http://www.omg.org/spec/BPMN/20100524/MODEL-XMI?Te...", Bpmn2ElementTypes.TextAnnotation_2015); //$NON-NLS-1$ case EndEvent3EditPart.VISUAL_ID: return getImage( "Navigator?TopLevelNode?http://www.omg.org/spec/BPMN/20100524/MODEL-XMI?En...", Bpmn2ElementTypes.EndEvent_2009); //$NON-NLS-1$ - case StartEvent4EditPart.VISUAL_ID: + case StartEvent2EditPart.VISUAL_ID: return getImage( - "Navigator?Node?http://www.omg.org/spec/BPMN/20100524/MODEL-XMI?StartEvent", Bpmn2ElementTypes.StartEvent_3005); //$NON-NLS-1$ - case IntermediateCatchEventEditPart.VISUAL_ID: + "Navigator?TopLevelNode?http://www.omg.org/spec/BPMN/20100524/MODEL-XMI?St...", Bpmn2ElementTypes.StartEvent_2007); //$NON-NLS-1$ + case ProcessEditPart.VISUAL_ID: return getImage( - "Navigator?TopLevelNode?http://www.omg.org/spec/BPMN/20100524/MODEL-XMI?In...", Bpmn2ElementTypes.IntermediateCatchEvent_2010); //$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 IntermediateThrowEvent2EditPart.VISUAL_ID: - return getImage( - "Navigator?Node?http://www.omg.org/spec/BPMN/20100524/MODEL-XMI?Intermedia...", Bpmn2ElementTypes.IntermediateThrowEvent_3012); //$NON-NLS-1$ + "Navigator?Diagram?http://www.omg.org/spec/BPMN/20100524/MODEL-XMI?Process", Bpmn2ElementTypes.Process_1000); //$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 StartEvent2EditPart.VISUAL_ID: + case DataObjectEditPart.VISUAL_ID: return getImage( - "Navigator?TopLevelNode?http://www.omg.org/spec/BPMN/20100524/MODEL-XMI?St...", Bpmn2ElementTypes.StartEvent_2007); //$NON-NLS-1$ - case StartEvent3EditPart.VISUAL_ID: + "Navigator?TopLevelNode?http://www.omg.org/spec/BPMN/20100524/MODEL-XMI?Da...", Bpmn2ElementTypes.DataObject_2014); //$NON-NLS-1$ + case SubProcess2EditPart.VISUAL_ID: return getImage( - "Navigator?Node?http://www.omg.org/spec/BPMN/20100524/MODEL-XMI?StartEvent", Bpmn2ElementTypes.StartEvent_3003); //$NON-NLS-1$ - case ExclusiveGateway2EditPart.VISUAL_ID: + "Navigator?Node?http://www.omg.org/spec/BPMN/20100524/MODEL-XMI?SubProcess", Bpmn2ElementTypes.SubProcess_3001); //$NON-NLS-1$ + case SequenceFlowEditPart.VISUAL_ID: return getImage( - "Navigator?Node?http://www.omg.org/spec/BPMN/20100524/MODEL-XMI?ExclusiveG...", Bpmn2ElementTypes.ExclusiveGateway_3007); //$NON-NLS-1$ + "Navigator?Link?http://www.omg.org/spec/BPMN/20100524/MODEL-XMI?SequenceFlow", Bpmn2ElementTypes.SequenceFlow_4001); //$NON-NLS-1$ case ServiceTaskEditPart.VISUAL_ID: return getImage( "Navigator?TopLevelNode?http://www.omg.org/spec/BPMN/20100524/MODEL-XMI?Se...", Bpmn2ElementTypes.ServiceTask_2002); //$NON-NLS-1$ - case ParallelGateway2EditPart.VISUAL_ID: + case DataObject2EditPart.VISUAL_ID: return getImage( - "Navigator?Node?http://www.omg.org/spec/BPMN/20100524/MODEL-XMI?ParallelGa...", Bpmn2ElementTypes.ParallelGateway_3008); //$NON-NLS-1$ + "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$ + case EndEvent5EditPart.VISUAL_ID: + return getImage( + "Navigator?Node?http://www.omg.org/spec/BPMN/20100524/MODEL-XMI?EndEvent", Bpmn2ElementTypes.EndEvent_3009); //$NON-NLS-1$ } return getImage("Navigator?UnknownElement", null); //$NON-NLS-1$ } @@ -295,78 +295,78 @@ return getUnresolvedDomainElementProxyText(view); } switch (Bpmn2VisualIDRegistry.getVisualID(view)) { - case EndEventEditPart.VISUAL_ID: - return getEndEvent_2004Text(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 EndEvent5EditPart.VISUAL_ID: - return getEndEvent_3009Text(view); + case ExclusiveGatewayEditPart.VISUAL_ID: + return getExclusiveGateway_2005Text(view); + case IntermediateCatchEventEditPart.VISUAL_ID: + return getIntermediateCatchEvent_2010Text(view); case SubProcessEditPart.VISUAL_ID: return getSubProcess_2016Text(view); - case SubProcess2EditPart.VISUAL_ID: - return getSubProcess_3001Text(view); - case ServiceTask2EditPart.VISUAL_ID: - return getServiceTask_3004Text(view); - case UserTask2EditPart.VISUAL_ID: - return getUserTask_3002Text(view); - case DataObjectEditPart.VISUAL_ID: - return getDataObject_2014Text(view); - case ProcessEditPart.VISUAL_ID: - return getProcess_1000Text(view); - case IntermediateCatchEvent3EditPart.VISUAL_ID: - return getIntermediateCatchEvent_2013Text(view); - case TextAnnotation2EditPart.VISUAL_ID: - return getTextAnnotation_3015Text(view); - case DataObject2EditPart.VISUAL_ID: - return getDataObject_3014Text(view); - case SequenceFlowEditPart.VISUAL_ID: - return getSequenceFlow_4001Text(view); case AssociationEditPart.VISUAL_ID: return getAssociation_4002Text(view); - case StartEventEditPart.VISUAL_ID: - return getStartEvent_2003Text(view); case EndEvent4EditPart.VISUAL_ID: return getEndEvent_3006Text(view); - case ExclusiveGatewayEditPart.VISUAL_ID: - return getExclusiveGateway_2005Text(view); - case TextAnnotationEditPart.VISUAL_ID: - return getTextAnnotation_2015Text(view); - case EndEvent6EditPart.VISUAL_ID: - return getEndEvent_3010Text(view); case IntermediateCatchEvent2EditPart.VISUAL_ID: return getIntermediateCatchEvent_2012Text(view); - case EndEvent2EditPart.VISUAL_ID: - return getEndEvent_2008Text(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 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 EndEvent6EditPart.VISUAL_ID: + return getEndEvent_3010Text(view); + case EndEventEditPart.VISUAL_ID: + return getEndEvent_2004Text(view); + case UserTask2EditPart.VISUAL_ID: + return getUserTask_3002Text(view); + case TextAnnotationEditPart.VISUAL_ID: + return getTextAnnotation_2015Text(view); case EndEvent3EditPart.VISUAL_ID: return getEndEvent_2009Text(view); - case StartEvent4EditPart.VISUAL_ID: - return getStartEvent_3005Text(view); - case IntermediateCatchEventEditPart.VISUAL_ID: - return getIntermediateCatchEvent_2010Text(view); - case IntermediateCatchEvent5EditPart.VISUAL_ID: - return getIntermediateCatchEvent_3013Text(view); - case IntermediateThrowEvent2EditPart.VISUAL_ID: - return getIntermediateThrowEvent_3012Text(view); + case StartEvent2EditPart.VISUAL_ID: + return getStartEvent_2007Text(view); + case ProcessEditPart.VISUAL_ID: + return getProcess_1000Text(view); case ScriptTaskEditPart.VISUAL_ID: return getScriptTask_2017Text(view); - case StartEvent2EditPart.VISUAL_ID: - return getStartEvent_2007Text(view); - case StartEvent3EditPart.VISUAL_ID: - return getStartEvent_3003Text(view); - case ExclusiveGateway2EditPart.VISUAL_ID: - return getExclusiveGateway_3007Text(view); + case DataObjectEditPart.VISUAL_ID: + return getDataObject_2014Text(view); + case SubProcess2EditPart.VISUAL_ID: + return getSubProcess_3001Text(view); + case SequenceFlowEditPart.VISUAL_ID: + return getSequenceFlow_4001Text(view); case ServiceTaskEditPart.VISUAL_ID: return getServiceTask_2002Text(view); - case ParallelGateway2EditPart.VISUAL_ID: - return getParallelGateway_3008Text(view); + case DataObject2EditPart.VISUAL_ID: + return getDataObject_3014Text(view); + case ServiceTask2EditPart.VISUAL_ID: + return getServiceTask_3004Text(view); + case EndEvent5EditPart.VISUAL_ID: + return getEndEvent_3009Text(view); } return getUnknownElementText(view); } 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 2010-11-22 16:07:35 UTC (rev 26820) +++ trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/part/Bpmn2DiagramEditorUtil.java 2010-11-22 16:08:50 UTC (rev 26821) @@ -46,6 +46,7 @@ import org.eclipse.emf.workspace.util.WorkspaceSynchronizer; import org.eclipse.gef.EditPart; import org.eclipse.gmf.runtime.common.core.command.CommandResult; +import org.eclipse.gmf.runtime.diagram.core.services.ViewService; import org.eclipse.gmf.runtime.diagram.ui.editparts.DiagramEditPart; import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart; import org.eclipse.gmf.runtime.diagram.ui.editparts.IPrimaryEditPart; @@ -54,6 +55,7 @@ import org.eclipse.gmf.runtime.emf.commands.core.command.AbstractTransactionalCommand; import org.eclipse.gmf.runtime.emf.core.GMFEditingDomainFactory; import org.eclipse.gmf.runtime.emf.core.util.EMFCoreUtil; +import org.eclipse.gmf.runtime.notation.Diagram; import org.eclipse.gmf.runtime.notation.View; import org.eclipse.jface.dialogs.IDialogSettings; import org.eclipse.jface.wizard.Wizard; @@ -63,6 +65,7 @@ import org.eclipse.ui.PartInitException; import org.eclipse.ui.PlatformUI; import org.eclipse.ui.part.FileEditorInput; +import org.jboss.tools.bpmn2.process.diagram.edit.parts.ProcessEditPart; /** * @generated @@ -174,11 +177,11 @@ Messages.Bpmn2DiagramEditorUtil_CreateDiagramProgressTask, 3); final Resource diagramResource = editingDomain.getResourceSet() .createResource(diagramURI); -// ((XMLResource) diagramResource).getDefaultSaveOptions().put( -// XMLResource.OPTION_EXTENDED_META_DATA, Boolean.TRUE); -// ((XMLResource) diagramResource).getDefaultLoadOptions().put( -// XMLResource.OPTION_EXTENDED_META_DATA, Boolean.TRUE); -// final String diagramName = diagramURI.lastSegment(); + // ((XMLResource) diagramResource).getDefaultSaveOptions().put( + // XMLResource.OPTION_EXTENDED_META_DATA, Boolean.TRUE); + // ((XMLResource) diagramResource).getDefaultLoadOptions().put( + // XMLResource.OPTION_EXTENDED_META_DATA, Boolean.TRUE); + // final String diagramName = diagramURI.lastSegment(); AbstractTransactionalCommand command = new AbstractTransactionalCommand( editingDomain, Messages.Bpmn2DiagramEditorUtil_CreateDiagramCommandLabel, @@ -191,29 +194,29 @@ EStructuralFeature definitionsFeature = Bpmn2Package.Literals.DOCUMENT_ROOT__DEFINITIONS; Definitions definitionsObject = (Definitions) model .eGet(definitionsFeature); -// List<RootElement> rootElements = definitionsObject -// .getRootElements(); -// RootElement rootElement = rootElements.get(0); + // List<RootElement> rootElements = definitionsObject + // .getRootElements(); + // RootElement rootElement = rootElements.get(0); BPMNDiagram diagram = definitionsObject.getDiagrams().get(0); -// DiagramElement element = diagram.getPlane().getPlaneElement().get(0); -// if (rootElement instanceof Process) { -// ((Process)rootElement).setName(diagramName); -// } -// Diagram diagram = ViewService.createDiagram(rootElement, -// ProcessEditPart.MODEL_ID, -// Bpmn2DiagramEditorPlugin.DIAGRAM_PREFERENCES_HINT); -// if (diagram != null) { -// diagramResource.getContents().add(diagram); -// diagram.setName(diagramName); -// diagram.setElement(rootElement); -// } + // DiagramElement element = diagram.getPlane().getPlaneElement().get(0); + // if (rootElement instanceof Process) { + // ((Process)rootElement).setName(diagramName); + // } + // Diagram diagram = ViewService.createDiagram(rootElement, + // ProcessEditPart.MODEL_ID, + // Bpmn2DiagramEditorPlugin.DIAGRAM_PREFERENCES_HINT); + // if (diagram != null) { + // diagramResource.getContents().add(diagram); + // diagram.setName(diagramName); + // diagram.setElement(rootElement); + // } try { diagramResource .save(org.jboss.tools.bpmn2.process.diagram.part.Bpmn2DiagramEditorUtil .getSaveOptions()); -// diagram.getPlane().getPlaneElement().remove(element); + // diagram.getPlane().getPlaneElement().remove(element); diagram.getPlane().getPlaneElement().clear(); diagramResource .save(org.jboss.tools.bpmn2.process.diagram.part.Bpmn2DiagramEditorUtil Modified: trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/part/Bpmn2UriEditorInputTester.java =================================================================== --- trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/part/Bpmn2UriEditorInputTester.java 2010-11-22 16:07:35 UTC (rev 26820) +++ trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/part/Bpmn2UriEditorInputTester.java 2010-11-22 16:08:50 UTC (rev 26821) @@ -17,7 +17,7 @@ return false; } URIEditorInput editorInput = (URIEditorInput) receiver; - return "bpmn2".equals(editorInput.getURI().fileExtension()); //$NON-NLS-1$ + return "jbpmn".equals(editorInput.getURI().fileExtension()); //$NON-NLS-1$ } } 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 2010-11-22 16:07:35 UTC (rev 26820) +++ trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/part/Bpmn2VisualIDRegistry.java 2010-11-22 16:08:50 UTC (rev 26821) @@ -405,8 +405,9 @@ } return -1; } - - public static int getLabelVisualId(EObject containerElement, EObject domainElement) { + + public static int getLabelVisualId(EObject containerElement, + EObject domainElement) { if (containerElement instanceof Process) { if (domainElement instanceof UserTask) { return UserTaskNameEditPart.VISUAL_ID; 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 2010-11-22 16:07:35 UTC (rev 26820) +++ trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/providers/Bpmn2ViewProvider.java 2010-11-22 16:08:50 UTC (rev 26821) @@ -439,12 +439,10 @@ } /** - * @generated not + * @generated */ public Node createUserTask_2001(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) { -// Shape node = NotationFactory.eINSTANCE.createShape(); -// node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds()); Shape node = BpmnNotationFactory.INSTANCE.createShape(); node.setLayoutConstraint(BpmnNotationFactory.INSTANCE.createBounds()); node.setType(Bpmn2VisualIDRegistry.getType(UserTaskEditPart.VISUAL_ID)); @@ -485,13 +483,11 @@ } /** - * @generated not + * @generated */ public Node createServiceTask_2002(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) { -// Shape node = NotationFactory.eINSTANCE.createShape(); -// node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds()); Shape node = BpmnNotationFactory.INSTANCE.createShape(); node.setLayoutConstraint(BpmnNotationFactory.INSTANCE.createBounds()); node.setType(Bpmn2VisualIDRegistry @@ -534,13 +530,11 @@ } /** - * @generated not + * @generated */ public Node createStartEvent_2003(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) { -// Shape node = NotationFactory.eINSTANCE.createShape(); -// node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds()); Shape node = BpmnNotationFactory.INSTANCE.createShape(); node.setLayoutConstraint(BpmnNotationFactory.INSTANCE.createBounds()); node.setType(Bpmn2VisualIDRegistry @@ -580,13 +574,11 @@ } /** - * @generated not + * @generated */ public Node createStartEvent_2007(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) { -// Shape node = NotationFactory.eINSTANCE.createShape(); -// node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds()); Shape node = BpmnNotationFactory.INSTANCE.createShape(); node.setLayoutConstraint(BpmnNotationFactory.INSTANCE.createBounds()); node.setType(Bpmn2VisualIDRegistry @@ -626,12 +618,10 @@ } /** - * @generated not + * @generated */ public Node createEndEvent_2004(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) { -// Shape node = NotationFactory.eINSTANCE.createShape(); -// node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds()); Shape node = BpmnNotationFactory.INSTANCE.createShape(); node.setLayoutConstraint(BpmnNotationFactory.INSTANCE.createBounds()); node.setType(Bpmn2VisualIDRegistry.getType(EndEventEditPart.VISUAL_ID)); @@ -670,13 +660,11 @@ } /** - * @generated not + * @generated */ public Node createExclusiveGateway_2005(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) { -// Shape node = NotationFactory.eINSTANCE.createShape(); -// node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds()); Shape node = BpmnNotationFactory.INSTANCE.createShape(); node.setLayoutConstraint(BpmnNotationFactory.INSTANCE.createBounds()); node.setType(Bpmn2VisualIDRegistry @@ -716,13 +704,11 @@ } /** - * @generated not + * @generated */ public Node createParallelGateway_2006(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) { -// Shape node = NotationFactory.eINSTANCE.createShape(); -// node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds()); Shape node = BpmnNotationFactory.INSTANCE.createShape(); node.setLayoutConstraint(BpmnNotationFactory.INSTANCE.createBounds()); node.setType(Bpmn2VisualIDRegistry @@ -762,12 +748,10 @@ } /** - * @generated not + * @generated */ public Node createEndEvent_2008(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) { -// Shape node = NotationFactory.eINSTANCE.createShape(); -// node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds()); Shape node = BpmnNotationFactory.INSTANCE.createShape(); node.setLayoutConstraint(BpmnNotationFactory.INSTANCE.createBounds()); node.setType(Bpmn2VisualIDRegistry.getType(EndEvent2EditPart.VISUAL_ID)); @@ -806,12 +790,10 @@ } /** - * @generated not + * @generated */ public Node createEndEvent_2009(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) { -// Shape node = NotationFactory.eINSTANCE.createShape(); -// node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds()); Shape node = BpmnNotationFactory.INSTANCE.createShape(); node.setLayoutConstraint(BpmnNotationFactory.INSTANCE.createBounds()); node.setType(Bpmn2VisualIDRegistry.getType(EndEvent3EditPart.VISUAL_ID)); @@ -850,13 +832,11 @@ } /** - * @generated not + * @generated */ public Node createIntermediateCatchEvent_2010(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) { -// Shape node = NotationFactory.eINSTANCE.createShape(); -// node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds()); Shape node = BpmnNotationFactory.INSTANCE.createShape(); node.setLayoutConstraint(BpmnNotationFactory.INSTANCE.createBounds()); node.setType(Bpmn2VisualIDRegistry @@ -896,13 +876,11 @@ } /** - * @generated not + * @generated */ public Node createIntermediateThrowEvent_2011(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) { -// Shape node = NotationFactory.eINSTANCE.createShape(); -// node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds()); Shape node = BpmnNotationFactory.INSTANCE.createShape(); node.setLayoutConstraint(BpmnNotationFactory.INSTANCE.createBounds()); node.setType(Bpmn2VisualIDRegistry @@ -942,13 +920,11 @@ } /** - * @generated not + * @generated */ public Node createIntermediateCatchEvent_2012(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) { -// Shape node = NotationFactory.eINSTANCE.createShape(); -// node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds()); Shape node = BpmnNotationFactory.INSTANCE.createShape(); node.setLayoutConstraint(BpmnNotationFactory.INSTANCE.createBounds()); node.setType(Bpmn2VisualIDRegistry @@ -988,13 +964,11 @@ } /** - * @generated not + * @generated */ public Node createIntermediateCatchEvent_2013(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) { -// Shape node = NotationFactory.eINSTANCE.createShape(); -// node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds()); Shape node = BpmnNotationFactory.INSTANCE.createShape(); node.setLayoutConstraint(BpmnNotationFactory.INSTANCE.createBounds()); node.setType(Bpmn2VisualIDRegistry @@ -1034,13 +1008,11 @@ } /** - * @generated not + * @generated */ public Node createDataObject_2014(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) { -// Shape node = NotationFactory.eINSTANCE.createShape(); -// node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds()); Shape node = BpmnNotationFactory.INSTANCE.createShape(); node.setLayoutConstraint(BpmnNotationFactory.INSTANCE.createBounds()); node.setType(Bpmn2VisualIDRegistry @@ -1078,9 +1050,8 @@ FigureUtilities.RGBToInteger(fillRGB)); Node label5003 = createLabel(node, Bpmn2VisualIDRegistry.getType(DataObjectNameEditPart.VISUAL_ID)); -// label5003.setLayoutConstraint(NotationFactory.eINSTANCE -// .createLocation()); - label5003.setLayoutConstraint(BpmnNotationFactory.INSTANCE.createBounds()); + label5003.setLayoutConstraint(NotationFactory.eINSTANCE + .createLocation()); Location location5003 = (Location) label5003.getLayoutConstraint(); location5003.setX(0); location5003.setY(5); @@ -1088,13 +1059,11 @@ } /** - * @generated not + * @generated */ public Node createTextAnnotation_2015(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) { -// Shape node = NotationFactory.eINSTANCE.createShape(); -// node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds()); Shape node = BpmnNotationFactory.INSTANCE.createShape(); node.setLayoutConstraint(BpmnNotationFactory.INSTANCE.createBounds()); node.setType(Bpmn2VisualIDRegistry @@ -1137,13 +1106,11 @@ } /** - * @generated not + * @generated */ public Node createSubProcess_2016(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) { -// Shape node = NotationFactory.eINSTANCE.createShape(); -// node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds()); Shape node = BpmnNotationFactory.INSTANCE.createShape(); node.setLayoutConstraint(BpmnNotationFactory.INSTANCE.createBounds()); node.setType(Bpmn2VisualIDRegistry @@ -1183,13 +1150,11 @@ } /** - * @generated not + * @generated */ public Node createScriptTask_2017(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) { -// Shape node = NotationFactory.eINSTANCE.createShape(); -// node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds()); Shape node = BpmnNotationFactory.INSTANCE.createShape(); node.setLayoutConstraint(BpmnNotationFactory.INSTANCE.createBounds()); node.setType(Bpmn2VisualIDRegistry @@ -1231,13 +1196,11 @@ } /** - * @generated not + * @generated */ public Node createSubProcess_3001(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) { -// Shape node = NotationFactory.eINSTANCE.createShape(); -// node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds()); Shape node = BpmnNotationFactory.INSTANCE.createShape(); node.setLayoutConstraint(BpmnNotationFactory.INSTANCE.createBounds()); node.setType(Bpmn2VisualIDRegistry @@ -1276,12 +1239,10 @@ } /** - * @generated not + * @generated */ public Node createUserTask_3002(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) { -// Shape node = NotationFactory.eINSTANCE.createShape(); -// node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds()); Shape node = BpmnNotationFactory.INSTANCE.createShape(); node.setLayoutConstraint(BpmnNotationFactory.INSTANCE.createBounds()); node.setType(Bpmn2VisualIDRegistry.getType(UserTask2EditPart.VISUAL_ID)); @@ -1321,13 +1282,11 @@ } /** - * @generated not + * @generated */ public Node createServiceTask_3004(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) { -// Shape node = NotationFactory.eINSTANCE.createShape(); -// node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds()); Shape node = BpmnNotationFactory.INSTANCE.createShape(); node.setLayoutConstraint(BpmnNotationFactory.INSTANCE.createBounds()); node.setType(Bpmn2VisualIDRegistry @@ -1369,13 +1328,11 @@ } /** - * @generated not + * @generated */ public Node createStartEvent_3003(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) { -// Shape node = NotationFactory.eINSTANCE.createShape(); -// node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds()); Shape node = BpmnNotationFactory.INSTANCE.createShape(); node.setLayoutConstraint(BpmnNotationFactory.INSTANCE.createBounds()); node.setType(Bpmn2VisualIDRegistry @@ -1414,13 +1371,11 @@ } /** - * @generated not + * @generated */ public Node createStartEvent_3005(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) { -// Shape node = NotationFactory.eINSTANCE.createShape(); -// node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds()); Shape node = BpmnNotationFactory.INSTANCE.createShape(); node.setLayoutConstraint(BpmnNotationFactory.INSTANCE.createBounds()); node.setType(Bpmn2VisualIDRegistry @@ -1459,12 +1414,10 @@ } /** - * @generated not + * @generated */ public Node createEndEvent_3006(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) { -// Shape node = NotationFactory.eINSTANCE.createShape(); -// node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds()); Shape node = BpmnNotationFactory.INSTANCE.createShape(); node.setLayoutConstraint(BpmnNotationFactory.INSTANCE.createBounds()); node.setType(Bpmn2VisualIDRegistry.getType(EndEvent4EditPart.VISUAL_ID)); @@ -1502,13 +1455,11 @@ } /** - * @generated not + * @generated */ public Node createExclusiveGateway_3007(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) { -// Shape node = NotationFactory.eINSTANCE.createShape(); -// node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds()); Shape node = BpmnNotationFactory.INSTANCE.createShape(); node.setLayoutConstraint(BpmnNotationFactory.INSTANCE.createBounds()); node.setType(Bpmn2VisualIDRegistry @@ -1547,13 +1498,11 @@ } /** - * @generated not + * @generated */ public Node createParallelGateway_3008(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) { -// Shape node = NotationFactory.eINSTANCE.createShape(); -// node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds()); Shape node = BpmnNotationFactory.INSTANCE.createShape(); node.setLayoutConstraint(BpmnNotationFactory.INSTANCE.createBounds()); node.setType(Bpmn2VisualIDRegistry @@ -1592,12 +1541,10 @@ } /** - * @generated not + * @generated */ public Node createEndEvent_3009(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) { -// Shape node = NotationFactory.eINSTANCE.createShape(); -// node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds()); Shape node = BpmnNotationFactory.INSTANCE.createShape(); node.setLayoutConstraint(BpmnNotationFactory.INSTANCE.createBounds()); node.setType(Bpmn2VisualIDRegistry.getType(EndEvent5EditPart.VISUAL_ID)); @@ -1635,12 +1582,10 @@ } /** - * @generated not + * @generated */ public Node createEndEvent_3010(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) { -// Shape node = NotationFactory.eINSTANCE.createShape(); -// node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds()); Shape node = BpmnNotationFactory.INSTANCE.createShape(); node.setLayoutConstraint(BpmnNotationFactory.INSTANCE.createBounds()); node.setType(Bpmn2VisualIDRegistry.getType(EndEvent6EditPart.VISUAL_ID)); @@ -1678,13 +1623,11 @@ } /** - * @generated not + * @generated */ public Node createIntermediateCatchEvent_3011(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) { -// Shape node = NotationFactory.eINSTANCE.createShape(); -// node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds()); Shape node = BpmnNotationFactory.INSTANCE.createShape(); node.setLayoutConstraint(BpmnNotationFactory.INSTANCE.createBounds()); node.setType(Bpmn2VisualIDRegistry @@ -1723,13 +1666,11 @@ } /** - * @generated not + * @generated */ public Node createIntermediateThrowEvent_3012(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) { -// Shape node = NotationFactory.eINSTANCE.createShape(); -// node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds()); Shape node = BpmnNotationFactory.INSTANCE.createShape(); node.setLayoutConstraint(BpmnNotationFactory.INSTANCE.createBounds()); node.setType(Bpmn2VisualIDRegistry @@ -1768,13 +1709,11 @@ } /** - * @generated not + * @generated */ public Node createIntermediateCatchEvent_3013(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) { -// Shape node = NotationFactory.eINSTANCE.createShape(); -// node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds()); Shape node = BpmnNotationFactory.INSTANCE.createShape(); node.setLayoutConstraint(BpmnNotationFactory.INSTANCE.createBounds()); node.setType(Bpmn2VisualIDRegistry @@ -1813,13 +1752,11 @@ } /** - * @generated not + * @generated */ public Node createDataObject_3014(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) { -// Shape node = NotationFactory.eINSTANCE.createShape(); -// node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds()); Shape node = BpmnNotationFactory.INSTANCE.createShape(); node.setLayoutConstraint(BpmnNotationFactory.INSTANCE.createBounds()); node.setType(Bpmn2VisualIDRegistry @@ -1866,13 +1803,11 @@ } /** - * @generated not + * @generated */ public Node createTextAnnotation_3015(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) { -// Shape node = NotationFactory.eINSTANCE.createShape(); -// node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds()); Shape node = BpmnNotationFactory.INSTANCE.createShape(); node.setLayoutConstraint(BpmnNotationFactory.INSTANCE.createBounds()); node.setType(Bpmn2VisualIDRegistry @@ -1914,13 +1849,11 @@ } /** - * @generated not + * @generated */ public Node createScriptTask_3016(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) { -// Shape node = NotationFactory.eINSTANCE.createShape(); -// node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds()); Shape node = BpmnNotationFactory.INSTANCE.createShape(); node.setLayoutConstraint(BpmnNotationFactory.INSTANCE.createBounds()); node.setType(Bpmn2VisualIDRegistry @@ -1967,12 +1900,13 @@ public Edge createSequenceFlow_4001(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) { -// Connector edge = NotationFactory.eINSTANCE.createConnector(); + // Connector edge = NotationFactory.eINSTANCE.createConnector(); Connector edge = BpmnNotationFactory.INSTANCE.createEdge(); edge.getStyles().add(NotationFactory.eINSTANCE.createFontStyle()); -// RelativeBendpoints bendpoints = NotationFactory.eINSTANCE -// .createRelativeBendpoints(); - RelativeBendpoints bendpoints = BpmnNotationFactory.INSTANCE.createRelativeBendpoints(); + // RelativeBendpoints bendpoints = NotationFactory.eINSTANCE + // .createRelativeBendpoints(); + RelativeBendpoints bendpoints = BpmnNotationFactory.INSTANCE + .createRelativeBendpoints(); ArrayList<RelativeBendpoint> points = new ArrayList<RelativeBendpoint>( 2); points.add(new RelativeBendpoint()); @@ -2090,7 +2024,7 @@ * @generated not */ private Node createLabel(View owner, String hint) { -// DecorationNode rv = NotationFactory.eINSTANCE.createDecorationNode(); + // DecorationNode rv = NotationFactory.eINSTANCE.createDecorationNode(); DecorationNode rv = BpmnNotationFactory.INSTANCE.createLabel(); rv.setType(hint); ViewUtil.insertChildView(owner, rv, ViewUtil.APPEND, true);

15 years, 5 months

1
0
0 / 0

JBoss Tools SVN: r26820 - in trunk/bpmn/plugins/org.jboss.tools.bpmn2.model: gmf-templates and 3 other directories.

by jbosstools-commits＠lists.jboss.org

Author: koen.aers(a)jboss.com Date: 2010-11-22 11:07:35 -0500 (Mon, 22 Nov 2010) New Revision: 26820 Added: trunk/bpmn/plugins/org.jboss.tools.bpmn2.model/gmf-templates/ trunk/bpmn/plugins/org.jboss.tools.bpmn2.model/gmf-templates/xpt/ trunk/bpmn/plugins/org.jboss.tools.bpmn2.model/gmf-templates/xpt/providers/ trunk/bpmn/plugins/org.jboss.tools.bpmn2.model/gmf-templates/xpt/providers/ViewProvider.xpt Modified: trunk/bpmn/plugins/org.jboss.tools.bpmn2.model/model/bpmn.gmfgraph trunk/bpmn/plugins/org.jboss.tools.bpmn2.model/model/bpmn.process.gmfgen Log: after regeneration Added: 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 (rev 0) +++ trunk/bpmn/plugins/org.jboss.tools.bpmn2.model/gmf-templates/xpt/providers/ViewProvider.xpt 2010-11-22 16:07:35 UTC (rev 26820) @@ -0,0 +1,438 @@ +/* + * Copyright (c) 2007, 2010 Borland Software Corporation and others + * + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Alexander Shatalin (Borland) - initial API and implementation + * Artem Tikhomirov (Borland) - [257119] Create views directly, not through ViewFactories + */ + +«IMPORT 'http://www.eclipse.org/gmf/2009/GenModel'» + +«EXTENSION xpt::diagram::Utils» +«EXTENSION xpt::diagram::ViewmapAttributesUtils» +«EXTENSION xpt::diagram::editpolicies::LinkUtils» + +«DEFINE ViewProvider FOR gmfgen::GenDiagram-» +«EXPAND xpt::Common::copyright FOR getDiagram().editorGen-» +package «providersPackageName»; + +«EXPAND xpt::Common::generatedClassComment» +public class «notationViewProviderClassName»«EXPAND extendsList»«EXPAND implementsList» { + + «EXPAND xpt::Common::generatedMemberComment» + public final boolean provides(org.eclipse.gmf.runtime.common.core.service.IOperation operation) { + if (operation instanceof org.eclipse.gmf.runtime.diagram.core.services.view.CreateViewForKindOperation) { + return provides((org.eclipse.gmf.runtime.diagram.core.services.view.CreateViewForKindOperation) operation); + } + «EXPAND xpt::Common::_assert('operation instanceof org.eclipse.gmf.runtime.diagram.core.services.view.CreateViewOperation')-» + if (operation instanceof org.eclipse.gmf.runtime.diagram.core.services.view.CreateDiagramViewOperation) { + return provides((org.eclipse.gmf.runtime.diagram.core.services.view.CreateDiagramViewOperation) operation); + } else if (operation instanceof org.eclipse.gmf.runtime.diagram.core.services.view.CreateEdgeViewOperation) { + return provides((org.eclipse.gmf.runtime.diagram.core.services.view.CreateEdgeViewOperation) operation); + } else if (operation instanceof org.eclipse.gmf.runtime.diagram.core.services.view.CreateNodeViewOperation) { + return provides((org.eclipse.gmf.runtime.diagram.core.services.view.CreateNodeViewOperation) operation); + } + return false; + } + + «EXPAND xpt::Common::generatedMemberComment» + protected boolean provides(org.eclipse.gmf.runtime.diagram.core.services.view.CreateViewForKindOperation op) { +/* + if (op.getViewKind() == Node.class) + return getNodeViewClass(op.getSemanticAdapter(), op.getContainerView(), op.getSemanticHint()) != null; + if (op.getViewKind() == Edge.class) + return getEdgeViewClass(op.getSemanticAdapter(), op.getContainerView(), op.getSemanticHint()) != null; +*/ + return true; + } + + «EXPAND xpt::Common::generatedMemberComment»«REM»When diagram domain element is null only diagram kind is checked«ENDREM» + protected boolean provides(org.eclipse.gmf.runtime.diagram.core.services.view.CreateDiagramViewOperation op) { + return «EXPAND xpt::editor::VisualIDRegistry::modelID».equals(op.getSemanticHint())«IF domainDiagramElement <> null» && «EXPAND xpt::editor::VisualIDRegistry::getDiagramVisualIDMethodCall»(getSemanticElement(op.getSemanticAdapter())) != -1«ENDIF»; + } + + «EXPAND xpt::Common::generatedMemberComment» + protected boolean provides(org.eclipse.gmf.runtime.diagram.core.services.view.CreateNodeViewOperation op) { + if (op.getContainerView() == null) { + return false; + } + org.eclipse.gmf.runtime.emf.type.core.IElementType elementType = getSemanticElementType(op.getSemanticAdapter()); + org.eclipse.emf.ecore.EObject domainElement = getSemanticElement(op.getSemanticAdapter()); + int visualID; + if (op.getSemanticHint() == null) { + // Semantic hint is not specified. Can be a result of call from CanonicalEditPolicy. + // In this situation there should be NO elementType, visualID will be determined + // by VisualIDRegistry.getNodeVisualID() for domainElement. + if (elementType != null || domainElement == null) {«REM»XXX Perhaps, better to fix CanonicalEP instead of this hack?«ENDREM» + return false; + } + visualID = «EXPAND xpt::editor::VisualIDRegistry::getNodeVisualIDMethodCall»(op.getContainerView(), domainElement); + } else { + visualID = «EXPAND xpt::editor::VisualIDRegistry::getVisualIDMethodCall»(op.getSemanticHint()); + if (elementType != null) {«REM» + Semantic hint is specified together with element type. + Both parameters should describe exactly the same diagram element. + In addition we check that visualID returned by VisualIDRegistry.getNodeVisualID() for + domainElement (if specified) is the same as in element type.«ENDREM» + if (!«getElementTypesQualifiedClassName()».isKnownElementType(elementType) || (!(elementType instanceof org.eclipse.gmf.runtime.emf.type.core.IHintedType))) { + return false; // foreign element type + } + String elementTypeHint = ((org.eclipse.gmf.runtime.emf.type.core.IHintedType) elementType).getSemanticHint(); + if (!op.getSemanticHint().equals(elementTypeHint)) { + return false; // if semantic hint is specified it should be the same as in element type + } + if (domainElement != null && visualID != «EXPAND xpt::editor::VisualIDRegistry::getNodeVisualIDMethodCall»(op.getContainerView(), domainElement)) { + return false; // visual id for node EClass should match visual id from element type + } + } else {«REM» + Element type is not specified. Domain element should be present (except pure design elements). + This method is called with EObjectAdapter as parameter from: + - ViewService.createNode(View container, EObject eObject, String type, PreferencesHint preferencesHint) + - generated ViewFactory.decorateView() for parent element«ENDREM» +«IF getAllTypedElements()->select(e | e.elementType <> null)->size() > 0-» + if (!«EXPAND xpt::editor::VisualIDRegistry::modelID».equals(«EXPAND xpt::editor::VisualIDRegistry::getModelIDMethodCall»(op.getContainerView()))) { + return false; // foreign diagram + } + switch (visualID) { + «IF getAllNodes().elementType[gmfgen::NotationType]->size() > 0-» + «EXPAND caseVisualID FOREACH getAllNodes().elementType[gmfgen::NotationType]-» + break; // pure design element + «ENDIF-» + «IF getAllNodes().elementType[gmfgen::MetamodelType]->size() > 0 or getAllNodes().elementType[gmfgen::SpecializationType]->size() > 0-» + «EXPAND caseVisualID FOREACH getAllNodes().elementType[gmfgen::MetamodelType]-» + «EXPAND caseVisualID FOREACH getAllNodes().elementType[gmfgen::SpecializationType]-» + if (domainElement == null || visualID != «EXPAND xpt::editor::VisualIDRegistry::getNodeVisualIDMethodCall»(op.getContainerView(), domainElement)) { + return false; // visual id in semantic hint should match visual id for domain element + } + break;«REM»FIXME: Perhaps, can return true or false right away, without any further check?«ENDREM» + «ENDIF-» + default: + return false; + } +«ELSE-» + return false; +«ENDIF-» + } + } + return «FOREACH getAllNodes() AS n SEPARATOR '||'»«EXPAND xpt::editor::VisualIDRegistry::visualID FOR n» == visualID«ENDFOREACH»; + } + + «EXPAND xpt::Common::generatedMemberComment»«REM»XXX: unlike createNode, we don't check op.containerView() for null here. On purpose?«ENDREM» + protected boolean provides(org.eclipse.gmf.runtime.diagram.core.services.view.CreateEdgeViewOperation op) { + org.eclipse.gmf.runtime.emf.type.core.IElementType elementType = getSemanticElementType(op.getSemanticAdapter()); + if (!«getElementTypesQualifiedClassName()».isKnownElementType(elementType) || (!(elementType instanceof org.eclipse.gmf.runtime.emf.type.core.IHintedType))) { + return false; // foreign element type + } + String elementTypeHint = ((org.eclipse.gmf.runtime.emf.type.core.IHintedType) elementType).getSemanticHint(); + if (elementTypeHint == null || (op.getSemanticHint() != null && !elementTypeHint.equals(op.getSemanticHint()))) { + return false; // our hint is visual id and must be specified, and it should be the same as in element type + } + int visualID = «EXPAND xpt::editor::VisualIDRegistry::getVisualIDMethodCall»(elementTypeHint); + org.eclipse.emf.ecore.EObject domainElement = getSemanticElement(op.getSemanticAdapter()); + if (domainElement != null && visualID != «EXPAND xpt::editor::VisualIDRegistry::getLinkWithClassVisualIDMethodCall»(domainElement)) { + return false; // visual id for link EClass should match visual id from element type + } + return true; «REM»Does it make sense to check visualID here, like we did for nodes?«ENDREM» + } + + «EXPAND xpt::Common::generatedMemberComment» + public org.eclipse.gmf.runtime.notation.Diagram createDiagram(org.eclipse.core.runtime.IAdaptable semanticAdapter, String diagramKind, org.eclipse.gmf.runtime.diagram.core.preferences.PreferencesHint preferencesHint) { + org.eclipse.gmf.runtime.notation.Diagram diagram = org.eclipse.gmf.runtime.notation.NotationFactory.eINSTANCE.createDiagram();«REM»FIXME instantiate diagramRunTimeClass instead«ENDREM» + diagram.getStyles().add(org.eclipse.gmf.runtime.notation.NotationFactory.eINSTANCE.createDiagramStyle()); + «EXPAND xpt::diagram::views::Utils::addCustomStyles('diagram.getStyles()')-» + diagram.setType(«EXPAND xpt::editor::VisualIDRegistry::modelID»); + diagram.setElement(«IF domainDiagramElement <> null»getSemanticElement(semanticAdapter)«ELSE»null«ENDIF»); +«IF units <> null-» + diagram.setMeasurementUnit(org.eclipse.gmf.runtime.notation.MeasurementUnit.«units.toUpper()»_LITERAL); +«ENDIF-» +«IF styles->notEmpty()-» + // initializeFromPreferences + org.eclipse.jface.preferences.IPreferenceStore store = (org.eclipse.jface.preferences.IPreferenceStore) preferencesHint.getPreferenceStore(); + «EXPAND initializeStyles('diagram', 'store', false, false, false)-» +«ENDIF-» + return diagram; + } + + «EXPAND xpt::Common::generatedMemberComment» + public org.eclipse.gmf.runtime.notation.Node createNode(org.eclipse.core.runtime.IAdaptable semanticAdapter, org.eclipse.gmf.runtime.notation.View containerView, String semanticHint, int index, boolean persisted, org.eclipse.gmf.runtime.diagram.core.preferences.PreferencesHint preferencesHint) { + final org.eclipse.emf.ecore.EObject domainElement = getSemanticElement(semanticAdapter); + final int visualID; + if (semanticHint == null) { + visualID = «EXPAND xpt::editor::VisualIDRegistry::getNodeVisualIDMethodCall»(containerView, domainElement); + } else { + visualID = «EXPAND xpt::editor::VisualIDRegistry::getVisualIDMethodCall»(semanticHint); + } + switch(visualID) { + «FOREACH getAllNodes() AS n-» + «EXPAND xpt::Common::caseVisualID FOR n» return create«n.getUniqueIdentifier()»(domainElement, containerView, index, persisted, preferencesHint); + «ENDFOREACH-» + } + // can't happen, provided #provides(CreateNodeViewOperation) is correct + return null; + } + + «EXPAND xpt::Common::generatedMemberComment» + public org.eclipse.gmf.runtime.notation.Edge createEdge(org.eclipse.core.runtime.IAdaptable semanticAdapter, org.eclipse.gmf.runtime.notation.View containerView, String semanticHint, int index, boolean persisted, org.eclipse.gmf.runtime.diagram.core.preferences.PreferencesHint preferencesHint) { + org.eclipse.gmf.runtime.emf.type.core.IElementType elementType = getSemanticElementType(semanticAdapter); + String elementTypeHint = ((org.eclipse.gmf.runtime.emf.type.core.IHintedType) elementType).getSemanticHint(); + switch («EXPAND xpt::editor::VisualIDRegistry::getVisualIDMethodCall»(elementTypeHint)) { + «FOREACH links AS link-» + «EXPAND xpt::Common::caseVisualID FOR link» return create«link.getUniqueIdentifier()»(«IF link.isTypeLink()» getSemanticElement(semanticAdapter), «ENDIF»containerView, index, persisted, preferencesHint); + «ENDFOREACH-» + } + // can never happen, provided #provides(CreateEdgeViewOperation) is correct + return null; + } + +«EXPAND createNodeMethod FOREACH getAllNodes()» +«EXPAND createEdgeMethod FOREACH links» + +«IF topLevelNodes->notEmpty()» + «EXPAND xpt::Common::generatedMemberComment» + private void stampShortcut(org.eclipse.gmf.runtime.notation.View containerView, org.eclipse.gmf.runtime.notation.Node target) { + if (!«EXPAND xpt::editor::VisualIDRegistry::modelID».equals(«EXPAND xpt::editor::VisualIDRegistry::getModelIDMethodCall»(containerView))) { + «EXPAND xpt::Common::addShortcutAnnotation('target')-» + } + } +«ENDIF-» + +«IF links.labels->notEmpty() or topLevelNodes.labels->notEmpty() or childNodes.labels->notEmpty()» + «EXPAND xpt::Common::generatedMemberComment» + private org.eclipse.gmf.runtime.notation.Node createLabel(org.eclipse.gmf.runtime.notation.View owner, String hint) { + org.eclipse.gmf.runtime.notation.DecorationNode rv = org.eclipse.gmf.runtime.notation.NotationFactory.eINSTANCE.createDecorationNode(); + rv.setType(hint); + org.eclipse.gmf.runtime.diagram.core.util.ViewUtil.insertChildView(owner, rv, org.eclipse.gmf.runtime.diagram.core.util.ViewUtil.APPEND, true); + return rv; + } +«ENDIF-» + +«IF getAllNodes().compartments->notEmpty()» + «EXPAND xpt::Common::generatedMemberComment» + private org.eclipse.gmf.runtime.notation.Node createCompartment(org.eclipse.gmf.runtime.notation.View owner, String hint, boolean canCollapse, boolean hasTitle, boolean canSort, boolean canFilter) { + //SemanticListCompartment rv = NotationFactory.eINSTANCE.createSemanticListCompartment(); + //rv.setShowTitle(showTitle); + //rv.setCollapsed(isCollapsed); + org.eclipse.gmf.runtime.notation.Node rv; + if (canCollapse) { + rv = org.eclipse.gmf.runtime.notation.NotationFactory.eINSTANCE.createBasicCompartment(); + } else { + rv = org.eclipse.gmf.runtime.notation.NotationFactory.eINSTANCE.createDecorationNode(); + } + if (hasTitle) { + org.eclipse.gmf.runtime.notation.TitleStyle ts = org.eclipse.gmf.runtime.notation.NotationFactory.eINSTANCE.createTitleStyle(); + ts.setShowTitle(true); + rv.getStyles().add(ts); + } + if (canSort) { + rv.getStyles().add(org.eclipse.gmf.runtime.notation.NotationFactory.eINSTANCE.createSortingStyle()); + } + if (canFilter) { + rv.getStyles().add(org.eclipse.gmf.runtime.notation.NotationFactory.eINSTANCE.createFilteringStyle()); + } + rv.setType(hint); + org.eclipse.gmf.runtime.diagram.core.util.ViewUtil.insertChildView(owner, rv, org.eclipse.gmf.runtime.diagram.core.util.ViewUtil.APPEND, true); + return rv; + } +«ENDIF-» + «EXPAND getSemanticElementMethod» + «EXPAND getSemanticElementTypeMethod-» + «EXPAND additions-» +} +«ENDDEFINE» + +«DEFINE createNodeMethod FOR gmfgen::GenNode-» + «EXPAND xpt::Common::generatedMemberComment» + public org.eclipse.gmf.runtime.notation.Node create«getUniqueIdentifier()»(org.eclipse.emf.ecore.EObject domainElement, org.eclipse.gmf.runtime.notation.View containerView, int index, boolean persisted, org.eclipse.gmf.runtime.diagram.core.preferences.PreferencesHint preferencesHint) { +«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(); + 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-» + «EXPAND xpt::diagram::views::Utils::addLinkedDiagramStyle('node.getStyles()')-» + «EXPAND xpt::diagram::views::Utils::addCustomStyles('node.getStyles()')-» + node.setLayoutConstraint(org.jboss.tools.bpmn2.gmf.notation.BpmnNotationFactory.INSTANCE.createBounds()); + node.setType(«EXPAND xpt::editor::VisualIDRegistry::typeMethodCall»); + org.eclipse.gmf.runtime.diagram.core.util.ViewUtil.insertChildView(containerView, node, index, persisted); + node.setElement(domainElement); +«IF self.oclIsTypeOf(gmfgen::GenTopLevelNode)-» + stampShortcut(containerView, node); +«ENDIF-» + // initializeFromPreferences «REM»XXX Perhaps, do init only once, for complete figure?«ENDREM» + final org.eclipse.jface.preference.IPreferenceStore prefStore = (org.eclipse.jface.preference.IPreferenceStore) preferencesHint.getPreferenceStore(); + «EXPAND initializeStyles('node', 'prefStore', not viewmap.isFixedForeground(), not viewmap.isFixedBackground(), not viewmap.isFixedFont())-» + «EXPAND initLabel('node', 'prefStore') FOREACH labels-» + «EXPAND initCompartment('node', 'prefStore') FOREACH compartments-» + return node; + } +«ENDDEFINE» + +// Location as layoutConstraint, no children +«DEFINE createNodeMethod FOR gmfgen::GenChildLabelNode-» + «EXPAND xpt::Common::generatedMemberComment» + public org.eclipse.gmf.runtime.notation.Node create«getUniqueIdentifier()»(org.eclipse.emf.ecore.EObject domainElement, org.eclipse.gmf.runtime.notation.View containerView, int index, boolean persisted, org.eclipse.gmf.runtime.diagram.core.preferences.PreferencesHint preferencesHint) { + org.eclipse.gmf.runtime.notation.Node node = org.eclipse.gmf.runtime.notation.NotationFactory.eINSTANCE.createNode(); + node.setLayoutConstraint(org.eclipse.gmf.runtime.notation.NotationFactory.eINSTANCE.createLocation());«REM»[artem] XXX not sure, why LabelNode needs location«ENDREM» + «EXPAND xpt::diagram::views::Utils::addLinkedDiagramStyle('node.getStyles()')-» + «EXPAND xpt::diagram::views::Utils::addCustomStyles('node.getStyles()')-» + node.setType(«EXPAND xpt::editor::VisualIDRegistry::typeMethodCall»); + org.eclipse.gmf.runtime.diagram.core.util.ViewUtil.insertChildView(containerView, node, index, persisted); + node.setElement(domainElement); +«IF styles->notEmpty()-» + final org.eclipse.jface.preference.IPreferenceStore prefStore = (org.eclipse.jface.preference.IPreferenceStore) preferencesHint.getPreferenceStore(); + «EXPAND initializeStyles('node', 'prefStore', false, false, false)-» +«ENDIF-» + return node; + } +«ENDDEFINE» + +// looks for Font/Line/Fill styles in customStyles and initializes, if any (may be forced with boolean params) +// params has*Style are to force respective style initialization (when callee knows certain style was added) +«DEFINE initializeStyles(String viewVar, String prefStoreVar, Boolean hasLineStyle, Boolean hasFillStyle, Boolean hasFontStyle) FOR gmfgen::GenCommonBase-» +«IF hasLineStyle or self.hasLineStyleInCustom()-» + «REM»FIXME ColorAttributes is deprecated, should remove and clean the second branch of the disjunction«ENDREM» + «IF viewmap.isFixedForeground() or viewmap.attributes[gmfgen::ColorAttributes]->notEmpty()-» + «EXPAND xpt::diagram::views::Utils::foregroundColour(viewVar) FOR viewmap-» + «ELSE-» + «EXPAND initForegroundFromPrefs(viewVar, prefStoreVar)-» + «ENDIF-» +«ENDIF-» +«IF (hasFontStyle or self.hasFontStyleInCustom()) and not viewmap.isFixedFont()-» + «EXPAND initFontFromPrefs(viewVar, prefStoreVar)-» +«ENDIF-» +«IF hasFillStyle or self.hasFillStyleInCustom()-» + «IF viewmap.isFixedBackground() or viewmap.attributes[gmfgen::ColorAttributes]->notEmpty()-» + «EXPAND xpt::diagram::views::Utils::backgroundColour(viewVar) FOR viewmap-» + «ELSE-» + «EXPAND initBackgroundFromPrefs(viewVar, prefStoreVar)-» + «ENDIF-» +«ENDIF-» +«ENDDEFINE» + +// FIXME check if there's need for a variable name, see initCompartment for a hint +«DEFINE initLabel(String nodeVar, String prefStoreVar) FOR gmfgen::GenLabel-» +«LET 'label' + self.visualID.repr() AS labelVar-» + org.eclipse.gmf.runtime.notation.Node «labelVar» = createLabel(«nodeVar», «EXPAND xpt::editor::VisualIDRegistry::typeMethodCall»); + «EXPAND xpt::diagram::views::Utils::addTextStyle(labelVar + '.getStyles()') FOR modelFacet-» + «EXPAND xpt::diagram::views::Utils::addCustomStyles(labelVar + '.getStyles()')-» +«IF self.oclIsKindOf(gmfgen::GenExternalNodeLabel) or self.oclIsKindOf(gmfgen::GenLinkLabel)-» + «labelVar».setLayoutConstraint(org.eclipse.gmf.runtime.notation.NotationFactory.eINSTANCE.createLocation()); + «EXPAND xpt::diagram::views::Utils::offset(labelVar)-» +«ENDIF-» + «EXPAND initializeStyles(labelVar, prefStoreVar, false, false, false)-» +«ENDLET-» +«ENDDEFINE» + +«DEFINE initCompartment(String nodeVar, String prefStoreVar) FOR gmfgen::GenCompartment-» +«LET 'compartment' + self.visualID.repr() AS compartmentVar-» + «IF styles->notEmpty() or isStoringChildPositions(getLayoutType())»org.eclipse.gmf.runtime.notation.Node «compartmentVar» = «ENDIF»createCompartment(«nodeVar», «EXPAND xpt::editor::VisualIDRegistry::typeMethodCall», «canCollapse», «needsTitle», «listLayout», «listLayout»); + «EXPAND xpt::diagram::views::Utils::addCustomStyles(compartmentVar + '.getStyles()')-» +«IF isStoringChildPositions(getLayoutType())-» + «IF viewmap.canUseShapeStyle()-» + «compartmentVar».add(org.eclipse.gmf.runtime.notation.NotationFactory.eINSTANCE.createShapeStyle()); + «ELSE-» +«REM»Intentionally not adding Description style, as it deemed to be useless for compartments (can't avoid for ShapeStyle - benefits of a single style overwheight drawbacks of Description presence)«ENDREM» + «EXPAND xpt::diagram::views::Utils::addFontLineFillStylesConditionally(compartmentVar + '.getStyles()') FOR viewmap-» + «ENDIF-» + «compartmentVar».setLayoutConstraint(org.eclipse.gmf.runtime.notation.NotationFactory.eINSTANCE.createBounds()); + «EXPAND initializeStyles(compartmentVar, prefStoreVar, not viewmap.isFixedForeground(), not viewmap.isFixedBackground(), not viewmap.isFixedFont())-» +«ELSE-» + «EXPAND initializeStyles(compartmentVar, prefStoreVar, false, false, false)-» +«ENDIF-» +«ENDLET-» +«ENDDEFINE» + +«DEFINE initForegroundFromPrefs(String viewVar, String prefStoreVar) FOR gmfgen::GenCommonBase-» + org.eclipse.swt.graphics.RGB lineRGB = org.eclipse.jface.preference.PreferenceConverter.getColor(«prefStoreVar», org.eclipse.gmf.runtime.diagram.ui.preferences.IPreferenceConstants.PREF_LINE_COLOR); + org.eclipse.gmf.runtime.diagram.core.util.ViewUtil.setStructuralFeatureValue(«viewVar», org.eclipse.gmf.runtime.notation.NotationPackage.eINSTANCE.getLineStyle_LineColor(), org.eclipse.gmf.runtime.draw2d.ui.figures.FigureUtilities.RGBToInteger(lineRGB)); +«ENDDEFINE» + +«DEFINE initBackgroundFromPrefs(String viewVar, String prefStoreVar) FOR gmfgen::GenCommonBase-» + org.eclipse.swt.graphics.RGB fillRGB = org.eclipse.jface.preference.PreferenceConverter.getColor(«prefStoreVar», org.eclipse.gmf.runtime.diagram.ui.preferences.IPreferenceConstants.PREF_FILL_COLOR); + org.eclipse.gmf.runtime.diagram.core.util.ViewUtil.setStructuralFeatureValue(«viewVar», org.eclipse.gmf.runtime.notation.NotationPackage.eINSTANCE.getFillStyle_FillColor(), org.eclipse.gmf.runtime.draw2d.ui.figures.FigureUtilities.RGBToInteger(fillRGB)); +«ENDDEFINE» + +«DEFINE initFontFromPrefs(String viewVar, String prefStoreVar) FOR gmfgen::GenCommonBase-» + org.eclipse.gmf.runtime.notation.FontStyle «viewVar»FontStyle = (org.eclipse.gmf.runtime.notation.FontStyle) «viewVar».getStyle(org.eclipse.gmf.runtime.notation.NotationPackage.Literals.FONT_STYLE); + if («viewVar»FontStyle != null) {«REM»Given this template is invoked only when FontStyle is present, no need to check fontStyle for null, but at least this gives a scope for fontData var«ENDREM» + org.eclipse.swt.graphics.FontData fontData = org.eclipse.jface.preference.PreferenceConverter.getFontData(«prefStoreVar», org.eclipse.gmf.runtime.diagram.ui.preferences.IPreferenceConstants.PREF_DEFAULT_FONT); + «viewVar»FontStyle.setFontName(fontData.getName()); + «viewVar»FontStyle.setFontHeight(fontData.getHeight()); + «viewVar»FontStyle.setBold((fontData.getStyle() & org.eclipse.swt.SWT.BOLD) != 0); + «viewVar»FontStyle.setItalic((fontData.getStyle() & org.eclipse.swt.SWT.ITALIC) != 0); + org.eclipse.swt.graphics.RGB fontRGB = org.eclipse.jface.preference.PreferenceConverter.getColor(«prefStoreVar», org.eclipse.gmf.runtime.diagram.ui.preferences.IPreferenceConstants.PREF_FONT_COLOR); + «viewVar»FontStyle.setFontColor(org.eclipse.gmf.runtime.draw2d.ui.figures.FigureUtilities.RGBToInteger(fontRGB).intValue()); + } +«ENDDEFINE» + + +«DEFINE createEdgeMethod FOR gmfgen::GenLink-» + «EXPAND xpt::Common::generatedMemberComment» + public org.eclipse.gmf.runtime.notation.Edge create«getUniqueIdentifier()»(«IF isTypeLink()»org.eclipse.emf.ecore.EObject domainElement, «ENDIF»org.eclipse.gmf.runtime.notation.View containerView, int index, boolean persisted, org.eclipse.gmf.runtime.diagram.core.preferences.PreferencesHint preferencesHint) { + «IF viewmap.isFixedForeground()-» + org.eclipse.gmf.runtime.notation.Edge edge = org.eclipse.gmf.runtime.notation.NotationFactory.eINSTANCE.createEdge(); + edge.getStyles().add(org.eclipse.gmf.runtime.notation.NotationFactory.eINSTANCE.createRoutingStyle()); + «ELSE-» + org.eclipse.gmf.runtime.notation.Connector edge = org.eclipse.gmf.runtime.notation.NotationFactory.eINSTANCE.createConnector(); + «ENDIF-» + «IF not viewmap.isFixedFont()-» + edge.getStyles().add(org.eclipse.gmf.runtime.notation.NotationFactory.eINSTANCE.createFontStyle()); + «ENDIF-» + «EXPAND xpt::diagram::views::Utils::addCustomStyles('edge.getStyles()')-» + org.eclipse.gmf.runtime.notation.RelativeBendpoints bendpoints = org.eclipse.gmf.runtime.notation.NotationFactory.eINSTANCE.createRelativeBendpoints(); + «EXPAND CodeStyle::newGenericInstance('points', 'java.util.ArrayList', 'org.eclipse.gmf.runtime.notation.datatype.RelativeBendpoint')»(2); + points.add(new org.eclipse.gmf.runtime.notation.datatype.RelativeBendpoint()); + points.add(new org.eclipse.gmf.runtime.notation.datatype.RelativeBendpoint()); + bendpoints.setPoints(points); + edge.setBendpoints(bendpoints); + org.eclipse.gmf.runtime.diagram.core.util.ViewUtil.insertChildView(containerView, edge, index, persisted); + edge.setType(«EXPAND xpt::editor::VisualIDRegistry::typeMethodCall»); + edge.setElement(«IF isTypeLink()»domainElement«ELSE»null«ENDIF»); + // initializePreferences + final org.eclipse.jface.preference.IPreferenceStore prefStore = (org.eclipse.jface.preference.IPreferenceStore) preferencesHint.getPreferenceStore(); + «EXPAND initializeStyles('edge', 'prefStore', not viewmap.isFixedForeground(), false, not viewmap.isFixedFont())-» + org.eclipse.gmf.runtime.notation.Routing routing = org.eclipse.gmf.runtime.notation.Routing.get(prefStore.getInt(org.eclipse.gmf.runtime.diagram.ui.preferences.IPreferenceConstants.PREF_LINE_STYLE)); + if (routing != null) { + org.eclipse.gmf.runtime.diagram.core.util.ViewUtil.setStructuralFeatureValue(edge, org.eclipse.gmf.runtime.notation.NotationPackage.eINSTANCE.getRoutingStyle_Routing(), routing); + } +«EXPAND initLabel('edge', 'prefStore') FOREACH labels-» + return edge; + } +«ENDDEFINE» + +«DEFINE extendsList FOR gmfgen::GenDiagram» extends org.eclipse.gmf.runtime.common.core.service.AbstractProvider«ENDDEFINE» +«DEFINE implementsList FOR gmfgen::GenDiagram» implements org.eclipse.gmf.runtime.diagram.core.providers.IViewProvider«ENDDEFINE» + +«DEFINE caseVisualID FOR gmfgen::ElementType»«EXPAND xpt::Common::caseVisualID FOR diagramElement»«ENDDEFINE» + +«DEFINE getSemanticElementMethod FOR gmfgen::GenDiagram» + «EXPAND xpt::Common::generatedMemberComment» + private org.eclipse.emf.ecore.EObject getSemanticElement(org.eclipse.core.runtime.IAdaptable semanticAdapter) { + if (semanticAdapter == null) { + return null; + } + org.eclipse.emf.ecore.EObject eObject = (org.eclipse.emf.ecore.EObject) semanticAdapter.getAdapter(org.eclipse.emf.ecore.EObject.class); + if (eObject != null) { + return org.eclipse.gmf.runtime.emf.core.util.EMFCoreUtil.resolve(org.eclipse.emf.transaction.util.TransactionUtil.getEditingDomain(eObject), eObject); + } + return null; + } +«ENDDEFINE» + +«DEFINE getSemanticElementTypeMethod FOR gmfgen::GenDiagram» +«EXPAND xpt::Common::generatedMemberComment» +private org.eclipse.gmf.runtime.emf.type.core.IElementType getSemanticElementType(org.eclipse.core.runtime.IAdaptable semanticAdapter) { + if (semanticAdapter == null) { + return null; + } + return (org.eclipse.gmf.runtime.emf.type.core.IElementType) semanticAdapter.getAdapter(org.eclipse.gmf.runtime.emf.type.core.IElementType.class); +} +«ENDDEFINE» + +«DEFINE additions FOR gmfgen::GenDiagram»«ENDDEFINE» Modified: trunk/bpmn/plugins/org.jboss.tools.bpmn2.model/model/bpmn.gmfgraph =================================================================== --- trunk/bpmn/plugins/org.jboss.tools.bpmn2.model/model/bpmn.gmfgraph 2010-11-22 15:54:58 UTC (rev 26819) +++ trunk/bpmn/plugins/org.jboss.tools.bpmn2.model/model/bpmn.gmfgraph 2010-11-22 16:07:35 UTC (rev 26820) @@ -722,7 +722,8 @@ </nodes> <nodes name="MessageCatchIntermediateEvent" - figure="MessageCatchIntermediateEventFigureDescriptor"> + figure="MessageCatchIntermediateEventFigureDescriptor" + resizeConstraint="NONE"> <facets xsi:type="gmfgraph:DefaultSizeFacet"> <defaultSize 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 2010-11-22 15:54:58 UTC (rev 26819) +++ trunk/bpmn/plugins/org.jboss.tools.bpmn2.model/model/bpmn.process.gmfgen 2010-11-22 16:07:35 UTC (rev 26820) @@ -3,7 +3,12 @@ xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:gmfgen="http://www.eclipse.org/gmf/2009/GenModel" packageNamePrefix="org.jboss.tools.bpmn2.process.diagram" - diagramFileExtension="prd" + modelID="bpmn2" + sameFileForDiagramAndModel="true" + diagramFileExtension="jbpmn" + domainFileExtension="jbpmn" + dynamicTemplates="true" + templateDirectory="/org.jboss.tools.bpmn2.model/gmf-templates" pluginDirectory="/org.jboss.tools.bpmn2.process.diagram/src"> <diagram visualID="1000"

15 years, 5 months

1
0
0 / 0

JBoss Tools SVN: r26819 - trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client.

by jbosstools-commits＠lists.jboss.org

Author: adietish Date: 2010-11-22 10:54:58 -0500 (Mon, 22 Nov 2010) New Revision: 26819 Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/AddressList.java trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/DeltaCloudAuthException.java trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/DeltaCloudClient.java trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/DeltaCloudClientException.java trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/DeltaCloudClientImpl.java trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/DeltaCloudNotFoundClientException.java trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/DeltaCloudObject.java trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/HardwareProfile.java trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/HttpStatusCode.java trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/HttpStatusRange.java trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/Image.java trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/Instance.java trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/InstanceAction.java trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/InternalDeltaCloudClient.java trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/Property.java trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/Realm.java Log: added author tags Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/AddressList.java =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/AddressList.java 2010-11-22 15:32:56 UTC (rev 26818) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/AddressList.java 2010-11-22 15:54:58 UTC (rev 26819) @@ -15,6 +15,9 @@ import javax.xml.bind.annotation.XmlList; import javax.xml.bind.annotation.XmlType; +/** + * @author Martyn Taylor + */ @XmlType public class AddressList { Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/DeltaCloudAuthException.java =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/DeltaCloudAuthException.java 2010-11-22 15:32:56 UTC (rev 26818) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/DeltaCloudAuthException.java 2010-11-22 15:54:58 UTC (rev 26819) @@ -10,6 +10,9 @@ *******************************************************************************/ package org.jboss.tools.deltacloud.core.client; +/** + * @author Andre Dietisheim + */ public class DeltaCloudAuthException extends DeltaCloudClientException { private static final long serialVersionUID = 1L; Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/DeltaCloudClient.java =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/DeltaCloudClient.java 2010-11-22 15:32:56 UTC (rev 26818) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/DeltaCloudClient.java 2010-11-22 15:54:58 UTC (rev 26819) @@ -14,6 +14,10 @@ import org.jboss.tools.deltacloud.core.client.DeltaCloudClientImpl.DeltaCloudServerType; +/** + * @author Martyn Taylor + * @author Andre Dietisheim + */ public interface DeltaCloudClient { /** Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/DeltaCloudClientException.java =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/DeltaCloudClientException.java 2010-11-22 15:32:56 UTC (rev 26818) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/DeltaCloudClientException.java 2010-11-22 15:54:58 UTC (rev 26819) @@ -10,6 +10,9 @@ *******************************************************************************/ package org.jboss.tools.deltacloud.core.client; +/** + * @author Martyn Taylor + */ public class DeltaCloudClientException extends Exception { private static final long serialVersionUID = 1L; Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/DeltaCloudClientImpl.java =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/DeltaCloudClientImpl.java 2010-11-22 15:32:56 UTC (rev 26818) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/DeltaCloudClientImpl.java 2010-11-22 15:54:58 UTC (rev 26819) @@ -70,6 +70,9 @@ import org.xml.sax.InputSource; import org.xml.sax.SAXException; +/** + * @author Andre Dietisheim (based on prior implementation by Martyn Taylor) + */ public class DeltaCloudClientImpl implements InternalDeltaCloudClient { private static final String PEM_FILE_SUFFIX = "pem"; Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/DeltaCloudNotFoundClientException.java =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/DeltaCloudNotFoundClientException.java 2010-11-22 15:32:56 UTC (rev 26818) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/DeltaCloudNotFoundClientException.java 2010-11-22 15:54:58 UTC (rev 26819) @@ -10,6 +10,9 @@ *******************************************************************************/ package org.jboss.tools.deltacloud.core.client; +/** + * @author Andre Dietisheim + */ public class DeltaCloudNotFoundClientException extends DeltaCloudClientException { private static final long serialVersionUID = 1L; Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/DeltaCloudObject.java =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/DeltaCloudObject.java 2010-11-22 15:32:56 UTC (rev 26818) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/DeltaCloudObject.java 2010-11-22 15:54:58 UTC (rev 26819) @@ -14,6 +14,9 @@ import javax.xml.bind.annotation.XmlAttribute; +/** + * @author Martyn Taylor + */ public abstract class DeltaCloudObject implements Serializable { private static final long serialVersionUID = 1L; Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/HardwareProfile.java =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/HardwareProfile.java 2010-11-22 15:32:56 UTC (rev 26818) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/HardwareProfile.java 2010-11-22 15:54:58 UTC (rev 26819) @@ -13,6 +13,9 @@ import java.util.ArrayList; import java.util.List; +/** + * @author Martyn Taylor + */ public class HardwareProfile extends DeltaCloudObject { private static final long serialVersionUID = 1L; Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/HttpStatusCode.java =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/HttpStatusCode.java 2010-11-22 15:32:56 UTC (rev 26818) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/HttpStatusCode.java 2010-11-22 15:54:58 UTC (rev 26819) @@ -9,6 +9,10 @@ * Red Hat, Inc. - initial API and implementation ******************************************************************************/ package org.jboss.tools.deltacloud.core.client; + +/** + * @author Andre Dietisheim + */ public enum HttpStatusCode { OK(200), NOT_FOUND(404), FORBIDDEN(403); Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/HttpStatusRange.java =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/HttpStatusRange.java 2010-11-22 15:32:56 UTC (rev 26818) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/HttpStatusRange.java 2010-11-22 15:54:58 UTC (rev 26819) @@ -1,6 +1,20 @@ +/******************************************************************************* + * Copyright (c) 2010 Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is made available under the terms of the + * Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ package org.jboss.tools.deltacloud.core.client; +/** + * @author Andre Dietisheim + */ public enum HttpStatusRange { + CLIENT_ERROR(400, 499), SERVER_ERROR(500, 599); private int start; Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/Image.java =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/Image.java 2010-11-22 15:32:56 UTC (rev 26818) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/Image.java 2010-11-22 15:54:58 UTC (rev 26819) @@ -12,6 +12,9 @@ import javax.xml.bind.annotation.XmlElement; +/** + * @author Martyn Taylor + */ public class Image extends DeltaCloudObject { private static final long serialVersionUID = 1L; Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/Instance.java =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/Instance.java 2010-11-22 15:32:56 UTC (rev 26818) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/Instance.java 2010-11-22 15:54:58 UTC (rev 26819) @@ -15,6 +15,10 @@ import javax.xml.bind.annotation.XmlElement; +/** + * @author Martyn Taylor + * @author Andre Dietisheim + */ public class Instance extends DeltaCloudObject { private static final long serialVersionUID = 1L; Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/InstanceAction.java =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/InstanceAction.java 2010-11-22 15:32:56 UTC (rev 26818) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/InstanceAction.java 2010-11-22 15:54:58 UTC (rev 26819) @@ -15,6 +15,7 @@ /** * An action that is executable on an instance * + * @author Martin Taylor * @author André Dietisheim * @see Instance * @see DeltaCloudClient#performInstanceAction(String, String); Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/InternalDeltaCloudClient.java =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/InternalDeltaCloudClient.java 2010-11-22 15:32:56 UTC (rev 26818) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/InternalDeltaCloudClient.java 2010-11-22 15:54:58 UTC (rev 26819) @@ -10,6 +10,9 @@ ******************************************************************************/ package org.jboss.tools.deltacloud.core.client; +/** + * @author Andre Dietisheim + */ public interface InternalDeltaCloudClient extends DeltaCloudClient { /** Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/Property.java =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/Property.java 2010-11-22 15:32:56 UTC (rev 26818) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/Property.java 2010-11-22 15:54:58 UTC (rev 26819) @@ -14,6 +14,9 @@ import javax.xml.bind.annotation.XmlElement; +/** + * @author Martyn Taylor + */ public class Property extends DeltaCloudObject { private static final long serialVersionUID = 1L; Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/Realm.java =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/Realm.java 2010-11-22 15:32:56 UTC (rev 26818) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/Realm.java 2010-11-22 15:54:58 UTC (rev 26819) @@ -12,6 +12,9 @@ import javax.xml.bind.annotation.XmlElement; +/** + * @author Martyn Taylor + */ public class Realm extends DeltaCloudObject { private static final long serialVersionUID = 1L;

15 years, 5 months

1
0
0 / 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

jbosstools-commits November 2010