diff options
| author | Maged Elaasar | 2015-12-10 19:26:30 +0000 |
|---|---|---|
| committer | Gerrit Code Review @ Eclipse.org | 2016-03-22 13:45:02 +0000 |
| commit | e8484696ad8258ca27ca5c622d037c975161ac6b (patch) | |
| tree | 1640f5e2f80a242ecbc61b2a47fb0fc7fee8873c /plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview | |
| parent | ac3e24920a8de354a1668d76d59dd549fda9306e (diff) | |
| download | org.eclipse.papyrus-e8484696ad8258ca27ca5c622d037c975161ac6b.tar.gz org.eclipse.papyrus-e8484696ad8258ca27ca5c622d037c975161ac6b.tar.xz org.eclipse.papyrus-e8484696ad8258ca27ca5c622d037c975161ac6b.zip | |
Bug 489116 - Unify diagram visualID of all diagrams in Papyrus
1. Changed the visual ids of the UML2 diagrams from numbers to
meaningful names corresponding to notational cases. This was applied
consistely across diagram such that similar cases get similar visual
ids. Added diagram reconcilers for v1.2 to migrate older diagrams.
2. Amalgamated the UML2 diagram element types into a single model
(umldi.elementtypesconfigurations). Some diagrams, like Sequence,
Communication and Timing, still use extension-based configurations and
will need to be migrated later.
Change-Id: I7f47b25454dcd1ed81e8f3eeffc1a09a2584d316
Signed-off-by: Maged Elaasar <melaasar@gmail.com>
Diffstat (limited to 'plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview')
25 files changed, 381 insertions, 261 deletions
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/model/InteractionOverviewDiagram.configuration b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/model/InteractionOverviewDiagram.configuration index 696854d716a..02826b837d9 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/model/InteractionOverviewDiagram.configuration +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/model/InteractionOverviewDiagram.configuration @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?>
-<configuration:PapyrusConfiguration xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:configuration="http://www.eclipse.org/papyrus/infra/viewpoints/configuration" xmi:id="_ko07IErbEeSdQKzSRatBjg">
+<configuration:PapyrusConfiguration xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/Activity_Shape/XMLSchema-instance" xmlns:configuration="http://www.eclipse.org/papyrus/infra/viewpoints/configuration" xmi:id="_ko07IErbEeSdQKzSRatBjg">
<viewpoints xsi:type="configuration:PapyrusViewpoint" xmi:id="_xogdoErbEeSdQKzSRatBjg" name="Default Papyrus Viewpoint">
<modelKinds xsi:type="configuration:PapyrusDiagram" xmi:id="_FuMjYHDuEeWh-MssWmCB_A" implementationID="PapyrusUMLInteractionOverviewDiagram">
<modelRules xmi:id="_FuMjYXDuEeWh-MssWmCB_A">
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/model/UML.InteractionOverview.idgen b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/model/UML.InteractionOverview.idgen index 3b1c4a8a377..f66b8e1d7b7 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/model/UML.InteractionOverview.idgen +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/model/UML.InteractionOverview.idgen @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?>
-<idgen:Diagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:gmfgen="http://www.eclipse.org/gmf/2009/GenModel" xmlns:idgen="http://www.eclipse.org/papyrus/0.7.0/idgen" name="InteractionOverviewDiagram" type="PapyrusUMLInteractionOverviewDiagram" icon="icons/obj16/Diagram_InteractionOverview.gif" label="Interaction Overview Diagram" language="uml" javaPackagePrefix="org.eclipse.papyrus.uml.diagram.interactionoverview" javaClassPrefix="InteractionOverviewDiagram" createCommandLabel="Create a new Interaction Overview Diagram">
+<idgen:Diagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/Activity_Shape/XMLSchema-instance" xmlns:gmfgen="http://www.eclipse.org/gmf/2009/GenModel" xmlns:idgen="http://www.eclipse.org/papyrus/0.7.0/idgen" name="InteractionOverviewDiagram" type="PapyrusUMLInteractionOverviewDiagram" icon="icons/obj16/Diagram_InteractionOverview.gif" label="Interaction Overview Diagram" language="uml" javaPackagePrefix="org.eclipse.papyrus.uml.diagram.interactionoverview" javaClassPrefix="InteractionOverviewDiagram" createCommandLabel="Create a new Interaction Overview Diagram">
<diagramEditPart name="InteractionOverviewDiagramEditPart">
<behaviors javaClassQualifiedName="org.eclipse.papyrus.uml.diagram.common.editpolicies.DuplicatePasteEditPolicy" key="DuplicatePasteEditPolicy.PASTE_ROLE"/>
<behaviors javaClassQualifiedName="org.eclipse.papyrus.uml.diagram.interactionoverview.edit.policies.CustomInteractionOverviewDiagramCreationEditPolicy" key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CREATION_ROLE"/>
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/model/interactionOverviewDiagram.elementtypesconfigurations b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/model/interactionOverviewDiagram.elementtypesconfigurations index d065929aa1e..7631c0b6127 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/model/interactionOverviewDiagram.elementtypesconfigurations +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/model/interactionOverviewDiagram.elementtypesconfigurations @@ -1,12 +1,6 @@ -<?xml version="1.0" encoding="ASCII" standalone="no"?><elementtypesconfigurations:ElementTypeSetConfiguration xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.1" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" identifier="org.eclipse.papyrus.uml.diagram.interactionoverview.elementTypeSet" metamodelNsURI="http://www.eclipse.org/uml2/5.0.0/UML" name="elementTypeSet" xmi:id="_x8G0YGaNEeSyJIsxLao1Pw" xmi:version="2.0">
- <elementTypeConfigurations hint="5000" identifier="org.eclipse.papyrus.uml.diagram.interactionoverview.CallBehaviorAction_5000" name="org.eclipse.papyrus.uml.diagram.interactionoverview.CallBehaviorAction_5000" xmi:id="_x8G0yWaNEeSyJIsxLao1Pw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
- <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/CallBehaviorAction.gif" xmi:id="_x8G0ymaNEeSyJIsxLao1Pw"/>
- <specializedTypesID>org.eclipse.papyrus.uml.diagram.activity.CallBehaviorAction_3008</specializedTypesID>
- <editHelperAdviceConfiguration editHelperAdviceClassName="org.eclipse.papyrus.uml.diagram.interactionoverview.edit.advices.CallBehaviorActionAsInteractionEditHelperAdvice" xmi:id="_FYd2YGpzEeSbA6Db03aufw" xsi:type="elementtypesconfigurations:EditHelperAdviceConfiguration"/>
- </elementTypeConfigurations>
- <elementTypeConfigurations hint="5005" identifier="org.eclipse.papyrus.uml.diagram.interactionoverview.CallBehaviorAction_As_InteractionUse_5005" name="org.eclipse.papyrus.uml.diagram.interactionoverview.CallBehaviorAction_As_InteractionUse_5005" xmi:id="_QywZsOm6EeSdwvyVD4uXcQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
- <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/CallBehaviorAction.gif" xmi:id="_sFytEOm6EeSdwvyVD4uXcQ"/>
- <specializedTypesID>org.eclipse.papyrus.uml.diagram.activity.CallBehaviorAction_BaseType</specializedTypesID>
- </elementTypeConfigurations>
- <adviceBindingsConfigurations editHelperAdviceClassName="org.eclipse.papyrus.uml.diagram.interactionoverview.edit.advices.CallBehaviorActionAsInteractionUseEditHelperAdvice" identifier="org.eclipse.papyrus.uml.diagram.interactionoverview.edit.advices.CallBehaviorActionAsInteractionUseEditHelperAdvice" target="_QywZsOm6EeSdwvyVD4uXcQ" xmi:id="_zAcw0GaOEeSyJIsxLao1Pw" xsi:type="elementtypesconfigurations:AdviceBindingConfiguration"/>
-</elementtypesconfigurations:ElementTypeSetConfiguration>
\ No newline at end of file +<?xml version="1.0" encoding="ASCII"?> +<elementtypesconfigurations:ElementTypeSetConfiguration xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.1" xmi:id="_x8G0YGaNEeSyJIsxLao1Pw" identifier="org.eclipse.papyrus.uml.diagram.interactionoverview.elementTypeSet" name="elementTypeSet" metamodelNsURI="http://www.eclipse.org/uml2/5.0.0/UML"> + <adviceBindingsConfigurations xsi:type="elementtypesconfigurations:AdviceBindingConfiguration" xmi:id="_zAcw0GaOEeSyJIsxLao1Pw" identifier="org.eclipse.papyrus.uml.diagram.interactionoverview.edit.advices.CallBehaviorActionAsInteractionUseEditHelperAdvice" editHelperAdviceClassName="org.eclipse.papyrus.uml.diagram.interactionoverview.edit.advices.CallBehaviorActionAsInteractionUseEditHelperAdvice"> + <target xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="../../org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#_eu4bbdx0EeWVxMf7SXAfhg"/> + </adviceBindingsConfigurations> +</elementtypesconfigurations:ElementTypeSetConfiguration> diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/plugin.gen.xml b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/plugin.gen.xml index 544dec3e9dd..4c8166f92da 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/plugin.gen.xml +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/plugin.gen.xml @@ -123,22 +123,17 @@ <viewProvider class="org.eclipse.papyrus.uml.diagram.interactionoverview.provider.InheritedActivityDiagramViewProvider"> <Priority name="Low"/> - <!-- "3005" = ACTIVITY_FINAL_NODE_CN "3008" = CALL_BEHAVIOR_ACTION_CN "3080" = COMMENT_CN "3069" = CONDITIONAL_NODE_CN "3038" = DECISION_NODE_CN "3006" - = FLOW_FINAL_NODE_CN "3040" = FORK_NODE_CN "3004" = INITIAL_NODE_CN "3041" = JOIN_NODE_CN "3071" = LOOP_NODE_CN "3039" = MERGE_NODE_CN "3085" = SHAPE_NAMED_ELEMENT_CN - "2001" = ACTIVITY "3073" = SEQUENCE_NODE_CN "3112" = CONSTRAINT_CN --> <context viewClass="org.eclipse.gmf.runtime.notation.Node" - semanticHints="3005, 3008, 3080, 3069, 3038, 3006, 3040, 3004, 3041, 3071, 3039, 3085, 2001, 3073, 3112"/> + semanticHints="ActivityFinalNode_Shape, CallBehaviorAction_Shape, Comment_Shape, ConditionalNode_Shape, DecisionNode_Shape, FlowFinalNode_Shape, ForkNode_Shape, InitialNode_Shape, JoinNode_Shape, LoopNode_Shape, MergeNode_Shape, NamedElement_DefaultShape, Activity_Shape, SequenceNode_Shape, Constraint_Shape"/> - <!-- "3001" = ACTIVITY_PARAMETER_CLN "3002" = ACTIVITY_CONSTRAINT_CLN "3003" = ACTIVITY_CONSTRAINT_CLN --> <context viewClass="org.eclipse.gmf.runtime.notation.Node" - semanticHints="3001, 3002, 3003"/> + semanticHints="Parameter_ParameterLabel, Constraint_PreconditionLabel, Constraint_PostconditionLabel"/> - <!-- "4006" = COMMENT_ANNOTATED_ELEMENT "4004" = CONTROL_FLOW --> <context viewClass="org.eclipse.gmf.runtime.notation.Edge" - semanticHints="4006, 4004"/> + semanticHints="Comment_AnnotatedElementEdge, ControlFlow_Edge"/> <object id="elementtype.node" @@ -146,7 +141,7 @@ <method name="getSemanticHint()" - value="3005, 3008, 3080, 3069, 3038, 3006, 3040, 3004, 3041, 3071, 3039, 3085, 2001, 3073, 3112"> + value="ActivityFinalNode_Shape, CallBehaviorAction_Shape, Comment_Shape, ConditionalNode_Shape, DecisionNode_Shape, FlowFinalNode_Shape, ForkNode_Shape, InitialNode_Shape, JoinNode_Shape, LoopNode_Shape, MergeNode_Shape, NamedElement_DefaultShape, Activity_Shape, SequenceNode_Shape, Constraint_Shape"> </method> </object> <context @@ -159,7 +154,7 @@ <method name="getSemanticHint()" - value="4006, 4004"> + value="Comment_AnnotatedElementEdge, ControlFlow_Edge"> </method> </object> <context @@ -354,161 +349,147 @@ <!-- EditPartProvider for inherited elements (from ActivityDiagram) --> <editpartProvider class="org.eclipse.papyrus.uml.diagram.interactionoverview.provider.InheritedActivityDiagramEditPartProvider"> <Priority name="Low"/> - <!-- The semantic hints given here are used in case the provider is not already loaded. As soon as the provider is loaded its provides method is used. - "3005" = ACTIVITY_FINAL_NODE_CN "5081" = ACTIVITY_FINAL_NODE_CN_LABEL_APPLIED_STEREOTYPE_HINT "3008" = CALL_BEHAVIOR_ACTION_CN "5004" = CALL_BEHAVIOR_ACTION_CN_LABEL_NAME_HINT - "3080" = COMMENT_CN "5138" = COMMENT_CN_LABEL_BODY_LABEL_HINT "3069" = CONDITIONAL_NODE_CN "5119" = CONDITIONAL_NODE_CN_LABEL_KEYWORD_HINT "7008" = CONDITIONAL_NODE_CN_COMPARTMENT_STRUCTURED_ACTIVITY_NODE_CONTENT_HINT - "3038" = DECISION_NODE_CN "5043" = DECISION_NODE_CN_LABEL_DECISION_INPUT_HINT "5098" = DECISION_NODE_CN_LABEL_APPLIED_STEREOTYPE_HINT "3006" = FLOW_FINAL_NODE_CN - "5082" = FLOW_FINAL_NODE_CN_LABEL_APPLIED_STEREOTYPE_HINT "3040" = FORK_NODE_CN "5100" = FORK_NODE_CN_LABEL_APPLIED_STEREOTYPE_HINT "3004" = INITIAL_NODE_CN "5080" - = INITIAL_NODE_CN_LABEL_APPLIED_STEREOTYPE_HINT "3041" = JOIN_NODE_CN "5042" = JOIN_NODE_CN_LABEL_JOIN_SPEC_HINT "5101" = JOIN_NODE_CN_LABEL_APPLIED_STEREOTYPE_HINT - "3071" = LOOP_NODE_CN "5121" = LOOP_NODE_CN_LABEL_KEYWORD_HINT "7010" = LOOP_NODE_CN_COMPARTMENT_STRUCTURED_ACTIVITY_NODE_CONTENT_HINT "3039" = MERGE_NODE_CN "5099" - = MERGE_NODE_CN_LABEL_APPLIED_STEREOTYPE_HINT "3085" = SHAPE_NAMED_ELEMENT_CN "5129" = SHAPE_NAMED_ELEMENT_CN_LABEL_NAME_HINT "2001" = ACTIVITY "5001" = ACTIVITY_LABEL_NAME_HINT - "5002" = ACTIVITY_LABEL_IS_SINGLE_EXECUTION_HINT "7001" = ACTIVITY_COMPARTMENT_ACTIVITY_FIGURE_PARAMETER_HINT "7002" = ACTIVITY_COMPARTMENT_ACTIVITY_FIGURE_PRECONDITION_HINT - "7003" = ACTIVITY_COMPARTMENT_ACTIVITY_FIGURE_POST_CONDTION_HINT "7004" = ACTIVITY_COMPARTMENT_ACTIVITY_FIGURE_CONTENT_HINT "3073" = SEQUENCE_NODE_CN "5123" = SEQUENCE_NODE_CN_LABEL_KEYWORD_HINT - "7012" = SEQUENCE_NODE_CN_COMPARTMENT_STRUCTURED_ACTIVITY_NODE_CONTENT_HINT "3112" = CONSTRAINT_CN "5189" = CONSTRAINT_CN_LABEL_NAME_HINT "5190" = CONSTRAINT_CN_LABEL_BODY_HINT --> <object id="ACTIVITY_FINAL_NODE_CN" class="org.eclipse.gmf.runtime.notation.Node"> <method name="getType()" - value="3005, 5081"/> + value="ActivityFinalNode_Shape, ActivityFinalNode_StereotypeLabel"/> </object> <object id="CALL_BEHAVIOR_ACTION_CN" class="org.eclipse.gmf.runtime.notation.Node"> <method name="getType()" - value="3008, 5004"/> + value="CallBehaviorAction_Shape, CallBehaviorAction_NameLabel"/> </object> <object id="COMMENT_CN" class="org.eclipse.gmf.runtime.notation.Node"> <method name="getType()" - value="3080, 5138"/> + value="Comment_Shape, Comment_BodyLabel"/> </object> <object id="CONDITIONAL_NODE_CN" class="org.eclipse.gmf.runtime.notation.Node"> <method name="getType()" - value="3069, 5119, 7008"/> + value="ConditionalNode_Shape, ConditionalNode_KeywordLabel, ConditionalNode_ActivityNodeCompartment"/> </object> <object id="DECISION_NODE_CN" class="org.eclipse.gmf.runtime.notation.Node"> <method name="getType()" - value="3038, 5043, 5098"/> + value="DecisionNode_Shape, DecisionNode_DecisionInputLabel, DecisionNode_StereotypeLabel"/> </object> <object id="FLOW_FINAL_NODE_CN" class="org.eclipse.gmf.runtime.notation.Node"> <method name="getType()" - value="3006, 5082"/> + value="FlowFinalNode_Shape, FlowFinalNode_StereotypeLabel"/> </object> <object id="FORK_NODE_CN" class="org.eclipse.gmf.runtime.notation.Node"> <method name="getType()" - value="3040, 5100"/> + value="ForkNode_Shape, ForkNode_StereotypeLabel"/> </object> <object id="INITIAL_NODE_CN" class="org.eclipse.gmf.runtime.notation.Node"> <method name="getType()" - value="3004, 5080"/> + value="InitialNode_Shape, InitialNode_StereotypeLabel"/> </object> <object id="JOIN_NODE_CN" class="org.eclipse.gmf.runtime.notation.Node"> <method name="getType()" - value="3041, 5042, 5101"/> + value="JoinNode_Shape, JoinNode_JoinSpecLabel, JoinNode_StereotypeLabel"/> </object> <object id="LOOP_NODE_CN" class="org.eclipse.gmf.runtime.notation.Node"> <method name="getType()" - value="3071, 5121, 7010"/> + value="LoopNode_Shape, LoopNode_KeywordLabel, LoopNode_ActivityNodeCompartment"/> </object> <object id="MERGE_NODE_CN" class="org.eclipse.gmf.runtime.notation.Node"> <method name="getType()" - value="3039, 5099"/> + value="MergeNode_Shape, MergeNode_StereotypeLabel"/> </object> <object id="SHAPE_NAMED_ELEMENT_CN" class="org.eclipse.gmf.runtime.notation.Node"> <method name="getType()" - value="3085, 5129"/> + value="NamedElement_DefaultShape, NamedElement_NameLabel"/> </object> <object id="ACTIVITY" class="org.eclipse.gmf.runtime.notation.Node"> <method name="getType()" - value="2001, 5001, 5002, 7001, 7002, 7003, 7004"/> + value="Activity_Shape, Activity_NameLabel, Activity_KeywordLabel, Activity_ParameterCompartment, Activity_PreconditionCompartment, Activity_PostconditionCompartment, Activity_ActivityNodeCompartment"/> </object> <object id="SEQUENCE_NODE_CN" class="org.eclipse.gmf.runtime.notation.Node"> <method name="getType()" - value="3073, 5123, 7012"/> + value="SequenceNode_Shape, SequenceNode_KeywordLabel, SequenceNode_ActivityNodeCompartment"/> </object> <object id="CONSTRAINT_CN" class="org.eclipse.gmf.runtime.notation.Node"> <method name="getType()" - value="3112, 5189, 5190"/> + value="Constraint_Shape, Constraint_NameLabel, Constraint_BodyLabel"/> </object> - <!-- "3001" = ACTIVITY_PARAMETER_CLN "3002" = ACTIVITY_CONSTRAINT_CLN "3003" = ACTIVITY_CONSTRAINT_CLN --> <object id="ACTIVITY_PARAMETER_CLN" class="org.eclipse.gmf.runtime.notation.Node"> <method name="getType()" - value="3001"/> + value="Parameter_ParameterLabel"/> </object> <object id="ACTIVITY_CONSTRAINT_CLN" class="org.eclipse.gmf.runtime.notation.Node"> <method name="getType()" - value="3002"/> + value="Constraint_PreconditionLabel"/> </object> <object id="ACTIVITY_CONSTRAINT_CLN" class="org.eclipse.gmf.runtime.notation.Node"> <method name="getType()" - value="3003"/> + value="Constraint_PostconditionLabel"/> </object> - <!-- "4006" = COMMENT_ANNOTATED_ELEMENT "4004" = CONTROL_FLOW "6003" = CONTROL_FLOW_LABEL_NAME_HINT "6004" = CONTROL_FLOW_LABEL_WEIGHT_HINT "6009" = - CONTROL_FLOW_LABEL_GUARD_HINT "6011" = CONTROL_FLOW_LABEL_APPLIED_STEREOTYPE_HINT "6013" = CONTROL_FLOW_LABEL_INTERRUPTIBLE_ICON_HINT --> <object id="COMMENT_ANNOTATED_ELEMENT" class="org.eclipse.gmf.runtime.notation.Edge"> <method name="getType()" - value="4006"/> + value="Comment_AnnotatedElementEdge"/> </object> <object id="CONTROL_FLOW" class="org.eclipse.gmf.runtime.notation.Edge"> <method name="getType()" - value="4004, 6003, 6004, 6009, 6011, 6013"/> + value="ControlFlow_Edge, ControlFlow_NameLabel, ControlFlow_WeightLabel, ControlFlow_GuardLabel, ControlFlow_StereotypeLabel, ControlFlow_IconLabel"/> </object> <context diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/plugin.xml b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/plugin.xml index d553e3db256..72e53696793 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/plugin.xml +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/plugin.xml @@ -85,22 +85,17 @@ <viewProvider class="org.eclipse.papyrus.uml.diagram.interactionoverview.provider.InheritedActivityDiagramViewProvider"> <Priority name="Low"/> - <!-- "3005" = ACTIVITY_FINAL_NODE_CN "3008" = CALL_BEHAVIOR_ACTION_CN "3080" = COMMENT_CN "3069" = CONDITIONAL_NODE_CN "3038" = DECISION_NODE_CN "3006" - = FLOW_FINAL_NODE_CN "3040" = FORK_NODE_CN "3004" = INITIAL_NODE_CN "3041" = JOIN_NODE_CN "3071" = LOOP_NODE_CN "3039" = MERGE_NODE_CN "3085" = SHAPE_NAMED_ELEMENT_CN - "2001" = ACTIVITY "3073" = SEQUENCE_NODE_CN "3112" = CONSTRAINT_CN --> <context viewClass="org.eclipse.gmf.runtime.notation.Node" - semanticHints="3005, 3008, 3080, 3069, 3038, 3006, 3040, 3004, 3041, 3071, 3039, 3085, 2001, 3073, 3112"/> + semanticHints="ActivityFinalNode_Shape, CallBehaviorAction_Shape, Comment_Shape, ConditionalNode_Shape, DecisionNode_Shape, FlowFinalNode_Shape, ForkNode_Shape, InitialNode_Shape, JoinNode_Shape, LoopNode_Shape, MergeNode_Shape, NamedElement_DefaultShape, Activity_Shape, SequenceNode_Shape, Constraint_Shape"/> - <!-- "3001" = ACTIVITY_PARAMETER_CLN "3002" = ACTIVITY_CONSTRAINT_CLN "3003" = ACTIVITY_CONSTRAINT_CLN --> <context viewClass="org.eclipse.gmf.runtime.notation.Node" - semanticHints="3001, 3002, 3003"/> + semanticHints="Parameter_ParameterLabel, Constraint_PreconditionLabel, Constraint_PostconditionLabel"/> - <!-- "4006" = COMMENT_ANNOTATED_ELEMENT "4004" = CONTROL_FLOW --> <context viewClass="org.eclipse.gmf.runtime.notation.Edge" - semanticHints="4006, 4004"/> + semanticHints="Comment_AnnotatedElementEdge, ControlFlow_Edge"/> <object id="elementtype.node" @@ -108,7 +103,7 @@ <method name="getSemanticHint()" - value="3005, 3008, 3080, 3069, 3038, 3006, 3040, 3004, 3041, 3071, 3039, 3085, 2001, 3073, 3112"> + value="ActivityFinalNode_Shape, CallBehaviorAction_Shape, Comment_Shape, ConditionalNode_Shape, DecisionNode_Shape, FlowFinalNode_Shape, ForkNode_Shape, InitialNode_Shape, JoinNode_Shape, LoopNode_Shape, MergeNode_Shape, NamedElement_DefaultShape, Activity_Shape, SequenceNode_Shape, Constraint_Shape"> </method> </object> <context @@ -121,7 +116,7 @@ <method name="getSemanticHint()" - value="4006, 4004"> + value="Comment_AnnotatedElementEdge, ControlFlow_Edge"> </method> </object> <context @@ -302,17 +297,15 @@ </Priority> <context viewClass="org.eclipse.gmf.runtime.notation.Node" - semanticHints="5000, 5005"/> + semanticHints="CallBehaviorAction_InteractionShape, CallBehaviorAction_InteractionUseShape"/> - <!-- "4006" = COMMENT_ANNOTATED_ELEMENT "4004" = CONTROL_FLOW --> - <object id="elementtype.node" class="org.eclipse.papyrus.gmf.diagram.common.commands.ISemanticHintAdapter(org.eclipse.papyrus.sysml.diagram.common)"> <method name="getSemanticHint()" - value="5000"> + value="CallBehaviorAction_InteractionShape"> </method> </object> <object @@ -321,7 +314,7 @@ <method name="getSemanticHint()" - value="5005"> + value="CallBehaviorAction_InteractionUseShape"> </method> </object> <context @@ -350,161 +343,147 @@ <!-- EditPartProvider for inherited elements (from ActivityDiagram) --> <editpartProvider class="org.eclipse.papyrus.uml.diagram.interactionoverview.provider.InheritedActivityDiagramEditPartProvider"> <Priority name="Low"/> - <!-- The semantic hints given here are used in case the provider is not already loaded. As soon as the provider is loaded its provides method is used. - "3005" = ACTIVITY_FINAL_NODE_CN "5081" = ACTIVITY_FINAL_NODE_CN_LABEL_APPLIED_STEREOTYPE_HINT "3008" = CALL_BEHAVIOR_ACTION_CN "5004" = CALL_BEHAVIOR_ACTION_CN_LABEL_NAME_HINT - "3080" = COMMENT_CN "5138" = COMMENT_CN_LABEL_BODY_LABEL_HINT "3069" = CONDITIONAL_NODE_CN "5119" = CONDITIONAL_NODE_CN_LABEL_KEYWORD_HINT "7008" = CONDITIONAL_NODE_CN_COMPARTMENT_STRUCTURED_ACTIVITY_NODE_CONTENT_HINT - "3038" = DECISION_NODE_CN "5043" = DECISION_NODE_CN_LABEL_DECISION_INPUT_HINT "5098" = DECISION_NODE_CN_LABEL_APPLIED_STEREOTYPE_HINT "3006" = FLOW_FINAL_NODE_CN - "5082" = FLOW_FINAL_NODE_CN_LABEL_APPLIED_STEREOTYPE_HINT "3040" = FORK_NODE_CN "5100" = FORK_NODE_CN_LABEL_APPLIED_STEREOTYPE_HINT "3004" = INITIAL_NODE_CN "5080" - = INITIAL_NODE_CN_LABEL_APPLIED_STEREOTYPE_HINT "3041" = JOIN_NODE_CN "5042" = JOIN_NODE_CN_LABEL_JOIN_SPEC_HINT "5101" = JOIN_NODE_CN_LABEL_APPLIED_STEREOTYPE_HINT - "3071" = LOOP_NODE_CN "5121" = LOOP_NODE_CN_LABEL_KEYWORD_HINT "7010" = LOOP_NODE_CN_COMPARTMENT_STRUCTURED_ACTIVITY_NODE_CONTENT_HINT "3039" = MERGE_NODE_CN "5099" - = MERGE_NODE_CN_LABEL_APPLIED_STEREOTYPE_HINT "3085" = SHAPE_NAMED_ELEMENT_CN "5129" = SHAPE_NAMED_ELEMENT_CN_LABEL_NAME_HINT "2001" = ACTIVITY "5001" = ACTIVITY_LABEL_NAME_HINT - "5002" = ACTIVITY_LABEL_IS_SINGLE_EXECUTION_HINT "7001" = ACTIVITY_COMPARTMENT_ACTIVITY_FIGURE_PARAMETER_HINT "7002" = ACTIVITY_COMPARTMENT_ACTIVITY_FIGURE_PRECONDITION_HINT - "7003" = ACTIVITY_COMPARTMENT_ACTIVITY_FIGURE_POST_CONDTION_HINT "7004" = ACTIVITY_COMPARTMENT_ACTIVITY_FIGURE_CONTENT_HINT "3073" = SEQUENCE_NODE_CN "5123" = SEQUENCE_NODE_CN_LABEL_KEYWORD_HINT - "7012" = SEQUENCE_NODE_CN_COMPARTMENT_STRUCTURED_ACTIVITY_NODE_CONTENT_HINT "3112" = CONSTRAINT_CN "5189" = CONSTRAINT_CN_LABEL_NAME_HINT "5190" = CONSTRAINT_CN_LABEL_BODY_HINT --> <object id="ACTIVITY_FINAL_NODE_CN" class="org.eclipse.gmf.runtime.notation.Node"> <method name="getType()" - value="3005, 5081"/> + value="ActivityFinalNode_Shape, ActivityFinalNode_StereotypeLabel"/> </object> <object id="CALL_BEHAVIOR_ACTION_CN" class="org.eclipse.gmf.runtime.notation.Node"> <method name="getType()" - value="3008, 5004"/> + value="CallBehaviorAction_Shape, CallBehaviorAction_NameLabel"/> </object> <object id="COMMENT_CN" class="org.eclipse.gmf.runtime.notation.Node"> <method name="getType()" - value="3080, 5138"/> + value="Comment_Shape, Comment_BodyLabel"/> </object> <object id="CONDITIONAL_NODE_CN" class="org.eclipse.gmf.runtime.notation.Node"> <method name="getType()" - value="3069, 5119, 7008"/> + value="ConditionalNode_Shape, ConditionalNode_KeywordLabel, ConditionalNode_ActivityNodeCompartment"/> </object> <object id="DECISION_NODE_CN" class="org.eclipse.gmf.runtime.notation.Node"> <method name="getType()" - value="3038, 5043, 5098"/> + value="DecisionNode_Shape, DecisionNode_DecisionInputLabel, DecisionNode_StereotypeLabel"/> </object> <object id="FLOW_FINAL_NODE_CN" class="org.eclipse.gmf.runtime.notation.Node"> <method name="getType()" - value="3006, 5082"/> + value="FlowFinalNode_Shape, FlowFinalNode_StereotypeLabel"/> </object> <object id="FORK_NODE_CN" class="org.eclipse.gmf.runtime.notation.Node"> <method name="getType()" - value="3040, 5100"/> + value="ForkNode_Shape, ForkNode_StereotypeLabel"/> </object> <object id="INITIAL_NODE_CN" class="org.eclipse.gmf.runtime.notation.Node"> <method name="getType()" - value="3004, 5080"/> + value="InitialNode_Shape, InitialNode_StereotypeLabel"/> </object> <object id="JOIN_NODE_CN" class="org.eclipse.gmf.runtime.notation.Node"> <method name="getType()" - value="3041, 5042, 5101"/> + value="JoinNode_Shape, JoinNode_JoinSpecLabel, JoinNode_StereotypeLabel"/> </object> <object id="LOOP_NODE_CN" class="org.eclipse.gmf.runtime.notation.Node"> <method name="getType()" - value="3071, 5121, 7010"/> + value="LoopNode_Shape, LoopNode_KeywordLabel, LoopNode_ActivityNodeCompartment"/> </object> <object id="MERGE_NODE_CN" class="org.eclipse.gmf.runtime.notation.Node"> <method name="getType()" - value="3039, 5099"/> + value="MergeNode_Shape, MergeNode_StereotypeLabel"/> </object> <object id="SHAPE_NAMED_ELEMENT_CN" class="org.eclipse.gmf.runtime.notation.Node"> <method name="getType()" - value="3085, 5129"/> + value="NamedElement_DefaultShape, NamedElement_NameLabel"/> </object> <object id="ACTIVITY" class="org.eclipse.gmf.runtime.notation.Node"> <method name="getType()" - value="5001, 5002, 7001, 7002, 7003, 7004"/> + value="Activity_NameLabel, Activity_KeywordLabel, Activity_ParameterCompartment, Activity_PreconditionCompartment, Activity_PostconditionCompartment, Activity_ActivityNodeCompartment"/> </object> <object id="SEQUENCE_NODE_CN" class="org.eclipse.gmf.runtime.notation.Node"> <method name="getType()" - value="3073, 5123, 7012"/> + value="SequenceNode_Shape, SequenceNode_KeywordLabel, SequenceNode_ActivityNodeCompartment"/> </object> <object id="CONSTRAINT_CN" class="org.eclipse.gmf.runtime.notation.Node"> <method name="getType()" - value="3112, 5189, 5190"/> + value="Constraint_Shape, Constraint_NameLabel, Constraint_BodyLabel"/> </object> - <!-- "3001" = ACTIVITY_PARAMETER_CLN "3002" = ACTIVITY_CONSTRAINT_CLN "3003" = ACTIVITY_CONSTRAINT_CLN --> <object id="ACTIVITY_PARAMETER_CLN" class="org.eclipse.gmf.runtime.notation.Node"> <method name="getType()" - value="3001"/> + value="Parameter_ParameterLabel"/> </object> <object id="ACTIVITY_CONSTRAINT_CLN" class="org.eclipse.gmf.runtime.notation.Node"> <method name="getType()" - value="3002"/> + value="Constraint_PreconditionLabel"/> </object> <object id="ACTIVITY_CONSTRAINT_CLN" class="org.eclipse.gmf.runtime.notation.Node"> <method name="getType()" - value="3003"/> + value="Constraint_PostconditionLabel"/> </object> - <!-- "4006" = COMMENT_ANNOTATED_ELEMENT "4004" = CONTROL_FLOW "6003" = CONTROL_FLOW_LABEL_NAME_HINT "6004" = CONTROL_FLOW_LABEL_WEIGHT_HINT "6009" = - CONTROL_FLOW_LABEL_GUARD_HINT "6011" = CONTROL_FLOW_LABEL_APPLIED_STEREOTYPE_HINT "6013" = CONTROL_FLOW_LABEL_INTERRUPTIBLE_ICON_HINT --> <object id="COMMENT_ANNOTATED_ELEMENT" class="org.eclipse.gmf.runtime.notation.Edge"> <method name="getType()" - value="4006"/> + value="Comment_AnnotatedElementEdge"/> </object> <object id="CONTROL_FLOW" class="org.eclipse.gmf.runtime.notation.Edge"> <method name="getType()" - value="4004, 6003, 6004, 6009, 6011, 6013"/> + value="ControlFlow_Edge, ControlFlow_NameLabel, ControlFlow_WeightLabel, ControlFlow_GuardLabel, ControlFlow_StereotypeLabel, ControlFlow_IconLabel"/> </object> <context @@ -524,8 +503,7 @@ <object class="org.eclipse.gmf.runtime.notation.Node" id="ACTIVITY"> - <!-- 2001 = ActivityEditPartTN --> - <method name="getType()" value="2001"/> + <method name="getType()" value="Activity_Shape"/> </object> <context views="ACTIVITY"/> </editpartProvider> @@ -732,11 +710,18 @@ point="org.eclipse.papyrus.infra.gmfdiag.common.diagramReconciler"> <diagramReconciler diagramType="PapyrusUMLInteractionOverviewDiagram" - reconcilerClass="org.eclipse.papyrus.uml.diagram.activity.migration.ActivityReconcilier" + reconcilerClass="org.eclipse.papyrus.uml.diagram.activity.migration.ActivityReconciler" source="undefined" target="1.1.0"> </diagramReconciler> + <diagramReconciler + diagramType="PapyrusUMLInteractionOverviewDiagram" + reconcilerClass="org.eclipse.papyrus.uml.diagram.interactionoverview.migration.InteractionOverviewReconciler_1_2_0" + source="1.1.0" + target="1.2.0"> + </diagramReconciler> </extension> + <extension point="org.eclipse.papyrus.infra.gmfdiag.common.visualTypeProviders"> <?gmfgen generated="true"?> <visualTypeProvider diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/src-gen/org/eclipse/papyrus/uml/diagram/interactionoverview/edit/part/InteractionOverviewDiagramEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/src-gen/org/eclipse/papyrus/uml/diagram/interactionoverview/edit/part/InteractionOverviewDiagramEditPart.java index c9a999c7c41..38103e438bd 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/src-gen/org/eclipse/papyrus/uml/diagram/interactionoverview/edit/part/InteractionOverviewDiagramEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/src-gen/org/eclipse/papyrus/uml/diagram/interactionoverview/edit/part/InteractionOverviewDiagramEditPart.java @@ -21,7 +21,7 @@ public class InteractionOverviewDiagramEditPart extends DiagramEditPart { public static String MODEL_ID = "PapyrusUMLInteractionOverviewDiagram"; - public static final String VISUAL_ID = "1000"; + public static final String VISUAL_ID = "Package_InteractionOverviewDiagram"; public InteractionOverviewDiagramEditPart(final View view) { super(view); diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/src-gen/org/eclipse/papyrus/uml/diagram/interactionoverview/edit/policy/DiagramSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/src-gen/org/eclipse/papyrus/uml/diagram/interactionoverview/edit/policy/DiagramSemanticEditPolicy.java index 0813e932451..a81c42708ea 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/src-gen/org/eclipse/papyrus/uml/diagram/interactionoverview/edit/policy/DiagramSemanticEditPolicy.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/src-gen/org/eclipse/papyrus/uml/diagram/interactionoverview/edit/policy/DiagramSemanticEditPolicy.java @@ -26,7 +26,7 @@ public class DiagramSemanticEditPolicy extends SemanticEditPolicy { protected Command getCreateCommand(final CreateElementRequest req) { - final IElementEditService commandService = ElementEditServiceUtils.getCommandProvider(UMLElementTypes.Package_1000); + final IElementEditService commandService = ElementEditServiceUtils.getCommandProvider(UMLElementTypes.Package_ActivityDiagram); if (commandService == null) { return UnexecutableCommand.INSTANCE; } @@ -35,7 +35,7 @@ public class DiagramSemanticEditPolicy extends SemanticEditPolicy { // End of user code if (ElementTypes.ACTIVITY == req.getElementType()) { - final CreateElementRequest createRequest = new CreateElementRequest(req.getContainer(), UMLElementTypes.Activity_2001); + final CreateElementRequest createRequest = new CreateElementRequest(req.getContainer(), UMLElementTypes.Activity_Shape); return new ICommandProxy(commandService.getEditCommand(createRequest)); } return UnexecutableCommand.INSTANCE; diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/src-gen/org/eclipse/papyrus/uml/diagram/interactionoverview/provider/CustomUMLParserProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/src-gen/org/eclipse/papyrus/uml/diagram/interactionoverview/provider/CustomUMLParserProvider.java index f290384983a..0e0a8a6cdd8 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/src-gen/org/eclipse/papyrus/uml/diagram/interactionoverview/provider/CustomUMLParserProvider.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/src-gen/org/eclipse/papyrus/uml/diagram/interactionoverview/provider/CustomUMLParserProvider.java @@ -28,7 +28,7 @@ public class CustomUMLParserProvider extends UMLParserProvider { protected IParser getParser(final String visualID) {
switch (visualID) {
case CallBehaviorActionNameEditPart.VISUAL_ID:
- return getCallBehaviorActionLabel_5004Parser();
+ return getCallBehaviorAction_NameLabel_Parser();
default:
return super.getParser(visualID);
}
@@ -36,13 +36,13 @@ public class CustomUMLParserProvider extends UMLParserProvider { }
- private IParser getCallBehaviorActionLabel_5004Parser() {
- if (custom_callBehaviorActionLabel_5004Parser == null) {
+ private IParser getCallBehaviorAction_NameLabel_Parser() {
+ if (custom_callBehaviorAction_NameLabel_Parser == null) {
final CustomCallBehaviorActionParser parser = new CustomCallBehaviorActionParser();
- custom_callBehaviorActionLabel_5004Parser = parser;
+ custom_callBehaviorAction_NameLabel_Parser = parser;
}
- return custom_callBehaviorActionLabel_5004Parser;
+ return custom_callBehaviorAction_NameLabel_Parser;
}
- private IParser custom_callBehaviorActionLabel_5004Parser;
+ private IParser custom_callBehaviorAction_NameLabel_Parser;
}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/src-gen/org/eclipse/papyrus/uml/diagram/interactionoverview/provider/ElementTypes.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/src-gen/org/eclipse/papyrus/uml/diagram/interactionoverview/provider/ElementTypes.java index 2ac99a84e5d..24f4f2f345a 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/src-gen/org/eclipse/papyrus/uml/diagram/interactionoverview/provider/ElementTypes.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/src-gen/org/eclipse/papyrus/uml/diagram/interactionoverview/provider/ElementTypes.java @@ -27,121 +27,121 @@ public class ElementTypes extends AbstractElementTypeEnumerator { /** ********************************************************* */ /** ActivityDiagram :: ACTIVITY_FINAL_NODE_CN */ - public static final IHintedType ACTIVITY_FINAL_NODE_CN = (IHintedType) getElementType("org.eclipse.papyrus.uml.diagram.activity.ActivityFinalNode_3005"); //$NON-NLS-1$ + public static final IHintedType ACTIVITY_FINAL_NODE_CN = (IHintedType) getElementType("org.eclipse.papyrus.umldi.ActivityFinalNode_Shape"); //$NON-NLS-1$ - public static final String ACTIVITY_FINAL_NODE_CN_LABEL_APPLIED_STEREOTYPE_HINT = "5081"; //$NON-NLS-1$ + public static final String ACTIVITY_FINAL_NODE_CN_LABEL_APPLIED_STEREOTYPE_HINT = "ActivityFinalNode_StereotypeLabel"; //$NON-NLS-1$ /** ActivityDiagram :: CALL_BEHAVIOR_ACTION_CN */ - public static final IHintedType CALL_BEHAVIOR_ACTION_CN = (IHintedType) getElementType("org.eclipse.papyrus.uml.diagram.activity.CallBehaviorAction_3008"); //$NON-NLS-1$ + public static final IHintedType CALL_BEHAVIOR_ACTION_CN = (IHintedType) getElementType("org.eclipse.papyrus.umldi.CallBehaviorAction_Shape"); //$NON-NLS-1$ - public static final String CALL_BEHAVIOR_ACTION_CN_LABEL_NAME_HINT = "5004"; //$NON-NLS-1$ + public static final String CALL_BEHAVIOR_ACTION_CN_LABEL_NAME_HINT = "CallBehaviorAction_NameLabel"; //$NON-NLS-1$ /** ActivityDiagram :: COMMENT_CN */ - public static final IHintedType COMMENT_CN = (IHintedType) getElementType("org.eclipse.papyrus.uml.diagram.activity.Comment_3080"); //$NON-NLS-1$ + public static final IHintedType COMMENT_CN = (IHintedType) getElementType("org.eclipse.papyrus.umldi.Comment_Shape"); //$NON-NLS-1$ - public static final String COMMENT_CN_LABEL_BODY_LABEL_HINT = "5138"; //$NON-NLS-1$ + public static final String COMMENT_CN_LABEL_BODY_LABEL_HINT = "Comment_BodyLabel"; //$NON-NLS-1$ /** ActivityDiagram :: CONDITIONAL_NODE_CN */ - public static final IHintedType CONDITIONAL_NODE_CN = (IHintedType) getElementType("org.eclipse.papyrus.uml.diagram.activity.ConditionalNode_3069"); //$NON-NLS-1$ + public static final IHintedType CONDITIONAL_NODE_CN = (IHintedType) getElementType("org.eclipse.papyrus.umldi.ConditionalNode_Shape"); //$NON-NLS-1$ - public static final String CONDITIONAL_NODE_CN_COMPARTMENT_STRUCTURED_ACTIVITY_NODE_CONTENT_HINT = "7008"; //$NON-NLS-1$ + public static final String CONDITIONAL_NODE_CN_COMPARTMENT_STRUCTURED_ACTIVITY_NODE_CONTENT_HINT = "ConditionalNode_ActivityNodeCompartment"; //$NON-NLS-1$ - public static final String CONDITIONAL_NODE_CN_LABEL_KEYWORD_HINT = "5119"; //$NON-NLS-1$ + public static final String CONDITIONAL_NODE_CN_LABEL_KEYWORD_HINT = "ConditionalNode_KeywordLabel"; //$NON-NLS-1$ /** ActivityDiagram :: DECISION_NODE_CN */ - public static final IHintedType DECISION_NODE_CN = (IHintedType) getElementType("org.eclipse.papyrus.uml.diagram.activity.DecisionNode_3038"); //$NON-NLS-1$ + public static final IHintedType DECISION_NODE_CN = (IHintedType) getElementType("org.eclipse.papyrus.umldi.DecisionNode_Shape"); //$NON-NLS-1$ - public static final String DECISION_NODE_CN_LABEL_DECISION_INPUT_HINT = "5043"; //$NON-NLS-1$ + public static final String DECISION_NODE_CN_LABEL_DECISION_INPUT_HINT = "DecisionNode_DecisionInputLabel"; //$NON-NLS-1$ - public static final String DECISION_NODE_CN_LABEL_APPLIED_STEREOTYPE_HINT = "5098"; //$NON-NLS-1$ + public static final String DECISION_NODE_CN_LABEL_APPLIED_STEREOTYPE_HINT = "DecisionNode_StereotypeLabel"; //$NON-NLS-1$ /** ActivityDiagram :: FLOW_FINAL_NODE_CN */ - public static final IHintedType FLOW_FINAL_NODE_CN = (IHintedType) getElementType("org.eclipse.papyrus.uml.diagram.activity.FlowFinalNode_3006"); //$NON-NLS-1$ + public static final IHintedType FLOW_FINAL_NODE_CN = (IHintedType) getElementType("org.eclipse.papyrus.umldi.FlowFinalNode_Shape"); //$NON-NLS-1$ - public static final String FLOW_FINAL_NODE_CN_LABEL_APPLIED_STEREOTYPE_HINT = "5082"; //$NON-NLS-1$ + public static final String FLOW_FINAL_NODE_CN_LABEL_APPLIED_STEREOTYPE_HINT = "FlowFinalNode_StereotypeLabel"; //$NON-NLS-1$ /** ActivityDiagram :: FORK_NODE_CN */ - public static final IHintedType FORK_NODE_CN = (IHintedType) getElementType("org.eclipse.papyrus.uml.diagram.activity.ForkNode_3040"); //$NON-NLS-1$ + public static final IHintedType FORK_NODE_CN = (IHintedType) getElementType("org.eclipse.papyrus.umldi.ForkNode_Shape"); //$NON-NLS-1$ - public static final String FORK_NODE_CN_LABEL_APPLIED_STEREOTYPE_HINT = "5100"; //$NON-NLS-1$ + public static final String FORK_NODE_CN_LABEL_APPLIED_STEREOTYPE_HINT = "ForkNode_StereotypeLabel"; //$NON-NLS-1$ /** ActivityDiagram :: INITIAL_NODE_CN */ - public static final IHintedType INITIAL_NODE_CN = (IHintedType) getElementType("org.eclipse.papyrus.uml.diagram.activity.InitialNode_3004"); //$NON-NLS-1$ + public static final IHintedType INITIAL_NODE_CN = (IHintedType) getElementType("org.eclipse.papyrus.umldi.InitialNode_Shape"); //$NON-NLS-1$ - public static final String INITIAL_NODE_CN_LABEL_APPLIED_STEREOTYPE_HINT = "5080"; //$NON-NLS-1$ + public static final String INITIAL_NODE_CN_LABEL_APPLIED_STEREOTYPE_HINT = "InitialNode_StereotypeLabel"; //$NON-NLS-1$ /** ActivityDiagram :: JOIN_NODE_CN */ - public static final IHintedType JOIN_NODE_CN = (IHintedType) getElementType("org.eclipse.papyrus.uml.diagram.activity.JoinNode_3041"); //$NON-NLS-1$ + public static final IHintedType JOIN_NODE_CN = (IHintedType) getElementType("org.eclipse.papyrus.umldi.JoinNode_Shape"); //$NON-NLS-1$ - public static final String JOIN_NODE_CN_LABEL_JOIN_SPEC_HINT = "5042"; //$NON-NLS-1$ + public static final String JOIN_NODE_CN_LABEL_JOIN_SPEC_HINT = "JoinNode_JoinSpecLabel"; //$NON-NLS-1$ - public static final String JOIN_NODE_CN_LABEL_APPLIED_STEREOTYPE_HINT = "5101"; //$NON-NLS-1$ + public static final String JOIN_NODE_CN_LABEL_APPLIED_STEREOTYPE_HINT = "JoinNode_StereotypeLabel"; //$NON-NLS-1$ /** ActivityDiagram :: LOOP_NODE_CN */ - public static final IHintedType LOOP_NODE_CN = (IHintedType) getElementType("org.eclipse.papyrus.uml.diagram.activity.LoopNode_3071"); //$NON-NLS-1$ + public static final IHintedType LOOP_NODE_CN = (IHintedType) getElementType("org.eclipse.papyrus.umldi.LoopNode_Shape"); //$NON-NLS-1$ - public static final String LOOP_NODE_CN_COMPARTMENT_STRUCTURED_ACTIVITY_NODE_CONTENT_HINT = "7010"; //$NON-NLS-1$ + public static final String LOOP_NODE_CN_COMPARTMENT_STRUCTURED_ACTIVITY_NODE_CONTENT_HINT = "LoopNode_ActivityNodeCompartment"; //$NON-NLS-1$ - public static final String LOOP_NODE_CN_LABEL_KEYWORD_HINT = "5121"; //$NON-NLS-1$ + public static final String LOOP_NODE_CN_LABEL_KEYWORD_HINT = "LoopNode_KeywordLabel"; //$NON-NLS-1$ /** ActivityDiagram :: MERGE_NODE_CN */ - public static final IHintedType MERGE_NODE_CN = (IHintedType) getElementType("org.eclipse.papyrus.uml.diagram.activity.MergeNode_3039"); //$NON-NLS-1$ + public static final IHintedType MERGE_NODE_CN = (IHintedType) getElementType("org.eclipse.papyrus.umldi.MergeNode_Shape"); //$NON-NLS-1$ - public static final String MERGE_NODE_CN_LABEL_APPLIED_STEREOTYPE_HINT = "5099"; //$NON-NLS-1$ + public static final String MERGE_NODE_CN_LABEL_APPLIED_STEREOTYPE_HINT = "MergeNode_StereotypeLabel"; //$NON-NLS-1$ /** ActivityDiagram :: SHAPE_NAMED_ELEMENT_CN */ - public static final IHintedType SHAPE_NAMED_ELEMENT_CN = (IHintedType) getElementType("org.eclipse.papyrus.uml.diagram.activity.NamedElement_3085"); //$NON-NLS-1$ + public static final IHintedType SHAPE_NAMED_ELEMENT_CN = (IHintedType) getElementType("org.eclipse.papyrus.umldi.NamedElement_DefaultShape"); //$NON-NLS-1$ - public static final String SHAPE_NAMED_ELEMENT_CN_LABEL_NAME_HINT = "5129"; //$NON-NLS-1$ + public static final String SHAPE_NAMED_ELEMENT_CN_LABEL_NAME_HINT = "NamedElement_NameLabel"; //$NON-NLS-1$ /** ActivityDiagram :: ACTIVITY */ - public static final IHintedType ACTIVITY = (IHintedType) getElementType("org.eclipse.papyrus.uml.diagram.activity.Activity_2001"); //$NON-NLS-1$ + public static final IHintedType ACTIVITY = (IHintedType) getElementType("org.eclipse.papyrus.umldi.Activity_Shape"); //$NON-NLS-1$ - public static final String ACTIVITY_COMPARTMENT_ACTIVITY_FIGURE_PARAMETER_HINT = "7001"; //$NON-NLS-1$ + public static final String ACTIVITY_COMPARTMENT_ACTIVITY_FIGURE_PARAMETER_HINT = "Activity_ParameterCompartment"; //$NON-NLS-1$ - public static final String ACTIVITY_COMPARTMENT_ACTIVITY_FIGURE_PRECONDITION_HINT = "7002"; //$NON-NLS-1$ + public static final String ACTIVITY_COMPARTMENT_ACTIVITY_FIGURE_PRECONDITION_HINT = "Activity_PreconditionCompartment"; //$NON-NLS-1$ - public static final String ACTIVITY_COMPARTMENT_ACTIVITY_FIGURE_POST_CONDTION_HINT = "7003"; //$NON-NLS-1$ + public static final String ACTIVITY_COMPARTMENT_ACTIVITY_FIGURE_POST_CONDTION_HINT = "Activity_PostconditionCompartment"; //$NON-NLS-1$ - public static final String ACTIVITY_COMPARTMENT_ACTIVITY_FIGURE_CONTENT_HINT = "7004"; //$NON-NLS-1$ + public static final String ACTIVITY_COMPARTMENT_ACTIVITY_FIGURE_CONTENT_HINT = "Activity_ActivityNodeCompartment"; //$NON-NLS-1$ - public static final String ACTIVITY_LABEL_NAME_HINT = "5001"; //$NON-NLS-1$ + public static final String ACTIVITY_LABEL_NAME_HINT = "Activity_NameLabel"; //$NON-NLS-1$ - public static final String ACTIVITY_LABEL_IS_SINGLE_EXECUTION_HINT = "5002"; //$NON-NLS-1$ + public static final String ACTIVITY_LABEL_IS_SINGLE_EXECUTION_HINT = "Activity_KeywordLabel"; //$NON-NLS-1$ /** ActivityDiagram :: SEQUENCE_NODE_CN */ - public static final IHintedType SEQUENCE_NODE_CN = (IHintedType) getElementType("org.eclipse.papyrus.uml.diagram.activity.SequenceNode_3073"); //$NON-NLS-1$ + public static final IHintedType SEQUENCE_NODE_CN = (IHintedType) getElementType("org.eclipse.papyrus.umldi.SequenceNode_Shape"); //$NON-NLS-1$ - public static final String SEQUENCE_NODE_CN_COMPARTMENT_STRUCTURED_ACTIVITY_NODE_CONTENT_HINT = "7012"; //$NON-NLS-1$ + public static final String SEQUENCE_NODE_CN_COMPARTMENT_STRUCTURED_ACTIVITY_NODE_CONTENT_HINT = "SequenceNode_ActivityNodeCompartment"; //$NON-NLS-1$ - public static final String SEQUENCE_NODE_CN_LABEL_KEYWORD_HINT = "5123"; //$NON-NLS-1$ + public static final String SEQUENCE_NODE_CN_LABEL_KEYWORD_HINT = "SequenceNode_KeywordLabel"; //$NON-NLS-1$ /** ActivityDiagram :: CONSTRAINT_CN */ - public static final IHintedType CONSTRAINT_CN = (IHintedType) getElementType("org.eclipse.papyrus.uml.diagram.activity.Constraint_3112"); //$NON-NLS-1$ + public static final IHintedType CONSTRAINT_CN = (IHintedType) getElementType("org.eclipse.papyrus.umldi.Constraint_Shape"); //$NON-NLS-1$ - public static final String CONSTRAINT_CN_LABEL_NAME_HINT = "5189"; //$NON-NLS-1$ + public static final String CONSTRAINT_CN_LABEL_NAME_HINT = "Constraint_NameLabel"; //$NON-NLS-1$ - public static final String CONSTRAINT_CN_LABEL_BODY_HINT = "5190"; //$NON-NLS-1$ + public static final String CONSTRAINT_CN_LABEL_BODY_HINT = "Constraint_BodyLabel"; //$NON-NLS-1$ /** ActivityDiagram :: COMMENT_ANNOTATED_ELEMENT */ - public static final IHintedType COMMENT_ANNOTATED_ELEMENT = (IHintedType) getElementType("org.eclipse.papyrus.uml.diagram.activity.CommentAnnotatedElement_4006"); //$NON-NLS-1$ + public static final IHintedType COMMENT_ANNOTATED_ELEMENT = (IHintedType) getElementType("org.eclipse.papyrus.umldi.Comment_AnnotatedElementEdge"); //$NON-NLS-1$ /** ActivityDiagram :: CONTROL_FLOW */ - public static final IHintedType CONTROL_FLOW = (IHintedType) getElementType("org.eclipse.papyrus.uml.diagram.activity.ControlFlow_4004"); //$NON-NLS-1$ + public static final IHintedType CONTROL_FLOW = (IHintedType) getElementType("org.eclipse.papyrus.umldi.ControlFlow_Edge"); //$NON-NLS-1$ - public static final String CONTROL_FLOW_LABEL_NAME_HINT = "6003"; //$NON-NLS-1$ + public static final String CONTROL_FLOW_LABEL_NAME_HINT = "ControlFlow_NameLabel"; //$NON-NLS-1$ - public static final String CONTROL_FLOW_LABEL_WEIGHT_HINT = "6004"; //$NON-NLS-1$ + public static final String CONTROL_FLOW_LABEL_WEIGHT_HINT = "ControlFlow_WeightLabel"; //$NON-NLS-1$ - public static final String CONTROL_FLOW_LABEL_GUARD_HINT = "6009"; //$NON-NLS-1$ + public static final String CONTROL_FLOW_LABEL_GUARD_HINT = "ControlFlow_GuardLabel"; //$NON-NLS-1$ - public static final String CONTROL_FLOW_LABEL_APPLIED_STEREOTYPE_HINT = "6011"; //$NON-NLS-1$ + public static final String CONTROL_FLOW_LABEL_APPLIED_STEREOTYPE_HINT = "ControlFlow_StereotypeLabel"; //$NON-NLS-1$ - public static final String CONTROL_FLOW_LABEL_INTERRUPTIBLE_ICON_HINT = "6013"; //$NON-NLS-1$ + public static final String CONTROL_FLOW_LABEL_INTERRUPTIBLE_ICON_HINT = "ControlFlow_IconLabel"; //$NON-NLS-1$ /** ActivityDiagram :: ChildLabelNodes */ - public static final IHintedType ACTIVITY_PARAMETER_CLN = (IHintedType) getElementType("org.eclipse.papyrus.uml.diagram.activity.Parameter_3001"); //$NON-NLS-1$ + public static final IHintedType ACTIVITY_PARAMETER_CLN = (IHintedType) getElementType("org.eclipse.papyrus.umldi.Parameter_ParameterLabel"); //$NON-NLS-1$ - public static final IHintedType ACTIVITY_CONSTRAINT_CLN = (IHintedType) getElementType("org.eclipse.papyrus.uml.diagram.activity.Constraint_3002"); //$NON-NLS-1$ + public static final IHintedType ACTIVITY_CONSTRAINT_CLN = (IHintedType) getElementType("org.eclipse.papyrus.umldi.Constraint_PreconditionLabel"); //$NON-NLS-1$ } diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/src-gen/org/eclipse/papyrus/uml/diagram/interactionoverview/provider/InheritedActivityDiagramViewProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/src-gen/org/eclipse/papyrus/uml/diagram/interactionoverview/provider/InheritedActivityDiagramViewProvider.java index 2ca63f0bd39..f57db76f6b8 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/src-gen/org/eclipse/papyrus/uml/diagram/interactionoverview/provider/InheritedActivityDiagramViewProvider.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/src-gen/org/eclipse/papyrus/uml/diagram/interactionoverview/provider/InheritedActivityDiagramViewProvider.java @@ -54,10 +54,10 @@ public class InheritedActivityDiagramViewProvider extends CustomUMLViewProvider // preferencesHint); if (ElementTypes.COMMENT_ANNOTATED_ELEMENT.getSemanticHint().equals(domainElementGraphicalType)) { - createdEdge = createCommentAnnotatedElement_4006(containerView, index, persisted, preferencesHint); + createdEdge = createComment_AnnotatedElementEdge(containerView, index, persisted, preferencesHint); } if (ElementTypes.CONTROL_FLOW.getSemanticHint().equals(domainElementGraphicalType)) { - createdEdge = createControlFlow_4004(domainElement, containerView, index, persisted, preferencesHint); + createdEdge = createControlFlow_Edge(domainElement, containerView, index, persisted, preferencesHint); } } } diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/src/org/eclipse/papyrus/uml/diagram/interactionoverview/edit/commands/ChangeInteractionToInteractionUseCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/src/org/eclipse/papyrus/uml/diagram/interactionoverview/edit/commands/ChangeInteractionToInteractionUseCommand.java index 4db867d2971..31122792f2c 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/src/org/eclipse/papyrus/uml/diagram/interactionoverview/edit/commands/ChangeInteractionToInteractionUseCommand.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/src/org/eclipse/papyrus/uml/diagram/interactionoverview/edit/commands/ChangeInteractionToInteractionUseCommand.java @@ -34,7 +34,7 @@ public class ChangeInteractionToInteractionUseCommand extends protected Node createTargetCallBehaviorView(
CallBehaviorAction callBehaviorAction, View containerView, int index) {
InheritedActivityDiagramViewProvider viewProvider = new InheritedActivityDiagramViewProvider();
- return viewProvider.createCallBehaviorAction_3008(callBehaviorAction, containerView, index, true, this.callBehaviorActionEditPart.getDiagramPreferencesHint());
+ return viewProvider.createCallBehaviorAction_Shape(callBehaviorAction, containerView, index, true, this.callBehaviorActionEditPart.getDiagramPreferencesHint());
}
}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/src/org/eclipse/papyrus/uml/diagram/interactionoverview/edit/commands/ChangeInteractionUseToInteraction.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/src/org/eclipse/papyrus/uml/diagram/interactionoverview/edit/commands/ChangeInteractionUseToInteraction.java index 7bcf2366766..ee256539926 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/src/org/eclipse/papyrus/uml/diagram/interactionoverview/edit/commands/ChangeInteractionUseToInteraction.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/src/org/eclipse/papyrus/uml/diagram/interactionoverview/edit/commands/ChangeInteractionUseToInteraction.java @@ -34,7 +34,7 @@ public class ChangeInteractionUseToInteraction extends protected Node createTargetCallBehaviorView(
CallBehaviorAction callBehaviorAction, View containerView, int index) {
CustomViewProvider viewProvider = new CustomViewProvider();
- return viewProvider.createCallBehaviorAction_5000(callBehaviorAction, containerView, index, true, this.callBehaviorActionEditPart.getDiagramPreferencesHint());
+ return viewProvider.createCallBehaviorAction_InteractionShape(callBehaviorAction, containerView, index, true, this.callBehaviorActionEditPart.getDiagramPreferencesHint());
}
}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/src/org/eclipse/papyrus/uml/diagram/interactionoverview/edit/commands/DropInteractionWithSnapshotCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/src/org/eclipse/papyrus/uml/diagram/interactionoverview/edit/commands/DropInteractionWithSnapshotCommand.java index f71e38bbf77..3c2040e07c8 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/src/org/eclipse/papyrus/uml/diagram/interactionoverview/edit/commands/DropInteractionWithSnapshotCommand.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/src/org/eclipse/papyrus/uml/diagram/interactionoverview/edit/commands/DropInteractionWithSnapshotCommand.java @@ -69,7 +69,7 @@ public class DropInteractionWithSnapshotCommand extends protected Node createTargetCallBehaviorView(
CallBehaviorAction callBehaviorAction, View containerView, int index) {
CustomViewProvider viewProvider = new CustomViewProvider();
- return viewProvider.createCallBehaviorAction_5000(callBehaviorAction, containerView, index, true, this.parentEditPart.getDiagramPreferencesHint());
+ return viewProvider.createCallBehaviorAction_InteractionShape(callBehaviorAction, containerView, index, true, this.parentEditPart.getDiagramPreferencesHint());
}
protected CallBehaviorActionType getTargetCallBehaviorType() {
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/src/org/eclipse/papyrus/uml/diagram/interactionoverview/edit/part/CallBehaviorActionAsInteractionEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/src/org/eclipse/papyrus/uml/diagram/interactionoverview/edit/part/CallBehaviorActionAsInteractionEditPart.java index 5e06adbbf09..8acac57ebc6 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/src/org/eclipse/papyrus/uml/diagram/interactionoverview/edit/part/CallBehaviorActionAsInteractionEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/src/org/eclipse/papyrus/uml/diagram/interactionoverview/edit/part/CallBehaviorActionAsInteractionEditPart.java @@ -37,7 +37,7 @@ import org.eclipse.uml2.uml.CallBehaviorAction; public class CallBehaviorActionAsInteractionEditPart extends CallBehaviorActionEditPart {
- public static final String INTERACTION_VISUAL_ID = "5000";
+ public static final String VISUAL_ID = "CallBehaviorAction_InteractionShape";
public CallBehaviorActionAsInteractionEditPart(final View view) {
super(view);
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/src/org/eclipse/papyrus/uml/diagram/interactionoverview/edit/part/CustomInteractionUseEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/src/org/eclipse/papyrus/uml/diagram/interactionoverview/edit/part/CustomInteractionUseEditPartCN.java index 0e3f1f096e7..111cd1e951b 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/src/org/eclipse/papyrus/uml/diagram/interactionoverview/edit/part/CustomInteractionUseEditPartCN.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/src/org/eclipse/papyrus/uml/diagram/interactionoverview/edit/part/CustomInteractionUseEditPartCN.java @@ -17,7 +17,7 @@ import org.eclipse.papyrus.uml.diagram.interactionoverview.figures.InteractionUs public class CustomInteractionUseEditPartCN extends CallBehaviorActionEditPart {
- public static final String INTERACTIONUSE_VISUAL_ID = "5005";
+ public static final String VISUAL_ID = "CallBehaviorAction_InteractionUseShape";
public CustomInteractionUseEditPartCN(final View view) {
super(view);
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/src/org/eclipse/papyrus/uml/diagram/interactionoverview/edit/part/CustomInteractionUseNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/src/org/eclipse/papyrus/uml/diagram/interactionoverview/edit/part/CustomInteractionUseNameEditPart.java index c9b2814d759..bd8f8653c18 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/src/org/eclipse/papyrus/uml/diagram/interactionoverview/edit/part/CustomInteractionUseNameEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/src/org/eclipse/papyrus/uml/diagram/interactionoverview/edit/part/CustomInteractionUseNameEditPart.java @@ -1,42 +1,42 @@ -/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
- *
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- *****************************************************************************/
-package org.eclipse.papyrus.uml.diagram.interactionoverview.edit.part;
-
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.uml.diagram.activity.edit.parts.CallBehaviorActionNameEditPart;
-import org.eclipse.papyrus.uml.diagram.activity.part.UMLVisualIDRegistry;
-import org.eclipse.papyrus.uml.diagram.activity.providers.UMLElementTypes;
-import org.eclipse.papyrus.uml.diagram.activity.providers.UMLParserProvider;
-
-public class CustomInteractionUseNameEditPart extends CallBehaviorActionNameEditPart {
-
- /**
- * @see org.eclipse.papyrus.uml.diagram.activity.edit.parts.CallBehaviorActionNameEditPart#getParser()
- *
- * @return
- */
-
- IParser customParser;
-
- @Override
- public IParser getParser() {
- if (customParser == null) {
- customParser = UMLParserProvider.getParser(UMLElementTypes.CallBehaviorAction_3008, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.activity.edit.parts.CallBehaviorActionNameEditPart.VISUAL_ID));
- }
- return customParser;
- }
-
- public CustomInteractionUseNameEditPart(final View view) {
- super(view);
- }
-
-}
+/***************************************************************************** + * Copyright (c) 2013 CEA LIST. + * + * + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + *****************************************************************************/ +package org.eclipse.papyrus.uml.diagram.interactionoverview.edit.part; + +import org.eclipse.gmf.runtime.common.ui.services.parser.IParser; +import org.eclipse.gmf.runtime.notation.View; +import org.eclipse.papyrus.uml.diagram.activity.edit.parts.CallBehaviorActionNameEditPart; +import org.eclipse.papyrus.uml.diagram.activity.part.UMLVisualIDRegistry; +import org.eclipse.papyrus.uml.diagram.activity.providers.UMLElementTypes; +import org.eclipse.papyrus.uml.diagram.activity.providers.UMLParserProvider; + +public class CustomInteractionUseNameEditPart extends CallBehaviorActionNameEditPart { + + /** + * @see org.eclipse.papyrus.uml.diagram.activity.edit.parts.CallBehaviorActionNameEditPart#getParser() + * + * @return + */ + + IParser customParser; + + @Override + public IParser getParser() { + if (customParser == null) { + customParser = UMLParserProvider.getParser(UMLElementTypes.CallBehaviorAction_Shape, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.activity.edit.parts.CallBehaviorActionNameEditPart.VISUAL_ID)); + } + return customParser; + } + + public CustomInteractionUseNameEditPart(final View view) { + super(view); + } + +} diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/src/org/eclipse/papyrus/uml/diagram/interactionoverview/edit/part/CustomUMLInteractionOverviewEditPartFactory.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/src/org/eclipse/papyrus/uml/diagram/interactionoverview/edit/part/CustomUMLInteractionOverviewEditPartFactory.java index 916b7fd2a22..b19cfca1154 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/src/org/eclipse/papyrus/uml/diagram/interactionoverview/edit/part/CustomUMLInteractionOverviewEditPartFactory.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/src/org/eclipse/papyrus/uml/diagram/interactionoverview/edit/part/CustomUMLInteractionOverviewEditPartFactory.java @@ -24,15 +24,15 @@ public class CustomUMLInteractionOverviewEditPartFactory extends CustomUMLEditPa String visualID = org.eclipse.papyrus.uml.diagram.activity.part.UMLVisualIDRegistry.getVisualID(view);
if (visualID != null) {
switch (visualID) {
- case CustomActivityEditPartTN.VISUAL_ID:// 2001
+ case CustomActivityEditPartTN.VISUAL_ID:// Activity_Shape
return new CustomActivityEditPartTN(view);
- case CallBehaviorActionEditPart.VISUAL_ID: // 3008
- case CustomInteractionUseEditPartCN.INTERACTIONUSE_VISUAL_ID:// 5005
+ case CallBehaviorActionEditPart.VISUAL_ID: // CallBehaviorAction_Shape
+ case CustomInteractionUseEditPartCN.VISUAL_ID:// CallBehaviorAction_InteractionShapeShape
return new CustomInteractionUseEditPartCN(view);
case CustomInteractionUseNameEditPart.VISUAL_ID:
- return new CustomInteractionUseNameEditPart(view);// 5004
- case CallBehaviorActionAsInteractionEditPart.INTERACTION_VISUAL_ID:
- return new CallBehaviorActionAsInteractionEditPart(view);// 5000
+ return new CustomInteractionUseNameEditPart(view);// CallBehaviorAction_NameLabel
+ case CallBehaviorActionAsInteractionEditPart.VISUAL_ID:
+ return new CallBehaviorActionAsInteractionEditPart(view);// CallBehaviorAction_InteractionShape
default:
// when adding cases to this switch, also add the corresponding
// IDs in the extension
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/src/org/eclipse/papyrus/uml/diagram/interactionoverview/edit/policies/ActivityContentCompartmentCreationEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/src/org/eclipse/papyrus/uml/diagram/interactionoverview/edit/policies/ActivityContentCompartmentCreationEditPolicy.java index 30a1171e7bd..75b1f1a6763 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/src/org/eclipse/papyrus/uml/diagram/interactionoverview/edit/policies/ActivityContentCompartmentCreationEditPolicy.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/src/org/eclipse/papyrus/uml/diagram/interactionoverview/edit/policies/ActivityContentCompartmentCreationEditPolicy.java @@ -36,12 +36,12 @@ public class ActivityContentCompartmentCreationEditPolicy extends PapyrusCreatio final List<? extends ViewDescriptor> viewDescriptors = request.getViewDescriptors();
if (request instanceof CreateViewAndElementRequest && viewDescriptors.size() == 1) {
final String semanticHint = viewDescriptors.get(0).getSemanticHint();
- if (CallBehaviorActionAsInteractionEditPart.INTERACTION_VISUAL_ID.equals(semanticHint)) {
+ if (CallBehaviorActionAsInteractionEditPart.VISUAL_ID.equals(semanticHint)) {
return getCreateCallBehaviorActionAsInteractionCommand(request, superCommand);
}
} else if (request instanceof CreateViewRequest && viewDescriptors.size() == 1) {
final String semanticHint = viewDescriptors.get(0).getSemanticHint();
- if (CallBehaviorActionAsInteractionEditPart.INTERACTION_VISUAL_ID.equals(semanticHint)) {
+ if (CallBehaviorActionAsInteractionEditPart.VISUAL_ID.equals(semanticHint)) {
return getCreateCallBehaviorActionAsInteractionCommand(request, superCommand);
}
}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/src/org/eclipse/papyrus/uml/diagram/interactionoverview/migration/InteractionOverviewReconciler_1_2_0.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/src/org/eclipse/papyrus/uml/diagram/interactionoverview/migration/InteractionOverviewReconciler_1_2_0.java new file mode 100644 index 00000000000..6b88d2d268f --- /dev/null +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/src/org/eclipse/papyrus/uml/diagram/interactionoverview/migration/InteractionOverviewReconciler_1_2_0.java @@ -0,0 +1,160 @@ +/***************************************************************************** + * Copyright (c) 2016 CEA LIST and others. + * + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * CEA LIST - Initial API and implementation + * + *****************************************************************************/ + +package org.eclipse.papyrus.uml.diagram.interactionoverview.migration; + +import java.util.HashSet; +import java.util.Set; + +import org.eclipse.core.commands.ExecutionException; +import org.eclipse.core.runtime.IAdaptable; +import org.eclipse.core.runtime.IProgressMonitor; +import org.eclipse.emf.common.util.TreeIterator; +import org.eclipse.emf.ecore.EObject; +import org.eclipse.gmf.runtime.common.core.command.AbstractCommand; +import org.eclipse.gmf.runtime.common.core.command.CommandResult; +import org.eclipse.gmf.runtime.common.core.command.CompositeCommand; +import org.eclipse.gmf.runtime.common.core.command.ICommand; +import org.eclipse.gmf.runtime.notation.Diagram; +import org.eclipse.gmf.runtime.notation.View; +import org.eclipse.papyrus.infra.gmfdiag.common.reconciler.DiagramReconciler; +import org.eclipse.papyrus.uml.diagram.activity.migration.ActivityReconciler_1_2_0; + +/** + * @author melaasar + * + */ +public class InteractionOverviewReconciler_1_2_0 extends DiagramReconciler { + + @Override + public ICommand getReconcileCommand(Diagram diagram) { + CompositeCommand cc = new CompositeCommand("Migrate diagram from 1.1.0 to 1.2.0"); + cc.add(new DeleteObsoleteViewCommand(diagram)); + cc.add(new ChangeVisualIDsCommand(diagram)); + return cc; + } + + protected class DeleteObsoleteViewCommand extends AbstractCommand { + + protected final Diagram diagram; + + public DeleteObsoleteViewCommand(Diagram diagram) { + super("Deleting obselete views in 1.1.0"); + this.diagram = diagram; + } + + @Override + protected CommandResult doExecuteWithResult(IProgressMonitor progressMonitor, IAdaptable info) throws ExecutionException { + TreeIterator<EObject> allContentIterator = diagram.eAllContents(); + + Set<View> toDelete = new HashSet<View>(); + while (allContentIterator.hasNext()) { + EObject eObject = allContentIterator.next(); + if (eObject instanceof View) { + View view = (View) eObject; + if (view.getType().equals("5173"))//InputPinInBroadcastSignalActionValueLabel + toDelete.add(view); + } + } + + for (View v : toDelete) { + View container = (View) v.eContainer(); + container.getPersistedChildren().remove(v); + } + + return CommandResult.newOKCommandResult(); + } + + @Override + public boolean canUndo() { + return false; + } + + @Override + public boolean canRedo() { + return false; + } + + @Override + protected CommandResult doRedoWithResult(IProgressMonitor progressMonitor, IAdaptable info) throws ExecutionException { + throw new ExecutionException("Should not be called, canRedo false"); + } + + @Override + protected CommandResult doUndoWithResult(IProgressMonitor progressMonitor, IAdaptable info) throws ExecutionException { + throw new ExecutionException("Should not be called, canUndo false"); + } + } + + protected class ChangeVisualIDsCommand extends AbstractCommand { + + protected final Diagram diagram; + + public ChangeVisualIDsCommand(Diagram diagram) { + super("Change the diagram's visual ids from 1.1.0 to 1.2.0"); + this.diagram = diagram; + } + + @Override + protected CommandResult doExecuteWithResult(IProgressMonitor progressMonitor, IAdaptable info) throws ExecutionException { + TreeIterator<EObject> allContentIterator = diagram.eAllContents(); + + while (allContentIterator.hasNext()) { + EObject eObject = allContentIterator.next(); + if (eObject instanceof View) { + View view = (View) eObject; + view.setType(getNewVisualID(view.getType())); + } + } + + return CommandResult.newOKCommandResult(); + } + + @Override + public boolean canUndo() { + return false; + } + + @Override + public boolean canRedo() { + return false; + } + + @Override + protected CommandResult doRedoWithResult(IProgressMonitor progressMonitor, IAdaptable info) throws ExecutionException { + throw new ExecutionException("Should not be called, canRedo false"); + } + + @Override + protected CommandResult doUndoWithResult(IProgressMonitor progressMonitor, IAdaptable info) throws ExecutionException { + throw new ExecutionException("Should not be called, canUndo false"); + } + } + + public static String getNewVisualID(String oldVisualID) { + switch (oldVisualID) { + case "1000": + return "Package_InteractionOverviewDiagram"; + case "5000": + return "CallBehaviorAction_InteractionShape"; + case "5005": + return "CallBehaviorAction_InteractionUseShape"; + default: + return defaultGetNewVisualID(oldVisualID); + } + } + + private static String defaultGetNewVisualID(String oldVisualID) { + return ActivityReconciler_1_2_0.getNewVisualID(oldVisualID); + } +} diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/src/org/eclipse/papyrus/uml/diagram/interactionoverview/part/CustomIODPaletteFactory.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/src/org/eclipse/papyrus/uml/diagram/interactionoverview/part/CustomIODPaletteFactory.java index cb045a1f957..860c079deb6 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/src/org/eclipse/papyrus/uml/diagram/interactionoverview/part/CustomIODPaletteFactory.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/src/org/eclipse/papyrus/uml/diagram/interactionoverview/part/CustomIODPaletteFactory.java @@ -39,14 +39,14 @@ public class CustomIODPaletteFactory extends UMLPaletteFactory { private static Tool createCallBehaviorActionAsInteractionCreationTool() {
final List<IElementType> types = new ArrayList<IElementType>(1);
- types.add(UMLElementTypes.CallBehaviorAction_5000);
+ types.add(UMLElementTypes.CallBehaviorAction_InteractionShape);
final Tool tool = new AspectUnspecifiedTypeCreationTool(types);
return tool;
}
private static Tool createCallBehaviorActionAsInteractionUseCreationTool() {
final List<IElementType> types = new ArrayList<IElementType>(1);
- types.add(UMLElementTypes.CallBehaviorAction_As_InteractionUse_5005);
+ types.add(UMLElementTypes.CallBehaviorAction_InteractionUseShape);
final Tool tool = new AspectUnspecifiedTypeCreationTool(types);
return tool;
}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/src/org/eclipse/papyrus/uml/diagram/interactionoverview/part/UMLVisualIDRegistry.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/src/org/eclipse/papyrus/uml/diagram/interactionoverview/part/UMLVisualIDRegistry.java index 7299ff3c34d..62c872023cb 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/src/org/eclipse/papyrus/uml/diagram/interactionoverview/part/UMLVisualIDRegistry.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/src/org/eclipse/papyrus/uml/diagram/interactionoverview/part/UMLVisualIDRegistry.java @@ -130,11 +130,11 @@ public class UMLVisualIDRegistry extends org.eclipse.papyrus.uml.diagram.activit if (UMLPackage.eINSTANCE.getFlowFinalNode().isSuperTypeOf(domainElement.eClass())) {
return FlowFinalNodeEditPart.VISUAL_ID;
}
- if (UMLPackage.eINSTANCE.getCallBehaviorAction().isSuperTypeOf(domainElement.eClass()) && isInteractionUse_3008(containerView, (CallBehaviorAction) domainElement)) {
+ if (UMLPackage.eINSTANCE.getCallBehaviorAction().isSuperTypeOf(domainElement.eClass()) && isCallBehaviorAction_Shape(containerView, (CallBehaviorAction) domainElement)) {
return CallBehaviorActionEditPart.VISUAL_ID;
}
- if (UMLPackage.eINSTANCE.getCallBehaviorAction().isSuperTypeOf(domainElement.eClass()) && isInteraction_5000(containerView, (CallBehaviorAction) domainElement)) {
- return CallBehaviorActionAsInteractionEditPart.INTERACTION_VISUAL_ID;
+ if (UMLPackage.eINSTANCE.getCallBehaviorAction().isSuperTypeOf(domainElement.eClass()) && isCallBehaviorAction_InteractionShape(containerView, (CallBehaviorAction) domainElement)) {
+ return CallBehaviorActionAsInteractionEditPart.VISUAL_ID;
}
if (UMLPackage.eINSTANCE.getDecisionNode().isSuperTypeOf(domainElement.eClass())) {
return DecisionNodeEditPart.VISUAL_ID;
@@ -183,7 +183,7 @@ public class UMLVisualIDRegistry extends org.eclipse.papyrus.uml.diagram.activit return null;
}
- private static boolean isInteractionUse_3008(final View containerView, final CallBehaviorAction domainElement) {
+ private static boolean isCallBehaviorAction_Shape(final View containerView, final CallBehaviorAction domainElement) {
return CallBehaviorUtil.getCallBehaviorType(domainElement) == CallBehaviorUtil.CallBehaviorActionType.use;
}
@@ -192,7 +192,7 @@ public class UMLVisualIDRegistry extends org.eclipse.papyrus.uml.diagram.activit * @generated
*/
- private static boolean isInteraction_5000(final View containerView, final CallBehaviorAction domainElement) {
+ private static boolean isCallBehaviorAction_InteractionShape(final View containerView, final CallBehaviorAction domainElement) {
return CallBehaviorUtil.getCallBehaviorType(domainElement) == CallBehaviorUtil.CallBehaviorActionType.snapshot;
}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/src/org/eclipse/papyrus/uml/diagram/interactionoverview/provider/CustomViewProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/src/org/eclipse/papyrus/uml/diagram/interactionoverview/provider/CustomViewProvider.java index fd2e0247d64..c3c03ee5cdb 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/src/org/eclipse/papyrus/uml/diagram/interactionoverview/provider/CustomViewProvider.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/src/org/eclipse/papyrus/uml/diagram/interactionoverview/provider/CustomViewProvider.java @@ -59,13 +59,13 @@ public class CustomViewProvider extends AbstractViewProvider { // /////////////////////////////////////////////////////////////////////
final IElementType elementType = (IElementType) op.getSemanticAdapter().getAdapter(IElementType.class);
- if (elementType == UMLElementTypes.CallBehaviorAction_5000) {
+ if (elementType == UMLElementTypes.CallBehaviorAction_InteractionShape) {
if (ElementTypes.ACTIVITY_COMPARTMENT_ACTIVITY_FIGURE_CONTENT_HINT.equals(containerGraphicalType)) {
return true;
}
}
- if (elementType == UMLElementTypes.CallBehaviorAction_As_InteractionUse_5005) {
+ if (elementType == UMLElementTypes.CallBehaviorAction_InteractionUseShape) {
if (ElementTypes.ACTIVITY_COMPARTMENT_ACTIVITY_FIGURE_CONTENT_HINT.equals(containerGraphicalType)) {
return true;
}
@@ -83,21 +83,21 @@ public class CustomViewProvider extends AbstractViewProvider { visualID = UMLVisualIDRegistry.getVisualID(semanticHint);
}
switch (visualID) {
- case CallBehaviorActionAsInteractionEditPart.INTERACTION_VISUAL_ID:
- return createCallBehaviorAction_5000(domainElement, containerView, index, persisted, preferencesHint);
+ case CallBehaviorActionAsInteractionEditPart.VISUAL_ID:
+ return createCallBehaviorAction_InteractionShape(domainElement, containerView, index, persisted, preferencesHint);
case CallBehaviorActionEditPart.VISUAL_ID:
- case CustomInteractionUseEditPartCN.INTERACTIONUSE_VISUAL_ID:
- return createCallBehaviorAction_As_InteractionUse_5005(domainElement, containerView, index, persisted, preferencesHint);
+ case CustomInteractionUseEditPartCN.VISUAL_ID:
+ return createCallBehaviorAction_InteractionUseShape(domainElement, containerView, index, persisted, preferencesHint);
// can't happen, provided #provides(CreateNodeViewOperation) is correct
}
return null;
}
- public Node createCallBehaviorAction_5000(final EObject domainElement, final View containerView, final int index, final boolean persisted, final PreferencesHint preferencesHint) {
+ public Node createCallBehaviorAction_InteractionShape(final EObject domainElement, final View containerView, final int index, final boolean persisted, final PreferencesHint preferencesHint) {
final Shape node = NotationFactory.eINSTANCE.createShape();
node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());
- node.setType(UMLVisualIDRegistry.getType(CallBehaviorActionAsInteractionEditPart.INTERACTION_VISUAL_ID));
+ node.setType(UMLVisualIDRegistry.getType(CallBehaviorActionAsInteractionEditPart.VISUAL_ID));
ViewUtil.insertChildView(containerView, node, index, persisted);
node.setElement(domainElement);
CallBehaviorUtil.setCallBehaviorActionType((CallBehaviorAction) domainElement, CallBehaviorActionType.snapshot);
@@ -110,10 +110,10 @@ public class CustomViewProvider extends AbstractViewProvider { return node;
}
- public Node createCallBehaviorAction_As_InteractionUse_5005(final EObject domainElement, final View containerView, final int index, final boolean persisted, final PreferencesHint preferencesHint) {
+ public Node createCallBehaviorAction_InteractionUseShape(final EObject domainElement, final View containerView, final int index, final boolean persisted, final PreferencesHint preferencesHint) {
final Shape node = NotationFactory.eINSTANCE.createShape();
node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());
- node.setType(UMLVisualIDRegistry.getType(CustomInteractionUseEditPartCN.INTERACTIONUSE_VISUAL_ID));
+ node.setType(UMLVisualIDRegistry.getType(CustomInteractionUseEditPartCN.VISUAL_ID));
ViewUtil.insertChildView(containerView, node, index, persisted);
node.setElement(domainElement);
CallBehaviorUtil.setCallBehaviorActionType((CallBehaviorAction) domainElement, CallBehaviorActionType.use);
@@ -124,11 +124,11 @@ public class CustomViewProvider extends AbstractViewProvider { PreferenceInitializerForElementHelper.initBackgroundFromPrefs(node, prefStore, "CallBehaviorAction");
PreferenceInitializerForElementHelper.initCompartmentsStatusFromPrefs(node, prefStore, "CallBehaviorAction");
createLabel(node, UMLVisualIDRegistry.getType(CallBehaviorActionNameEditPart.VISUAL_ID));
- Node label6020 = createLabel(node, UMLVisualIDRegistry.getType(CallBehaviorActionFloatingNameEditPart.VISUAL_ID));
- label6020.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());
- Location location6020 = (Location) label6020.getLayoutConstraint();
- location6020.setX(0);
- location6020.setY(5);
+ Node callBehaviorAction_FloatingNameLabel = createLabel(node, UMLVisualIDRegistry.getType(CallBehaviorActionFloatingNameEditPart.VISUAL_ID));
+ callBehaviorAction_FloatingNameLabel.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());
+ Location callBehaviorAction_FloatingNameLabel_Location = (Location) callBehaviorAction_FloatingNameLabel.getLayoutConstraint();
+ callBehaviorAction_FloatingNameLabel_Location.setX(0);
+ callBehaviorAction_FloatingNameLabel_Location.setY(5);
return node;
}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/src/org/eclipse/papyrus/uml/diagram/interactionoverview/provider/ElementInitializers.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/src/org/eclipse/papyrus/uml/diagram/interactionoverview/provider/ElementInitializers.java index da40d0bda3d..c55c3ea2056 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/src/org/eclipse/papyrus/uml/diagram/interactionoverview/provider/ElementInitializers.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/src/org/eclipse/papyrus/uml/diagram/interactionoverview/provider/ElementInitializers.java @@ -26,16 +26,16 @@ public class ElementInitializers extends org.eclipse.papyrus.uml.diagram.activit return cached;
}
- public void init_CallBehaviorAction_5000(final CallBehaviorAction instance) {
+ public void init_CallBehaviorAction_InteractionShape(final CallBehaviorAction instance) {
try {
- final Object value_0 = name_CallBehaviorAction_5000(instance);
+ final Object value_0 = name_CallBehaviorAction_InteractionShape(instance);
instance.setName((String) value_0);
} catch (final RuntimeException e) {
UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$
}
}
- private String name_CallBehaviorAction_5000(final CallBehaviorAction self) {
+ private String name_CallBehaviorAction_InteractionShape(final CallBehaviorAction self) {
return LabelHelper.INSTANCE.findName(self.eContainer(), self);
}
}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/src/org/eclipse/papyrus/uml/diagram/interactionoverview/provider/UMLElementTypes.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/src/org/eclipse/papyrus/uml/diagram/interactionoverview/provider/UMLElementTypes.java index 9d892a8c738..fba8963f29d 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/src/org/eclipse/papyrus/uml/diagram/interactionoverview/provider/UMLElementTypes.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/src/org/eclipse/papyrus/uml/diagram/interactionoverview/provider/UMLElementTypes.java @@ -42,9 +42,9 @@ public class UMLElementTypes { private static Set<IElementType> KNOWN_ELEMENT_TYPES;
- public static final IElementType CallBehaviorAction_5000 = getElementTypeByUniqueId("org.eclipse.papyrus.uml.diagram.interactionoverview.CallBehaviorAction_5000"); //$NON-NLS-1$
+ public static final IElementType CallBehaviorAction_InteractionShape = getElementTypeByUniqueId("org.eclipse.papyrus.umldi.CallBehaviorAction_InteractionShape"); //$NON-NLS-1$
- public static final IElementType CallBehaviorAction_As_InteractionUse_5005 = getElementTypeByUniqueId("org.eclipse.papyrus.uml.diagram.interactionoverview.CallBehaviorAction_As_InteractionUse_5005"); //$NON-NLS-1$
+ public static final IElementType CallBehaviorAction_InteractionUseShape = getElementTypeByUniqueId("org.eclipse.papyrus.umldi.CallBehaviorAction_InteractionUseShape"); //$NON-NLS-1$
private static ImageRegistry getImageRegistry() {
if (imageRegistry == null) {
@@ -148,7 +148,7 @@ public class UMLElementTypes { final Object type = hint.getAdapter(IElementType.class);
if (elements == null) {
elements = new IdentityHashMap<IElementType, ENamedElement>();
- elements.put(CallBehaviorAction_5000, UMLPackage.eINSTANCE.getCallBehaviorAction());
+ elements.put(CallBehaviorAction_InteractionShape, UMLPackage.eINSTANCE.getCallBehaviorAction());
}
return elements.get(type);
}
@@ -166,8 +166,8 @@ public class UMLElementTypes { public static boolean isKnownElementType(final IElementType elementType) {
if (KNOWN_ELEMENT_TYPES == null) {
KNOWN_ELEMENT_TYPES = new HashSet<IElementType>();
- KNOWN_ELEMENT_TYPES.add(CallBehaviorAction_5000);
- KNOWN_ELEMENT_TYPES.add(CallBehaviorAction_As_InteractionUse_5005);
+ KNOWN_ELEMENT_TYPES.add(CallBehaviorAction_InteractionShape);
+ KNOWN_ELEMENT_TYPES.add(CallBehaviorAction_InteractionUseShape);
}
return KNOWN_ELEMENT_TYPES.contains(elementType);
}
@@ -177,10 +177,10 @@ public class UMLElementTypes { */
public static IElementType getElementType(final String visualID) {
switch (visualID) {
- case CallBehaviorActionAsInteractionEditPart.INTERACTION_VISUAL_ID:
- return CallBehaviorAction_5000;
- case CustomInteractionUseEditPartCN.INTERACTIONUSE_VISUAL_ID:
- return CallBehaviorAction_As_InteractionUse_5005;
+ case CallBehaviorActionAsInteractionEditPart.VISUAL_ID:
+ return CallBehaviorAction_InteractionShape;
+ case CustomInteractionUseEditPartCN.VISUAL_ID:
+ return CallBehaviorAction_InteractionUseShape;
}
return null;
}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/src/org/eclipse/papyrus/uml/diagram/interactionoverview/utils/CallBehaviorUtil.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/src/org/eclipse/papyrus/uml/diagram/interactionoverview/utils/CallBehaviorUtil.java index b12cb537e6b..7a6d62aa53b 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/src/org/eclipse/papyrus/uml/diagram/interactionoverview/utils/CallBehaviorUtil.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/src/org/eclipse/papyrus/uml/diagram/interactionoverview/utils/CallBehaviorUtil.java @@ -76,7 +76,7 @@ public class CallBehaviorUtil { }
public static boolean isCallBehaviorActionEditPart(final String visualID) {
- return CallBehaviorActionEditPart.VISUAL_ID.equals(visualID) || CallBehaviorActionAsInteractionEditPart.INTERACTION_VISUAL_ID.equals(visualID);
+ return CallBehaviorActionEditPart.VISUAL_ID.equals(visualID) || CallBehaviorActionAsInteractionEditPart.VISUAL_ID.equals(visualID);
}
public static boolean isCallBehaviorActionEditPart(final EditPart editPart) {
|