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?EndEvent", Bpmn2ElementTypes.EndEvent_2004); //$NON-NLS-1$ + "Navigator?Node?http://www.omg.org/spec/BPMN/20100524/MODEL-XMI?ExclusiveGateway", 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?ParallelGateway", 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?ExclusiveGateway", Bpmn2ElementTypes.ExclusiveGateway_2005); //$NON-NLS-1$ + case IntermediateCatchEventEditPart.VISUAL_ID: + return getImage( + "Navigator?TopLevelNode?http://www.omg.org/spec/BPMN/20100524/MODEL-XMI?IntermediateCatchEvent", Bpmn2ElementTypes.IntermediateCatchEvent_2010); //$NON-NLS-1$ case SubProcessEditPart.VISUAL_ID: return getImage( "Navigator?TopLevelNode?http://www.omg.org/spec/BPMN/20100524/MODEL-XMI?SubProcess", 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?IntermediateCatchEvent", Bpmn2ElementTypes.IntermediateCatchEvent_2012); //$NON-NLS-1$ + case TextAnnotation2EditPart.VISUAL_ID: return getImage( - "Navigator?TopLevelNode?http://www.omg.org/spec/BPMN/20100524/MODEL-XMI?DataObject", 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?TextAnnotation", Bpmn2ElementTypes.TextAnnotation_3015); //$NON-NLS-1$ case IntermediateCatchEvent3EditPart.VISUAL_ID: return getImage( "Navigator?TopLevelNode?http://www.omg.org/spec/BPMN/20100524/MODEL-XMI?IntermediateCatchEvent", 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?TextAnnotation", Bpmn2ElementTypes.TextAnnotation_3015); //$NON-NLS-1$ - case DataObject2EditPart.VISUAL_ID: + "Navigator?Node?http://www.omg.org/spec/BPMN/20100524/MODEL-XMI?IntermediateCatchEvent", 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?IntermediateThrowEvent", 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?IntermediateThrowEvent", Bpmn2ElementTypes.IntermediateThrowEvent_2011); //$NON-NLS-1$ case StartEventEditPart.VISUAL_ID: return getImage( "Navigator?TopLevelNode?http://www.omg.org/spec/BPMN/20100524/MODEL-XMI?StartEvent", 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?UserTask", Bpmn2ElementTypes.UserTask_2001); //$NON-NLS-1$ + case ParallelGateway2EditPart.VISUAL_ID: return getImage( - "Navigator?TopLevelNode?http://www.omg.org/spec/BPMN/20100524/MODEL-XMI?ExclusiveGateway", Bpmn2ElementTypes.ExclusiveGateway_2005); //$NON-NLS-1$ - case TextAnnotationEditPart.VISUAL_ID: + "Navigator?Node?http://www.omg.org/spec/BPMN/20100524/MODEL-XMI?ParallelGateway", Bpmn2ElementTypes.ParallelGateway_3008); //$NON-NLS-1$ + case IntermediateCatchEvent5EditPart.VISUAL_ID: return getImage( - "Navigator?TopLevelNode?http://www.omg.org/spec/BPMN/20100524/MODEL-XMI?TextAnnotation", Bpmn2ElementTypes.TextAnnotation_2015); //$NON-NLS-1$ - case EndEvent6EditPart.VISUAL_ID: + "Navigator?Node?http://www.omg.org/spec/BPMN/20100524/MODEL-XMI?IntermediateCatchEvent", 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?IntermediateCatchEvent", 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?EndEvent", 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?IntermediateCatchEvent", 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?IntermediateThrowEvent", Bpmn2ElementTypes.IntermediateThrowEvent_2011); //$NON-NLS-1$ - case UserTaskEditPart.VISUAL_ID: + "Navigator?TopLevelNode?http://www.omg.org/spec/BPMN/20100524/MODEL-XMI?EndEvent", Bpmn2ElementTypes.EndEvent_2004); //$NON-NLS-1$ + case UserTask2EditPart.VISUAL_ID: return getImage( - "Navigator?TopLevelNode?http://www.omg.org/spec/BPMN/20100524/MODEL-XMI?UserTask", 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?TextAnnotation", Bpmn2ElementTypes.TextAnnotation_2015); //$NON-NLS-1$ case EndEvent3EditPart.VISUAL_ID: return getImage( "Navigator?TopLevelNode?http://www.omg.org/spec/BPMN/20100524/MODEL-XMI?EndEvent", 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?StartEvent", Bpmn2ElementTypes.StartEvent_2007); //$NON-NLS-1$ + case ProcessEditPart.VISUAL_ID: return getImage( - "Navigator?TopLevelNode?http://www.omg.org/spec/BPMN/20100524/MODEL-XMI?IntermediateCatchEvent", Bpmn2ElementTypes.IntermediateCatchEvent_2010); //$NON-NLS-1$ - case IntermediateCatchEvent5EditPart.VISUAL_ID: - return getImage( - "Navigator?Node?http://www.omg.org/spec/BPMN/20100524/MODEL-XMI?IntermediateCatchEvent", Bpmn2ElementTypes.IntermediateCatchEvent_3013); //$NON-NLS-1$ - case IntermediateThrowEvent2EditPart.VISUAL_ID: - return getImage( - "Navigator?Node?http://www.omg.org/spec/BPMN/20100524/MODEL-XMI?IntermediateThrowEvent", 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?ScriptTask", 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?StartEvent", Bpmn2ElementTypes.StartEvent_2007); //$NON-NLS-1$ - case StartEvent3EditPart.VISUAL_ID: + "Navigator?TopLevelNode?http://www.omg.org/spec/BPMN/20100524/MODEL-XMI?DataObject", 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?ExclusiveGateway", 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?ServiceTask", 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?ParallelGateway", 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);