Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorytanguy2009-12-03 18:18:03 +0000
committerytanguy2009-12-03 18:18:03 +0000
commit6ea7e08fa13894313ab820e27aeb8ef37d1fa5f0 (patch)
tree8ee1c307e9a760533276e24245e9724e9d8015a6 /plugins
parentfb3e23f2038d881ac31fe3a93f6cf282fae05ce9 (diff)
downloadorg.eclipse.papyrus-6ea7e08fa13894313ab820e27aeb8ef37d1fa5f0.tar.gz
org.eclipse.papyrus-6ea7e08fa13894313ab820e27aeb8ef37d1fa5f0.tar.xz
org.eclipse.papyrus-6ea7e08fa13894313ab820e27aeb8ef37d1fa5f0.zip
NEW - bug 296840: [Composite Structure Diagram] adding TimeObservation and DurationObservation management in diagram
https://bugs.eclipse.org/bugs/show_bug.cgi?id=296840 Contributed by V. Lorenzo (CEA LIST)
Diffstat (limited to 'plugins')
-rw-r--r--plugins/uml/org.eclipse.papyrus.diagram.composite/custom-src/org/eclipse/papyrus/diagram/composite/UmlCompositeDiagramForMultiEditor.java108
-rw-r--r--plugins/uml/org.eclipse.papyrus.diagram.composite/custom-src/org/eclipse/papyrus/diagram/composite/custom/edit/parts/AbstractObservationEditPart.java65
-rw-r--r--plugins/uml/org.eclipse.papyrus.diagram.composite/custom-src/org/eclipse/papyrus/diagram/composite/custom/edit/policies/CustomDiagramDragDropEditPolicy.java62
-rw-r--r--plugins/uml/org.eclipse.papyrus.diagram.composite/custom-src/org/eclipse/papyrus/diagram/composite/custom/figures/AbstractObservationNodeFigure.java141
-rw-r--r--plugins/uml/org.eclipse.papyrus.diagram.composite/custom-src/org/eclipse/papyrus/diagram/composite/custom/figures/DurationObservationNodeFigure.java36
-rw-r--r--plugins/uml/org.eclipse.papyrus.diagram.composite/custom-src/org/eclipse/papyrus/diagram/composite/custom/figures/TimeObservationNodeFigure.java36
-rw-r--r--plugins/uml/org.eclipse.papyrus.diagram.composite/custom-src/org/eclipse/papyrus/diagram/composite/custom/helper/DurationObservationHelper.java178
-rw-r--r--plugins/uml/org.eclipse.papyrus.diagram.composite/custom-src/org/eclipse/papyrus/diagram/composite/custom/helper/TimeObservationHelper.java149
-rw-r--r--plugins/uml/org.eclipse.papyrus.diagram.composite/messages.properties10
-rw-r--r--plugins/uml/org.eclipse.papyrus.diagram.composite/model/compositediagram.gmfgen199
-rw-r--r--plugins/uml/org.eclipse.papyrus.diagram.composite/plugin.properties2
-rw-r--r--plugins/uml/org.eclipse.papyrus.diagram.composite/plugin.xml60
-rw-r--r--plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/commands/ConnectorDurationObservationCreateCommand.java107
-rw-r--r--plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/commands/ConnectorDurationObservationReorientCommand.java163
-rw-r--r--plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/commands/ConnectorTimeObservationCreateCommand.java107
-rw-r--r--plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/commands/ConnectorTimeObservationReorientCommand.java162
-rw-r--r--plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/ActivityCompositeCompartmentEditPart.java46
-rw-r--r--plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/ActivityCompositeCompartmentEditPartCN.java46
-rw-r--r--plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/ActivityCompositeEditPart.java27
-rw-r--r--plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/ActivityCompositeEditPartCN.java27
-rw-r--r--plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/ActorEditPart.java23
-rw-r--r--plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/ActorEditPartCN.java23
-rw-r--r--plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/AnyReceiveEventEditPart.java23
-rw-r--r--plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/ArtifactEditPart.java23
-rw-r--r--plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/ArtifactEditPartCN.java23
-rw-r--r--plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/CallEventEditPart.java23
-rw-r--r--plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/ChangeEventEditPart.java23
-rw-r--r--plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/ClassAttributeCompartmentEditPart.java45
-rw-r--r--plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/ClassClassifierEditPart.java35
-rw-r--r--plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/ClassCompositeCompartmentEditPart.java46
-rw-r--r--plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/ClassCompositeCompartmentEditPartCN.java46
-rw-r--r--plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/ClassCompositeEditPart.java27
-rw-r--r--plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/ClassCompositeEditPartCN.java27
-rw-r--r--plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/ClassNestedClassifierCompartmentEditPart.java45
-rw-r--r--plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/ClassOperationCompartmentEditPart.java45
-rw-r--r--plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/CollaborationCompositeCompartmentEditPart.java46
-rw-r--r--plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/CollaborationCompositeCompartmentEditPartCN.java46
-rw-r--r--plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/CollaborationCompositeEditPart.java27
-rw-r--r--plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/CollaborationCompositeEditPartCN.java27
-rw-r--r--plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/CollaborationRoleEditPartCN.java23
-rw-r--r--plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/CollaborationUseEditPartCN.java23
-rw-r--r--plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/CommentEditPart.java15
-rw-r--r--plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/CommentEditPartCN.java15
-rw-r--r--plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/ComponentCompositeCompartmentEditPart.java46
-rw-r--r--plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/ComponentCompositeCompartmentEditPartCN.java46
-rw-r--r--plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/ComponentCompositeEditPart.java27
-rw-r--r--plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/ComponentCompositeEditPartCN.java27
-rw-r--r--plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/ConnectorDurationObservationEditPart.java88
-rw-r--r--plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/ConnectorTimeObservationEditPart.java88
-rw-r--r--plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/ConstraintEditPart.java23
-rw-r--r--plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/CreationEventEditPart.java23
-rw-r--r--plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/DataTypeAttributeCompartmentEditPart.java45
-rw-r--r--plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/DataTypeAttributeCompartmentEditPartCN.java45
-rw-r--r--plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/DataTypeEditPart.java31
-rw-r--r--plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/DataTypeEditPartCN.java31
-rw-r--r--plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/DataTypeOperationCompartmentEditPart.java45
-rw-r--r--plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/DataTypeOperationCompartmentEditPartCN.java45
-rw-r--r--plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/DeploymentSpecificationEditPart.java23
-rw-r--r--plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/DeploymentSpecificationEditPartCN.java23
-rw-r--r--plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/DestructionEventEditPart.java23
-rw-r--r--plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/DeviceCompositeCompartmentEditPart.java46
-rw-r--r--plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/DeviceCompositeCompartmentEditPartCN.java46
-rw-r--r--plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/DeviceCompositeEditPart.java27
-rw-r--r--plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/DeviceCompositeEditPartCN.java27
-rw-r--r--plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/DurationConstraintEditPart.java23
-rw-r--r--plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/DurationEditPart.java23
-rw-r--r--plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/DurationIntervalEditPart.java23
-rw-r--r--plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/DurationObservationEditPart.java684
-rw-r--r--plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/DurationObservationNameEditPart.java147
-rw-r--r--plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/DurationObservationStereotypeLabelEditPart.java755
-rw-r--r--plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/EnumerationEditPart.java27
-rw-r--r--plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/EnumerationEditPartCN.java27
-rw-r--r--plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/EnumerationEnumerationLiteralCompartmentEditPart.java45
-rw-r--r--plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/EnumerationEnumerationLiteralCompartmentEditPartCN.java45
-rw-r--r--plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/ExecutionEnvironmentCompositeCompartmentEditPart.java46
-rw-r--r--plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/ExecutionEnvironmentCompositeCompartmentEditPartCN.java46
-rw-r--r--plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/ExecutionEnvironmentCompositeEditPart.java27
-rw-r--r--plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/ExecutionEnvironmentCompositeEditPartCN.java27
-rw-r--r--plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/ExecutionEventEditPart.java23
-rw-r--r--plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/ExpressionEditPart.java23
-rw-r--r--plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/FunctionBehaviorCompositeCompartmentEditPart.java46
-rw-r--r--plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/FunctionBehaviorCompositeCompartmentEditPartCN.java46
-rw-r--r--plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/FunctionBehaviorCompositeEditPart.java27
-rw-r--r--plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/FunctionBehaviorCompositeEditPartCN.java27
-rw-r--r--plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/InformationItemEditPart.java23
-rw-r--r--plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/InformationItemEditPartCN.java23
-rw-r--r--plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/InstanceValueEditPart.java23
-rw-r--r--plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/InteractionCompositeCompartmentEditPart.java46
-rw-r--r--plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/InteractionCompositeCompartmentEditPartCN.java46
-rw-r--r--plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/InteractionCompositeEditPart.java27
-rw-r--r--plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/InteractionCompositeEditPartCN.java27
-rw-r--r--plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/InteractionConstraintEditPart.java23
-rw-r--r--plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/InterfaceCompartmentEditPart.java46
-rw-r--r--plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/InterfaceCompartmentEditPartCN.java46
-rw-r--r--plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/InterfaceEditPart.java27
-rw-r--r--plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/InterfaceEditPartCN.java27
-rw-r--r--plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/IntervalConstraintEditPart.java23
-rw-r--r--plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/IntervalEditPart.java23
-rw-r--r--plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/LiteralBooleanEditPart.java23
-rw-r--r--plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/LiteralIntegerEditPart.java23
-rw-r--r--plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/LiteralNullEditPart.java23
-rw-r--r--plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/LiteralStringEditPart.java23
-rw-r--r--plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/LiteralUnlimitedNaturalEditPart.java23
-rw-r--r--plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/NodeCompositeCompartmentEditPart.java46
-rw-r--r--plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/NodeCompositeCompartmentEditPartCN.java46
-rw-r--r--plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/NodeCompositeEditPart.java27
-rw-r--r--plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/NodeCompositeEditPartCN.java27
-rw-r--r--plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/OpaqueBehaviorCompositeCompartmentEditPart.java46
-rw-r--r--plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/OpaqueBehaviorCompositeCompartmentEditPartCN.java46
-rw-r--r--plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/OpaqueBehaviorCompositeEditPart.java27
-rw-r--r--plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/OpaqueBehaviorCompositeEditPartCN.java27
-rw-r--r--plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/OpaqueExpressionEditPart.java23
-rw-r--r--plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/PortEditPart.java23
-rw-r--r--plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/PortNameEditPart.java6
-rw-r--r--plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/PrimitiveTypeEditPart.java23
-rw-r--r--plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/PrimitiveTypeEditPartCN.java23
-rw-r--r--plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/PropertyPartCompartmentEditPartCN.java46
-rw-r--r--plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/PropertyPartEditPartCN.java27
-rw-r--r--plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/ProtocolStateMachineCompositeCompartmentEditPart.java46
-rw-r--r--plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/ProtocolStateMachineCompositeCompartmentEditPartCN.java46
-rw-r--r--plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/ProtocolStateMachineCompositeEditPart.java27
-rw-r--r--plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/ProtocolStateMachineCompositeEditPartCN.java27
-rw-r--r--plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/SendOperationEventEditPart.java23
-rw-r--r--plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/SendSignalEventEditPart.java23
-rw-r--r--plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/SignalEditPart.java23
-rw-r--r--plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/SignalEditPartCN.java23
-rw-r--r--plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/SignalEventEditPart.java23
-rw-r--r--plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/StateMachineCompositeCompartmentEditPart.java46
-rw-r--r--plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/StateMachineCompositeCompartmentEditPartCN.java46
-rw-r--r--plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/StateMachineCompositeEditPart.java27
-rw-r--r--plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/StateMachineCompositeEditPartCN.java27
-rw-r--r--plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/StringExpressionEditPart.java23
-rw-r--r--plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/TimeConstraintEditPart.java23
-rw-r--r--plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/TimeEventEditPart.java23
-rw-r--r--plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/TimeExpressionEditPart.java23
-rw-r--r--plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/TimeIntervalEditPart.java23
-rw-r--r--plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/TimeObservationEditPart.java684
-rw-r--r--plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/TimeObservationNameEditPart.java147
-rw-r--r--plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/TimeObservationStereotypeLabelEditPart.java755
-rw-r--r--plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/UMLEditPartFactory.java12
-rw-r--r--plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/UseCaseEditPart.java23
-rw-r--r--plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/UseCaseEditPartCN.java23
-rw-r--r--plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/AbstractionItemSemanticEditPolicy.java22
-rw-r--r--plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/ActivityCompositeItemSemanticEditPolicy.java386
-rw-r--r--plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/ActivityCompositeItemSemanticEditPolicyCN.java386
-rw-r--r--plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/ActorItemSemanticEditPolicy.java36
-rw-r--r--plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/ActorItemSemanticEditPolicyCN.java36
-rw-r--r--plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/AnyReceiveEventItemSemanticEditPolicy.java36
-rw-r--r--plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/ArtifactItemSemanticEditPolicy.java36
-rw-r--r--plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/ArtifactItemSemanticEditPolicyCN.java36
-rw-r--r--plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/CallEventItemSemanticEditPolicy.java36
-rw-r--r--plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/ChangeEventItemSemanticEditPolicy.java36
-rw-r--r--plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/ClassClassifierItemSemanticEditPolicy.java36
-rw-r--r--plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/ClassCompositeItemSemanticEditPolicy.java386
-rw-r--r--plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/ClassCompositeItemSemanticEditPolicyCN.java386
-rw-r--r--plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/CollaborationCompositeItemSemanticEditPolicy.java78
-rw-r--r--plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/CollaborationCompositeItemSemanticEditPolicyCN.java78
-rw-r--r--plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/CollaborationRoleItemSemanticEditPolicyCN.java36
-rw-r--r--plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/CollaborationUseItemSemanticEditPolicyCN.java36
-rw-r--r--plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/ComponentCompositeItemSemanticEditPolicy.java386
-rw-r--r--plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/ComponentCompositeItemSemanticEditPolicyCN.java386
-rw-r--r--plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/ComponentRealizationItemSemanticEditPolicy.java22
-rw-r--r--plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/ConnectorDurationObservationItemSemanticEditPolicy.java40
-rw-r--r--plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/ConnectorItemSemanticEditPolicy.java22
-rw-r--r--plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/ConnectorTimeObservationItemSemanticEditPolicy.java40
-rw-r--r--plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/ConstraintItemSemanticEditPolicy.java36
-rw-r--r--plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/CreationEventItemSemanticEditPolicy.java36
-rw-r--r--plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/DataTypeItemSemanticEditPolicy.java36
-rw-r--r--plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/DataTypeItemSemanticEditPolicyCN.java36
-rw-r--r--plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/DependencyItemSemanticEditPolicy.java22
-rw-r--r--plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/DeploymentItemSemanticEditPolicy.java22
-rw-r--r--plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/DeploymentSpecificationItemSemanticEditPolicy.java36
-rw-r--r--plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/DeploymentSpecificationItemSemanticEditPolicyCN.java36
-rw-r--r--plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/DestructionEventItemSemanticEditPolicy.java36
-rw-r--r--plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/DeviceCompositeItemSemanticEditPolicy.java386
-rw-r--r--plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/DeviceCompositeItemSemanticEditPolicyCN.java386
-rw-r--r--plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/DurationConstraintItemSemanticEditPolicy.java36
-rw-r--r--plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/DurationIntervalItemSemanticEditPolicy.java36
-rw-r--r--plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/DurationItemSemanticEditPolicy.java36
-rw-r--r--plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/DurationObservationItemSemanticEditPolicy.java43
-rw-r--r--plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/EnumerationItemSemanticEditPolicy.java36
-rw-r--r--plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/EnumerationItemSemanticEditPolicyCN.java36
-rw-r--r--plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/ExecutionEnvironmentCompositeItemSemanticEditPolicy.java386
-rw-r--r--plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/ExecutionEnvironmentCompositeItemSemanticEditPolicyCN.java386
-rw-r--r--plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/ExecutionEventItemSemanticEditPolicy.java36
-rw-r--r--plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/ExpressionItemSemanticEditPolicy.java36
-rw-r--r--plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/FunctionBehaviorCompositeItemSemanticEditPolicy.java386
-rw-r--r--plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/FunctionBehaviorCompositeItemSemanticEditPolicyCN.java386
-rw-r--r--plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/InformationFlowItemSemanticEditPolicy.java22
-rw-r--r--plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/InformationItemItemSemanticEditPolicy.java36
-rw-r--r--plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/InformationItemItemSemanticEditPolicyCN.java36
-rw-r--r--plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/InstanceValueItemSemanticEditPolicy.java36
-rw-r--r--plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/InteractionCompositeItemSemanticEditPolicy.java386
-rw-r--r--plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/InteractionCompositeItemSemanticEditPolicyCN.java386
-rw-r--r--plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/InteractionConstraintItemSemanticEditPolicy.java36
-rw-r--r--plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/InterfaceItemSemanticEditPolicy.java36
-rw-r--r--plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/InterfaceItemSemanticEditPolicyCN.java36
-rw-r--r--plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/InterfaceRealizationItemSemanticEditPolicy.java22
-rw-r--r--plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/IntervalConstraintItemSemanticEditPolicy.java36
-rw-r--r--plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/IntervalItemSemanticEditPolicy.java36
-rw-r--r--plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/LiteralBooleanItemSemanticEditPolicy.java36
-rw-r--r--plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/LiteralIntegerItemSemanticEditPolicy.java36
-rw-r--r--plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/LiteralNullItemSemanticEditPolicy.java36
-rw-r--r--plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/LiteralStringItemSemanticEditPolicy.java36
-rw-r--r--plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/LiteralUnlimitedNaturalItemSemanticEditPolicy.java36
-rw-r--r--plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/ManifestationItemSemanticEditPolicy.java22
-rw-r--r--plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/NodeCompositeItemSemanticEditPolicy.java386
-rw-r--r--plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/NodeCompositeItemSemanticEditPolicycN.java386
-rw-r--r--plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/OpaqueBehaviorCompositeItemSemanticEditPolicy.java386
-rw-r--r--plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/OpaqueBehaviorCompositeItemSemanticEditPolicyCN.java386
-rw-r--r--plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/OpaqueExpressionItemSemanticEditPolicy.java36
-rw-r--r--plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/PortItemSemanticEditPolicy.java36
-rw-r--r--plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/PrimitiveTypeItemSemanticEditPolicy.java36
-rw-r--r--plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/PrimitiveTypeItemSemanticEditPolicyCN.java36
-rw-r--r--plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/PropertyPartItemSemanticEditPolicyCN.java64
-rw-r--r--plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/ProtocolStateMachineCompositeItemSemanticEditPolicy.java386
-rw-r--r--plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/ProtocolStateMachineCompositeItemSemanticEditPolicyCN.java386
-rw-r--r--plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/RealizationItemSemanticEditPolicy.java22
-rw-r--r--plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/RoleBindingItemSemanticEditPolicy.java22
-rw-r--r--plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/SendOperationEventItemSemanticEditPolicy.java36
-rw-r--r--plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/SendSignalEventItemSemanticEditPolicy.java36
-rw-r--r--plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/SignalEventItemSemanticEditPolicy.java36
-rw-r--r--plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/SignalItemSemanticEditPolicy.java36
-rw-r--r--plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/SignalItemSemanticEditPolicyCN.java36
-rw-r--r--plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/StateMachineCompositeItemSemanticEditPolicy.java386
-rw-r--r--plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/StateMachineCompositeItemSemanticEditPolicyCN.java386
-rw-r--r--plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/StringExpressionItemSemanticEditPolicy.java36
-rw-r--r--plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/SubstitutionItemSemanticEditPolicy.java22
-rw-r--r--plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/TimeConstraintItemSemanticEditPolicy.java36
-rw-r--r--plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/TimeEventItemSemanticEditPolicy.java36
-rw-r--r--plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/TimeExpressionItemSemanticEditPolicy.java36
-rw-r--r--plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/TimeIntervalItemSemanticEditPolicy.java36
-rw-r--r--plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/TimeObservationItemSemanticEditPolicy.java43
-rw-r--r--plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/UMLBaseItemSemanticEditPolicy.java42
-rw-r--r--plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/UsageItemSemanticEditPolicy.java22
-rw-r--r--plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/UseCaseItemSemanticEditPolicy.java36
-rw-r--r--plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/UseCaseItemSemanticEditPolicyCN.java36
-rw-r--r--plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/part/Messages.java24
-rw-r--r--plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/part/UMLDiagramEditor.java170
-rw-r--r--plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/part/UMLDiagramEditorUtil.java2
-rw-r--r--plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/part/UMLDiagramUpdater.java258
-rw-r--r--plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/part/UMLPaletteFactory.java105
-rw-r--r--plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/part/UMLVisualIDRegistry.java12
-rw-r--r--plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/providers/UMLElementTypes.java20
-rw-r--r--plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/providers/UMLParserProvider.java64
-rw-r--r--plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/providers/UMLViewProvider.java104
246 files changed, 19159 insertions, 1258 deletions
diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/custom-src/org/eclipse/papyrus/diagram/composite/UmlCompositeDiagramForMultiEditor.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/custom-src/org/eclipse/papyrus/diagram/composite/UmlCompositeDiagramForMultiEditor.java
index 9d599e3d43e..8de9ce43133 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/custom-src/org/eclipse/papyrus/diagram/composite/UmlCompositeDiagramForMultiEditor.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/custom-src/org/eclipse/papyrus/diagram/composite/UmlCompositeDiagramForMultiEditor.java
@@ -27,10 +27,8 @@ import org.eclipse.gmf.runtime.notation.Diagram;
import org.eclipse.jface.dialogs.ErrorDialog;
import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.jface.util.LocalSelectionTransfer;
-import org.eclipse.jface.viewers.ISelection;
import org.eclipse.papyrus.core.adaptor.gmf.GmfMultiDiagramDocumentProvider;
import org.eclipse.papyrus.core.editor.BackboneException;
-import org.eclipse.papyrus.core.editor.IMultiDiagramEditor;
import org.eclipse.papyrus.core.services.ServiceException;
import org.eclipse.papyrus.core.services.ServicesRegistry;
import org.eclipse.papyrus.diagram.common.listeners.DropTargetListener;
@@ -40,8 +38,6 @@ import org.eclipse.swt.dnd.TransferData;
import org.eclipse.swt.widgets.Shell;
import org.eclipse.ui.IEditorInput;
import org.eclipse.ui.IEditorSite;
-import org.eclipse.ui.IFileEditorInput;
-import org.eclipse.ui.IWorkbenchPart;
import org.eclipse.ui.PartInitException;
/**
@@ -76,11 +72,6 @@ public class UmlCompositeDiagramForMultiEditor extends UMLDiagramEditor {
/** The editing domain. */
private TransactionalEditingDomain editingDomain;
- /**
- * The diagram shown by this editor.
- */
- private Diagram diagram;
-
private IDocumentProvider documentProvider;
/**
@@ -92,19 +83,7 @@ public class UmlCompositeDiagramForMultiEditor extends UMLDiagramEditor {
*/
public UmlCompositeDiagramForMultiEditor(ServicesRegistry servicesRegistry, Diagram diagram)
throws BackboneException, ServiceException {
- super(servicesRegistry);
- this.diagram = diagram;
- // IEditorContextRegistry contextRegistry;
- // contextRegistry = (IEditorContextRegistry)
- // servicesRegistry.getService(IEditorContextRegistry.class);
- //
- // // Get the context by its ID
- // this.context = (GmfEditorContext)
- // contextRegistry.getContext(GmfEditorContext.GMF_CONTEXT_ID);
-
- // overrides editing domain created by super constructor
- // setDocumentProvider(context.getDocumentProvider());
- // System.err.println(this.getClass().getName());
+ super(servicesRegistry, diagram);
editingDomain = servicesRegistry.getService(TransactionalEditingDomain.class);
documentProvider = new GmfMultiDiagramDocumentProvider(editingDomain);
@@ -152,26 +131,6 @@ public class UmlCompositeDiagramForMultiEditor extends UMLDiagramEditor {
}
/**
- * @return the diagram
- */
- @Override
- public Diagram getDiagram() {
- return diagram;
- }
-
- /**
- *
- * {@inheritDoc}
- */
- @Override
- final protected IDocumentProvider getDocumentProvider(IEditorInput input) {
- if (input instanceof IFileEditorInput || input instanceof URIEditorInput) {
- return documentProvider;
- }
- return super.getDocumentProvider(input);
- }
-
- /**
* Returns an editing domain id used to retrive an editing domain from the editing domain
* registry. Clients should override this if they wish to use a shared editing domain for this
* editor. If null is returned then a new editing domain will be created per editor instance.
@@ -194,13 +153,6 @@ public class UmlCompositeDiagramForMultiEditor extends UMLDiagramEditor {
}
/**
- * @return the parentEditor
- */
- // public GmfEditorContext getSharedObjects() {
- // return context;
- // }
-
- /**
*
* {@inheritDoc}
*/
@@ -241,60 +193,13 @@ public class UmlCompositeDiagramForMultiEditor extends UMLDiagramEditor {
* {@inheritDoc}
*/
@Override
- public void selectionChanged(IWorkbenchPart part, ISelection selection) {
- if (getSite().getPage().getActiveEditor() instanceof IMultiDiagramEditor) {
- IMultiDiagramEditor editor = (IMultiDiagramEditor) getSite().getPage().getActiveEditor();
- // If not the active editor, ignore selection changed.
- if (this.equals(editor.getActiveEditor())) {
- updateActions(getSelectionActions());
- super.selectionChanged(part, selection);
- } else {
- super.selectionChanged(part, selection);
- }
- } else {
- super.selectionChanged(part, selection);
- }
- // from
- // org.eclipse.gmf.runtime.diagram.ui.resources.editor.parts.DiagramDocumentEditor.selectionChanged(IWorkbenchPart,
- // ISelection)
- if (part == this) {
- rebuildStatusLine();
- }
- }
-
- /**
- * @param diagram
- * the diagram to set
- */
- public void setDiagram(Diagram diagram) {
- this.diagram = diagram;
- }
-
- /**
- *
- * {@inheritDoc}
- */
- @Override
- protected void setDocumentProvider(IEditorInput input) {
- if (input instanceof IFileEditorInput || input instanceof URIEditorInput) {
- setDocumentProvider(documentProvider);
- } else {
- super.setDocumentProvider(input);
- }
- }
-
- /**
- *
- * {@inheritDoc}
- */
- @Override
public void setInput(IEditorInput input) {
try {
// We are in a nested editor.
// Provide an URI with fragment in order to reuse the same Resource
// and to set the diagram to the fragment.
// First, compute the URI
- URIEditorInput uriInput = new URIEditorInput(EcoreUtil.getURI(diagram));
+ URIEditorInput uriInput = new URIEditorInput(EcoreUtil.getURI(getDiagram()));
System.err.println(this.getClass().getSimpleName() + ".setInput(" + uriInput.toString() + ")"); //$NON-NLS-1$
doSetInput(uriInput, true);
} catch (CoreException x) {
@@ -303,14 +208,5 @@ public class UmlCompositeDiagramForMultiEditor extends UMLDiagramEditor {
Shell shell = getSite().getShell();
ErrorDialog.openError(shell, title, msg, x.getStatus());
}
-
}
-
- /**
- * @param parentEditor
- * the parentEditor to set
- */
- // public void setSharedObject(GmfEditorContext parentEditor) {
- // this.context = parentEditor;
- // }
}
diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/custom-src/org/eclipse/papyrus/diagram/composite/custom/edit/parts/AbstractObservationEditPart.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/custom-src/org/eclipse/papyrus/diagram/composite/custom/edit/parts/AbstractObservationEditPart.java
new file mode 100644
index 00000000000..482d9740922
--- /dev/null
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/custom-src/org/eclipse/papyrus/diagram/composite/custom/edit/parts/AbstractObservationEditPart.java
@@ -0,0 +1,65 @@
+/*****************************************************************************
+ * Copyright (c) 2009 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
+ *
+ * Contributors:
+ * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+
+package org.eclipse.papyrus.diagram.composite.custom.edit.parts;
+
+import org.eclipse.draw2d.geometry.Dimension;
+import org.eclipse.draw2d.geometry.Point;
+import org.eclipse.draw2d.geometry.Rectangle;
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.gef.GraphicalEditPart;
+import org.eclipse.gmf.runtime.notation.NotationPackage;
+import org.eclipse.gmf.runtime.notation.View;
+import org.eclipse.papyrus.diagram.common.editparts.IUMLNamedElementEditPart;
+import org.eclipse.papyrus.diagram.common.editparts.NamedElementEditPart;
+
+/*
+ * This class looks like AbstractShortCutDiagramEditPart
+ * This class update the icon (icon UML or stereotype's icon)
+ */
+public abstract class AbstractObservationEditPart extends NamedElementEditPart implements IUMLNamedElementEditPart {
+
+ public AbstractObservationEditPart(View view) {
+ super(view);
+ }
+
+ /**
+ *
+ * {@inheritDoc}
+ */
+ protected void refreshBounds() {
+
+ int width = 20;
+ int height = 20;
+ Dimension size = new Dimension(width, height);
+ int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();
+ int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();
+ Point loc = new Point(x, y);
+ ((GraphicalEditPart) getParent()).setLayoutConstraint(this, getFigure(), new Rectangle(loc, size));
+
+ }
+
+ protected void handleNotificationEvent(Notification event) {
+ super.handleNotificationEvent(event);
+ // set the figure active when the feature of the of a class is true
+ if (resolveSemanticElement() != null) {
+ refreshFontColor();
+
+ // To adapt the display of the container to the icon!
+ refreshBounds();
+ }
+
+ }
+
+}
diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/custom-src/org/eclipse/papyrus/diagram/composite/custom/edit/policies/CustomDiagramDragDropEditPolicy.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/custom-src/org/eclipse/papyrus/diagram/composite/custom/edit/policies/CustomDiagramDragDropEditPolicy.java
index 3096b2c5982..f504f63063c 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/custom-src/org/eclipse/papyrus/diagram/composite/custom/edit/policies/CustomDiagramDragDropEditPolicy.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/custom-src/org/eclipse/papyrus/diagram/composite/custom/edit/policies/CustomDiagramDragDropEditPolicy.java
@@ -28,20 +28,26 @@ import org.eclipse.gmf.runtime.notation.View;
import org.eclipse.papyrus.diagram.common.editpolicies.CommonDiagramDragDropEditPolicy;
import org.eclipse.papyrus.diagram.composite.custom.helper.CompositeLinkMappingHelper;
import org.eclipse.papyrus.diagram.composite.custom.helper.ConnectorHelper;
+import org.eclipse.papyrus.diagram.composite.custom.helper.DurationObservationHelper;
+import org.eclipse.papyrus.diagram.composite.custom.helper.TimeObservationHelper;
import org.eclipse.papyrus.diagram.composite.edit.parts.ConnectorEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.DependencyEditPart;
+import org.eclipse.papyrus.diagram.composite.edit.parts.DurationObservationEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.PortEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.PropertyPartEditPartCN;
import org.eclipse.papyrus.diagram.composite.edit.parts.RoleBindingEditPart;
+import org.eclipse.papyrus.diagram.composite.edit.parts.TimeObservationEditPart;
import org.eclipse.papyrus.diagram.composite.part.UMLVisualIDRegistry;
import org.eclipse.papyrus.diagram.composite.providers.UMLElementTypes;
import org.eclipse.uml2.uml.Classifier;
import org.eclipse.uml2.uml.ConnectableElement;
import org.eclipse.uml2.uml.Connector;
+import org.eclipse.uml2.uml.DurationObservation;
import org.eclipse.uml2.uml.Element;
import org.eclipse.uml2.uml.EncapsulatedClassifier;
import org.eclipse.uml2.uml.Port;
import org.eclipse.uml2.uml.Property;
+import org.eclipse.uml2.uml.TimeObservation;
import org.eclipse.uml2.uml.Type;
/**
@@ -52,7 +58,8 @@ public class CustomDiagramDragDropEditPolicy extends CommonDiagramDragDropEditPo
/** List of VISUAL_ID for which a specific Drop behavior is provided */
public int[] secificDropNode = { DependencyEditPart.VISUAL_ID, RoleBindingEditPart.VISUAL_ID,
- ConnectorEditPart.VISUAL_ID, PortEditPart.VISUAL_ID, PropertyPartEditPartCN.VISUAL_ID };
+ ConnectorEditPart.VISUAL_ID, PortEditPart.VISUAL_ID, PropertyPartEditPartCN.VISUAL_ID,
+ TimeObservationEditPart.VISUAL_ID, DurationObservationEditPart.VISUAL_ID };
/**
* Default constructor
@@ -114,6 +121,11 @@ public class CustomDiagramDragDropEditPolicy extends CommonDiagramDragDropEditPo
return dropPort(dropRequest, location, (Port) semanticElement, nodeVISUALID);
case PropertyPartEditPartCN.VISUAL_ID:
return dropProperty(dropRequest, location, (Property) semanticElement, nodeVISUALID);
+ case TimeObservationEditPart.VISUAL_ID:
+ return dropTimeObservation(dropRequest, location, (TimeObservation) semanticElement, nodeVISUALID);
+ case DurationObservationEditPart.VISUAL_ID:
+ return dropDurationObservation(dropRequest, location, (DurationObservation) semanticElement,
+ nodeVISUALID);
default:
return super.getSpecificDropCommand(dropRequest, semanticElement, nodeVISUALID, linkVISUALID);
}
@@ -273,4 +285,52 @@ public class CustomDiagramDragDropEditPolicy extends CommonDiagramDragDropEditPo
return UnexecutableCommand.INSTANCE;
}
+
+ /**
+ * Returns the drop command for DurationObservation nodes.
+ *
+ * @param dropRequest
+ * the drop request
+ * @param location
+ * the location to drop the element
+ * @param droppedElement
+ * the element to drop
+ * @param nodeVISUALID
+ * the visual identifier of the EditPart of the dropped element
+ * @return the drop command
+ *
+ */
+ protected Command dropDurationObservation(DropObjectsRequest dropRequest, Point location,
+ DurationObservation droppedElement, int nodeVISUALID) {
+
+ DurationObservationHelper durationObservationHelper = new DurationObservationHelper(getEditingDomain());
+ return durationObservationHelper.dropDurationObservation((DurationObservation) droppedElement, getViewer(),
+ getDiagramPreferencesHint(), dropRequest.getLocation(), ((GraphicalEditPart) getHost())
+ .getNotationView());
+
+ }
+
+ /**
+ * Returns the drop command for TimeObservation nodes.
+ *
+ * @param dropRequest
+ * the drop request
+ * @param location
+ * the location to drop the element
+ * @param droppedElement
+ * the element to drop
+ * @param nodeVISUALID
+ * the visual identifier of the EditPart of the dropped element
+ * @return the drop command
+ *
+ */
+ protected Command dropTimeObservation(DropObjectsRequest dropRequest, Point location,
+ TimeObservation droppedElement, int nodeVISUALID) {
+
+ TimeObservationHelper timeObservationHelper = new TimeObservationHelper(getEditingDomain());
+ return timeObservationHelper.dropTimeObservation((TimeObservation) droppedElement, getViewer(),
+ getDiagramPreferencesHint(), dropRequest.getLocation(), ((GraphicalEditPart) getHost())
+ .getNotationView());
+ }
+
}
diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/custom-src/org/eclipse/papyrus/diagram/composite/custom/figures/AbstractObservationNodeFigure.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/custom-src/org/eclipse/papyrus/diagram/composite/custom/figures/AbstractObservationNodeFigure.java
new file mode 100644
index 00000000000..1dbe720fbc7
--- /dev/null
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/custom-src/org/eclipse/papyrus/diagram/composite/custom/figures/AbstractObservationNodeFigure.java
@@ -0,0 +1,141 @@
+/*****************************************************************************
+ * Copyright (c) 2009 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
+ *
+ * Contributors:
+ * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+
+package org.eclipse.papyrus.diagram.composite.custom.figures;
+
+import java.util.List;
+
+import org.eclipse.draw2d.AbstractLayout;
+import org.eclipse.draw2d.IFigure;
+import org.eclipse.draw2d.Label;
+import org.eclipse.draw2d.ToolbarLayout;
+import org.eclipse.draw2d.geometry.Dimension;
+import org.eclipse.draw2d.geometry.Rectangle;
+import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;
+import org.eclipse.papyrus.diagram.common.figure.node.NodeNamedElementFigure;
+import org.eclipse.swt.graphics.Image;
+
+/**
+ * Provides stereotype and name management for {@link TimeObservationNodeFigure} and
+ * {@link DurationObservationNodeFigure}
+ */
+public class AbstractObservationNodeFigure extends NodeNamedElementFigure {
+
+ /** Plug-in ID where UML2 icons can be found */
+ public static final String ID = "org.eclipse.uml2.uml.edit"; //$NON-NLS-1$
+
+ /** Icons relative path for UML2 elements in org.eclipse.uml2.uml.edit */
+ public static final String PATH = "/icons/full/obj16/"; //$NON-NLS-1$
+
+ /**
+ * Figure layout manager
+ *
+ */
+ protected class AbstractObservationLayoutManager extends AbstractLayout {
+
+ /**
+ *
+ * {@inheritDoc}
+ */
+ @Override
+ protected Dimension calculatePreferredSize(IFigure container, int hint, int hint2) {
+
+ int minimumWidth = 0;
+ int minimumHeight = 0;
+
+ // Adapt the container to the contents
+ for (int i = 0; i < container.getChildren().size(); i++) {
+ // we ignore the stereotype Label and the qualified name label
+ if (container.getChildren().get(i) instanceof Label) {
+ // Do nothing
+ } else {
+ minimumHeight = minimumHeight
+ + ((IFigure) container.getChildren().get(i)).getPreferredSize().height + 2;
+ minimumWidth = minimumWidth + ((IFigure) container.getChildren().get(i)).getPreferredSize().width
+ + 1;
+
+ }
+ }
+ return new Dimension(minimumWidth, minimumHeight);
+
+ }
+
+ /**
+ *
+ * {@inheritDoc}
+ */
+ public void layout(IFigure container) {
+ List<?> childrenList = container.getChildren();
+
+ for (int i = 0; i < container.getChildren().size(); i++) {
+ // stereotype and qualified name labels are not displayed
+ if (container.getChildren().get(i) instanceof Label) {
+ ((IFigure) container.getChildren().get(i)).setVisible(false);
+ }
+ Rectangle bound = new Rectangle(((IFigure) childrenList.get(i)).getBounds());
+ bound.setSize(((IFigure) childrenList.get(i)).getPreferredSize());
+ if (i > 0) {
+ bound.y = container.getBounds().y + 2;
+
+ bound.x = container.getBounds().x + 2;
+ }
+ ((IFigure) childrenList.get(i)).setBounds(bound);
+
+ }
+
+ }
+ }
+
+ /**
+ * Label for figure icon
+ */
+ protected WrappingLabel iconLabel;
+
+ /**
+ * Constructor
+ */
+ public AbstractObservationNodeFigure() {
+
+ super();
+
+ this.iconLabel = new WrappingLabel("");
+ this.add(this.iconLabel);
+ ToolbarLayout toolbarLayout = new ToolbarLayout();
+ toolbarLayout.setSpacing(5);
+ toolbarLayout.setVertical(false);
+ this.setLayoutManager(new AbstractObservationLayoutManager());
+
+ }
+
+ /**
+ * Get the figure icon container
+ *
+ * @return the icon label
+ */
+ public WrappingLabel getIconContainer() {
+ return iconLabel;
+
+ }
+
+ /**
+ * Set the icon in the figure
+ *
+ * @param image
+ */
+ public void setIcon(Image image) {
+ getIconContainer().setIcon(image, 0);
+
+ }
+
+}
diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/custom-src/org/eclipse/papyrus/diagram/composite/custom/figures/DurationObservationNodeFigure.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/custom-src/org/eclipse/papyrus/diagram/composite/custom/figures/DurationObservationNodeFigure.java
new file mode 100644
index 00000000000..5079e0a1a20
--- /dev/null
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/custom-src/org/eclipse/papyrus/diagram/composite/custom/figures/DurationObservationNodeFigure.java
@@ -0,0 +1,36 @@
+/*****************************************************************************
+ * Copyright (c) 2009 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
+ *
+ * Contributors:
+ * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+
+package org.eclipse.papyrus.diagram.composite.custom.figures;
+
+import org.eclipse.papyrus.diagram.common.Activator;
+import org.eclipse.swt.graphics.Image;
+
+/*
+ * This class looks like DiagramNodeFigure
+ */
+//public class ObservationNodeFigure extends RectangleFigure {
+public class DurationObservationNodeFigure extends AbstractObservationNodeFigure {
+
+ public static final String IMAGE_DURATION = "DurationObservation.gif"; //$NON-NLS-1$
+
+ public void setAppliedStereotypeIcon(Image image) {
+ if (image == null)
+ setIcon(Activator.getPluginIconImage(ID, PATH + IMAGE_DURATION));
+ else
+ setIcon(image);
+
+ }
+
+}
diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/custom-src/org/eclipse/papyrus/diagram/composite/custom/figures/TimeObservationNodeFigure.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/custom-src/org/eclipse/papyrus/diagram/composite/custom/figures/TimeObservationNodeFigure.java
new file mode 100644
index 00000000000..a68e24ea39e
--- /dev/null
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/custom-src/org/eclipse/papyrus/diagram/composite/custom/figures/TimeObservationNodeFigure.java
@@ -0,0 +1,36 @@
+/*****************************************************************************
+ * Copyright (c) 2009 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
+ *
+ * Contributors:
+ * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+
+package org.eclipse.papyrus.diagram.composite.custom.figures;
+
+import org.eclipse.papyrus.diagram.common.Activator;
+import org.eclipse.swt.graphics.Image;
+
+/*
+ * This class looks like DiagramNodeFigure
+ */
+//public class ObservationNodeFigure extends RectangleFigure {
+public class TimeObservationNodeFigure extends AbstractObservationNodeFigure {
+
+ public static final String IMAGE_OBSERVATION = "TimeObservation.gif"; //$NON-NLS-1$
+
+ public void setAppliedStereotypeIcon(Image image) {
+ if (image == null)
+ setIcon(Activator.getPluginIconImage(ID, PATH + IMAGE_OBSERVATION));
+ else
+ setIcon(image);
+
+ }
+
+}
diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/custom-src/org/eclipse/papyrus/diagram/composite/custom/helper/DurationObservationHelper.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/custom-src/org/eclipse/papyrus/diagram/composite/custom/helper/DurationObservationHelper.java
new file mode 100644
index 00000000000..fa21d14a88f
--- /dev/null
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/custom-src/org/eclipse/papyrus/diagram/composite/custom/helper/DurationObservationHelper.java
@@ -0,0 +1,178 @@
+/*****************************************************************************
+ * Copyright (c) 2009 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
+ *
+ * Contributors:
+ * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.diagram.composite.custom.helper;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Iterator;
+
+import org.eclipse.core.runtime.IAdaptable;
+import org.eclipse.draw2d.geometry.Point;
+import org.eclipse.emf.transaction.TransactionalEditingDomain;
+import org.eclipse.gef.EditPart;
+import org.eclipse.gef.EditPartViewer;
+import org.eclipse.gef.commands.Command;
+import org.eclipse.gmf.runtime.common.core.command.CompositeCommand;
+import org.eclipse.gmf.runtime.diagram.core.preferences.PreferencesHint;
+import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;
+import org.eclipse.gmf.runtime.diagram.ui.commands.CreateCommand;
+import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;
+import org.eclipse.gmf.runtime.diagram.ui.commands.SetBoundsCommand;
+import org.eclipse.gmf.runtime.diagram.ui.editparts.CompartmentEditPart;
+import org.eclipse.gmf.runtime.diagram.ui.editparts.GraphicalEditPart;
+import org.eclipse.gmf.runtime.diagram.ui.editparts.LabelEditPart;
+import org.eclipse.gmf.runtime.diagram.ui.requests.CreateConnectionViewRequest.ConnectionViewDescriptor;
+import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest.ViewDescriptor;
+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;
+import org.eclipse.gmf.runtime.emf.type.core.IHintedType;
+import org.eclipse.gmf.runtime.notation.Node;
+import org.eclipse.gmf.runtime.notation.View;
+import org.eclipse.papyrus.diagram.common.commands.CommonDeferredCreateConnectionViewCommand;
+import org.eclipse.papyrus.diagram.common.commands.SemanticAdapter;
+import org.eclipse.papyrus.diagram.common.helper.ElementHelper;
+import org.eclipse.papyrus.diagram.composite.providers.UMLElementTypes;
+import org.eclipse.uml2.uml.DurationObservation;
+import org.eclipse.uml2.uml.NamedElement;
+
+/**
+ * The Class DurationObservationHelper has in charge to drop a durationObservation
+ *
+ * This class looks like AssociationClassHelper
+ *
+ * This class looks like TimeObservationHelper
+ */
+public class DurationObservationHelper extends ElementHelper {
+
+ /**
+ * Instantiates a new DurationObservation helper.
+ *
+ * @param editDomain
+ * the edit domain
+ */
+ public DurationObservationHelper(TransactionalEditingDomain editDomain) {
+ this.editDomain = editDomain;
+ }
+
+ /**
+ * Drop DurationObservation.
+ *
+ * @param durationobservation
+ * the association class the semantic element
+ * @param viewer
+ * the viewer
+ * @param diagramPreferencesHint
+ * the diagram preferences hint
+ * @param location
+ * the location of the drop
+ * @param containerView
+ * the container view that will contain the associationClass views
+ *
+ * @return the command
+ */
+ public Command dropDurationObservation(DurationObservation durationObservation, EditPartViewer viewer,
+ PreferencesHint diagramPreferencesHint, Point location, View containerView) {
+ CompositeCommand cc = new CompositeCommand("dropDurationObservation");
+ int nbEvents = durationObservation.getEvents().size();
+
+ // 0. Obtain list of the events
+ ArrayList<NamedElement> endToConnect = new ArrayList<NamedElement>(durationObservation.getEvents());
+ GraphicalEditPart[] endEditPart = new GraphicalEditPart[nbEvents];
+
+ // 1. Look for if each event is on the diagram
+ Iterator<NamedElement> iteratorProp = endToConnect.iterator();
+ int index = 0;
+ while (iteratorProp.hasNext()) {
+
+ NamedElement currentEvent = iteratorProp.next();
+
+ // look for if an editpart exist for this element
+ Collection<EditPart> editPartSet = viewer.getEditPartRegistry().values();
+ Iterator<EditPart> editPartIterator = editPartSet.iterator();
+
+ while (editPartIterator.hasNext() && endEditPart[index] == null) {
+
+ EditPart currentEditPart = editPartIterator.next();
+
+ if (currentEditPart instanceof GraphicalEditPart
+ && currentEvent.equals(((GraphicalEditPart) currentEditPart).resolveSemanticElement())) {
+ /**
+ * Warning : TimeObservationEditPart, TimeObservationStereotypeLabelEditPart and
+ * TimeObservationNameEditPart are equal : This is the object of this 2nd IF!!!
+ */
+ if (!(currentEditPart instanceof CompartmentEditPart)
+ && !(currentEditPart instanceof LabelEditPart))
+ endEditPart[index] = (GraphicalEditPart) currentEditPart;
+ }
+
+ }
+ index += 1;
+ }
+
+ // 2. creation of the node DurationObservation
+
+ IAdaptable elementAdapter = new EObjectAdapter(durationObservation);
+ ViewDescriptor descriptor = new ViewDescriptor(elementAdapter, Node.class,
+ ((IHintedType) UMLElementTypes.DurationObservation_2093).getSemanticHint(), ViewUtil.APPEND, false,
+ diagramPreferencesHint);
+ CreateCommand nodeCreationCommand = new CreateCommand(getEditingDomain(), descriptor, ((View) containerView));
+ cc.compose(nodeCreationCommand);
+
+ SetBoundsCommand setBoundsCommand = new SetBoundsCommand(getEditingDomain(), "move",
+ (IAdaptable) nodeCreationCommand.getCommandResult().getReturnValue(), location);
+ cc.compose(setBoundsCommand);
+
+ if (nbEvents != 0) {
+ IAdaptable sourceEventAdapter = null;
+ IAdaptable targetEvent0Adapter = null;
+ IAdaptable targetEvent1Adapter = null;
+
+ // obtain the node figure
+ sourceEventAdapter = (IAdaptable) nodeCreationCommand.getCommandResult().getReturnValue();
+
+ // used in the creation command of each event
+ ConnectionViewDescriptor dashedLineViewDescriptor = new ConnectionViewDescriptor(
+ UMLElementTypes.DurationObservationEvent_4019,
+ ((IHintedType) UMLElementTypes.DurationObservationEvent_4019).getSemanticHint(),
+ diagramPreferencesHint);
+
+ // 3. creation of the dashed line between the associationClass link
+ if (endEditPart[0] != null) {
+
+ targetEvent0Adapter = new SemanticAdapter(null, endEditPart[0].getModel());
+ CommonDeferredCreateConnectionViewCommand dashedLineCmd = new CommonDeferredCreateConnectionViewCommand(
+ getEditingDomain(), ((IHintedType) UMLElementTypes.DurationObservationEvent_4019)
+ .getSemanticHint(), ((IAdaptable) sourceEventAdapter),
+ ((IAdaptable) targetEvent0Adapter), viewer, diagramPreferencesHint, dashedLineViewDescriptor,
+ null);
+ dashedLineCmd.setElement(durationObservation);
+ cc.compose(dashedLineCmd);
+
+ }
+
+ if ((nbEvents == 2) && endEditPart[1] != null) {
+ targetEvent1Adapter = new SemanticAdapter(null, endEditPart[1].getModel());
+ CommonDeferredCreateConnectionViewCommand dashedLineCmd = new CommonDeferredCreateConnectionViewCommand(
+ getEditingDomain(), ((IHintedType) UMLElementTypes.DurationObservationEvent_4019)
+ .getSemanticHint(), ((IAdaptable) sourceEventAdapter),
+ ((IAdaptable) targetEvent1Adapter), viewer, diagramPreferencesHint, dashedLineViewDescriptor,
+ null);
+ dashedLineCmd.setElement(durationObservation);
+ cc.compose(dashedLineCmd);
+ }
+
+ }
+ return new ICommandProxy(cc);
+ }
+
+}
diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/custom-src/org/eclipse/papyrus/diagram/composite/custom/helper/TimeObservationHelper.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/custom-src/org/eclipse/papyrus/diagram/composite/custom/helper/TimeObservationHelper.java
new file mode 100644
index 00000000000..770b9d9e32a
--- /dev/null
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/custom-src/org/eclipse/papyrus/diagram/composite/custom/helper/TimeObservationHelper.java
@@ -0,0 +1,149 @@
+/*****************************************************************************
+ * Copyright (c) 2009 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
+ *
+ * Contributors:
+ * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.diagram.composite.custom.helper;
+
+import java.util.Collection;
+import java.util.Iterator;
+
+import org.eclipse.core.runtime.IAdaptable;
+import org.eclipse.draw2d.geometry.Point;
+import org.eclipse.emf.transaction.TransactionalEditingDomain;
+import org.eclipse.gef.EditPart;
+import org.eclipse.gef.EditPartViewer;
+import org.eclipse.gef.commands.Command;
+import org.eclipse.gmf.runtime.common.core.command.CompositeCommand;
+import org.eclipse.gmf.runtime.diagram.core.preferences.PreferencesHint;
+import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;
+import org.eclipse.gmf.runtime.diagram.ui.commands.CreateCommand;
+import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;
+import org.eclipse.gmf.runtime.diagram.ui.commands.SetBoundsCommand;
+import org.eclipse.gmf.runtime.diagram.ui.editparts.CompartmentEditPart;
+import org.eclipse.gmf.runtime.diagram.ui.editparts.GraphicalEditPart;
+import org.eclipse.gmf.runtime.diagram.ui.editparts.LabelEditPart;
+import org.eclipse.gmf.runtime.diagram.ui.requests.CreateConnectionViewRequest.ConnectionViewDescriptor;
+import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest.ViewDescriptor;
+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;
+import org.eclipse.gmf.runtime.emf.type.core.IHintedType;
+import org.eclipse.gmf.runtime.notation.Node;
+import org.eclipse.gmf.runtime.notation.View;
+import org.eclipse.papyrus.diagram.common.commands.CommonDeferredCreateConnectionViewCommand;
+import org.eclipse.papyrus.diagram.common.commands.SemanticAdapter;
+import org.eclipse.papyrus.diagram.common.helper.ElementHelper;
+import org.eclipse.papyrus.diagram.composite.providers.UMLElementTypes;
+import org.eclipse.uml2.uml.NamedElement;
+import org.eclipse.uml2.uml.TimeObservation;
+
+/**
+ * The Class TimeObservationHelper has in charge to drop a timeObservation
+ *
+ * This class looks like AssociationClassHelper
+ */
+public class TimeObservationHelper extends ElementHelper {
+
+ /**
+ * Instantiates a new TimeObservation helper.
+ *
+ * @param editDomain
+ * the edit domain
+ */
+ public TimeObservationHelper(TransactionalEditingDomain editDomain) {
+ this.editDomain = editDomain;
+ }
+
+ /**
+ * Drop TimeObservation.
+ *
+ * @param durationobservation
+ * the association class the semantic element
+ * @param viewer
+ * the viewer
+ * @param diagramPreferencesHint
+ * the diagram preferences hint
+ * @param location
+ * the location of the drop
+ * @param containerView
+ * the container view that will contain the associationClass views
+ *
+ * @return the command
+ */
+ public Command dropTimeObservation(TimeObservation timeObservation, EditPartViewer viewer,
+ PreferencesHint diagramPreferencesHint, Point location, View containerView) {
+ CompositeCommand cc = new CompositeCommand("dropTimeObservation");
+
+ // 0. Obtain the events
+ NamedElement endToConnect = timeObservation.getEvent();
+ GraphicalEditPart endEditPart = null;
+
+ // we have an event
+ if (endToConnect != null) {
+ // look for if an editpart exist for this element
+ Collection<EditPart> editPartSet = viewer.getEditPartRegistry().values();
+ Iterator<EditPart> editPartIterator = editPartSet.iterator();
+
+ while (editPartIterator.hasNext() && endEditPart == null) {
+
+ EditPart currentEditPart = editPartIterator.next();
+ if (currentEditPart instanceof GraphicalEditPart
+ && endToConnect.equals(((GraphicalEditPart) currentEditPart).resolveSemanticElement())) {
+ /**
+ * Warning : TimeObservationEditPart, TimeObservationStereotypeLabelEditPart and
+ * TimeObservationNameEditPart are equal : This is the object of this 2nd IF!!!
+ */
+ if (!(currentEditPart instanceof CompartmentEditPart)
+ && !(currentEditPart instanceof LabelEditPart))
+ endEditPart = (GraphicalEditPart) currentEditPart;
+ }
+ }
+ }
+
+ // 2. creation of the node TimeObservation
+ IAdaptable elementAdapter = new EObjectAdapter(timeObservation);
+ ViewDescriptor descriptor = new ViewDescriptor(elementAdapter, Node.class,
+ ((IHintedType) UMLElementTypes.TimeObservation_2094).getSemanticHint(), ViewUtil.APPEND, false,
+ diagramPreferencesHint);
+ CreateCommand nodeCreationCommand = new CreateCommand(getEditingDomain(), descriptor, ((View) containerView));
+ cc.compose(nodeCreationCommand);
+
+ SetBoundsCommand setBoundsCommand = new SetBoundsCommand(getEditingDomain(), "move",
+ (IAdaptable) nodeCreationCommand.getCommandResult().getReturnValue(), location);
+ cc.compose(setBoundsCommand);
+
+ if (endEditPart != null) {
+ IAdaptable sourceEventAdapter = null;
+ IAdaptable targetEventAdapter = null;
+
+ // obtain the node figure
+ sourceEventAdapter = (IAdaptable) nodeCreationCommand.getCommandResult().getReturnValue();
+
+ // used in the creation command of the event
+ ConnectionViewDescriptor dashedLineViewDescriptor = new ConnectionViewDescriptor(
+ UMLElementTypes.TimeObservationEvent_4018,
+ ((IHintedType) UMLElementTypes.TimeObservationEvent_4018).getSemanticHint(), diagramPreferencesHint);
+
+ // 3. creation of the dashed line between the associationClass link
+
+ targetEventAdapter = new SemanticAdapter(null, endEditPart.getModel());
+ CommonDeferredCreateConnectionViewCommand dashedLineCmd = new CommonDeferredCreateConnectionViewCommand(
+ getEditingDomain(), ((IHintedType) UMLElementTypes.TimeObservationEvent_4018).getSemanticHint(),
+ ((IAdaptable) sourceEventAdapter), ((IAdaptable) targetEventAdapter), viewer,
+ diagramPreferencesHint, dashedLineViewDescriptor, null);
+ dashedLineCmd.setElement(timeObservation);
+ cc.compose(dashedLineCmd);
+
+ }
+
+ return new ICommandProxy(cc);
+ }
+
+}
diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/messages.properties b/plugins/uml/org.eclipse.papyrus.diagram.composite/messages.properties
index 73d6bad049f..c273ff51f67 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/messages.properties
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/messages.properties
@@ -177,3 +177,13 @@ Usage8CreationTool_title=Usage
Usage8CreationTool_desc=Create new Usage
Dependency9CreationTool_title=Dependency
Dependency9CreationTool_desc=Create new Dependency
+TimeObservation9CreationTool_title=TimeObservation
+TimeObservation9CreationTool_desc=Create new TimeObservation
+DurationObservation10CreationTool_title=DurationObservation
+DurationObservation10CreationTool_desc=Create new DurationObservation
+ConnectorTimeObservation10CreationTool_title=ConnectorTimeObservation
+ConnectorTimeObservation10CreationTool_desc=Create a new link with a TimeObservation
+ConnectorDurationObservation11CreationTool_title=ConnectorDurationObservation
+ConnectorDurationObservation11CreationTool_desc=Create new connector with a DurationObservation
+Constraint8CreationTool_title=Constraint
+Constraint8CreationTool_desc=Create new Constraint
diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/model/compositediagram.gmfgen b/plugins/uml/org.eclipse.papyrus.diagram.composite/model/compositediagram.gmfgen
index f794f1c1980..ec3f25b399d 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/model/compositediagram.gmfgen
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/model/compositediagram.gmfgen
@@ -4649,13 +4649,16 @@
xsi:type="gmfgen:MetamodelType"
editHelperClassName="DurationObservationEditHelper"/>
<viewmap
- xsi:type="gmfgen:InnerClassViewmap"
- className="NamedElementDescriptor"
- classBody="&#xA;/**&#xA; * @generated&#xA; */&#xA;public class NamedElementDescriptor extends org.eclipse.draw2d.RectangleFigure {&#xA;&#xA;&#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;private org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel fNamedElementNameLabel; &#xA;&#xA;&#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;public NamedElementDescriptor() {&#xA;&#x9;&#x9;&#x9;&#x9;this.setLineWidth(1);&#xA;&#x9;this.setForegroundColor(org.eclipse.draw2d.ColorConstants.black);&#xA;&#x9;&#x9;createContents();&#xA;&#x9;}&#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;private void createContents(){&#xA;&#xA;&#xA;fNamedElementNameLabel = new org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel();&#xA;fNamedElementNameLabel.setText(&quot;&quot;);&#xA;&#x9;fNamedElementNameLabel.setForegroundColor(org.eclipse.draw2d.ColorConstants.black);&#xA;&#xA;fNamedElementNameLabel.setFont(FNAMEDELEMENTNAMELABEL_FONT);&#xA;&#xA;&#xA;&#xA;this.add(fNamedElementNameLabel);&#xA;&#xA;&#xA;&#x9;}&#xA;&#xA;&#xA;&#xA;&#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;private boolean myUseLocalCoordinates = false;&#xA;&#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;protected boolean useLocalCoordinates() {&#xA;&#x9;&#x9;return myUseLocalCoordinates;&#xA;&#x9;}&#xA;&#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;protected void setUseLocalCoordinates(boolean useLocalCoordinates) {&#xA;&#x9;&#x9;myUseLocalCoordinates = useLocalCoordinates;&#xA;&#x9;}&#xA;&#xA;&#xA;&#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;public org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel getNamedElementNameLabel() {&#xA;&#x9;&#x9;return fNamedElementNameLabel;&#xA;&#x9;}&#xA;&#xA;&#xA;}&#xA;&#xA;/**&#xA; * @generated&#xA; */&#xA;static final org.eclipse.swt.graphics.Font FNAMEDELEMENTNAMELABEL_FONT = new org.eclipse.swt.graphics.Font(org.eclipse.swt.widgets.Display.getCurrent(), &quot;Arial&quot;, 10, org.eclipse.swt.SWT.BOLD);&#xA;&#xA;">
- <attributes
- xsi:type="gmfgen:StyleAttributes"
- fixedForeground="true"/>
- </viewmap>
+ xsi:type="gmfgen:FigureViewmap"
+ figureQualifiedClassName="org.eclipse.papyrus.diagram.composite.custom.figures.DurationObservationNodeFigure"/>
+ <behaviour
+ xsi:type="gmfgen:CustomBehaviour"
+ key="org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"
+ editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeIconlDisplayEditPolicy"/>
+ <behaviour
+ xsi:type="gmfgen:CustomBehaviour"
+ key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE"
+ editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy"/>
<modelFacet>
<metaClass
href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/DurationObservation"/>
@@ -4674,27 +4677,42 @@
</modelElementInitializer>
</modelFacet>
<labels
- visualID="5176"
+ xsi:type="gmfgen:GenExternalNodeLabel"
+ visualID="5151"
editPartClassName="DurationObservationNameEditPart"
- itemSemanticEditPolicyClassName="DurationObservationNameItemSemanticEditPolicy"
- elementIcon="true">
+ itemSemanticEditPolicyClassName="DurationObservationNameItemSemanticEditPolicy">
<diagramRunTimeClass
href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
<viewmap
- xsi:type="gmfgen:ParentAssignedViewmap"
- getterName="getNamedElementNameLabel"
- figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel">
- <attributes
- xsi:type="gmfgen:StyleAttributes"
- fixedFont="true"
- fixedForeground="true"/>
- </viewmap>
+ xsi:type="gmfgen:FigureViewmap"
+ figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel"/>
<modelFacet
xsi:type="gmfgen:FeatureLabelModelFacet"
- parser="/0/@labelParsers/@implementations.0"
- viewPattern="{0} "
- editorPattern="{0}"
- editPattern="{0}">
+ parser="/0/@labelParsers/@implementations.0">
+ <metaFeatures
+ href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
+ </modelFacet>
+ </labels>
+ <labels
+ xsi:type="gmfgen:GenExternalNodeLabel"
+ visualID="5152"
+ editPartClassName="DurationObservationStereotypeLabelEditPart"
+ itemSemanticEditPolicyClassName="DurationObservationStereotypeLabelItemSemanticEditPolicy">
+ <diagramRunTimeClass
+ href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
+ <viewmap
+ xsi:type="gmfgen:FigureViewmap"
+ figureQualifiedClassName="org.eclipse.papyrus.diagram.common.figure.node.AppliedStereotypeWrappingLabelFigure"/>
+ <behaviour
+ xsi:type="gmfgen:CustomBehaviour"
+ key="org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"
+ editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeExternalNodeEditPolicy"/>
+ <modelFacet
+ xsi:type="gmfgen:FeatureLabelModelFacet"
+ parser="/0/@labelParsers/@implementations.1"
+ viewPattern="&lt;&lt;{0}>>"
+ editorPattern="&lt;&lt;{0}>>"
+ editPattern="&lt;&lt;{0}>>">
<metaFeatures
href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
</modelFacet>
@@ -4713,13 +4731,16 @@
xsi:type="gmfgen:MetamodelType"
editHelperClassName="TimeObservationEditHelper"/>
<viewmap
- xsi:type="gmfgen:InnerClassViewmap"
- className="NamedElementDescriptor"
- classBody="&#xA;/**&#xA; * @generated&#xA; */&#xA;public class NamedElementDescriptor extends org.eclipse.draw2d.RectangleFigure {&#xA;&#xA;&#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;private org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel fNamedElementNameLabel; &#xA;&#xA;&#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;public NamedElementDescriptor() {&#xA;&#x9;&#x9;&#x9;&#x9;this.setLineWidth(1);&#xA;&#x9;this.setForegroundColor(org.eclipse.draw2d.ColorConstants.black);&#xA;&#x9;&#x9;createContents();&#xA;&#x9;}&#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;private void createContents(){&#xA;&#xA;&#xA;fNamedElementNameLabel = new org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel();&#xA;fNamedElementNameLabel.setText(&quot;&quot;);&#xA;&#x9;fNamedElementNameLabel.setForegroundColor(org.eclipse.draw2d.ColorConstants.black);&#xA;&#xA;fNamedElementNameLabel.setFont(FNAMEDELEMENTNAMELABEL_FONT);&#xA;&#xA;&#xA;&#xA;this.add(fNamedElementNameLabel);&#xA;&#xA;&#xA;&#x9;}&#xA;&#xA;&#xA;&#xA;&#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;private boolean myUseLocalCoordinates = false;&#xA;&#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;protected boolean useLocalCoordinates() {&#xA;&#x9;&#x9;return myUseLocalCoordinates;&#xA;&#x9;}&#xA;&#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;protected void setUseLocalCoordinates(boolean useLocalCoordinates) {&#xA;&#x9;&#x9;myUseLocalCoordinates = useLocalCoordinates;&#xA;&#x9;}&#xA;&#xA;&#xA;&#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;public org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel getNamedElementNameLabel() {&#xA;&#x9;&#x9;return fNamedElementNameLabel;&#xA;&#x9;}&#xA;&#xA;&#xA;}&#xA;&#xA;/**&#xA; * @generated&#xA; */&#xA;static final org.eclipse.swt.graphics.Font FNAMEDELEMENTNAMELABEL_FONT = new org.eclipse.swt.graphics.Font(org.eclipse.swt.widgets.Display.getCurrent(), &quot;Arial&quot;, 10, org.eclipse.swt.SWT.BOLD);&#xA;&#xA;">
- <attributes
- xsi:type="gmfgen:StyleAttributes"
- fixedForeground="true"/>
- </viewmap>
+ xsi:type="gmfgen:FigureViewmap"
+ figureQualifiedClassName="org.eclipse.papyrus.diagram.composite.custom.figures.TimeObservationNodeFigure"/>
+ <behaviour
+ xsi:type="gmfgen:CustomBehaviour"
+ key="org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"
+ editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeIconlDisplayEditPolicy"/>
+ <behaviour
+ xsi:type="gmfgen:CustomBehaviour"
+ key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE"
+ editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy"/>
<modelFacet>
<metaClass
href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/TimeObservation"/>
@@ -4738,27 +4759,42 @@
</modelElementInitializer>
</modelFacet>
<labels
- visualID="5177"
+ xsi:type="gmfgen:GenExternalNodeLabel"
+ visualID="5142"
editPartClassName="TimeObservationNameEditPart"
- itemSemanticEditPolicyClassName="TimeObservationNameItemSemanticEditPolicy"
- elementIcon="true">
+ itemSemanticEditPolicyClassName="TimeObservationNameItemSemanticEditPolicy">
<diagramRunTimeClass
href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
<viewmap
- xsi:type="gmfgen:ParentAssignedViewmap"
- getterName="getNamedElementNameLabel"
- figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel">
- <attributes
- xsi:type="gmfgen:StyleAttributes"
- fixedFont="true"
- fixedForeground="true"/>
- </viewmap>
+ xsi:type="gmfgen:FigureViewmap"
+ figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel"/>
<modelFacet
xsi:type="gmfgen:FeatureLabelModelFacet"
- parser="/0/@labelParsers/@implementations.0"
- viewPattern="{0} "
- editorPattern="{0}"
- editPattern="{0}">
+ parser="/0/@labelParsers/@implementations.0">
+ <metaFeatures
+ href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
+ </modelFacet>
+ </labels>
+ <labels
+ xsi:type="gmfgen:GenExternalNodeLabel"
+ visualID="5143"
+ editPartClassName="TimeObservationStereotypeLabelEditPart"
+ itemSemanticEditPolicyClassName="TimeObservationStereotypeLabelItemSemanticEditPolicy">
+ <diagramRunTimeClass
+ href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
+ <viewmap
+ xsi:type="gmfgen:FigureViewmap"
+ figureQualifiedClassName="org.eclipse.papyrus.diagram.common.figure.node.AppliedStereotypeWrappingLabelFigure"/>
+ <behaviour
+ xsi:type="gmfgen:CustomBehaviour"
+ key="org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"
+ editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeExternalNodeEditPolicy"/>
+ <modelFacet
+ xsi:type="gmfgen:FeatureLabelModelFacet"
+ parser="/0/@labelParsers/@implementations.1"
+ viewPattern="&lt;&lt;{0}>>"
+ editorPattern="&lt;&lt;{0}>>"
+ editPattern="&lt;&lt;{0}>>">
<metaFeatures
href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
</modelFacet>
@@ -7212,6 +7248,46 @@
href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/DirectedRelationship/target"/>
</modelFacet>
</links>
+ <links
+ visualID="4018"
+ editPartClassName="ConnectorTimeObservationEditPart"
+ itemSemanticEditPolicyClassName="ConnectorTimeObservationItemSemanticEditPolicy"
+ createCommandClassName="ConnectorTimeObservationCreateCommand"
+ reorientCommandClassName="ConnectorTimeObservationReorientCommand">
+ <diagramRunTimeClass
+ href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Edge"/>
+ <elementType
+ xsi:type="gmfgen:SpecializationType"/>
+ <viewmap
+ xsi:type="gmfgen:InnerClassViewmap"
+ className="LinkDescriptor"
+ classBody="&#xA;/**&#xA; * @generated&#xA; */&#xA;public class LinkDescriptor extends org.eclipse.gmf.runtime.draw2d.ui.figures.PolylineConnectionEx {&#xA;&#xA;&#xA;&#xA;&#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;public LinkDescriptor() {&#xA;&#x9;&#x9;this.setLineWidth(1);&#xA;this.setLineStyle(org.eclipse.draw2d.Graphics.LINE_DASH);&#xA;&#xA;&#x9;}&#xA;&#xA;&#xA;&#xA;&#xA;}&#xA;&#xA;"/>
+ <modelFacet
+ xsi:type="gmfgen:FeatureLinkModelFacet">
+ <metaFeature
+ href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/TimeObservation/event"/>
+ </modelFacet>
+ </links>
+ <links
+ visualID="4019"
+ editPartClassName="ConnectorDurationObservationEditPart"
+ itemSemanticEditPolicyClassName="ConnectorDurationObservationItemSemanticEditPolicy"
+ createCommandClassName="ConnectorDurationObservationCreateCommand"
+ reorientCommandClassName="ConnectorDurationObservationReorientCommand">
+ <diagramRunTimeClass
+ href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Edge"/>
+ <elementType
+ xsi:type="gmfgen:SpecializationType"/>
+ <viewmap
+ xsi:type="gmfgen:InnerClassViewmap"
+ className="LinkDescriptor"
+ classBody="&#xA;/**&#xA; * @generated&#xA; */&#xA;public class LinkDescriptor extends org.eclipse.gmf.runtime.draw2d.ui.figures.PolylineConnectionEx {&#xA;&#xA;&#xA;&#xA;&#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;public LinkDescriptor() {&#xA;&#x9;&#x9;this.setLineWidth(1);&#xA;this.setLineStyle(org.eclipse.draw2d.Graphics.LINE_DASH);&#xA;&#xA;&#x9;}&#xA;&#xA;&#xA;&#xA;&#xA;}&#xA;&#xA;"/>
+ <modelFacet
+ xsi:type="gmfgen:FeatureLinkModelFacet">
+ <metaFeature
+ href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/DurationObservation/event"/>
+ </modelFacet>
+ </links>
<compartments
visualID="7033"
editPartClassName="DataTypeAttributeCompartmentEditPart"
@@ -8279,11 +8355,26 @@
genNodes="/0/@diagram/@childNodes.26 /0/@diagram/@topLevelNodes.49"/>
<entries
xsi:type="gmfgen:ToolEntry"
- title="Contraint"
+ title="Constraint"
description="Create new Constraint"
largeIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Constraint.gif"
smallIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Constraint.gif"
+ createMethodName="createConstraint8CreationTool"
genNodes="/0/@diagram/@topLevelNodes.54"/>
+ <entries
+ xsi:type="gmfgen:ToolEntry"
+ title="TimeObservation"
+ description="Create new TimeObservation"
+ largeIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/TimeObservation.gif"
+ smallIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/TimeObservation.gif"
+ genNodes="/0/@diagram/@topLevelNodes.34"/>
+ <entries
+ xsi:type="gmfgen:ToolEntry"
+ title="DurationObservation"
+ description="Create new DurationObservation"
+ largeIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/DurationObservation.gif"
+ smallIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/DurationObservation.gif"
+ genNodes="/0/@diagram/@topLevelNodes.33"/>
</groups>
<groups
title="Edges"
@@ -8297,7 +8388,7 @@
description="Create new Link (Comment / Constraint)"
largeIconPath="icons/obj16/Link.gif"
smallIconPath="icons/obj16/Link.gif"
- genLinks="/0/@diagram/@links.1 /0/@diagram/@links.2"/>
+ genLinks="/0/@diagram/@links.1 /0/@diagram/@links.2 /0/@diagram/@links.16 /0/@diagram/@links.17"/>
<entries
xsi:type="gmfgen:ToolEntry"
title="Connector"
@@ -8443,10 +8534,10 @@
extensibleViaService="true">
<implementations
xsi:type="gmfgen:PredefinedParser"
- uses="/0/@diagram/@topLevelNodes.0/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.1/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.2/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.3/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.4/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.5/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.14/@labels.0/@modelFacet /0/@diagram/@childNodes.30/@labelModelFacet /0/@diagram/@topLevelNodes.15/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.16/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.6/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.7/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.8/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.9/@labels.0/@modelFacet /0/@diagram/@childNodes.0/@labels.0/@modelFacet /0/@diagram/@childNodes.1/@labels.0/@modelFacet /0/@diagram/@childNodes.3/@labels.0/@modelFacet /0/@diagram/@childNodes.4/@labels.0/@modelFacet /0/@diagram/@childNodes.5/@labels.0/@modelFacet /0/@diagram/@childNodes.6/@labels.0/@modelFacet /0/@diagram/@childNodes.7/@labels.0/@modelFacet /0/@diagram/@childNodes.8/@labels.0/@modelFacet /0/@diagram/@childNodes.9/@labels.0/@modelFacet /0/@diagram/@childNodes.17/@labels.0/@modelFacet /0/@diagram/@childNodes.18/@labels.0/@modelFacet /0/@diagram/@childNodes.19/@labels.0/@modelFacet /0/@diagram/@childNodes.10/@labels.0/@modelFacet /0/@diagram/@childNodes.11/@labels.0/@modelFacet /0/@diagram/@childNodes.12/@labels.0/@modelFacet /0/@diagram/@childNodes.13/@labels.0/@modelFacet /0/@diagram/@childNodes.15/@labels.0/@modelFacet /0/@diagram/@childNodes.20/@labels.0/@modelFacet /0/@diagram/@childNodes.21/@labels.0/@modelFacet /0/@diagram/@childNodes.22/@labels.0/@modelFacet /0/@diagram/@childNodes.23/@labels.0/@modelFacet /0/@diagram/@childNodes.24/@labels.0/@modelFacet /0/@diagram/@childNodes.25/@labels.0/@modelFacet /0/@diagram/@childNodes.26/@labels.0/@modelFacet /0/@diagram/@childNodes.16/@labels.0/@modelFacet /0/@diagram/@childNodes.14/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.10/@labels.0/@modelFacet /0/@diagram/@childNodes.29/@labelModelFacet /0/@diagram/@childNodes.27/@labelModelFacet /0/@diagram/@childNodes.28/@labelModelFacet /0/@diagram/@childNodes.31/@labelModelFacet /0/@diagram/@childNodes.32/@labelModelFacet /0/@diagram/@childNodes.33/@labelModelFacet /0/@diagram/@childNodes.34/@labelModelFacet /0/@diagram/@childNodes.35/@labelModelFacet /0/@diagram/@childNodes.36/@labelModelFacet /0/@diagram/@childNodes.37/@labelModelFacet /0/@diagram/@childNodes.38/@labelModelFacet /0/@diagram/@childNodes.39/@labelModelFacet /0/@diagram/@childNodes.40/@labelModelFacet /0/@diagram/@childNodes.41/@labelModelFacet /0/@diagram/@childNodes.42/@labelModelFacet /0/@diagram/@topLevelNodes.11/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.12/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.13/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.17/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.18/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.19/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.20/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.21/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.22/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.23/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.24/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.25/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.26/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.27/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.28/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.29/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.30/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.31/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.32/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.33/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.34/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.35/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.36/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.37/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.38/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.39/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.40/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.41/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.42/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.43/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.44/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.45/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.46/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.47/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.48/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.49/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.50/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.51/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.52/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.53/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.54/@labels.0/@modelFacet /0/@diagram/@links.3/@labels.0/@modelFacet /0/@diagram/@links.4/@labels.0/@modelFacet /0/@diagram/@links.5/@labels.0/@modelFacet /0/@diagram/@links.6/@labels.0/@modelFacet /0/@diagram/@links.7/@labels.0/@modelFacet /0/@diagram/@links.8/@labels.0/@modelFacet /0/@diagram/@links.9/@labels.0/@modelFacet /0/@diagram/@links.10/@labels.0/@modelFacet /0/@diagram/@links.12/@labels.0/@modelFacet /0/@diagram/@links.13/@labels.0/@modelFacet /0/@diagram/@links.13/@labels.1/@modelFacet /0/@diagram/@links.13/@labels.2/@modelFacet /0/@diagram/@childNodes.2/@labels.0/@modelFacet /0/@diagram/@links.11/@labels.0/@modelFacet"/>
+ uses="/0/@diagram/@topLevelNodes.0/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.1/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.2/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.3/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.4/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.5/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.14/@labels.0/@modelFacet /0/@diagram/@childNodes.30/@labelModelFacet /0/@diagram/@topLevelNodes.15/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.16/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.6/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.7/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.8/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.9/@labels.0/@modelFacet /0/@diagram/@childNodes.0/@labels.0/@modelFacet /0/@diagram/@childNodes.1/@labels.0/@modelFacet /0/@diagram/@childNodes.3/@labels.0/@modelFacet /0/@diagram/@childNodes.4/@labels.0/@modelFacet /0/@diagram/@childNodes.5/@labels.0/@modelFacet /0/@diagram/@childNodes.6/@labels.0/@modelFacet /0/@diagram/@childNodes.7/@labels.0/@modelFacet /0/@diagram/@childNodes.8/@labels.0/@modelFacet /0/@diagram/@childNodes.9/@labels.0/@modelFacet /0/@diagram/@childNodes.17/@labels.0/@modelFacet /0/@diagram/@childNodes.18/@labels.0/@modelFacet /0/@diagram/@childNodes.19/@labels.0/@modelFacet /0/@diagram/@childNodes.10/@labels.0/@modelFacet /0/@diagram/@childNodes.11/@labels.0/@modelFacet /0/@diagram/@childNodes.12/@labels.0/@modelFacet /0/@diagram/@childNodes.13/@labels.0/@modelFacet /0/@diagram/@childNodes.15/@labels.0/@modelFacet /0/@diagram/@childNodes.20/@labels.0/@modelFacet /0/@diagram/@childNodes.21/@labels.0/@modelFacet /0/@diagram/@childNodes.22/@labels.0/@modelFacet /0/@diagram/@childNodes.23/@labels.0/@modelFacet /0/@diagram/@childNodes.24/@labels.0/@modelFacet /0/@diagram/@childNodes.25/@labels.0/@modelFacet /0/@diagram/@childNodes.26/@labels.0/@modelFacet /0/@diagram/@childNodes.16/@labels.0/@modelFacet /0/@diagram/@childNodes.14/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.10/@labels.0/@modelFacet /0/@diagram/@childNodes.29/@labelModelFacet /0/@diagram/@childNodes.27/@labelModelFacet /0/@diagram/@childNodes.28/@labelModelFacet /0/@diagram/@childNodes.31/@labelModelFacet /0/@diagram/@childNodes.32/@labelModelFacet /0/@diagram/@childNodes.33/@labelModelFacet /0/@diagram/@childNodes.34/@labelModelFacet /0/@diagram/@childNodes.35/@labelModelFacet /0/@diagram/@childNodes.36/@labelModelFacet /0/@diagram/@childNodes.37/@labelModelFacet /0/@diagram/@childNodes.38/@labelModelFacet /0/@diagram/@childNodes.39/@labelModelFacet /0/@diagram/@childNodes.40/@labelModelFacet /0/@diagram/@childNodes.41/@labelModelFacet /0/@diagram/@childNodes.42/@labelModelFacet /0/@diagram/@topLevelNodes.11/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.12/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.13/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.17/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.18/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.19/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.20/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.21/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.22/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.23/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.24/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.25/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.26/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.27/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.28/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.29/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.30/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.31/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.32/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.35/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.36/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.37/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.38/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.39/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.40/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.41/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.42/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.43/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.44/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.45/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.46/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.47/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.48/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.49/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.50/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.51/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.52/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.53/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.54/@labels.0/@modelFacet /0/@diagram/@links.3/@labels.0/@modelFacet /0/@diagram/@links.4/@labels.0/@modelFacet /0/@diagram/@links.5/@labels.0/@modelFacet /0/@diagram/@links.6/@labels.0/@modelFacet /0/@diagram/@links.7/@labels.0/@modelFacet /0/@diagram/@links.8/@labels.0/@modelFacet /0/@diagram/@links.9/@labels.0/@modelFacet /0/@diagram/@links.10/@labels.0/@modelFacet /0/@diagram/@links.12/@labels.0/@modelFacet /0/@diagram/@links.13/@labels.0/@modelFacet /0/@diagram/@links.13/@labels.1/@modelFacet /0/@diagram/@links.13/@labels.2/@modelFacet /0/@diagram/@childNodes.2/@labels.0/@modelFacet /0/@diagram/@links.11/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.34/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.33/@labels.0/@modelFacet"/>
<implementations
xsi:type="gmfgen:CustomParser"
- uses="/0/@diagram/@links.3/@labels.1/@modelFacet /0/@diagram/@links.4/@labels.1/@modelFacet /0/@diagram/@links.5/@labels.1/@modelFacet /0/@diagram/@links.6/@labels.1/@modelFacet /0/@diagram/@links.7/@labels.1/@modelFacet /0/@diagram/@links.8/@labels.1/@modelFacet /0/@diagram/@links.9/@labels.1/@modelFacet /0/@diagram/@links.10/@labels.1/@modelFacet /0/@diagram/@links.12/@labels.1/@modelFacet /0/@diagram/@links.14/@labels.0/@modelFacet /0/@diagram/@links.13/@labels.3/@modelFacet /0/@diagram/@links.11/@labels.2/@modelFacet"
+ uses="/0/@diagram/@links.3/@labels.1/@modelFacet /0/@diagram/@links.4/@labels.1/@modelFacet /0/@diagram/@links.5/@labels.1/@modelFacet /0/@diagram/@links.6/@labels.1/@modelFacet /0/@diagram/@links.7/@labels.1/@modelFacet /0/@diagram/@links.8/@labels.1/@modelFacet /0/@diagram/@links.9/@labels.1/@modelFacet /0/@diagram/@links.10/@labels.1/@modelFacet /0/@diagram/@links.12/@labels.1/@modelFacet /0/@diagram/@links.14/@labels.0/@modelFacet /0/@diagram/@links.13/@labels.3/@modelFacet /0/@diagram/@links.11/@labels.2/@modelFacet /0/@diagram/@topLevelNodes.34/@labels.1/@modelFacet /0/@diagram/@topLevelNodes.33/@labels.1/@modelFacet"
qualifiedName="org.eclipse.papyrus.diagram.common.parser.stereotype.AppliedStereotypeParser"/>
<implementations
xsi:type="gmfgen:CustomParser"
@@ -8480,6 +8571,18 @@
name="ExtendedUMLLinks"
superOwnedEditPart="org.eclipse.papyrus.diagram.common.editparts.UMLConnectionNodeEditPart"/>
<extensionNodes
+ xsi:type="papyrusgmfgenextension:ExtendedGenView"
+ comment="Adds a superclass for DurationObservationEditPart, TimeObservationEditPart"
+ genView="/0/@diagram/@topLevelNodes.34 /0/@diagram/@topLevelNodes.33"
+ name="AbstractObservationEditPart"
+ superOwnedEditPart="org.eclipse.papyrus.diagram.composite.custom.edit.parts.AbstractObservationEditPart"/>
+ <extensionNodes
+ xsi:type="papyrusgmfgenextension:ExtendedGenView"
+ comment="add a super class to TimeObservationSteteorypeLabelEditPart, DurationObservationStereotypeLabelEditPart"
+ genView="/0/@diagram/@topLevelNodes.34/@labels.1 /0/@diagram/@topLevelNodes.33/@labels.1"
+ name="AbstractLabelEditPart"
+ superOwnedEditPart="org.eclipse.papyrus.diagram.common.editparts.AbstractLabelEditPart"/>
+ <extensionNodes
xsi:type="papyrusgmfgenextension:SpecificLocator"
comment="Affixed Port locator"
classpath="org.eclipse.papyrus.diagram.composite.custom.locators.PortPositionLocator"
diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/plugin.properties b/plugins/uml/org.eclipse.papyrus.diagram.composite/plugin.properties
index f840440fc01..33409caba14 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/plugin.properties
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/plugin.properties
@@ -279,3 +279,5 @@ metatype.name.TimeConstraint_3116=TimeConstraint
metatype.name.TimeConstraint_3117=TimeConstraint
metatype.name.TimeConstraint_3118=TimeConstraint
metatype.name.TimeConstraint_3119=TimeConstraint
+metatype.name.TimeObservationEvent_4018=Undefined
+metatype.name.DurationObservationEvent_4019=Undefined
diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/plugin.xml b/plugins/uml/org.eclipse.papyrus.diagram.composite/plugin.xml
index 87bc160dde7..89979d42a65 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/plugin.xml
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/plugin.xml
@@ -212,7 +212,7 @@
<Priority name="Lowest"/>
<context viewClass="org.eclipse.gmf.runtime.notation.Diagram" semanticHints="CompositeStructure"/>
<context viewClass="org.eclipse.gmf.runtime.notation.Node" semanticHints="2060,2061,2062,2063,2064,2065,2069,2070,2071,2072,2073,2074,2075,2076,2066,2067,2068,2077,2078,2079,2080,2081,2082,2083,2084,2085,2086,2087,2088,2089,2090,2091,2092,2093,2094,2095,2096,2097,2098,2099,2100,2101,2102,2103,2104,2105,2106,2107,2108,2109,2110,2111,2112,2113,2114,3069,3070,3115,3071,3072,3073,3074,3075,3076,3077,3081,3082,3083,3084,3085,3086,3087,3078,3079,3080,3091,3092,3093,3094,3095,3096,3097,3101,3102,3100,3066,3103,3104,3105,3106,3107,3108,3109,3110,3111,3112,3113,3114"/>
- <context viewClass="org.eclipse.gmf.runtime.notation.Edge" semanticHints="4001,4002,4003,4004,4005,4011,4006,4012,4007,4008,4009,4017,4010,4013,4015,4016"/>
+ <context viewClass="org.eclipse.gmf.runtime.notation.Edge" semanticHints="4001,4002,4003,4004,4005,4011,4006,4012,4007,4008,4009,4017,4010,4013,4015,4016,4018,4019"/>
</viewProvider>
</extension>
@@ -227,10 +227,10 @@
<method name="getType()" value="2060,2061,2062,2063,2064,2065,2069,2070,2071,2072,2073,2074,2075,2076,2066,2067,2068,2077,2078,2079,2080,2081,2082,2083,2084,2085,2086,2087,2088,2089,2090,2091,2092,2093,2094,2095,2096,2097,2098,2099,2100,2101,2102,2103,2104,2105,2106,2107,2108,2109,2110,2111,2112,2113,2114,3069,3070,3115,3071,3072,3073,3074,3075,3076,3077,3081,3082,3083,3084,3085,3086,3087,3078,3079,3080,3091,3092,3093,3094,3095,3096,3097,3101,3102,3100,3066,3103,3104,3105,3106,3107,3108,3109,3110,3111,3112,3113,3114"/>
</object>
<object class="org.eclipse.gmf.runtime.notation.Edge" id="generated-links">
- <method name="getType()" value="4001,4002,4003,4004,4005,4011,4006,4012,4007,4008,4009,4017,4010,4013,4015,4016"/>
+ <method name="getType()" value="4001,4002,4003,4004,4005,4011,4006,4012,4007,4008,4009,4017,4010,4013,4015,4016,4018,4019"/>
</object>
<object class="org.eclipse.gmf.runtime.notation.Node" id="generated-labels">
- <method name="getType()" value="5112,5113,5114,5115,5116,5117,5121,5122,5123,5124,5156,5157,5158,5159,5118,5119,5120,5160,5161,5162,5163,5164,5165,5166,5167,5168,5169,5170,5171,5172,5173,5174,5175,5176,5177,5178,5179,5180,5181,5182,5183,5184,5185,5186,5187,5188,5189,5190,5191,5192,5193,5194,5195,5196,5197,5125,5126,5198,5127,5128,5129,5130,5131,5132,5133,5137,5138,5139,5140,5155,5141,5154,5134,5135,5136,5144,5145,5146,5147,5148,5149,5150"/>
+ <method name="getType()" value="5112,5113,5114,5115,5116,5117,5121,5122,5123,5124,5156,5157,5158,5159,5118,5119,5120,5160,5161,5162,5163,5164,5165,5166,5167,5168,5169,5170,5171,5172,5173,5174,5175,5151,5152,5142,5143,5178,5179,5180,5181,5182,5183,5184,5185,5186,5187,5188,5189,5190,5191,5192,5193,5194,5195,5196,5197,5125,5126,5198,5127,5128,5129,5130,5131,5132,5133,5137,5138,5139,5140,5155,5141,5154,5134,5135,5136,5144,5145,5146,5147,5148,5149,5150"/>
</object>
<object class="org.eclipse.gmf.runtime.notation.Node" id="generated-compartments">
<method name="getType()" value="7033,7034,7036,7037,7043,7044,7045,7048,7049,7050,7051,7052,7053,7054,7055,7056,7057,7058,7059,7060,7061,7062,7063,7064,7065,7066,7067,7068,7069,7070,7071,7072,7073,7075,7076,7077"/>
@@ -1416,6 +1416,24 @@
<param name="semanticHint" value="4016"/>
</metamodelType>
</metamodel>
+ <metamodel nsURI="http://www.eclipse.org/uml2/3.0.0/UML">
+ <specializationType
+ id="org.eclipse.papyrus.diagram.composite.TimeObservationEvent_4018"
+ name="%metatype.name.TimeObservationEvent_4018"
+ kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+ <specializes id="org.eclipse.gmf.runtime.emf.type.core.null"/>
+ <param name="semanticHint" value="4018"/>
+ </specializationType>
+ </metamodel>
+ <metamodel nsURI="http://www.eclipse.org/uml2/3.0.0/UML">
+ <specializationType
+ id="org.eclipse.papyrus.diagram.composite.DurationObservationEvent_4019"
+ name="%metatype.name.DurationObservationEvent_4019"
+ kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+ <specializes id="org.eclipse.gmf.runtime.emf.type.core.null"/>
+ <param name="semanticHint" value="4019"/>
+ </specializationType>
+ </metamodel>
</extension>
<extension point="org.eclipse.gmf.runtime.emf.type.core.elementTypeBindings" id="element-types-bindings">
@@ -1543,6 +1561,8 @@
<elementType ref="org.eclipse.papyrus.diagram.composite.Connector_4013"/>
<elementType ref="org.eclipse.papyrus.diagram.composite.Generalization_4015"/>
<elementType ref="org.eclipse.papyrus.diagram.composite.InformationFlow_4016"/>
+ <elementType ref="org.eclipse.papyrus.diagram.composite.TimeObservationEvent_4018"/>
+ <elementType ref="org.eclipse.papyrus.diagram.composite.DurationObservationEvent_4019"/>
<advice ref="org.eclipse.gmf.runtime.diagram.core.advice.notationDepdendents"/>
</binding>
</extension>
@@ -2310,15 +2330,35 @@
<entry
defineOnly="true"
description="Create new Constraint"
- id="createContraint8CreationTool"
+ id="createConstraint8CreationTool"
kind="tool"
- label="Contraint"
+ label="Constraint"
large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Constraint.gif"
path=""
small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Constraint.gif">
</entry>
<entry
defineOnly="true"
+ description="Create new TimeObservation"
+ id="createTimeObservation9CreationTool"
+ kind="tool"
+ label="TimeObservation"
+ large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/TimeObservation.gif"
+ path=""
+ small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/TimeObservation.gif">
+ </entry>
+ <entry
+ defineOnly="true"
+ description="Create new DurationObservation"
+ id="createDurationObservation10CreationTool"
+ kind="tool"
+ label="DurationObservation"
+ large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/DurationObservation.gif"
+ path=""
+ small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/DurationObservation.gif">
+ </entry>
+ <entry
+ defineOnly="true"
description="Create new Link (Comment / Constraint)"
id="createLink1CreationTool"
kind="tool"
@@ -2466,7 +2506,15 @@
path="/createNodes1Group">
</predefinedEntry>
<predefinedEntry
- id="createContraint8CreationTool"
+ id="createConstraint8CreationTool"
+ path="/createNodes1Group">
+ </predefinedEntry>
+ <predefinedEntry
+ id="createTimeObservation9CreationTool"
+ path="/createNodes1Group">
+ </predefinedEntry>
+ <predefinedEntry
+ id="createDurationObservation10CreationTool"
path="/createNodes1Group">
</predefinedEntry>
diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/commands/ConnectorDurationObservationCreateCommand.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/commands/ConnectorDurationObservationCreateCommand.java
new file mode 100644
index 00000000000..5d5824663e7
--- /dev/null
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/commands/ConnectorDurationObservationCreateCommand.java
@@ -0,0 +1,107 @@
+/*****************************************************************************
+ * Copyright (c) 2009 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
+ *
+ * Contributors:
+ * Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.diagram.composite.edit.commands;
+
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.core.runtime.IAdaptable;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.gmf.runtime.common.core.command.CommandResult;
+import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;
+import org.eclipse.papyrus.diagram.composite.edit.policies.UMLBaseItemSemanticEditPolicy;
+import org.eclipse.uml2.uml.DurationObservation;
+import org.eclipse.uml2.uml.NamedElement;
+
+/**
+ * @generated
+ */
+public class ConnectorDurationObservationCreateCommand extends EditElementCommand {
+
+ /**
+ * @generated
+ */
+ private final EObject source;
+
+ /**
+ * @generated
+ */
+ private final EObject target;
+
+ /**
+ * @generated
+ */
+ public ConnectorDurationObservationCreateCommand(CreateRelationshipRequest request, EObject source, EObject target) {
+ super(request.getLabel(), null, request);
+ this.source = source;
+ this.target = target;
+ }
+
+ /**
+ * @generated
+ */
+ public boolean canExecute() {
+ if (source == null && target == null) {
+ return false;
+ }
+ if (source != null && false == source instanceof DurationObservation) {
+ return false;
+ }
+ if (target != null && false == target instanceof NamedElement) {
+ return false;
+ }
+ if (getSource() == null) {
+ return true; // link creation is in progress; source is not defined yet
+ }
+ // target may be null here but it's possible to check constraint
+ return UMLBaseItemSemanticEditPolicy.LinkConstraints.canCreateDurationObservationEvent_4019(getSource(),
+ getTarget());
+ }
+
+ /**
+ * @generated
+ */
+ protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
+ if (!canExecute()) {
+ throw new ExecutionException("Invalid arguments in create link command"); //$NON-NLS-1$
+ }
+
+ if (getSource() != null && getTarget() != null) {
+ getSource().getEvents().add(getTarget());
+ }
+ return CommandResult.newOKCommandResult();
+
+ }
+
+ /**
+ * @generated
+ */
+ protected void setElementToEdit(EObject element) {
+ throw new UnsupportedOperationException();
+ }
+
+ /**
+ * @generated
+ */
+ protected DurationObservation getSource() {
+ return (DurationObservation) source;
+ }
+
+ /**
+ * @generated
+ */
+ protected NamedElement getTarget() {
+ return (NamedElement) target;
+ }
+}
diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/commands/ConnectorDurationObservationReorientCommand.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/commands/ConnectorDurationObservationReorientCommand.java
new file mode 100644
index 00000000000..282dc262012
--- /dev/null
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/commands/ConnectorDurationObservationReorientCommand.java
@@ -0,0 +1,163 @@
+/*****************************************************************************
+ * Copyright (c) 2009 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
+ *
+ * Contributors:
+ * Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.diagram.composite.edit.commands;
+
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.core.runtime.IAdaptable;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.gmf.runtime.common.core.command.CommandResult;
+import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
+import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;
+import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;
+import org.eclipse.papyrus.diagram.composite.edit.policies.UMLBaseItemSemanticEditPolicy;
+import org.eclipse.uml2.uml.DurationObservation;
+import org.eclipse.uml2.uml.NamedElement;
+
+/**
+ * @generated
+ */
+public class ConnectorDurationObservationReorientCommand extends EditElementCommand {
+
+ /**
+ * @generated
+ */
+ private final int reorientDirection;
+
+ /**
+ * @generated
+ */
+ private final EObject referenceOwner;
+
+ /**
+ * @generated
+ */
+ private final EObject oldEnd;
+
+ /**
+ * @generated
+ */
+ private final EObject newEnd;
+
+ /**
+ * @generated
+ */
+ public ConnectorDurationObservationReorientCommand(ReorientReferenceRelationshipRequest request) {
+ super(request.getLabel(), null, request);
+ reorientDirection = request.getDirection();
+ referenceOwner = request.getReferenceOwner();
+ oldEnd = request.getOldRelationshipEnd();
+ newEnd = request.getNewRelationshipEnd();
+ }
+
+ /**
+ * @generated
+ */
+ public boolean canExecute() {
+ if (false == referenceOwner instanceof DurationObservation) {
+ return false;
+ }
+ if (reorientDirection == ReorientRelationshipRequest.REORIENT_SOURCE) {
+ return canReorientSource();
+ }
+ if (reorientDirection == ReorientRelationshipRequest.REORIENT_TARGET) {
+ return canReorientTarget();
+ }
+ return false;
+ }
+
+ /**
+ * @generated
+ */
+ protected boolean canReorientSource() {
+ if (!(oldEnd instanceof NamedElement && newEnd instanceof DurationObservation)) {
+ return false;
+ }
+ return UMLBaseItemSemanticEditPolicy.LinkConstraints.canExistDurationObservationEvent_4019(getNewSource(),
+ getOldTarget());
+ }
+
+ /**
+ * @generated
+ */
+ protected boolean canReorientTarget() {
+ if (!(oldEnd instanceof NamedElement && newEnd instanceof NamedElement)) {
+ return false;
+ }
+ return UMLBaseItemSemanticEditPolicy.LinkConstraints.canExistDurationObservationEvent_4019(getOldSource(),
+ getNewTarget());
+ }
+
+ /**
+ * @generated
+ */
+ protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
+ if (!canExecute()) {
+ throw new ExecutionException("Invalid arguments in reorient link command"); //$NON-NLS-1$
+ }
+ if (reorientDirection == ReorientRelationshipRequest.REORIENT_SOURCE) {
+ return reorientSource();
+ }
+ if (reorientDirection == ReorientRelationshipRequest.REORIENT_TARGET) {
+ return reorientTarget();
+ }
+ throw new IllegalStateException();
+ }
+
+ /**
+ * @generated
+ */
+ protected CommandResult reorientSource() throws ExecutionException {
+ getOldSource().getEvents().remove(getOldTarget());
+ getNewSource().getEvents().add(getOldTarget());
+ return CommandResult.newOKCommandResult(referenceOwner);
+ }
+
+ /**
+ * @generated
+ */
+ protected CommandResult reorientTarget() throws ExecutionException {
+ getOldSource().getEvents().remove(getOldTarget());
+ getOldSource().getEvents().add(getNewTarget());
+ return CommandResult.newOKCommandResult(referenceOwner);
+ }
+
+ /**
+ * @generated
+ */
+ protected DurationObservation getOldSource() {
+ return (DurationObservation) referenceOwner;
+ }
+
+ /**
+ * @generated
+ */
+ protected DurationObservation getNewSource() {
+ return (DurationObservation) newEnd;
+ }
+
+ /**
+ * @generated
+ */
+ protected NamedElement getOldTarget() {
+ return (NamedElement) oldEnd;
+ }
+
+ /**
+ * @generated
+ */
+ protected NamedElement getNewTarget() {
+ return (NamedElement) newEnd;
+ }
+}
diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/commands/ConnectorTimeObservationCreateCommand.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/commands/ConnectorTimeObservationCreateCommand.java
new file mode 100644
index 00000000000..bc6de4e95a5
--- /dev/null
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/commands/ConnectorTimeObservationCreateCommand.java
@@ -0,0 +1,107 @@
+/*****************************************************************************
+ * Copyright (c) 2009 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
+ *
+ * Contributors:
+ * Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.diagram.composite.edit.commands;
+
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.core.runtime.IAdaptable;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.gmf.runtime.common.core.command.CommandResult;
+import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;
+import org.eclipse.papyrus.diagram.composite.edit.policies.UMLBaseItemSemanticEditPolicy;
+import org.eclipse.uml2.uml.NamedElement;
+import org.eclipse.uml2.uml.TimeObservation;
+
+/**
+ * @generated
+ */
+public class ConnectorTimeObservationCreateCommand extends EditElementCommand {
+
+ /**
+ * @generated
+ */
+ private final EObject source;
+
+ /**
+ * @generated
+ */
+ private final EObject target;
+
+ /**
+ * @generated
+ */
+ public ConnectorTimeObservationCreateCommand(CreateRelationshipRequest request, EObject source, EObject target) {
+ super(request.getLabel(), null, request);
+ this.source = source;
+ this.target = target;
+ }
+
+ /**
+ * @generated
+ */
+ public boolean canExecute() {
+ if (source == null && target == null) {
+ return false;
+ }
+ if (source != null && false == source instanceof TimeObservation) {
+ return false;
+ }
+ if (target != null && false == target instanceof NamedElement) {
+ return false;
+ }
+ if (getSource() == null) {
+ return true; // link creation is in progress; source is not defined yet
+ }
+ // target may be null here but it's possible to check constraint
+ return UMLBaseItemSemanticEditPolicy.LinkConstraints.canCreateTimeObservationEvent_4018(getSource(),
+ getTarget());
+ }
+
+ /**
+ * @generated
+ */
+ protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
+ if (!canExecute()) {
+ throw new ExecutionException("Invalid arguments in create link command"); //$NON-NLS-1$
+ }
+
+ if (getSource() != null && getTarget() != null) {
+ getSource().setEvent(getTarget());
+ }
+ return CommandResult.newOKCommandResult();
+
+ }
+
+ /**
+ * @generated
+ */
+ protected void setElementToEdit(EObject element) {
+ throw new UnsupportedOperationException();
+ }
+
+ /**
+ * @generated
+ */
+ protected TimeObservation getSource() {
+ return (TimeObservation) source;
+ }
+
+ /**
+ * @generated
+ */
+ protected NamedElement getTarget() {
+ return (NamedElement) target;
+ }
+}
diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/commands/ConnectorTimeObservationReorientCommand.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/commands/ConnectorTimeObservationReorientCommand.java
new file mode 100644
index 00000000000..a08344c6568
--- /dev/null
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/commands/ConnectorTimeObservationReorientCommand.java
@@ -0,0 +1,162 @@
+/*****************************************************************************
+ * Copyright (c) 2009 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
+ *
+ * Contributors:
+ * Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.diagram.composite.edit.commands;
+
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.core.runtime.IAdaptable;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.gmf.runtime.common.core.command.CommandResult;
+import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
+import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;
+import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;
+import org.eclipse.papyrus.diagram.composite.edit.policies.UMLBaseItemSemanticEditPolicy;
+import org.eclipse.uml2.uml.NamedElement;
+import org.eclipse.uml2.uml.TimeObservation;
+
+/**
+ * @generated
+ */
+public class ConnectorTimeObservationReorientCommand extends EditElementCommand {
+
+ /**
+ * @generated
+ */
+ private final int reorientDirection;
+
+ /**
+ * @generated
+ */
+ private final EObject referenceOwner;
+
+ /**
+ * @generated
+ */
+ private final EObject oldEnd;
+
+ /**
+ * @generated
+ */
+ private final EObject newEnd;
+
+ /**
+ * @generated
+ */
+ public ConnectorTimeObservationReorientCommand(ReorientReferenceRelationshipRequest request) {
+ super(request.getLabel(), null, request);
+ reorientDirection = request.getDirection();
+ referenceOwner = request.getReferenceOwner();
+ oldEnd = request.getOldRelationshipEnd();
+ newEnd = request.getNewRelationshipEnd();
+ }
+
+ /**
+ * @generated
+ */
+ public boolean canExecute() {
+ if (false == referenceOwner instanceof TimeObservation) {
+ return false;
+ }
+ if (reorientDirection == ReorientRelationshipRequest.REORIENT_SOURCE) {
+ return canReorientSource();
+ }
+ if (reorientDirection == ReorientRelationshipRequest.REORIENT_TARGET) {
+ return canReorientTarget();
+ }
+ return false;
+ }
+
+ /**
+ * @generated
+ */
+ protected boolean canReorientSource() {
+ if (!(oldEnd instanceof NamedElement && newEnd instanceof TimeObservation)) {
+ return false;
+ }
+ return UMLBaseItemSemanticEditPolicy.LinkConstraints.canExistTimeObservationEvent_4018(getNewSource(),
+ getOldTarget());
+ }
+
+ /**
+ * @generated
+ */
+ protected boolean canReorientTarget() {
+ if (!(oldEnd instanceof NamedElement && newEnd instanceof NamedElement)) {
+ return false;
+ }
+ return UMLBaseItemSemanticEditPolicy.LinkConstraints.canExistTimeObservationEvent_4018(getOldSource(),
+ getNewTarget());
+ }
+
+ /**
+ * @generated
+ */
+ protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
+ if (!canExecute()) {
+ throw new ExecutionException("Invalid arguments in reorient link command"); //$NON-NLS-1$
+ }
+ if (reorientDirection == ReorientRelationshipRequest.REORIENT_SOURCE) {
+ return reorientSource();
+ }
+ if (reorientDirection == ReorientRelationshipRequest.REORIENT_TARGET) {
+ return reorientTarget();
+ }
+ throw new IllegalStateException();
+ }
+
+ /**
+ * @generated
+ */
+ protected CommandResult reorientSource() throws ExecutionException {
+ getOldSource().setEvent(null);
+ getNewSource().setEvent(getOldTarget());
+ return CommandResult.newOKCommandResult(referenceOwner);
+ }
+
+ /**
+ * @generated
+ */
+ protected CommandResult reorientTarget() throws ExecutionException {
+ getOldSource().setEvent(getNewTarget());
+ return CommandResult.newOKCommandResult(referenceOwner);
+ }
+
+ /**
+ * @generated
+ */
+ protected TimeObservation getOldSource() {
+ return (TimeObservation) referenceOwner;
+ }
+
+ /**
+ * @generated
+ */
+ protected TimeObservation getNewSource() {
+ return (TimeObservation) newEnd;
+ }
+
+ /**
+ * @generated
+ */
+ protected NamedElement getOldTarget() {
+ return (NamedElement) oldEnd;
+ }
+
+ /**
+ * @generated
+ */
+ protected NamedElement getNewTarget() {
+ return (NamedElement) newEnd;
+ }
+}
diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/ActivityCompositeCompartmentEditPart.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/ActivityCompositeCompartmentEditPart.java
index 9457e44bd62..d0900068b9e 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/ActivityCompositeCompartmentEditPart.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/ActivityCompositeCompartmentEditPart.java
@@ -14,7 +14,12 @@
package org.eclipse.papyrus.diagram.composite.edit.parts;
import org.eclipse.draw2d.IFigure;
+import org.eclipse.draw2d.geometry.Dimension;
+import org.eclipse.draw2d.geometry.Point;
+import org.eclipse.draw2d.geometry.Rectangle;
+import org.eclipse.emf.common.notify.Notification;
import org.eclipse.gef.EditPolicy;
+import org.eclipse.gef.GraphicalEditPart;
import org.eclipse.gmf.runtime.diagram.ui.editparts.ShapeCompartmentEditPart;
import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CreationEditPolicy;
import org.eclipse.gmf.runtime.diagram.ui.editpolicies.DragDropEditPolicy;
@@ -22,6 +27,7 @@ import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableCompartmentEditPolicy;
import org.eclipse.gmf.runtime.diagram.ui.figures.ResizableCompartmentFigure;
import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;
+import org.eclipse.gmf.runtime.notation.NotationPackage;
import org.eclipse.gmf.runtime.notation.View;
import org.eclipse.papyrus.diagram.common.editpolicies.CustomContainerEditPolicy;
import org.eclipse.papyrus.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy;
@@ -32,7 +38,11 @@ import org.eclipse.papyrus.diagram.composite.part.Messages;
/**
* @generated
*/
-public class ActivityCompositeCompartmentEditPart extends ShapeCompartmentEditPart {
+public class ActivityCompositeCompartmentEditPart
+
+extends ShapeCompartmentEditPart
+
+{
/**
* @generated
@@ -85,4 +95,38 @@ public class ActivityCompositeCompartmentEditPart extends ShapeCompartmentEditPa
}
}
+ /**
+ * @generated
+ */
+ protected void handleNotificationEvent(Notification notification) {
+ Object feature = notification.getFeature();
+ if (NotationPackage.eINSTANCE.getSize_Width().equals(feature)
+ || NotationPackage.eINSTANCE.getSize_Height().equals(feature)
+ || NotationPackage.eINSTANCE.getLocation_X().equals(feature)
+ || NotationPackage.eINSTANCE.getLocation_Y().equals(feature)) {
+ refreshBounds();
+ }
+ super.handleNotificationEvent(notification);
+ }
+
+ /**
+ * @generated
+ */
+ protected void refreshBounds() {
+ int width = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();
+ int height = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();
+ Dimension size = new Dimension(width, height);
+ int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();
+ int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();
+ Point loc = new Point(x, y);
+ ((GraphicalEditPart) getParent()).setLayoutConstraint(this, getFigure(), new Rectangle(loc, size));
+ }
+
+ /**
+ * @generated
+ */
+ protected void refreshVisuals() {
+ super.refreshVisuals();
+ refreshBounds();
+ }
}
diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/ActivityCompositeCompartmentEditPartCN.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/ActivityCompositeCompartmentEditPartCN.java
index 36187199815..bb1e68a6f2c 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/ActivityCompositeCompartmentEditPartCN.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/ActivityCompositeCompartmentEditPartCN.java
@@ -14,7 +14,12 @@
package org.eclipse.papyrus.diagram.composite.edit.parts;
import org.eclipse.draw2d.IFigure;
+import org.eclipse.draw2d.geometry.Dimension;
+import org.eclipse.draw2d.geometry.Point;
+import org.eclipse.draw2d.geometry.Rectangle;
+import org.eclipse.emf.common.notify.Notification;
import org.eclipse.gef.EditPolicy;
+import org.eclipse.gef.GraphicalEditPart;
import org.eclipse.gmf.runtime.diagram.ui.editparts.ShapeCompartmentEditPart;
import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CreationEditPolicy;
import org.eclipse.gmf.runtime.diagram.ui.editpolicies.DragDropEditPolicy;
@@ -22,6 +27,7 @@ import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableCompartmentEditPolicy;
import org.eclipse.gmf.runtime.diagram.ui.figures.ResizableCompartmentFigure;
import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;
+import org.eclipse.gmf.runtime.notation.NotationPackage;
import org.eclipse.gmf.runtime.notation.View;
import org.eclipse.papyrus.diagram.common.editpolicies.CustomContainerEditPolicy;
import org.eclipse.papyrus.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy;
@@ -32,7 +38,11 @@ import org.eclipse.papyrus.diagram.composite.part.Messages;
/**
* @generated
*/
-public class ActivityCompositeCompartmentEditPartCN extends ShapeCompartmentEditPart {
+public class ActivityCompositeCompartmentEditPartCN
+
+extends ShapeCompartmentEditPart
+
+{
/**
* @generated
@@ -85,4 +95,38 @@ public class ActivityCompositeCompartmentEditPartCN extends ShapeCompartmentEdit
}
}
+ /**
+ * @generated
+ */
+ protected void handleNotificationEvent(Notification notification) {
+ Object feature = notification.getFeature();
+ if (NotationPackage.eINSTANCE.getSize_Width().equals(feature)
+ || NotationPackage.eINSTANCE.getSize_Height().equals(feature)
+ || NotationPackage.eINSTANCE.getLocation_X().equals(feature)
+ || NotationPackage.eINSTANCE.getLocation_Y().equals(feature)) {
+ refreshBounds();
+ }
+ super.handleNotificationEvent(notification);
+ }
+
+ /**
+ * @generated
+ */
+ protected void refreshBounds() {
+ int width = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();
+ int height = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();
+ Dimension size = new Dimension(width, height);
+ int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();
+ int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();
+ Point loc = new Point(x, y);
+ ((GraphicalEditPart) getParent()).setLayoutConstraint(this, getFigure(), new Rectangle(loc, size));
+ }
+
+ /**
+ * @generated
+ */
+ protected void refreshVisuals() {
+ super.refreshVisuals();
+ refreshBounds();
+ }
}
diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/ActivityCompositeEditPart.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/ActivityCompositeEditPart.java
index 0c11c3b98eb..4f4c1990a61 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/ActivityCompositeEditPart.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/ActivityCompositeEditPart.java
@@ -168,7 +168,7 @@ NamedElementEditPart {
if (childEditPart instanceof ActivityCompositeCompartmentEditPart) {
IFigure pane = getPrimaryShape().getCompositeCompartmentFigure();
setupContentPane(pane); // FIXME each comparment should handle his content pane in his
- // own way
+ // own way
pane.add(((ActivityCompositeCompartmentEditPart) childEditPart).getFigure());
return true;
}
@@ -193,7 +193,7 @@ NamedElementEditPart {
if (childEditPart instanceof ActivityCompositeCompartmentEditPart) {
IFigure pane = getPrimaryShape().getCompositeCompartmentFigure();
setupContentPane(pane); // FIXME each comparment should handle his content pane in his
- // own way
+ // own way
pane.remove(((ActivityCompositeCompartmentEditPart) childEditPart).getFigure());
return true;
}
@@ -332,7 +332,8 @@ NamedElementEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -363,7 +364,8 @@ NamedElementEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -3274,7 +3276,8 @@ NamedElementEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -6184,7 +6187,8 @@ NamedElementEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -6204,6 +6208,8 @@ NamedElementEditPart {
types.add(UMLElementTypes.Dependency_4010);
types.add(UMLElementTypes.Generalization_4015);
types.add(UMLElementTypes.InformationFlow_4016);
+ types.add(UMLElementTypes.TimeObservationEvent_4018);
+ types.add(UMLElementTypes.DurationObservationEvent_4019);
return types;
}
@@ -6217,7 +6223,8 @@ NamedElementEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -9136,6 +9143,12 @@ NamedElementEditPart {
if (relationshipType == UMLElementTypes.InformationFlow_4016) {
types.add(UMLElementTypes.Comment_3097);
}
+ if (relationshipType == UMLElementTypes.TimeObservationEvent_4018) {
+ types.add(UMLElementTypes.TimeObservation_2094);
+ }
+ if (relationshipType == UMLElementTypes.DurationObservationEvent_4019) {
+ types.add(UMLElementTypes.DurationObservation_2093);
+ }
return types;
}
diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/ActivityCompositeEditPartCN.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/ActivityCompositeEditPartCN.java
index 20c79afd994..6c10bb06710 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/ActivityCompositeEditPartCN.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/ActivityCompositeEditPartCN.java
@@ -168,7 +168,7 @@ NamedElementEditPart {
if (childEditPart instanceof ActivityCompositeCompartmentEditPartCN) {
IFigure pane = getPrimaryShape().getCompositeCompartmentFigure();
setupContentPane(pane); // FIXME each comparment should handle his content pane in his
- // own way
+ // own way
pane.add(((ActivityCompositeCompartmentEditPartCN) childEditPart).getFigure());
return true;
}
@@ -193,7 +193,7 @@ NamedElementEditPart {
if (childEditPart instanceof ActivityCompositeCompartmentEditPartCN) {
IFigure pane = getPrimaryShape().getCompositeCompartmentFigure();
setupContentPane(pane); // FIXME each comparment should handle his content pane in his
- // own way
+ // own way
pane.remove(((ActivityCompositeCompartmentEditPartCN) childEditPart).getFigure());
return true;
}
@@ -332,7 +332,8 @@ NamedElementEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -363,7 +364,8 @@ NamedElementEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -3274,7 +3276,8 @@ NamedElementEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -6184,7 +6187,8 @@ NamedElementEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -6204,6 +6208,8 @@ NamedElementEditPart {
types.add(UMLElementTypes.Dependency_4010);
types.add(UMLElementTypes.Generalization_4015);
types.add(UMLElementTypes.InformationFlow_4016);
+ types.add(UMLElementTypes.TimeObservationEvent_4018);
+ types.add(UMLElementTypes.DurationObservationEvent_4019);
return types;
}
@@ -6217,7 +6223,8 @@ NamedElementEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -9136,6 +9143,12 @@ NamedElementEditPart {
if (relationshipType == UMLElementTypes.InformationFlow_4016) {
types.add(UMLElementTypes.Comment_3097);
}
+ if (relationshipType == UMLElementTypes.TimeObservationEvent_4018) {
+ types.add(UMLElementTypes.TimeObservation_2094);
+ }
+ if (relationshipType == UMLElementTypes.DurationObservationEvent_4019) {
+ types.add(UMLElementTypes.DurationObservation_2093);
+ }
return types;
}
diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/ActorEditPart.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/ActorEditPart.java
index e6138797897..1ebb7d55d0b 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/ActorEditPart.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/ActorEditPart.java
@@ -277,7 +277,8 @@ ShapeNodeEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -308,7 +309,8 @@ ShapeNodeEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -3219,7 +3221,8 @@ ShapeNodeEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -6129,7 +6132,8 @@ ShapeNodeEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -6149,6 +6153,8 @@ ShapeNodeEditPart {
types.add(UMLElementTypes.Dependency_4010);
types.add(UMLElementTypes.Generalization_4015);
types.add(UMLElementTypes.InformationFlow_4016);
+ types.add(UMLElementTypes.TimeObservationEvent_4018);
+ types.add(UMLElementTypes.DurationObservationEvent_4019);
return types;
}
@@ -6162,7 +6168,8 @@ ShapeNodeEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -9081,6 +9088,12 @@ ShapeNodeEditPart {
if (relationshipType == UMLElementTypes.InformationFlow_4016) {
types.add(UMLElementTypes.Comment_3097);
}
+ if (relationshipType == UMLElementTypes.TimeObservationEvent_4018) {
+ types.add(UMLElementTypes.TimeObservation_2094);
+ }
+ if (relationshipType == UMLElementTypes.DurationObservationEvent_4019) {
+ types.add(UMLElementTypes.DurationObservation_2093);
+ }
return types;
}
diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/ActorEditPartCN.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/ActorEditPartCN.java
index 4764165a719..ee1338db5b6 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/ActorEditPartCN.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/ActorEditPartCN.java
@@ -277,7 +277,8 @@ ShapeNodeEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -308,7 +309,8 @@ ShapeNodeEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -3219,7 +3221,8 @@ ShapeNodeEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -6129,7 +6132,8 @@ ShapeNodeEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -6149,6 +6153,8 @@ ShapeNodeEditPart {
types.add(UMLElementTypes.Dependency_4010);
types.add(UMLElementTypes.Generalization_4015);
types.add(UMLElementTypes.InformationFlow_4016);
+ types.add(UMLElementTypes.TimeObservationEvent_4018);
+ types.add(UMLElementTypes.DurationObservationEvent_4019);
return types;
}
@@ -6162,7 +6168,8 @@ ShapeNodeEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -9081,6 +9088,12 @@ ShapeNodeEditPart {
if (relationshipType == UMLElementTypes.InformationFlow_4016) {
types.add(UMLElementTypes.Comment_3097);
}
+ if (relationshipType == UMLElementTypes.TimeObservationEvent_4018) {
+ types.add(UMLElementTypes.TimeObservation_2094);
+ }
+ if (relationshipType == UMLElementTypes.DurationObservationEvent_4019) {
+ types.add(UMLElementTypes.DurationObservation_2093);
+ }
return types;
}
diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/AnyReceiveEventEditPart.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/AnyReceiveEventEditPart.java
index bde0068a076..7817d9baa71 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/AnyReceiveEventEditPart.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/AnyReceiveEventEditPart.java
@@ -277,7 +277,8 @@ ShapeNodeEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -308,7 +309,8 @@ ShapeNodeEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -3219,7 +3221,8 @@ ShapeNodeEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -6129,7 +6132,8 @@ ShapeNodeEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -6149,6 +6153,8 @@ ShapeNodeEditPart {
types.add(UMLElementTypes.Dependency_4010);
types.add(UMLElementTypes.Generalization_4015);
types.add(UMLElementTypes.InformationFlow_4016);
+ types.add(UMLElementTypes.TimeObservationEvent_4018);
+ types.add(UMLElementTypes.DurationObservationEvent_4019);
return types;
}
@@ -6162,7 +6168,8 @@ ShapeNodeEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -9081,6 +9088,12 @@ ShapeNodeEditPart {
if (relationshipType == UMLElementTypes.InformationFlow_4016) {
types.add(UMLElementTypes.Comment_3097);
}
+ if (relationshipType == UMLElementTypes.TimeObservationEvent_4018) {
+ types.add(UMLElementTypes.TimeObservation_2094);
+ }
+ if (relationshipType == UMLElementTypes.DurationObservationEvent_4019) {
+ types.add(UMLElementTypes.DurationObservation_2093);
+ }
return types;
}
diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/ArtifactEditPart.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/ArtifactEditPart.java
index 2d974ade649..58ded8b8abe 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/ArtifactEditPart.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/ArtifactEditPart.java
@@ -277,7 +277,8 @@ ShapeNodeEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -308,7 +309,8 @@ ShapeNodeEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -3219,7 +3221,8 @@ ShapeNodeEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -6129,7 +6132,8 @@ ShapeNodeEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -6149,6 +6153,8 @@ ShapeNodeEditPart {
types.add(UMLElementTypes.Dependency_4010);
types.add(UMLElementTypes.Generalization_4015);
types.add(UMLElementTypes.InformationFlow_4016);
+ types.add(UMLElementTypes.TimeObservationEvent_4018);
+ types.add(UMLElementTypes.DurationObservationEvent_4019);
return types;
}
@@ -6162,7 +6168,8 @@ ShapeNodeEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -9081,6 +9088,12 @@ ShapeNodeEditPart {
if (relationshipType == UMLElementTypes.InformationFlow_4016) {
types.add(UMLElementTypes.Comment_3097);
}
+ if (relationshipType == UMLElementTypes.TimeObservationEvent_4018) {
+ types.add(UMLElementTypes.TimeObservation_2094);
+ }
+ if (relationshipType == UMLElementTypes.DurationObservationEvent_4019) {
+ types.add(UMLElementTypes.DurationObservation_2093);
+ }
return types;
}
diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/ArtifactEditPartCN.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/ArtifactEditPartCN.java
index 17f00c04c38..9df8afb2fb6 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/ArtifactEditPartCN.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/ArtifactEditPartCN.java
@@ -277,7 +277,8 @@ ShapeNodeEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -308,7 +309,8 @@ ShapeNodeEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -3219,7 +3221,8 @@ ShapeNodeEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -6129,7 +6132,8 @@ ShapeNodeEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -6149,6 +6153,8 @@ ShapeNodeEditPart {
types.add(UMLElementTypes.Dependency_4010);
types.add(UMLElementTypes.Generalization_4015);
types.add(UMLElementTypes.InformationFlow_4016);
+ types.add(UMLElementTypes.TimeObservationEvent_4018);
+ types.add(UMLElementTypes.DurationObservationEvent_4019);
return types;
}
@@ -6162,7 +6168,8 @@ ShapeNodeEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -9081,6 +9088,12 @@ ShapeNodeEditPart {
if (relationshipType == UMLElementTypes.InformationFlow_4016) {
types.add(UMLElementTypes.Comment_3097);
}
+ if (relationshipType == UMLElementTypes.TimeObservationEvent_4018) {
+ types.add(UMLElementTypes.TimeObservation_2094);
+ }
+ if (relationshipType == UMLElementTypes.DurationObservationEvent_4019) {
+ types.add(UMLElementTypes.DurationObservation_2093);
+ }
return types;
}
diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/CallEventEditPart.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/CallEventEditPart.java
index d9fe08576d3..d3ed33fca4b 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/CallEventEditPart.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/CallEventEditPart.java
@@ -277,7 +277,8 @@ ShapeNodeEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -308,7 +309,8 @@ ShapeNodeEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -3219,7 +3221,8 @@ ShapeNodeEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -6129,7 +6132,8 @@ ShapeNodeEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -6149,6 +6153,8 @@ ShapeNodeEditPart {
types.add(UMLElementTypes.Dependency_4010);
types.add(UMLElementTypes.Generalization_4015);
types.add(UMLElementTypes.InformationFlow_4016);
+ types.add(UMLElementTypes.TimeObservationEvent_4018);
+ types.add(UMLElementTypes.DurationObservationEvent_4019);
return types;
}
@@ -6162,7 +6168,8 @@ ShapeNodeEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -9081,6 +9088,12 @@ ShapeNodeEditPart {
if (relationshipType == UMLElementTypes.InformationFlow_4016) {
types.add(UMLElementTypes.Comment_3097);
}
+ if (relationshipType == UMLElementTypes.TimeObservationEvent_4018) {
+ types.add(UMLElementTypes.TimeObservation_2094);
+ }
+ if (relationshipType == UMLElementTypes.DurationObservationEvent_4019) {
+ types.add(UMLElementTypes.DurationObservation_2093);
+ }
return types;
}
diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/ChangeEventEditPart.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/ChangeEventEditPart.java
index 40762bf51ac..30141141c09 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/ChangeEventEditPart.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/ChangeEventEditPart.java
@@ -277,7 +277,8 @@ ShapeNodeEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -308,7 +309,8 @@ ShapeNodeEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -3219,7 +3221,8 @@ ShapeNodeEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -6129,7 +6132,8 @@ ShapeNodeEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -6149,6 +6153,8 @@ ShapeNodeEditPart {
types.add(UMLElementTypes.Dependency_4010);
types.add(UMLElementTypes.Generalization_4015);
types.add(UMLElementTypes.InformationFlow_4016);
+ types.add(UMLElementTypes.TimeObservationEvent_4018);
+ types.add(UMLElementTypes.DurationObservationEvent_4019);
return types;
}
@@ -6162,7 +6168,8 @@ ShapeNodeEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -9081,6 +9088,12 @@ ShapeNodeEditPart {
if (relationshipType == UMLElementTypes.InformationFlow_4016) {
types.add(UMLElementTypes.Comment_3097);
}
+ if (relationshipType == UMLElementTypes.TimeObservationEvent_4018) {
+ types.add(UMLElementTypes.TimeObservation_2094);
+ }
+ if (relationshipType == UMLElementTypes.DurationObservationEvent_4019) {
+ types.add(UMLElementTypes.DurationObservation_2093);
+ }
return types;
}
diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/ClassAttributeCompartmentEditPart.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/ClassAttributeCompartmentEditPart.java
index d458b5f8018..ec5cd5ec752 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/ClassAttributeCompartmentEditPart.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/ClassAttributeCompartmentEditPart.java
@@ -14,8 +14,12 @@
package org.eclipse.papyrus.diagram.composite.edit.parts;
import org.eclipse.draw2d.IFigure;
+import org.eclipse.draw2d.geometry.Dimension;
+import org.eclipse.draw2d.geometry.Point;
+import org.eclipse.draw2d.geometry.Rectangle;
import org.eclipse.emf.common.notify.Notification;
import org.eclipse.gef.EditPolicy;
+import org.eclipse.gef.GraphicalEditPart;
import org.eclipse.gmf.runtime.diagram.ui.editparts.ListCompartmentEditPart;
import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CreationEditPolicy;
import org.eclipse.gmf.runtime.diagram.ui.editpolicies.DragDropEditPolicy;
@@ -23,6 +27,7 @@ import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableCompartmentEditPolicy;
import org.eclipse.gmf.runtime.diagram.ui.figures.ResizableCompartmentFigure;
import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;
+import org.eclipse.gmf.runtime.notation.NotationPackage;
import org.eclipse.gmf.runtime.notation.View;
import org.eclipse.papyrus.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy;
import org.eclipse.papyrus.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy;
@@ -32,7 +37,11 @@ import org.eclipse.papyrus.diagram.composite.part.Messages;
/**
* @generated
*/
-public class ClassAttributeCompartmentEditPart extends ListCompartmentEditPart {
+public class ClassAttributeCompartmentEditPart
+
+extends ListCompartmentEditPart
+
+{
/**
* @generated
@@ -91,4 +100,38 @@ public class ClassAttributeCompartmentEditPart extends ListCompartmentEditPart {
}
}
+ /**
+ * @generated
+ */
+ protected void handleNotificationEvent(Notification notification) {
+ Object feature = notification.getFeature();
+ if (NotationPackage.eINSTANCE.getSize_Width().equals(feature)
+ || NotationPackage.eINSTANCE.getSize_Height().equals(feature)
+ || NotationPackage.eINSTANCE.getLocation_X().equals(feature)
+ || NotationPackage.eINSTANCE.getLocation_Y().equals(feature)) {
+ refreshBounds();
+ }
+ super.handleNotificationEvent(notification);
+ }
+
+ /**
+ * @generated
+ */
+ protected void refreshBounds() {
+ int width = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();
+ int height = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();
+ Dimension size = new Dimension(width, height);
+ int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();
+ int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();
+ Point loc = new Point(x, y);
+ ((GraphicalEditPart) getParent()).setLayoutConstraint(this, getFigure(), new Rectangle(loc, size));
+ }
+
+ /**
+ * @generated
+ */
+ protected void refreshVisuals() {
+ super.refreshVisuals();
+ refreshBounds();
+ }
}
diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/ClassClassifierEditPart.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/ClassClassifierEditPart.java
index 8ea56a61999..caffa9062e2 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/ClassClassifierEditPart.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/ClassClassifierEditPart.java
@@ -156,7 +156,7 @@ NamedElementEditPart {
if (childEditPart instanceof ClassAttributeCompartmentEditPart) {
IFigure pane = getPrimaryShape().getAttributeCompartmentFigure();
setupContentPane(pane); // FIXME each comparment should handle his content pane in his
- // own way
+ // own way
pane.add(((ClassAttributeCompartmentEditPart) childEditPart).getFigure());
return true;
}
@@ -164,7 +164,7 @@ NamedElementEditPart {
if (childEditPart instanceof ClassOperationCompartmentEditPart) {
IFigure pane = getPrimaryShape().getOperationCompartmentFigure();
setupContentPane(pane); // FIXME each comparment should handle his content pane in his
- // own way
+ // own way
pane.add(((ClassOperationCompartmentEditPart) childEditPart).getFigure());
return true;
}
@@ -172,7 +172,7 @@ NamedElementEditPart {
if (childEditPart instanceof ClassNestedClassifierCompartmentEditPart) {
IFigure pane = getPrimaryShape().getNestedClassifierFigure();
setupContentPane(pane); // FIXME each comparment should handle his content pane in his
- // own way
+ // own way
pane.add(((ClassNestedClassifierCompartmentEditPart) childEditPart).getFigure());
return true;
}
@@ -190,21 +190,21 @@ NamedElementEditPart {
if (childEditPart instanceof ClassAttributeCompartmentEditPart) {
IFigure pane = getPrimaryShape().getAttributeCompartmentFigure();
setupContentPane(pane); // FIXME each comparment should handle his content pane in his
- // own way
+ // own way
pane.remove(((ClassAttributeCompartmentEditPart) childEditPart).getFigure());
return true;
}
if (childEditPart instanceof ClassOperationCompartmentEditPart) {
IFigure pane = getPrimaryShape().getOperationCompartmentFigure();
setupContentPane(pane); // FIXME each comparment should handle his content pane in his
- // own way
+ // own way
pane.remove(((ClassOperationCompartmentEditPart) childEditPart).getFigure());
return true;
}
if (childEditPart instanceof ClassNestedClassifierCompartmentEditPart) {
IFigure pane = getPrimaryShape().getNestedClassifierFigure();
setupContentPane(pane); // FIXME each comparment should handle his content pane in his
- // own way
+ // own way
pane.remove(((ClassNestedClassifierCompartmentEditPart) childEditPart).getFigure());
return true;
}
@@ -342,7 +342,8 @@ NamedElementEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -373,7 +374,8 @@ NamedElementEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -3284,7 +3286,8 @@ NamedElementEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -6194,7 +6197,8 @@ NamedElementEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -6214,6 +6218,8 @@ NamedElementEditPart {
types.add(UMLElementTypes.Dependency_4010);
types.add(UMLElementTypes.Generalization_4015);
types.add(UMLElementTypes.InformationFlow_4016);
+ types.add(UMLElementTypes.TimeObservationEvent_4018);
+ types.add(UMLElementTypes.DurationObservationEvent_4019);
return types;
}
@@ -6227,7 +6233,8 @@ NamedElementEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -9146,6 +9153,12 @@ NamedElementEditPart {
if (relationshipType == UMLElementTypes.InformationFlow_4016) {
types.add(UMLElementTypes.Comment_3097);
}
+ if (relationshipType == UMLElementTypes.TimeObservationEvent_4018) {
+ types.add(UMLElementTypes.TimeObservation_2094);
+ }
+ if (relationshipType == UMLElementTypes.DurationObservationEvent_4019) {
+ types.add(UMLElementTypes.DurationObservation_2093);
+ }
return types;
}
diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/ClassCompositeCompartmentEditPart.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/ClassCompositeCompartmentEditPart.java
index 1efa82a7bf2..7f25ab16c37 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/ClassCompositeCompartmentEditPart.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/ClassCompositeCompartmentEditPart.java
@@ -14,7 +14,12 @@
package org.eclipse.papyrus.diagram.composite.edit.parts;
import org.eclipse.draw2d.IFigure;
+import org.eclipse.draw2d.geometry.Dimension;
+import org.eclipse.draw2d.geometry.Point;
+import org.eclipse.draw2d.geometry.Rectangle;
+import org.eclipse.emf.common.notify.Notification;
import org.eclipse.gef.EditPolicy;
+import org.eclipse.gef.GraphicalEditPart;
import org.eclipse.gmf.runtime.diagram.ui.editparts.ShapeCompartmentEditPart;
import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CreationEditPolicy;
import org.eclipse.gmf.runtime.diagram.ui.editpolicies.DragDropEditPolicy;
@@ -22,6 +27,7 @@ import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableCompartmentEditPolicy;
import org.eclipse.gmf.runtime.diagram.ui.figures.ResizableCompartmentFigure;
import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;
+import org.eclipse.gmf.runtime.notation.NotationPackage;
import org.eclipse.gmf.runtime.notation.View;
import org.eclipse.papyrus.diagram.common.editpolicies.CustomContainerEditPolicy;
import org.eclipse.papyrus.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy;
@@ -32,7 +38,11 @@ import org.eclipse.papyrus.diagram.composite.part.Messages;
/**
* @generated
*/
-public class ClassCompositeCompartmentEditPart extends ShapeCompartmentEditPart {
+public class ClassCompositeCompartmentEditPart
+
+extends ShapeCompartmentEditPart
+
+{
/**
* @generated
@@ -85,4 +95,38 @@ public class ClassCompositeCompartmentEditPart extends ShapeCompartmentEditPart
}
}
+ /**
+ * @generated
+ */
+ protected void handleNotificationEvent(Notification notification) {
+ Object feature = notification.getFeature();
+ if (NotationPackage.eINSTANCE.getSize_Width().equals(feature)
+ || NotationPackage.eINSTANCE.getSize_Height().equals(feature)
+ || NotationPackage.eINSTANCE.getLocation_X().equals(feature)
+ || NotationPackage.eINSTANCE.getLocation_Y().equals(feature)) {
+ refreshBounds();
+ }
+ super.handleNotificationEvent(notification);
+ }
+
+ /**
+ * @generated
+ */
+ protected void refreshBounds() {
+ int width = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();
+ int height = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();
+ Dimension size = new Dimension(width, height);
+ int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();
+ int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();
+ Point loc = new Point(x, y);
+ ((GraphicalEditPart) getParent()).setLayoutConstraint(this, getFigure(), new Rectangle(loc, size));
+ }
+
+ /**
+ * @generated
+ */
+ protected void refreshVisuals() {
+ super.refreshVisuals();
+ refreshBounds();
+ }
}
diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/ClassCompositeCompartmentEditPartCN.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/ClassCompositeCompartmentEditPartCN.java
index 2167c4206d4..bad60427f1d 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/ClassCompositeCompartmentEditPartCN.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/ClassCompositeCompartmentEditPartCN.java
@@ -14,7 +14,12 @@
package org.eclipse.papyrus.diagram.composite.edit.parts;
import org.eclipse.draw2d.IFigure;
+import org.eclipse.draw2d.geometry.Dimension;
+import org.eclipse.draw2d.geometry.Point;
+import org.eclipse.draw2d.geometry.Rectangle;
+import org.eclipse.emf.common.notify.Notification;
import org.eclipse.gef.EditPolicy;
+import org.eclipse.gef.GraphicalEditPart;
import org.eclipse.gmf.runtime.diagram.ui.editparts.ShapeCompartmentEditPart;
import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CreationEditPolicy;
import org.eclipse.gmf.runtime.diagram.ui.editpolicies.DragDropEditPolicy;
@@ -22,6 +27,7 @@ import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableCompartmentEditPolicy;
import org.eclipse.gmf.runtime.diagram.ui.figures.ResizableCompartmentFigure;
import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;
+import org.eclipse.gmf.runtime.notation.NotationPackage;
import org.eclipse.gmf.runtime.notation.View;
import org.eclipse.papyrus.diagram.common.editpolicies.CustomContainerEditPolicy;
import org.eclipse.papyrus.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy;
@@ -32,7 +38,11 @@ import org.eclipse.papyrus.diagram.composite.part.Messages;
/**
* @generated
*/
-public class ClassCompositeCompartmentEditPartCN extends ShapeCompartmentEditPart {
+public class ClassCompositeCompartmentEditPartCN
+
+extends ShapeCompartmentEditPart
+
+{
/**
* @generated
@@ -85,4 +95,38 @@ public class ClassCompositeCompartmentEditPartCN extends ShapeCompartmentEditPar
}
}
+ /**
+ * @generated
+ */
+ protected void handleNotificationEvent(Notification notification) {
+ Object feature = notification.getFeature();
+ if (NotationPackage.eINSTANCE.getSize_Width().equals(feature)
+ || NotationPackage.eINSTANCE.getSize_Height().equals(feature)
+ || NotationPackage.eINSTANCE.getLocation_X().equals(feature)
+ || NotationPackage.eINSTANCE.getLocation_Y().equals(feature)) {
+ refreshBounds();
+ }
+ super.handleNotificationEvent(notification);
+ }
+
+ /**
+ * @generated
+ */
+ protected void refreshBounds() {
+ int width = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();
+ int height = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();
+ Dimension size = new Dimension(width, height);
+ int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();
+ int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();
+ Point loc = new Point(x, y);
+ ((GraphicalEditPart) getParent()).setLayoutConstraint(this, getFigure(), new Rectangle(loc, size));
+ }
+
+ /**
+ * @generated
+ */
+ protected void refreshVisuals() {
+ super.refreshVisuals();
+ refreshBounds();
+ }
}
diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/ClassCompositeEditPart.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/ClassCompositeEditPart.java
index c9892e48eef..0d730cbc247 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/ClassCompositeEditPart.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/ClassCompositeEditPart.java
@@ -168,7 +168,7 @@ NamedElementEditPart {
if (childEditPart instanceof ClassCompositeCompartmentEditPart) {
IFigure pane = getPrimaryShape().getCompositeCompartmentFigure();
setupContentPane(pane); // FIXME each comparment should handle his content pane in his
- // own way
+ // own way
pane.add(((ClassCompositeCompartmentEditPart) childEditPart).getFigure());
return true;
}
@@ -193,7 +193,7 @@ NamedElementEditPart {
if (childEditPart instanceof ClassCompositeCompartmentEditPart) {
IFigure pane = getPrimaryShape().getCompositeCompartmentFigure();
setupContentPane(pane); // FIXME each comparment should handle his content pane in his
- // own way
+ // own way
pane.remove(((ClassCompositeCompartmentEditPart) childEditPart).getFigure());
return true;
}
@@ -332,7 +332,8 @@ NamedElementEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -363,7 +364,8 @@ NamedElementEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -3274,7 +3276,8 @@ NamedElementEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -6184,7 +6187,8 @@ NamedElementEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -6204,6 +6208,8 @@ NamedElementEditPart {
types.add(UMLElementTypes.Dependency_4010);
types.add(UMLElementTypes.Generalization_4015);
types.add(UMLElementTypes.InformationFlow_4016);
+ types.add(UMLElementTypes.TimeObservationEvent_4018);
+ types.add(UMLElementTypes.DurationObservationEvent_4019);
return types;
}
@@ -6217,7 +6223,8 @@ NamedElementEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -9136,6 +9143,12 @@ NamedElementEditPart {
if (relationshipType == UMLElementTypes.InformationFlow_4016) {
types.add(UMLElementTypes.Comment_3097);
}
+ if (relationshipType == UMLElementTypes.TimeObservationEvent_4018) {
+ types.add(UMLElementTypes.TimeObservation_2094);
+ }
+ if (relationshipType == UMLElementTypes.DurationObservationEvent_4019) {
+ types.add(UMLElementTypes.DurationObservation_2093);
+ }
return types;
}
diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/ClassCompositeEditPartCN.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/ClassCompositeEditPartCN.java
index 6a8b906f96d..ad39fe00cb1 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/ClassCompositeEditPartCN.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/ClassCompositeEditPartCN.java
@@ -168,7 +168,7 @@ NamedElementEditPart {
if (childEditPart instanceof ClassCompositeCompartmentEditPartCN) {
IFigure pane = getPrimaryShape().getCompositeCompartmentFigure();
setupContentPane(pane); // FIXME each comparment should handle his content pane in his
- // own way
+ // own way
pane.add(((ClassCompositeCompartmentEditPartCN) childEditPart).getFigure());
return true;
}
@@ -193,7 +193,7 @@ NamedElementEditPart {
if (childEditPart instanceof ClassCompositeCompartmentEditPartCN) {
IFigure pane = getPrimaryShape().getCompositeCompartmentFigure();
setupContentPane(pane); // FIXME each comparment should handle his content pane in his
- // own way
+ // own way
pane.remove(((ClassCompositeCompartmentEditPartCN) childEditPart).getFigure());
return true;
}
@@ -332,7 +332,8 @@ NamedElementEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -363,7 +364,8 @@ NamedElementEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -3274,7 +3276,8 @@ NamedElementEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -6184,7 +6187,8 @@ NamedElementEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -6204,6 +6208,8 @@ NamedElementEditPart {
types.add(UMLElementTypes.Dependency_4010);
types.add(UMLElementTypes.Generalization_4015);
types.add(UMLElementTypes.InformationFlow_4016);
+ types.add(UMLElementTypes.TimeObservationEvent_4018);
+ types.add(UMLElementTypes.DurationObservationEvent_4019);
return types;
}
@@ -6217,7 +6223,8 @@ NamedElementEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -9136,6 +9143,12 @@ NamedElementEditPart {
if (relationshipType == UMLElementTypes.InformationFlow_4016) {
types.add(UMLElementTypes.Comment_3097);
}
+ if (relationshipType == UMLElementTypes.TimeObservationEvent_4018) {
+ types.add(UMLElementTypes.TimeObservation_2094);
+ }
+ if (relationshipType == UMLElementTypes.DurationObservationEvent_4019) {
+ types.add(UMLElementTypes.DurationObservation_2093);
+ }
return types;
}
diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/ClassNestedClassifierCompartmentEditPart.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/ClassNestedClassifierCompartmentEditPart.java
index d7d303bf95a..8c54f0c6bb1 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/ClassNestedClassifierCompartmentEditPart.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/ClassNestedClassifierCompartmentEditPart.java
@@ -14,8 +14,12 @@
package org.eclipse.papyrus.diagram.composite.edit.parts;
import org.eclipse.draw2d.IFigure;
+import org.eclipse.draw2d.geometry.Dimension;
+import org.eclipse.draw2d.geometry.Point;
+import org.eclipse.draw2d.geometry.Rectangle;
import org.eclipse.emf.common.notify.Notification;
import org.eclipse.gef.EditPolicy;
+import org.eclipse.gef.GraphicalEditPart;
import org.eclipse.gmf.runtime.diagram.ui.editparts.ListCompartmentEditPart;
import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CreationEditPolicy;
import org.eclipse.gmf.runtime.diagram.ui.editpolicies.DragDropEditPolicy;
@@ -23,6 +27,7 @@ import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableCompartmentEditPolicy;
import org.eclipse.gmf.runtime.diagram.ui.figures.ResizableCompartmentFigure;
import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;
+import org.eclipse.gmf.runtime.notation.NotationPackage;
import org.eclipse.gmf.runtime.notation.View;
import org.eclipse.papyrus.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy;
import org.eclipse.papyrus.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy;
@@ -32,7 +37,11 @@ import org.eclipse.papyrus.diagram.composite.part.Messages;
/**
* @generated
*/
-public class ClassNestedClassifierCompartmentEditPart extends ListCompartmentEditPart {
+public class ClassNestedClassifierCompartmentEditPart
+
+extends ListCompartmentEditPart
+
+{
/**
* @generated
@@ -91,4 +100,38 @@ public class ClassNestedClassifierCompartmentEditPart extends ListCompartmentEdi
}
}
+ /**
+ * @generated
+ */
+ protected void handleNotificationEvent(Notification notification) {
+ Object feature = notification.getFeature();
+ if (NotationPackage.eINSTANCE.getSize_Width().equals(feature)
+ || NotationPackage.eINSTANCE.getSize_Height().equals(feature)
+ || NotationPackage.eINSTANCE.getLocation_X().equals(feature)
+ || NotationPackage.eINSTANCE.getLocation_Y().equals(feature)) {
+ refreshBounds();
+ }
+ super.handleNotificationEvent(notification);
+ }
+
+ /**
+ * @generated
+ */
+ protected void refreshBounds() {
+ int width = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();
+ int height = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();
+ Dimension size = new Dimension(width, height);
+ int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();
+ int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();
+ Point loc = new Point(x, y);
+ ((GraphicalEditPart) getParent()).setLayoutConstraint(this, getFigure(), new Rectangle(loc, size));
+ }
+
+ /**
+ * @generated
+ */
+ protected void refreshVisuals() {
+ super.refreshVisuals();
+ refreshBounds();
+ }
}
diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/ClassOperationCompartmentEditPart.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/ClassOperationCompartmentEditPart.java
index 437a97eacb5..78d77a76a3c 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/ClassOperationCompartmentEditPart.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/ClassOperationCompartmentEditPart.java
@@ -14,8 +14,12 @@
package org.eclipse.papyrus.diagram.composite.edit.parts;
import org.eclipse.draw2d.IFigure;
+import org.eclipse.draw2d.geometry.Dimension;
+import org.eclipse.draw2d.geometry.Point;
+import org.eclipse.draw2d.geometry.Rectangle;
import org.eclipse.emf.common.notify.Notification;
import org.eclipse.gef.EditPolicy;
+import org.eclipse.gef.GraphicalEditPart;
import org.eclipse.gmf.runtime.diagram.ui.editparts.ListCompartmentEditPart;
import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CreationEditPolicy;
import org.eclipse.gmf.runtime.diagram.ui.editpolicies.DragDropEditPolicy;
@@ -23,6 +27,7 @@ import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableCompartmentEditPolicy;
import org.eclipse.gmf.runtime.diagram.ui.figures.ResizableCompartmentFigure;
import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;
+import org.eclipse.gmf.runtime.notation.NotationPackage;
import org.eclipse.gmf.runtime.notation.View;
import org.eclipse.papyrus.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy;
import org.eclipse.papyrus.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy;
@@ -32,7 +37,11 @@ import org.eclipse.papyrus.diagram.composite.part.Messages;
/**
* @generated
*/
-public class ClassOperationCompartmentEditPart extends ListCompartmentEditPart {
+public class ClassOperationCompartmentEditPart
+
+extends ListCompartmentEditPart
+
+{
/**
* @generated
@@ -91,4 +100,38 @@ public class ClassOperationCompartmentEditPart extends ListCompartmentEditPart {
}
}
+ /**
+ * @generated
+ */
+ protected void handleNotificationEvent(Notification notification) {
+ Object feature = notification.getFeature();
+ if (NotationPackage.eINSTANCE.getSize_Width().equals(feature)
+ || NotationPackage.eINSTANCE.getSize_Height().equals(feature)
+ || NotationPackage.eINSTANCE.getLocation_X().equals(feature)
+ || NotationPackage.eINSTANCE.getLocation_Y().equals(feature)) {
+ refreshBounds();
+ }
+ super.handleNotificationEvent(notification);
+ }
+
+ /**
+ * @generated
+ */
+ protected void refreshBounds() {
+ int width = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();
+ int height = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();
+ Dimension size = new Dimension(width, height);
+ int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();
+ int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();
+ Point loc = new Point(x, y);
+ ((GraphicalEditPart) getParent()).setLayoutConstraint(this, getFigure(), new Rectangle(loc, size));
+ }
+
+ /**
+ * @generated
+ */
+ protected void refreshVisuals() {
+ super.refreshVisuals();
+ refreshBounds();
+ }
}
diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/CollaborationCompositeCompartmentEditPart.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/CollaborationCompositeCompartmentEditPart.java
index dce1ddc4d2f..6d1a9c93f26 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/CollaborationCompositeCompartmentEditPart.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/CollaborationCompositeCompartmentEditPart.java
@@ -14,7 +14,12 @@
package org.eclipse.papyrus.diagram.composite.edit.parts;
import org.eclipse.draw2d.IFigure;
+import org.eclipse.draw2d.geometry.Dimension;
+import org.eclipse.draw2d.geometry.Point;
+import org.eclipse.draw2d.geometry.Rectangle;
+import org.eclipse.emf.common.notify.Notification;
import org.eclipse.gef.EditPolicy;
+import org.eclipse.gef.GraphicalEditPart;
import org.eclipse.gmf.runtime.diagram.ui.editparts.ShapeCompartmentEditPart;
import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CreationEditPolicy;
import org.eclipse.gmf.runtime.diagram.ui.editpolicies.DragDropEditPolicy;
@@ -22,6 +27,7 @@ import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableCompartmentEditPolicy;
import org.eclipse.gmf.runtime.diagram.ui.figures.ResizableCompartmentFigure;
import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;
+import org.eclipse.gmf.runtime.notation.NotationPackage;
import org.eclipse.gmf.runtime.notation.View;
import org.eclipse.papyrus.diagram.common.editpolicies.CustomContainerEditPolicy;
import org.eclipse.papyrus.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy;
@@ -32,7 +38,11 @@ import org.eclipse.papyrus.diagram.composite.part.Messages;
/**
* @generated
*/
-public class CollaborationCompositeCompartmentEditPart extends ShapeCompartmentEditPart {
+public class CollaborationCompositeCompartmentEditPart
+
+extends ShapeCompartmentEditPart
+
+{
/**
* @generated
@@ -88,4 +98,38 @@ public class CollaborationCompositeCompartmentEditPart extends ShapeCompartmentE
}
}
+ /**
+ * @generated
+ */
+ protected void handleNotificationEvent(Notification notification) {
+ Object feature = notification.getFeature();
+ if (NotationPackage.eINSTANCE.getSize_Width().equals(feature)
+ || NotationPackage.eINSTANCE.getSize_Height().equals(feature)
+ || NotationPackage.eINSTANCE.getLocation_X().equals(feature)
+ || NotationPackage.eINSTANCE.getLocation_Y().equals(feature)) {
+ refreshBounds();
+ }
+ super.handleNotificationEvent(notification);
+ }
+
+ /**
+ * @generated
+ */
+ protected void refreshBounds() {
+ int width = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();
+ int height = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();
+ Dimension size = new Dimension(width, height);
+ int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();
+ int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();
+ Point loc = new Point(x, y);
+ ((GraphicalEditPart) getParent()).setLayoutConstraint(this, getFigure(), new Rectangle(loc, size));
+ }
+
+ /**
+ * @generated
+ */
+ protected void refreshVisuals() {
+ super.refreshVisuals();
+ refreshBounds();
+ }
}
diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/CollaborationCompositeCompartmentEditPartCN.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/CollaborationCompositeCompartmentEditPartCN.java
index 6b575bf26f9..0194de4b5d7 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/CollaborationCompositeCompartmentEditPartCN.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/CollaborationCompositeCompartmentEditPartCN.java
@@ -14,7 +14,12 @@
package org.eclipse.papyrus.diagram.composite.edit.parts;
import org.eclipse.draw2d.IFigure;
+import org.eclipse.draw2d.geometry.Dimension;
+import org.eclipse.draw2d.geometry.Point;
+import org.eclipse.draw2d.geometry.Rectangle;
+import org.eclipse.emf.common.notify.Notification;
import org.eclipse.gef.EditPolicy;
+import org.eclipse.gef.GraphicalEditPart;
import org.eclipse.gmf.runtime.diagram.ui.editparts.ShapeCompartmentEditPart;
import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CreationEditPolicy;
import org.eclipse.gmf.runtime.diagram.ui.editpolicies.DragDropEditPolicy;
@@ -22,6 +27,7 @@ import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableCompartmentEditPolicy;
import org.eclipse.gmf.runtime.diagram.ui.figures.ResizableCompartmentFigure;
import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;
+import org.eclipse.gmf.runtime.notation.NotationPackage;
import org.eclipse.gmf.runtime.notation.View;
import org.eclipse.papyrus.diagram.common.editpolicies.CustomContainerEditPolicy;
import org.eclipse.papyrus.diagram.composite.custom.edit.policies.CollaborationCompositeCompartmentItemSemanticEditPolicy;
@@ -33,7 +39,11 @@ import org.eclipse.papyrus.diagram.composite.part.Messages;
/**
* @generated
*/
-public class CollaborationCompositeCompartmentEditPartCN extends ShapeCompartmentEditPart {
+public class CollaborationCompositeCompartmentEditPartCN
+
+extends ShapeCompartmentEditPart
+
+{
/**
* @generated
@@ -88,4 +98,38 @@ public class CollaborationCompositeCompartmentEditPartCN extends ShapeCompartmen
}
}
+ /**
+ * @generated
+ */
+ protected void handleNotificationEvent(Notification notification) {
+ Object feature = notification.getFeature();
+ if (NotationPackage.eINSTANCE.getSize_Width().equals(feature)
+ || NotationPackage.eINSTANCE.getSize_Height().equals(feature)
+ || NotationPackage.eINSTANCE.getLocation_X().equals(feature)
+ || NotationPackage.eINSTANCE.getLocation_Y().equals(feature)) {
+ refreshBounds();
+ }
+ super.handleNotificationEvent(notification);
+ }
+
+ /**
+ * @generated
+ */
+ protected void refreshBounds() {
+ int width = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();
+ int height = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();
+ Dimension size = new Dimension(width, height);
+ int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();
+ int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();
+ Point loc = new Point(x, y);
+ ((GraphicalEditPart) getParent()).setLayoutConstraint(this, getFigure(), new Rectangle(loc, size));
+ }
+
+ /**
+ * @generated
+ */
+ protected void refreshVisuals() {
+ super.refreshVisuals();
+ refreshBounds();
+ }
}
diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/CollaborationCompositeEditPart.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/CollaborationCompositeEditPart.java
index c2e088de95e..af0c5d8bc6e 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/CollaborationCompositeEditPart.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/CollaborationCompositeEditPart.java
@@ -150,7 +150,7 @@ NamedElementEditPart {
if (childEditPart instanceof CollaborationCompositeCompartmentEditPart) {
IFigure pane = getPrimaryShape().getCompositeCompartmentFigure();
setupContentPane(pane); // FIXME each comparment should handle his content pane in his
- // own way
+ // own way
pane.add(((CollaborationCompositeCompartmentEditPart) childEditPart).getFigure());
return true;
}
@@ -168,7 +168,7 @@ NamedElementEditPart {
if (childEditPart instanceof CollaborationCompositeCompartmentEditPart) {
IFigure pane = getPrimaryShape().getCompositeCompartmentFigure();
setupContentPane(pane); // FIXME each comparment should handle his content pane in his
- // own way
+ // own way
pane.remove(((CollaborationCompositeCompartmentEditPart) childEditPart).getFigure());
return true;
}
@@ -300,7 +300,8 @@ NamedElementEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -331,7 +332,8 @@ NamedElementEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -3242,7 +3244,8 @@ NamedElementEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -6152,7 +6155,8 @@ NamedElementEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -6172,6 +6176,8 @@ NamedElementEditPart {
types.add(UMLElementTypes.Dependency_4010);
types.add(UMLElementTypes.Generalization_4015);
types.add(UMLElementTypes.InformationFlow_4016);
+ types.add(UMLElementTypes.TimeObservationEvent_4018);
+ types.add(UMLElementTypes.DurationObservationEvent_4019);
return types;
}
@@ -6185,7 +6191,8 @@ NamedElementEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -9104,6 +9111,12 @@ NamedElementEditPart {
if (relationshipType == UMLElementTypes.InformationFlow_4016) {
types.add(UMLElementTypes.Comment_3097);
}
+ if (relationshipType == UMLElementTypes.TimeObservationEvent_4018) {
+ types.add(UMLElementTypes.TimeObservation_2094);
+ }
+ if (relationshipType == UMLElementTypes.DurationObservationEvent_4019) {
+ types.add(UMLElementTypes.DurationObservation_2093);
+ }
return types;
}
diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/CollaborationCompositeEditPartCN.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/CollaborationCompositeEditPartCN.java
index 715fa8d060c..f2e640dff6f 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/CollaborationCompositeEditPartCN.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/CollaborationCompositeEditPartCN.java
@@ -150,7 +150,7 @@ NamedElementEditPart {
if (childEditPart instanceof CollaborationCompositeCompartmentEditPartCN) {
IFigure pane = getPrimaryShape().getCompositeCompartmentFigure();
setupContentPane(pane); // FIXME each comparment should handle his content pane in his
- // own way
+ // own way
pane.add(((CollaborationCompositeCompartmentEditPartCN) childEditPart).getFigure());
return true;
}
@@ -168,7 +168,7 @@ NamedElementEditPart {
if (childEditPart instanceof CollaborationCompositeCompartmentEditPartCN) {
IFigure pane = getPrimaryShape().getCompositeCompartmentFigure();
setupContentPane(pane); // FIXME each comparment should handle his content pane in his
- // own way
+ // own way
pane.remove(((CollaborationCompositeCompartmentEditPartCN) childEditPart).getFigure());
return true;
}
@@ -300,7 +300,8 @@ NamedElementEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -331,7 +332,8 @@ NamedElementEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -3242,7 +3244,8 @@ NamedElementEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -6152,7 +6155,8 @@ NamedElementEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -6172,6 +6176,8 @@ NamedElementEditPart {
types.add(UMLElementTypes.Dependency_4010);
types.add(UMLElementTypes.Generalization_4015);
types.add(UMLElementTypes.InformationFlow_4016);
+ types.add(UMLElementTypes.TimeObservationEvent_4018);
+ types.add(UMLElementTypes.DurationObservationEvent_4019);
return types;
}
@@ -6185,7 +6191,8 @@ NamedElementEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -9104,6 +9111,12 @@ NamedElementEditPart {
if (relationshipType == UMLElementTypes.InformationFlow_4016) {
types.add(UMLElementTypes.Comment_3097);
}
+ if (relationshipType == UMLElementTypes.TimeObservationEvent_4018) {
+ types.add(UMLElementTypes.TimeObservation_2094);
+ }
+ if (relationshipType == UMLElementTypes.DurationObservationEvent_4019) {
+ types.add(UMLElementTypes.DurationObservation_2093);
+ }
return types;
}
diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/CollaborationRoleEditPartCN.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/CollaborationRoleEditPartCN.java
index b1bf0a8c552..61520a99ff6 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/CollaborationRoleEditPartCN.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/CollaborationRoleEditPartCN.java
@@ -286,7 +286,8 @@ NamedElementEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -317,7 +318,8 @@ NamedElementEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -3228,7 +3230,8 @@ NamedElementEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -6138,7 +6141,8 @@ NamedElementEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -6158,6 +6162,8 @@ NamedElementEditPart {
types.add(UMLElementTypes.Dependency_4010);
types.add(UMLElementTypes.Generalization_4015);
types.add(UMLElementTypes.InformationFlow_4016);
+ types.add(UMLElementTypes.TimeObservationEvent_4018);
+ types.add(UMLElementTypes.DurationObservationEvent_4019);
return types;
}
@@ -6171,7 +6177,8 @@ NamedElementEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -9090,6 +9097,12 @@ NamedElementEditPart {
if (relationshipType == UMLElementTypes.InformationFlow_4016) {
types.add(UMLElementTypes.Comment_3097);
}
+ if (relationshipType == UMLElementTypes.TimeObservationEvent_4018) {
+ types.add(UMLElementTypes.TimeObservation_2094);
+ }
+ if (relationshipType == UMLElementTypes.DurationObservationEvent_4019) {
+ types.add(UMLElementTypes.DurationObservation_2093);
+ }
return types;
}
diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/CollaborationUseEditPartCN.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/CollaborationUseEditPartCN.java
index 625192810c6..1e7b200c063 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/CollaborationUseEditPartCN.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/CollaborationUseEditPartCN.java
@@ -285,7 +285,8 @@ NamedElementEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -316,7 +317,8 @@ NamedElementEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -3227,7 +3229,8 @@ NamedElementEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -6137,7 +6140,8 @@ NamedElementEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -6157,6 +6161,8 @@ NamedElementEditPart {
types.add(UMLElementTypes.Dependency_4010);
types.add(UMLElementTypes.Generalization_4015);
types.add(UMLElementTypes.InformationFlow_4016);
+ types.add(UMLElementTypes.TimeObservationEvent_4018);
+ types.add(UMLElementTypes.DurationObservationEvent_4019);
return types;
}
@@ -6170,7 +6176,8 @@ NamedElementEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -9089,6 +9096,12 @@ NamedElementEditPart {
if (relationshipType == UMLElementTypes.InformationFlow_4016) {
types.add(UMLElementTypes.Comment_3097);
}
+ if (relationshipType == UMLElementTypes.TimeObservationEvent_4018) {
+ types.add(UMLElementTypes.TimeObservation_2094);
+ }
+ if (relationshipType == UMLElementTypes.DurationObservationEvent_4019) {
+ types.add(UMLElementTypes.DurationObservation_2093);
+ }
return types;
}
diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/CommentEditPart.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/CommentEditPart.java
index c658f95d32d..39530277aa6 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/CommentEditPart.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/CommentEditPart.java
@@ -277,7 +277,8 @@ ShapeNodeEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -299,7 +300,8 @@ ShapeNodeEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -1056,7 +1058,8 @@ ShapeNodeEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -1812,7 +1815,8 @@ ShapeNodeEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -1835,7 +1839,8 @@ ShapeNodeEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/CommentEditPartCN.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/CommentEditPartCN.java
index 8250a253d46..9d17e84b680 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/CommentEditPartCN.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/CommentEditPartCN.java
@@ -277,7 +277,8 @@ ShapeNodeEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -299,7 +300,8 @@ ShapeNodeEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -1056,7 +1058,8 @@ ShapeNodeEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -1812,7 +1815,8 @@ ShapeNodeEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -1835,7 +1839,8 @@ ShapeNodeEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/ComponentCompositeCompartmentEditPart.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/ComponentCompositeCompartmentEditPart.java
index ee122deb0d6..0af958debb4 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/ComponentCompositeCompartmentEditPart.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/ComponentCompositeCompartmentEditPart.java
@@ -14,7 +14,12 @@
package org.eclipse.papyrus.diagram.composite.edit.parts;
import org.eclipse.draw2d.IFigure;
+import org.eclipse.draw2d.geometry.Dimension;
+import org.eclipse.draw2d.geometry.Point;
+import org.eclipse.draw2d.geometry.Rectangle;
+import org.eclipse.emf.common.notify.Notification;
import org.eclipse.gef.EditPolicy;
+import org.eclipse.gef.GraphicalEditPart;
import org.eclipse.gmf.runtime.diagram.ui.editparts.ShapeCompartmentEditPart;
import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CreationEditPolicy;
import org.eclipse.gmf.runtime.diagram.ui.editpolicies.DragDropEditPolicy;
@@ -22,6 +27,7 @@ import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableCompartmentEditPolicy;
import org.eclipse.gmf.runtime.diagram.ui.figures.ResizableCompartmentFigure;
import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;
+import org.eclipse.gmf.runtime.notation.NotationPackage;
import org.eclipse.gmf.runtime.notation.View;
import org.eclipse.papyrus.diagram.common.editpolicies.CustomContainerEditPolicy;
import org.eclipse.papyrus.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy;
@@ -32,7 +38,11 @@ import org.eclipse.papyrus.diagram.composite.part.Messages;
/**
* @generated
*/
-public class ComponentCompositeCompartmentEditPart extends ShapeCompartmentEditPart {
+public class ComponentCompositeCompartmentEditPart
+
+extends ShapeCompartmentEditPart
+
+{
/**
* @generated
@@ -85,4 +95,38 @@ public class ComponentCompositeCompartmentEditPart extends ShapeCompartmentEditP
}
}
+ /**
+ * @generated
+ */
+ protected void handleNotificationEvent(Notification notification) {
+ Object feature = notification.getFeature();
+ if (NotationPackage.eINSTANCE.getSize_Width().equals(feature)
+ || NotationPackage.eINSTANCE.getSize_Height().equals(feature)
+ || NotationPackage.eINSTANCE.getLocation_X().equals(feature)
+ || NotationPackage.eINSTANCE.getLocation_Y().equals(feature)) {
+ refreshBounds();
+ }
+ super.handleNotificationEvent(notification);
+ }
+
+ /**
+ * @generated
+ */
+ protected void refreshBounds() {
+ int width = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();
+ int height = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();
+ Dimension size = new Dimension(width, height);
+ int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();
+ int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();
+ Point loc = new Point(x, y);
+ ((GraphicalEditPart) getParent()).setLayoutConstraint(this, getFigure(), new Rectangle(loc, size));
+ }
+
+ /**
+ * @generated
+ */
+ protected void refreshVisuals() {
+ super.refreshVisuals();
+ refreshBounds();
+ }
}
diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/ComponentCompositeCompartmentEditPartCN.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/ComponentCompositeCompartmentEditPartCN.java
index e63d046e4d0..7727c5d0321 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/ComponentCompositeCompartmentEditPartCN.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/ComponentCompositeCompartmentEditPartCN.java
@@ -14,7 +14,12 @@
package org.eclipse.papyrus.diagram.composite.edit.parts;
import org.eclipse.draw2d.IFigure;
+import org.eclipse.draw2d.geometry.Dimension;
+import org.eclipse.draw2d.geometry.Point;
+import org.eclipse.draw2d.geometry.Rectangle;
+import org.eclipse.emf.common.notify.Notification;
import org.eclipse.gef.EditPolicy;
+import org.eclipse.gef.GraphicalEditPart;
import org.eclipse.gmf.runtime.diagram.ui.editparts.ShapeCompartmentEditPart;
import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CreationEditPolicy;
import org.eclipse.gmf.runtime.diagram.ui.editpolicies.DragDropEditPolicy;
@@ -22,6 +27,7 @@ import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableCompartmentEditPolicy;
import org.eclipse.gmf.runtime.diagram.ui.figures.ResizableCompartmentFigure;
import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;
+import org.eclipse.gmf.runtime.notation.NotationPackage;
import org.eclipse.gmf.runtime.notation.View;
import org.eclipse.papyrus.diagram.common.editpolicies.CustomContainerEditPolicy;
import org.eclipse.papyrus.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy;
@@ -32,7 +38,11 @@ import org.eclipse.papyrus.diagram.composite.part.Messages;
/**
* @generated
*/
-public class ComponentCompositeCompartmentEditPartCN extends ShapeCompartmentEditPart {
+public class ComponentCompositeCompartmentEditPartCN
+
+extends ShapeCompartmentEditPart
+
+{
/**
* @generated
@@ -85,4 +95,38 @@ public class ComponentCompositeCompartmentEditPartCN extends ShapeCompartmentEdi
}
}
+ /**
+ * @generated
+ */
+ protected void handleNotificationEvent(Notification notification) {
+ Object feature = notification.getFeature();
+ if (NotationPackage.eINSTANCE.getSize_Width().equals(feature)
+ || NotationPackage.eINSTANCE.getSize_Height().equals(feature)
+ || NotationPackage.eINSTANCE.getLocation_X().equals(feature)
+ || NotationPackage.eINSTANCE.getLocation_Y().equals(feature)) {
+ refreshBounds();
+ }
+ super.handleNotificationEvent(notification);
+ }
+
+ /**
+ * @generated
+ */
+ protected void refreshBounds() {
+ int width = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();
+ int height = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();
+ Dimension size = new Dimension(width, height);
+ int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();
+ int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();
+ Point loc = new Point(x, y);
+ ((GraphicalEditPart) getParent()).setLayoutConstraint(this, getFigure(), new Rectangle(loc, size));
+ }
+
+ /**
+ * @generated
+ */
+ protected void refreshVisuals() {
+ super.refreshVisuals();
+ refreshBounds();
+ }
}
diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/ComponentCompositeEditPart.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/ComponentCompositeEditPart.java
index 9dbbeb2d293..4aca1e62e34 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/ComponentCompositeEditPart.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/ComponentCompositeEditPart.java
@@ -168,7 +168,7 @@ NamedElementEditPart {
if (childEditPart instanceof ComponentCompositeCompartmentEditPart) {
IFigure pane = getPrimaryShape().getCompositeCompartmentFigure();
setupContentPane(pane); // FIXME each comparment should handle his content pane in his
- // own way
+ // own way
pane.add(((ComponentCompositeCompartmentEditPart) childEditPart).getFigure());
return true;
}
@@ -193,7 +193,7 @@ NamedElementEditPart {
if (childEditPart instanceof ComponentCompositeCompartmentEditPart) {
IFigure pane = getPrimaryShape().getCompositeCompartmentFigure();
setupContentPane(pane); // FIXME each comparment should handle his content pane in his
- // own way
+ // own way
pane.remove(((ComponentCompositeCompartmentEditPart) childEditPart).getFigure());
return true;
}
@@ -332,7 +332,8 @@ NamedElementEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -363,7 +364,8 @@ NamedElementEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -3274,7 +3276,8 @@ NamedElementEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -6184,7 +6187,8 @@ NamedElementEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -6204,6 +6208,8 @@ NamedElementEditPart {
types.add(UMLElementTypes.Dependency_4010);
types.add(UMLElementTypes.Generalization_4015);
types.add(UMLElementTypes.InformationFlow_4016);
+ types.add(UMLElementTypes.TimeObservationEvent_4018);
+ types.add(UMLElementTypes.DurationObservationEvent_4019);
return types;
}
@@ -6217,7 +6223,8 @@ NamedElementEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -9136,6 +9143,12 @@ NamedElementEditPart {
if (relationshipType == UMLElementTypes.InformationFlow_4016) {
types.add(UMLElementTypes.Comment_3097);
}
+ if (relationshipType == UMLElementTypes.TimeObservationEvent_4018) {
+ types.add(UMLElementTypes.TimeObservation_2094);
+ }
+ if (relationshipType == UMLElementTypes.DurationObservationEvent_4019) {
+ types.add(UMLElementTypes.DurationObservation_2093);
+ }
return types;
}
diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/ComponentCompositeEditPartCN.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/ComponentCompositeEditPartCN.java
index e4ecd65a962..16d829366c0 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/ComponentCompositeEditPartCN.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/ComponentCompositeEditPartCN.java
@@ -168,7 +168,7 @@ NamedElementEditPart {
if (childEditPart instanceof ComponentCompositeCompartmentEditPartCN) {
IFigure pane = getPrimaryShape().getCompositeCompartmentFigure();
setupContentPane(pane); // FIXME each comparment should handle his content pane in his
- // own way
+ // own way
pane.add(((ComponentCompositeCompartmentEditPartCN) childEditPart).getFigure());
return true;
}
@@ -193,7 +193,7 @@ NamedElementEditPart {
if (childEditPart instanceof ComponentCompositeCompartmentEditPartCN) {
IFigure pane = getPrimaryShape().getCompositeCompartmentFigure();
setupContentPane(pane); // FIXME each comparment should handle his content pane in his
- // own way
+ // own way
pane.remove(((ComponentCompositeCompartmentEditPartCN) childEditPart).getFigure());
return true;
}
@@ -332,7 +332,8 @@ NamedElementEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -363,7 +364,8 @@ NamedElementEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -3274,7 +3276,8 @@ NamedElementEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -6184,7 +6187,8 @@ NamedElementEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -6204,6 +6208,8 @@ NamedElementEditPart {
types.add(UMLElementTypes.Dependency_4010);
types.add(UMLElementTypes.Generalization_4015);
types.add(UMLElementTypes.InformationFlow_4016);
+ types.add(UMLElementTypes.TimeObservationEvent_4018);
+ types.add(UMLElementTypes.DurationObservationEvent_4019);
return types;
}
@@ -6217,7 +6223,8 @@ NamedElementEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -9136,6 +9143,12 @@ NamedElementEditPart {
if (relationshipType == UMLElementTypes.InformationFlow_4016) {
types.add(UMLElementTypes.Comment_3097);
}
+ if (relationshipType == UMLElementTypes.TimeObservationEvent_4018) {
+ types.add(UMLElementTypes.TimeObservation_2094);
+ }
+ if (relationshipType == UMLElementTypes.DurationObservationEvent_4019) {
+ types.add(UMLElementTypes.DurationObservation_2093);
+ }
return types;
}
diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/ConnectorDurationObservationEditPart.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/ConnectorDurationObservationEditPart.java
new file mode 100644
index 00000000000..df92f257d77
--- /dev/null
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/ConnectorDurationObservationEditPart.java
@@ -0,0 +1,88 @@
+/*****************************************************************************
+ * Copyright (c) 2009 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
+ *
+ * Contributors:
+ * Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.diagram.composite.edit.parts;
+
+import org.eclipse.draw2d.Connection;
+import org.eclipse.draw2d.Graphics;
+import org.eclipse.gmf.runtime.diagram.ui.editparts.ConnectionNodeEditPart;
+import org.eclipse.gmf.runtime.diagram.ui.editparts.ITreeBranchEditPart;
+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
+import org.eclipse.gmf.runtime.draw2d.ui.figures.PolylineConnectionEx;
+import org.eclipse.gmf.runtime.notation.View;
+import org.eclipse.papyrus.diagram.composite.edit.policies.ConnectorDurationObservationItemSemanticEditPolicy;
+
+/**
+ * @generated
+ */
+public class ConnectorDurationObservationEditPart extends ConnectionNodeEditPart
+
+implements ITreeBranchEditPart {
+
+ /**
+ * @generated
+ */
+ public static final int VISUAL_ID = 4019;
+
+ /**
+ * @generated
+ */
+ public ConnectorDurationObservationEditPart(View view) {
+ super(view);
+ }
+
+ /**
+ * @generated
+ */
+ protected void createDefaultEditPolicies() {
+ super.createDefaultEditPolicies();
+ installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new ConnectorDurationObservationItemSemanticEditPolicy());
+ }
+
+ /**
+ * Creates figure for this edit part.
+ *
+ * Body of this method does not depend on settings in generation model so you may safely remove
+ * <i>generated</i> tag and modify it.
+ *
+ * @generated
+ */
+
+ protected Connection createConnectionFigure() {
+ return new LinkDescriptor();
+ }
+
+ /**
+ * @generated
+ */
+ public LinkDescriptor getPrimaryShape() {
+ return (LinkDescriptor) getFigure();
+ }
+
+ /**
+ * @generated
+ */
+ public class LinkDescriptor extends PolylineConnectionEx {
+
+ /**
+ * @generated
+ */
+ public LinkDescriptor() {
+ this.setLineWidth(1);
+ this.setLineStyle(Graphics.LINE_DASH);
+
+ }
+
+ }
+
+}
diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/ConnectorTimeObservationEditPart.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/ConnectorTimeObservationEditPart.java
new file mode 100644
index 00000000000..4b055d68355
--- /dev/null
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/ConnectorTimeObservationEditPart.java
@@ -0,0 +1,88 @@
+/*****************************************************************************
+ * Copyright (c) 2009 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
+ *
+ * Contributors:
+ * Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.diagram.composite.edit.parts;
+
+import org.eclipse.draw2d.Connection;
+import org.eclipse.draw2d.Graphics;
+import org.eclipse.gmf.runtime.diagram.ui.editparts.ConnectionNodeEditPart;
+import org.eclipse.gmf.runtime.diagram.ui.editparts.ITreeBranchEditPart;
+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
+import org.eclipse.gmf.runtime.draw2d.ui.figures.PolylineConnectionEx;
+import org.eclipse.gmf.runtime.notation.View;
+import org.eclipse.papyrus.diagram.composite.edit.policies.ConnectorTimeObservationItemSemanticEditPolicy;
+
+/**
+ * @generated
+ */
+public class ConnectorTimeObservationEditPart extends ConnectionNodeEditPart
+
+implements ITreeBranchEditPart {
+
+ /**
+ * @generated
+ */
+ public static final int VISUAL_ID = 4018;
+
+ /**
+ * @generated
+ */
+ public ConnectorTimeObservationEditPart(View view) {
+ super(view);
+ }
+
+ /**
+ * @generated
+ */
+ protected void createDefaultEditPolicies() {
+ super.createDefaultEditPolicies();
+ installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new ConnectorTimeObservationItemSemanticEditPolicy());
+ }
+
+ /**
+ * Creates figure for this edit part.
+ *
+ * Body of this method does not depend on settings in generation model so you may safely remove
+ * <i>generated</i> tag and modify it.
+ *
+ * @generated
+ */
+
+ protected Connection createConnectionFigure() {
+ return new LinkDescriptor();
+ }
+
+ /**
+ * @generated
+ */
+ public LinkDescriptor getPrimaryShape() {
+ return (LinkDescriptor) getFigure();
+ }
+
+ /**
+ * @generated
+ */
+ public class LinkDescriptor extends PolylineConnectionEx {
+
+ /**
+ * @generated
+ */
+ public LinkDescriptor() {
+ this.setLineWidth(1);
+ this.setLineStyle(Graphics.LINE_DASH);
+
+ }
+
+ }
+
+}
diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/ConstraintEditPart.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/ConstraintEditPart.java
index 6b3fbe687da..cbb9450177e 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/ConstraintEditPart.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/ConstraintEditPart.java
@@ -277,7 +277,8 @@ ShapeNodeEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -309,7 +310,8 @@ ShapeNodeEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -3466,7 +3468,8 @@ ShapeNodeEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -6622,7 +6625,8 @@ ShapeNodeEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -6642,6 +6646,8 @@ ShapeNodeEditPart {
types.add(UMLElementTypes.Dependency_4010);
types.add(UMLElementTypes.Generalization_4015);
types.add(UMLElementTypes.InformationFlow_4016);
+ types.add(UMLElementTypes.TimeObservationEvent_4018);
+ types.add(UMLElementTypes.DurationObservationEvent_4019);
return types;
}
@@ -6655,7 +6661,8 @@ ShapeNodeEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -9574,6 +9581,12 @@ ShapeNodeEditPart {
if (relationshipType == UMLElementTypes.InformationFlow_4016) {
types.add(UMLElementTypes.Comment_3097);
}
+ if (relationshipType == UMLElementTypes.TimeObservationEvent_4018) {
+ types.add(UMLElementTypes.TimeObservation_2094);
+ }
+ if (relationshipType == UMLElementTypes.DurationObservationEvent_4019) {
+ types.add(UMLElementTypes.DurationObservation_2093);
+ }
return types;
}
diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/CreationEventEditPart.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/CreationEventEditPart.java
index 6b49f8effa4..db3fa4913af 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/CreationEventEditPart.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/CreationEventEditPart.java
@@ -277,7 +277,8 @@ ShapeNodeEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -308,7 +309,8 @@ ShapeNodeEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -3219,7 +3221,8 @@ ShapeNodeEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -6129,7 +6132,8 @@ ShapeNodeEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -6149,6 +6153,8 @@ ShapeNodeEditPart {
types.add(UMLElementTypes.Dependency_4010);
types.add(UMLElementTypes.Generalization_4015);
types.add(UMLElementTypes.InformationFlow_4016);
+ types.add(UMLElementTypes.TimeObservationEvent_4018);
+ types.add(UMLElementTypes.DurationObservationEvent_4019);
return types;
}
@@ -6162,7 +6168,8 @@ ShapeNodeEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -9081,6 +9088,12 @@ ShapeNodeEditPart {
if (relationshipType == UMLElementTypes.InformationFlow_4016) {
types.add(UMLElementTypes.Comment_3097);
}
+ if (relationshipType == UMLElementTypes.TimeObservationEvent_4018) {
+ types.add(UMLElementTypes.TimeObservation_2094);
+ }
+ if (relationshipType == UMLElementTypes.DurationObservationEvent_4019) {
+ types.add(UMLElementTypes.DurationObservation_2093);
+ }
return types;
}
diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/DataTypeAttributeCompartmentEditPart.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/DataTypeAttributeCompartmentEditPart.java
index a823309546c..97a3a190d1e 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/DataTypeAttributeCompartmentEditPart.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/DataTypeAttributeCompartmentEditPart.java
@@ -14,8 +14,12 @@
package org.eclipse.papyrus.diagram.composite.edit.parts;
import org.eclipse.draw2d.IFigure;
+import org.eclipse.draw2d.geometry.Dimension;
+import org.eclipse.draw2d.geometry.Point;
+import org.eclipse.draw2d.geometry.Rectangle;
import org.eclipse.emf.common.notify.Notification;
import org.eclipse.gef.EditPolicy;
+import org.eclipse.gef.GraphicalEditPart;
import org.eclipse.gmf.runtime.diagram.ui.editparts.ListCompartmentEditPart;
import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CreationEditPolicy;
import org.eclipse.gmf.runtime.diagram.ui.editpolicies.DragDropEditPolicy;
@@ -23,6 +27,7 @@ import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableCompartmentEditPolicy;
import org.eclipse.gmf.runtime.diagram.ui.figures.ResizableCompartmentFigure;
import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;
+import org.eclipse.gmf.runtime.notation.NotationPackage;
import org.eclipse.gmf.runtime.notation.View;
import org.eclipse.papyrus.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy;
import org.eclipse.papyrus.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy;
@@ -32,7 +37,11 @@ import org.eclipse.papyrus.diagram.composite.part.Messages;
/**
* @generated
*/
-public class DataTypeAttributeCompartmentEditPart extends ListCompartmentEditPart {
+public class DataTypeAttributeCompartmentEditPart
+
+extends ListCompartmentEditPart
+
+{
/**
* @generated
@@ -91,4 +100,38 @@ public class DataTypeAttributeCompartmentEditPart extends ListCompartmentEditPar
}
}
+ /**
+ * @generated
+ */
+ protected void handleNotificationEvent(Notification notification) {
+ Object feature = notification.getFeature();
+ if (NotationPackage.eINSTANCE.getSize_Width().equals(feature)
+ || NotationPackage.eINSTANCE.getSize_Height().equals(feature)
+ || NotationPackage.eINSTANCE.getLocation_X().equals(feature)
+ || NotationPackage.eINSTANCE.getLocation_Y().equals(feature)) {
+ refreshBounds();
+ }
+ super.handleNotificationEvent(notification);
+ }
+
+ /**
+ * @generated
+ */
+ protected void refreshBounds() {
+ int width = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();
+ int height = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();
+ Dimension size = new Dimension(width, height);
+ int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();
+ int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();
+ Point loc = new Point(x, y);
+ ((GraphicalEditPart) getParent()).setLayoutConstraint(this, getFigure(), new Rectangle(loc, size));
+ }
+
+ /**
+ * @generated
+ */
+ protected void refreshVisuals() {
+ super.refreshVisuals();
+ refreshBounds();
+ }
}
diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/DataTypeAttributeCompartmentEditPartCN.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/DataTypeAttributeCompartmentEditPartCN.java
index e293e27f4a2..a1cd18319cc 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/DataTypeAttributeCompartmentEditPartCN.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/DataTypeAttributeCompartmentEditPartCN.java
@@ -14,8 +14,12 @@
package org.eclipse.papyrus.diagram.composite.edit.parts;
import org.eclipse.draw2d.IFigure;
+import org.eclipse.draw2d.geometry.Dimension;
+import org.eclipse.draw2d.geometry.Point;
+import org.eclipse.draw2d.geometry.Rectangle;
import org.eclipse.emf.common.notify.Notification;
import org.eclipse.gef.EditPolicy;
+import org.eclipse.gef.GraphicalEditPart;
import org.eclipse.gmf.runtime.diagram.ui.editparts.ListCompartmentEditPart;
import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CreationEditPolicy;
import org.eclipse.gmf.runtime.diagram.ui.editpolicies.DragDropEditPolicy;
@@ -23,6 +27,7 @@ import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableCompartmentEditPolicy;
import org.eclipse.gmf.runtime.diagram.ui.figures.ResizableCompartmentFigure;
import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;
+import org.eclipse.gmf.runtime.notation.NotationPackage;
import org.eclipse.gmf.runtime.notation.View;
import org.eclipse.papyrus.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy;
import org.eclipse.papyrus.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy;
@@ -32,7 +37,11 @@ import org.eclipse.papyrus.diagram.composite.part.Messages;
/**
* @generated
*/
-public class DataTypeAttributeCompartmentEditPartCN extends ListCompartmentEditPart {
+public class DataTypeAttributeCompartmentEditPartCN
+
+extends ListCompartmentEditPart
+
+{
/**
* @generated
@@ -91,4 +100,38 @@ public class DataTypeAttributeCompartmentEditPartCN extends ListCompartmentEditP
}
}
+ /**
+ * @generated
+ */
+ protected void handleNotificationEvent(Notification notification) {
+ Object feature = notification.getFeature();
+ if (NotationPackage.eINSTANCE.getSize_Width().equals(feature)
+ || NotationPackage.eINSTANCE.getSize_Height().equals(feature)
+ || NotationPackage.eINSTANCE.getLocation_X().equals(feature)
+ || NotationPackage.eINSTANCE.getLocation_Y().equals(feature)) {
+ refreshBounds();
+ }
+ super.handleNotificationEvent(notification);
+ }
+
+ /**
+ * @generated
+ */
+ protected void refreshBounds() {
+ int width = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();
+ int height = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();
+ Dimension size = new Dimension(width, height);
+ int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();
+ int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();
+ Point loc = new Point(x, y);
+ ((GraphicalEditPart) getParent()).setLayoutConstraint(this, getFigure(), new Rectangle(loc, size));
+ }
+
+ /**
+ * @generated
+ */
+ protected void refreshVisuals() {
+ super.refreshVisuals();
+ refreshBounds();
+ }
}
diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/DataTypeEditPart.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/DataTypeEditPart.java
index 08168af4f0e..55fd36cd4c2 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/DataTypeEditPart.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/DataTypeEditPart.java
@@ -154,7 +154,7 @@ NamedElementEditPart {
if (childEditPart instanceof DataTypeAttributeCompartmentEditPart) {
IFigure pane = getPrimaryShape().getAttributeCompartmentFigure();
setupContentPane(pane); // FIXME each comparment should handle his content pane in his
- // own way
+ // own way
pane.add(((DataTypeAttributeCompartmentEditPart) childEditPart).getFigure());
return true;
}
@@ -162,7 +162,7 @@ NamedElementEditPart {
if (childEditPart instanceof DataTypeOperationCompartmentEditPart) {
IFigure pane = getPrimaryShape().getOperationCompartmentFigure();
setupContentPane(pane); // FIXME each comparment should handle his content pane in his
- // own way
+ // own way
pane.add(((DataTypeOperationCompartmentEditPart) childEditPart).getFigure());
return true;
}
@@ -180,14 +180,14 @@ NamedElementEditPart {
if (childEditPart instanceof DataTypeAttributeCompartmentEditPart) {
IFigure pane = getPrimaryShape().getAttributeCompartmentFigure();
setupContentPane(pane); // FIXME each comparment should handle his content pane in his
- // own way
+ // own way
pane.remove(((DataTypeAttributeCompartmentEditPart) childEditPart).getFigure());
return true;
}
if (childEditPart instanceof DataTypeOperationCompartmentEditPart) {
IFigure pane = getPrimaryShape().getOperationCompartmentFigure();
setupContentPane(pane); // FIXME each comparment should handle his content pane in his
- // own way
+ // own way
pane.remove(((DataTypeOperationCompartmentEditPart) childEditPart).getFigure());
return true;
}
@@ -322,7 +322,8 @@ NamedElementEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -353,7 +354,8 @@ NamedElementEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -3264,7 +3266,8 @@ NamedElementEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -6174,7 +6177,8 @@ NamedElementEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -6194,6 +6198,8 @@ NamedElementEditPart {
types.add(UMLElementTypes.Dependency_4010);
types.add(UMLElementTypes.Generalization_4015);
types.add(UMLElementTypes.InformationFlow_4016);
+ types.add(UMLElementTypes.TimeObservationEvent_4018);
+ types.add(UMLElementTypes.DurationObservationEvent_4019);
return types;
}
@@ -6207,7 +6213,8 @@ NamedElementEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -9126,6 +9133,12 @@ NamedElementEditPart {
if (relationshipType == UMLElementTypes.InformationFlow_4016) {
types.add(UMLElementTypes.Comment_3097);
}
+ if (relationshipType == UMLElementTypes.TimeObservationEvent_4018) {
+ types.add(UMLElementTypes.TimeObservation_2094);
+ }
+ if (relationshipType == UMLElementTypes.DurationObservationEvent_4019) {
+ types.add(UMLElementTypes.DurationObservation_2093);
+ }
return types;
}
diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/DataTypeEditPartCN.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/DataTypeEditPartCN.java
index e518c31a1ac..5af8bbdc1ae 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/DataTypeEditPartCN.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/DataTypeEditPartCN.java
@@ -154,7 +154,7 @@ NamedElementEditPart {
if (childEditPart instanceof DataTypeAttributeCompartmentEditPartCN) {
IFigure pane = getPrimaryShape().getAttributeCompartmentFigure();
setupContentPane(pane); // FIXME each comparment should handle his content pane in his
- // own way
+ // own way
pane.add(((DataTypeAttributeCompartmentEditPartCN) childEditPart).getFigure());
return true;
}
@@ -162,7 +162,7 @@ NamedElementEditPart {
if (childEditPart instanceof DataTypeOperationCompartmentEditPartCN) {
IFigure pane = getPrimaryShape().getOperationCompartmentFigure();
setupContentPane(pane); // FIXME each comparment should handle his content pane in his
- // own way
+ // own way
pane.add(((DataTypeOperationCompartmentEditPartCN) childEditPart).getFigure());
return true;
}
@@ -180,14 +180,14 @@ NamedElementEditPart {
if (childEditPart instanceof DataTypeAttributeCompartmentEditPartCN) {
IFigure pane = getPrimaryShape().getAttributeCompartmentFigure();
setupContentPane(pane); // FIXME each comparment should handle his content pane in his
- // own way
+ // own way
pane.remove(((DataTypeAttributeCompartmentEditPartCN) childEditPart).getFigure());
return true;
}
if (childEditPart instanceof DataTypeOperationCompartmentEditPartCN) {
IFigure pane = getPrimaryShape().getOperationCompartmentFigure();
setupContentPane(pane); // FIXME each comparment should handle his content pane in his
- // own way
+ // own way
pane.remove(((DataTypeOperationCompartmentEditPartCN) childEditPart).getFigure());
return true;
}
@@ -322,7 +322,8 @@ NamedElementEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -353,7 +354,8 @@ NamedElementEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -3264,7 +3266,8 @@ NamedElementEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -6174,7 +6177,8 @@ NamedElementEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -6194,6 +6198,8 @@ NamedElementEditPart {
types.add(UMLElementTypes.Dependency_4010);
types.add(UMLElementTypes.Generalization_4015);
types.add(UMLElementTypes.InformationFlow_4016);
+ types.add(UMLElementTypes.TimeObservationEvent_4018);
+ types.add(UMLElementTypes.DurationObservationEvent_4019);
return types;
}
@@ -6207,7 +6213,8 @@ NamedElementEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -9126,6 +9133,12 @@ NamedElementEditPart {
if (relationshipType == UMLElementTypes.InformationFlow_4016) {
types.add(UMLElementTypes.Comment_3097);
}
+ if (relationshipType == UMLElementTypes.TimeObservationEvent_4018) {
+ types.add(UMLElementTypes.TimeObservation_2094);
+ }
+ if (relationshipType == UMLElementTypes.DurationObservationEvent_4019) {
+ types.add(UMLElementTypes.DurationObservation_2093);
+ }
return types;
}
diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/DataTypeOperationCompartmentEditPart.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/DataTypeOperationCompartmentEditPart.java
index aa4e75007bd..ff2acde982e 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/DataTypeOperationCompartmentEditPart.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/DataTypeOperationCompartmentEditPart.java
@@ -14,8 +14,12 @@
package org.eclipse.papyrus.diagram.composite.edit.parts;
import org.eclipse.draw2d.IFigure;
+import org.eclipse.draw2d.geometry.Dimension;
+import org.eclipse.draw2d.geometry.Point;
+import org.eclipse.draw2d.geometry.Rectangle;
import org.eclipse.emf.common.notify.Notification;
import org.eclipse.gef.EditPolicy;
+import org.eclipse.gef.GraphicalEditPart;
import org.eclipse.gmf.runtime.diagram.ui.editparts.ListCompartmentEditPart;
import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CreationEditPolicy;
import org.eclipse.gmf.runtime.diagram.ui.editpolicies.DragDropEditPolicy;
@@ -23,6 +27,7 @@ import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableCompartmentEditPolicy;
import org.eclipse.gmf.runtime.diagram.ui.figures.ResizableCompartmentFigure;
import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;
+import org.eclipse.gmf.runtime.notation.NotationPackage;
import org.eclipse.gmf.runtime.notation.View;
import org.eclipse.papyrus.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy;
import org.eclipse.papyrus.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy;
@@ -32,7 +37,11 @@ import org.eclipse.papyrus.diagram.composite.part.Messages;
/**
* @generated
*/
-public class DataTypeOperationCompartmentEditPart extends ListCompartmentEditPart {
+public class DataTypeOperationCompartmentEditPart
+
+extends ListCompartmentEditPart
+
+{
/**
* @generated
@@ -91,4 +100,38 @@ public class DataTypeOperationCompartmentEditPart extends ListCompartmentEditPar
}
}
+ /**
+ * @generated
+ */
+ protected void handleNotificationEvent(Notification notification) {
+ Object feature = notification.getFeature();
+ if (NotationPackage.eINSTANCE.getSize_Width().equals(feature)
+ || NotationPackage.eINSTANCE.getSize_Height().equals(feature)
+ || NotationPackage.eINSTANCE.getLocation_X().equals(feature)
+ || NotationPackage.eINSTANCE.getLocation_Y().equals(feature)) {
+ refreshBounds();
+ }
+ super.handleNotificationEvent(notification);
+ }
+
+ /**
+ * @generated
+ */
+ protected void refreshBounds() {
+ int width = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();
+ int height = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();
+ Dimension size = new Dimension(width, height);
+ int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();
+ int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();
+ Point loc = new Point(x, y);
+ ((GraphicalEditPart) getParent()).setLayoutConstraint(this, getFigure(), new Rectangle(loc, size));
+ }
+
+ /**
+ * @generated
+ */
+ protected void refreshVisuals() {
+ super.refreshVisuals();
+ refreshBounds();
+ }
}
diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/DataTypeOperationCompartmentEditPartCN.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/DataTypeOperationCompartmentEditPartCN.java
index 59c443696bf..5e8223a0204 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/DataTypeOperationCompartmentEditPartCN.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/DataTypeOperationCompartmentEditPartCN.java
@@ -14,8 +14,12 @@
package org.eclipse.papyrus.diagram.composite.edit.parts;
import org.eclipse.draw2d.IFigure;
+import org.eclipse.draw2d.geometry.Dimension;
+import org.eclipse.draw2d.geometry.Point;
+import org.eclipse.draw2d.geometry.Rectangle;
import org.eclipse.emf.common.notify.Notification;
import org.eclipse.gef.EditPolicy;
+import org.eclipse.gef.GraphicalEditPart;
import org.eclipse.gmf.runtime.diagram.ui.editparts.ListCompartmentEditPart;
import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CreationEditPolicy;
import org.eclipse.gmf.runtime.diagram.ui.editpolicies.DragDropEditPolicy;
@@ -23,6 +27,7 @@ import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableCompartmentEditPolicy;
import org.eclipse.gmf.runtime.diagram.ui.figures.ResizableCompartmentFigure;
import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;
+import org.eclipse.gmf.runtime.notation.NotationPackage;
import org.eclipse.gmf.runtime.notation.View;
import org.eclipse.papyrus.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy;
import org.eclipse.papyrus.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy;
@@ -32,7 +37,11 @@ import org.eclipse.papyrus.diagram.composite.part.Messages;
/**
* @generated
*/
-public class DataTypeOperationCompartmentEditPartCN extends ListCompartmentEditPart {
+public class DataTypeOperationCompartmentEditPartCN
+
+extends ListCompartmentEditPart
+
+{
/**
* @generated
@@ -91,4 +100,38 @@ public class DataTypeOperationCompartmentEditPartCN extends ListCompartmentEditP
}
}
+ /**
+ * @generated
+ */
+ protected void handleNotificationEvent(Notification notification) {
+ Object feature = notification.getFeature();
+ if (NotationPackage.eINSTANCE.getSize_Width().equals(feature)
+ || NotationPackage.eINSTANCE.getSize_Height().equals(feature)
+ || NotationPackage.eINSTANCE.getLocation_X().equals(feature)
+ || NotationPackage.eINSTANCE.getLocation_Y().equals(feature)) {
+ refreshBounds();
+ }
+ super.handleNotificationEvent(notification);
+ }
+
+ /**
+ * @generated
+ */
+ protected void refreshBounds() {
+ int width = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();
+ int height = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();
+ Dimension size = new Dimension(width, height);
+ int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();
+ int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();
+ Point loc = new Point(x, y);
+ ((GraphicalEditPart) getParent()).setLayoutConstraint(this, getFigure(), new Rectangle(loc, size));
+ }
+
+ /**
+ * @generated
+ */
+ protected void refreshVisuals() {
+ super.refreshVisuals();
+ refreshBounds();
+ }
}
diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/DeploymentSpecificationEditPart.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/DeploymentSpecificationEditPart.java
index d96ec2e3694..8218d928fad 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/DeploymentSpecificationEditPart.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/DeploymentSpecificationEditPart.java
@@ -278,7 +278,8 @@ ShapeNodeEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -309,7 +310,8 @@ ShapeNodeEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -3220,7 +3222,8 @@ ShapeNodeEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -6130,7 +6133,8 @@ ShapeNodeEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -6150,6 +6154,8 @@ ShapeNodeEditPart {
types.add(UMLElementTypes.Dependency_4010);
types.add(UMLElementTypes.Generalization_4015);
types.add(UMLElementTypes.InformationFlow_4016);
+ types.add(UMLElementTypes.TimeObservationEvent_4018);
+ types.add(UMLElementTypes.DurationObservationEvent_4019);
return types;
}
@@ -6163,7 +6169,8 @@ ShapeNodeEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -9082,6 +9089,12 @@ ShapeNodeEditPart {
if (relationshipType == UMLElementTypes.InformationFlow_4016) {
types.add(UMLElementTypes.Comment_3097);
}
+ if (relationshipType == UMLElementTypes.TimeObservationEvent_4018) {
+ types.add(UMLElementTypes.TimeObservation_2094);
+ }
+ if (relationshipType == UMLElementTypes.DurationObservationEvent_4019) {
+ types.add(UMLElementTypes.DurationObservation_2093);
+ }
return types;
}
diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/DeploymentSpecificationEditPartCN.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/DeploymentSpecificationEditPartCN.java
index 247b16e193d..daf2abf639e 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/DeploymentSpecificationEditPartCN.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/DeploymentSpecificationEditPartCN.java
@@ -278,7 +278,8 @@ ShapeNodeEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -309,7 +310,8 @@ ShapeNodeEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -3220,7 +3222,8 @@ ShapeNodeEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -6130,7 +6133,8 @@ ShapeNodeEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -6150,6 +6154,8 @@ ShapeNodeEditPart {
types.add(UMLElementTypes.Dependency_4010);
types.add(UMLElementTypes.Generalization_4015);
types.add(UMLElementTypes.InformationFlow_4016);
+ types.add(UMLElementTypes.TimeObservationEvent_4018);
+ types.add(UMLElementTypes.DurationObservationEvent_4019);
return types;
}
@@ -6163,7 +6169,8 @@ ShapeNodeEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -9082,6 +9089,12 @@ ShapeNodeEditPart {
if (relationshipType == UMLElementTypes.InformationFlow_4016) {
types.add(UMLElementTypes.Comment_3097);
}
+ if (relationshipType == UMLElementTypes.TimeObservationEvent_4018) {
+ types.add(UMLElementTypes.TimeObservation_2094);
+ }
+ if (relationshipType == UMLElementTypes.DurationObservationEvent_4019) {
+ types.add(UMLElementTypes.DurationObservation_2093);
+ }
return types;
}
diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/DestructionEventEditPart.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/DestructionEventEditPart.java
index 1e66afae53b..dde2fdd909a 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/DestructionEventEditPart.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/DestructionEventEditPart.java
@@ -277,7 +277,8 @@ ShapeNodeEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -308,7 +309,8 @@ ShapeNodeEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -3219,7 +3221,8 @@ ShapeNodeEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -6129,7 +6132,8 @@ ShapeNodeEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -6149,6 +6153,8 @@ ShapeNodeEditPart {
types.add(UMLElementTypes.Dependency_4010);
types.add(UMLElementTypes.Generalization_4015);
types.add(UMLElementTypes.InformationFlow_4016);
+ types.add(UMLElementTypes.TimeObservationEvent_4018);
+ types.add(UMLElementTypes.DurationObservationEvent_4019);
return types;
}
@@ -6162,7 +6168,8 @@ ShapeNodeEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -9081,6 +9088,12 @@ ShapeNodeEditPart {
if (relationshipType == UMLElementTypes.InformationFlow_4016) {
types.add(UMLElementTypes.Comment_3097);
}
+ if (relationshipType == UMLElementTypes.TimeObservationEvent_4018) {
+ types.add(UMLElementTypes.TimeObservation_2094);
+ }
+ if (relationshipType == UMLElementTypes.DurationObservationEvent_4019) {
+ types.add(UMLElementTypes.DurationObservation_2093);
+ }
return types;
}
diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/DeviceCompositeCompartmentEditPart.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/DeviceCompositeCompartmentEditPart.java
index cda53a31310..3c47001fb69 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/DeviceCompositeCompartmentEditPart.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/DeviceCompositeCompartmentEditPart.java
@@ -14,7 +14,12 @@
package org.eclipse.papyrus.diagram.composite.edit.parts;
import org.eclipse.draw2d.IFigure;
+import org.eclipse.draw2d.geometry.Dimension;
+import org.eclipse.draw2d.geometry.Point;
+import org.eclipse.draw2d.geometry.Rectangle;
+import org.eclipse.emf.common.notify.Notification;
import org.eclipse.gef.EditPolicy;
+import org.eclipse.gef.GraphicalEditPart;
import org.eclipse.gmf.runtime.diagram.ui.editparts.ShapeCompartmentEditPart;
import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CreationEditPolicy;
import org.eclipse.gmf.runtime.diagram.ui.editpolicies.DragDropEditPolicy;
@@ -22,6 +27,7 @@ import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableCompartmentEditPolicy;
import org.eclipse.gmf.runtime.diagram.ui.figures.ResizableCompartmentFigure;
import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;
+import org.eclipse.gmf.runtime.notation.NotationPackage;
import org.eclipse.gmf.runtime.notation.View;
import org.eclipse.papyrus.diagram.common.editpolicies.CustomContainerEditPolicy;
import org.eclipse.papyrus.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy;
@@ -32,7 +38,11 @@ import org.eclipse.papyrus.diagram.composite.part.Messages;
/**
* @generated
*/
-public class DeviceCompositeCompartmentEditPart extends ShapeCompartmentEditPart {
+public class DeviceCompositeCompartmentEditPart
+
+extends ShapeCompartmentEditPart
+
+{
/**
* @generated
@@ -85,4 +95,38 @@ public class DeviceCompositeCompartmentEditPart extends ShapeCompartmentEditPart
}
}
+ /**
+ * @generated
+ */
+ protected void handleNotificationEvent(Notification notification) {
+ Object feature = notification.getFeature();
+ if (NotationPackage.eINSTANCE.getSize_Width().equals(feature)
+ || NotationPackage.eINSTANCE.getSize_Height().equals(feature)
+ || NotationPackage.eINSTANCE.getLocation_X().equals(feature)
+ || NotationPackage.eINSTANCE.getLocation_Y().equals(feature)) {
+ refreshBounds();
+ }
+ super.handleNotificationEvent(notification);
+ }
+
+ /**
+ * @generated
+ */
+ protected void refreshBounds() {
+ int width = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();
+ int height = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();
+ Dimension size = new Dimension(width, height);
+ int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();
+ int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();
+ Point loc = new Point(x, y);
+ ((GraphicalEditPart) getParent()).setLayoutConstraint(this, getFigure(), new Rectangle(loc, size));
+ }
+
+ /**
+ * @generated
+ */
+ protected void refreshVisuals() {
+ super.refreshVisuals();
+ refreshBounds();
+ }
}
diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/DeviceCompositeCompartmentEditPartCN.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/DeviceCompositeCompartmentEditPartCN.java
index 47d16e2565c..798f519189a 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/DeviceCompositeCompartmentEditPartCN.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/DeviceCompositeCompartmentEditPartCN.java
@@ -14,7 +14,12 @@
package org.eclipse.papyrus.diagram.composite.edit.parts;
import org.eclipse.draw2d.IFigure;
+import org.eclipse.draw2d.geometry.Dimension;
+import org.eclipse.draw2d.geometry.Point;
+import org.eclipse.draw2d.geometry.Rectangle;
+import org.eclipse.emf.common.notify.Notification;
import org.eclipse.gef.EditPolicy;
+import org.eclipse.gef.GraphicalEditPart;
import org.eclipse.gmf.runtime.diagram.ui.editparts.ShapeCompartmentEditPart;
import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CreationEditPolicy;
import org.eclipse.gmf.runtime.diagram.ui.editpolicies.DragDropEditPolicy;
@@ -22,6 +27,7 @@ import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableCompartmentEditPolicy;
import org.eclipse.gmf.runtime.diagram.ui.figures.ResizableCompartmentFigure;
import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;
+import org.eclipse.gmf.runtime.notation.NotationPackage;
import org.eclipse.gmf.runtime.notation.View;
import org.eclipse.papyrus.diagram.common.editpolicies.CustomContainerEditPolicy;
import org.eclipse.papyrus.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy;
@@ -32,7 +38,11 @@ import org.eclipse.papyrus.diagram.composite.part.Messages;
/**
* @generated
*/
-public class DeviceCompositeCompartmentEditPartCN extends ShapeCompartmentEditPart {
+public class DeviceCompositeCompartmentEditPartCN
+
+extends ShapeCompartmentEditPart
+
+{
/**
* @generated
@@ -85,4 +95,38 @@ public class DeviceCompositeCompartmentEditPartCN extends ShapeCompartmentEditPa
}
}
+ /**
+ * @generated
+ */
+ protected void handleNotificationEvent(Notification notification) {
+ Object feature = notification.getFeature();
+ if (NotationPackage.eINSTANCE.getSize_Width().equals(feature)
+ || NotationPackage.eINSTANCE.getSize_Height().equals(feature)
+ || NotationPackage.eINSTANCE.getLocation_X().equals(feature)
+ || NotationPackage.eINSTANCE.getLocation_Y().equals(feature)) {
+ refreshBounds();
+ }
+ super.handleNotificationEvent(notification);
+ }
+
+ /**
+ * @generated
+ */
+ protected void refreshBounds() {
+ int width = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();
+ int height = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();
+ Dimension size = new Dimension(width, height);
+ int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();
+ int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();
+ Point loc = new Point(x, y);
+ ((GraphicalEditPart) getParent()).setLayoutConstraint(this, getFigure(), new Rectangle(loc, size));
+ }
+
+ /**
+ * @generated
+ */
+ protected void refreshVisuals() {
+ super.refreshVisuals();
+ refreshBounds();
+ }
}
diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/DeviceCompositeEditPart.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/DeviceCompositeEditPart.java
index edb5d40efe2..d3d5c42cfcc 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/DeviceCompositeEditPart.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/DeviceCompositeEditPart.java
@@ -168,7 +168,7 @@ NamedElementEditPart {
if (childEditPart instanceof DeviceCompositeCompartmentEditPart) {
IFigure pane = getPrimaryShape().getCompositeCompartmentFigure();
setupContentPane(pane); // FIXME each comparment should handle his content pane in his
- // own way
+ // own way
pane.add(((DeviceCompositeCompartmentEditPart) childEditPart).getFigure());
return true;
}
@@ -193,7 +193,7 @@ NamedElementEditPart {
if (childEditPart instanceof DeviceCompositeCompartmentEditPart) {
IFigure pane = getPrimaryShape().getCompositeCompartmentFigure();
setupContentPane(pane); // FIXME each comparment should handle his content pane in his
- // own way
+ // own way
pane.remove(((DeviceCompositeCompartmentEditPart) childEditPart).getFigure());
return true;
}
@@ -332,7 +332,8 @@ NamedElementEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -363,7 +364,8 @@ NamedElementEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -3274,7 +3276,8 @@ NamedElementEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -6184,7 +6187,8 @@ NamedElementEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -6204,6 +6208,8 @@ NamedElementEditPart {
types.add(UMLElementTypes.Dependency_4010);
types.add(UMLElementTypes.Generalization_4015);
types.add(UMLElementTypes.InformationFlow_4016);
+ types.add(UMLElementTypes.TimeObservationEvent_4018);
+ types.add(UMLElementTypes.DurationObservationEvent_4019);
return types;
}
@@ -6217,7 +6223,8 @@ NamedElementEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -9136,6 +9143,12 @@ NamedElementEditPart {
if (relationshipType == UMLElementTypes.InformationFlow_4016) {
types.add(UMLElementTypes.Comment_3097);
}
+ if (relationshipType == UMLElementTypes.TimeObservationEvent_4018) {
+ types.add(UMLElementTypes.TimeObservation_2094);
+ }
+ if (relationshipType == UMLElementTypes.DurationObservationEvent_4019) {
+ types.add(UMLElementTypes.DurationObservation_2093);
+ }
return types;
}
diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/DeviceCompositeEditPartCN.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/DeviceCompositeEditPartCN.java
index 3d14bce8ca4..946bb67b879 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/DeviceCompositeEditPartCN.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/DeviceCompositeEditPartCN.java
@@ -168,7 +168,7 @@ NamedElementEditPart {
if (childEditPart instanceof DeviceCompositeCompartmentEditPartCN) {
IFigure pane = getPrimaryShape().getCompositeCompartmentFigure();
setupContentPane(pane); // FIXME each comparment should handle his content pane in his
- // own way
+ // own way
pane.add(((DeviceCompositeCompartmentEditPartCN) childEditPart).getFigure());
return true;
}
@@ -193,7 +193,7 @@ NamedElementEditPart {
if (childEditPart instanceof DeviceCompositeCompartmentEditPartCN) {
IFigure pane = getPrimaryShape().getCompositeCompartmentFigure();
setupContentPane(pane); // FIXME each comparment should handle his content pane in his
- // own way
+ // own way
pane.remove(((DeviceCompositeCompartmentEditPartCN) childEditPart).getFigure());
return true;
}
@@ -332,7 +332,8 @@ NamedElementEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -363,7 +364,8 @@ NamedElementEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -3274,7 +3276,8 @@ NamedElementEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -6184,7 +6187,8 @@ NamedElementEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -6204,6 +6208,8 @@ NamedElementEditPart {
types.add(UMLElementTypes.Dependency_4010);
types.add(UMLElementTypes.Generalization_4015);
types.add(UMLElementTypes.InformationFlow_4016);
+ types.add(UMLElementTypes.TimeObservationEvent_4018);
+ types.add(UMLElementTypes.DurationObservationEvent_4019);
return types;
}
@@ -6217,7 +6223,8 @@ NamedElementEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -9136,6 +9143,12 @@ NamedElementEditPart {
if (relationshipType == UMLElementTypes.InformationFlow_4016) {
types.add(UMLElementTypes.Comment_3097);
}
+ if (relationshipType == UMLElementTypes.TimeObservationEvent_4018) {
+ types.add(UMLElementTypes.TimeObservation_2094);
+ }
+ if (relationshipType == UMLElementTypes.DurationObservationEvent_4019) {
+ types.add(UMLElementTypes.DurationObservation_2093);
+ }
return types;
}
diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/DurationConstraintEditPart.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/DurationConstraintEditPart.java
index e91e19a656b..ba85ff8c2d0 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/DurationConstraintEditPart.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/DurationConstraintEditPart.java
@@ -277,7 +277,8 @@ ShapeNodeEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -309,7 +310,8 @@ ShapeNodeEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -3466,7 +3468,8 @@ ShapeNodeEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -6622,7 +6625,8 @@ ShapeNodeEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -6642,6 +6646,8 @@ ShapeNodeEditPart {
types.add(UMLElementTypes.Dependency_4010);
types.add(UMLElementTypes.Generalization_4015);
types.add(UMLElementTypes.InformationFlow_4016);
+ types.add(UMLElementTypes.TimeObservationEvent_4018);
+ types.add(UMLElementTypes.DurationObservationEvent_4019);
return types;
}
@@ -6655,7 +6661,8 @@ ShapeNodeEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -9574,6 +9581,12 @@ ShapeNodeEditPart {
if (relationshipType == UMLElementTypes.InformationFlow_4016) {
types.add(UMLElementTypes.Comment_3097);
}
+ if (relationshipType == UMLElementTypes.TimeObservationEvent_4018) {
+ types.add(UMLElementTypes.TimeObservation_2094);
+ }
+ if (relationshipType == UMLElementTypes.DurationObservationEvent_4019) {
+ types.add(UMLElementTypes.DurationObservation_2093);
+ }
return types;
}
diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/DurationEditPart.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/DurationEditPart.java
index b9ecc38853e..ba2e19ecdb6 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/DurationEditPart.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/DurationEditPart.java
@@ -277,7 +277,8 @@ ShapeNodeEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -308,7 +309,8 @@ ShapeNodeEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -3219,7 +3221,8 @@ ShapeNodeEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -6129,7 +6132,8 @@ ShapeNodeEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -6149,6 +6153,8 @@ ShapeNodeEditPart {
types.add(UMLElementTypes.Dependency_4010);
types.add(UMLElementTypes.Generalization_4015);
types.add(UMLElementTypes.InformationFlow_4016);
+ types.add(UMLElementTypes.TimeObservationEvent_4018);
+ types.add(UMLElementTypes.DurationObservationEvent_4019);
return types;
}
@@ -6162,7 +6168,8 @@ ShapeNodeEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -9081,6 +9088,12 @@ ShapeNodeEditPart {
if (relationshipType == UMLElementTypes.InformationFlow_4016) {
types.add(UMLElementTypes.Comment_3097);
}
+ if (relationshipType == UMLElementTypes.TimeObservationEvent_4018) {
+ types.add(UMLElementTypes.TimeObservation_2094);
+ }
+ if (relationshipType == UMLElementTypes.DurationObservationEvent_4019) {
+ types.add(UMLElementTypes.DurationObservation_2093);
+ }
return types;
}
diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/DurationIntervalEditPart.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/DurationIntervalEditPart.java
index d4fde5e8f4e..36cf5d12ec2 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/DurationIntervalEditPart.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/DurationIntervalEditPart.java
@@ -277,7 +277,8 @@ ShapeNodeEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -308,7 +309,8 @@ ShapeNodeEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -3219,7 +3221,8 @@ ShapeNodeEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -6129,7 +6132,8 @@ ShapeNodeEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -6149,6 +6153,8 @@ ShapeNodeEditPart {
types.add(UMLElementTypes.Dependency_4010);
types.add(UMLElementTypes.Generalization_4015);
types.add(UMLElementTypes.InformationFlow_4016);
+ types.add(UMLElementTypes.TimeObservationEvent_4018);
+ types.add(UMLElementTypes.DurationObservationEvent_4019);
return types;
}
@@ -6162,7 +6168,8 @@ ShapeNodeEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -9081,6 +9088,12 @@ ShapeNodeEditPart {
if (relationshipType == UMLElementTypes.InformationFlow_4016) {
types.add(UMLElementTypes.Comment_3097);
}
+ if (relationshipType == UMLElementTypes.TimeObservationEvent_4018) {
+ types.add(UMLElementTypes.TimeObservation_2094);
+ }
+ if (relationshipType == UMLElementTypes.DurationObservationEvent_4019) {
+ types.add(UMLElementTypes.DurationObservation_2093);
+ }
return types;
}
diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/DurationObservationEditPart.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/DurationObservationEditPart.java
index 2491ef07b54..4160b07f584 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/DurationObservationEditPart.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/DurationObservationEditPart.java
@@ -14,27 +14,31 @@
package org.eclipse.papyrus.diagram.composite.edit.parts;
import java.util.ArrayList;
+import java.util.Collections;
import java.util.List;
-import org.eclipse.draw2d.ColorConstants;
import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.RectangleFigure;
+import org.eclipse.draw2d.PositionConstants;
import org.eclipse.draw2d.Shape;
import org.eclipse.draw2d.StackLayout;
+import org.eclipse.draw2d.geometry.Dimension;
+import org.eclipse.emf.common.notify.Notification;
import org.eclipse.emf.ecore.EStructuralFeature;
import org.eclipse.gef.EditPart;
import org.eclipse.gef.EditPolicy;
+import org.eclipse.gef.GraphicalEditPart;
import org.eclipse.gef.Request;
import org.eclipse.gef.commands.Command;
import org.eclipse.gef.editpolicies.LayoutEditPolicy;
import org.eclipse.gef.editpolicies.NonResizableEditPolicy;
+import org.eclipse.gef.handles.MoveHandle;
import org.eclipse.gef.requests.CreateRequest;
+import org.eclipse.gmf.runtime.diagram.ui.editparts.IBorderItemEditPart;
import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ShapeNodeEditPart;
+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.BorderItemSelectionEditPolicy;
import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;
+import org.eclipse.gmf.runtime.diagram.ui.figures.BorderItemLocator;
import org.eclipse.gmf.runtime.draw2d.ui.figures.FigureUtilities;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;
import org.eclipse.gmf.runtime.emf.type.core.IElementType;
import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure;
import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;
@@ -42,22 +46,24 @@ import org.eclipse.gmf.runtime.notation.NotationPackage;
import org.eclipse.gmf.runtime.notation.View;
import org.eclipse.jface.preference.IPreferenceStore;
import org.eclipse.jface.preference.PreferenceConverter;
+import org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeIconlDisplayEditPolicy;
+import org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;
+import org.eclipse.papyrus.diagram.composite.custom.edit.parts.AbstractObservationEditPart;
+import org.eclipse.papyrus.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy;
+import org.eclipse.papyrus.diagram.composite.custom.figures.DurationObservationNodeFigure;
import org.eclipse.papyrus.diagram.composite.edit.policies.DurationObservationItemSemanticEditPolicy;
import org.eclipse.papyrus.diagram.composite.part.UMLVisualIDRegistry;
import org.eclipse.papyrus.diagram.composite.providers.UMLElementTypes;
import org.eclipse.papyrus.preferences.utils.GradientPreferenceConverter;
import org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper;
-import org.eclipse.swt.SWT;
import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.Font;
-import org.eclipse.swt.widgets.Display;
/**
* @generated
*/
public class DurationObservationEditPart extends
-ShapeNodeEditPart {
+AbstractObservationEditPart {
/**
* @generated
@@ -88,18 +94,44 @@ ShapeNodeEditPart {
super.createDefaultEditPolicies();
installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DurationObservationItemSemanticEditPolicy());
installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());
+ installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY,
+ new AppliedStereotypeIconlDisplayEditPolicy());
+ installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());
// XXX need an SCR to runtime to have another abstract superclass that would let children
// add reasonable editpolicies
// removeEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CONNECTION_HANDLES_ROLE);
}
/**
+ *Papyrus codeGen
+ *
+ * @generated
+ **/
+ protected void handleNotificationEvent(Notification event) {
+ super.handleNotificationEvent(event);
+
+ }
+
+ /**
* @generated
*/
protected LayoutEditPolicy createLayoutEditPolicy() {
LayoutEditPolicy lep = new LayoutEditPolicy() {
protected EditPolicy createChildEditPolicy(EditPart child) {
+ View childView = (View) child.getModel();
+ switch (UMLVisualIDRegistry.getVisualID(childView)) {
+ case DurationObservationNameEditPart.VISUAL_ID:
+ case DurationObservationStereotypeLabelEditPart.VISUAL_ID:
+ return new BorderItemSelectionEditPolicy() {
+
+ protected List createSelectionHandles() {
+ MoveHandle mh = new MoveHandle((GraphicalEditPart) getHost());
+ mh.setBorder(null);
+ return Collections.singletonList(mh);
+ }
+ };
+ }
EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
if (result == null) {
result = new NonResizableEditPolicy();
@@ -122,64 +154,28 @@ ShapeNodeEditPart {
* @generated
*/
protected IFigure createNodeShape() {
- NamedElementDescriptor figure = new NamedElementDescriptor();
- return primaryShape = figure;
- }
-
- /**
- * @generated
- */
- public NamedElementDescriptor getPrimaryShape() {
- return (NamedElementDescriptor) primaryShape;
- }
-
- /**
- * @generated
- */
- protected boolean addFixedChild(EditPart childEditPart) {
- if (childEditPart instanceof DurationObservationNameEditPart) {
- ((DurationObservationNameEditPart) childEditPart).setLabel(getPrimaryShape().getNamedElementNameLabel());
- return true;
- }
-
- return false;
- }
-
- /**
- * @generated
- */
- protected boolean removeFixedChild(EditPart childEditPart) {
- if (childEditPart instanceof DurationObservationNameEditPart) {
- return true;
- }
- return false;
+ return primaryShape = new DurationObservationNodeFigure();
}
/**
* @generated
*/
- protected void addChildVisual(EditPart childEditPart, int index) {
- if (addFixedChild(childEditPart)) {
- return;
- }
- super.addChildVisual(childEditPart, -1);
+ public DurationObservationNodeFigure getPrimaryShape() {
+ return (DurationObservationNodeFigure) primaryShape;
}
/**
* @generated
*/
- protected void removeChildVisual(EditPart childEditPart) {
- if (removeFixedChild(childEditPart)) {
- return;
+ protected void addBorderItem(IFigure borderItemContainer, IBorderItemEditPart borderItemEditPart) {
+ if (borderItemEditPart instanceof DurationObservationNameEditPart
+ || borderItemEditPart instanceof DurationObservationStereotypeLabelEditPart) {
+ BorderItemLocator locator = new BorderItemLocator(getMainFigure(), PositionConstants.SOUTH);
+ locator.setBorderItemOffset(new Dimension(-20, -20));
+ borderItemContainer.add(borderItemEditPart.getFigure(), locator);
+ } else {
+ super.addBorderItem(borderItemContainer, borderItemEditPart);
}
- super.removeChildVisual(childEditPart);
- }
-
- /**
- * @generated
- */
- protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {
- return getContentPane();
}
/**
@@ -198,7 +194,7 @@ ShapeNodeEditPart {
*
* @generated
*/
- protected NodeFigure createNodeFigure() {
+ protected NodeFigure createMainFigure() {
NodeFigure figure = createNodePlate();
figure.setLayoutManager(new StackLayout());
IFigure shape = createNodeShape();
@@ -216,11 +212,6 @@ ShapeNodeEditPart {
* @generated
*/
protected IFigure setupContentPane(IFigure nodeShape) {
- if (nodeShape.getLayoutManager() == null) {
- ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout();
- layout.setSpacing(5);
- nodeShape.setLayoutManager(layout);
- }
return nodeShape; // use nodeShape itself as contentPane
}
@@ -277,7 +268,8 @@ ShapeNodeEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -295,6 +287,7 @@ ShapeNodeEditPart {
types.add(UMLElementTypes.Dependency_4010);
types.add(UMLElementTypes.Generalization_4015);
types.add(UMLElementTypes.InformationFlow_4016);
+ types.add(UMLElementTypes.DurationObservationEvent_4019);
return types;
}
@@ -308,7 +301,8 @@ ShapeNodeEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -3206,6 +3200,246 @@ ShapeNodeEditPart {
if (targetEditPart instanceof CommentEditPartCN) {
types.add(UMLElementTypes.InformationFlow_4016);
}
+ if (targetEditPart instanceof ActivityCompositeEditPart) {
+ types.add(UMLElementTypes.DurationObservationEvent_4019);
+ }
+ if (targetEditPart instanceof InteractionCompositeEditPart) {
+ types.add(UMLElementTypes.DurationObservationEvent_4019);
+ }
+ if (targetEditPart instanceof ProtocolStateMachineCompositeEditPart) {
+ types.add(UMLElementTypes.DurationObservationEvent_4019);
+ }
+ if (targetEditPart instanceof StateMachineCompositeEditPart) {
+ types.add(UMLElementTypes.DurationObservationEvent_4019);
+ }
+ if (targetEditPart instanceof FunctionBehaviorCompositeEditPart) {
+ types.add(UMLElementTypes.DurationObservationEvent_4019);
+ }
+ if (targetEditPart instanceof OpaqueBehaviorCompositeEditPart) {
+ types.add(UMLElementTypes.DurationObservationEvent_4019);
+ }
+ if (targetEditPart instanceof ComponentCompositeEditPart) {
+ types.add(UMLElementTypes.DurationObservationEvent_4019);
+ }
+ if (targetEditPart instanceof DeviceCompositeEditPart) {
+ types.add(UMLElementTypes.DurationObservationEvent_4019);
+ }
+ if (targetEditPart instanceof ExecutionEnvironmentCompositeEditPart) {
+ types.add(UMLElementTypes.DurationObservationEvent_4019);
+ }
+ if (targetEditPart instanceof NodeCompositeEditPart) {
+ types.add(UMLElementTypes.DurationObservationEvent_4019);
+ }
+ if (targetEditPart instanceof ClassCompositeEditPart) {
+ types.add(UMLElementTypes.DurationObservationEvent_4019);
+ }
+ if (targetEditPart instanceof ClassClassifierEditPart) {
+ types.add(UMLElementTypes.DurationObservationEvent_4019);
+ }
+ if (targetEditPart instanceof CollaborationCompositeEditPart) {
+ types.add(UMLElementTypes.DurationObservationEvent_4019);
+ }
+ if (targetEditPart instanceof InterfaceEditPart) {
+ types.add(UMLElementTypes.DurationObservationEvent_4019);
+ }
+ if (targetEditPart instanceof PrimitiveTypeEditPart) {
+ types.add(UMLElementTypes.DurationObservationEvent_4019);
+ }
+ if (targetEditPart instanceof EnumerationEditPart) {
+ types.add(UMLElementTypes.DurationObservationEvent_4019);
+ }
+ if (targetEditPart instanceof DataTypeEditPart) {
+ types.add(UMLElementTypes.DurationObservationEvent_4019);
+ }
+ if (targetEditPart instanceof ActorEditPart) {
+ types.add(UMLElementTypes.DurationObservationEvent_4019);
+ }
+ if (targetEditPart instanceof DeploymentSpecificationEditPart) {
+ types.add(UMLElementTypes.DurationObservationEvent_4019);
+ }
+ if (targetEditPart instanceof ArtifactEditPart) {
+ types.add(UMLElementTypes.DurationObservationEvent_4019);
+ }
+ if (targetEditPart instanceof InformationItemEditPart) {
+ types.add(UMLElementTypes.DurationObservationEvent_4019);
+ }
+ if (targetEditPart instanceof SignalEditPart) {
+ types.add(UMLElementTypes.DurationObservationEvent_4019);
+ }
+ if (targetEditPart instanceof UseCaseEditPart) {
+ types.add(UMLElementTypes.DurationObservationEvent_4019);
+ }
+ if (targetEditPart instanceof SignalEventEditPart) {
+ types.add(UMLElementTypes.DurationObservationEvent_4019);
+ }
+ if (targetEditPart instanceof CallEventEditPart) {
+ types.add(UMLElementTypes.DurationObservationEvent_4019);
+ }
+ if (targetEditPart instanceof AnyReceiveEventEditPart) {
+ types.add(UMLElementTypes.DurationObservationEvent_4019);
+ }
+ if (targetEditPart instanceof SendSignalEventEditPart) {
+ types.add(UMLElementTypes.DurationObservationEvent_4019);
+ }
+ if (targetEditPart instanceof SendOperationEventEditPart) {
+ types.add(UMLElementTypes.DurationObservationEvent_4019);
+ }
+ if (targetEditPart instanceof ChangeEventEditPart) {
+ types.add(UMLElementTypes.DurationObservationEvent_4019);
+ }
+ if (targetEditPart instanceof TimeEventEditPart) {
+ types.add(UMLElementTypes.DurationObservationEvent_4019);
+ }
+ if (targetEditPart instanceof CreationEventEditPart) {
+ types.add(UMLElementTypes.DurationObservationEvent_4019);
+ }
+ if (targetEditPart instanceof DestructionEventEditPart) {
+ types.add(UMLElementTypes.DurationObservationEvent_4019);
+ }
+ if (targetEditPart instanceof ExecutionEventEditPart) {
+ types.add(UMLElementTypes.DurationObservationEvent_4019);
+ }
+ if (targetEditPart instanceof org.eclipse.papyrus.diagram.composite.edit.parts.DurationObservationEditPart) {
+ types.add(UMLElementTypes.DurationObservationEvent_4019);
+ }
+ if (targetEditPart instanceof TimeObservationEditPart) {
+ types.add(UMLElementTypes.DurationObservationEvent_4019);
+ }
+ if (targetEditPart instanceof LiteralBooleanEditPart) {
+ types.add(UMLElementTypes.DurationObservationEvent_4019);
+ }
+ if (targetEditPart instanceof LiteralIntegerEditPart) {
+ types.add(UMLElementTypes.DurationObservationEvent_4019);
+ }
+ if (targetEditPart instanceof LiteralNullEditPart) {
+ types.add(UMLElementTypes.DurationObservationEvent_4019);
+ }
+ if (targetEditPart instanceof LiteralStringEditPart) {
+ types.add(UMLElementTypes.DurationObservationEvent_4019);
+ }
+ if (targetEditPart instanceof LiteralUnlimitedNaturalEditPart) {
+ types.add(UMLElementTypes.DurationObservationEvent_4019);
+ }
+ if (targetEditPart instanceof StringExpressionEditPart) {
+ types.add(UMLElementTypes.DurationObservationEvent_4019);
+ }
+ if (targetEditPart instanceof OpaqueExpressionEditPart) {
+ types.add(UMLElementTypes.DurationObservationEvent_4019);
+ }
+ if (targetEditPart instanceof TimeExpressionEditPart) {
+ types.add(UMLElementTypes.DurationObservationEvent_4019);
+ }
+ if (targetEditPart instanceof ExpressionEditPart) {
+ types.add(UMLElementTypes.DurationObservationEvent_4019);
+ }
+ if (targetEditPart instanceof DurationEditPart) {
+ types.add(UMLElementTypes.DurationObservationEvent_4019);
+ }
+ if (targetEditPart instanceof TimeIntervalEditPart) {
+ types.add(UMLElementTypes.DurationObservationEvent_4019);
+ }
+ if (targetEditPart instanceof DurationIntervalEditPart) {
+ types.add(UMLElementTypes.DurationObservationEvent_4019);
+ }
+ if (targetEditPart instanceof IntervalEditPart) {
+ types.add(UMLElementTypes.DurationObservationEvent_4019);
+ }
+ if (targetEditPart instanceof InstanceValueEditPart) {
+ types.add(UMLElementTypes.DurationObservationEvent_4019);
+ }
+ if (targetEditPart instanceof DurationConstraintEditPart) {
+ types.add(UMLElementTypes.DurationObservationEvent_4019);
+ }
+ if (targetEditPart instanceof TimeConstraintEditPart) {
+ types.add(UMLElementTypes.DurationObservationEvent_4019);
+ }
+ if (targetEditPart instanceof IntervalConstraintEditPart) {
+ types.add(UMLElementTypes.DurationObservationEvent_4019);
+ }
+ if (targetEditPart instanceof InteractionConstraintEditPart) {
+ types.add(UMLElementTypes.DurationObservationEvent_4019);
+ }
+ if (targetEditPart instanceof ConstraintEditPart) {
+ types.add(UMLElementTypes.DurationObservationEvent_4019);
+ }
+ if (targetEditPart instanceof PortEditPart) {
+ types.add(UMLElementTypes.DurationObservationEvent_4019);
+ }
+ if (targetEditPart instanceof PropertyPartEditPartCN) {
+ types.add(UMLElementTypes.DurationObservationEvent_4019);
+ }
+ if (targetEditPart instanceof CollaborationRoleEditPartCN) {
+ types.add(UMLElementTypes.DurationObservationEvent_4019);
+ }
+ if (targetEditPart instanceof CollaborationUseEditPartCN) {
+ types.add(UMLElementTypes.DurationObservationEvent_4019);
+ }
+ if (targetEditPart instanceof ActivityCompositeEditPartCN) {
+ types.add(UMLElementTypes.DurationObservationEvent_4019);
+ }
+ if (targetEditPart instanceof InteractionCompositeEditPartCN) {
+ types.add(UMLElementTypes.DurationObservationEvent_4019);
+ }
+ if (targetEditPart instanceof ProtocolStateMachineCompositeEditPartCN) {
+ types.add(UMLElementTypes.DurationObservationEvent_4019);
+ }
+ if (targetEditPart instanceof StateMachineCompositeEditPartCN) {
+ types.add(UMLElementTypes.DurationObservationEvent_4019);
+ }
+ if (targetEditPart instanceof FunctionBehaviorCompositeEditPartCN) {
+ types.add(UMLElementTypes.DurationObservationEvent_4019);
+ }
+ if (targetEditPart instanceof OpaqueBehaviorCompositeEditPartCN) {
+ types.add(UMLElementTypes.DurationObservationEvent_4019);
+ }
+ if (targetEditPart instanceof ComponentCompositeEditPartCN) {
+ types.add(UMLElementTypes.DurationObservationEvent_4019);
+ }
+ if (targetEditPart instanceof DeviceCompositeEditPartCN) {
+ types.add(UMLElementTypes.DurationObservationEvent_4019);
+ }
+ if (targetEditPart instanceof ExecutionEnvironmentCompositeEditPartCN) {
+ types.add(UMLElementTypes.DurationObservationEvent_4019);
+ }
+ if (targetEditPart instanceof NodeCompositeEditPartCN) {
+ types.add(UMLElementTypes.DurationObservationEvent_4019);
+ }
+ if (targetEditPart instanceof ClassCompositeEditPartCN) {
+ types.add(UMLElementTypes.DurationObservationEvent_4019);
+ }
+ if (targetEditPart instanceof CollaborationCompositeEditPartCN) {
+ types.add(UMLElementTypes.DurationObservationEvent_4019);
+ }
+ if (targetEditPart instanceof InterfaceEditPartCN) {
+ types.add(UMLElementTypes.DurationObservationEvent_4019);
+ }
+ if (targetEditPart instanceof PrimitiveTypeEditPartCN) {
+ types.add(UMLElementTypes.DurationObservationEvent_4019);
+ }
+ if (targetEditPart instanceof EnumerationEditPartCN) {
+ types.add(UMLElementTypes.DurationObservationEvent_4019);
+ }
+ if (targetEditPart instanceof DataTypeEditPartCN) {
+ types.add(UMLElementTypes.DurationObservationEvent_4019);
+ }
+ if (targetEditPart instanceof ActorEditPartCN) {
+ types.add(UMLElementTypes.DurationObservationEvent_4019);
+ }
+ if (targetEditPart instanceof DeploymentSpecificationEditPartCN) {
+ types.add(UMLElementTypes.DurationObservationEvent_4019);
+ }
+ if (targetEditPart instanceof ArtifactEditPartCN) {
+ types.add(UMLElementTypes.DurationObservationEvent_4019);
+ }
+ if (targetEditPart instanceof InformationItemEditPartCN) {
+ types.add(UMLElementTypes.DurationObservationEvent_4019);
+ }
+ if (targetEditPart instanceof SignalEditPartCN) {
+ types.add(UMLElementTypes.DurationObservationEvent_4019);
+ }
+ if (targetEditPart instanceof UseCaseEditPartCN) {
+ types.add(UMLElementTypes.DurationObservationEvent_4019);
+ }
return types;
}
@@ -3219,7 +3453,8 @@ ShapeNodeEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -6117,6 +6352,246 @@ ShapeNodeEditPart {
if (relationshipType == UMLElementTypes.InformationFlow_4016) {
types.add(UMLElementTypes.Comment_3097);
}
+ if (relationshipType == UMLElementTypes.DurationObservationEvent_4019) {
+ types.add(UMLElementTypes.Activity_2060);
+ }
+ if (relationshipType == UMLElementTypes.DurationObservationEvent_4019) {
+ types.add(UMLElementTypes.Interaction_2061);
+ }
+ if (relationshipType == UMLElementTypes.DurationObservationEvent_4019) {
+ types.add(UMLElementTypes.ProtocolStateMachine_2062);
+ }
+ if (relationshipType == UMLElementTypes.DurationObservationEvent_4019) {
+ types.add(UMLElementTypes.StateMachine_2063);
+ }
+ if (relationshipType == UMLElementTypes.DurationObservationEvent_4019) {
+ types.add(UMLElementTypes.FunctionBehavior_2064);
+ }
+ if (relationshipType == UMLElementTypes.DurationObservationEvent_4019) {
+ types.add(UMLElementTypes.OpaqueBehavior_2065);
+ }
+ if (relationshipType == UMLElementTypes.DurationObservationEvent_4019) {
+ types.add(UMLElementTypes.Component_2069);
+ }
+ if (relationshipType == UMLElementTypes.DurationObservationEvent_4019) {
+ types.add(UMLElementTypes.Device_2070);
+ }
+ if (relationshipType == UMLElementTypes.DurationObservationEvent_4019) {
+ types.add(UMLElementTypes.ExecutionEnvironment_2071);
+ }
+ if (relationshipType == UMLElementTypes.DurationObservationEvent_4019) {
+ types.add(UMLElementTypes.Node_2072);
+ }
+ if (relationshipType == UMLElementTypes.DurationObservationEvent_4019) {
+ types.add(UMLElementTypes.Class_2073);
+ }
+ if (relationshipType == UMLElementTypes.DurationObservationEvent_4019) {
+ types.add(UMLElementTypes.Class_2074);
+ }
+ if (relationshipType == UMLElementTypes.DurationObservationEvent_4019) {
+ types.add(UMLElementTypes.Collaboration_2075);
+ }
+ if (relationshipType == UMLElementTypes.DurationObservationEvent_4019) {
+ types.add(UMLElementTypes.Interface_2076);
+ }
+ if (relationshipType == UMLElementTypes.DurationObservationEvent_4019) {
+ types.add(UMLElementTypes.PrimitiveType_2066);
+ }
+ if (relationshipType == UMLElementTypes.DurationObservationEvent_4019) {
+ types.add(UMLElementTypes.Enumeration_2067);
+ }
+ if (relationshipType == UMLElementTypes.DurationObservationEvent_4019) {
+ types.add(UMLElementTypes.DataType_2068);
+ }
+ if (relationshipType == UMLElementTypes.DurationObservationEvent_4019) {
+ types.add(UMLElementTypes.Actor_2077);
+ }
+ if (relationshipType == UMLElementTypes.DurationObservationEvent_4019) {
+ types.add(UMLElementTypes.DeploymentSpecification_2078);
+ }
+ if (relationshipType == UMLElementTypes.DurationObservationEvent_4019) {
+ types.add(UMLElementTypes.Artifact_2079);
+ }
+ if (relationshipType == UMLElementTypes.DurationObservationEvent_4019) {
+ types.add(UMLElementTypes.InformationItem_2080);
+ }
+ if (relationshipType == UMLElementTypes.DurationObservationEvent_4019) {
+ types.add(UMLElementTypes.Signal_2081);
+ }
+ if (relationshipType == UMLElementTypes.DurationObservationEvent_4019) {
+ types.add(UMLElementTypes.UseCase_2082);
+ }
+ if (relationshipType == UMLElementTypes.DurationObservationEvent_4019) {
+ types.add(UMLElementTypes.SignalEvent_2083);
+ }
+ if (relationshipType == UMLElementTypes.DurationObservationEvent_4019) {
+ types.add(UMLElementTypes.CallEvent_2084);
+ }
+ if (relationshipType == UMLElementTypes.DurationObservationEvent_4019) {
+ types.add(UMLElementTypes.AnyReceiveEvent_2085);
+ }
+ if (relationshipType == UMLElementTypes.DurationObservationEvent_4019) {
+ types.add(UMLElementTypes.SendSignalEvent_2086);
+ }
+ if (relationshipType == UMLElementTypes.DurationObservationEvent_4019) {
+ types.add(UMLElementTypes.SendOperationEvent_2087);
+ }
+ if (relationshipType == UMLElementTypes.DurationObservationEvent_4019) {
+ types.add(UMLElementTypes.ChangeEvent_2088);
+ }
+ if (relationshipType == UMLElementTypes.DurationObservationEvent_4019) {
+ types.add(UMLElementTypes.TimeEvent_2089);
+ }
+ if (relationshipType == UMLElementTypes.DurationObservationEvent_4019) {
+ types.add(UMLElementTypes.CreationEvent_2090);
+ }
+ if (relationshipType == UMLElementTypes.DurationObservationEvent_4019) {
+ types.add(UMLElementTypes.DestructionEvent_2091);
+ }
+ if (relationshipType == UMLElementTypes.DurationObservationEvent_4019) {
+ types.add(UMLElementTypes.ExecutionEvent_2092);
+ }
+ if (relationshipType == UMLElementTypes.DurationObservationEvent_4019) {
+ types.add(UMLElementTypes.DurationObservation_2093);
+ }
+ if (relationshipType == UMLElementTypes.DurationObservationEvent_4019) {
+ types.add(UMLElementTypes.TimeObservation_2094);
+ }
+ if (relationshipType == UMLElementTypes.DurationObservationEvent_4019) {
+ types.add(UMLElementTypes.LiteralBoolean_2095);
+ }
+ if (relationshipType == UMLElementTypes.DurationObservationEvent_4019) {
+ types.add(UMLElementTypes.LiteralInteger_2096);
+ }
+ if (relationshipType == UMLElementTypes.DurationObservationEvent_4019) {
+ types.add(UMLElementTypes.LiteralNull_2097);
+ }
+ if (relationshipType == UMLElementTypes.DurationObservationEvent_4019) {
+ types.add(UMLElementTypes.LiteralString_2098);
+ }
+ if (relationshipType == UMLElementTypes.DurationObservationEvent_4019) {
+ types.add(UMLElementTypes.LiteralUnlimitedNatural_2099);
+ }
+ if (relationshipType == UMLElementTypes.DurationObservationEvent_4019) {
+ types.add(UMLElementTypes.StringExpression_2100);
+ }
+ if (relationshipType == UMLElementTypes.DurationObservationEvent_4019) {
+ types.add(UMLElementTypes.OpaqueExpression_2101);
+ }
+ if (relationshipType == UMLElementTypes.DurationObservationEvent_4019) {
+ types.add(UMLElementTypes.TimeExpression_2102);
+ }
+ if (relationshipType == UMLElementTypes.DurationObservationEvent_4019) {
+ types.add(UMLElementTypes.Expression_2103);
+ }
+ if (relationshipType == UMLElementTypes.DurationObservationEvent_4019) {
+ types.add(UMLElementTypes.Duration_2104);
+ }
+ if (relationshipType == UMLElementTypes.DurationObservationEvent_4019) {
+ types.add(UMLElementTypes.TimeInterval_2105);
+ }
+ if (relationshipType == UMLElementTypes.DurationObservationEvent_4019) {
+ types.add(UMLElementTypes.DurationInterval_2106);
+ }
+ if (relationshipType == UMLElementTypes.DurationObservationEvent_4019) {
+ types.add(UMLElementTypes.Interval_2107);
+ }
+ if (relationshipType == UMLElementTypes.DurationObservationEvent_4019) {
+ types.add(UMLElementTypes.InstanceValue_2108);
+ }
+ if (relationshipType == UMLElementTypes.DurationObservationEvent_4019) {
+ types.add(UMLElementTypes.DurationConstraint_2110);
+ }
+ if (relationshipType == UMLElementTypes.DurationObservationEvent_4019) {
+ types.add(UMLElementTypes.TimeConstraint_2111);
+ }
+ if (relationshipType == UMLElementTypes.DurationObservationEvent_4019) {
+ types.add(UMLElementTypes.IntervalConstraint_2112);
+ }
+ if (relationshipType == UMLElementTypes.DurationObservationEvent_4019) {
+ types.add(UMLElementTypes.InteractionConstraint_2113);
+ }
+ if (relationshipType == UMLElementTypes.DurationObservationEvent_4019) {
+ types.add(UMLElementTypes.Constraint_2114);
+ }
+ if (relationshipType == UMLElementTypes.DurationObservationEvent_4019) {
+ types.add(UMLElementTypes.Port_3069);
+ }
+ if (relationshipType == UMLElementTypes.DurationObservationEvent_4019) {
+ types.add(UMLElementTypes.Property_3070);
+ }
+ if (relationshipType == UMLElementTypes.DurationObservationEvent_4019) {
+ types.add(UMLElementTypes.ConnectableElement_3115);
+ }
+ if (relationshipType == UMLElementTypes.DurationObservationEvent_4019) {
+ types.add(UMLElementTypes.CollaborationUse_3071);
+ }
+ if (relationshipType == UMLElementTypes.DurationObservationEvent_4019) {
+ types.add(UMLElementTypes.Activity_3072);
+ }
+ if (relationshipType == UMLElementTypes.DurationObservationEvent_4019) {
+ types.add(UMLElementTypes.Interaction_3073);
+ }
+ if (relationshipType == UMLElementTypes.DurationObservationEvent_4019) {
+ types.add(UMLElementTypes.ProtocolStateMachine_3074);
+ }
+ if (relationshipType == UMLElementTypes.DurationObservationEvent_4019) {
+ types.add(UMLElementTypes.StateMachine_3075);
+ }
+ if (relationshipType == UMLElementTypes.DurationObservationEvent_4019) {
+ types.add(UMLElementTypes.FunctionBehavior_3076);
+ }
+ if (relationshipType == UMLElementTypes.DurationObservationEvent_4019) {
+ types.add(UMLElementTypes.OpaqueBehavior_3077);
+ }
+ if (relationshipType == UMLElementTypes.DurationObservationEvent_4019) {
+ types.add(UMLElementTypes.Component_3081);
+ }
+ if (relationshipType == UMLElementTypes.DurationObservationEvent_4019) {
+ types.add(UMLElementTypes.Device_3082);
+ }
+ if (relationshipType == UMLElementTypes.DurationObservationEvent_4019) {
+ types.add(UMLElementTypes.ExecutionEnvironment_3083);
+ }
+ if (relationshipType == UMLElementTypes.DurationObservationEvent_4019) {
+ types.add(UMLElementTypes.Node_3084);
+ }
+ if (relationshipType == UMLElementTypes.DurationObservationEvent_4019) {
+ types.add(UMLElementTypes.Class_3085);
+ }
+ if (relationshipType == UMLElementTypes.DurationObservationEvent_4019) {
+ types.add(UMLElementTypes.Collaboration_3086);
+ }
+ if (relationshipType == UMLElementTypes.DurationObservationEvent_4019) {
+ types.add(UMLElementTypes.Interface_3087);
+ }
+ if (relationshipType == UMLElementTypes.DurationObservationEvent_4019) {
+ types.add(UMLElementTypes.PrimitiveType_3078);
+ }
+ if (relationshipType == UMLElementTypes.DurationObservationEvent_4019) {
+ types.add(UMLElementTypes.Enumeration_3079);
+ }
+ if (relationshipType == UMLElementTypes.DurationObservationEvent_4019) {
+ types.add(UMLElementTypes.DataType_3080);
+ }
+ if (relationshipType == UMLElementTypes.DurationObservationEvent_4019) {
+ types.add(UMLElementTypes.Actor_3091);
+ }
+ if (relationshipType == UMLElementTypes.DurationObservationEvent_4019) {
+ types.add(UMLElementTypes.DeploymentSpecification_3092);
+ }
+ if (relationshipType == UMLElementTypes.DurationObservationEvent_4019) {
+ types.add(UMLElementTypes.Artifact_3093);
+ }
+ if (relationshipType == UMLElementTypes.DurationObservationEvent_4019) {
+ types.add(UMLElementTypes.InformationItem_3094);
+ }
+ if (relationshipType == UMLElementTypes.DurationObservationEvent_4019) {
+ types.add(UMLElementTypes.Signal_3095);
+ }
+ if (relationshipType == UMLElementTypes.DurationObservationEvent_4019) {
+ types.add(UMLElementTypes.UseCase_3096);
+ }
return types;
}
@@ -6129,7 +6604,8 @@ ShapeNodeEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -6149,6 +6625,8 @@ ShapeNodeEditPart {
types.add(UMLElementTypes.Dependency_4010);
types.add(UMLElementTypes.Generalization_4015);
types.add(UMLElementTypes.InformationFlow_4016);
+ types.add(UMLElementTypes.TimeObservationEvent_4018);
+ types.add(UMLElementTypes.DurationObservationEvent_4019);
return types;
}
@@ -6162,7 +6640,8 @@ ShapeNodeEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -9081,79 +9560,18 @@ ShapeNodeEditPart {
if (relationshipType == UMLElementTypes.InformationFlow_4016) {
types.add(UMLElementTypes.Comment_3097);
}
- return types;
- }
-
- /**
- * @generated
- */
- public class NamedElementDescriptor extends RectangleFigure {
-
- /**
- * @generated
- */
- private WrappingLabel fNamedElementNameLabel;
-
- /**
- * @generated
- */
- public NamedElementDescriptor() {
- this.setLineWidth(1);
- this.setForegroundColor(ColorConstants.black);
- createContents();
- }
-
- /**
- * @generated
- */
- private void createContents() {
-
- fNamedElementNameLabel = new WrappingLabel();
- fNamedElementNameLabel.setText("");
- fNamedElementNameLabel.setForegroundColor(ColorConstants.black);
-
- fNamedElementNameLabel.setFont(FNAMEDELEMENTNAMELABEL_FONT);
-
- this.add(fNamedElementNameLabel);
-
- }
-
- /**
- * @generated
- */
- private boolean myUseLocalCoordinates = false;
-
- /**
- * @generated
- */
- protected boolean useLocalCoordinates() {
- return myUseLocalCoordinates;
- }
-
- /**
- * @generated
- */
- protected void setUseLocalCoordinates(boolean useLocalCoordinates) {
- myUseLocalCoordinates = useLocalCoordinates;
+ if (relationshipType == UMLElementTypes.TimeObservationEvent_4018) {
+ types.add(UMLElementTypes.TimeObservation_2094);
}
-
- /**
- * @generated
- */
- public WrappingLabel getNamedElementNameLabel() {
- return fNamedElementNameLabel;
+ if (relationshipType == UMLElementTypes.DurationObservationEvent_4019) {
+ types.add(UMLElementTypes.DurationObservation_2093);
}
-
+ return types;
}
/**
* @generated
*/
- static final Font FNAMEDELEMENTNAMELABEL_FONT = new Font(Display.getCurrent(), "Arial", 10, SWT.BOLD);
-
- /**
- * @generated
- */
@Override
public Object getPreferredValue(EStructuralFeature feature) {
IPreferenceStore preferenceStore = (IPreferenceStore) getDiagramPreferencesHint().getPreferenceStore();
diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/DurationObservationNameEditPart.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/DurationObservationNameEditPart.java
index cbd20322089..933cb880847 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/DurationObservationNameEditPart.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/DurationObservationNameEditPart.java
@@ -13,37 +13,33 @@
*****************************************************************************/
package org.eclipse.papyrus.diagram.composite.edit.parts;
-import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import org.eclipse.draw2d.IFigure;
import org.eclipse.draw2d.Label;
import org.eclipse.draw2d.geometry.Point;
+import org.eclipse.draw2d.geometry.Rectangle;
import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EAnnotation;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.transaction.RecordingCommand;
import org.eclipse.emf.transaction.RunnableWithResult;
import org.eclipse.emf.transaction.TransactionalEditingDomain;
import org.eclipse.gef.AccessibleEditPart;
import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.GraphicalEditPart;
import org.eclipse.gef.Request;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.editpolicies.NonResizableEditPolicy;
-import org.eclipse.gef.handles.MoveHandle;
-import org.eclipse.gef.handles.NonResizableHandleKit;
import org.eclipse.gef.requests.DirectEditRequest;
import org.eclipse.gef.tools.DirectEditManager;
import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;
import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;
import org.eclipse.gmf.runtime.common.ui.services.parser.ParserEditStatus;
import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.CompartmentEditPart;
+import org.eclipse.gmf.runtime.diagram.ui.editparts.IBorderItemEditPart;
import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;
+import org.eclipse.gmf.runtime.diagram.ui.editparts.LabelEditPart;
import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;
+import org.eclipse.gmf.runtime.diagram.ui.figures.IBorderItemLocator;
import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;
import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;
import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;
@@ -58,7 +54,6 @@ import org.eclipse.jface.viewers.ICellEditorValidator;
import org.eclipse.jface.window.Window;
import org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition;
import org.eclipse.papyrus.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;
-import org.eclipse.papyrus.diagram.common.util.DiagramEditPartsUtil;
import org.eclipse.papyrus.diagram.composite.edit.policies.UMLTextSelectionEditPolicy;
import org.eclipse.papyrus.diagram.composite.part.UMLVisualIDRegistry;
import org.eclipse.papyrus.diagram.composite.providers.UMLElementTypes;
@@ -68,8 +63,6 @@ import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorCo
import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;
import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;
import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;
-import org.eclipse.papyrus.umlutils.ui.VisualInformationPapyrusConstant;
-import org.eclipse.papyrus.umlutils.ui.helper.NameLabelIconHelper;
import org.eclipse.swt.SWT;
import org.eclipse.swt.accessibility.AccessibleEvent;
import org.eclipse.swt.graphics.Color;
@@ -81,12 +74,16 @@ import org.eclipse.uml2.uml.NamedElement;
/**
* @generated
*/
-public class DurationObservationNameEditPart extends CompartmentEditPart implements ITextAwareEditPart {
+public class DurationObservationNameEditPart
+
+extends LabelEditPart
+
+implements ITextAwareEditPart, IBorderItemEditPart {
/**
* @generated
*/
- public static final int VISUAL_ID = 5176;
+ public static final int VISUAL_ID = 5151;
/**
* @generated
@@ -117,6 +114,15 @@ public class DurationObservationNameEditPart extends CompartmentEditPart impleme
/**
* @generated
*/
+ static {
+ registerSnapBackPosition(UMLVisualIDRegistry
+ .getType(org.eclipse.papyrus.diagram.composite.edit.parts.DurationObservationNameEditPart.VISUAL_ID),
+ new Point(0, 0));
+ }
+
+ /**
+ * @generated
+ */
public DurationObservationNameEditPart(View view) {
super(view);
}
@@ -126,25 +132,31 @@ public class DurationObservationNameEditPart extends CompartmentEditPart impleme
*/
protected void createDefaultEditPolicies() {
super.createDefaultEditPolicies();
- installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());
installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());
- installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new NonResizableEditPolicy() {
-
- protected List createSelectionHandles() {
- List handles = new ArrayList();
- NonResizableHandleKit.addMoveHandle((GraphicalEditPart) getHost(), handles);
- ((MoveHandle) handles.get(0)).setBorder(null);
- return handles;
- }
+ installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());
+ }
- public Command getCommand(Request request) {
- return null;
- }
+ /**
+ * @generated
+ */
+ public IBorderItemLocator getBorderItemLocator() {
+ IFigure parentFigure = getFigure().getParent();
+ if (parentFigure != null && parentFigure.getLayoutManager() != null) {
+ Object constraint = parentFigure.getLayoutManager().getConstraint(getFigure());
+ return (IBorderItemLocator) constraint;
+ }
+ return null;
+ }
- public boolean understandsRequest(Request request) {
- return false;
- }
- });
+ /**
+ * @generated
+ */
+ public void refreshBounds() {
+ int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();
+ int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();
+ int width = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();
+ int height = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();
+ getBorderItemLocator().setConstraint(new Rectangle(x, y, width, height));
}
/**
@@ -194,7 +206,7 @@ public class DurationObservationNameEditPart extends CompartmentEditPart impleme
/**
* @generated
*/
- public void setLabel(WrappingLabel figure) {
+ public void setLabel(IFigure figure) {
unregisterVisuals();
setFigure(figure);
defaultText = getLabelTextHelper(figure);
@@ -227,19 +239,7 @@ public class DurationObservationNameEditPart extends CompartmentEditPart impleme
* @generated
*/
protected Image getLabelIcon() {
- EObject parserElement = getParserElement();
- if (parserElement == null) {
- return null;
- }
-
- List<View> views = DiagramEditPartsUtil.findViews(parserElement, getViewer());
- for (View view : views) {
- if (NameLabelIconHelper.showLabelIcon(view)) {
- return UMLElementTypes.getImage(parserElement.eClass());
- }
- }
return null;
-
}
/**
@@ -583,7 +583,7 @@ public class DurationObservationNameEditPart extends CompartmentEditPart impleme
* @generated
*/
private View getFontStyleOwnerView() {
- return (View) getModel();
+ return getPrimaryView();
}
/**
@@ -698,24 +698,7 @@ public class DurationObservationNameEditPart extends CompartmentEditPart impleme
/**
* @generated
*/
- protected void addNotationalListeners() {
- super.addNotationalListeners();
- addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$
- }
-
- /**
- * @generated
- */
- protected void removeNotationalListeners() {
- super.removeNotationalListeners();
- removeListenerFilter("PrimaryView"); //$NON-NLS-1$
- }
-
- /**
- * @generated
- */
protected void handleNotificationEvent(Notification event) {
- refreshLabel();
Object feature = event.getFeature();
if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {
Integer c = (Integer) event.getNewValue();
@@ -744,13 +727,6 @@ public class DurationObservationNameEditPart extends CompartmentEditPart impleme
}
}
}
-
- if (event.getNewValue() instanceof EAnnotation
- && VisualInformationPapyrusConstant.DISPLAY_NAMELABELICON.equals(((EAnnotation) event.getNewValue())
- .getSource())) {
- refreshLabel();
- }
-
super.handleNotificationEvent(event);
}
@@ -758,43 +734,16 @@ public class DurationObservationNameEditPart extends CompartmentEditPart impleme
* @generated
*/
protected IFigure createFigure() {
- // Parent should assign one using setLabel() method
- return null;
- }
-
- private static final String ADD_PARENT_MODEL = "AddParentModel";
-
- /**
- * @generated
- */
- public void activate() {
- super.activate();
- addOwnerElementListeners();
- }
-
- /**
- * @generated
- */
- protected void addOwnerElementListeners() {
- addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel())); //$NON-NLS-1$
-
- }
-
- /**
- * @generated
- */
- public void deactivate() {
- removeOwnerElementListeners();
- super.deactivate();
-
+ IFigure label = createFigurePrim();
+ defaultText = getLabelTextHelper(label);
+ return label;
}
/**
* @generated
*/
- protected void removeOwnerElementListeners() {
- removeListenerFilter(ADD_PARENT_MODEL);
-
+ protected IFigure createFigurePrim() {
+ return new WrappingLabel();
}
}
diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/DurationObservationStereotypeLabelEditPart.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/DurationObservationStereotypeLabelEditPart.java
new file mode 100644
index 00000000000..4d4eb63cec5
--- /dev/null
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/DurationObservationStereotypeLabelEditPart.java
@@ -0,0 +1,755 @@
+/*****************************************************************************
+ * Copyright (c) 2009 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
+ *
+ * Contributors:
+ * Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.diagram.composite.edit.parts;
+
+import java.util.Collections;
+import java.util.List;
+
+import org.eclipse.draw2d.IFigure;
+import org.eclipse.draw2d.Label;
+import org.eclipse.draw2d.geometry.Point;
+import org.eclipse.draw2d.geometry.Rectangle;
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.transaction.RecordingCommand;
+import org.eclipse.emf.transaction.RunnableWithResult;
+import org.eclipse.emf.transaction.TransactionalEditingDomain;
+import org.eclipse.gef.AccessibleEditPart;
+import org.eclipse.gef.EditPolicy;
+import org.eclipse.gef.Request;
+import org.eclipse.gef.requests.DirectEditRequest;
+import org.eclipse.gef.tools.DirectEditManager;
+import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;
+import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;
+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserEditStatus;
+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;
+import org.eclipse.gmf.runtime.diagram.ui.editparts.IBorderItemEditPart;
+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
+import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;
+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;
+import org.eclipse.gmf.runtime.diagram.ui.figures.IBorderItemLocator;
+import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;
+import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;
+import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;
+import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;
+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;
+import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;
+import org.eclipse.gmf.runtime.notation.FontStyle;
+import org.eclipse.gmf.runtime.notation.NotationPackage;
+import org.eclipse.gmf.runtime.notation.View;
+import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
+import org.eclipse.jface.viewers.ICellEditorValidator;
+import org.eclipse.jface.window.Window;
+import org.eclipse.papyrus.diagram.common.editparts.AbstractLabelEditPart;
+import org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeExternalNodeEditPolicy;
+import org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;
+import org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition;
+import org.eclipse.papyrus.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;
+import org.eclipse.papyrus.diagram.common.figure.node.AppliedStereotypeWrappingLabelFigure;
+import org.eclipse.papyrus.diagram.composite.edit.policies.UMLTextSelectionEditPolicy;
+import org.eclipse.papyrus.diagram.composite.part.UMLVisualIDRegistry;
+import org.eclipse.papyrus.diagram.composite.providers.UMLElementTypes;
+import org.eclipse.papyrus.diagram.composite.providers.UMLParserProvider;
+import org.eclipse.papyrus.extensionpoints.editors.Activator;
+import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;
+import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;
+import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;
+import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.accessibility.AccessibleEvent;
+import org.eclipse.swt.graphics.Color;
+import org.eclipse.swt.graphics.FontData;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.ui.PlatformUI;
+import org.eclipse.uml2.uml.NamedElement;
+
+/**
+ * @generated
+ */
+public class DurationObservationStereotypeLabelEditPart
+
+extends AbstractLabelEditPart
+
+implements ITextAwareEditPart, IBorderItemEditPart {
+
+ /**
+ * @generated
+ */
+ public static final int VISUAL_ID = 5152;
+
+ /**
+ * @generated
+ */
+ private DirectEditManager manager;
+
+ /**
+ * @generated
+ */
+ private IParser parser;
+
+ /**
+ * @generated
+ */
+ private List parserElements;
+
+ /**
+ * @generated
+ */
+ private String defaultText;
+
+ /** direct edition mode (default, undefined, registered editor, etc.) */
+ protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;
+
+ /** configuration from a registered edit dialog */
+ protected IDirectEditorConfiguration configuration;
+
+ /**
+ * @generated
+ */
+ static {
+ registerSnapBackPosition(
+ UMLVisualIDRegistry
+ .getType(org.eclipse.papyrus.diagram.composite.edit.parts.DurationObservationStereotypeLabelEditPart.VISUAL_ID),
+ new Point(0, 0));
+ }
+
+ /**
+ * @generated
+ */
+ public DurationObservationStereotypeLabelEditPart(View view) {
+ super(view);
+ }
+
+ /**
+ * @generated
+ */
+ protected void createDefaultEditPolicies() {
+ super.createDefaultEditPolicies();
+ installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());
+ installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());
+ installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY,
+ new AppliedStereotypeExternalNodeEditPolicy());
+ }
+
+ /**
+ * @generated
+ */
+ public IBorderItemLocator getBorderItemLocator() {
+ IFigure parentFigure = getFigure().getParent();
+ if (parentFigure != null && parentFigure.getLayoutManager() != null) {
+ Object constraint = parentFigure.getLayoutManager().getConstraint(getFigure());
+ return (IBorderItemLocator) constraint;
+ }
+ return null;
+ }
+
+ /**
+ * @generated
+ */
+ public void refreshBounds() {
+ int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();
+ int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();
+ int width = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();
+ int height = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();
+ getBorderItemLocator().setConstraint(new Rectangle(x, y, width, height));
+ }
+
+ /**
+ * @generated
+ */
+ protected String getLabelTextHelper(IFigure figure) {
+ if (figure instanceof WrappingLabel) {
+ return ((WrappingLabel) figure).getText();
+ } else {
+ return ((Label) figure).getText();
+ }
+ }
+
+ /**
+ * @generated
+ */
+ protected void setLabelTextHelper(IFigure figure, String text) {
+ if (figure instanceof WrappingLabel) {
+ ((WrappingLabel) figure).setText(text);
+ } else {
+ ((Label) figure).setText(text);
+ }
+ }
+
+ /**
+ * @generated
+ */
+ protected Image getLabelIconHelper(IFigure figure) {
+ if (figure instanceof WrappingLabel) {
+ return ((WrappingLabel) figure).getIcon();
+ } else {
+ return ((Label) figure).getIcon();
+ }
+ }
+
+ /**
+ * @generated
+ */
+ protected void setLabelIconHelper(IFigure figure, Image icon) {
+ if (figure instanceof WrappingLabel) {
+ ((WrappingLabel) figure).setIcon(icon);
+ } else {
+ ((Label) figure).setIcon(icon);
+ }
+ }
+
+ /**
+ * @generated
+ */
+ public void setLabel(IFigure figure) {
+ unregisterVisuals();
+ setFigure(figure);
+ defaultText = getLabelTextHelper(figure);
+ registerVisuals();
+ refreshVisuals();
+ }
+
+ /**
+ * @generated
+ */
+ protected List getModelChildren() {
+ return Collections.EMPTY_LIST;
+ }
+
+ /**
+ * @generated
+ */
+ public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {
+ return null;
+ }
+
+ /**
+ * @generated
+ */
+ protected EObject getParserElement() {
+ return resolveSemanticElement();
+ }
+
+ /**
+ * @generated
+ */
+ protected Image getLabelIcon() {
+ return null;
+ }
+
+ /**
+ * @generated
+ */
+ protected String getLabelText() {
+ String text = null;
+ EObject parserElement = getParserElement();
+ if (parserElement != null && getParser() != null) {
+ text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());
+ }
+ if (text == null || text.length() == 0) {
+ text = defaultText;
+ }
+ return text;
+ }
+
+ /**
+ * @generated
+ */
+ public void setLabelText(String text) {
+ setLabelTextHelper(getFigure(), text);
+ Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
+ if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
+ ((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
+ }
+ Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
+ if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
+ ((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
+ }
+ }
+
+ /**
+ * @generated
+ */
+ public String getEditText() {
+ if (getParserElement() == null || getParser() == null) {
+ return ""; //$NON-NLS-1$
+ }
+ return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());
+ }
+
+ /**
+ * @generated
+ */
+ protected boolean isEditable() {
+ return getParser() != null;
+ }
+
+ /**
+ * @generated
+ */
+ public ICellEditorValidator getEditTextValidator() {
+ return new ICellEditorValidator() {
+
+ public String isValid(final Object value) {
+ if (value instanceof String) {
+ final EObject element = getParserElement();
+ final IParser parser = getParser();
+ try {
+ IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive(
+ new RunnableWithResult.Impl() {
+
+ public void run() {
+ setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));
+ }
+ });
+ return valid.getCode() == ParserEditStatus.EDITABLE ? null : valid.getMessage();
+ } catch (InterruptedException ie) {
+ ie.printStackTrace();
+ }
+ }
+
+ // shouldn't get here
+ return null;
+ }
+ };
+ }
+
+ /**
+ * @generated
+ */
+ public IContentAssistProcessor getCompletionProcessor() {
+ if (getParserElement() == null || getParser() == null) {
+ return null;
+ }
+ return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));
+ }
+
+ /**
+ * @generated
+ */
+ public ParserOptions getParserOptions() {
+ return ParserOptions.NONE;
+ }
+
+ /**
+ * @generated
+ */
+ public IParser getParser() {
+ if (parser == null) {
+ parser = UMLParserProvider
+ .getParser(
+ UMLElementTypes.DurationObservation_2093,
+ getParserElement(),
+ UMLVisualIDRegistry
+ .getType(org.eclipse.papyrus.diagram.composite.edit.parts.DurationObservationStereotypeLabelEditPart.VISUAL_ID));
+ }
+ return parser;
+ }
+
+ /**
+ * @generated
+ */
+ protected DirectEditManager getManager() {
+ if (manager == null) {
+ setManager(new TextDirectEditManager(this, TextDirectEditManager.getTextCellEditorClass(this),
+ UMLEditPartFactory.getTextCellEditorLocator(this)));
+ }
+ return manager;
+ }
+
+ /**
+ * @generated
+ */
+ protected void setManager(DirectEditManager manager) {
+ this.manager = manager;
+ }
+
+ /**
+ * @generated
+ */
+ protected void performDirectEdit() {
+ getManager().show();
+ }
+
+ /**
+ * @generated
+ */
+ protected void performDirectEdit(Point eventLocation) {
+ if (getManager().getClass() == TextDirectEditManager.class) {
+ ((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());
+ }
+ }
+
+ /**
+ * @generated
+ */
+ private void performDirectEdit(char initialCharacter) {
+ if (getManager() instanceof TextDirectEditManager) {
+ ((TextDirectEditManager) getManager()).show(initialCharacter);
+ } else {
+ performDirectEdit();
+ }
+ }
+
+ /**
+ * @generated
+ */
+ protected void performDirectEditRequest(Request request) {
+
+ final Request theRequest = request;
+
+ if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {
+ directEditionMode = getDirectEditionType();
+ }
+ switch (directEditionMode) {
+ case IDirectEdition.NO_DIRECT_EDITION:
+ // no direct edition mode => does nothing
+ return;
+ case IDirectEdition.EXTENDED_DIRECT_EDITOR:
+ updateExtendedEditorConfiguration();
+ if (configuration == null || configuration.getLanguage() == null) {
+ performDefaultDirectEditorEdit(theRequest);
+ } else {
+ configuration.preEditAction(resolveSemanticElement());
+ final ExtendedDirectEditionDialog dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench()
+ .getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration
+ .getTextToEdit(resolveSemanticElement()), configuration);
+ if (Window.OK == dialog.open()) {
+ TransactionalEditingDomain domain = getEditingDomain();
+ RecordingCommand command = new RecordingCommand(domain, "Edit Label") {
+
+ @Override
+ protected void doExecute() {
+ configuration.postEditAction(resolveSemanticElement(), dialog.getValue());
+
+ }
+ };
+ domain.getCommandStack().execute(command);
+ }
+ }
+ break;
+ case IDirectEdition.DEFAULT_DIRECT_EDITOR:
+
+ // initialize the direct edit manager
+ try {
+ getEditingDomain().runExclusive(new Runnable() {
+
+ public void run() {
+ if (isActive() && isEditable()) {
+ if (theRequest.getExtendedData().get(
+ RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
+ Character initialChar = (Character) theRequest.getExtendedData().get(
+ RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
+ performDirectEdit(initialChar.charValue());
+ } else if ((theRequest instanceof DirectEditRequest)
+ && (getEditText().equals(getLabelText()))) {
+ DirectEditRequest editRequest = (DirectEditRequest) theRequest;
+ performDirectEdit(editRequest.getLocation());
+ } else {
+ performDirectEdit();
+ }
+ }
+ }
+ });
+ } catch (InterruptedException e) {
+ e.printStackTrace();
+ }
+ break;
+ default:
+ break;
+ }
+ }
+
+ /**
+ * @generated
+ */
+ protected void refreshVisuals() {
+ super.refreshVisuals();
+ refreshLabel();
+ refreshFont();
+ refreshFontColor();
+ refreshUnderline();
+ refreshStrikeThrough();
+ }
+
+ /**
+ * @generated
+ */
+ protected void refreshLabel() {
+ EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);
+ if (maskLabelPolicy == null) {
+ setLabelTextHelper(getFigure(), getLabelText());
+ setLabelIconHelper(getFigure(), getLabelIcon());
+ }
+ Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
+ if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
+ ((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
+ }
+ Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
+ if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
+ ((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
+ }
+ }
+
+ /**
+ * @generated
+ */
+ protected void refreshUnderline() {
+ FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());
+ if (style != null && getFigure() instanceof WrappingLabel) {
+ ((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());
+ }
+ }
+
+ /**
+ * @generated
+ */
+ protected void refreshStrikeThrough() {
+ FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());
+ if (style != null && getFigure() instanceof WrappingLabel) {
+ ((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());
+ }
+ }
+
+ /**
+ * @generated
+ */
+ protected void refreshFont() {
+ FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());
+ if (style != null) {
+ FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD
+ : SWT.NORMAL)
+ | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));
+ setFont(fontData);
+ }
+ }
+
+ /**
+ * @generated
+ */
+ protected void setFontColor(Color color) {
+ getFigure().setForegroundColor(color);
+ }
+
+ /**
+ * @generated
+ */
+ protected void addSemanticListeners() {
+ if (getParser() instanceof ISemanticParser) {
+ EObject element = resolveSemanticElement();
+ parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);
+ for (int i = 0; i < parserElements.size(); i++) {
+ addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$
+ }
+ } else {
+ super.addSemanticListeners();
+ }
+ }
+
+ /**
+ * @generated
+ */
+ protected void removeSemanticListeners() {
+ if (parserElements != null) {
+ for (int i = 0; i < parserElements.size(); i++) {
+ removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$
+ }
+ } else {
+ super.removeSemanticListeners();
+ }
+ }
+
+ /**
+ * @generated
+ */
+ protected AccessibleEditPart getAccessibleEditPart() {
+ if (accessibleEP == null) {
+ accessibleEP = new AccessibleGraphicalEditPart() {
+
+ public void getName(AccessibleEvent e) {
+ e.result = getLabelTextHelper(getFigure());
+ }
+ };
+ }
+ return accessibleEP;
+ }
+
+ /**
+ * @generated
+ */
+ private View getFontStyleOwnerView() {
+ return getPrimaryView();
+ }
+
+ /**
+ * Returns the kind of associated editor for direct edition.
+ *
+ * @return an <code>int</code> corresponding to the kind of direct editor, @see
+ * org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition
+ * @generated
+ */
+ public int getDirectEditionType() {
+ if (checkExtendedEditor()) {
+ initExtendedEditorConfiguration();
+ return IDirectEdition.EXTENDED_DIRECT_EDITOR;
+ }
+ if (checkDefaultEdition()) {
+ return IDirectEdition.DEFAULT_DIRECT_EDITOR;
+ }
+
+ // not a named element. no specific editor => do nothing
+ return IDirectEdition.NO_DIRECT_EDITION;
+ }
+
+ /**
+ * Checks if an extended editor is present.
+ *
+ * @return <code>true</code> if an extended editor is present.
+ * @generated
+ */
+ protected boolean checkExtendedEditor() {
+ if (resolveSemanticElement() != null) {
+ return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass()
+ .getInstanceClassName());
+ }
+ return false;
+ }
+
+ /**
+ * Checks if a default direct edition is available
+ *
+ * @return <code>true</code> if a default direct edition is available
+ * @generated
+ */
+ protected boolean checkDefaultEdition() {
+ return (resolveSemanticElement() instanceof NamedElement);
+ }
+
+ /**
+ * Initializes the extended editor configuration
+ *
+ * @generated
+ */
+ protected void initExtendedEditorConfiguration() {
+ if (configuration == null) {
+ final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(
+ IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
+ if (languagePreferred != null && !languagePreferred.equals("")) {
+ configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()
+ .eClass().getInstanceClassName());
+ } else {
+ configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE,
+ resolveSemanticElement().eClass().getInstanceClassName());
+ }
+ }
+ }
+
+ /**
+ * Updates the preference configuration
+ */
+ protected void updateExtendedEditorConfiguration() {
+ String languagePreferred = Activator.getDefault().getPreferenceStore().getString(
+ IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
+ if (languagePreferred != null && !languagePreferred.equals("")
+ && languagePreferred != configuration.getLanguage()) {
+ configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()
+ .eClass().getInstanceClassName());
+ } else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {
+ configuration = null;
+ }
+ }
+
+ /**
+ * Performs the direct edit usually used by GMF editors.
+ *
+ * @param theRequest
+ * the direct edit request that starts the direct edit system
+ */
+ protected void performDefaultDirectEditorEdit(final Request theRequest) {
+ // initialize the direct edit manager
+ try {
+ getEditingDomain().runExclusive(new Runnable() {
+
+ public void run() {
+ if (isActive() && isEditable()) {
+ if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
+ Character initialChar = (Character) theRequest.getExtendedData().get(
+ RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
+ performDirectEdit(initialChar.charValue());
+ } else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {
+ DirectEditRequest editRequest = (DirectEditRequest) theRequest;
+ performDirectEdit(editRequest.getLocation());
+ } else {
+ performDirectEdit();
+ }
+ }
+ }
+ });
+ } catch (InterruptedException e) {
+ e.printStackTrace();
+ }
+ }
+
+ /**
+ * @generated
+ */
+ protected void handleNotificationEvent(Notification event) {
+ Object feature = event.getFeature();
+ if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {
+ Integer c = (Integer) event.getNewValue();
+ setFontColor(DiagramColorRegistry.getInstance().getColor(c));
+ } else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {
+ refreshUnderline();
+ } else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {
+ refreshStrikeThrough();
+ } else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature)
+ || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature)
+ || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)
+ || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {
+ refreshFont();
+ } else {
+ if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {
+ refreshLabel();
+ }
+ if (getParser() instanceof ISemanticParser) {
+ ISemanticParser modelParser = (ISemanticParser) getParser();
+ if (modelParser.areSemanticElementsAffected(null, event)) {
+ removeSemanticListeners();
+ if (resolveSemanticElement() != null) {
+ addSemanticListeners();
+ }
+ refreshLabel();
+ }
+ }
+ }
+ super.handleNotificationEvent(event);
+ }
+
+ /**
+ * @generated
+ */
+ protected IFigure createFigure() {
+ IFigure label = createFigurePrim();
+ defaultText = getLabelTextHelper(label);
+ return label;
+ }
+
+ /**
+ * @generated
+ */
+ protected IFigure createFigurePrim() {
+ return new AppliedStereotypeWrappingLabelFigure();
+ }
+
+}
diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/EnumerationEditPart.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/EnumerationEditPart.java
index e764986d246..283d6126889 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/EnumerationEditPart.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/EnumerationEditPart.java
@@ -156,7 +156,7 @@ NamedElementEditPart {
if (childEditPart instanceof EnumerationEnumerationLiteralCompartmentEditPart) {
IFigure pane = getPrimaryShape().getEnumerationLiteralCompartmentFigure();
setupContentPane(pane); // FIXME each comparment should handle his content pane in his
- // own way
+ // own way
pane.add(((EnumerationEnumerationLiteralCompartmentEditPart) childEditPart).getFigure());
return true;
}
@@ -174,7 +174,7 @@ NamedElementEditPart {
if (childEditPart instanceof EnumerationEnumerationLiteralCompartmentEditPart) {
IFigure pane = getPrimaryShape().getEnumerationLiteralCompartmentFigure();
setupContentPane(pane); // FIXME each comparment should handle his content pane in his
- // own way
+ // own way
pane.remove(((EnumerationEnumerationLiteralCompartmentEditPart) childEditPart).getFigure());
return true;
}
@@ -306,7 +306,8 @@ NamedElementEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -337,7 +338,8 @@ NamedElementEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -3248,7 +3250,8 @@ NamedElementEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -6158,7 +6161,8 @@ NamedElementEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -6178,6 +6182,8 @@ NamedElementEditPart {
types.add(UMLElementTypes.Dependency_4010);
types.add(UMLElementTypes.Generalization_4015);
types.add(UMLElementTypes.InformationFlow_4016);
+ types.add(UMLElementTypes.TimeObservationEvent_4018);
+ types.add(UMLElementTypes.DurationObservationEvent_4019);
return types;
}
@@ -6191,7 +6197,8 @@ NamedElementEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -9110,6 +9117,12 @@ NamedElementEditPart {
if (relationshipType == UMLElementTypes.InformationFlow_4016) {
types.add(UMLElementTypes.Comment_3097);
}
+ if (relationshipType == UMLElementTypes.TimeObservationEvent_4018) {
+ types.add(UMLElementTypes.TimeObservation_2094);
+ }
+ if (relationshipType == UMLElementTypes.DurationObservationEvent_4019) {
+ types.add(UMLElementTypes.DurationObservation_2093);
+ }
return types;
}
diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/EnumerationEditPartCN.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/EnumerationEditPartCN.java
index e5b21735b70..33e71fd1501 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/EnumerationEditPartCN.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/EnumerationEditPartCN.java
@@ -156,7 +156,7 @@ NamedElementEditPart {
if (childEditPart instanceof EnumerationEnumerationLiteralCompartmentEditPartCN) {
IFigure pane = getPrimaryShape().getEnumerationLiteralCompartmentFigure();
setupContentPane(pane); // FIXME each comparment should handle his content pane in his
- // own way
+ // own way
pane.add(((EnumerationEnumerationLiteralCompartmentEditPartCN) childEditPart).getFigure());
return true;
}
@@ -174,7 +174,7 @@ NamedElementEditPart {
if (childEditPart instanceof EnumerationEnumerationLiteralCompartmentEditPartCN) {
IFigure pane = getPrimaryShape().getEnumerationLiteralCompartmentFigure();
setupContentPane(pane); // FIXME each comparment should handle his content pane in his
- // own way
+ // own way
pane.remove(((EnumerationEnumerationLiteralCompartmentEditPartCN) childEditPart).getFigure());
return true;
}
@@ -306,7 +306,8 @@ NamedElementEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -337,7 +338,8 @@ NamedElementEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -3248,7 +3250,8 @@ NamedElementEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -6158,7 +6161,8 @@ NamedElementEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -6178,6 +6182,8 @@ NamedElementEditPart {
types.add(UMLElementTypes.Dependency_4010);
types.add(UMLElementTypes.Generalization_4015);
types.add(UMLElementTypes.InformationFlow_4016);
+ types.add(UMLElementTypes.TimeObservationEvent_4018);
+ types.add(UMLElementTypes.DurationObservationEvent_4019);
return types;
}
@@ -6191,7 +6197,8 @@ NamedElementEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -9110,6 +9117,12 @@ NamedElementEditPart {
if (relationshipType == UMLElementTypes.InformationFlow_4016) {
types.add(UMLElementTypes.Comment_3097);
}
+ if (relationshipType == UMLElementTypes.TimeObservationEvent_4018) {
+ types.add(UMLElementTypes.TimeObservation_2094);
+ }
+ if (relationshipType == UMLElementTypes.DurationObservationEvent_4019) {
+ types.add(UMLElementTypes.DurationObservation_2093);
+ }
return types;
}
diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/EnumerationEnumerationLiteralCompartmentEditPart.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/EnumerationEnumerationLiteralCompartmentEditPart.java
index 1c137336cf3..3b5e42f57d9 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/EnumerationEnumerationLiteralCompartmentEditPart.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/EnumerationEnumerationLiteralCompartmentEditPart.java
@@ -14,8 +14,12 @@
package org.eclipse.papyrus.diagram.composite.edit.parts;
import org.eclipse.draw2d.IFigure;
+import org.eclipse.draw2d.geometry.Dimension;
+import org.eclipse.draw2d.geometry.Point;
+import org.eclipse.draw2d.geometry.Rectangle;
import org.eclipse.emf.common.notify.Notification;
import org.eclipse.gef.EditPolicy;
+import org.eclipse.gef.GraphicalEditPart;
import org.eclipse.gmf.runtime.diagram.ui.editparts.ListCompartmentEditPart;
import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CreationEditPolicy;
import org.eclipse.gmf.runtime.diagram.ui.editpolicies.DragDropEditPolicy;
@@ -23,6 +27,7 @@ import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableCompartmentEditPolicy;
import org.eclipse.gmf.runtime.diagram.ui.figures.ResizableCompartmentFigure;
import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;
+import org.eclipse.gmf.runtime.notation.NotationPackage;
import org.eclipse.gmf.runtime.notation.View;
import org.eclipse.papyrus.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy;
import org.eclipse.papyrus.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy;
@@ -32,7 +37,11 @@ import org.eclipse.papyrus.diagram.composite.part.Messages;
/**
* @generated
*/
-public class EnumerationEnumerationLiteralCompartmentEditPart extends ListCompartmentEditPart {
+public class EnumerationEnumerationLiteralCompartmentEditPart
+
+extends ListCompartmentEditPart
+
+{
/**
* @generated
@@ -92,4 +101,38 @@ public class EnumerationEnumerationLiteralCompartmentEditPart extends ListCompar
}
}
+ /**
+ * @generated
+ */
+ protected void handleNotificationEvent(Notification notification) {
+ Object feature = notification.getFeature();
+ if (NotationPackage.eINSTANCE.getSize_Width().equals(feature)
+ || NotationPackage.eINSTANCE.getSize_Height().equals(feature)
+ || NotationPackage.eINSTANCE.getLocation_X().equals(feature)
+ || NotationPackage.eINSTANCE.getLocation_Y().equals(feature)) {
+ refreshBounds();
+ }
+ super.handleNotificationEvent(notification);
+ }
+
+ /**
+ * @generated
+ */
+ protected void refreshBounds() {
+ int width = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();
+ int height = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();
+ Dimension size = new Dimension(width, height);
+ int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();
+ int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();
+ Point loc = new Point(x, y);
+ ((GraphicalEditPart) getParent()).setLayoutConstraint(this, getFigure(), new Rectangle(loc, size));
+ }
+
+ /**
+ * @generated
+ */
+ protected void refreshVisuals() {
+ super.refreshVisuals();
+ refreshBounds();
+ }
}
diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/EnumerationEnumerationLiteralCompartmentEditPartCN.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/EnumerationEnumerationLiteralCompartmentEditPartCN.java
index 22e7f63efd2..5bafc109644 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/EnumerationEnumerationLiteralCompartmentEditPartCN.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/EnumerationEnumerationLiteralCompartmentEditPartCN.java
@@ -14,8 +14,12 @@
package org.eclipse.papyrus.diagram.composite.edit.parts;
import org.eclipse.draw2d.IFigure;
+import org.eclipse.draw2d.geometry.Dimension;
+import org.eclipse.draw2d.geometry.Point;
+import org.eclipse.draw2d.geometry.Rectangle;
import org.eclipse.emf.common.notify.Notification;
import org.eclipse.gef.EditPolicy;
+import org.eclipse.gef.GraphicalEditPart;
import org.eclipse.gmf.runtime.diagram.ui.editparts.ListCompartmentEditPart;
import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CreationEditPolicy;
import org.eclipse.gmf.runtime.diagram.ui.editpolicies.DragDropEditPolicy;
@@ -23,6 +27,7 @@ import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableCompartmentEditPolicy;
import org.eclipse.gmf.runtime.diagram.ui.figures.ResizableCompartmentFigure;
import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;
+import org.eclipse.gmf.runtime.notation.NotationPackage;
import org.eclipse.gmf.runtime.notation.View;
import org.eclipse.papyrus.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy;
import org.eclipse.papyrus.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy;
@@ -32,7 +37,11 @@ import org.eclipse.papyrus.diagram.composite.part.Messages;
/**
* @generated
*/
-public class EnumerationEnumerationLiteralCompartmentEditPartCN extends ListCompartmentEditPart {
+public class EnumerationEnumerationLiteralCompartmentEditPartCN
+
+extends ListCompartmentEditPart
+
+{
/**
* @generated
@@ -92,4 +101,38 @@ public class EnumerationEnumerationLiteralCompartmentEditPartCN extends ListComp
}
}
+ /**
+ * @generated
+ */
+ protected void handleNotificationEvent(Notification notification) {
+ Object feature = notification.getFeature();
+ if (NotationPackage.eINSTANCE.getSize_Width().equals(feature)
+ || NotationPackage.eINSTANCE.getSize_Height().equals(feature)
+ || NotationPackage.eINSTANCE.getLocation_X().equals(feature)
+ || NotationPackage.eINSTANCE.getLocation_Y().equals(feature)) {
+ refreshBounds();
+ }
+ super.handleNotificationEvent(notification);
+ }
+
+ /**
+ * @generated
+ */
+ protected void refreshBounds() {
+ int width = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();
+ int height = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();
+ Dimension size = new Dimension(width, height);
+ int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();
+ int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();
+ Point loc = new Point(x, y);
+ ((GraphicalEditPart) getParent()).setLayoutConstraint(this, getFigure(), new Rectangle(loc, size));
+ }
+
+ /**
+ * @generated
+ */
+ protected void refreshVisuals() {
+ super.refreshVisuals();
+ refreshBounds();
+ }
}
diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/ExecutionEnvironmentCompositeCompartmentEditPart.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/ExecutionEnvironmentCompositeCompartmentEditPart.java
index 4c00d13c2ab..c17029c5b2b 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/ExecutionEnvironmentCompositeCompartmentEditPart.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/ExecutionEnvironmentCompositeCompartmentEditPart.java
@@ -14,7 +14,12 @@
package org.eclipse.papyrus.diagram.composite.edit.parts;
import org.eclipse.draw2d.IFigure;
+import org.eclipse.draw2d.geometry.Dimension;
+import org.eclipse.draw2d.geometry.Point;
+import org.eclipse.draw2d.geometry.Rectangle;
+import org.eclipse.emf.common.notify.Notification;
import org.eclipse.gef.EditPolicy;
+import org.eclipse.gef.GraphicalEditPart;
import org.eclipse.gmf.runtime.diagram.ui.editparts.ShapeCompartmentEditPart;
import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CreationEditPolicy;
import org.eclipse.gmf.runtime.diagram.ui.editpolicies.DragDropEditPolicy;
@@ -22,6 +27,7 @@ import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableCompartmentEditPolicy;
import org.eclipse.gmf.runtime.diagram.ui.figures.ResizableCompartmentFigure;
import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;
+import org.eclipse.gmf.runtime.notation.NotationPackage;
import org.eclipse.gmf.runtime.notation.View;
import org.eclipse.papyrus.diagram.common.editpolicies.CustomContainerEditPolicy;
import org.eclipse.papyrus.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy;
@@ -32,7 +38,11 @@ import org.eclipse.papyrus.diagram.composite.part.Messages;
/**
* @generated
*/
-public class ExecutionEnvironmentCompositeCompartmentEditPart extends ShapeCompartmentEditPart {
+public class ExecutionEnvironmentCompositeCompartmentEditPart
+
+extends ShapeCompartmentEditPart
+
+{
/**
* @generated
@@ -86,4 +96,38 @@ public class ExecutionEnvironmentCompositeCompartmentEditPart extends ShapeCompa
}
}
+ /**
+ * @generated
+ */
+ protected void handleNotificationEvent(Notification notification) {
+ Object feature = notification.getFeature();
+ if (NotationPackage.eINSTANCE.getSize_Width().equals(feature)
+ || NotationPackage.eINSTANCE.getSize_Height().equals(feature)
+ || NotationPackage.eINSTANCE.getLocation_X().equals(feature)
+ || NotationPackage.eINSTANCE.getLocation_Y().equals(feature)) {
+ refreshBounds();
+ }
+ super.handleNotificationEvent(notification);
+ }
+
+ /**
+ * @generated
+ */
+ protected void refreshBounds() {
+ int width = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();
+ int height = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();
+ Dimension size = new Dimension(width, height);
+ int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();
+ int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();
+ Point loc = new Point(x, y);
+ ((GraphicalEditPart) getParent()).setLayoutConstraint(this, getFigure(), new Rectangle(loc, size));
+ }
+
+ /**
+ * @generated
+ */
+ protected void refreshVisuals() {
+ super.refreshVisuals();
+ refreshBounds();
+ }
}
diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/ExecutionEnvironmentCompositeCompartmentEditPartCN.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/ExecutionEnvironmentCompositeCompartmentEditPartCN.java
index 33aa9f6529e..83caa95720f 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/ExecutionEnvironmentCompositeCompartmentEditPartCN.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/ExecutionEnvironmentCompositeCompartmentEditPartCN.java
@@ -14,7 +14,12 @@
package org.eclipse.papyrus.diagram.composite.edit.parts;
import org.eclipse.draw2d.IFigure;
+import org.eclipse.draw2d.geometry.Dimension;
+import org.eclipse.draw2d.geometry.Point;
+import org.eclipse.draw2d.geometry.Rectangle;
+import org.eclipse.emf.common.notify.Notification;
import org.eclipse.gef.EditPolicy;
+import org.eclipse.gef.GraphicalEditPart;
import org.eclipse.gmf.runtime.diagram.ui.editparts.ShapeCompartmentEditPart;
import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CreationEditPolicy;
import org.eclipse.gmf.runtime.diagram.ui.editpolicies.DragDropEditPolicy;
@@ -22,6 +27,7 @@ import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableCompartmentEditPolicy;
import org.eclipse.gmf.runtime.diagram.ui.figures.ResizableCompartmentFigure;
import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;
+import org.eclipse.gmf.runtime.notation.NotationPackage;
import org.eclipse.gmf.runtime.notation.View;
import org.eclipse.papyrus.diagram.common.editpolicies.CustomContainerEditPolicy;
import org.eclipse.papyrus.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy;
@@ -32,7 +38,11 @@ import org.eclipse.papyrus.diagram.composite.part.Messages;
/**
* @generated
*/
-public class ExecutionEnvironmentCompositeCompartmentEditPartCN extends ShapeCompartmentEditPart {
+public class ExecutionEnvironmentCompositeCompartmentEditPartCN
+
+extends ShapeCompartmentEditPart
+
+{
/**
* @generated
@@ -86,4 +96,38 @@ public class ExecutionEnvironmentCompositeCompartmentEditPartCN extends ShapeCom
}
}
+ /**
+ * @generated
+ */
+ protected void handleNotificationEvent(Notification notification) {
+ Object feature = notification.getFeature();
+ if (NotationPackage.eINSTANCE.getSize_Width().equals(feature)
+ || NotationPackage.eINSTANCE.getSize_Height().equals(feature)
+ || NotationPackage.eINSTANCE.getLocation_X().equals(feature)
+ || NotationPackage.eINSTANCE.getLocation_Y().equals(feature)) {
+ refreshBounds();
+ }
+ super.handleNotificationEvent(notification);
+ }
+
+ /**
+ * @generated
+ */
+ protected void refreshBounds() {
+ int width = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();
+ int height = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();
+ Dimension size = new Dimension(width, height);
+ int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();
+ int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();
+ Point loc = new Point(x, y);
+ ((GraphicalEditPart) getParent()).setLayoutConstraint(this, getFigure(), new Rectangle(loc, size));
+ }
+
+ /**
+ * @generated
+ */
+ protected void refreshVisuals() {
+ super.refreshVisuals();
+ refreshBounds();
+ }
}
diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/ExecutionEnvironmentCompositeEditPart.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/ExecutionEnvironmentCompositeEditPart.java
index 28357a2995a..650ed3be516 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/ExecutionEnvironmentCompositeEditPart.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/ExecutionEnvironmentCompositeEditPart.java
@@ -168,7 +168,7 @@ NamedElementEditPart {
if (childEditPart instanceof ExecutionEnvironmentCompositeCompartmentEditPart) {
IFigure pane = getPrimaryShape().getCompositeCompartmentFigure();
setupContentPane(pane); // FIXME each comparment should handle his content pane in his
- // own way
+ // own way
pane.add(((ExecutionEnvironmentCompositeCompartmentEditPart) childEditPart).getFigure());
return true;
}
@@ -193,7 +193,7 @@ NamedElementEditPart {
if (childEditPart instanceof ExecutionEnvironmentCompositeCompartmentEditPart) {
IFigure pane = getPrimaryShape().getCompositeCompartmentFigure();
setupContentPane(pane); // FIXME each comparment should handle his content pane in his
- // own way
+ // own way
pane.remove(((ExecutionEnvironmentCompositeCompartmentEditPart) childEditPart).getFigure());
return true;
}
@@ -332,7 +332,8 @@ NamedElementEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -363,7 +364,8 @@ NamedElementEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -3274,7 +3276,8 @@ NamedElementEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -6184,7 +6187,8 @@ NamedElementEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -6204,6 +6208,8 @@ NamedElementEditPart {
types.add(UMLElementTypes.Dependency_4010);
types.add(UMLElementTypes.Generalization_4015);
types.add(UMLElementTypes.InformationFlow_4016);
+ types.add(UMLElementTypes.TimeObservationEvent_4018);
+ types.add(UMLElementTypes.DurationObservationEvent_4019);
return types;
}
@@ -6217,7 +6223,8 @@ NamedElementEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -9136,6 +9143,12 @@ NamedElementEditPart {
if (relationshipType == UMLElementTypes.InformationFlow_4016) {
types.add(UMLElementTypes.Comment_3097);
}
+ if (relationshipType == UMLElementTypes.TimeObservationEvent_4018) {
+ types.add(UMLElementTypes.TimeObservation_2094);
+ }
+ if (relationshipType == UMLElementTypes.DurationObservationEvent_4019) {
+ types.add(UMLElementTypes.DurationObservation_2093);
+ }
return types;
}
diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/ExecutionEnvironmentCompositeEditPartCN.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/ExecutionEnvironmentCompositeEditPartCN.java
index 65c70841eb6..c77928fb2cb 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/ExecutionEnvironmentCompositeEditPartCN.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/ExecutionEnvironmentCompositeEditPartCN.java
@@ -168,7 +168,7 @@ NamedElementEditPart {
if (childEditPart instanceof ExecutionEnvironmentCompositeCompartmentEditPartCN) {
IFigure pane = getPrimaryShape().getCompositeCompartmentFigure();
setupContentPane(pane); // FIXME each comparment should handle his content pane in his
- // own way
+ // own way
pane.add(((ExecutionEnvironmentCompositeCompartmentEditPartCN) childEditPart).getFigure());
return true;
}
@@ -193,7 +193,7 @@ NamedElementEditPart {
if (childEditPart instanceof ExecutionEnvironmentCompositeCompartmentEditPartCN) {
IFigure pane = getPrimaryShape().getCompositeCompartmentFigure();
setupContentPane(pane); // FIXME each comparment should handle his content pane in his
- // own way
+ // own way
pane.remove(((ExecutionEnvironmentCompositeCompartmentEditPartCN) childEditPart).getFigure());
return true;
}
@@ -333,7 +333,8 @@ NamedElementEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -364,7 +365,8 @@ NamedElementEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -3275,7 +3277,8 @@ NamedElementEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -6185,7 +6188,8 @@ NamedElementEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -6205,6 +6209,8 @@ NamedElementEditPart {
types.add(UMLElementTypes.Dependency_4010);
types.add(UMLElementTypes.Generalization_4015);
types.add(UMLElementTypes.InformationFlow_4016);
+ types.add(UMLElementTypes.TimeObservationEvent_4018);
+ types.add(UMLElementTypes.DurationObservationEvent_4019);
return types;
}
@@ -6218,7 +6224,8 @@ NamedElementEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -9137,6 +9144,12 @@ NamedElementEditPart {
if (relationshipType == UMLElementTypes.InformationFlow_4016) {
types.add(UMLElementTypes.Comment_3097);
}
+ if (relationshipType == UMLElementTypes.TimeObservationEvent_4018) {
+ types.add(UMLElementTypes.TimeObservation_2094);
+ }
+ if (relationshipType == UMLElementTypes.DurationObservationEvent_4019) {
+ types.add(UMLElementTypes.DurationObservation_2093);
+ }
return types;
}
diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/ExecutionEventEditPart.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/ExecutionEventEditPart.java
index 1e0a4d300aa..3a205bb6b43 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/ExecutionEventEditPart.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/ExecutionEventEditPart.java
@@ -277,7 +277,8 @@ ShapeNodeEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -308,7 +309,8 @@ ShapeNodeEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -3219,7 +3221,8 @@ ShapeNodeEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -6129,7 +6132,8 @@ ShapeNodeEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -6149,6 +6153,8 @@ ShapeNodeEditPart {
types.add(UMLElementTypes.Dependency_4010);
types.add(UMLElementTypes.Generalization_4015);
types.add(UMLElementTypes.InformationFlow_4016);
+ types.add(UMLElementTypes.TimeObservationEvent_4018);
+ types.add(UMLElementTypes.DurationObservationEvent_4019);
return types;
}
@@ -6162,7 +6168,8 @@ ShapeNodeEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -9081,6 +9088,12 @@ ShapeNodeEditPart {
if (relationshipType == UMLElementTypes.InformationFlow_4016) {
types.add(UMLElementTypes.Comment_3097);
}
+ if (relationshipType == UMLElementTypes.TimeObservationEvent_4018) {
+ types.add(UMLElementTypes.TimeObservation_2094);
+ }
+ if (relationshipType == UMLElementTypes.DurationObservationEvent_4019) {
+ types.add(UMLElementTypes.DurationObservation_2093);
+ }
return types;
}
diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/ExpressionEditPart.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/ExpressionEditPart.java
index 8a8680418a3..0274341c7db 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/ExpressionEditPart.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/ExpressionEditPart.java
@@ -277,7 +277,8 @@ ShapeNodeEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -308,7 +309,8 @@ ShapeNodeEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -3219,7 +3221,8 @@ ShapeNodeEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -6129,7 +6132,8 @@ ShapeNodeEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -6149,6 +6153,8 @@ ShapeNodeEditPart {
types.add(UMLElementTypes.Dependency_4010);
types.add(UMLElementTypes.Generalization_4015);
types.add(UMLElementTypes.InformationFlow_4016);
+ types.add(UMLElementTypes.TimeObservationEvent_4018);
+ types.add(UMLElementTypes.DurationObservationEvent_4019);
return types;
}
@@ -6162,7 +6168,8 @@ ShapeNodeEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -9081,6 +9088,12 @@ ShapeNodeEditPart {
if (relationshipType == UMLElementTypes.InformationFlow_4016) {
types.add(UMLElementTypes.Comment_3097);
}
+ if (relationshipType == UMLElementTypes.TimeObservationEvent_4018) {
+ types.add(UMLElementTypes.TimeObservation_2094);
+ }
+ if (relationshipType == UMLElementTypes.DurationObservationEvent_4019) {
+ types.add(UMLElementTypes.DurationObservation_2093);
+ }
return types;
}
diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/FunctionBehaviorCompositeCompartmentEditPart.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/FunctionBehaviorCompositeCompartmentEditPart.java
index de2edaccf7a..592c7bae0cf 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/FunctionBehaviorCompositeCompartmentEditPart.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/FunctionBehaviorCompositeCompartmentEditPart.java
@@ -14,7 +14,12 @@
package org.eclipse.papyrus.diagram.composite.edit.parts;
import org.eclipse.draw2d.IFigure;
+import org.eclipse.draw2d.geometry.Dimension;
+import org.eclipse.draw2d.geometry.Point;
+import org.eclipse.draw2d.geometry.Rectangle;
+import org.eclipse.emf.common.notify.Notification;
import org.eclipse.gef.EditPolicy;
+import org.eclipse.gef.GraphicalEditPart;
import org.eclipse.gmf.runtime.diagram.ui.editparts.ShapeCompartmentEditPart;
import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CreationEditPolicy;
import org.eclipse.gmf.runtime.diagram.ui.editpolicies.DragDropEditPolicy;
@@ -22,6 +27,7 @@ import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableCompartmentEditPolicy;
import org.eclipse.gmf.runtime.diagram.ui.figures.ResizableCompartmentFigure;
import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;
+import org.eclipse.gmf.runtime.notation.NotationPackage;
import org.eclipse.gmf.runtime.notation.View;
import org.eclipse.papyrus.diagram.common.editpolicies.CustomContainerEditPolicy;
import org.eclipse.papyrus.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy;
@@ -32,7 +38,11 @@ import org.eclipse.papyrus.diagram.composite.part.Messages;
/**
* @generated
*/
-public class FunctionBehaviorCompositeCompartmentEditPart extends ShapeCompartmentEditPart {
+public class FunctionBehaviorCompositeCompartmentEditPart
+
+extends ShapeCompartmentEditPart
+
+{
/**
* @generated
@@ -86,4 +96,38 @@ public class FunctionBehaviorCompositeCompartmentEditPart extends ShapeCompartme
}
}
+ /**
+ * @generated
+ */
+ protected void handleNotificationEvent(Notification notification) {
+ Object feature = notification.getFeature();
+ if (NotationPackage.eINSTANCE.getSize_Width().equals(feature)
+ || NotationPackage.eINSTANCE.getSize_Height().equals(feature)
+ || NotationPackage.eINSTANCE.getLocation_X().equals(feature)
+ || NotationPackage.eINSTANCE.getLocation_Y().equals(feature)) {
+ refreshBounds();
+ }
+ super.handleNotificationEvent(notification);
+ }
+
+ /**
+ * @generated
+ */
+ protected void refreshBounds() {
+ int width = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();
+ int height = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();
+ Dimension size = new Dimension(width, height);
+ int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();
+ int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();
+ Point loc = new Point(x, y);
+ ((GraphicalEditPart) getParent()).setLayoutConstraint(this, getFigure(), new Rectangle(loc, size));
+ }
+
+ /**
+ * @generated
+ */
+ protected void refreshVisuals() {
+ super.refreshVisuals();
+ refreshBounds();
+ }
}
diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/FunctionBehaviorCompositeCompartmentEditPartCN.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/FunctionBehaviorCompositeCompartmentEditPartCN.java
index c6419dd5b86..d9e81938ae1 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/FunctionBehaviorCompositeCompartmentEditPartCN.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/FunctionBehaviorCompositeCompartmentEditPartCN.java
@@ -14,7 +14,12 @@
package org.eclipse.papyrus.diagram.composite.edit.parts;
import org.eclipse.draw2d.IFigure;
+import org.eclipse.draw2d.geometry.Dimension;
+import org.eclipse.draw2d.geometry.Point;
+import org.eclipse.draw2d.geometry.Rectangle;
+import org.eclipse.emf.common.notify.Notification;
import org.eclipse.gef.EditPolicy;
+import org.eclipse.gef.GraphicalEditPart;
import org.eclipse.gmf.runtime.diagram.ui.editparts.ShapeCompartmentEditPart;
import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CreationEditPolicy;
import org.eclipse.gmf.runtime.diagram.ui.editpolicies.DragDropEditPolicy;
@@ -22,6 +27,7 @@ import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableCompartmentEditPolicy;
import org.eclipse.gmf.runtime.diagram.ui.figures.ResizableCompartmentFigure;
import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;
+import org.eclipse.gmf.runtime.notation.NotationPackage;
import org.eclipse.gmf.runtime.notation.View;
import org.eclipse.papyrus.diagram.common.editpolicies.CustomContainerEditPolicy;
import org.eclipse.papyrus.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy;
@@ -32,7 +38,11 @@ import org.eclipse.papyrus.diagram.composite.part.Messages;
/**
* @generated
*/
-public class FunctionBehaviorCompositeCompartmentEditPartCN extends ShapeCompartmentEditPart {
+public class FunctionBehaviorCompositeCompartmentEditPartCN
+
+extends ShapeCompartmentEditPart
+
+{
/**
* @generated
@@ -86,4 +96,38 @@ public class FunctionBehaviorCompositeCompartmentEditPartCN extends ShapeCompart
}
}
+ /**
+ * @generated
+ */
+ protected void handleNotificationEvent(Notification notification) {
+ Object feature = notification.getFeature();
+ if (NotationPackage.eINSTANCE.getSize_Width().equals(feature)
+ || NotationPackage.eINSTANCE.getSize_Height().equals(feature)
+ || NotationPackage.eINSTANCE.getLocation_X().equals(feature)
+ || NotationPackage.eINSTANCE.getLocation_Y().equals(feature)) {
+ refreshBounds();
+ }
+ super.handleNotificationEvent(notification);
+ }
+
+ /**
+ * @generated
+ */
+ protected void refreshBounds() {
+ int width = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();
+ int height = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();
+ Dimension size = new Dimension(width, height);
+ int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();
+ int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();
+ Point loc = new Point(x, y);
+ ((GraphicalEditPart) getParent()).setLayoutConstraint(this, getFigure(), new Rectangle(loc, size));
+ }
+
+ /**
+ * @generated
+ */
+ protected void refreshVisuals() {
+ super.refreshVisuals();
+ refreshBounds();
+ }
}
diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/FunctionBehaviorCompositeEditPart.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/FunctionBehaviorCompositeEditPart.java
index bad0563e479..38962ed55e9 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/FunctionBehaviorCompositeEditPart.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/FunctionBehaviorCompositeEditPart.java
@@ -168,7 +168,7 @@ NamedElementEditPart {
if (childEditPart instanceof FunctionBehaviorCompositeCompartmentEditPart) {
IFigure pane = getPrimaryShape().getCompositeCompartmentFigure();
setupContentPane(pane); // FIXME each comparment should handle his content pane in his
- // own way
+ // own way
pane.add(((FunctionBehaviorCompositeCompartmentEditPart) childEditPart).getFigure());
return true;
}
@@ -193,7 +193,7 @@ NamedElementEditPart {
if (childEditPart instanceof FunctionBehaviorCompositeCompartmentEditPart) {
IFigure pane = getPrimaryShape().getCompositeCompartmentFigure();
setupContentPane(pane); // FIXME each comparment should handle his content pane in his
- // own way
+ // own way
pane.remove(((FunctionBehaviorCompositeCompartmentEditPart) childEditPart).getFigure());
return true;
}
@@ -332,7 +332,8 @@ NamedElementEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -363,7 +364,8 @@ NamedElementEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -3274,7 +3276,8 @@ NamedElementEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -6184,7 +6187,8 @@ NamedElementEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -6204,6 +6208,8 @@ NamedElementEditPart {
types.add(UMLElementTypes.Dependency_4010);
types.add(UMLElementTypes.Generalization_4015);
types.add(UMLElementTypes.InformationFlow_4016);
+ types.add(UMLElementTypes.TimeObservationEvent_4018);
+ types.add(UMLElementTypes.DurationObservationEvent_4019);
return types;
}
@@ -6217,7 +6223,8 @@ NamedElementEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -9136,6 +9143,12 @@ NamedElementEditPart {
if (relationshipType == UMLElementTypes.InformationFlow_4016) {
types.add(UMLElementTypes.Comment_3097);
}
+ if (relationshipType == UMLElementTypes.TimeObservationEvent_4018) {
+ types.add(UMLElementTypes.TimeObservation_2094);
+ }
+ if (relationshipType == UMLElementTypes.DurationObservationEvent_4019) {
+ types.add(UMLElementTypes.DurationObservation_2093);
+ }
return types;
}
diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/FunctionBehaviorCompositeEditPartCN.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/FunctionBehaviorCompositeEditPartCN.java
index 9e3ce20aa1a..c99868cc79d 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/FunctionBehaviorCompositeEditPartCN.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/FunctionBehaviorCompositeEditPartCN.java
@@ -168,7 +168,7 @@ NamedElementEditPart {
if (childEditPart instanceof FunctionBehaviorCompositeCompartmentEditPartCN) {
IFigure pane = getPrimaryShape().getCompositeCompartmentFigure();
setupContentPane(pane); // FIXME each comparment should handle his content pane in his
- // own way
+ // own way
pane.add(((FunctionBehaviorCompositeCompartmentEditPartCN) childEditPart).getFigure());
return true;
}
@@ -193,7 +193,7 @@ NamedElementEditPart {
if (childEditPart instanceof FunctionBehaviorCompositeCompartmentEditPartCN) {
IFigure pane = getPrimaryShape().getCompositeCompartmentFigure();
setupContentPane(pane); // FIXME each comparment should handle his content pane in his
- // own way
+ // own way
pane.remove(((FunctionBehaviorCompositeCompartmentEditPartCN) childEditPart).getFigure());
return true;
}
@@ -332,7 +332,8 @@ NamedElementEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -363,7 +364,8 @@ NamedElementEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -3274,7 +3276,8 @@ NamedElementEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -6184,7 +6187,8 @@ NamedElementEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -6204,6 +6208,8 @@ NamedElementEditPart {
types.add(UMLElementTypes.Dependency_4010);
types.add(UMLElementTypes.Generalization_4015);
types.add(UMLElementTypes.InformationFlow_4016);
+ types.add(UMLElementTypes.TimeObservationEvent_4018);
+ types.add(UMLElementTypes.DurationObservationEvent_4019);
return types;
}
@@ -6217,7 +6223,8 @@ NamedElementEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -9136,6 +9143,12 @@ NamedElementEditPart {
if (relationshipType == UMLElementTypes.InformationFlow_4016) {
types.add(UMLElementTypes.Comment_3097);
}
+ if (relationshipType == UMLElementTypes.TimeObservationEvent_4018) {
+ types.add(UMLElementTypes.TimeObservation_2094);
+ }
+ if (relationshipType == UMLElementTypes.DurationObservationEvent_4019) {
+ types.add(UMLElementTypes.DurationObservation_2093);
+ }
return types;
}
diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/InformationItemEditPart.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/InformationItemEditPart.java
index f41dd77681c..417e6498af1 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/InformationItemEditPart.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/InformationItemEditPart.java
@@ -277,7 +277,8 @@ ShapeNodeEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -308,7 +309,8 @@ ShapeNodeEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -3219,7 +3221,8 @@ ShapeNodeEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -6129,7 +6132,8 @@ ShapeNodeEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -6149,6 +6153,8 @@ ShapeNodeEditPart {
types.add(UMLElementTypes.Dependency_4010);
types.add(UMLElementTypes.Generalization_4015);
types.add(UMLElementTypes.InformationFlow_4016);
+ types.add(UMLElementTypes.TimeObservationEvent_4018);
+ types.add(UMLElementTypes.DurationObservationEvent_4019);
return types;
}
@@ -6162,7 +6168,8 @@ ShapeNodeEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -9081,6 +9088,12 @@ ShapeNodeEditPart {
if (relationshipType == UMLElementTypes.InformationFlow_4016) {
types.add(UMLElementTypes.Comment_3097);
}
+ if (relationshipType == UMLElementTypes.TimeObservationEvent_4018) {
+ types.add(UMLElementTypes.TimeObservation_2094);
+ }
+ if (relationshipType == UMLElementTypes.DurationObservationEvent_4019) {
+ types.add(UMLElementTypes.DurationObservation_2093);
+ }
return types;
}
diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/InformationItemEditPartCN.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/InformationItemEditPartCN.java
index 1fcc54eef6d..d71f8a6ced0 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/InformationItemEditPartCN.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/InformationItemEditPartCN.java
@@ -277,7 +277,8 @@ ShapeNodeEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -308,7 +309,8 @@ ShapeNodeEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -3219,7 +3221,8 @@ ShapeNodeEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -6129,7 +6132,8 @@ ShapeNodeEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -6149,6 +6153,8 @@ ShapeNodeEditPart {
types.add(UMLElementTypes.Dependency_4010);
types.add(UMLElementTypes.Generalization_4015);
types.add(UMLElementTypes.InformationFlow_4016);
+ types.add(UMLElementTypes.TimeObservationEvent_4018);
+ types.add(UMLElementTypes.DurationObservationEvent_4019);
return types;
}
@@ -6162,7 +6168,8 @@ ShapeNodeEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -9081,6 +9088,12 @@ ShapeNodeEditPart {
if (relationshipType == UMLElementTypes.InformationFlow_4016) {
types.add(UMLElementTypes.Comment_3097);
}
+ if (relationshipType == UMLElementTypes.TimeObservationEvent_4018) {
+ types.add(UMLElementTypes.TimeObservation_2094);
+ }
+ if (relationshipType == UMLElementTypes.DurationObservationEvent_4019) {
+ types.add(UMLElementTypes.DurationObservation_2093);
+ }
return types;
}
diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/InstanceValueEditPart.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/InstanceValueEditPart.java
index 8002e4028c2..a3b933dde03 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/InstanceValueEditPart.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/InstanceValueEditPart.java
@@ -277,7 +277,8 @@ ShapeNodeEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -308,7 +309,8 @@ ShapeNodeEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -3219,7 +3221,8 @@ ShapeNodeEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -6129,7 +6132,8 @@ ShapeNodeEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -6149,6 +6153,8 @@ ShapeNodeEditPart {
types.add(UMLElementTypes.Dependency_4010);
types.add(UMLElementTypes.Generalization_4015);
types.add(UMLElementTypes.InformationFlow_4016);
+ types.add(UMLElementTypes.TimeObservationEvent_4018);
+ types.add(UMLElementTypes.DurationObservationEvent_4019);
return types;
}
@@ -6162,7 +6168,8 @@ ShapeNodeEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -9081,6 +9088,12 @@ ShapeNodeEditPart {
if (relationshipType == UMLElementTypes.InformationFlow_4016) {
types.add(UMLElementTypes.Comment_3097);
}
+ if (relationshipType == UMLElementTypes.TimeObservationEvent_4018) {
+ types.add(UMLElementTypes.TimeObservation_2094);
+ }
+ if (relationshipType == UMLElementTypes.DurationObservationEvent_4019) {
+ types.add(UMLElementTypes.DurationObservation_2093);
+ }
return types;
}
diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/InteractionCompositeCompartmentEditPart.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/InteractionCompositeCompartmentEditPart.java
index e8e53f23c6e..e5464ec830f 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/InteractionCompositeCompartmentEditPart.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/InteractionCompositeCompartmentEditPart.java
@@ -14,7 +14,12 @@
package org.eclipse.papyrus.diagram.composite.edit.parts;
import org.eclipse.draw2d.IFigure;
+import org.eclipse.draw2d.geometry.Dimension;
+import org.eclipse.draw2d.geometry.Point;
+import org.eclipse.draw2d.geometry.Rectangle;
+import org.eclipse.emf.common.notify.Notification;
import org.eclipse.gef.EditPolicy;
+import org.eclipse.gef.GraphicalEditPart;
import org.eclipse.gmf.runtime.diagram.ui.editparts.ShapeCompartmentEditPart;
import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CreationEditPolicy;
import org.eclipse.gmf.runtime.diagram.ui.editpolicies.DragDropEditPolicy;
@@ -22,6 +27,7 @@ import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableCompartmentEditPolicy;
import org.eclipse.gmf.runtime.diagram.ui.figures.ResizableCompartmentFigure;
import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;
+import org.eclipse.gmf.runtime.notation.NotationPackage;
import org.eclipse.gmf.runtime.notation.View;
import org.eclipse.papyrus.diagram.common.editpolicies.CustomContainerEditPolicy;
import org.eclipse.papyrus.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy;
@@ -32,7 +38,11 @@ import org.eclipse.papyrus.diagram.composite.part.Messages;
/**
* @generated
*/
-public class InteractionCompositeCompartmentEditPart extends ShapeCompartmentEditPart {
+public class InteractionCompositeCompartmentEditPart
+
+extends ShapeCompartmentEditPart
+
+{
/**
* @generated
@@ -85,4 +95,38 @@ public class InteractionCompositeCompartmentEditPart extends ShapeCompartmentEdi
}
}
+ /**
+ * @generated
+ */
+ protected void handleNotificationEvent(Notification notification) {
+ Object feature = notification.getFeature();
+ if (NotationPackage.eINSTANCE.getSize_Width().equals(feature)
+ || NotationPackage.eINSTANCE.getSize_Height().equals(feature)
+ || NotationPackage.eINSTANCE.getLocation_X().equals(feature)
+ || NotationPackage.eINSTANCE.getLocation_Y().equals(feature)) {
+ refreshBounds();
+ }
+ super.handleNotificationEvent(notification);
+ }
+
+ /**
+ * @generated
+ */
+ protected void refreshBounds() {
+ int width = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();
+ int height = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();
+ Dimension size = new Dimension(width, height);
+ int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();
+ int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();
+ Point loc = new Point(x, y);
+ ((GraphicalEditPart) getParent()).setLayoutConstraint(this, getFigure(), new Rectangle(loc, size));
+ }
+
+ /**
+ * @generated
+ */
+ protected void refreshVisuals() {
+ super.refreshVisuals();
+ refreshBounds();
+ }
}
diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/InteractionCompositeCompartmentEditPartCN.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/InteractionCompositeCompartmentEditPartCN.java
index 2a325aed1d8..1ff4df5a37f 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/InteractionCompositeCompartmentEditPartCN.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/InteractionCompositeCompartmentEditPartCN.java
@@ -14,7 +14,12 @@
package org.eclipse.papyrus.diagram.composite.edit.parts;
import org.eclipse.draw2d.IFigure;
+import org.eclipse.draw2d.geometry.Dimension;
+import org.eclipse.draw2d.geometry.Point;
+import org.eclipse.draw2d.geometry.Rectangle;
+import org.eclipse.emf.common.notify.Notification;
import org.eclipse.gef.EditPolicy;
+import org.eclipse.gef.GraphicalEditPart;
import org.eclipse.gmf.runtime.diagram.ui.editparts.ShapeCompartmentEditPart;
import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CreationEditPolicy;
import org.eclipse.gmf.runtime.diagram.ui.editpolicies.DragDropEditPolicy;
@@ -22,6 +27,7 @@ import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableCompartmentEditPolicy;
import org.eclipse.gmf.runtime.diagram.ui.figures.ResizableCompartmentFigure;
import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;
+import org.eclipse.gmf.runtime.notation.NotationPackage;
import org.eclipse.gmf.runtime.notation.View;
import org.eclipse.papyrus.diagram.common.editpolicies.CustomContainerEditPolicy;
import org.eclipse.papyrus.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy;
@@ -32,7 +38,11 @@ import org.eclipse.papyrus.diagram.composite.part.Messages;
/**
* @generated
*/
-public class InteractionCompositeCompartmentEditPartCN extends ShapeCompartmentEditPart {
+public class InteractionCompositeCompartmentEditPartCN
+
+extends ShapeCompartmentEditPart
+
+{
/**
* @generated
@@ -85,4 +95,38 @@ public class InteractionCompositeCompartmentEditPartCN extends ShapeCompartmentE
}
}
+ /**
+ * @generated
+ */
+ protected void handleNotificationEvent(Notification notification) {
+ Object feature = notification.getFeature();
+ if (NotationPackage.eINSTANCE.getSize_Width().equals(feature)
+ || NotationPackage.eINSTANCE.getSize_Height().equals(feature)
+ || NotationPackage.eINSTANCE.getLocation_X().equals(feature)
+ || NotationPackage.eINSTANCE.getLocation_Y().equals(feature)) {
+ refreshBounds();
+ }
+ super.handleNotificationEvent(notification);
+ }
+
+ /**
+ * @generated
+ */
+ protected void refreshBounds() {
+ int width = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();
+ int height = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();
+ Dimension size = new Dimension(width, height);
+ int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();
+ int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();
+ Point loc = new Point(x, y);
+ ((GraphicalEditPart) getParent()).setLayoutConstraint(this, getFigure(), new Rectangle(loc, size));
+ }
+
+ /**
+ * @generated
+ */
+ protected void refreshVisuals() {
+ super.refreshVisuals();
+ refreshBounds();
+ }
}
diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/InteractionCompositeEditPart.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/InteractionCompositeEditPart.java
index 79b4b3c0419..06fb3ad8fd3 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/InteractionCompositeEditPart.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/InteractionCompositeEditPart.java
@@ -168,7 +168,7 @@ NamedElementEditPart {
if (childEditPart instanceof InteractionCompositeCompartmentEditPart) {
IFigure pane = getPrimaryShape().getCompositeCompartmentFigure();
setupContentPane(pane); // FIXME each comparment should handle his content pane in his
- // own way
+ // own way
pane.add(((InteractionCompositeCompartmentEditPart) childEditPart).getFigure());
return true;
}
@@ -193,7 +193,7 @@ NamedElementEditPart {
if (childEditPart instanceof InteractionCompositeCompartmentEditPart) {
IFigure pane = getPrimaryShape().getCompositeCompartmentFigure();
setupContentPane(pane); // FIXME each comparment should handle his content pane in his
- // own way
+ // own way
pane.remove(((InteractionCompositeCompartmentEditPart) childEditPart).getFigure());
return true;
}
@@ -332,7 +332,8 @@ NamedElementEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -363,7 +364,8 @@ NamedElementEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -3274,7 +3276,8 @@ NamedElementEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -6184,7 +6187,8 @@ NamedElementEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -6204,6 +6208,8 @@ NamedElementEditPart {
types.add(UMLElementTypes.Dependency_4010);
types.add(UMLElementTypes.Generalization_4015);
types.add(UMLElementTypes.InformationFlow_4016);
+ types.add(UMLElementTypes.TimeObservationEvent_4018);
+ types.add(UMLElementTypes.DurationObservationEvent_4019);
return types;
}
@@ -6217,7 +6223,8 @@ NamedElementEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -9136,6 +9143,12 @@ NamedElementEditPart {
if (relationshipType == UMLElementTypes.InformationFlow_4016) {
types.add(UMLElementTypes.Comment_3097);
}
+ if (relationshipType == UMLElementTypes.TimeObservationEvent_4018) {
+ types.add(UMLElementTypes.TimeObservation_2094);
+ }
+ if (relationshipType == UMLElementTypes.DurationObservationEvent_4019) {
+ types.add(UMLElementTypes.DurationObservation_2093);
+ }
return types;
}
diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/InteractionCompositeEditPartCN.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/InteractionCompositeEditPartCN.java
index 9ea4c53265c..85f9445787b 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/InteractionCompositeEditPartCN.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/InteractionCompositeEditPartCN.java
@@ -168,7 +168,7 @@ NamedElementEditPart {
if (childEditPart instanceof InteractionCompositeCompartmentEditPartCN) {
IFigure pane = getPrimaryShape().getCompositeCompartmentFigure();
setupContentPane(pane); // FIXME each comparment should handle his content pane in his
- // own way
+ // own way
pane.add(((InteractionCompositeCompartmentEditPartCN) childEditPart).getFigure());
return true;
}
@@ -193,7 +193,7 @@ NamedElementEditPart {
if (childEditPart instanceof InteractionCompositeCompartmentEditPartCN) {
IFigure pane = getPrimaryShape().getCompositeCompartmentFigure();
setupContentPane(pane); // FIXME each comparment should handle his content pane in his
- // own way
+ // own way
pane.remove(((InteractionCompositeCompartmentEditPartCN) childEditPart).getFigure());
return true;
}
@@ -332,7 +332,8 @@ NamedElementEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -363,7 +364,8 @@ NamedElementEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -3274,7 +3276,8 @@ NamedElementEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -6184,7 +6187,8 @@ NamedElementEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -6204,6 +6208,8 @@ NamedElementEditPart {
types.add(UMLElementTypes.Dependency_4010);
types.add(UMLElementTypes.Generalization_4015);
types.add(UMLElementTypes.InformationFlow_4016);
+ types.add(UMLElementTypes.TimeObservationEvent_4018);
+ types.add(UMLElementTypes.DurationObservationEvent_4019);
return types;
}
@@ -6217,7 +6223,8 @@ NamedElementEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -9136,6 +9143,12 @@ NamedElementEditPart {
if (relationshipType == UMLElementTypes.InformationFlow_4016) {
types.add(UMLElementTypes.Comment_3097);
}
+ if (relationshipType == UMLElementTypes.TimeObservationEvent_4018) {
+ types.add(UMLElementTypes.TimeObservation_2094);
+ }
+ if (relationshipType == UMLElementTypes.DurationObservationEvent_4019) {
+ types.add(UMLElementTypes.DurationObservation_2093);
+ }
return types;
}
diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/InteractionConstraintEditPart.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/InteractionConstraintEditPart.java
index d9430051505..03c3e06906f 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/InteractionConstraintEditPart.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/InteractionConstraintEditPart.java
@@ -277,7 +277,8 @@ ShapeNodeEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -309,7 +310,8 @@ ShapeNodeEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -3466,7 +3468,8 @@ ShapeNodeEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -6622,7 +6625,8 @@ ShapeNodeEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -6642,6 +6646,8 @@ ShapeNodeEditPart {
types.add(UMLElementTypes.Dependency_4010);
types.add(UMLElementTypes.Generalization_4015);
types.add(UMLElementTypes.InformationFlow_4016);
+ types.add(UMLElementTypes.TimeObservationEvent_4018);
+ types.add(UMLElementTypes.DurationObservationEvent_4019);
return types;
}
@@ -6655,7 +6661,8 @@ ShapeNodeEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -9574,6 +9581,12 @@ ShapeNodeEditPart {
if (relationshipType == UMLElementTypes.InformationFlow_4016) {
types.add(UMLElementTypes.Comment_3097);
}
+ if (relationshipType == UMLElementTypes.TimeObservationEvent_4018) {
+ types.add(UMLElementTypes.TimeObservation_2094);
+ }
+ if (relationshipType == UMLElementTypes.DurationObservationEvent_4019) {
+ types.add(UMLElementTypes.DurationObservation_2093);
+ }
return types;
}
diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/InterfaceCompartmentEditPart.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/InterfaceCompartmentEditPart.java
index 335deea6113..729cb253a31 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/InterfaceCompartmentEditPart.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/InterfaceCompartmentEditPart.java
@@ -14,12 +14,18 @@
package org.eclipse.papyrus.diagram.composite.edit.parts;
import org.eclipse.draw2d.IFigure;
+import org.eclipse.draw2d.geometry.Dimension;
+import org.eclipse.draw2d.geometry.Point;
+import org.eclipse.draw2d.geometry.Rectangle;
+import org.eclipse.emf.common.notify.Notification;
import org.eclipse.gef.EditPolicy;
+import org.eclipse.gef.GraphicalEditPart;
import org.eclipse.gmf.runtime.diagram.ui.editparts.ShapeCompartmentEditPart;
import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableCompartmentEditPolicy;
import org.eclipse.gmf.runtime.diagram.ui.figures.ResizableCompartmentFigure;
import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;
+import org.eclipse.gmf.runtime.notation.NotationPackage;
import org.eclipse.gmf.runtime.notation.View;
import org.eclipse.papyrus.diagram.common.editpolicies.CustomContainerEditPolicy;
import org.eclipse.papyrus.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy;
@@ -30,7 +36,11 @@ import org.eclipse.papyrus.diagram.composite.part.Messages;
/**
* @generated
*/
-public class InterfaceCompartmentEditPart extends ShapeCompartmentEditPart {
+public class InterfaceCompartmentEditPart
+
+extends ShapeCompartmentEditPart
+
+{
/**
* @generated
@@ -81,4 +91,38 @@ public class InterfaceCompartmentEditPart extends ShapeCompartmentEditPart {
}
}
+ /**
+ * @generated
+ */
+ protected void handleNotificationEvent(Notification notification) {
+ Object feature = notification.getFeature();
+ if (NotationPackage.eINSTANCE.getSize_Width().equals(feature)
+ || NotationPackage.eINSTANCE.getSize_Height().equals(feature)
+ || NotationPackage.eINSTANCE.getLocation_X().equals(feature)
+ || NotationPackage.eINSTANCE.getLocation_Y().equals(feature)) {
+ refreshBounds();
+ }
+ super.handleNotificationEvent(notification);
+ }
+
+ /**
+ * @generated
+ */
+ protected void refreshBounds() {
+ int width = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();
+ int height = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();
+ Dimension size = new Dimension(width, height);
+ int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();
+ int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();
+ Point loc = new Point(x, y);
+ ((GraphicalEditPart) getParent()).setLayoutConstraint(this, getFigure(), new Rectangle(loc, size));
+ }
+
+ /**
+ * @generated
+ */
+ protected void refreshVisuals() {
+ super.refreshVisuals();
+ refreshBounds();
+ }
}
diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/InterfaceCompartmentEditPartCN.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/InterfaceCompartmentEditPartCN.java
index 67a10185664..283e6611ea6 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/InterfaceCompartmentEditPartCN.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/InterfaceCompartmentEditPartCN.java
@@ -14,12 +14,18 @@
package org.eclipse.papyrus.diagram.composite.edit.parts;
import org.eclipse.draw2d.IFigure;
+import org.eclipse.draw2d.geometry.Dimension;
+import org.eclipse.draw2d.geometry.Point;
+import org.eclipse.draw2d.geometry.Rectangle;
+import org.eclipse.emf.common.notify.Notification;
import org.eclipse.gef.EditPolicy;
+import org.eclipse.gef.GraphicalEditPart;
import org.eclipse.gmf.runtime.diagram.ui.editparts.ShapeCompartmentEditPart;
import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableCompartmentEditPolicy;
import org.eclipse.gmf.runtime.diagram.ui.figures.ResizableCompartmentFigure;
import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;
+import org.eclipse.gmf.runtime.notation.NotationPackage;
import org.eclipse.gmf.runtime.notation.View;
import org.eclipse.papyrus.diagram.common.editpolicies.CustomContainerEditPolicy;
import org.eclipse.papyrus.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy;
@@ -30,7 +36,11 @@ import org.eclipse.papyrus.diagram.composite.part.Messages;
/**
* @generated
*/
-public class InterfaceCompartmentEditPartCN extends ShapeCompartmentEditPart {
+public class InterfaceCompartmentEditPartCN
+
+extends ShapeCompartmentEditPart
+
+{
/**
* @generated
@@ -81,4 +91,38 @@ public class InterfaceCompartmentEditPartCN extends ShapeCompartmentEditPart {
}
}
+ /**
+ * @generated
+ */
+ protected void handleNotificationEvent(Notification notification) {
+ Object feature = notification.getFeature();
+ if (NotationPackage.eINSTANCE.getSize_Width().equals(feature)
+ || NotationPackage.eINSTANCE.getSize_Height().equals(feature)
+ || NotationPackage.eINSTANCE.getLocation_X().equals(feature)
+ || NotationPackage.eINSTANCE.getLocation_Y().equals(feature)) {
+ refreshBounds();
+ }
+ super.handleNotificationEvent(notification);
+ }
+
+ /**
+ * @generated
+ */
+ protected void refreshBounds() {
+ int width = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();
+ int height = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();
+ Dimension size = new Dimension(width, height);
+ int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();
+ int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();
+ Point loc = new Point(x, y);
+ ((GraphicalEditPart) getParent()).setLayoutConstraint(this, getFigure(), new Rectangle(loc, size));
+ }
+
+ /**
+ * @generated
+ */
+ protected void refreshVisuals() {
+ super.refreshVisuals();
+ refreshBounds();
+ }
}
diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/InterfaceEditPart.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/InterfaceEditPart.java
index 8cad3d2bf43..a29a5c9d37f 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/InterfaceEditPart.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/InterfaceEditPart.java
@@ -150,7 +150,7 @@ NamedElementEditPart {
if (childEditPart instanceof InterfaceCompartmentEditPart) {
IFigure pane = getPrimaryShape().getCompositeCompartmentFigure();
setupContentPane(pane); // FIXME each comparment should handle his content pane in his
- // own way
+ // own way
pane.add(((InterfaceCompartmentEditPart) childEditPart).getFigure());
return true;
}
@@ -168,7 +168,7 @@ NamedElementEditPart {
if (childEditPart instanceof InterfaceCompartmentEditPart) {
IFigure pane = getPrimaryShape().getCompositeCompartmentFigure();
setupContentPane(pane); // FIXME each comparment should handle his content pane in his
- // own way
+ // own way
pane.remove(((InterfaceCompartmentEditPart) childEditPart).getFigure());
return true;
}
@@ -300,7 +300,8 @@ NamedElementEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -331,7 +332,8 @@ NamedElementEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -3242,7 +3244,8 @@ NamedElementEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -6152,7 +6155,8 @@ NamedElementEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -6172,6 +6176,8 @@ NamedElementEditPart {
types.add(UMLElementTypes.Dependency_4010);
types.add(UMLElementTypes.Generalization_4015);
types.add(UMLElementTypes.InformationFlow_4016);
+ types.add(UMLElementTypes.TimeObservationEvent_4018);
+ types.add(UMLElementTypes.DurationObservationEvent_4019);
return types;
}
@@ -6185,7 +6191,8 @@ NamedElementEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -9104,6 +9111,12 @@ NamedElementEditPart {
if (relationshipType == UMLElementTypes.InformationFlow_4016) {
types.add(UMLElementTypes.Comment_3097);
}
+ if (relationshipType == UMLElementTypes.TimeObservationEvent_4018) {
+ types.add(UMLElementTypes.TimeObservation_2094);
+ }
+ if (relationshipType == UMLElementTypes.DurationObservationEvent_4019) {
+ types.add(UMLElementTypes.DurationObservation_2093);
+ }
return types;
}
diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/InterfaceEditPartCN.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/InterfaceEditPartCN.java
index 2feb294ccd2..f34c75633de 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/InterfaceEditPartCN.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/InterfaceEditPartCN.java
@@ -150,7 +150,7 @@ NamedElementEditPart {
if (childEditPart instanceof InterfaceCompartmentEditPartCN) {
IFigure pane = getPrimaryShape().getCompositeCompartmentFigure();
setupContentPane(pane); // FIXME each comparment should handle his content pane in his
- // own way
+ // own way
pane.add(((InterfaceCompartmentEditPartCN) childEditPart).getFigure());
return true;
}
@@ -168,7 +168,7 @@ NamedElementEditPart {
if (childEditPart instanceof InterfaceCompartmentEditPartCN) {
IFigure pane = getPrimaryShape().getCompositeCompartmentFigure();
setupContentPane(pane); // FIXME each comparment should handle his content pane in his
- // own way
+ // own way
pane.remove(((InterfaceCompartmentEditPartCN) childEditPart).getFigure());
return true;
}
@@ -300,7 +300,8 @@ NamedElementEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -331,7 +332,8 @@ NamedElementEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -3242,7 +3244,8 @@ NamedElementEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -6152,7 +6155,8 @@ NamedElementEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -6172,6 +6176,8 @@ NamedElementEditPart {
types.add(UMLElementTypes.Dependency_4010);
types.add(UMLElementTypes.Generalization_4015);
types.add(UMLElementTypes.InformationFlow_4016);
+ types.add(UMLElementTypes.TimeObservationEvent_4018);
+ types.add(UMLElementTypes.DurationObservationEvent_4019);
return types;
}
@@ -6185,7 +6191,8 @@ NamedElementEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -9104,6 +9111,12 @@ NamedElementEditPart {
if (relationshipType == UMLElementTypes.InformationFlow_4016) {
types.add(UMLElementTypes.Comment_3097);
}
+ if (relationshipType == UMLElementTypes.TimeObservationEvent_4018) {
+ types.add(UMLElementTypes.TimeObservation_2094);
+ }
+ if (relationshipType == UMLElementTypes.DurationObservationEvent_4019) {
+ types.add(UMLElementTypes.DurationObservation_2093);
+ }
return types;
}
diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/IntervalConstraintEditPart.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/IntervalConstraintEditPart.java
index c57db5e2b31..d30cd83ece5 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/IntervalConstraintEditPart.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/IntervalConstraintEditPart.java
@@ -277,7 +277,8 @@ ShapeNodeEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -309,7 +310,8 @@ ShapeNodeEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -3466,7 +3468,8 @@ ShapeNodeEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -6622,7 +6625,8 @@ ShapeNodeEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -6642,6 +6646,8 @@ ShapeNodeEditPart {
types.add(UMLElementTypes.Dependency_4010);
types.add(UMLElementTypes.Generalization_4015);
types.add(UMLElementTypes.InformationFlow_4016);
+ types.add(UMLElementTypes.TimeObservationEvent_4018);
+ types.add(UMLElementTypes.DurationObservationEvent_4019);
return types;
}
@@ -6655,7 +6661,8 @@ ShapeNodeEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -9574,6 +9581,12 @@ ShapeNodeEditPart {
if (relationshipType == UMLElementTypes.InformationFlow_4016) {
types.add(UMLElementTypes.Comment_3097);
}
+ if (relationshipType == UMLElementTypes.TimeObservationEvent_4018) {
+ types.add(UMLElementTypes.TimeObservation_2094);
+ }
+ if (relationshipType == UMLElementTypes.DurationObservationEvent_4019) {
+ types.add(UMLElementTypes.DurationObservation_2093);
+ }
return types;
}
diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/IntervalEditPart.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/IntervalEditPart.java
index 7c48d095e39..78744b3e1b0 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/IntervalEditPart.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/IntervalEditPart.java
@@ -277,7 +277,8 @@ ShapeNodeEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -308,7 +309,8 @@ ShapeNodeEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -3219,7 +3221,8 @@ ShapeNodeEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -6129,7 +6132,8 @@ ShapeNodeEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -6149,6 +6153,8 @@ ShapeNodeEditPart {
types.add(UMLElementTypes.Dependency_4010);
types.add(UMLElementTypes.Generalization_4015);
types.add(UMLElementTypes.InformationFlow_4016);
+ types.add(UMLElementTypes.TimeObservationEvent_4018);
+ types.add(UMLElementTypes.DurationObservationEvent_4019);
return types;
}
@@ -6162,7 +6168,8 @@ ShapeNodeEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -9081,6 +9088,12 @@ ShapeNodeEditPart {
if (relationshipType == UMLElementTypes.InformationFlow_4016) {
types.add(UMLElementTypes.Comment_3097);
}
+ if (relationshipType == UMLElementTypes.TimeObservationEvent_4018) {
+ types.add(UMLElementTypes.TimeObservation_2094);
+ }
+ if (relationshipType == UMLElementTypes.DurationObservationEvent_4019) {
+ types.add(UMLElementTypes.DurationObservation_2093);
+ }
return types;
}
diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/LiteralBooleanEditPart.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/LiteralBooleanEditPart.java
index 3f82b53f811..96fe3643765 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/LiteralBooleanEditPart.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/LiteralBooleanEditPart.java
@@ -277,7 +277,8 @@ ShapeNodeEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -308,7 +309,8 @@ ShapeNodeEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -3219,7 +3221,8 @@ ShapeNodeEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -6129,7 +6132,8 @@ ShapeNodeEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -6149,6 +6153,8 @@ ShapeNodeEditPart {
types.add(UMLElementTypes.Dependency_4010);
types.add(UMLElementTypes.Generalization_4015);
types.add(UMLElementTypes.InformationFlow_4016);
+ types.add(UMLElementTypes.TimeObservationEvent_4018);
+ types.add(UMLElementTypes.DurationObservationEvent_4019);
return types;
}
@@ -6162,7 +6168,8 @@ ShapeNodeEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -9081,6 +9088,12 @@ ShapeNodeEditPart {
if (relationshipType == UMLElementTypes.InformationFlow_4016) {
types.add(UMLElementTypes.Comment_3097);
}
+ if (relationshipType == UMLElementTypes.TimeObservationEvent_4018) {
+ types.add(UMLElementTypes.TimeObservation_2094);
+ }
+ if (relationshipType == UMLElementTypes.DurationObservationEvent_4019) {
+ types.add(UMLElementTypes.DurationObservation_2093);
+ }
return types;
}
diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/LiteralIntegerEditPart.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/LiteralIntegerEditPart.java
index b8a223959fe..9803ed94a53 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/LiteralIntegerEditPart.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/LiteralIntegerEditPart.java
@@ -277,7 +277,8 @@ ShapeNodeEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -308,7 +309,8 @@ ShapeNodeEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -3219,7 +3221,8 @@ ShapeNodeEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -6129,7 +6132,8 @@ ShapeNodeEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -6149,6 +6153,8 @@ ShapeNodeEditPart {
types.add(UMLElementTypes.Dependency_4010);
types.add(UMLElementTypes.Generalization_4015);
types.add(UMLElementTypes.InformationFlow_4016);
+ types.add(UMLElementTypes.TimeObservationEvent_4018);
+ types.add(UMLElementTypes.DurationObservationEvent_4019);
return types;
}
@@ -6162,7 +6168,8 @@ ShapeNodeEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -9081,6 +9088,12 @@ ShapeNodeEditPart {
if (relationshipType == UMLElementTypes.InformationFlow_4016) {
types.add(UMLElementTypes.Comment_3097);
}
+ if (relationshipType == UMLElementTypes.TimeObservationEvent_4018) {
+ types.add(UMLElementTypes.TimeObservation_2094);
+ }
+ if (relationshipType == UMLElementTypes.DurationObservationEvent_4019) {
+ types.add(UMLElementTypes.DurationObservation_2093);
+ }
return types;
}
diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/LiteralNullEditPart.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/LiteralNullEditPart.java
index 58e617fac53..dc3900b9a63 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/LiteralNullEditPart.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/LiteralNullEditPart.java
@@ -277,7 +277,8 @@ ShapeNodeEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -308,7 +309,8 @@ ShapeNodeEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -3219,7 +3221,8 @@ ShapeNodeEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -6129,7 +6132,8 @@ ShapeNodeEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -6149,6 +6153,8 @@ ShapeNodeEditPart {
types.add(UMLElementTypes.Dependency_4010);
types.add(UMLElementTypes.Generalization_4015);
types.add(UMLElementTypes.InformationFlow_4016);
+ types.add(UMLElementTypes.TimeObservationEvent_4018);
+ types.add(UMLElementTypes.DurationObservationEvent_4019);
return types;
}
@@ -6162,7 +6168,8 @@ ShapeNodeEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -9081,6 +9088,12 @@ ShapeNodeEditPart {
if (relationshipType == UMLElementTypes.InformationFlow_4016) {
types.add(UMLElementTypes.Comment_3097);
}
+ if (relationshipType == UMLElementTypes.TimeObservationEvent_4018) {
+ types.add(UMLElementTypes.TimeObservation_2094);
+ }
+ if (relationshipType == UMLElementTypes.DurationObservationEvent_4019) {
+ types.add(UMLElementTypes.DurationObservation_2093);
+ }
return types;
}
diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/LiteralStringEditPart.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/LiteralStringEditPart.java
index 555ccdf1524..52b7c6c451a 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/LiteralStringEditPart.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/LiteralStringEditPart.java
@@ -277,7 +277,8 @@ ShapeNodeEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -308,7 +309,8 @@ ShapeNodeEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -3219,7 +3221,8 @@ ShapeNodeEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -6129,7 +6132,8 @@ ShapeNodeEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -6149,6 +6153,8 @@ ShapeNodeEditPart {
types.add(UMLElementTypes.Dependency_4010);
types.add(UMLElementTypes.Generalization_4015);
types.add(UMLElementTypes.InformationFlow_4016);
+ types.add(UMLElementTypes.TimeObservationEvent_4018);
+ types.add(UMLElementTypes.DurationObservationEvent_4019);
return types;
}
@@ -6162,7 +6168,8 @@ ShapeNodeEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -9081,6 +9088,12 @@ ShapeNodeEditPart {
if (relationshipType == UMLElementTypes.InformationFlow_4016) {
types.add(UMLElementTypes.Comment_3097);
}
+ if (relationshipType == UMLElementTypes.TimeObservationEvent_4018) {
+ types.add(UMLElementTypes.TimeObservation_2094);
+ }
+ if (relationshipType == UMLElementTypes.DurationObservationEvent_4019) {
+ types.add(UMLElementTypes.DurationObservation_2093);
+ }
return types;
}
diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/LiteralUnlimitedNaturalEditPart.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/LiteralUnlimitedNaturalEditPart.java
index 8bf070026c7..f2995a3ca2b 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/LiteralUnlimitedNaturalEditPart.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/LiteralUnlimitedNaturalEditPart.java
@@ -278,7 +278,8 @@ ShapeNodeEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -309,7 +310,8 @@ ShapeNodeEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -3220,7 +3222,8 @@ ShapeNodeEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -6130,7 +6133,8 @@ ShapeNodeEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -6150,6 +6154,8 @@ ShapeNodeEditPart {
types.add(UMLElementTypes.Dependency_4010);
types.add(UMLElementTypes.Generalization_4015);
types.add(UMLElementTypes.InformationFlow_4016);
+ types.add(UMLElementTypes.TimeObservationEvent_4018);
+ types.add(UMLElementTypes.DurationObservationEvent_4019);
return types;
}
@@ -6163,7 +6169,8 @@ ShapeNodeEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -9082,6 +9089,12 @@ ShapeNodeEditPart {
if (relationshipType == UMLElementTypes.InformationFlow_4016) {
types.add(UMLElementTypes.Comment_3097);
}
+ if (relationshipType == UMLElementTypes.TimeObservationEvent_4018) {
+ types.add(UMLElementTypes.TimeObservation_2094);
+ }
+ if (relationshipType == UMLElementTypes.DurationObservationEvent_4019) {
+ types.add(UMLElementTypes.DurationObservation_2093);
+ }
return types;
}
diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/NodeCompositeCompartmentEditPart.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/NodeCompositeCompartmentEditPart.java
index e1d759d934c..774981fa30c 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/NodeCompositeCompartmentEditPart.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/NodeCompositeCompartmentEditPart.java
@@ -14,7 +14,12 @@
package org.eclipse.papyrus.diagram.composite.edit.parts;
import org.eclipse.draw2d.IFigure;
+import org.eclipse.draw2d.geometry.Dimension;
+import org.eclipse.draw2d.geometry.Point;
+import org.eclipse.draw2d.geometry.Rectangle;
+import org.eclipse.emf.common.notify.Notification;
import org.eclipse.gef.EditPolicy;
+import org.eclipse.gef.GraphicalEditPart;
import org.eclipse.gmf.runtime.diagram.ui.editparts.ShapeCompartmentEditPart;
import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CreationEditPolicy;
import org.eclipse.gmf.runtime.diagram.ui.editpolicies.DragDropEditPolicy;
@@ -22,6 +27,7 @@ import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableCompartmentEditPolicy;
import org.eclipse.gmf.runtime.diagram.ui.figures.ResizableCompartmentFigure;
import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;
+import org.eclipse.gmf.runtime.notation.NotationPackage;
import org.eclipse.gmf.runtime.notation.View;
import org.eclipse.papyrus.diagram.common.editpolicies.CustomContainerEditPolicy;
import org.eclipse.papyrus.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy;
@@ -32,7 +38,11 @@ import org.eclipse.papyrus.diagram.composite.part.Messages;
/**
* @generated
*/
-public class NodeCompositeCompartmentEditPart extends ShapeCompartmentEditPart {
+public class NodeCompositeCompartmentEditPart
+
+extends ShapeCompartmentEditPart
+
+{
/**
* @generated
@@ -85,4 +95,38 @@ public class NodeCompositeCompartmentEditPart extends ShapeCompartmentEditPart {
}
}
+ /**
+ * @generated
+ */
+ protected void handleNotificationEvent(Notification notification) {
+ Object feature = notification.getFeature();
+ if (NotationPackage.eINSTANCE.getSize_Width().equals(feature)
+ || NotationPackage.eINSTANCE.getSize_Height().equals(feature)
+ || NotationPackage.eINSTANCE.getLocation_X().equals(feature)
+ || NotationPackage.eINSTANCE.getLocation_Y().equals(feature)) {
+ refreshBounds();
+ }
+ super.handleNotificationEvent(notification);
+ }
+
+ /**
+ * @generated
+ */
+ protected void refreshBounds() {
+ int width = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();
+ int height = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();
+ Dimension size = new Dimension(width, height);
+ int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();
+ int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();
+ Point loc = new Point(x, y);
+ ((GraphicalEditPart) getParent()).setLayoutConstraint(this, getFigure(), new Rectangle(loc, size));
+ }
+
+ /**
+ * @generated
+ */
+ protected void refreshVisuals() {
+ super.refreshVisuals();
+ refreshBounds();
+ }
}
diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/NodeCompositeCompartmentEditPartCN.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/NodeCompositeCompartmentEditPartCN.java
index 39eb4d7bf1d..0e961c068cd 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/NodeCompositeCompartmentEditPartCN.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/NodeCompositeCompartmentEditPartCN.java
@@ -14,7 +14,12 @@
package org.eclipse.papyrus.diagram.composite.edit.parts;
import org.eclipse.draw2d.IFigure;
+import org.eclipse.draw2d.geometry.Dimension;
+import org.eclipse.draw2d.geometry.Point;
+import org.eclipse.draw2d.geometry.Rectangle;
+import org.eclipse.emf.common.notify.Notification;
import org.eclipse.gef.EditPolicy;
+import org.eclipse.gef.GraphicalEditPart;
import org.eclipse.gmf.runtime.diagram.ui.editparts.ShapeCompartmentEditPart;
import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CreationEditPolicy;
import org.eclipse.gmf.runtime.diagram.ui.editpolicies.DragDropEditPolicy;
@@ -22,6 +27,7 @@ import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableCompartmentEditPolicy;
import org.eclipse.gmf.runtime.diagram.ui.figures.ResizableCompartmentFigure;
import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;
+import org.eclipse.gmf.runtime.notation.NotationPackage;
import org.eclipse.gmf.runtime.notation.View;
import org.eclipse.papyrus.diagram.common.editpolicies.CustomContainerEditPolicy;
import org.eclipse.papyrus.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy;
@@ -32,7 +38,11 @@ import org.eclipse.papyrus.diagram.composite.part.Messages;
/**
* @generated
*/
-public class NodeCompositeCompartmentEditPartCN extends ShapeCompartmentEditPart {
+public class NodeCompositeCompartmentEditPartCN
+
+extends ShapeCompartmentEditPart
+
+{
/**
* @generated
@@ -85,4 +95,38 @@ public class NodeCompositeCompartmentEditPartCN extends ShapeCompartmentEditPart
}
}
+ /**
+ * @generated
+ */
+ protected void handleNotificationEvent(Notification notification) {
+ Object feature = notification.getFeature();
+ if (NotationPackage.eINSTANCE.getSize_Width().equals(feature)
+ || NotationPackage.eINSTANCE.getSize_Height().equals(feature)
+ || NotationPackage.eINSTANCE.getLocation_X().equals(feature)
+ || NotationPackage.eINSTANCE.getLocation_Y().equals(feature)) {
+ refreshBounds();
+ }
+ super.handleNotificationEvent(notification);
+ }
+
+ /**
+ * @generated
+ */
+ protected void refreshBounds() {
+ int width = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();
+ int height = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();
+ Dimension size = new Dimension(width, height);
+ int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();
+ int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();
+ Point loc = new Point(x, y);
+ ((GraphicalEditPart) getParent()).setLayoutConstraint(this, getFigure(), new Rectangle(loc, size));
+ }
+
+ /**
+ * @generated
+ */
+ protected void refreshVisuals() {
+ super.refreshVisuals();
+ refreshBounds();
+ }
}
diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/NodeCompositeEditPart.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/NodeCompositeEditPart.java
index 7d26c4c8e4e..95c9f218754 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/NodeCompositeEditPart.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/NodeCompositeEditPart.java
@@ -168,7 +168,7 @@ NamedElementEditPart {
if (childEditPart instanceof NodeCompositeCompartmentEditPart) {
IFigure pane = getPrimaryShape().getCompositeCompartmentFigure();
setupContentPane(pane); // FIXME each comparment should handle his content pane in his
- // own way
+ // own way
pane.add(((NodeCompositeCompartmentEditPart) childEditPart).getFigure());
return true;
}
@@ -193,7 +193,7 @@ NamedElementEditPart {
if (childEditPart instanceof NodeCompositeCompartmentEditPart) {
IFigure pane = getPrimaryShape().getCompositeCompartmentFigure();
setupContentPane(pane); // FIXME each comparment should handle his content pane in his
- // own way
+ // own way
pane.remove(((NodeCompositeCompartmentEditPart) childEditPart).getFigure());
return true;
}
@@ -332,7 +332,8 @@ NamedElementEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -363,7 +364,8 @@ NamedElementEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -3274,7 +3276,8 @@ NamedElementEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -6184,7 +6187,8 @@ NamedElementEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -6204,6 +6208,8 @@ NamedElementEditPart {
types.add(UMLElementTypes.Dependency_4010);
types.add(UMLElementTypes.Generalization_4015);
types.add(UMLElementTypes.InformationFlow_4016);
+ types.add(UMLElementTypes.TimeObservationEvent_4018);
+ types.add(UMLElementTypes.DurationObservationEvent_4019);
return types;
}
@@ -6217,7 +6223,8 @@ NamedElementEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -9136,6 +9143,12 @@ NamedElementEditPart {
if (relationshipType == UMLElementTypes.InformationFlow_4016) {
types.add(UMLElementTypes.Comment_3097);
}
+ if (relationshipType == UMLElementTypes.TimeObservationEvent_4018) {
+ types.add(UMLElementTypes.TimeObservation_2094);
+ }
+ if (relationshipType == UMLElementTypes.DurationObservationEvent_4019) {
+ types.add(UMLElementTypes.DurationObservation_2093);
+ }
return types;
}
diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/NodeCompositeEditPartCN.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/NodeCompositeEditPartCN.java
index 2a0aed6f41c..1b0611424df 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/NodeCompositeEditPartCN.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/NodeCompositeEditPartCN.java
@@ -168,7 +168,7 @@ NamedElementEditPart {
if (childEditPart instanceof NodeCompositeCompartmentEditPartCN) {
IFigure pane = getPrimaryShape().getCompositeCompartmentFigure();
setupContentPane(pane); // FIXME each comparment should handle his content pane in his
- // own way
+ // own way
pane.add(((NodeCompositeCompartmentEditPartCN) childEditPart).getFigure());
return true;
}
@@ -193,7 +193,7 @@ NamedElementEditPart {
if (childEditPart instanceof NodeCompositeCompartmentEditPartCN) {
IFigure pane = getPrimaryShape().getCompositeCompartmentFigure();
setupContentPane(pane); // FIXME each comparment should handle his content pane in his
- // own way
+ // own way
pane.remove(((NodeCompositeCompartmentEditPartCN) childEditPart).getFigure());
return true;
}
@@ -332,7 +332,8 @@ NamedElementEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -363,7 +364,8 @@ NamedElementEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -3274,7 +3276,8 @@ NamedElementEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -6184,7 +6187,8 @@ NamedElementEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -6204,6 +6208,8 @@ NamedElementEditPart {
types.add(UMLElementTypes.Dependency_4010);
types.add(UMLElementTypes.Generalization_4015);
types.add(UMLElementTypes.InformationFlow_4016);
+ types.add(UMLElementTypes.TimeObservationEvent_4018);
+ types.add(UMLElementTypes.DurationObservationEvent_4019);
return types;
}
@@ -6217,7 +6223,8 @@ NamedElementEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -9136,6 +9143,12 @@ NamedElementEditPart {
if (relationshipType == UMLElementTypes.InformationFlow_4016) {
types.add(UMLElementTypes.Comment_3097);
}
+ if (relationshipType == UMLElementTypes.TimeObservationEvent_4018) {
+ types.add(UMLElementTypes.TimeObservation_2094);
+ }
+ if (relationshipType == UMLElementTypes.DurationObservationEvent_4019) {
+ types.add(UMLElementTypes.DurationObservation_2093);
+ }
return types;
}
diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/OpaqueBehaviorCompositeCompartmentEditPart.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/OpaqueBehaviorCompositeCompartmentEditPart.java
index 80bbb3a87fc..07cc8953a49 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/OpaqueBehaviorCompositeCompartmentEditPart.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/OpaqueBehaviorCompositeCompartmentEditPart.java
@@ -14,7 +14,12 @@
package org.eclipse.papyrus.diagram.composite.edit.parts;
import org.eclipse.draw2d.IFigure;
+import org.eclipse.draw2d.geometry.Dimension;
+import org.eclipse.draw2d.geometry.Point;
+import org.eclipse.draw2d.geometry.Rectangle;
+import org.eclipse.emf.common.notify.Notification;
import org.eclipse.gef.EditPolicy;
+import org.eclipse.gef.GraphicalEditPart;
import org.eclipse.gmf.runtime.diagram.ui.editparts.ShapeCompartmentEditPart;
import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CreationEditPolicy;
import org.eclipse.gmf.runtime.diagram.ui.editpolicies.DragDropEditPolicy;
@@ -22,6 +27,7 @@ import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableCompartmentEditPolicy;
import org.eclipse.gmf.runtime.diagram.ui.figures.ResizableCompartmentFigure;
import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;
+import org.eclipse.gmf.runtime.notation.NotationPackage;
import org.eclipse.gmf.runtime.notation.View;
import org.eclipse.papyrus.diagram.common.editpolicies.CustomContainerEditPolicy;
import org.eclipse.papyrus.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy;
@@ -32,7 +38,11 @@ import org.eclipse.papyrus.diagram.composite.part.Messages;
/**
* @generated
*/
-public class OpaqueBehaviorCompositeCompartmentEditPart extends ShapeCompartmentEditPart {
+public class OpaqueBehaviorCompositeCompartmentEditPart
+
+extends ShapeCompartmentEditPart
+
+{
/**
* @generated
@@ -85,4 +95,38 @@ public class OpaqueBehaviorCompositeCompartmentEditPart extends ShapeCompartment
}
}
+ /**
+ * @generated
+ */
+ protected void handleNotificationEvent(Notification notification) {
+ Object feature = notification.getFeature();
+ if (NotationPackage.eINSTANCE.getSize_Width().equals(feature)
+ || NotationPackage.eINSTANCE.getSize_Height().equals(feature)
+ || NotationPackage.eINSTANCE.getLocation_X().equals(feature)
+ || NotationPackage.eINSTANCE.getLocation_Y().equals(feature)) {
+ refreshBounds();
+ }
+ super.handleNotificationEvent(notification);
+ }
+
+ /**
+ * @generated
+ */
+ protected void refreshBounds() {
+ int width = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();
+ int height = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();
+ Dimension size = new Dimension(width, height);
+ int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();
+ int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();
+ Point loc = new Point(x, y);
+ ((GraphicalEditPart) getParent()).setLayoutConstraint(this, getFigure(), new Rectangle(loc, size));
+ }
+
+ /**
+ * @generated
+ */
+ protected void refreshVisuals() {
+ super.refreshVisuals();
+ refreshBounds();
+ }
}
diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/OpaqueBehaviorCompositeCompartmentEditPartCN.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/OpaqueBehaviorCompositeCompartmentEditPartCN.java
index 36567d03803..3b03ab61927 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/OpaqueBehaviorCompositeCompartmentEditPartCN.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/OpaqueBehaviorCompositeCompartmentEditPartCN.java
@@ -14,7 +14,12 @@
package org.eclipse.papyrus.diagram.composite.edit.parts;
import org.eclipse.draw2d.IFigure;
+import org.eclipse.draw2d.geometry.Dimension;
+import org.eclipse.draw2d.geometry.Point;
+import org.eclipse.draw2d.geometry.Rectangle;
+import org.eclipse.emf.common.notify.Notification;
import org.eclipse.gef.EditPolicy;
+import org.eclipse.gef.GraphicalEditPart;
import org.eclipse.gmf.runtime.diagram.ui.editparts.ShapeCompartmentEditPart;
import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CreationEditPolicy;
import org.eclipse.gmf.runtime.diagram.ui.editpolicies.DragDropEditPolicy;
@@ -22,6 +27,7 @@ import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableCompartmentEditPolicy;
import org.eclipse.gmf.runtime.diagram.ui.figures.ResizableCompartmentFigure;
import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;
+import org.eclipse.gmf.runtime.notation.NotationPackage;
import org.eclipse.gmf.runtime.notation.View;
import org.eclipse.papyrus.diagram.common.editpolicies.CustomContainerEditPolicy;
import org.eclipse.papyrus.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy;
@@ -32,7 +38,11 @@ import org.eclipse.papyrus.diagram.composite.part.Messages;
/**
* @generated
*/
-public class OpaqueBehaviorCompositeCompartmentEditPartCN extends ShapeCompartmentEditPart {
+public class OpaqueBehaviorCompositeCompartmentEditPartCN
+
+extends ShapeCompartmentEditPart
+
+{
/**
* @generated
@@ -86,4 +96,38 @@ public class OpaqueBehaviorCompositeCompartmentEditPartCN extends ShapeCompartme
}
}
+ /**
+ * @generated
+ */
+ protected void handleNotificationEvent(Notification notification) {
+ Object feature = notification.getFeature();
+ if (NotationPackage.eINSTANCE.getSize_Width().equals(feature)
+ || NotationPackage.eINSTANCE.getSize_Height().equals(feature)
+ || NotationPackage.eINSTANCE.getLocation_X().equals(feature)
+ || NotationPackage.eINSTANCE.getLocation_Y().equals(feature)) {
+ refreshBounds();
+ }
+ super.handleNotificationEvent(notification);
+ }
+
+ /**
+ * @generated
+ */
+ protected void refreshBounds() {
+ int width = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();
+ int height = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();
+ Dimension size = new Dimension(width, height);
+ int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();
+ int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();
+ Point loc = new Point(x, y);
+ ((GraphicalEditPart) getParent()).setLayoutConstraint(this, getFigure(), new Rectangle(loc, size));
+ }
+
+ /**
+ * @generated
+ */
+ protected void refreshVisuals() {
+ super.refreshVisuals();
+ refreshBounds();
+ }
}
diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/OpaqueBehaviorCompositeEditPart.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/OpaqueBehaviorCompositeEditPart.java
index 1ba6b084ffa..08d2e9be9cc 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/OpaqueBehaviorCompositeEditPart.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/OpaqueBehaviorCompositeEditPart.java
@@ -168,7 +168,7 @@ NamedElementEditPart {
if (childEditPart instanceof OpaqueBehaviorCompositeCompartmentEditPart) {
IFigure pane = getPrimaryShape().getCompositeCompartmentFigure();
setupContentPane(pane); // FIXME each comparment should handle his content pane in his
- // own way
+ // own way
pane.add(((OpaqueBehaviorCompositeCompartmentEditPart) childEditPart).getFigure());
return true;
}
@@ -193,7 +193,7 @@ NamedElementEditPart {
if (childEditPart instanceof OpaqueBehaviorCompositeCompartmentEditPart) {
IFigure pane = getPrimaryShape().getCompositeCompartmentFigure();
setupContentPane(pane); // FIXME each comparment should handle his content pane in his
- // own way
+ // own way
pane.remove(((OpaqueBehaviorCompositeCompartmentEditPart) childEditPart).getFigure());
return true;
}
@@ -332,7 +332,8 @@ NamedElementEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -363,7 +364,8 @@ NamedElementEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -3274,7 +3276,8 @@ NamedElementEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -6184,7 +6187,8 @@ NamedElementEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -6204,6 +6208,8 @@ NamedElementEditPart {
types.add(UMLElementTypes.Dependency_4010);
types.add(UMLElementTypes.Generalization_4015);
types.add(UMLElementTypes.InformationFlow_4016);
+ types.add(UMLElementTypes.TimeObservationEvent_4018);
+ types.add(UMLElementTypes.DurationObservationEvent_4019);
return types;
}
@@ -6217,7 +6223,8 @@ NamedElementEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -9136,6 +9143,12 @@ NamedElementEditPart {
if (relationshipType == UMLElementTypes.InformationFlow_4016) {
types.add(UMLElementTypes.Comment_3097);
}
+ if (relationshipType == UMLElementTypes.TimeObservationEvent_4018) {
+ types.add(UMLElementTypes.TimeObservation_2094);
+ }
+ if (relationshipType == UMLElementTypes.DurationObservationEvent_4019) {
+ types.add(UMLElementTypes.DurationObservation_2093);
+ }
return types;
}
diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/OpaqueBehaviorCompositeEditPartCN.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/OpaqueBehaviorCompositeEditPartCN.java
index eb50c396a7b..d5c3b3af527 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/OpaqueBehaviorCompositeEditPartCN.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/OpaqueBehaviorCompositeEditPartCN.java
@@ -168,7 +168,7 @@ NamedElementEditPart {
if (childEditPart instanceof OpaqueBehaviorCompositeCompartmentEditPartCN) {
IFigure pane = getPrimaryShape().getCompositeCompartmentFigure();
setupContentPane(pane); // FIXME each comparment should handle his content pane in his
- // own way
+ // own way
pane.add(((OpaqueBehaviorCompositeCompartmentEditPartCN) childEditPart).getFigure());
return true;
}
@@ -193,7 +193,7 @@ NamedElementEditPart {
if (childEditPart instanceof OpaqueBehaviorCompositeCompartmentEditPartCN) {
IFigure pane = getPrimaryShape().getCompositeCompartmentFigure();
setupContentPane(pane); // FIXME each comparment should handle his content pane in his
- // own way
+ // own way
pane.remove(((OpaqueBehaviorCompositeCompartmentEditPartCN) childEditPart).getFigure());
return true;
}
@@ -332,7 +332,8 @@ NamedElementEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -363,7 +364,8 @@ NamedElementEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -3274,7 +3276,8 @@ NamedElementEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -6184,7 +6187,8 @@ NamedElementEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -6204,6 +6208,8 @@ NamedElementEditPart {
types.add(UMLElementTypes.Dependency_4010);
types.add(UMLElementTypes.Generalization_4015);
types.add(UMLElementTypes.InformationFlow_4016);
+ types.add(UMLElementTypes.TimeObservationEvent_4018);
+ types.add(UMLElementTypes.DurationObservationEvent_4019);
return types;
}
@@ -6217,7 +6223,8 @@ NamedElementEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -9136,6 +9143,12 @@ NamedElementEditPart {
if (relationshipType == UMLElementTypes.InformationFlow_4016) {
types.add(UMLElementTypes.Comment_3097);
}
+ if (relationshipType == UMLElementTypes.TimeObservationEvent_4018) {
+ types.add(UMLElementTypes.TimeObservation_2094);
+ }
+ if (relationshipType == UMLElementTypes.DurationObservationEvent_4019) {
+ types.add(UMLElementTypes.DurationObservation_2093);
+ }
return types;
}
diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/OpaqueExpressionEditPart.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/OpaqueExpressionEditPart.java
index b6fbacc22c6..ce379e716c2 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/OpaqueExpressionEditPart.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/OpaqueExpressionEditPart.java
@@ -277,7 +277,8 @@ ShapeNodeEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -308,7 +309,8 @@ ShapeNodeEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -3219,7 +3221,8 @@ ShapeNodeEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -6129,7 +6132,8 @@ ShapeNodeEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -6149,6 +6153,8 @@ ShapeNodeEditPart {
types.add(UMLElementTypes.Dependency_4010);
types.add(UMLElementTypes.Generalization_4015);
types.add(UMLElementTypes.InformationFlow_4016);
+ types.add(UMLElementTypes.TimeObservationEvent_4018);
+ types.add(UMLElementTypes.DurationObservationEvent_4019);
return types;
}
@@ -6162,7 +6168,8 @@ ShapeNodeEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -9081,6 +9088,12 @@ ShapeNodeEditPart {
if (relationshipType == UMLElementTypes.InformationFlow_4016) {
types.add(UMLElementTypes.Comment_3097);
}
+ if (relationshipType == UMLElementTypes.TimeObservationEvent_4018) {
+ types.add(UMLElementTypes.TimeObservation_2094);
+ }
+ if (relationshipType == UMLElementTypes.DurationObservationEvent_4019) {
+ types.add(UMLElementTypes.DurationObservation_2093);
+ }
return types;
}
diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/PortEditPart.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/PortEditPart.java
index 89805f99399..4d64504959a 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/PortEditPart.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/PortEditPart.java
@@ -259,7 +259,8 @@ BorderedBorderItemEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -290,7 +291,8 @@ BorderedBorderItemEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -3201,7 +3203,8 @@ BorderedBorderItemEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -6111,7 +6114,8 @@ BorderedBorderItemEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -6131,6 +6135,8 @@ BorderedBorderItemEditPart {
types.add(UMLElementTypes.Dependency_4010);
types.add(UMLElementTypes.Generalization_4015);
types.add(UMLElementTypes.InformationFlow_4016);
+ types.add(UMLElementTypes.TimeObservationEvent_4018);
+ types.add(UMLElementTypes.DurationObservationEvent_4019);
return types;
}
@@ -6144,7 +6150,8 @@ BorderedBorderItemEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -9063,6 +9070,12 @@ BorderedBorderItemEditPart {
if (relationshipType == UMLElementTypes.InformationFlow_4016) {
types.add(UMLElementTypes.Comment_3097);
}
+ if (relationshipType == UMLElementTypes.TimeObservationEvent_4018) {
+ types.add(UMLElementTypes.TimeObservation_2094);
+ }
+ if (relationshipType == UMLElementTypes.DurationObservationEvent_4019) {
+ types.add(UMLElementTypes.DurationObservation_2093);
+ }
return types;
}
diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/PortNameEditPart.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/PortNameEditPart.java
index 6e36a32d6ab..27cfc154a64 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/PortNameEditPart.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/PortNameEditPart.java
@@ -80,7 +80,11 @@ import org.eclipse.uml2.uml.NamedElement;
/**
* @generated
*/
-public class PortNameEditPart extends LabelEditPart implements ITextAwareEditPart, IBorderItemEditPart {
+public class PortNameEditPart
+
+extends LabelEditPart
+
+implements ITextAwareEditPart, IBorderItemEditPart {
/**
* @generated
diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/PrimitiveTypeEditPart.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/PrimitiveTypeEditPart.java
index f955ba4843d..1bf739bbfe2 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/PrimitiveTypeEditPart.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/PrimitiveTypeEditPart.java
@@ -282,7 +282,8 @@ NamedElementEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -313,7 +314,8 @@ NamedElementEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -3224,7 +3226,8 @@ NamedElementEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -6134,7 +6137,8 @@ NamedElementEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -6154,6 +6158,8 @@ NamedElementEditPart {
types.add(UMLElementTypes.Dependency_4010);
types.add(UMLElementTypes.Generalization_4015);
types.add(UMLElementTypes.InformationFlow_4016);
+ types.add(UMLElementTypes.TimeObservationEvent_4018);
+ types.add(UMLElementTypes.DurationObservationEvent_4019);
return types;
}
@@ -6167,7 +6173,8 @@ NamedElementEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -9086,6 +9093,12 @@ NamedElementEditPart {
if (relationshipType == UMLElementTypes.InformationFlow_4016) {
types.add(UMLElementTypes.Comment_3097);
}
+ if (relationshipType == UMLElementTypes.TimeObservationEvent_4018) {
+ types.add(UMLElementTypes.TimeObservation_2094);
+ }
+ if (relationshipType == UMLElementTypes.DurationObservationEvent_4019) {
+ types.add(UMLElementTypes.DurationObservation_2093);
+ }
return types;
}
diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/PrimitiveTypeEditPartCN.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/PrimitiveTypeEditPartCN.java
index 6f7e794d4df..69fc31bea75 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/PrimitiveTypeEditPartCN.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/PrimitiveTypeEditPartCN.java
@@ -282,7 +282,8 @@ NamedElementEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -313,7 +314,8 @@ NamedElementEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -3224,7 +3226,8 @@ NamedElementEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -6134,7 +6137,8 @@ NamedElementEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -6154,6 +6158,8 @@ NamedElementEditPart {
types.add(UMLElementTypes.Dependency_4010);
types.add(UMLElementTypes.Generalization_4015);
types.add(UMLElementTypes.InformationFlow_4016);
+ types.add(UMLElementTypes.TimeObservationEvent_4018);
+ types.add(UMLElementTypes.DurationObservationEvent_4019);
return types;
}
@@ -6167,7 +6173,8 @@ NamedElementEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -9086,6 +9093,12 @@ NamedElementEditPart {
if (relationshipType == UMLElementTypes.InformationFlow_4016) {
types.add(UMLElementTypes.Comment_3097);
}
+ if (relationshipType == UMLElementTypes.TimeObservationEvent_4018) {
+ types.add(UMLElementTypes.TimeObservation_2094);
+ }
+ if (relationshipType == UMLElementTypes.DurationObservationEvent_4019) {
+ types.add(UMLElementTypes.DurationObservation_2093);
+ }
return types;
}
diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/PropertyPartCompartmentEditPartCN.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/PropertyPartCompartmentEditPartCN.java
index a9dc5c19819..b34a44a48a1 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/PropertyPartCompartmentEditPartCN.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/PropertyPartCompartmentEditPartCN.java
@@ -14,7 +14,12 @@
package org.eclipse.papyrus.diagram.composite.edit.parts;
import org.eclipse.draw2d.IFigure;
+import org.eclipse.draw2d.geometry.Dimension;
+import org.eclipse.draw2d.geometry.Point;
+import org.eclipse.draw2d.geometry.Rectangle;
+import org.eclipse.emf.common.notify.Notification;
import org.eclipse.gef.EditPolicy;
+import org.eclipse.gef.GraphicalEditPart;
import org.eclipse.gmf.runtime.diagram.ui.editparts.ShapeCompartmentEditPart;
import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CreationEditPolicy;
import org.eclipse.gmf.runtime.diagram.ui.editpolicies.DragDropEditPolicy;
@@ -22,6 +27,7 @@ import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableCompartmentEditPolicy;
import org.eclipse.gmf.runtime.diagram.ui.figures.ResizableCompartmentFigure;
import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;
+import org.eclipse.gmf.runtime.notation.NotationPackage;
import org.eclipse.gmf.runtime.notation.View;
import org.eclipse.papyrus.diagram.common.editpolicies.CustomContainerEditPolicy;
import org.eclipse.papyrus.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy;
@@ -32,7 +38,11 @@ import org.eclipse.papyrus.diagram.composite.part.Messages;
/**
* @generated
*/
-public class PropertyPartCompartmentEditPartCN extends ShapeCompartmentEditPart {
+public class PropertyPartCompartmentEditPartCN
+
+extends ShapeCompartmentEditPart
+
+{
/**
* @generated
@@ -88,4 +98,38 @@ public class PropertyPartCompartmentEditPartCN extends ShapeCompartmentEditPart
}
}
+ /**
+ * @generated
+ */
+ protected void handleNotificationEvent(Notification notification) {
+ Object feature = notification.getFeature();
+ if (NotationPackage.eINSTANCE.getSize_Width().equals(feature)
+ || NotationPackage.eINSTANCE.getSize_Height().equals(feature)
+ || NotationPackage.eINSTANCE.getLocation_X().equals(feature)
+ || NotationPackage.eINSTANCE.getLocation_Y().equals(feature)) {
+ refreshBounds();
+ }
+ super.handleNotificationEvent(notification);
+ }
+
+ /**
+ * @generated
+ */
+ protected void refreshBounds() {
+ int width = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();
+ int height = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();
+ Dimension size = new Dimension(width, height);
+ int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();
+ int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();
+ Point loc = new Point(x, y);
+ ((GraphicalEditPart) getParent()).setLayoutConstraint(this, getFigure(), new Rectangle(loc, size));
+ }
+
+ /**
+ * @generated
+ */
+ protected void refreshVisuals() {
+ super.refreshVisuals();
+ refreshBounds();
+ }
}
diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/PropertyPartEditPartCN.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/PropertyPartEditPartCN.java
index dca819dd7d3..fe1676074e8 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/PropertyPartEditPartCN.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/PropertyPartEditPartCN.java
@@ -171,7 +171,7 @@ org.eclipse.papyrus.diagram.composite.custom.edit.parts.PropertyPartEditPartCN {
if (childEditPart instanceof PropertyPartCompartmentEditPartCN) {
IFigure pane = getPrimaryShape().getCompositeCompartmentFigure();
setupContentPane(pane); // FIXME each comparment should handle his content pane in his
- // own way
+ // own way
pane.add(((PropertyPartCompartmentEditPartCN) childEditPart).getFigure());
return true;
}
@@ -196,7 +196,7 @@ org.eclipse.papyrus.diagram.composite.custom.edit.parts.PropertyPartEditPartCN {
if (childEditPart instanceof PropertyPartCompartmentEditPartCN) {
IFigure pane = getPrimaryShape().getCompositeCompartmentFigure();
setupContentPane(pane); // FIXME each comparment should handle his content pane in his
- // own way
+ // own way
pane.remove(((PropertyPartCompartmentEditPartCN) childEditPart).getFigure());
return true;
}
@@ -335,7 +335,8 @@ org.eclipse.papyrus.diagram.composite.custom.edit.parts.PropertyPartEditPartCN {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -366,7 +367,8 @@ org.eclipse.papyrus.diagram.composite.custom.edit.parts.PropertyPartEditPartCN {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -3277,7 +3279,8 @@ org.eclipse.papyrus.diagram.composite.custom.edit.parts.PropertyPartEditPartCN {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -6187,7 +6190,8 @@ org.eclipse.papyrus.diagram.composite.custom.edit.parts.PropertyPartEditPartCN {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -6207,6 +6211,8 @@ org.eclipse.papyrus.diagram.composite.custom.edit.parts.PropertyPartEditPartCN {
types.add(UMLElementTypes.Dependency_4010);
types.add(UMLElementTypes.Generalization_4015);
types.add(UMLElementTypes.InformationFlow_4016);
+ types.add(UMLElementTypes.TimeObservationEvent_4018);
+ types.add(UMLElementTypes.DurationObservationEvent_4019);
return types;
}
@@ -6220,7 +6226,8 @@ org.eclipse.papyrus.diagram.composite.custom.edit.parts.PropertyPartEditPartCN {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -9139,6 +9146,12 @@ org.eclipse.papyrus.diagram.composite.custom.edit.parts.PropertyPartEditPartCN {
if (relationshipType == UMLElementTypes.InformationFlow_4016) {
types.add(UMLElementTypes.Comment_3097);
}
+ if (relationshipType == UMLElementTypes.TimeObservationEvent_4018) {
+ types.add(UMLElementTypes.TimeObservation_2094);
+ }
+ if (relationshipType == UMLElementTypes.DurationObservationEvent_4019) {
+ types.add(UMLElementTypes.DurationObservation_2093);
+ }
return types;
}
diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/ProtocolStateMachineCompositeCompartmentEditPart.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/ProtocolStateMachineCompositeCompartmentEditPart.java
index ba53b526f48..2489134332f 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/ProtocolStateMachineCompositeCompartmentEditPart.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/ProtocolStateMachineCompositeCompartmentEditPart.java
@@ -14,7 +14,12 @@
package org.eclipse.papyrus.diagram.composite.edit.parts;
import org.eclipse.draw2d.IFigure;
+import org.eclipse.draw2d.geometry.Dimension;
+import org.eclipse.draw2d.geometry.Point;
+import org.eclipse.draw2d.geometry.Rectangle;
+import org.eclipse.emf.common.notify.Notification;
import org.eclipse.gef.EditPolicy;
+import org.eclipse.gef.GraphicalEditPart;
import org.eclipse.gmf.runtime.diagram.ui.editparts.ShapeCompartmentEditPart;
import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CreationEditPolicy;
import org.eclipse.gmf.runtime.diagram.ui.editpolicies.DragDropEditPolicy;
@@ -22,6 +27,7 @@ import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableCompartmentEditPolicy;
import org.eclipse.gmf.runtime.diagram.ui.figures.ResizableCompartmentFigure;
import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;
+import org.eclipse.gmf.runtime.notation.NotationPackage;
import org.eclipse.gmf.runtime.notation.View;
import org.eclipse.papyrus.diagram.common.editpolicies.CustomContainerEditPolicy;
import org.eclipse.papyrus.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy;
@@ -32,7 +38,11 @@ import org.eclipse.papyrus.diagram.composite.part.Messages;
/**
* @generated
*/
-public class ProtocolStateMachineCompositeCompartmentEditPart extends ShapeCompartmentEditPart {
+public class ProtocolStateMachineCompositeCompartmentEditPart
+
+extends ShapeCompartmentEditPart
+
+{
/**
* @generated
@@ -86,4 +96,38 @@ public class ProtocolStateMachineCompositeCompartmentEditPart extends ShapeCompa
}
}
+ /**
+ * @generated
+ */
+ protected void handleNotificationEvent(Notification notification) {
+ Object feature = notification.getFeature();
+ if (NotationPackage.eINSTANCE.getSize_Width().equals(feature)
+ || NotationPackage.eINSTANCE.getSize_Height().equals(feature)
+ || NotationPackage.eINSTANCE.getLocation_X().equals(feature)
+ || NotationPackage.eINSTANCE.getLocation_Y().equals(feature)) {
+ refreshBounds();
+ }
+ super.handleNotificationEvent(notification);
+ }
+
+ /**
+ * @generated
+ */
+ protected void refreshBounds() {
+ int width = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();
+ int height = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();
+ Dimension size = new Dimension(width, height);
+ int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();
+ int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();
+ Point loc = new Point(x, y);
+ ((GraphicalEditPart) getParent()).setLayoutConstraint(this, getFigure(), new Rectangle(loc, size));
+ }
+
+ /**
+ * @generated
+ */
+ protected void refreshVisuals() {
+ super.refreshVisuals();
+ refreshBounds();
+ }
}
diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/ProtocolStateMachineCompositeCompartmentEditPartCN.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/ProtocolStateMachineCompositeCompartmentEditPartCN.java
index a1c6f6227b7..e02109b57d1 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/ProtocolStateMachineCompositeCompartmentEditPartCN.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/ProtocolStateMachineCompositeCompartmentEditPartCN.java
@@ -14,7 +14,12 @@
package org.eclipse.papyrus.diagram.composite.edit.parts;
import org.eclipse.draw2d.IFigure;
+import org.eclipse.draw2d.geometry.Dimension;
+import org.eclipse.draw2d.geometry.Point;
+import org.eclipse.draw2d.geometry.Rectangle;
+import org.eclipse.emf.common.notify.Notification;
import org.eclipse.gef.EditPolicy;
+import org.eclipse.gef.GraphicalEditPart;
import org.eclipse.gmf.runtime.diagram.ui.editparts.ShapeCompartmentEditPart;
import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CreationEditPolicy;
import org.eclipse.gmf.runtime.diagram.ui.editpolicies.DragDropEditPolicy;
@@ -22,6 +27,7 @@ import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableCompartmentEditPolicy;
import org.eclipse.gmf.runtime.diagram.ui.figures.ResizableCompartmentFigure;
import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;
+import org.eclipse.gmf.runtime.notation.NotationPackage;
import org.eclipse.gmf.runtime.notation.View;
import org.eclipse.papyrus.diagram.common.editpolicies.CustomContainerEditPolicy;
import org.eclipse.papyrus.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy;
@@ -32,7 +38,11 @@ import org.eclipse.papyrus.diagram.composite.part.Messages;
/**
* @generated
*/
-public class ProtocolStateMachineCompositeCompartmentEditPartCN extends ShapeCompartmentEditPart {
+public class ProtocolStateMachineCompositeCompartmentEditPartCN
+
+extends ShapeCompartmentEditPart
+
+{
/**
* @generated
@@ -86,4 +96,38 @@ public class ProtocolStateMachineCompositeCompartmentEditPartCN extends ShapeCom
}
}
+ /**
+ * @generated
+ */
+ protected void handleNotificationEvent(Notification notification) {
+ Object feature = notification.getFeature();
+ if (NotationPackage.eINSTANCE.getSize_Width().equals(feature)
+ || NotationPackage.eINSTANCE.getSize_Height().equals(feature)
+ || NotationPackage.eINSTANCE.getLocation_X().equals(feature)
+ || NotationPackage.eINSTANCE.getLocation_Y().equals(feature)) {
+ refreshBounds();
+ }
+ super.handleNotificationEvent(notification);
+ }
+
+ /**
+ * @generated
+ */
+ protected void refreshBounds() {
+ int width = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();
+ int height = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();
+ Dimension size = new Dimension(width, height);
+ int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();
+ int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();
+ Point loc = new Point(x, y);
+ ((GraphicalEditPart) getParent()).setLayoutConstraint(this, getFigure(), new Rectangle(loc, size));
+ }
+
+ /**
+ * @generated
+ */
+ protected void refreshVisuals() {
+ super.refreshVisuals();
+ refreshBounds();
+ }
}
diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/ProtocolStateMachineCompositeEditPart.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/ProtocolStateMachineCompositeEditPart.java
index 5c03dc53d70..11e2c59072a 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/ProtocolStateMachineCompositeEditPart.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/ProtocolStateMachineCompositeEditPart.java
@@ -168,7 +168,7 @@ NamedElementEditPart {
if (childEditPart instanceof ProtocolStateMachineCompositeCompartmentEditPart) {
IFigure pane = getPrimaryShape().getCompositeCompartmentFigure();
setupContentPane(pane); // FIXME each comparment should handle his content pane in his
- // own way
+ // own way
pane.add(((ProtocolStateMachineCompositeCompartmentEditPart) childEditPart).getFigure());
return true;
}
@@ -193,7 +193,7 @@ NamedElementEditPart {
if (childEditPart instanceof ProtocolStateMachineCompositeCompartmentEditPart) {
IFigure pane = getPrimaryShape().getCompositeCompartmentFigure();
setupContentPane(pane); // FIXME each comparment should handle his content pane in his
- // own way
+ // own way
pane.remove(((ProtocolStateMachineCompositeCompartmentEditPart) childEditPart).getFigure());
return true;
}
@@ -332,7 +332,8 @@ NamedElementEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -363,7 +364,8 @@ NamedElementEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -3274,7 +3276,8 @@ NamedElementEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -6184,7 +6187,8 @@ NamedElementEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -6204,6 +6208,8 @@ NamedElementEditPart {
types.add(UMLElementTypes.Dependency_4010);
types.add(UMLElementTypes.Generalization_4015);
types.add(UMLElementTypes.InformationFlow_4016);
+ types.add(UMLElementTypes.TimeObservationEvent_4018);
+ types.add(UMLElementTypes.DurationObservationEvent_4019);
return types;
}
@@ -6217,7 +6223,8 @@ NamedElementEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -9136,6 +9143,12 @@ NamedElementEditPart {
if (relationshipType == UMLElementTypes.InformationFlow_4016) {
types.add(UMLElementTypes.Comment_3097);
}
+ if (relationshipType == UMLElementTypes.TimeObservationEvent_4018) {
+ types.add(UMLElementTypes.TimeObservation_2094);
+ }
+ if (relationshipType == UMLElementTypes.DurationObservationEvent_4019) {
+ types.add(UMLElementTypes.DurationObservation_2093);
+ }
return types;
}
diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/ProtocolStateMachineCompositeEditPartCN.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/ProtocolStateMachineCompositeEditPartCN.java
index 602688f2055..41a1197b6be 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/ProtocolStateMachineCompositeEditPartCN.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/ProtocolStateMachineCompositeEditPartCN.java
@@ -168,7 +168,7 @@ NamedElementEditPart {
if (childEditPart instanceof ProtocolStateMachineCompositeCompartmentEditPartCN) {
IFigure pane = getPrimaryShape().getCompositeCompartmentFigure();
setupContentPane(pane); // FIXME each comparment should handle his content pane in his
- // own way
+ // own way
pane.add(((ProtocolStateMachineCompositeCompartmentEditPartCN) childEditPart).getFigure());
return true;
}
@@ -193,7 +193,7 @@ NamedElementEditPart {
if (childEditPart instanceof ProtocolStateMachineCompositeCompartmentEditPartCN) {
IFigure pane = getPrimaryShape().getCompositeCompartmentFigure();
setupContentPane(pane); // FIXME each comparment should handle his content pane in his
- // own way
+ // own way
pane.remove(((ProtocolStateMachineCompositeCompartmentEditPartCN) childEditPart).getFigure());
return true;
}
@@ -333,7 +333,8 @@ NamedElementEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -364,7 +365,8 @@ NamedElementEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -3275,7 +3277,8 @@ NamedElementEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -6185,7 +6188,8 @@ NamedElementEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -6205,6 +6209,8 @@ NamedElementEditPart {
types.add(UMLElementTypes.Dependency_4010);
types.add(UMLElementTypes.Generalization_4015);
types.add(UMLElementTypes.InformationFlow_4016);
+ types.add(UMLElementTypes.TimeObservationEvent_4018);
+ types.add(UMLElementTypes.DurationObservationEvent_4019);
return types;
}
@@ -6218,7 +6224,8 @@ NamedElementEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -9137,6 +9144,12 @@ NamedElementEditPart {
if (relationshipType == UMLElementTypes.InformationFlow_4016) {
types.add(UMLElementTypes.Comment_3097);
}
+ if (relationshipType == UMLElementTypes.TimeObservationEvent_4018) {
+ types.add(UMLElementTypes.TimeObservation_2094);
+ }
+ if (relationshipType == UMLElementTypes.DurationObservationEvent_4019) {
+ types.add(UMLElementTypes.DurationObservation_2093);
+ }
return types;
}
diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/SendOperationEventEditPart.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/SendOperationEventEditPart.java
index b2aa229eaf3..40ff7dd1927 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/SendOperationEventEditPart.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/SendOperationEventEditPart.java
@@ -277,7 +277,8 @@ ShapeNodeEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -308,7 +309,8 @@ ShapeNodeEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -3219,7 +3221,8 @@ ShapeNodeEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -6129,7 +6132,8 @@ ShapeNodeEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -6149,6 +6153,8 @@ ShapeNodeEditPart {
types.add(UMLElementTypes.Dependency_4010);
types.add(UMLElementTypes.Generalization_4015);
types.add(UMLElementTypes.InformationFlow_4016);
+ types.add(UMLElementTypes.TimeObservationEvent_4018);
+ types.add(UMLElementTypes.DurationObservationEvent_4019);
return types;
}
@@ -6162,7 +6168,8 @@ ShapeNodeEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -9081,6 +9088,12 @@ ShapeNodeEditPart {
if (relationshipType == UMLElementTypes.InformationFlow_4016) {
types.add(UMLElementTypes.Comment_3097);
}
+ if (relationshipType == UMLElementTypes.TimeObservationEvent_4018) {
+ types.add(UMLElementTypes.TimeObservation_2094);
+ }
+ if (relationshipType == UMLElementTypes.DurationObservationEvent_4019) {
+ types.add(UMLElementTypes.DurationObservation_2093);
+ }
return types;
}
diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/SendSignalEventEditPart.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/SendSignalEventEditPart.java
index 136315fbd73..63a9531c9e8 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/SendSignalEventEditPart.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/SendSignalEventEditPart.java
@@ -277,7 +277,8 @@ ShapeNodeEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -308,7 +309,8 @@ ShapeNodeEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -3219,7 +3221,8 @@ ShapeNodeEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -6129,7 +6132,8 @@ ShapeNodeEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -6149,6 +6153,8 @@ ShapeNodeEditPart {
types.add(UMLElementTypes.Dependency_4010);
types.add(UMLElementTypes.Generalization_4015);
types.add(UMLElementTypes.InformationFlow_4016);
+ types.add(UMLElementTypes.TimeObservationEvent_4018);
+ types.add(UMLElementTypes.DurationObservationEvent_4019);
return types;
}
@@ -6162,7 +6168,8 @@ ShapeNodeEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -9081,6 +9088,12 @@ ShapeNodeEditPart {
if (relationshipType == UMLElementTypes.InformationFlow_4016) {
types.add(UMLElementTypes.Comment_3097);
}
+ if (relationshipType == UMLElementTypes.TimeObservationEvent_4018) {
+ types.add(UMLElementTypes.TimeObservation_2094);
+ }
+ if (relationshipType == UMLElementTypes.DurationObservationEvent_4019) {
+ types.add(UMLElementTypes.DurationObservation_2093);
+ }
return types;
}
diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/SignalEditPart.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/SignalEditPart.java
index 487156c27d4..80e1b0fc1b9 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/SignalEditPart.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/SignalEditPart.java
@@ -282,7 +282,8 @@ NamedElementEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -313,7 +314,8 @@ NamedElementEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -3224,7 +3226,8 @@ NamedElementEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -6134,7 +6137,8 @@ NamedElementEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -6154,6 +6158,8 @@ NamedElementEditPart {
types.add(UMLElementTypes.Dependency_4010);
types.add(UMLElementTypes.Generalization_4015);
types.add(UMLElementTypes.InformationFlow_4016);
+ types.add(UMLElementTypes.TimeObservationEvent_4018);
+ types.add(UMLElementTypes.DurationObservationEvent_4019);
return types;
}
@@ -6167,7 +6173,8 @@ NamedElementEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -9086,6 +9093,12 @@ NamedElementEditPart {
if (relationshipType == UMLElementTypes.InformationFlow_4016) {
types.add(UMLElementTypes.Comment_3097);
}
+ if (relationshipType == UMLElementTypes.TimeObservationEvent_4018) {
+ types.add(UMLElementTypes.TimeObservation_2094);
+ }
+ if (relationshipType == UMLElementTypes.DurationObservationEvent_4019) {
+ types.add(UMLElementTypes.DurationObservation_2093);
+ }
return types;
}
diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/SignalEditPartCN.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/SignalEditPartCN.java
index 27407375e0b..b3f579b5aa4 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/SignalEditPartCN.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/SignalEditPartCN.java
@@ -282,7 +282,8 @@ NamedElementEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -313,7 +314,8 @@ NamedElementEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -3224,7 +3226,8 @@ NamedElementEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -6134,7 +6137,8 @@ NamedElementEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -6154,6 +6158,8 @@ NamedElementEditPart {
types.add(UMLElementTypes.Dependency_4010);
types.add(UMLElementTypes.Generalization_4015);
types.add(UMLElementTypes.InformationFlow_4016);
+ types.add(UMLElementTypes.TimeObservationEvent_4018);
+ types.add(UMLElementTypes.DurationObservationEvent_4019);
return types;
}
@@ -6167,7 +6173,8 @@ NamedElementEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -9086,6 +9093,12 @@ NamedElementEditPart {
if (relationshipType == UMLElementTypes.InformationFlow_4016) {
types.add(UMLElementTypes.Comment_3097);
}
+ if (relationshipType == UMLElementTypes.TimeObservationEvent_4018) {
+ types.add(UMLElementTypes.TimeObservation_2094);
+ }
+ if (relationshipType == UMLElementTypes.DurationObservationEvent_4019) {
+ types.add(UMLElementTypes.DurationObservation_2093);
+ }
return types;
}
diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/SignalEventEditPart.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/SignalEventEditPart.java
index 5002f982af5..14b1a4bfcb0 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/SignalEventEditPart.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/SignalEventEditPart.java
@@ -277,7 +277,8 @@ ShapeNodeEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -308,7 +309,8 @@ ShapeNodeEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -3219,7 +3221,8 @@ ShapeNodeEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -6129,7 +6132,8 @@ ShapeNodeEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -6149,6 +6153,8 @@ ShapeNodeEditPart {
types.add(UMLElementTypes.Dependency_4010);
types.add(UMLElementTypes.Generalization_4015);
types.add(UMLElementTypes.InformationFlow_4016);
+ types.add(UMLElementTypes.TimeObservationEvent_4018);
+ types.add(UMLElementTypes.DurationObservationEvent_4019);
return types;
}
@@ -6162,7 +6168,8 @@ ShapeNodeEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -9081,6 +9088,12 @@ ShapeNodeEditPart {
if (relationshipType == UMLElementTypes.InformationFlow_4016) {
types.add(UMLElementTypes.Comment_3097);
}
+ if (relationshipType == UMLElementTypes.TimeObservationEvent_4018) {
+ types.add(UMLElementTypes.TimeObservation_2094);
+ }
+ if (relationshipType == UMLElementTypes.DurationObservationEvent_4019) {
+ types.add(UMLElementTypes.DurationObservation_2093);
+ }
return types;
}
diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/StateMachineCompositeCompartmentEditPart.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/StateMachineCompositeCompartmentEditPart.java
index 74a014315d1..738ac9a54ca 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/StateMachineCompositeCompartmentEditPart.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/StateMachineCompositeCompartmentEditPart.java
@@ -14,7 +14,12 @@
package org.eclipse.papyrus.diagram.composite.edit.parts;
import org.eclipse.draw2d.IFigure;
+import org.eclipse.draw2d.geometry.Dimension;
+import org.eclipse.draw2d.geometry.Point;
+import org.eclipse.draw2d.geometry.Rectangle;
+import org.eclipse.emf.common.notify.Notification;
import org.eclipse.gef.EditPolicy;
+import org.eclipse.gef.GraphicalEditPart;
import org.eclipse.gmf.runtime.diagram.ui.editparts.ShapeCompartmentEditPart;
import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CreationEditPolicy;
import org.eclipse.gmf.runtime.diagram.ui.editpolicies.DragDropEditPolicy;
@@ -22,6 +27,7 @@ import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableCompartmentEditPolicy;
import org.eclipse.gmf.runtime.diagram.ui.figures.ResizableCompartmentFigure;
import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;
+import org.eclipse.gmf.runtime.notation.NotationPackage;
import org.eclipse.gmf.runtime.notation.View;
import org.eclipse.papyrus.diagram.common.editpolicies.CustomContainerEditPolicy;
import org.eclipse.papyrus.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy;
@@ -32,7 +38,11 @@ import org.eclipse.papyrus.diagram.composite.part.Messages;
/**
* @generated
*/
-public class StateMachineCompositeCompartmentEditPart extends ShapeCompartmentEditPart {
+public class StateMachineCompositeCompartmentEditPart
+
+extends ShapeCompartmentEditPart
+
+{
/**
* @generated
@@ -85,4 +95,38 @@ public class StateMachineCompositeCompartmentEditPart extends ShapeCompartmentEd
}
}
+ /**
+ * @generated
+ */
+ protected void handleNotificationEvent(Notification notification) {
+ Object feature = notification.getFeature();
+ if (NotationPackage.eINSTANCE.getSize_Width().equals(feature)
+ || NotationPackage.eINSTANCE.getSize_Height().equals(feature)
+ || NotationPackage.eINSTANCE.getLocation_X().equals(feature)
+ || NotationPackage.eINSTANCE.getLocation_Y().equals(feature)) {
+ refreshBounds();
+ }
+ super.handleNotificationEvent(notification);
+ }
+
+ /**
+ * @generated
+ */
+ protected void refreshBounds() {
+ int width = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();
+ int height = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();
+ Dimension size = new Dimension(width, height);
+ int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();
+ int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();
+ Point loc = new Point(x, y);
+ ((GraphicalEditPart) getParent()).setLayoutConstraint(this, getFigure(), new Rectangle(loc, size));
+ }
+
+ /**
+ * @generated
+ */
+ protected void refreshVisuals() {
+ super.refreshVisuals();
+ refreshBounds();
+ }
}
diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/StateMachineCompositeCompartmentEditPartCN.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/StateMachineCompositeCompartmentEditPartCN.java
index 573264a89b9..edad1808144 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/StateMachineCompositeCompartmentEditPartCN.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/StateMachineCompositeCompartmentEditPartCN.java
@@ -14,7 +14,12 @@
package org.eclipse.papyrus.diagram.composite.edit.parts;
import org.eclipse.draw2d.IFigure;
+import org.eclipse.draw2d.geometry.Dimension;
+import org.eclipse.draw2d.geometry.Point;
+import org.eclipse.draw2d.geometry.Rectangle;
+import org.eclipse.emf.common.notify.Notification;
import org.eclipse.gef.EditPolicy;
+import org.eclipse.gef.GraphicalEditPart;
import org.eclipse.gmf.runtime.diagram.ui.editparts.ShapeCompartmentEditPart;
import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CreationEditPolicy;
import org.eclipse.gmf.runtime.diagram.ui.editpolicies.DragDropEditPolicy;
@@ -22,6 +27,7 @@ import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableCompartmentEditPolicy;
import org.eclipse.gmf.runtime.diagram.ui.figures.ResizableCompartmentFigure;
import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;
+import org.eclipse.gmf.runtime.notation.NotationPackage;
import org.eclipse.gmf.runtime.notation.View;
import org.eclipse.papyrus.diagram.common.editpolicies.CustomContainerEditPolicy;
import org.eclipse.papyrus.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy;
@@ -32,7 +38,11 @@ import org.eclipse.papyrus.diagram.composite.part.Messages;
/**
* @generated
*/
-public class StateMachineCompositeCompartmentEditPartCN extends ShapeCompartmentEditPart {
+public class StateMachineCompositeCompartmentEditPartCN
+
+extends ShapeCompartmentEditPart
+
+{
/**
* @generated
@@ -85,4 +95,38 @@ public class StateMachineCompositeCompartmentEditPartCN extends ShapeCompartment
}
}
+ /**
+ * @generated
+ */
+ protected void handleNotificationEvent(Notification notification) {
+ Object feature = notification.getFeature();
+ if (NotationPackage.eINSTANCE.getSize_Width().equals(feature)
+ || NotationPackage.eINSTANCE.getSize_Height().equals(feature)
+ || NotationPackage.eINSTANCE.getLocation_X().equals(feature)
+ || NotationPackage.eINSTANCE.getLocation_Y().equals(feature)) {
+ refreshBounds();
+ }
+ super.handleNotificationEvent(notification);
+ }
+
+ /**
+ * @generated
+ */
+ protected void refreshBounds() {
+ int width = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();
+ int height = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();
+ Dimension size = new Dimension(width, height);
+ int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();
+ int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();
+ Point loc = new Point(x, y);
+ ((GraphicalEditPart) getParent()).setLayoutConstraint(this, getFigure(), new Rectangle(loc, size));
+ }
+
+ /**
+ * @generated
+ */
+ protected void refreshVisuals() {
+ super.refreshVisuals();
+ refreshBounds();
+ }
}
diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/StateMachineCompositeEditPart.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/StateMachineCompositeEditPart.java
index 3b5235933ff..ddd32f0044b 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/StateMachineCompositeEditPart.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/StateMachineCompositeEditPart.java
@@ -168,7 +168,7 @@ NamedElementEditPart {
if (childEditPart instanceof StateMachineCompositeCompartmentEditPart) {
IFigure pane = getPrimaryShape().getCompositeCompartmentFigure();
setupContentPane(pane); // FIXME each comparment should handle his content pane in his
- // own way
+ // own way
pane.add(((StateMachineCompositeCompartmentEditPart) childEditPart).getFigure());
return true;
}
@@ -193,7 +193,7 @@ NamedElementEditPart {
if (childEditPart instanceof StateMachineCompositeCompartmentEditPart) {
IFigure pane = getPrimaryShape().getCompositeCompartmentFigure();
setupContentPane(pane); // FIXME each comparment should handle his content pane in his
- // own way
+ // own way
pane.remove(((StateMachineCompositeCompartmentEditPart) childEditPart).getFigure());
return true;
}
@@ -332,7 +332,8 @@ NamedElementEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -363,7 +364,8 @@ NamedElementEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -3274,7 +3276,8 @@ NamedElementEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -6184,7 +6187,8 @@ NamedElementEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -6204,6 +6208,8 @@ NamedElementEditPart {
types.add(UMLElementTypes.Dependency_4010);
types.add(UMLElementTypes.Generalization_4015);
types.add(UMLElementTypes.InformationFlow_4016);
+ types.add(UMLElementTypes.TimeObservationEvent_4018);
+ types.add(UMLElementTypes.DurationObservationEvent_4019);
return types;
}
@@ -6217,7 +6223,8 @@ NamedElementEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -9136,6 +9143,12 @@ NamedElementEditPart {
if (relationshipType == UMLElementTypes.InformationFlow_4016) {
types.add(UMLElementTypes.Comment_3097);
}
+ if (relationshipType == UMLElementTypes.TimeObservationEvent_4018) {
+ types.add(UMLElementTypes.TimeObservation_2094);
+ }
+ if (relationshipType == UMLElementTypes.DurationObservationEvent_4019) {
+ types.add(UMLElementTypes.DurationObservation_2093);
+ }
return types;
}
diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/StateMachineCompositeEditPartCN.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/StateMachineCompositeEditPartCN.java
index 36b28355abb..92be0a73f4d 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/StateMachineCompositeEditPartCN.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/StateMachineCompositeEditPartCN.java
@@ -168,7 +168,7 @@ NamedElementEditPart {
if (childEditPart instanceof StateMachineCompositeCompartmentEditPartCN) {
IFigure pane = getPrimaryShape().getCompositeCompartmentFigure();
setupContentPane(pane); // FIXME each comparment should handle his content pane in his
- // own way
+ // own way
pane.add(((StateMachineCompositeCompartmentEditPartCN) childEditPart).getFigure());
return true;
}
@@ -193,7 +193,7 @@ NamedElementEditPart {
if (childEditPart instanceof StateMachineCompositeCompartmentEditPartCN) {
IFigure pane = getPrimaryShape().getCompositeCompartmentFigure();
setupContentPane(pane); // FIXME each comparment should handle his content pane in his
- // own way
+ // own way
pane.remove(((StateMachineCompositeCompartmentEditPartCN) childEditPart).getFigure());
return true;
}
@@ -332,7 +332,8 @@ NamedElementEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -363,7 +364,8 @@ NamedElementEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -3274,7 +3276,8 @@ NamedElementEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -6184,7 +6187,8 @@ NamedElementEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -6204,6 +6208,8 @@ NamedElementEditPart {
types.add(UMLElementTypes.Dependency_4010);
types.add(UMLElementTypes.Generalization_4015);
types.add(UMLElementTypes.InformationFlow_4016);
+ types.add(UMLElementTypes.TimeObservationEvent_4018);
+ types.add(UMLElementTypes.DurationObservationEvent_4019);
return types;
}
@@ -6217,7 +6223,8 @@ NamedElementEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -9136,6 +9143,12 @@ NamedElementEditPart {
if (relationshipType == UMLElementTypes.InformationFlow_4016) {
types.add(UMLElementTypes.Comment_3097);
}
+ if (relationshipType == UMLElementTypes.TimeObservationEvent_4018) {
+ types.add(UMLElementTypes.TimeObservation_2094);
+ }
+ if (relationshipType == UMLElementTypes.DurationObservationEvent_4019) {
+ types.add(UMLElementTypes.DurationObservation_2093);
+ }
return types;
}
diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/StringExpressionEditPart.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/StringExpressionEditPart.java
index 0a1f32570da..53d89120b6b 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/StringExpressionEditPart.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/StringExpressionEditPart.java
@@ -277,7 +277,8 @@ ShapeNodeEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -308,7 +309,8 @@ ShapeNodeEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -3219,7 +3221,8 @@ ShapeNodeEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -6129,7 +6132,8 @@ ShapeNodeEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -6149,6 +6153,8 @@ ShapeNodeEditPart {
types.add(UMLElementTypes.Dependency_4010);
types.add(UMLElementTypes.Generalization_4015);
types.add(UMLElementTypes.InformationFlow_4016);
+ types.add(UMLElementTypes.TimeObservationEvent_4018);
+ types.add(UMLElementTypes.DurationObservationEvent_4019);
return types;
}
@@ -6162,7 +6168,8 @@ ShapeNodeEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -9081,6 +9088,12 @@ ShapeNodeEditPart {
if (relationshipType == UMLElementTypes.InformationFlow_4016) {
types.add(UMLElementTypes.Comment_3097);
}
+ if (relationshipType == UMLElementTypes.TimeObservationEvent_4018) {
+ types.add(UMLElementTypes.TimeObservation_2094);
+ }
+ if (relationshipType == UMLElementTypes.DurationObservationEvent_4019) {
+ types.add(UMLElementTypes.DurationObservation_2093);
+ }
return types;
}
diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/TimeConstraintEditPart.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/TimeConstraintEditPart.java
index c7efedfd838..e8c05fc755d 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/TimeConstraintEditPart.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/TimeConstraintEditPart.java
@@ -277,7 +277,8 @@ ShapeNodeEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -309,7 +310,8 @@ ShapeNodeEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -3466,7 +3468,8 @@ ShapeNodeEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -6622,7 +6625,8 @@ ShapeNodeEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -6642,6 +6646,8 @@ ShapeNodeEditPart {
types.add(UMLElementTypes.Dependency_4010);
types.add(UMLElementTypes.Generalization_4015);
types.add(UMLElementTypes.InformationFlow_4016);
+ types.add(UMLElementTypes.TimeObservationEvent_4018);
+ types.add(UMLElementTypes.DurationObservationEvent_4019);
return types;
}
@@ -6655,7 +6661,8 @@ ShapeNodeEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -9574,6 +9581,12 @@ ShapeNodeEditPart {
if (relationshipType == UMLElementTypes.InformationFlow_4016) {
types.add(UMLElementTypes.Comment_3097);
}
+ if (relationshipType == UMLElementTypes.TimeObservationEvent_4018) {
+ types.add(UMLElementTypes.TimeObservation_2094);
+ }
+ if (relationshipType == UMLElementTypes.DurationObservationEvent_4019) {
+ types.add(UMLElementTypes.DurationObservation_2093);
+ }
return types;
}
diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/TimeEventEditPart.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/TimeEventEditPart.java
index 1a9e9b15d2b..71d529830e3 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/TimeEventEditPart.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/TimeEventEditPart.java
@@ -277,7 +277,8 @@ ShapeNodeEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -308,7 +309,8 @@ ShapeNodeEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -3219,7 +3221,8 @@ ShapeNodeEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -6129,7 +6132,8 @@ ShapeNodeEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -6149,6 +6153,8 @@ ShapeNodeEditPart {
types.add(UMLElementTypes.Dependency_4010);
types.add(UMLElementTypes.Generalization_4015);
types.add(UMLElementTypes.InformationFlow_4016);
+ types.add(UMLElementTypes.TimeObservationEvent_4018);
+ types.add(UMLElementTypes.DurationObservationEvent_4019);
return types;
}
@@ -6162,7 +6168,8 @@ ShapeNodeEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -9081,6 +9088,12 @@ ShapeNodeEditPart {
if (relationshipType == UMLElementTypes.InformationFlow_4016) {
types.add(UMLElementTypes.Comment_3097);
}
+ if (relationshipType == UMLElementTypes.TimeObservationEvent_4018) {
+ types.add(UMLElementTypes.TimeObservation_2094);
+ }
+ if (relationshipType == UMLElementTypes.DurationObservationEvent_4019) {
+ types.add(UMLElementTypes.DurationObservation_2093);
+ }
return types;
}
diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/TimeExpressionEditPart.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/TimeExpressionEditPart.java
index 93483fd8d29..7d926abcbd1 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/TimeExpressionEditPart.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/TimeExpressionEditPart.java
@@ -277,7 +277,8 @@ ShapeNodeEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -308,7 +309,8 @@ ShapeNodeEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -3219,7 +3221,8 @@ ShapeNodeEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -6129,7 +6132,8 @@ ShapeNodeEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -6149,6 +6153,8 @@ ShapeNodeEditPart {
types.add(UMLElementTypes.Dependency_4010);
types.add(UMLElementTypes.Generalization_4015);
types.add(UMLElementTypes.InformationFlow_4016);
+ types.add(UMLElementTypes.TimeObservationEvent_4018);
+ types.add(UMLElementTypes.DurationObservationEvent_4019);
return types;
}
@@ -6162,7 +6168,8 @@ ShapeNodeEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -9081,6 +9088,12 @@ ShapeNodeEditPart {
if (relationshipType == UMLElementTypes.InformationFlow_4016) {
types.add(UMLElementTypes.Comment_3097);
}
+ if (relationshipType == UMLElementTypes.TimeObservationEvent_4018) {
+ types.add(UMLElementTypes.TimeObservation_2094);
+ }
+ if (relationshipType == UMLElementTypes.DurationObservationEvent_4019) {
+ types.add(UMLElementTypes.DurationObservation_2093);
+ }
return types;
}
diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/TimeIntervalEditPart.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/TimeIntervalEditPart.java
index 1c6eb0d44c0..bba8f1b2660 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/TimeIntervalEditPart.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/TimeIntervalEditPart.java
@@ -277,7 +277,8 @@ ShapeNodeEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -308,7 +309,8 @@ ShapeNodeEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -3219,7 +3221,8 @@ ShapeNodeEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -6129,7 +6132,8 @@ ShapeNodeEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -6149,6 +6153,8 @@ ShapeNodeEditPart {
types.add(UMLElementTypes.Dependency_4010);
types.add(UMLElementTypes.Generalization_4015);
types.add(UMLElementTypes.InformationFlow_4016);
+ types.add(UMLElementTypes.TimeObservationEvent_4018);
+ types.add(UMLElementTypes.DurationObservationEvent_4019);
return types;
}
@@ -6162,7 +6168,8 @@ ShapeNodeEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -9081,6 +9088,12 @@ ShapeNodeEditPart {
if (relationshipType == UMLElementTypes.InformationFlow_4016) {
types.add(UMLElementTypes.Comment_3097);
}
+ if (relationshipType == UMLElementTypes.TimeObservationEvent_4018) {
+ types.add(UMLElementTypes.TimeObservation_2094);
+ }
+ if (relationshipType == UMLElementTypes.DurationObservationEvent_4019) {
+ types.add(UMLElementTypes.DurationObservation_2093);
+ }
return types;
}
diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/TimeObservationEditPart.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/TimeObservationEditPart.java
index 7bd5fa5a028..356220983b7 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/TimeObservationEditPart.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/TimeObservationEditPart.java
@@ -14,27 +14,31 @@
package org.eclipse.papyrus.diagram.composite.edit.parts;
import java.util.ArrayList;
+import java.util.Collections;
import java.util.List;
-import org.eclipse.draw2d.ColorConstants;
import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.RectangleFigure;
+import org.eclipse.draw2d.PositionConstants;
import org.eclipse.draw2d.Shape;
import org.eclipse.draw2d.StackLayout;
+import org.eclipse.draw2d.geometry.Dimension;
+import org.eclipse.emf.common.notify.Notification;
import org.eclipse.emf.ecore.EStructuralFeature;
import org.eclipse.gef.EditPart;
import org.eclipse.gef.EditPolicy;
+import org.eclipse.gef.GraphicalEditPart;
import org.eclipse.gef.Request;
import org.eclipse.gef.commands.Command;
import org.eclipse.gef.editpolicies.LayoutEditPolicy;
import org.eclipse.gef.editpolicies.NonResizableEditPolicy;
+import org.eclipse.gef.handles.MoveHandle;
import org.eclipse.gef.requests.CreateRequest;
+import org.eclipse.gmf.runtime.diagram.ui.editparts.IBorderItemEditPart;
import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ShapeNodeEditPart;
+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.BorderItemSelectionEditPolicy;
import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;
+import org.eclipse.gmf.runtime.diagram.ui.figures.BorderItemLocator;
import org.eclipse.gmf.runtime.draw2d.ui.figures.FigureUtilities;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;
import org.eclipse.gmf.runtime.emf.type.core.IElementType;
import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure;
import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;
@@ -42,22 +46,24 @@ import org.eclipse.gmf.runtime.notation.NotationPackage;
import org.eclipse.gmf.runtime.notation.View;
import org.eclipse.jface.preference.IPreferenceStore;
import org.eclipse.jface.preference.PreferenceConverter;
+import org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeIconlDisplayEditPolicy;
+import org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;
+import org.eclipse.papyrus.diagram.composite.custom.edit.parts.AbstractObservationEditPart;
+import org.eclipse.papyrus.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy;
+import org.eclipse.papyrus.diagram.composite.custom.figures.TimeObservationNodeFigure;
import org.eclipse.papyrus.diagram.composite.edit.policies.TimeObservationItemSemanticEditPolicy;
import org.eclipse.papyrus.diagram.composite.part.UMLVisualIDRegistry;
import org.eclipse.papyrus.diagram.composite.providers.UMLElementTypes;
import org.eclipse.papyrus.preferences.utils.GradientPreferenceConverter;
import org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper;
-import org.eclipse.swt.SWT;
import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.Font;
-import org.eclipse.swt.widgets.Display;
/**
* @generated
*/
public class TimeObservationEditPart extends
-ShapeNodeEditPart {
+AbstractObservationEditPart {
/**
* @generated
@@ -88,18 +94,44 @@ ShapeNodeEditPart {
super.createDefaultEditPolicies();
installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new TimeObservationItemSemanticEditPolicy());
installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());
+ installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY,
+ new AppliedStereotypeIconlDisplayEditPolicy());
+ installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());
// XXX need an SCR to runtime to have another abstract superclass that would let children
// add reasonable editpolicies
// removeEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CONNECTION_HANDLES_ROLE);
}
/**
+ *Papyrus codeGen
+ *
+ * @generated
+ **/
+ protected void handleNotificationEvent(Notification event) {
+ super.handleNotificationEvent(event);
+
+ }
+
+ /**
* @generated
*/
protected LayoutEditPolicy createLayoutEditPolicy() {
LayoutEditPolicy lep = new LayoutEditPolicy() {
protected EditPolicy createChildEditPolicy(EditPart child) {
+ View childView = (View) child.getModel();
+ switch (UMLVisualIDRegistry.getVisualID(childView)) {
+ case TimeObservationNameEditPart.VISUAL_ID:
+ case TimeObservationStereotypeLabelEditPart.VISUAL_ID:
+ return new BorderItemSelectionEditPolicy() {
+
+ protected List createSelectionHandles() {
+ MoveHandle mh = new MoveHandle((GraphicalEditPart) getHost());
+ mh.setBorder(null);
+ return Collections.singletonList(mh);
+ }
+ };
+ }
EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
if (result == null) {
result = new NonResizableEditPolicy();
@@ -122,64 +154,28 @@ ShapeNodeEditPart {
* @generated
*/
protected IFigure createNodeShape() {
- NamedElementDescriptor figure = new NamedElementDescriptor();
- return primaryShape = figure;
- }
-
- /**
- * @generated
- */
- public NamedElementDescriptor getPrimaryShape() {
- return (NamedElementDescriptor) primaryShape;
- }
-
- /**
- * @generated
- */
- protected boolean addFixedChild(EditPart childEditPart) {
- if (childEditPart instanceof TimeObservationNameEditPart) {
- ((TimeObservationNameEditPart) childEditPart).setLabel(getPrimaryShape().getNamedElementNameLabel());
- return true;
- }
-
- return false;
- }
-
- /**
- * @generated
- */
- protected boolean removeFixedChild(EditPart childEditPart) {
- if (childEditPart instanceof TimeObservationNameEditPart) {
- return true;
- }
- return false;
+ return primaryShape = new TimeObservationNodeFigure();
}
/**
* @generated
*/
- protected void addChildVisual(EditPart childEditPart, int index) {
- if (addFixedChild(childEditPart)) {
- return;
- }
- super.addChildVisual(childEditPart, -1);
+ public TimeObservationNodeFigure getPrimaryShape() {
+ return (TimeObservationNodeFigure) primaryShape;
}
/**
* @generated
*/
- protected void removeChildVisual(EditPart childEditPart) {
- if (removeFixedChild(childEditPart)) {
- return;
+ protected void addBorderItem(IFigure borderItemContainer, IBorderItemEditPart borderItemEditPart) {
+ if (borderItemEditPart instanceof TimeObservationNameEditPart
+ || borderItemEditPart instanceof TimeObservationStereotypeLabelEditPart) {
+ BorderItemLocator locator = new BorderItemLocator(getMainFigure(), PositionConstants.SOUTH);
+ locator.setBorderItemOffset(new Dimension(-20, -20));
+ borderItemContainer.add(borderItemEditPart.getFigure(), locator);
+ } else {
+ super.addBorderItem(borderItemContainer, borderItemEditPart);
}
- super.removeChildVisual(childEditPart);
- }
-
- /**
- * @generated
- */
- protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {
- return getContentPane();
}
/**
@@ -198,7 +194,7 @@ ShapeNodeEditPart {
*
* @generated
*/
- protected NodeFigure createNodeFigure() {
+ protected NodeFigure createMainFigure() {
NodeFigure figure = createNodePlate();
figure.setLayoutManager(new StackLayout());
IFigure shape = createNodeShape();
@@ -216,11 +212,6 @@ ShapeNodeEditPart {
* @generated
*/
protected IFigure setupContentPane(IFigure nodeShape) {
- if (nodeShape.getLayoutManager() == null) {
- ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout();
- layout.setSpacing(5);
- nodeShape.setLayoutManager(layout);
- }
return nodeShape; // use nodeShape itself as contentPane
}
@@ -277,7 +268,8 @@ ShapeNodeEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -295,6 +287,7 @@ ShapeNodeEditPart {
types.add(UMLElementTypes.Dependency_4010);
types.add(UMLElementTypes.Generalization_4015);
types.add(UMLElementTypes.InformationFlow_4016);
+ types.add(UMLElementTypes.TimeObservationEvent_4018);
return types;
}
@@ -308,7 +301,8 @@ ShapeNodeEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -3206,6 +3200,246 @@ ShapeNodeEditPart {
if (targetEditPart instanceof CommentEditPartCN) {
types.add(UMLElementTypes.InformationFlow_4016);
}
+ if (targetEditPart instanceof ActivityCompositeEditPart) {
+ types.add(UMLElementTypes.TimeObservationEvent_4018);
+ }
+ if (targetEditPart instanceof InteractionCompositeEditPart) {
+ types.add(UMLElementTypes.TimeObservationEvent_4018);
+ }
+ if (targetEditPart instanceof ProtocolStateMachineCompositeEditPart) {
+ types.add(UMLElementTypes.TimeObservationEvent_4018);
+ }
+ if (targetEditPart instanceof StateMachineCompositeEditPart) {
+ types.add(UMLElementTypes.TimeObservationEvent_4018);
+ }
+ if (targetEditPart instanceof FunctionBehaviorCompositeEditPart) {
+ types.add(UMLElementTypes.TimeObservationEvent_4018);
+ }
+ if (targetEditPart instanceof OpaqueBehaviorCompositeEditPart) {
+ types.add(UMLElementTypes.TimeObservationEvent_4018);
+ }
+ if (targetEditPart instanceof ComponentCompositeEditPart) {
+ types.add(UMLElementTypes.TimeObservationEvent_4018);
+ }
+ if (targetEditPart instanceof DeviceCompositeEditPart) {
+ types.add(UMLElementTypes.TimeObservationEvent_4018);
+ }
+ if (targetEditPart instanceof ExecutionEnvironmentCompositeEditPart) {
+ types.add(UMLElementTypes.TimeObservationEvent_4018);
+ }
+ if (targetEditPart instanceof NodeCompositeEditPart) {
+ types.add(UMLElementTypes.TimeObservationEvent_4018);
+ }
+ if (targetEditPart instanceof ClassCompositeEditPart) {
+ types.add(UMLElementTypes.TimeObservationEvent_4018);
+ }
+ if (targetEditPart instanceof ClassClassifierEditPart) {
+ types.add(UMLElementTypes.TimeObservationEvent_4018);
+ }
+ if (targetEditPart instanceof CollaborationCompositeEditPart) {
+ types.add(UMLElementTypes.TimeObservationEvent_4018);
+ }
+ if (targetEditPart instanceof InterfaceEditPart) {
+ types.add(UMLElementTypes.TimeObservationEvent_4018);
+ }
+ if (targetEditPart instanceof PrimitiveTypeEditPart) {
+ types.add(UMLElementTypes.TimeObservationEvent_4018);
+ }
+ if (targetEditPart instanceof EnumerationEditPart) {
+ types.add(UMLElementTypes.TimeObservationEvent_4018);
+ }
+ if (targetEditPart instanceof DataTypeEditPart) {
+ types.add(UMLElementTypes.TimeObservationEvent_4018);
+ }
+ if (targetEditPart instanceof ActorEditPart) {
+ types.add(UMLElementTypes.TimeObservationEvent_4018);
+ }
+ if (targetEditPart instanceof DeploymentSpecificationEditPart) {
+ types.add(UMLElementTypes.TimeObservationEvent_4018);
+ }
+ if (targetEditPart instanceof ArtifactEditPart) {
+ types.add(UMLElementTypes.TimeObservationEvent_4018);
+ }
+ if (targetEditPart instanceof InformationItemEditPart) {
+ types.add(UMLElementTypes.TimeObservationEvent_4018);
+ }
+ if (targetEditPart instanceof SignalEditPart) {
+ types.add(UMLElementTypes.TimeObservationEvent_4018);
+ }
+ if (targetEditPart instanceof UseCaseEditPart) {
+ types.add(UMLElementTypes.TimeObservationEvent_4018);
+ }
+ if (targetEditPart instanceof SignalEventEditPart) {
+ types.add(UMLElementTypes.TimeObservationEvent_4018);
+ }
+ if (targetEditPart instanceof CallEventEditPart) {
+ types.add(UMLElementTypes.TimeObservationEvent_4018);
+ }
+ if (targetEditPart instanceof AnyReceiveEventEditPart) {
+ types.add(UMLElementTypes.TimeObservationEvent_4018);
+ }
+ if (targetEditPart instanceof SendSignalEventEditPart) {
+ types.add(UMLElementTypes.TimeObservationEvent_4018);
+ }
+ if (targetEditPart instanceof SendOperationEventEditPart) {
+ types.add(UMLElementTypes.TimeObservationEvent_4018);
+ }
+ if (targetEditPart instanceof ChangeEventEditPart) {
+ types.add(UMLElementTypes.TimeObservationEvent_4018);
+ }
+ if (targetEditPart instanceof TimeEventEditPart) {
+ types.add(UMLElementTypes.TimeObservationEvent_4018);
+ }
+ if (targetEditPart instanceof CreationEventEditPart) {
+ types.add(UMLElementTypes.TimeObservationEvent_4018);
+ }
+ if (targetEditPart instanceof DestructionEventEditPart) {
+ types.add(UMLElementTypes.TimeObservationEvent_4018);
+ }
+ if (targetEditPart instanceof ExecutionEventEditPart) {
+ types.add(UMLElementTypes.TimeObservationEvent_4018);
+ }
+ if (targetEditPart instanceof DurationObservationEditPart) {
+ types.add(UMLElementTypes.TimeObservationEvent_4018);
+ }
+ if (targetEditPart instanceof org.eclipse.papyrus.diagram.composite.edit.parts.TimeObservationEditPart) {
+ types.add(UMLElementTypes.TimeObservationEvent_4018);
+ }
+ if (targetEditPart instanceof LiteralBooleanEditPart) {
+ types.add(UMLElementTypes.TimeObservationEvent_4018);
+ }
+ if (targetEditPart instanceof LiteralIntegerEditPart) {
+ types.add(UMLElementTypes.TimeObservationEvent_4018);
+ }
+ if (targetEditPart instanceof LiteralNullEditPart) {
+ types.add(UMLElementTypes.TimeObservationEvent_4018);
+ }
+ if (targetEditPart instanceof LiteralStringEditPart) {
+ types.add(UMLElementTypes.TimeObservationEvent_4018);
+ }
+ if (targetEditPart instanceof LiteralUnlimitedNaturalEditPart) {
+ types.add(UMLElementTypes.TimeObservationEvent_4018);
+ }
+ if (targetEditPart instanceof StringExpressionEditPart) {
+ types.add(UMLElementTypes.TimeObservationEvent_4018);
+ }
+ if (targetEditPart instanceof OpaqueExpressionEditPart) {
+ types.add(UMLElementTypes.TimeObservationEvent_4018);
+ }
+ if (targetEditPart instanceof TimeExpressionEditPart) {
+ types.add(UMLElementTypes.TimeObservationEvent_4018);
+ }
+ if (targetEditPart instanceof ExpressionEditPart) {
+ types.add(UMLElementTypes.TimeObservationEvent_4018);
+ }
+ if (targetEditPart instanceof DurationEditPart) {
+ types.add(UMLElementTypes.TimeObservationEvent_4018);
+ }
+ if (targetEditPart instanceof TimeIntervalEditPart) {
+ types.add(UMLElementTypes.TimeObservationEvent_4018);
+ }
+ if (targetEditPart instanceof DurationIntervalEditPart) {
+ types.add(UMLElementTypes.TimeObservationEvent_4018);
+ }
+ if (targetEditPart instanceof IntervalEditPart) {
+ types.add(UMLElementTypes.TimeObservationEvent_4018);
+ }
+ if (targetEditPart instanceof InstanceValueEditPart) {
+ types.add(UMLElementTypes.TimeObservationEvent_4018);
+ }
+ if (targetEditPart instanceof DurationConstraintEditPart) {
+ types.add(UMLElementTypes.TimeObservationEvent_4018);
+ }
+ if (targetEditPart instanceof TimeConstraintEditPart) {
+ types.add(UMLElementTypes.TimeObservationEvent_4018);
+ }
+ if (targetEditPart instanceof IntervalConstraintEditPart) {
+ types.add(UMLElementTypes.TimeObservationEvent_4018);
+ }
+ if (targetEditPart instanceof InteractionConstraintEditPart) {
+ types.add(UMLElementTypes.TimeObservationEvent_4018);
+ }
+ if (targetEditPart instanceof ConstraintEditPart) {
+ types.add(UMLElementTypes.TimeObservationEvent_4018);
+ }
+ if (targetEditPart instanceof PortEditPart) {
+ types.add(UMLElementTypes.TimeObservationEvent_4018);
+ }
+ if (targetEditPart instanceof PropertyPartEditPartCN) {
+ types.add(UMLElementTypes.TimeObservationEvent_4018);
+ }
+ if (targetEditPart instanceof CollaborationRoleEditPartCN) {
+ types.add(UMLElementTypes.TimeObservationEvent_4018);
+ }
+ if (targetEditPart instanceof CollaborationUseEditPartCN) {
+ types.add(UMLElementTypes.TimeObservationEvent_4018);
+ }
+ if (targetEditPart instanceof ActivityCompositeEditPartCN) {
+ types.add(UMLElementTypes.TimeObservationEvent_4018);
+ }
+ if (targetEditPart instanceof InteractionCompositeEditPartCN) {
+ types.add(UMLElementTypes.TimeObservationEvent_4018);
+ }
+ if (targetEditPart instanceof ProtocolStateMachineCompositeEditPartCN) {
+ types.add(UMLElementTypes.TimeObservationEvent_4018);
+ }
+ if (targetEditPart instanceof StateMachineCompositeEditPartCN) {
+ types.add(UMLElementTypes.TimeObservationEvent_4018);
+ }
+ if (targetEditPart instanceof FunctionBehaviorCompositeEditPartCN) {
+ types.add(UMLElementTypes.TimeObservationEvent_4018);
+ }
+ if (targetEditPart instanceof OpaqueBehaviorCompositeEditPartCN) {
+ types.add(UMLElementTypes.TimeObservationEvent_4018);
+ }
+ if (targetEditPart instanceof ComponentCompositeEditPartCN) {
+ types.add(UMLElementTypes.TimeObservationEvent_4018);
+ }
+ if (targetEditPart instanceof DeviceCompositeEditPartCN) {
+ types.add(UMLElementTypes.TimeObservationEvent_4018);
+ }
+ if (targetEditPart instanceof ExecutionEnvironmentCompositeEditPartCN) {
+ types.add(UMLElementTypes.TimeObservationEvent_4018);
+ }
+ if (targetEditPart instanceof NodeCompositeEditPartCN) {
+ types.add(UMLElementTypes.TimeObservationEvent_4018);
+ }
+ if (targetEditPart instanceof ClassCompositeEditPartCN) {
+ types.add(UMLElementTypes.TimeObservationEvent_4018);
+ }
+ if (targetEditPart instanceof CollaborationCompositeEditPartCN) {
+ types.add(UMLElementTypes.TimeObservationEvent_4018);
+ }
+ if (targetEditPart instanceof InterfaceEditPartCN) {
+ types.add(UMLElementTypes.TimeObservationEvent_4018);
+ }
+ if (targetEditPart instanceof PrimitiveTypeEditPartCN) {
+ types.add(UMLElementTypes.TimeObservationEvent_4018);
+ }
+ if (targetEditPart instanceof EnumerationEditPartCN) {
+ types.add(UMLElementTypes.TimeObservationEvent_4018);
+ }
+ if (targetEditPart instanceof DataTypeEditPartCN) {
+ types.add(UMLElementTypes.TimeObservationEvent_4018);
+ }
+ if (targetEditPart instanceof ActorEditPartCN) {
+ types.add(UMLElementTypes.TimeObservationEvent_4018);
+ }
+ if (targetEditPart instanceof DeploymentSpecificationEditPartCN) {
+ types.add(UMLElementTypes.TimeObservationEvent_4018);
+ }
+ if (targetEditPart instanceof ArtifactEditPartCN) {
+ types.add(UMLElementTypes.TimeObservationEvent_4018);
+ }
+ if (targetEditPart instanceof InformationItemEditPartCN) {
+ types.add(UMLElementTypes.TimeObservationEvent_4018);
+ }
+ if (targetEditPart instanceof SignalEditPartCN) {
+ types.add(UMLElementTypes.TimeObservationEvent_4018);
+ }
+ if (targetEditPart instanceof UseCaseEditPartCN) {
+ types.add(UMLElementTypes.TimeObservationEvent_4018);
+ }
return types;
}
@@ -3219,7 +3453,8 @@ ShapeNodeEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -6117,6 +6352,246 @@ ShapeNodeEditPart {
if (relationshipType == UMLElementTypes.InformationFlow_4016) {
types.add(UMLElementTypes.Comment_3097);
}
+ if (relationshipType == UMLElementTypes.TimeObservationEvent_4018) {
+ types.add(UMLElementTypes.Activity_2060);
+ }
+ if (relationshipType == UMLElementTypes.TimeObservationEvent_4018) {
+ types.add(UMLElementTypes.Interaction_2061);
+ }
+ if (relationshipType == UMLElementTypes.TimeObservationEvent_4018) {
+ types.add(UMLElementTypes.ProtocolStateMachine_2062);
+ }
+ if (relationshipType == UMLElementTypes.TimeObservationEvent_4018) {
+ types.add(UMLElementTypes.StateMachine_2063);
+ }
+ if (relationshipType == UMLElementTypes.TimeObservationEvent_4018) {
+ types.add(UMLElementTypes.FunctionBehavior_2064);
+ }
+ if (relationshipType == UMLElementTypes.TimeObservationEvent_4018) {
+ types.add(UMLElementTypes.OpaqueBehavior_2065);
+ }
+ if (relationshipType == UMLElementTypes.TimeObservationEvent_4018) {
+ types.add(UMLElementTypes.Component_2069);
+ }
+ if (relationshipType == UMLElementTypes.TimeObservationEvent_4018) {
+ types.add(UMLElementTypes.Device_2070);
+ }
+ if (relationshipType == UMLElementTypes.TimeObservationEvent_4018) {
+ types.add(UMLElementTypes.ExecutionEnvironment_2071);
+ }
+ if (relationshipType == UMLElementTypes.TimeObservationEvent_4018) {
+ types.add(UMLElementTypes.Node_2072);
+ }
+ if (relationshipType == UMLElementTypes.TimeObservationEvent_4018) {
+ types.add(UMLElementTypes.Class_2073);
+ }
+ if (relationshipType == UMLElementTypes.TimeObservationEvent_4018) {
+ types.add(UMLElementTypes.Class_2074);
+ }
+ if (relationshipType == UMLElementTypes.TimeObservationEvent_4018) {
+ types.add(UMLElementTypes.Collaboration_2075);
+ }
+ if (relationshipType == UMLElementTypes.TimeObservationEvent_4018) {
+ types.add(UMLElementTypes.Interface_2076);
+ }
+ if (relationshipType == UMLElementTypes.TimeObservationEvent_4018) {
+ types.add(UMLElementTypes.PrimitiveType_2066);
+ }
+ if (relationshipType == UMLElementTypes.TimeObservationEvent_4018) {
+ types.add(UMLElementTypes.Enumeration_2067);
+ }
+ if (relationshipType == UMLElementTypes.TimeObservationEvent_4018) {
+ types.add(UMLElementTypes.DataType_2068);
+ }
+ if (relationshipType == UMLElementTypes.TimeObservationEvent_4018) {
+ types.add(UMLElementTypes.Actor_2077);
+ }
+ if (relationshipType == UMLElementTypes.TimeObservationEvent_4018) {
+ types.add(UMLElementTypes.DeploymentSpecification_2078);
+ }
+ if (relationshipType == UMLElementTypes.TimeObservationEvent_4018) {
+ types.add(UMLElementTypes.Artifact_2079);
+ }
+ if (relationshipType == UMLElementTypes.TimeObservationEvent_4018) {
+ types.add(UMLElementTypes.InformationItem_2080);
+ }
+ if (relationshipType == UMLElementTypes.TimeObservationEvent_4018) {
+ types.add(UMLElementTypes.Signal_2081);
+ }
+ if (relationshipType == UMLElementTypes.TimeObservationEvent_4018) {
+ types.add(UMLElementTypes.UseCase_2082);
+ }
+ if (relationshipType == UMLElementTypes.TimeObservationEvent_4018) {
+ types.add(UMLElementTypes.SignalEvent_2083);
+ }
+ if (relationshipType == UMLElementTypes.TimeObservationEvent_4018) {
+ types.add(UMLElementTypes.CallEvent_2084);
+ }
+ if (relationshipType == UMLElementTypes.TimeObservationEvent_4018) {
+ types.add(UMLElementTypes.AnyReceiveEvent_2085);
+ }
+ if (relationshipType == UMLElementTypes.TimeObservationEvent_4018) {
+ types.add(UMLElementTypes.SendSignalEvent_2086);
+ }
+ if (relationshipType == UMLElementTypes.TimeObservationEvent_4018) {
+ types.add(UMLElementTypes.SendOperationEvent_2087);
+ }
+ if (relationshipType == UMLElementTypes.TimeObservationEvent_4018) {
+ types.add(UMLElementTypes.ChangeEvent_2088);
+ }
+ if (relationshipType == UMLElementTypes.TimeObservationEvent_4018) {
+ types.add(UMLElementTypes.TimeEvent_2089);
+ }
+ if (relationshipType == UMLElementTypes.TimeObservationEvent_4018) {
+ types.add(UMLElementTypes.CreationEvent_2090);
+ }
+ if (relationshipType == UMLElementTypes.TimeObservationEvent_4018) {
+ types.add(UMLElementTypes.DestructionEvent_2091);
+ }
+ if (relationshipType == UMLElementTypes.TimeObservationEvent_4018) {
+ types.add(UMLElementTypes.ExecutionEvent_2092);
+ }
+ if (relationshipType == UMLElementTypes.TimeObservationEvent_4018) {
+ types.add(UMLElementTypes.DurationObservation_2093);
+ }
+ if (relationshipType == UMLElementTypes.TimeObservationEvent_4018) {
+ types.add(UMLElementTypes.TimeObservation_2094);
+ }
+ if (relationshipType == UMLElementTypes.TimeObservationEvent_4018) {
+ types.add(UMLElementTypes.LiteralBoolean_2095);
+ }
+ if (relationshipType == UMLElementTypes.TimeObservationEvent_4018) {
+ types.add(UMLElementTypes.LiteralInteger_2096);
+ }
+ if (relationshipType == UMLElementTypes.TimeObservationEvent_4018) {
+ types.add(UMLElementTypes.LiteralNull_2097);
+ }
+ if (relationshipType == UMLElementTypes.TimeObservationEvent_4018) {
+ types.add(UMLElementTypes.LiteralString_2098);
+ }
+ if (relationshipType == UMLElementTypes.TimeObservationEvent_4018) {
+ types.add(UMLElementTypes.LiteralUnlimitedNatural_2099);
+ }
+ if (relationshipType == UMLElementTypes.TimeObservationEvent_4018) {
+ types.add(UMLElementTypes.StringExpression_2100);
+ }
+ if (relationshipType == UMLElementTypes.TimeObservationEvent_4018) {
+ types.add(UMLElementTypes.OpaqueExpression_2101);
+ }
+ if (relationshipType == UMLElementTypes.TimeObservationEvent_4018) {
+ types.add(UMLElementTypes.TimeExpression_2102);
+ }
+ if (relationshipType == UMLElementTypes.TimeObservationEvent_4018) {
+ types.add(UMLElementTypes.Expression_2103);
+ }
+ if (relationshipType == UMLElementTypes.TimeObservationEvent_4018) {
+ types.add(UMLElementTypes.Duration_2104);
+ }
+ if (relationshipType == UMLElementTypes.TimeObservationEvent_4018) {
+ types.add(UMLElementTypes.TimeInterval_2105);
+ }
+ if (relationshipType == UMLElementTypes.TimeObservationEvent_4018) {
+ types.add(UMLElementTypes.DurationInterval_2106);
+ }
+ if (relationshipType == UMLElementTypes.TimeObservationEvent_4018) {
+ types.add(UMLElementTypes.Interval_2107);
+ }
+ if (relationshipType == UMLElementTypes.TimeObservationEvent_4018) {
+ types.add(UMLElementTypes.InstanceValue_2108);
+ }
+ if (relationshipType == UMLElementTypes.TimeObservationEvent_4018) {
+ types.add(UMLElementTypes.DurationConstraint_2110);
+ }
+ if (relationshipType == UMLElementTypes.TimeObservationEvent_4018) {
+ types.add(UMLElementTypes.TimeConstraint_2111);
+ }
+ if (relationshipType == UMLElementTypes.TimeObservationEvent_4018) {
+ types.add(UMLElementTypes.IntervalConstraint_2112);
+ }
+ if (relationshipType == UMLElementTypes.TimeObservationEvent_4018) {
+ types.add(UMLElementTypes.InteractionConstraint_2113);
+ }
+ if (relationshipType == UMLElementTypes.TimeObservationEvent_4018) {
+ types.add(UMLElementTypes.Constraint_2114);
+ }
+ if (relationshipType == UMLElementTypes.TimeObservationEvent_4018) {
+ types.add(UMLElementTypes.Port_3069);
+ }
+ if (relationshipType == UMLElementTypes.TimeObservationEvent_4018) {
+ types.add(UMLElementTypes.Property_3070);
+ }
+ if (relationshipType == UMLElementTypes.TimeObservationEvent_4018) {
+ types.add(UMLElementTypes.ConnectableElement_3115);
+ }
+ if (relationshipType == UMLElementTypes.TimeObservationEvent_4018) {
+ types.add(UMLElementTypes.CollaborationUse_3071);
+ }
+ if (relationshipType == UMLElementTypes.TimeObservationEvent_4018) {
+ types.add(UMLElementTypes.Activity_3072);
+ }
+ if (relationshipType == UMLElementTypes.TimeObservationEvent_4018) {
+ types.add(UMLElementTypes.Interaction_3073);
+ }
+ if (relationshipType == UMLElementTypes.TimeObservationEvent_4018) {
+ types.add(UMLElementTypes.ProtocolStateMachine_3074);
+ }
+ if (relationshipType == UMLElementTypes.TimeObservationEvent_4018) {
+ types.add(UMLElementTypes.StateMachine_3075);
+ }
+ if (relationshipType == UMLElementTypes.TimeObservationEvent_4018) {
+ types.add(UMLElementTypes.FunctionBehavior_3076);
+ }
+ if (relationshipType == UMLElementTypes.TimeObservationEvent_4018) {
+ types.add(UMLElementTypes.OpaqueBehavior_3077);
+ }
+ if (relationshipType == UMLElementTypes.TimeObservationEvent_4018) {
+ types.add(UMLElementTypes.Component_3081);
+ }
+ if (relationshipType == UMLElementTypes.TimeObservationEvent_4018) {
+ types.add(UMLElementTypes.Device_3082);
+ }
+ if (relationshipType == UMLElementTypes.TimeObservationEvent_4018) {
+ types.add(UMLElementTypes.ExecutionEnvironment_3083);
+ }
+ if (relationshipType == UMLElementTypes.TimeObservationEvent_4018) {
+ types.add(UMLElementTypes.Node_3084);
+ }
+ if (relationshipType == UMLElementTypes.TimeObservationEvent_4018) {
+ types.add(UMLElementTypes.Class_3085);
+ }
+ if (relationshipType == UMLElementTypes.TimeObservationEvent_4018) {
+ types.add(UMLElementTypes.Collaboration_3086);
+ }
+ if (relationshipType == UMLElementTypes.TimeObservationEvent_4018) {
+ types.add(UMLElementTypes.Interface_3087);
+ }
+ if (relationshipType == UMLElementTypes.TimeObservationEvent_4018) {
+ types.add(UMLElementTypes.PrimitiveType_3078);
+ }
+ if (relationshipType == UMLElementTypes.TimeObservationEvent_4018) {
+ types.add(UMLElementTypes.Enumeration_3079);
+ }
+ if (relationshipType == UMLElementTypes.TimeObservationEvent_4018) {
+ types.add(UMLElementTypes.DataType_3080);
+ }
+ if (relationshipType == UMLElementTypes.TimeObservationEvent_4018) {
+ types.add(UMLElementTypes.Actor_3091);
+ }
+ if (relationshipType == UMLElementTypes.TimeObservationEvent_4018) {
+ types.add(UMLElementTypes.DeploymentSpecification_3092);
+ }
+ if (relationshipType == UMLElementTypes.TimeObservationEvent_4018) {
+ types.add(UMLElementTypes.Artifact_3093);
+ }
+ if (relationshipType == UMLElementTypes.TimeObservationEvent_4018) {
+ types.add(UMLElementTypes.InformationItem_3094);
+ }
+ if (relationshipType == UMLElementTypes.TimeObservationEvent_4018) {
+ types.add(UMLElementTypes.Signal_3095);
+ }
+ if (relationshipType == UMLElementTypes.TimeObservationEvent_4018) {
+ types.add(UMLElementTypes.UseCase_3096);
+ }
return types;
}
@@ -6129,7 +6604,8 @@ ShapeNodeEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -6149,6 +6625,8 @@ ShapeNodeEditPart {
types.add(UMLElementTypes.Dependency_4010);
types.add(UMLElementTypes.Generalization_4015);
types.add(UMLElementTypes.InformationFlow_4016);
+ types.add(UMLElementTypes.TimeObservationEvent_4018);
+ types.add(UMLElementTypes.DurationObservationEvent_4019);
return types;
}
@@ -6162,7 +6640,8 @@ ShapeNodeEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -9081,79 +9560,18 @@ ShapeNodeEditPart {
if (relationshipType == UMLElementTypes.InformationFlow_4016) {
types.add(UMLElementTypes.Comment_3097);
}
- return types;
- }
-
- /**
- * @generated
- */
- public class NamedElementDescriptor extends RectangleFigure {
-
- /**
- * @generated
- */
- private WrappingLabel fNamedElementNameLabel;
-
- /**
- * @generated
- */
- public NamedElementDescriptor() {
- this.setLineWidth(1);
- this.setForegroundColor(ColorConstants.black);
- createContents();
- }
-
- /**
- * @generated
- */
- private void createContents() {
-
- fNamedElementNameLabel = new WrappingLabel();
- fNamedElementNameLabel.setText("");
- fNamedElementNameLabel.setForegroundColor(ColorConstants.black);
-
- fNamedElementNameLabel.setFont(FNAMEDELEMENTNAMELABEL_FONT);
-
- this.add(fNamedElementNameLabel);
-
- }
-
- /**
- * @generated
- */
- private boolean myUseLocalCoordinates = false;
-
- /**
- * @generated
- */
- protected boolean useLocalCoordinates() {
- return myUseLocalCoordinates;
- }
-
- /**
- * @generated
- */
- protected void setUseLocalCoordinates(boolean useLocalCoordinates) {
- myUseLocalCoordinates = useLocalCoordinates;
+ if (relationshipType == UMLElementTypes.TimeObservationEvent_4018) {
+ types.add(UMLElementTypes.TimeObservation_2094);
}
-
- /**
- * @generated
- */
- public WrappingLabel getNamedElementNameLabel() {
- return fNamedElementNameLabel;
+ if (relationshipType == UMLElementTypes.DurationObservationEvent_4019) {
+ types.add(UMLElementTypes.DurationObservation_2093);
}
-
+ return types;
}
/**
* @generated
*/
- static final Font FNAMEDELEMENTNAMELABEL_FONT = new Font(Display.getCurrent(), "Arial", 10, SWT.BOLD);
-
- /**
- * @generated
- */
@Override
public Object getPreferredValue(EStructuralFeature feature) {
IPreferenceStore preferenceStore = (IPreferenceStore) getDiagramPreferencesHint().getPreferenceStore();
diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/TimeObservationNameEditPart.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/TimeObservationNameEditPart.java
index 08ff117d646..f699e476010 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/TimeObservationNameEditPart.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/TimeObservationNameEditPart.java
@@ -13,37 +13,33 @@
*****************************************************************************/
package org.eclipse.papyrus.diagram.composite.edit.parts;
-import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import org.eclipse.draw2d.IFigure;
import org.eclipse.draw2d.Label;
import org.eclipse.draw2d.geometry.Point;
+import org.eclipse.draw2d.geometry.Rectangle;
import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EAnnotation;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.transaction.RecordingCommand;
import org.eclipse.emf.transaction.RunnableWithResult;
import org.eclipse.emf.transaction.TransactionalEditingDomain;
import org.eclipse.gef.AccessibleEditPart;
import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.GraphicalEditPart;
import org.eclipse.gef.Request;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.editpolicies.NonResizableEditPolicy;
-import org.eclipse.gef.handles.MoveHandle;
-import org.eclipse.gef.handles.NonResizableHandleKit;
import org.eclipse.gef.requests.DirectEditRequest;
import org.eclipse.gef.tools.DirectEditManager;
import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;
import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;
import org.eclipse.gmf.runtime.common.ui.services.parser.ParserEditStatus;
import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.CompartmentEditPart;
+import org.eclipse.gmf.runtime.diagram.ui.editparts.IBorderItemEditPart;
import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;
+import org.eclipse.gmf.runtime.diagram.ui.editparts.LabelEditPart;
import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;
+import org.eclipse.gmf.runtime.diagram.ui.figures.IBorderItemLocator;
import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;
import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;
import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;
@@ -58,7 +54,6 @@ import org.eclipse.jface.viewers.ICellEditorValidator;
import org.eclipse.jface.window.Window;
import org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition;
import org.eclipse.papyrus.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;
-import org.eclipse.papyrus.diagram.common.util.DiagramEditPartsUtil;
import org.eclipse.papyrus.diagram.composite.edit.policies.UMLTextSelectionEditPolicy;
import org.eclipse.papyrus.diagram.composite.part.UMLVisualIDRegistry;
import org.eclipse.papyrus.diagram.composite.providers.UMLElementTypes;
@@ -68,8 +63,6 @@ import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorCo
import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;
import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;
import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;
-import org.eclipse.papyrus.umlutils.ui.VisualInformationPapyrusConstant;
-import org.eclipse.papyrus.umlutils.ui.helper.NameLabelIconHelper;
import org.eclipse.swt.SWT;
import org.eclipse.swt.accessibility.AccessibleEvent;
import org.eclipse.swt.graphics.Color;
@@ -81,12 +74,16 @@ import org.eclipse.uml2.uml.NamedElement;
/**
* @generated
*/
-public class TimeObservationNameEditPart extends CompartmentEditPart implements ITextAwareEditPart {
+public class TimeObservationNameEditPart
+
+extends LabelEditPart
+
+implements ITextAwareEditPart, IBorderItemEditPart {
/**
* @generated
*/
- public static final int VISUAL_ID = 5177;
+ public static final int VISUAL_ID = 5142;
/**
* @generated
@@ -117,6 +114,15 @@ public class TimeObservationNameEditPart extends CompartmentEditPart implements
/**
* @generated
*/
+ static {
+ registerSnapBackPosition(UMLVisualIDRegistry
+ .getType(org.eclipse.papyrus.diagram.composite.edit.parts.TimeObservationNameEditPart.VISUAL_ID),
+ new Point(0, 0));
+ }
+
+ /**
+ * @generated
+ */
public TimeObservationNameEditPart(View view) {
super(view);
}
@@ -126,25 +132,31 @@ public class TimeObservationNameEditPart extends CompartmentEditPart implements
*/
protected void createDefaultEditPolicies() {
super.createDefaultEditPolicies();
- installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());
installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());
- installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new NonResizableEditPolicy() {
-
- protected List createSelectionHandles() {
- List handles = new ArrayList();
- NonResizableHandleKit.addMoveHandle((GraphicalEditPart) getHost(), handles);
- ((MoveHandle) handles.get(0)).setBorder(null);
- return handles;
- }
+ installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());
+ }
- public Command getCommand(Request request) {
- return null;
- }
+ /**
+ * @generated
+ */
+ public IBorderItemLocator getBorderItemLocator() {
+ IFigure parentFigure = getFigure().getParent();
+ if (parentFigure != null && parentFigure.getLayoutManager() != null) {
+ Object constraint = parentFigure.getLayoutManager().getConstraint(getFigure());
+ return (IBorderItemLocator) constraint;
+ }
+ return null;
+ }
- public boolean understandsRequest(Request request) {
- return false;
- }
- });
+ /**
+ * @generated
+ */
+ public void refreshBounds() {
+ int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();
+ int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();
+ int width = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();
+ int height = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();
+ getBorderItemLocator().setConstraint(new Rectangle(x, y, width, height));
}
/**
@@ -194,7 +206,7 @@ public class TimeObservationNameEditPart extends CompartmentEditPart implements
/**
* @generated
*/
- public void setLabel(WrappingLabel figure) {
+ public void setLabel(IFigure figure) {
unregisterVisuals();
setFigure(figure);
defaultText = getLabelTextHelper(figure);
@@ -227,19 +239,7 @@ public class TimeObservationNameEditPart extends CompartmentEditPart implements
* @generated
*/
protected Image getLabelIcon() {
- EObject parserElement = getParserElement();
- if (parserElement == null) {
- return null;
- }
-
- List<View> views = DiagramEditPartsUtil.findViews(parserElement, getViewer());
- for (View view : views) {
- if (NameLabelIconHelper.showLabelIcon(view)) {
- return UMLElementTypes.getImage(parserElement.eClass());
- }
- }
return null;
-
}
/**
@@ -583,7 +583,7 @@ public class TimeObservationNameEditPart extends CompartmentEditPart implements
* @generated
*/
private View getFontStyleOwnerView() {
- return (View) getModel();
+ return getPrimaryView();
}
/**
@@ -698,24 +698,7 @@ public class TimeObservationNameEditPart extends CompartmentEditPart implements
/**
* @generated
*/
- protected void addNotationalListeners() {
- super.addNotationalListeners();
- addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$
- }
-
- /**
- * @generated
- */
- protected void removeNotationalListeners() {
- super.removeNotationalListeners();
- removeListenerFilter("PrimaryView"); //$NON-NLS-1$
- }
-
- /**
- * @generated
- */
protected void handleNotificationEvent(Notification event) {
- refreshLabel();
Object feature = event.getFeature();
if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {
Integer c = (Integer) event.getNewValue();
@@ -744,13 +727,6 @@ public class TimeObservationNameEditPart extends CompartmentEditPart implements
}
}
}
-
- if (event.getNewValue() instanceof EAnnotation
- && VisualInformationPapyrusConstant.DISPLAY_NAMELABELICON.equals(((EAnnotation) event.getNewValue())
- .getSource())) {
- refreshLabel();
- }
-
super.handleNotificationEvent(event);
}
@@ -758,43 +734,16 @@ public class TimeObservationNameEditPart extends CompartmentEditPart implements
* @generated
*/
protected IFigure createFigure() {
- // Parent should assign one using setLabel() method
- return null;
- }
-
- private static final String ADD_PARENT_MODEL = "AddParentModel";
-
- /**
- * @generated
- */
- public void activate() {
- super.activate();
- addOwnerElementListeners();
- }
-
- /**
- * @generated
- */
- protected void addOwnerElementListeners() {
- addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel())); //$NON-NLS-1$
-
- }
-
- /**
- * @generated
- */
- public void deactivate() {
- removeOwnerElementListeners();
- super.deactivate();
-
+ IFigure label = createFigurePrim();
+ defaultText = getLabelTextHelper(label);
+ return label;
}
/**
* @generated
*/
- protected void removeOwnerElementListeners() {
- removeListenerFilter(ADD_PARENT_MODEL);
-
+ protected IFigure createFigurePrim() {
+ return new WrappingLabel();
}
}
diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/TimeObservationStereotypeLabelEditPart.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/TimeObservationStereotypeLabelEditPart.java
new file mode 100644
index 00000000000..fa912e2f10b
--- /dev/null
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/TimeObservationStereotypeLabelEditPart.java
@@ -0,0 +1,755 @@
+/*****************************************************************************
+ * Copyright (c) 2009 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
+ *
+ * Contributors:
+ * Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.diagram.composite.edit.parts;
+
+import java.util.Collections;
+import java.util.List;
+
+import org.eclipse.draw2d.IFigure;
+import org.eclipse.draw2d.Label;
+import org.eclipse.draw2d.geometry.Point;
+import org.eclipse.draw2d.geometry.Rectangle;
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.transaction.RecordingCommand;
+import org.eclipse.emf.transaction.RunnableWithResult;
+import org.eclipse.emf.transaction.TransactionalEditingDomain;
+import org.eclipse.gef.AccessibleEditPart;
+import org.eclipse.gef.EditPolicy;
+import org.eclipse.gef.Request;
+import org.eclipse.gef.requests.DirectEditRequest;
+import org.eclipse.gef.tools.DirectEditManager;
+import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;
+import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;
+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserEditStatus;
+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;
+import org.eclipse.gmf.runtime.diagram.ui.editparts.IBorderItemEditPart;
+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
+import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;
+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;
+import org.eclipse.gmf.runtime.diagram.ui.figures.IBorderItemLocator;
+import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;
+import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;
+import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;
+import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;
+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;
+import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;
+import org.eclipse.gmf.runtime.notation.FontStyle;
+import org.eclipse.gmf.runtime.notation.NotationPackage;
+import org.eclipse.gmf.runtime.notation.View;
+import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
+import org.eclipse.jface.viewers.ICellEditorValidator;
+import org.eclipse.jface.window.Window;
+import org.eclipse.papyrus.diagram.common.editparts.AbstractLabelEditPart;
+import org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeExternalNodeEditPolicy;
+import org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;
+import org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition;
+import org.eclipse.papyrus.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;
+import org.eclipse.papyrus.diagram.common.figure.node.AppliedStereotypeWrappingLabelFigure;
+import org.eclipse.papyrus.diagram.composite.edit.policies.UMLTextSelectionEditPolicy;
+import org.eclipse.papyrus.diagram.composite.part.UMLVisualIDRegistry;
+import org.eclipse.papyrus.diagram.composite.providers.UMLElementTypes;
+import org.eclipse.papyrus.diagram.composite.providers.UMLParserProvider;
+import org.eclipse.papyrus.extensionpoints.editors.Activator;
+import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;
+import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;
+import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;
+import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.accessibility.AccessibleEvent;
+import org.eclipse.swt.graphics.Color;
+import org.eclipse.swt.graphics.FontData;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.ui.PlatformUI;
+import org.eclipse.uml2.uml.NamedElement;
+
+/**
+ * @generated
+ */
+public class TimeObservationStereotypeLabelEditPart
+
+extends AbstractLabelEditPart
+
+implements ITextAwareEditPart, IBorderItemEditPart {
+
+ /**
+ * @generated
+ */
+ public static final int VISUAL_ID = 5143;
+
+ /**
+ * @generated
+ */
+ private DirectEditManager manager;
+
+ /**
+ * @generated
+ */
+ private IParser parser;
+
+ /**
+ * @generated
+ */
+ private List parserElements;
+
+ /**
+ * @generated
+ */
+ private String defaultText;
+
+ /** direct edition mode (default, undefined, registered editor, etc.) */
+ protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;
+
+ /** configuration from a registered edit dialog */
+ protected IDirectEditorConfiguration configuration;
+
+ /**
+ * @generated
+ */
+ static {
+ registerSnapBackPosition(
+ UMLVisualIDRegistry
+ .getType(org.eclipse.papyrus.diagram.composite.edit.parts.TimeObservationStereotypeLabelEditPart.VISUAL_ID),
+ new Point(0, 0));
+ }
+
+ /**
+ * @generated
+ */
+ public TimeObservationStereotypeLabelEditPart(View view) {
+ super(view);
+ }
+
+ /**
+ * @generated
+ */
+ protected void createDefaultEditPolicies() {
+ super.createDefaultEditPolicies();
+ installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());
+ installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());
+ installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY,
+ new AppliedStereotypeExternalNodeEditPolicy());
+ }
+
+ /**
+ * @generated
+ */
+ public IBorderItemLocator getBorderItemLocator() {
+ IFigure parentFigure = getFigure().getParent();
+ if (parentFigure != null && parentFigure.getLayoutManager() != null) {
+ Object constraint = parentFigure.getLayoutManager().getConstraint(getFigure());
+ return (IBorderItemLocator) constraint;
+ }
+ return null;
+ }
+
+ /**
+ * @generated
+ */
+ public void refreshBounds() {
+ int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();
+ int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();
+ int width = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();
+ int height = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();
+ getBorderItemLocator().setConstraint(new Rectangle(x, y, width, height));
+ }
+
+ /**
+ * @generated
+ */
+ protected String getLabelTextHelper(IFigure figure) {
+ if (figure instanceof WrappingLabel) {
+ return ((WrappingLabel) figure).getText();
+ } else {
+ return ((Label) figure).getText();
+ }
+ }
+
+ /**
+ * @generated
+ */
+ protected void setLabelTextHelper(IFigure figure, String text) {
+ if (figure instanceof WrappingLabel) {
+ ((WrappingLabel) figure).setText(text);
+ } else {
+ ((Label) figure).setText(text);
+ }
+ }
+
+ /**
+ * @generated
+ */
+ protected Image getLabelIconHelper(IFigure figure) {
+ if (figure instanceof WrappingLabel) {
+ return ((WrappingLabel) figure).getIcon();
+ } else {
+ return ((Label) figure).getIcon();
+ }
+ }
+
+ /**
+ * @generated
+ */
+ protected void setLabelIconHelper(IFigure figure, Image icon) {
+ if (figure instanceof WrappingLabel) {
+ ((WrappingLabel) figure).setIcon(icon);
+ } else {
+ ((Label) figure).setIcon(icon);
+ }
+ }
+
+ /**
+ * @generated
+ */
+ public void setLabel(IFigure figure) {
+ unregisterVisuals();
+ setFigure(figure);
+ defaultText = getLabelTextHelper(figure);
+ registerVisuals();
+ refreshVisuals();
+ }
+
+ /**
+ * @generated
+ */
+ protected List getModelChildren() {
+ return Collections.EMPTY_LIST;
+ }
+
+ /**
+ * @generated
+ */
+ public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {
+ return null;
+ }
+
+ /**
+ * @generated
+ */
+ protected EObject getParserElement() {
+ return resolveSemanticElement();
+ }
+
+ /**
+ * @generated
+ */
+ protected Image getLabelIcon() {
+ return null;
+ }
+
+ /**
+ * @generated
+ */
+ protected String getLabelText() {
+ String text = null;
+ EObject parserElement = getParserElement();
+ if (parserElement != null && getParser() != null) {
+ text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());
+ }
+ if (text == null || text.length() == 0) {
+ text = defaultText;
+ }
+ return text;
+ }
+
+ /**
+ * @generated
+ */
+ public void setLabelText(String text) {
+ setLabelTextHelper(getFigure(), text);
+ Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
+ if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
+ ((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
+ }
+ Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
+ if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
+ ((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
+ }
+ }
+
+ /**
+ * @generated
+ */
+ public String getEditText() {
+ if (getParserElement() == null || getParser() == null) {
+ return ""; //$NON-NLS-1$
+ }
+ return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());
+ }
+
+ /**
+ * @generated
+ */
+ protected boolean isEditable() {
+ return getParser() != null;
+ }
+
+ /**
+ * @generated
+ */
+ public ICellEditorValidator getEditTextValidator() {
+ return new ICellEditorValidator() {
+
+ public String isValid(final Object value) {
+ if (value instanceof String) {
+ final EObject element = getParserElement();
+ final IParser parser = getParser();
+ try {
+ IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive(
+ new RunnableWithResult.Impl() {
+
+ public void run() {
+ setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));
+ }
+ });
+ return valid.getCode() == ParserEditStatus.EDITABLE ? null : valid.getMessage();
+ } catch (InterruptedException ie) {
+ ie.printStackTrace();
+ }
+ }
+
+ // shouldn't get here
+ return null;
+ }
+ };
+ }
+
+ /**
+ * @generated
+ */
+ public IContentAssistProcessor getCompletionProcessor() {
+ if (getParserElement() == null || getParser() == null) {
+ return null;
+ }
+ return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));
+ }
+
+ /**
+ * @generated
+ */
+ public ParserOptions getParserOptions() {
+ return ParserOptions.NONE;
+ }
+
+ /**
+ * @generated
+ */
+ public IParser getParser() {
+ if (parser == null) {
+ parser = UMLParserProvider
+ .getParser(
+ UMLElementTypes.TimeObservation_2094,
+ getParserElement(),
+ UMLVisualIDRegistry
+ .getType(org.eclipse.papyrus.diagram.composite.edit.parts.TimeObservationStereotypeLabelEditPart.VISUAL_ID));
+ }
+ return parser;
+ }
+
+ /**
+ * @generated
+ */
+ protected DirectEditManager getManager() {
+ if (manager == null) {
+ setManager(new TextDirectEditManager(this, TextDirectEditManager.getTextCellEditorClass(this),
+ UMLEditPartFactory.getTextCellEditorLocator(this)));
+ }
+ return manager;
+ }
+
+ /**
+ * @generated
+ */
+ protected void setManager(DirectEditManager manager) {
+ this.manager = manager;
+ }
+
+ /**
+ * @generated
+ */
+ protected void performDirectEdit() {
+ getManager().show();
+ }
+
+ /**
+ * @generated
+ */
+ protected void performDirectEdit(Point eventLocation) {
+ if (getManager().getClass() == TextDirectEditManager.class) {
+ ((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());
+ }
+ }
+
+ /**
+ * @generated
+ */
+ private void performDirectEdit(char initialCharacter) {
+ if (getManager() instanceof TextDirectEditManager) {
+ ((TextDirectEditManager) getManager()).show(initialCharacter);
+ } else {
+ performDirectEdit();
+ }
+ }
+
+ /**
+ * @generated
+ */
+ protected void performDirectEditRequest(Request request) {
+
+ final Request theRequest = request;
+
+ if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {
+ directEditionMode = getDirectEditionType();
+ }
+ switch (directEditionMode) {
+ case IDirectEdition.NO_DIRECT_EDITION:
+ // no direct edition mode => does nothing
+ return;
+ case IDirectEdition.EXTENDED_DIRECT_EDITOR:
+ updateExtendedEditorConfiguration();
+ if (configuration == null || configuration.getLanguage() == null) {
+ performDefaultDirectEditorEdit(theRequest);
+ } else {
+ configuration.preEditAction(resolveSemanticElement());
+ final ExtendedDirectEditionDialog dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench()
+ .getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration
+ .getTextToEdit(resolveSemanticElement()), configuration);
+ if (Window.OK == dialog.open()) {
+ TransactionalEditingDomain domain = getEditingDomain();
+ RecordingCommand command = new RecordingCommand(domain, "Edit Label") {
+
+ @Override
+ protected void doExecute() {
+ configuration.postEditAction(resolveSemanticElement(), dialog.getValue());
+
+ }
+ };
+ domain.getCommandStack().execute(command);
+ }
+ }
+ break;
+ case IDirectEdition.DEFAULT_DIRECT_EDITOR:
+
+ // initialize the direct edit manager
+ try {
+ getEditingDomain().runExclusive(new Runnable() {
+
+ public void run() {
+ if (isActive() && isEditable()) {
+ if (theRequest.getExtendedData().get(
+ RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
+ Character initialChar = (Character) theRequest.getExtendedData().get(
+ RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
+ performDirectEdit(initialChar.charValue());
+ } else if ((theRequest instanceof DirectEditRequest)
+ && (getEditText().equals(getLabelText()))) {
+ DirectEditRequest editRequest = (DirectEditRequest) theRequest;
+ performDirectEdit(editRequest.getLocation());
+ } else {
+ performDirectEdit();
+ }
+ }
+ }
+ });
+ } catch (InterruptedException e) {
+ e.printStackTrace();
+ }
+ break;
+ default:
+ break;
+ }
+ }
+
+ /**
+ * @generated
+ */
+ protected void refreshVisuals() {
+ super.refreshVisuals();
+ refreshLabel();
+ refreshFont();
+ refreshFontColor();
+ refreshUnderline();
+ refreshStrikeThrough();
+ }
+
+ /**
+ * @generated
+ */
+ protected void refreshLabel() {
+ EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);
+ if (maskLabelPolicy == null) {
+ setLabelTextHelper(getFigure(), getLabelText());
+ setLabelIconHelper(getFigure(), getLabelIcon());
+ }
+ Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
+ if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
+ ((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
+ }
+ Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
+ if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
+ ((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
+ }
+ }
+
+ /**
+ * @generated
+ */
+ protected void refreshUnderline() {
+ FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());
+ if (style != null && getFigure() instanceof WrappingLabel) {
+ ((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());
+ }
+ }
+
+ /**
+ * @generated
+ */
+ protected void refreshStrikeThrough() {
+ FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());
+ if (style != null && getFigure() instanceof WrappingLabel) {
+ ((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());
+ }
+ }
+
+ /**
+ * @generated
+ */
+ protected void refreshFont() {
+ FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());
+ if (style != null) {
+ FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD
+ : SWT.NORMAL)
+ | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));
+ setFont(fontData);
+ }
+ }
+
+ /**
+ * @generated
+ */
+ protected void setFontColor(Color color) {
+ getFigure().setForegroundColor(color);
+ }
+
+ /**
+ * @generated
+ */
+ protected void addSemanticListeners() {
+ if (getParser() instanceof ISemanticParser) {
+ EObject element = resolveSemanticElement();
+ parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);
+ for (int i = 0; i < parserElements.size(); i++) {
+ addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$
+ }
+ } else {
+ super.addSemanticListeners();
+ }
+ }
+
+ /**
+ * @generated
+ */
+ protected void removeSemanticListeners() {
+ if (parserElements != null) {
+ for (int i = 0; i < parserElements.size(); i++) {
+ removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$
+ }
+ } else {
+ super.removeSemanticListeners();
+ }
+ }
+
+ /**
+ * @generated
+ */
+ protected AccessibleEditPart getAccessibleEditPart() {
+ if (accessibleEP == null) {
+ accessibleEP = new AccessibleGraphicalEditPart() {
+
+ public void getName(AccessibleEvent e) {
+ e.result = getLabelTextHelper(getFigure());
+ }
+ };
+ }
+ return accessibleEP;
+ }
+
+ /**
+ * @generated
+ */
+ private View getFontStyleOwnerView() {
+ return getPrimaryView();
+ }
+
+ /**
+ * Returns the kind of associated editor for direct edition.
+ *
+ * @return an <code>int</code> corresponding to the kind of direct editor, @see
+ * org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition
+ * @generated
+ */
+ public int getDirectEditionType() {
+ if (checkExtendedEditor()) {
+ initExtendedEditorConfiguration();
+ return IDirectEdition.EXTENDED_DIRECT_EDITOR;
+ }
+ if (checkDefaultEdition()) {
+ return IDirectEdition.DEFAULT_DIRECT_EDITOR;
+ }
+
+ // not a named element. no specific editor => do nothing
+ return IDirectEdition.NO_DIRECT_EDITION;
+ }
+
+ /**
+ * Checks if an extended editor is present.
+ *
+ * @return <code>true</code> if an extended editor is present.
+ * @generated
+ */
+ protected boolean checkExtendedEditor() {
+ if (resolveSemanticElement() != null) {
+ return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass()
+ .getInstanceClassName());
+ }
+ return false;
+ }
+
+ /**
+ * Checks if a default direct edition is available
+ *
+ * @return <code>true</code> if a default direct edition is available
+ * @generated
+ */
+ protected boolean checkDefaultEdition() {
+ return (resolveSemanticElement() instanceof NamedElement);
+ }
+
+ /**
+ * Initializes the extended editor configuration
+ *
+ * @generated
+ */
+ protected void initExtendedEditorConfiguration() {
+ if (configuration == null) {
+ final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(
+ IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
+ if (languagePreferred != null && !languagePreferred.equals("")) {
+ configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()
+ .eClass().getInstanceClassName());
+ } else {
+ configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE,
+ resolveSemanticElement().eClass().getInstanceClassName());
+ }
+ }
+ }
+
+ /**
+ * Updates the preference configuration
+ */
+ protected void updateExtendedEditorConfiguration() {
+ String languagePreferred = Activator.getDefault().getPreferenceStore().getString(
+ IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
+ if (languagePreferred != null && !languagePreferred.equals("")
+ && languagePreferred != configuration.getLanguage()) {
+ configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()
+ .eClass().getInstanceClassName());
+ } else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {
+ configuration = null;
+ }
+ }
+
+ /**
+ * Performs the direct edit usually used by GMF editors.
+ *
+ * @param theRequest
+ * the direct edit request that starts the direct edit system
+ */
+ protected void performDefaultDirectEditorEdit(final Request theRequest) {
+ // initialize the direct edit manager
+ try {
+ getEditingDomain().runExclusive(new Runnable() {
+
+ public void run() {
+ if (isActive() && isEditable()) {
+ if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
+ Character initialChar = (Character) theRequest.getExtendedData().get(
+ RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
+ performDirectEdit(initialChar.charValue());
+ } else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {
+ DirectEditRequest editRequest = (DirectEditRequest) theRequest;
+ performDirectEdit(editRequest.getLocation());
+ } else {
+ performDirectEdit();
+ }
+ }
+ }
+ });
+ } catch (InterruptedException e) {
+ e.printStackTrace();
+ }
+ }
+
+ /**
+ * @generated
+ */
+ protected void handleNotificationEvent(Notification event) {
+ Object feature = event.getFeature();
+ if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {
+ Integer c = (Integer) event.getNewValue();
+ setFontColor(DiagramColorRegistry.getInstance().getColor(c));
+ } else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {
+ refreshUnderline();
+ } else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {
+ refreshStrikeThrough();
+ } else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature)
+ || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature)
+ || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)
+ || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {
+ refreshFont();
+ } else {
+ if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {
+ refreshLabel();
+ }
+ if (getParser() instanceof ISemanticParser) {
+ ISemanticParser modelParser = (ISemanticParser) getParser();
+ if (modelParser.areSemanticElementsAffected(null, event)) {
+ removeSemanticListeners();
+ if (resolveSemanticElement() != null) {
+ addSemanticListeners();
+ }
+ refreshLabel();
+ }
+ }
+ }
+ super.handleNotificationEvent(event);
+ }
+
+ /**
+ * @generated
+ */
+ protected IFigure createFigure() {
+ IFigure label = createFigurePrim();
+ defaultText = getLabelTextHelper(label);
+ return label;
+ }
+
+ /**
+ * @generated
+ */
+ protected IFigure createFigurePrim() {
+ return new AppliedStereotypeWrappingLabelFigure();
+ }
+
+}
diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/UMLEditPartFactory.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/UMLEditPartFactory.java
index bd0e7ee24a6..d26762290cd 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/UMLEditPartFactory.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/UMLEditPartFactory.java
@@ -248,12 +248,18 @@ public class UMLEditPartFactory implements EditPartFactory {
case DurationObservationNameEditPart.VISUAL_ID:
return new DurationObservationNameEditPart(view);
+ case DurationObservationStereotypeLabelEditPart.VISUAL_ID:
+ return new DurationObservationStereotypeLabelEditPart(view);
+
case TimeObservationEditPart.VISUAL_ID:
return new TimeObservationEditPart(view);
case TimeObservationNameEditPart.VISUAL_ID:
return new TimeObservationNameEditPart(view);
+ case TimeObservationStereotypeLabelEditPart.VISUAL_ID:
+ return new TimeObservationStereotypeLabelEditPart(view);
+
case LiteralBooleanEditPart.VISUAL_ID:
return new LiteralBooleanEditPart(view);
@@ -818,6 +824,12 @@ public class UMLEditPartFactory implements EditPartFactory {
case InformationFlowEditPart.VISUAL_ID:
return new InformationFlowEditPart(view);
+ case ConnectorTimeObservationEditPart.VISUAL_ID:
+ return new ConnectorTimeObservationEditPart(view);
+
+ case ConnectorDurationObservationEditPart.VISUAL_ID:
+ return new ConnectorDurationObservationEditPart(view);
+
}
}
return createUnrecognizedEditPart(context, model);
diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/UseCaseEditPart.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/UseCaseEditPart.java
index f7260ae06de..117627a7605 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/UseCaseEditPart.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/UseCaseEditPart.java
@@ -277,7 +277,8 @@ ShapeNodeEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -308,7 +309,8 @@ ShapeNodeEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -3219,7 +3221,8 @@ ShapeNodeEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -6129,7 +6132,8 @@ ShapeNodeEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -6149,6 +6153,8 @@ ShapeNodeEditPart {
types.add(UMLElementTypes.Dependency_4010);
types.add(UMLElementTypes.Generalization_4015);
types.add(UMLElementTypes.InformationFlow_4016);
+ types.add(UMLElementTypes.TimeObservationEvent_4018);
+ types.add(UMLElementTypes.DurationObservationEvent_4019);
return types;
}
@@ -6162,7 +6168,8 @@ ShapeNodeEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -9081,6 +9088,12 @@ ShapeNodeEditPart {
if (relationshipType == UMLElementTypes.InformationFlow_4016) {
types.add(UMLElementTypes.Comment_3097);
}
+ if (relationshipType == UMLElementTypes.TimeObservationEvent_4018) {
+ types.add(UMLElementTypes.TimeObservation_2094);
+ }
+ if (relationshipType == UMLElementTypes.DurationObservationEvent_4019) {
+ types.add(UMLElementTypes.DurationObservation_2093);
+ }
return types;
}
diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/UseCaseEditPartCN.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/UseCaseEditPartCN.java
index 3119b02e8cb..5054c16656b 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/UseCaseEditPartCN.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/parts/UseCaseEditPartCN.java
@@ -277,7 +277,8 @@ ShapeNodeEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -308,7 +309,8 @@ ShapeNodeEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -3219,7 +3221,8 @@ ShapeNodeEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -6129,7 +6132,8 @@ ShapeNodeEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -6149,6 +6153,8 @@ ShapeNodeEditPart {
types.add(UMLElementTypes.Dependency_4010);
types.add(UMLElementTypes.Generalization_4015);
types.add(UMLElementTypes.InformationFlow_4016);
+ types.add(UMLElementTypes.TimeObservationEvent_4018);
+ types.add(UMLElementTypes.DurationObservationEvent_4019);
return types;
}
@@ -6162,7 +6168,8 @@ ShapeNodeEditPart {
* .gmf.
* runtime
* .
- * emf.type
+ * emf.
+ * type
* .
* core.
* IElementType
@@ -9081,6 +9088,12 @@ ShapeNodeEditPart {
if (relationshipType == UMLElementTypes.InformationFlow_4016) {
types.add(UMLElementTypes.Comment_3097);
}
+ if (relationshipType == UMLElementTypes.TimeObservationEvent_4018) {
+ types.add(UMLElementTypes.TimeObservation_2094);
+ }
+ if (relationshipType == UMLElementTypes.DurationObservationEvent_4019) {
+ types.add(UMLElementTypes.DurationObservation_2093);
+ }
return types;
}
diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/AbstractionItemSemanticEditPolicy.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/AbstractionItemSemanticEditPolicy.java
index 615c3abd70e..a55bf9467b3 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/AbstractionItemSemanticEditPolicy.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/AbstractionItemSemanticEditPolicy.java
@@ -25,6 +25,10 @@ import org.eclipse.papyrus.diagram.composite.edit.commands.CommentAnnotatedEleme
import org.eclipse.papyrus.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ComponentRealizationCreateCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ComponentRealizationReorientCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorDurationObservationCreateCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorDurationObservationReorientCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorTimeObservationCreateCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorTimeObservationReorientCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.DependencyCreateCommand;
@@ -50,6 +54,8 @@ import org.eclipse.papyrus.diagram.composite.edit.commands.UsageReorientCommand;
import org.eclipse.papyrus.diagram.composite.edit.parts.AbstractionEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.ComponentRealizationEditPart;
+import org.eclipse.papyrus.diagram.composite.edit.parts.ConnectorDurationObservationEditPart;
+import org.eclipse.papyrus.diagram.composite.edit.parts.ConnectorTimeObservationEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.DependencyEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.DeploymentEditPart;
@@ -137,6 +143,12 @@ public class AbstractionItemSemanticEditPolicy extends UMLBaseItemSemanticEditPo
if (UMLElementTypes.InformationFlow_4016 == req.getElementType()) {
return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));
}
+ if (UMLElementTypes.TimeObservationEvent_4018 == req.getElementType()) {
+ return null;
+ }
+ if (UMLElementTypes.DurationObservationEvent_4019 == req.getElementType()) {
+ return null;
+ }
return null;
}
@@ -186,6 +198,12 @@ public class AbstractionItemSemanticEditPolicy extends UMLBaseItemSemanticEditPo
if (UMLElementTypes.InformationFlow_4016 == req.getElementType()) {
return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));
}
+ if (UMLElementTypes.TimeObservationEvent_4018 == req.getElementType()) {
+ return getGEFWrapper(new ConnectorTimeObservationCreateCommand(req, req.getSource(), req.getTarget()));
+ }
+ if (UMLElementTypes.DurationObservationEvent_4019 == req.getElementType()) {
+ return getGEFWrapper(new ConnectorDurationObservationCreateCommand(req, req.getSource(), req.getTarget()));
+ }
return null;
}
@@ -237,6 +255,10 @@ public class AbstractionItemSemanticEditPolicy extends UMLBaseItemSemanticEditPo
return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));
case ConstraintConstrainedElementEditPart.VISUAL_ID:
return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));
+ case ConnectorTimeObservationEditPart.VISUAL_ID:
+ return getGEFWrapper(new ConnectorTimeObservationReorientCommand(req));
+ case ConnectorDurationObservationEditPart.VISUAL_ID:
+ return getGEFWrapper(new ConnectorDurationObservationReorientCommand(req));
}
return super.getReorientReferenceRelationshipCommand(req);
}
diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/ActivityCompositeItemSemanticEditPolicy.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/ActivityCompositeItemSemanticEditPolicy.java
index 1e09ede4567..6d04e094b11 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/ActivityCompositeItemSemanticEditPolicy.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/ActivityCompositeItemSemanticEditPolicy.java
@@ -37,6 +37,10 @@ import org.eclipse.papyrus.diagram.composite.edit.commands.CommentAnnotatedEleme
import org.eclipse.papyrus.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ComponentRealizationCreateCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ComponentRealizationReorientCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorDurationObservationCreateCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorDurationObservationReorientCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorTimeObservationCreateCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorTimeObservationReorientCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.DependencyCreateCommand;
@@ -72,6 +76,8 @@ import org.eclipse.papyrus.diagram.composite.edit.parts.CommentAnnotatedElementE
import org.eclipse.papyrus.diagram.composite.edit.parts.CommentEditPartCN;
import org.eclipse.papyrus.diagram.composite.edit.parts.ComponentCompositeEditPartCN;
import org.eclipse.papyrus.diagram.composite.edit.parts.ComponentRealizationEditPart;
+import org.eclipse.papyrus.diagram.composite.edit.parts.ConnectorDurationObservationEditPart;
+import org.eclipse.papyrus.diagram.composite.edit.parts.ConnectorTimeObservationEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.DataTypeEditPartCN;
import org.eclipse.papyrus.diagram.composite.edit.parts.DependencyEditPart;
@@ -221,6 +227,20 @@ public class ActivityCompositeItemSemanticEditPolicy extends UMLBaseItemSemantic
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null,
+ incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null,
+ incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = view.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -407,6 +427,20 @@ public class ActivityCompositeItemSemanticEditPolicy extends UMLBaseItemSemantic
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource().getElement(),
+ null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource().getElement(),
+ null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = node.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -584,6 +618,20 @@ public class ActivityCompositeItemSemanticEditPolicy extends UMLBaseItemSemantic
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -757,6 +805,20 @@ public class ActivityCompositeItemSemanticEditPolicy extends UMLBaseItemSemantic
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -930,6 +992,20 @@ public class ActivityCompositeItemSemanticEditPolicy extends UMLBaseItemSemantic
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -1103,6 +1179,20 @@ public class ActivityCompositeItemSemanticEditPolicy extends UMLBaseItemSemantic
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -1276,6 +1366,20 @@ public class ActivityCompositeItemSemanticEditPolicy extends UMLBaseItemSemantic
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -1449,6 +1553,20 @@ public class ActivityCompositeItemSemanticEditPolicy extends UMLBaseItemSemantic
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -1622,6 +1740,20 @@ public class ActivityCompositeItemSemanticEditPolicy extends UMLBaseItemSemantic
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -1795,6 +1927,20 @@ public class ActivityCompositeItemSemanticEditPolicy extends UMLBaseItemSemantic
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -1968,6 +2114,20 @@ public class ActivityCompositeItemSemanticEditPolicy extends UMLBaseItemSemantic
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -2141,6 +2301,20 @@ public class ActivityCompositeItemSemanticEditPolicy extends UMLBaseItemSemantic
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -2314,6 +2488,20 @@ public class ActivityCompositeItemSemanticEditPolicy extends UMLBaseItemSemantic
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -2487,6 +2675,20 @@ public class ActivityCompositeItemSemanticEditPolicy extends UMLBaseItemSemantic
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -2660,6 +2862,20 @@ public class ActivityCompositeItemSemanticEditPolicy extends UMLBaseItemSemantic
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -2833,6 +3049,20 @@ public class ActivityCompositeItemSemanticEditPolicy extends UMLBaseItemSemantic
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -3006,6 +3236,20 @@ public class ActivityCompositeItemSemanticEditPolicy extends UMLBaseItemSemantic
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -3179,6 +3423,20 @@ public class ActivityCompositeItemSemanticEditPolicy extends UMLBaseItemSemantic
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -3352,6 +3610,20 @@ public class ActivityCompositeItemSemanticEditPolicy extends UMLBaseItemSemantic
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -3525,6 +3797,20 @@ public class ActivityCompositeItemSemanticEditPolicy extends UMLBaseItemSemantic
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -3698,6 +3984,20 @@ public class ActivityCompositeItemSemanticEditPolicy extends UMLBaseItemSemantic
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -3871,6 +4171,20 @@ public class ActivityCompositeItemSemanticEditPolicy extends UMLBaseItemSemantic
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -4044,6 +4358,20 @@ public class ActivityCompositeItemSemanticEditPolicy extends UMLBaseItemSemantic
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -4217,6 +4545,20 @@ public class ActivityCompositeItemSemanticEditPolicy extends UMLBaseItemSemantic
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -4390,6 +4732,20 @@ public class ActivityCompositeItemSemanticEditPolicy extends UMLBaseItemSemantic
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -4563,6 +4919,20 @@ public class ActivityCompositeItemSemanticEditPolicy extends UMLBaseItemSemantic
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -4769,6 +5139,12 @@ public class ActivityCompositeItemSemanticEditPolicy extends UMLBaseItemSemantic
if (UMLElementTypes.InformationFlow_4016 == req.getElementType()) {
return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));
}
+ if (UMLElementTypes.TimeObservationEvent_4018 == req.getElementType()) {
+ return null;
+ }
+ if (UMLElementTypes.DurationObservationEvent_4019 == req.getElementType()) {
+ return null;
+ }
return null;
}
@@ -4818,6 +5194,12 @@ public class ActivityCompositeItemSemanticEditPolicy extends UMLBaseItemSemantic
if (UMLElementTypes.InformationFlow_4016 == req.getElementType()) {
return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));
}
+ if (UMLElementTypes.TimeObservationEvent_4018 == req.getElementType()) {
+ return getGEFWrapper(new ConnectorTimeObservationCreateCommand(req, req.getSource(), req.getTarget()));
+ }
+ if (UMLElementTypes.DurationObservationEvent_4019 == req.getElementType()) {
+ return getGEFWrapper(new ConnectorDurationObservationCreateCommand(req, req.getSource(), req.getTarget()));
+ }
return null;
}
@@ -4869,6 +5251,10 @@ public class ActivityCompositeItemSemanticEditPolicy extends UMLBaseItemSemantic
return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));
case ConstraintConstrainedElementEditPart.VISUAL_ID:
return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));
+ case ConnectorTimeObservationEditPart.VISUAL_ID:
+ return getGEFWrapper(new ConnectorTimeObservationReorientCommand(req));
+ case ConnectorDurationObservationEditPart.VISUAL_ID:
+ return getGEFWrapper(new ConnectorDurationObservationReorientCommand(req));
}
return super.getReorientReferenceRelationshipCommand(req);
}
diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/ActivityCompositeItemSemanticEditPolicyCN.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/ActivityCompositeItemSemanticEditPolicyCN.java
index 3a80ef75b31..fdba00890e7 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/ActivityCompositeItemSemanticEditPolicyCN.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/ActivityCompositeItemSemanticEditPolicyCN.java
@@ -37,6 +37,10 @@ import org.eclipse.papyrus.diagram.composite.edit.commands.CommentAnnotatedEleme
import org.eclipse.papyrus.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ComponentRealizationCreateCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ComponentRealizationReorientCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorDurationObservationCreateCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorDurationObservationReorientCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorTimeObservationCreateCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorTimeObservationReorientCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.DependencyCreateCommand;
@@ -72,6 +76,8 @@ import org.eclipse.papyrus.diagram.composite.edit.parts.CommentAnnotatedElementE
import org.eclipse.papyrus.diagram.composite.edit.parts.CommentEditPartCN;
import org.eclipse.papyrus.diagram.composite.edit.parts.ComponentCompositeEditPartCN;
import org.eclipse.papyrus.diagram.composite.edit.parts.ComponentRealizationEditPart;
+import org.eclipse.papyrus.diagram.composite.edit.parts.ConnectorDurationObservationEditPart;
+import org.eclipse.papyrus.diagram.composite.edit.parts.ConnectorTimeObservationEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.DataTypeEditPartCN;
import org.eclipse.papyrus.diagram.composite.edit.parts.DependencyEditPart;
@@ -221,6 +227,20 @@ public class ActivityCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemant
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null,
+ incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null,
+ incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = view.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -407,6 +427,20 @@ public class ActivityCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemant
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource().getElement(),
+ null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource().getElement(),
+ null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = node.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -584,6 +618,20 @@ public class ActivityCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemant
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -757,6 +805,20 @@ public class ActivityCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemant
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -930,6 +992,20 @@ public class ActivityCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemant
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -1103,6 +1179,20 @@ public class ActivityCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemant
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -1276,6 +1366,20 @@ public class ActivityCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemant
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -1449,6 +1553,20 @@ public class ActivityCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemant
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -1622,6 +1740,20 @@ public class ActivityCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemant
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -1795,6 +1927,20 @@ public class ActivityCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemant
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -1968,6 +2114,20 @@ public class ActivityCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemant
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -2141,6 +2301,20 @@ public class ActivityCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemant
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -2314,6 +2488,20 @@ public class ActivityCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemant
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -2487,6 +2675,20 @@ public class ActivityCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemant
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -2660,6 +2862,20 @@ public class ActivityCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemant
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -2833,6 +3049,20 @@ public class ActivityCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemant
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -3006,6 +3236,20 @@ public class ActivityCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemant
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -3179,6 +3423,20 @@ public class ActivityCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemant
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -3352,6 +3610,20 @@ public class ActivityCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemant
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -3525,6 +3797,20 @@ public class ActivityCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemant
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -3698,6 +3984,20 @@ public class ActivityCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemant
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -3871,6 +4171,20 @@ public class ActivityCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemant
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -4044,6 +4358,20 @@ public class ActivityCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemant
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -4217,6 +4545,20 @@ public class ActivityCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemant
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -4390,6 +4732,20 @@ public class ActivityCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemant
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -4563,6 +4919,20 @@ public class ActivityCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemant
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -4769,6 +5139,12 @@ public class ActivityCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemant
if (UMLElementTypes.InformationFlow_4016 == req.getElementType()) {
return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));
}
+ if (UMLElementTypes.TimeObservationEvent_4018 == req.getElementType()) {
+ return null;
+ }
+ if (UMLElementTypes.DurationObservationEvent_4019 == req.getElementType()) {
+ return null;
+ }
return null;
}
@@ -4818,6 +5194,12 @@ public class ActivityCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemant
if (UMLElementTypes.InformationFlow_4016 == req.getElementType()) {
return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));
}
+ if (UMLElementTypes.TimeObservationEvent_4018 == req.getElementType()) {
+ return getGEFWrapper(new ConnectorTimeObservationCreateCommand(req, req.getSource(), req.getTarget()));
+ }
+ if (UMLElementTypes.DurationObservationEvent_4019 == req.getElementType()) {
+ return getGEFWrapper(new ConnectorDurationObservationCreateCommand(req, req.getSource(), req.getTarget()));
+ }
return null;
}
@@ -4869,6 +5251,10 @@ public class ActivityCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemant
return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));
case ConstraintConstrainedElementEditPart.VISUAL_ID:
return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));
+ case ConnectorTimeObservationEditPart.VISUAL_ID:
+ return getGEFWrapper(new ConnectorTimeObservationReorientCommand(req));
+ case ConnectorDurationObservationEditPart.VISUAL_ID:
+ return getGEFWrapper(new ConnectorDurationObservationReorientCommand(req));
}
return super.getReorientReferenceRelationshipCommand(req);
}
diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/ActorItemSemanticEditPolicy.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/ActorItemSemanticEditPolicy.java
index 8f389855360..42460f3aa64 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/ActorItemSemanticEditPolicy.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/ActorItemSemanticEditPolicy.java
@@ -34,6 +34,10 @@ import org.eclipse.papyrus.diagram.composite.edit.commands.CommentAnnotatedEleme
import org.eclipse.papyrus.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ComponentRealizationCreateCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ComponentRealizationReorientCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorDurationObservationCreateCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorDurationObservationReorientCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorTimeObservationCreateCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorTimeObservationReorientCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.DependencyCreateCommand;
@@ -59,6 +63,8 @@ import org.eclipse.papyrus.diagram.composite.edit.commands.UsageReorientCommand;
import org.eclipse.papyrus.diagram.composite.edit.parts.AbstractionEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.ComponentRealizationEditPart;
+import org.eclipse.papyrus.diagram.composite.edit.parts.ConnectorDurationObservationEditPart;
+import org.eclipse.papyrus.diagram.composite.edit.parts.ConnectorTimeObservationEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.DependencyEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.DeploymentEditPart;
@@ -180,6 +186,20 @@ public class ActorItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null,
+ incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null,
+ incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = view.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -323,6 +343,12 @@ public class ActorItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {
if (UMLElementTypes.InformationFlow_4016 == req.getElementType()) {
return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));
}
+ if (UMLElementTypes.TimeObservationEvent_4018 == req.getElementType()) {
+ return null;
+ }
+ if (UMLElementTypes.DurationObservationEvent_4019 == req.getElementType()) {
+ return null;
+ }
return null;
}
@@ -372,6 +398,12 @@ public class ActorItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {
if (UMLElementTypes.InformationFlow_4016 == req.getElementType()) {
return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));
}
+ if (UMLElementTypes.TimeObservationEvent_4018 == req.getElementType()) {
+ return getGEFWrapper(new ConnectorTimeObservationCreateCommand(req, req.getSource(), req.getTarget()));
+ }
+ if (UMLElementTypes.DurationObservationEvent_4019 == req.getElementType()) {
+ return getGEFWrapper(new ConnectorDurationObservationCreateCommand(req, req.getSource(), req.getTarget()));
+ }
return null;
}
@@ -423,6 +455,10 @@ public class ActorItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {
return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));
case ConstraintConstrainedElementEditPart.VISUAL_ID:
return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));
+ case ConnectorTimeObservationEditPart.VISUAL_ID:
+ return getGEFWrapper(new ConnectorTimeObservationReorientCommand(req));
+ case ConnectorDurationObservationEditPart.VISUAL_ID:
+ return getGEFWrapper(new ConnectorDurationObservationReorientCommand(req));
}
return super.getReorientReferenceRelationshipCommand(req);
}
diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/ActorItemSemanticEditPolicyCN.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/ActorItemSemanticEditPolicyCN.java
index bc24c1ffdad..a2b3867872a 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/ActorItemSemanticEditPolicyCN.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/ActorItemSemanticEditPolicyCN.java
@@ -34,6 +34,10 @@ import org.eclipse.papyrus.diagram.composite.edit.commands.CommentAnnotatedEleme
import org.eclipse.papyrus.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ComponentRealizationCreateCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ComponentRealizationReorientCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorDurationObservationCreateCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorDurationObservationReorientCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorTimeObservationCreateCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorTimeObservationReorientCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.DependencyCreateCommand;
@@ -59,6 +63,8 @@ import org.eclipse.papyrus.diagram.composite.edit.commands.UsageReorientCommand;
import org.eclipse.papyrus.diagram.composite.edit.parts.AbstractionEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.ComponentRealizationEditPart;
+import org.eclipse.papyrus.diagram.composite.edit.parts.ConnectorDurationObservationEditPart;
+import org.eclipse.papyrus.diagram.composite.edit.parts.ConnectorTimeObservationEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.DependencyEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.DeploymentEditPart;
@@ -180,6 +186,20 @@ public class ActorItemSemanticEditPolicyCN extends UMLBaseItemSemanticEditPolicy
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null,
+ incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null,
+ incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = view.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -323,6 +343,12 @@ public class ActorItemSemanticEditPolicyCN extends UMLBaseItemSemanticEditPolicy
if (UMLElementTypes.InformationFlow_4016 == req.getElementType()) {
return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));
}
+ if (UMLElementTypes.TimeObservationEvent_4018 == req.getElementType()) {
+ return null;
+ }
+ if (UMLElementTypes.DurationObservationEvent_4019 == req.getElementType()) {
+ return null;
+ }
return null;
}
@@ -372,6 +398,12 @@ public class ActorItemSemanticEditPolicyCN extends UMLBaseItemSemanticEditPolicy
if (UMLElementTypes.InformationFlow_4016 == req.getElementType()) {
return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));
}
+ if (UMLElementTypes.TimeObservationEvent_4018 == req.getElementType()) {
+ return getGEFWrapper(new ConnectorTimeObservationCreateCommand(req, req.getSource(), req.getTarget()));
+ }
+ if (UMLElementTypes.DurationObservationEvent_4019 == req.getElementType()) {
+ return getGEFWrapper(new ConnectorDurationObservationCreateCommand(req, req.getSource(), req.getTarget()));
+ }
return null;
}
@@ -423,6 +455,10 @@ public class ActorItemSemanticEditPolicyCN extends UMLBaseItemSemanticEditPolicy
return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));
case ConstraintConstrainedElementEditPart.VISUAL_ID:
return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));
+ case ConnectorTimeObservationEditPart.VISUAL_ID:
+ return getGEFWrapper(new ConnectorTimeObservationReorientCommand(req));
+ case ConnectorDurationObservationEditPart.VISUAL_ID:
+ return getGEFWrapper(new ConnectorDurationObservationReorientCommand(req));
}
return super.getReorientReferenceRelationshipCommand(req);
}
diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/AnyReceiveEventItemSemanticEditPolicy.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/AnyReceiveEventItemSemanticEditPolicy.java
index dfe01c4c579..7e6b8fa5b8c 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/AnyReceiveEventItemSemanticEditPolicy.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/AnyReceiveEventItemSemanticEditPolicy.java
@@ -34,6 +34,10 @@ import org.eclipse.papyrus.diagram.composite.edit.commands.CommentAnnotatedEleme
import org.eclipse.papyrus.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ComponentRealizationCreateCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ComponentRealizationReorientCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorDurationObservationCreateCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorDurationObservationReorientCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorTimeObservationCreateCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorTimeObservationReorientCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.DependencyCreateCommand;
@@ -59,6 +63,8 @@ import org.eclipse.papyrus.diagram.composite.edit.commands.UsageReorientCommand;
import org.eclipse.papyrus.diagram.composite.edit.parts.AbstractionEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.ComponentRealizationEditPart;
+import org.eclipse.papyrus.diagram.composite.edit.parts.ConnectorDurationObservationEditPart;
+import org.eclipse.papyrus.diagram.composite.edit.parts.ConnectorTimeObservationEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.DependencyEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.DeploymentEditPart;
@@ -180,6 +186,20 @@ public class AnyReceiveEventItemSemanticEditPolicy extends UMLBaseItemSemanticEd
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null,
+ incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null,
+ incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = view.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -323,6 +343,12 @@ public class AnyReceiveEventItemSemanticEditPolicy extends UMLBaseItemSemanticEd
if (UMLElementTypes.InformationFlow_4016 == req.getElementType()) {
return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));
}
+ if (UMLElementTypes.TimeObservationEvent_4018 == req.getElementType()) {
+ return null;
+ }
+ if (UMLElementTypes.DurationObservationEvent_4019 == req.getElementType()) {
+ return null;
+ }
return null;
}
@@ -372,6 +398,12 @@ public class AnyReceiveEventItemSemanticEditPolicy extends UMLBaseItemSemanticEd
if (UMLElementTypes.InformationFlow_4016 == req.getElementType()) {
return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));
}
+ if (UMLElementTypes.TimeObservationEvent_4018 == req.getElementType()) {
+ return getGEFWrapper(new ConnectorTimeObservationCreateCommand(req, req.getSource(), req.getTarget()));
+ }
+ if (UMLElementTypes.DurationObservationEvent_4019 == req.getElementType()) {
+ return getGEFWrapper(new ConnectorDurationObservationCreateCommand(req, req.getSource(), req.getTarget()));
+ }
return null;
}
@@ -423,6 +455,10 @@ public class AnyReceiveEventItemSemanticEditPolicy extends UMLBaseItemSemanticEd
return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));
case ConstraintConstrainedElementEditPart.VISUAL_ID:
return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));
+ case ConnectorTimeObservationEditPart.VISUAL_ID:
+ return getGEFWrapper(new ConnectorTimeObservationReorientCommand(req));
+ case ConnectorDurationObservationEditPart.VISUAL_ID:
+ return getGEFWrapper(new ConnectorDurationObservationReorientCommand(req));
}
return super.getReorientReferenceRelationshipCommand(req);
}
diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/ArtifactItemSemanticEditPolicy.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/ArtifactItemSemanticEditPolicy.java
index f310ba29a9e..9d6c6671978 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/ArtifactItemSemanticEditPolicy.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/ArtifactItemSemanticEditPolicy.java
@@ -34,6 +34,10 @@ import org.eclipse.papyrus.diagram.composite.edit.commands.CommentAnnotatedEleme
import org.eclipse.papyrus.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ComponentRealizationCreateCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ComponentRealizationReorientCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorDurationObservationCreateCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorDurationObservationReorientCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorTimeObservationCreateCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorTimeObservationReorientCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.DependencyCreateCommand;
@@ -59,6 +63,8 @@ import org.eclipse.papyrus.diagram.composite.edit.commands.UsageReorientCommand;
import org.eclipse.papyrus.diagram.composite.edit.parts.AbstractionEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.ComponentRealizationEditPart;
+import org.eclipse.papyrus.diagram.composite.edit.parts.ConnectorDurationObservationEditPart;
+import org.eclipse.papyrus.diagram.composite.edit.parts.ConnectorTimeObservationEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.DependencyEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.DeploymentEditPart;
@@ -180,6 +186,20 @@ public class ArtifactItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolic
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null,
+ incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null,
+ incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = view.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -323,6 +343,12 @@ public class ArtifactItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolic
if (UMLElementTypes.InformationFlow_4016 == req.getElementType()) {
return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));
}
+ if (UMLElementTypes.TimeObservationEvent_4018 == req.getElementType()) {
+ return null;
+ }
+ if (UMLElementTypes.DurationObservationEvent_4019 == req.getElementType()) {
+ return null;
+ }
return null;
}
@@ -372,6 +398,12 @@ public class ArtifactItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolic
if (UMLElementTypes.InformationFlow_4016 == req.getElementType()) {
return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));
}
+ if (UMLElementTypes.TimeObservationEvent_4018 == req.getElementType()) {
+ return getGEFWrapper(new ConnectorTimeObservationCreateCommand(req, req.getSource(), req.getTarget()));
+ }
+ if (UMLElementTypes.DurationObservationEvent_4019 == req.getElementType()) {
+ return getGEFWrapper(new ConnectorDurationObservationCreateCommand(req, req.getSource(), req.getTarget()));
+ }
return null;
}
@@ -423,6 +455,10 @@ public class ArtifactItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolic
return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));
case ConstraintConstrainedElementEditPart.VISUAL_ID:
return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));
+ case ConnectorTimeObservationEditPart.VISUAL_ID:
+ return getGEFWrapper(new ConnectorTimeObservationReorientCommand(req));
+ case ConnectorDurationObservationEditPart.VISUAL_ID:
+ return getGEFWrapper(new ConnectorDurationObservationReorientCommand(req));
}
return super.getReorientReferenceRelationshipCommand(req);
}
diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/ArtifactItemSemanticEditPolicyCN.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/ArtifactItemSemanticEditPolicyCN.java
index 4b090644dd0..12b9f5a862b 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/ArtifactItemSemanticEditPolicyCN.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/ArtifactItemSemanticEditPolicyCN.java
@@ -34,6 +34,10 @@ import org.eclipse.papyrus.diagram.composite.edit.commands.CommentAnnotatedEleme
import org.eclipse.papyrus.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ComponentRealizationCreateCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ComponentRealizationReorientCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorDurationObservationCreateCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorDurationObservationReorientCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorTimeObservationCreateCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorTimeObservationReorientCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.DependencyCreateCommand;
@@ -59,6 +63,8 @@ import org.eclipse.papyrus.diagram.composite.edit.commands.UsageReorientCommand;
import org.eclipse.papyrus.diagram.composite.edit.parts.AbstractionEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.ComponentRealizationEditPart;
+import org.eclipse.papyrus.diagram.composite.edit.parts.ConnectorDurationObservationEditPart;
+import org.eclipse.papyrus.diagram.composite.edit.parts.ConnectorTimeObservationEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.DependencyEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.DeploymentEditPart;
@@ -180,6 +186,20 @@ public class ArtifactItemSemanticEditPolicyCN extends UMLBaseItemSemanticEditPol
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null,
+ incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null,
+ incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = view.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -323,6 +343,12 @@ public class ArtifactItemSemanticEditPolicyCN extends UMLBaseItemSemanticEditPol
if (UMLElementTypes.InformationFlow_4016 == req.getElementType()) {
return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));
}
+ if (UMLElementTypes.TimeObservationEvent_4018 == req.getElementType()) {
+ return null;
+ }
+ if (UMLElementTypes.DurationObservationEvent_4019 == req.getElementType()) {
+ return null;
+ }
return null;
}
@@ -372,6 +398,12 @@ public class ArtifactItemSemanticEditPolicyCN extends UMLBaseItemSemanticEditPol
if (UMLElementTypes.InformationFlow_4016 == req.getElementType()) {
return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));
}
+ if (UMLElementTypes.TimeObservationEvent_4018 == req.getElementType()) {
+ return getGEFWrapper(new ConnectorTimeObservationCreateCommand(req, req.getSource(), req.getTarget()));
+ }
+ if (UMLElementTypes.DurationObservationEvent_4019 == req.getElementType()) {
+ return getGEFWrapper(new ConnectorDurationObservationCreateCommand(req, req.getSource(), req.getTarget()));
+ }
return null;
}
@@ -423,6 +455,10 @@ public class ArtifactItemSemanticEditPolicyCN extends UMLBaseItemSemanticEditPol
return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));
case ConstraintConstrainedElementEditPart.VISUAL_ID:
return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));
+ case ConnectorTimeObservationEditPart.VISUAL_ID:
+ return getGEFWrapper(new ConnectorTimeObservationReorientCommand(req));
+ case ConnectorDurationObservationEditPart.VISUAL_ID:
+ return getGEFWrapper(new ConnectorDurationObservationReorientCommand(req));
}
return super.getReorientReferenceRelationshipCommand(req);
}
diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/CallEventItemSemanticEditPolicy.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/CallEventItemSemanticEditPolicy.java
index 981f72db244..e77750b412f 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/CallEventItemSemanticEditPolicy.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/CallEventItemSemanticEditPolicy.java
@@ -34,6 +34,10 @@ import org.eclipse.papyrus.diagram.composite.edit.commands.CommentAnnotatedEleme
import org.eclipse.papyrus.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ComponentRealizationCreateCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ComponentRealizationReorientCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorDurationObservationCreateCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorDurationObservationReorientCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorTimeObservationCreateCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorTimeObservationReorientCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.DependencyCreateCommand;
@@ -59,6 +63,8 @@ import org.eclipse.papyrus.diagram.composite.edit.commands.UsageReorientCommand;
import org.eclipse.papyrus.diagram.composite.edit.parts.AbstractionEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.ComponentRealizationEditPart;
+import org.eclipse.papyrus.diagram.composite.edit.parts.ConnectorDurationObservationEditPart;
+import org.eclipse.papyrus.diagram.composite.edit.parts.ConnectorTimeObservationEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.DependencyEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.DeploymentEditPart;
@@ -180,6 +186,20 @@ public class CallEventItemSemanticEditPolicy extends UMLBaseItemSemanticEditPoli
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null,
+ incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null,
+ incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = view.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -323,6 +343,12 @@ public class CallEventItemSemanticEditPolicy extends UMLBaseItemSemanticEditPoli
if (UMLElementTypes.InformationFlow_4016 == req.getElementType()) {
return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));
}
+ if (UMLElementTypes.TimeObservationEvent_4018 == req.getElementType()) {
+ return null;
+ }
+ if (UMLElementTypes.DurationObservationEvent_4019 == req.getElementType()) {
+ return null;
+ }
return null;
}
@@ -372,6 +398,12 @@ public class CallEventItemSemanticEditPolicy extends UMLBaseItemSemanticEditPoli
if (UMLElementTypes.InformationFlow_4016 == req.getElementType()) {
return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));
}
+ if (UMLElementTypes.TimeObservationEvent_4018 == req.getElementType()) {
+ return getGEFWrapper(new ConnectorTimeObservationCreateCommand(req, req.getSource(), req.getTarget()));
+ }
+ if (UMLElementTypes.DurationObservationEvent_4019 == req.getElementType()) {
+ return getGEFWrapper(new ConnectorDurationObservationCreateCommand(req, req.getSource(), req.getTarget()));
+ }
return null;
}
@@ -423,6 +455,10 @@ public class CallEventItemSemanticEditPolicy extends UMLBaseItemSemanticEditPoli
return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));
case ConstraintConstrainedElementEditPart.VISUAL_ID:
return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));
+ case ConnectorTimeObservationEditPart.VISUAL_ID:
+ return getGEFWrapper(new ConnectorTimeObservationReorientCommand(req));
+ case ConnectorDurationObservationEditPart.VISUAL_ID:
+ return getGEFWrapper(new ConnectorDurationObservationReorientCommand(req));
}
return super.getReorientReferenceRelationshipCommand(req);
}
diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/ChangeEventItemSemanticEditPolicy.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/ChangeEventItemSemanticEditPolicy.java
index a6ea8e680a0..9df2a4e563a 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/ChangeEventItemSemanticEditPolicy.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/ChangeEventItemSemanticEditPolicy.java
@@ -34,6 +34,10 @@ import org.eclipse.papyrus.diagram.composite.edit.commands.CommentAnnotatedEleme
import org.eclipse.papyrus.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ComponentRealizationCreateCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ComponentRealizationReorientCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorDurationObservationCreateCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorDurationObservationReorientCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorTimeObservationCreateCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorTimeObservationReorientCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.DependencyCreateCommand;
@@ -59,6 +63,8 @@ import org.eclipse.papyrus.diagram.composite.edit.commands.UsageReorientCommand;
import org.eclipse.papyrus.diagram.composite.edit.parts.AbstractionEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.ComponentRealizationEditPart;
+import org.eclipse.papyrus.diagram.composite.edit.parts.ConnectorDurationObservationEditPart;
+import org.eclipse.papyrus.diagram.composite.edit.parts.ConnectorTimeObservationEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.DependencyEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.DeploymentEditPart;
@@ -180,6 +186,20 @@ public class ChangeEventItemSemanticEditPolicy extends UMLBaseItemSemanticEditPo
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null,
+ incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null,
+ incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = view.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -323,6 +343,12 @@ public class ChangeEventItemSemanticEditPolicy extends UMLBaseItemSemanticEditPo
if (UMLElementTypes.InformationFlow_4016 == req.getElementType()) {
return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));
}
+ if (UMLElementTypes.TimeObservationEvent_4018 == req.getElementType()) {
+ return null;
+ }
+ if (UMLElementTypes.DurationObservationEvent_4019 == req.getElementType()) {
+ return null;
+ }
return null;
}
@@ -372,6 +398,12 @@ public class ChangeEventItemSemanticEditPolicy extends UMLBaseItemSemanticEditPo
if (UMLElementTypes.InformationFlow_4016 == req.getElementType()) {
return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));
}
+ if (UMLElementTypes.TimeObservationEvent_4018 == req.getElementType()) {
+ return getGEFWrapper(new ConnectorTimeObservationCreateCommand(req, req.getSource(), req.getTarget()));
+ }
+ if (UMLElementTypes.DurationObservationEvent_4019 == req.getElementType()) {
+ return getGEFWrapper(new ConnectorDurationObservationCreateCommand(req, req.getSource(), req.getTarget()));
+ }
return null;
}
@@ -423,6 +455,10 @@ public class ChangeEventItemSemanticEditPolicy extends UMLBaseItemSemanticEditPo
return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));
case ConstraintConstrainedElementEditPart.VISUAL_ID:
return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));
+ case ConnectorTimeObservationEditPart.VISUAL_ID:
+ return getGEFWrapper(new ConnectorTimeObservationReorientCommand(req));
+ case ConnectorDurationObservationEditPart.VISUAL_ID:
+ return getGEFWrapper(new ConnectorDurationObservationReorientCommand(req));
}
return super.getReorientReferenceRelationshipCommand(req);
}
diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/ClassClassifierItemSemanticEditPolicy.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/ClassClassifierItemSemanticEditPolicy.java
index d2244d62d01..b88a50b811c 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/ClassClassifierItemSemanticEditPolicy.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/ClassClassifierItemSemanticEditPolicy.java
@@ -36,6 +36,10 @@ import org.eclipse.papyrus.diagram.composite.edit.commands.CommentAnnotatedEleme
import org.eclipse.papyrus.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ComponentRealizationCreateCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ComponentRealizationReorientCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorDurationObservationCreateCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorDurationObservationReorientCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorTimeObservationCreateCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorTimeObservationReorientCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.DependencyCreateCommand;
@@ -67,6 +71,8 @@ import org.eclipse.papyrus.diagram.composite.edit.parts.ClassOperationCompartmen
import org.eclipse.papyrus.diagram.composite.edit.parts.CollaborationEditPartCLN;
import org.eclipse.papyrus.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.ComponentRealizationEditPart;
+import org.eclipse.papyrus.diagram.composite.edit.parts.ConnectorDurationObservationEditPart;
+import org.eclipse.papyrus.diagram.composite.edit.parts.ConnectorTimeObservationEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.DataTypeEditPartCLN;
import org.eclipse.papyrus.diagram.composite.edit.parts.DependencyEditPart;
@@ -200,6 +206,20 @@ public class ClassClassifierItemSemanticEditPolicy extends UMLBaseItemSemanticEd
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null,
+ incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null,
+ incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = view.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -512,6 +532,12 @@ public class ClassClassifierItemSemanticEditPolicy extends UMLBaseItemSemanticEd
if (UMLElementTypes.InformationFlow_4016 == req.getElementType()) {
return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));
}
+ if (UMLElementTypes.TimeObservationEvent_4018 == req.getElementType()) {
+ return null;
+ }
+ if (UMLElementTypes.DurationObservationEvent_4019 == req.getElementType()) {
+ return null;
+ }
return null;
}
@@ -561,6 +587,12 @@ public class ClassClassifierItemSemanticEditPolicy extends UMLBaseItemSemanticEd
if (UMLElementTypes.InformationFlow_4016 == req.getElementType()) {
return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));
}
+ if (UMLElementTypes.TimeObservationEvent_4018 == req.getElementType()) {
+ return getGEFWrapper(new ConnectorTimeObservationCreateCommand(req, req.getSource(), req.getTarget()));
+ }
+ if (UMLElementTypes.DurationObservationEvent_4019 == req.getElementType()) {
+ return getGEFWrapper(new ConnectorDurationObservationCreateCommand(req, req.getSource(), req.getTarget()));
+ }
return null;
}
@@ -612,6 +644,10 @@ public class ClassClassifierItemSemanticEditPolicy extends UMLBaseItemSemanticEd
return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));
case ConstraintConstrainedElementEditPart.VISUAL_ID:
return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));
+ case ConnectorTimeObservationEditPart.VISUAL_ID:
+ return getGEFWrapper(new ConnectorTimeObservationReorientCommand(req));
+ case ConnectorDurationObservationEditPart.VISUAL_ID:
+ return getGEFWrapper(new ConnectorDurationObservationReorientCommand(req));
}
return super.getReorientReferenceRelationshipCommand(req);
}
diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/ClassCompositeItemSemanticEditPolicy.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/ClassCompositeItemSemanticEditPolicy.java
index 0f533749772..f6bed481251 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/ClassCompositeItemSemanticEditPolicy.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/ClassCompositeItemSemanticEditPolicy.java
@@ -37,6 +37,10 @@ import org.eclipse.papyrus.diagram.composite.edit.commands.CommentAnnotatedEleme
import org.eclipse.papyrus.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ComponentRealizationCreateCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ComponentRealizationReorientCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorDurationObservationCreateCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorDurationObservationReorientCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorTimeObservationCreateCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorTimeObservationReorientCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.DependencyCreateCommand;
@@ -72,6 +76,8 @@ import org.eclipse.papyrus.diagram.composite.edit.parts.CommentAnnotatedElementE
import org.eclipse.papyrus.diagram.composite.edit.parts.CommentEditPartCN;
import org.eclipse.papyrus.diagram.composite.edit.parts.ComponentCompositeEditPartCN;
import org.eclipse.papyrus.diagram.composite.edit.parts.ComponentRealizationEditPart;
+import org.eclipse.papyrus.diagram.composite.edit.parts.ConnectorDurationObservationEditPart;
+import org.eclipse.papyrus.diagram.composite.edit.parts.ConnectorTimeObservationEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.DataTypeEditPartCN;
import org.eclipse.papyrus.diagram.composite.edit.parts.DependencyEditPart;
@@ -221,6 +227,20 @@ public class ClassCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEdi
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null,
+ incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null,
+ incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = view.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -407,6 +427,20 @@ public class ClassCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEdi
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource().getElement(),
+ null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource().getElement(),
+ null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = node.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -584,6 +618,20 @@ public class ClassCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEdi
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -757,6 +805,20 @@ public class ClassCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEdi
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -930,6 +992,20 @@ public class ClassCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEdi
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -1103,6 +1179,20 @@ public class ClassCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEdi
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -1276,6 +1366,20 @@ public class ClassCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEdi
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -1449,6 +1553,20 @@ public class ClassCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEdi
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -1622,6 +1740,20 @@ public class ClassCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEdi
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -1795,6 +1927,20 @@ public class ClassCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEdi
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -1968,6 +2114,20 @@ public class ClassCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEdi
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -2141,6 +2301,20 @@ public class ClassCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEdi
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -2314,6 +2488,20 @@ public class ClassCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEdi
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -2487,6 +2675,20 @@ public class ClassCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEdi
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -2660,6 +2862,20 @@ public class ClassCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEdi
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -2833,6 +3049,20 @@ public class ClassCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEdi
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -3006,6 +3236,20 @@ public class ClassCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEdi
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -3179,6 +3423,20 @@ public class ClassCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEdi
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -3352,6 +3610,20 @@ public class ClassCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEdi
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -3525,6 +3797,20 @@ public class ClassCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEdi
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -3698,6 +3984,20 @@ public class ClassCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEdi
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -3871,6 +4171,20 @@ public class ClassCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEdi
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -4044,6 +4358,20 @@ public class ClassCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEdi
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -4217,6 +4545,20 @@ public class ClassCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEdi
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -4390,6 +4732,20 @@ public class ClassCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEdi
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -4563,6 +4919,20 @@ public class ClassCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEdi
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -4769,6 +5139,12 @@ public class ClassCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEdi
if (UMLElementTypes.InformationFlow_4016 == req.getElementType()) {
return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));
}
+ if (UMLElementTypes.TimeObservationEvent_4018 == req.getElementType()) {
+ return null;
+ }
+ if (UMLElementTypes.DurationObservationEvent_4019 == req.getElementType()) {
+ return null;
+ }
return null;
}
@@ -4818,6 +5194,12 @@ public class ClassCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEdi
if (UMLElementTypes.InformationFlow_4016 == req.getElementType()) {
return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));
}
+ if (UMLElementTypes.TimeObservationEvent_4018 == req.getElementType()) {
+ return getGEFWrapper(new ConnectorTimeObservationCreateCommand(req, req.getSource(), req.getTarget()));
+ }
+ if (UMLElementTypes.DurationObservationEvent_4019 == req.getElementType()) {
+ return getGEFWrapper(new ConnectorDurationObservationCreateCommand(req, req.getSource(), req.getTarget()));
+ }
return null;
}
@@ -4869,6 +5251,10 @@ public class ClassCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEdi
return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));
case ConstraintConstrainedElementEditPart.VISUAL_ID:
return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));
+ case ConnectorTimeObservationEditPart.VISUAL_ID:
+ return getGEFWrapper(new ConnectorTimeObservationReorientCommand(req));
+ case ConnectorDurationObservationEditPart.VISUAL_ID:
+ return getGEFWrapper(new ConnectorDurationObservationReorientCommand(req));
}
return super.getReorientReferenceRelationshipCommand(req);
}
diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/ClassCompositeItemSemanticEditPolicyCN.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/ClassCompositeItemSemanticEditPolicyCN.java
index 6dd1f38db5b..14bc417de93 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/ClassCompositeItemSemanticEditPolicyCN.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/ClassCompositeItemSemanticEditPolicyCN.java
@@ -37,6 +37,10 @@ import org.eclipse.papyrus.diagram.composite.edit.commands.CommentAnnotatedEleme
import org.eclipse.papyrus.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ComponentRealizationCreateCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ComponentRealizationReorientCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorDurationObservationCreateCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorDurationObservationReorientCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorTimeObservationCreateCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorTimeObservationReorientCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.DependencyCreateCommand;
@@ -72,6 +76,8 @@ import org.eclipse.papyrus.diagram.composite.edit.parts.CommentAnnotatedElementE
import org.eclipse.papyrus.diagram.composite.edit.parts.CommentEditPartCN;
import org.eclipse.papyrus.diagram.composite.edit.parts.ComponentCompositeEditPartCN;
import org.eclipse.papyrus.diagram.composite.edit.parts.ComponentRealizationEditPart;
+import org.eclipse.papyrus.diagram.composite.edit.parts.ConnectorDurationObservationEditPart;
+import org.eclipse.papyrus.diagram.composite.edit.parts.ConnectorTimeObservationEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.DataTypeEditPartCN;
import org.eclipse.papyrus.diagram.composite.edit.parts.DependencyEditPart;
@@ -221,6 +227,20 @@ public class ClassCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemanticE
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null,
+ incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null,
+ incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = view.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -407,6 +427,20 @@ public class ClassCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemanticE
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource().getElement(),
+ null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource().getElement(),
+ null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = node.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -584,6 +618,20 @@ public class ClassCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemanticE
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -757,6 +805,20 @@ public class ClassCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemanticE
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -930,6 +992,20 @@ public class ClassCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemanticE
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -1103,6 +1179,20 @@ public class ClassCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemanticE
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -1276,6 +1366,20 @@ public class ClassCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemanticE
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -1449,6 +1553,20 @@ public class ClassCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemanticE
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -1622,6 +1740,20 @@ public class ClassCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemanticE
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -1795,6 +1927,20 @@ public class ClassCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemanticE
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -1968,6 +2114,20 @@ public class ClassCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemanticE
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -2141,6 +2301,20 @@ public class ClassCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemanticE
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -2314,6 +2488,20 @@ public class ClassCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemanticE
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -2487,6 +2675,20 @@ public class ClassCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemanticE
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -2660,6 +2862,20 @@ public class ClassCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemanticE
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -2833,6 +3049,20 @@ public class ClassCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemanticE
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -3006,6 +3236,20 @@ public class ClassCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemanticE
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -3179,6 +3423,20 @@ public class ClassCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemanticE
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -3352,6 +3610,20 @@ public class ClassCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemanticE
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -3525,6 +3797,20 @@ public class ClassCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemanticE
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -3698,6 +3984,20 @@ public class ClassCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemanticE
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -3871,6 +4171,20 @@ public class ClassCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemanticE
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -4044,6 +4358,20 @@ public class ClassCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemanticE
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -4217,6 +4545,20 @@ public class ClassCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemanticE
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -4390,6 +4732,20 @@ public class ClassCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemanticE
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -4563,6 +4919,20 @@ public class ClassCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemanticE
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -4769,6 +5139,12 @@ public class ClassCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemanticE
if (UMLElementTypes.InformationFlow_4016 == req.getElementType()) {
return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));
}
+ if (UMLElementTypes.TimeObservationEvent_4018 == req.getElementType()) {
+ return null;
+ }
+ if (UMLElementTypes.DurationObservationEvent_4019 == req.getElementType()) {
+ return null;
+ }
return null;
}
@@ -4818,6 +5194,12 @@ public class ClassCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemanticE
if (UMLElementTypes.InformationFlow_4016 == req.getElementType()) {
return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));
}
+ if (UMLElementTypes.TimeObservationEvent_4018 == req.getElementType()) {
+ return getGEFWrapper(new ConnectorTimeObservationCreateCommand(req, req.getSource(), req.getTarget()));
+ }
+ if (UMLElementTypes.DurationObservationEvent_4019 == req.getElementType()) {
+ return getGEFWrapper(new ConnectorDurationObservationCreateCommand(req, req.getSource(), req.getTarget()));
+ }
return null;
}
@@ -4869,6 +5251,10 @@ public class ClassCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemanticE
return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));
case ConstraintConstrainedElementEditPart.VISUAL_ID:
return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));
+ case ConnectorTimeObservationEditPart.VISUAL_ID:
+ return getGEFWrapper(new ConnectorTimeObservationReorientCommand(req));
+ case ConnectorDurationObservationEditPart.VISUAL_ID:
+ return getGEFWrapper(new ConnectorDurationObservationReorientCommand(req));
}
return super.getReorientReferenceRelationshipCommand(req);
}
diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/CollaborationCompositeItemSemanticEditPolicy.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/CollaborationCompositeItemSemanticEditPolicy.java
index 6695f5d6b29..801e5ce09e5 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/CollaborationCompositeItemSemanticEditPolicy.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/CollaborationCompositeItemSemanticEditPolicy.java
@@ -36,6 +36,10 @@ import org.eclipse.papyrus.diagram.composite.edit.commands.CommentAnnotatedEleme
import org.eclipse.papyrus.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ComponentRealizationCreateCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ComponentRealizationReorientCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorDurationObservationCreateCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorDurationObservationReorientCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorTimeObservationCreateCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorTimeObservationReorientCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.DependencyCreateCommand;
@@ -65,6 +69,8 @@ import org.eclipse.papyrus.diagram.composite.edit.parts.CollaborationUseEditPart
import org.eclipse.papyrus.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.CommentEditPartCN;
import org.eclipse.papyrus.diagram.composite.edit.parts.ComponentRealizationEditPart;
+import org.eclipse.papyrus.diagram.composite.edit.parts.ConnectorDurationObservationEditPart;
+import org.eclipse.papyrus.diagram.composite.edit.parts.ConnectorTimeObservationEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.DependencyEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.DeploymentEditPart;
@@ -187,6 +193,20 @@ public class CollaborationCompositeItemSemanticEditPolicy extends UMLBaseItemSem
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null,
+ incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null,
+ incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = view.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -377,6 +397,20 @@ public class CollaborationCompositeItemSemanticEditPolicy extends UMLBaseItemSem
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -550,6 +584,20 @@ public class CollaborationCompositeItemSemanticEditPolicy extends UMLBaseItemSem
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -783,6 +831,20 @@ public class CollaborationCompositeItemSemanticEditPolicy extends UMLBaseItemSem
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -929,6 +991,12 @@ public class CollaborationCompositeItemSemanticEditPolicy extends UMLBaseItemSem
if (UMLElementTypes.InformationFlow_4016 == req.getElementType()) {
return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));
}
+ if (UMLElementTypes.TimeObservationEvent_4018 == req.getElementType()) {
+ return null;
+ }
+ if (UMLElementTypes.DurationObservationEvent_4019 == req.getElementType()) {
+ return null;
+ }
return null;
}
@@ -978,6 +1046,12 @@ public class CollaborationCompositeItemSemanticEditPolicy extends UMLBaseItemSem
if (UMLElementTypes.InformationFlow_4016 == req.getElementType()) {
return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));
}
+ if (UMLElementTypes.TimeObservationEvent_4018 == req.getElementType()) {
+ return getGEFWrapper(new ConnectorTimeObservationCreateCommand(req, req.getSource(), req.getTarget()));
+ }
+ if (UMLElementTypes.DurationObservationEvent_4019 == req.getElementType()) {
+ return getGEFWrapper(new ConnectorDurationObservationCreateCommand(req, req.getSource(), req.getTarget()));
+ }
return null;
}
@@ -1029,6 +1103,10 @@ public class CollaborationCompositeItemSemanticEditPolicy extends UMLBaseItemSem
return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));
case ConstraintConstrainedElementEditPart.VISUAL_ID:
return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));
+ case ConnectorTimeObservationEditPart.VISUAL_ID:
+ return getGEFWrapper(new ConnectorTimeObservationReorientCommand(req));
+ case ConnectorDurationObservationEditPart.VISUAL_ID:
+ return getGEFWrapper(new ConnectorDurationObservationReorientCommand(req));
}
return super.getReorientReferenceRelationshipCommand(req);
}
diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/CollaborationCompositeItemSemanticEditPolicyCN.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/CollaborationCompositeItemSemanticEditPolicyCN.java
index 8ef2c3218f4..a777761bd60 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/CollaborationCompositeItemSemanticEditPolicyCN.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/CollaborationCompositeItemSemanticEditPolicyCN.java
@@ -36,6 +36,10 @@ import org.eclipse.papyrus.diagram.composite.edit.commands.CommentAnnotatedEleme
import org.eclipse.papyrus.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ComponentRealizationCreateCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ComponentRealizationReorientCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorDurationObservationCreateCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorDurationObservationReorientCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorTimeObservationCreateCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorTimeObservationReorientCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.DependencyCreateCommand;
@@ -65,6 +69,8 @@ import org.eclipse.papyrus.diagram.composite.edit.parts.CollaborationUseEditPart
import org.eclipse.papyrus.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.CommentEditPartCN;
import org.eclipse.papyrus.diagram.composite.edit.parts.ComponentRealizationEditPart;
+import org.eclipse.papyrus.diagram.composite.edit.parts.ConnectorDurationObservationEditPart;
+import org.eclipse.papyrus.diagram.composite.edit.parts.ConnectorTimeObservationEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.DependencyEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.DeploymentEditPart;
@@ -187,6 +193,20 @@ public class CollaborationCompositeItemSemanticEditPolicyCN extends UMLBaseItemS
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null,
+ incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null,
+ incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = view.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -377,6 +397,20 @@ public class CollaborationCompositeItemSemanticEditPolicyCN extends UMLBaseItemS
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -550,6 +584,20 @@ public class CollaborationCompositeItemSemanticEditPolicyCN extends UMLBaseItemS
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -783,6 +831,20 @@ public class CollaborationCompositeItemSemanticEditPolicyCN extends UMLBaseItemS
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -929,6 +991,12 @@ public class CollaborationCompositeItemSemanticEditPolicyCN extends UMLBaseItemS
if (UMLElementTypes.InformationFlow_4016 == req.getElementType()) {
return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));
}
+ if (UMLElementTypes.TimeObservationEvent_4018 == req.getElementType()) {
+ return null;
+ }
+ if (UMLElementTypes.DurationObservationEvent_4019 == req.getElementType()) {
+ return null;
+ }
return null;
}
@@ -978,6 +1046,12 @@ public class CollaborationCompositeItemSemanticEditPolicyCN extends UMLBaseItemS
if (UMLElementTypes.InformationFlow_4016 == req.getElementType()) {
return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));
}
+ if (UMLElementTypes.TimeObservationEvent_4018 == req.getElementType()) {
+ return getGEFWrapper(new ConnectorTimeObservationCreateCommand(req, req.getSource(), req.getTarget()));
+ }
+ if (UMLElementTypes.DurationObservationEvent_4019 == req.getElementType()) {
+ return getGEFWrapper(new ConnectorDurationObservationCreateCommand(req, req.getSource(), req.getTarget()));
+ }
return null;
}
@@ -1029,6 +1103,10 @@ public class CollaborationCompositeItemSemanticEditPolicyCN extends UMLBaseItemS
return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));
case ConstraintConstrainedElementEditPart.VISUAL_ID:
return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));
+ case ConnectorTimeObservationEditPart.VISUAL_ID:
+ return getGEFWrapper(new ConnectorTimeObservationReorientCommand(req));
+ case ConnectorDurationObservationEditPart.VISUAL_ID:
+ return getGEFWrapper(new ConnectorDurationObservationReorientCommand(req));
}
return super.getReorientReferenceRelationshipCommand(req);
}
diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/CollaborationRoleItemSemanticEditPolicyCN.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/CollaborationRoleItemSemanticEditPolicyCN.java
index 76c3bae8a42..a0328217d38 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/CollaborationRoleItemSemanticEditPolicyCN.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/CollaborationRoleItemSemanticEditPolicyCN.java
@@ -34,6 +34,10 @@ import org.eclipse.papyrus.diagram.composite.edit.commands.CommentAnnotatedEleme
import org.eclipse.papyrus.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ComponentRealizationCreateCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ComponentRealizationReorientCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorDurationObservationCreateCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorDurationObservationReorientCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorTimeObservationCreateCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorTimeObservationReorientCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.DependencyCreateCommand;
@@ -59,6 +63,8 @@ import org.eclipse.papyrus.diagram.composite.edit.commands.UsageReorientCommand;
import org.eclipse.papyrus.diagram.composite.edit.parts.AbstractionEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.ComponentRealizationEditPart;
+import org.eclipse.papyrus.diagram.composite.edit.parts.ConnectorDurationObservationEditPart;
+import org.eclipse.papyrus.diagram.composite.edit.parts.ConnectorTimeObservationEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.DependencyEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.DeploymentEditPart;
@@ -180,6 +186,20 @@ public class CollaborationRoleItemSemanticEditPolicyCN extends UMLBaseItemSemant
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null,
+ incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null,
+ incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = view.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -323,6 +343,12 @@ public class CollaborationRoleItemSemanticEditPolicyCN extends UMLBaseItemSemant
if (UMLElementTypes.InformationFlow_4016 == req.getElementType()) {
return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));
}
+ if (UMLElementTypes.TimeObservationEvent_4018 == req.getElementType()) {
+ return null;
+ }
+ if (UMLElementTypes.DurationObservationEvent_4019 == req.getElementType()) {
+ return null;
+ }
return null;
}
@@ -372,6 +398,12 @@ public class CollaborationRoleItemSemanticEditPolicyCN extends UMLBaseItemSemant
if (UMLElementTypes.InformationFlow_4016 == req.getElementType()) {
return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));
}
+ if (UMLElementTypes.TimeObservationEvent_4018 == req.getElementType()) {
+ return getGEFWrapper(new ConnectorTimeObservationCreateCommand(req, req.getSource(), req.getTarget()));
+ }
+ if (UMLElementTypes.DurationObservationEvent_4019 == req.getElementType()) {
+ return getGEFWrapper(new ConnectorDurationObservationCreateCommand(req, req.getSource(), req.getTarget()));
+ }
return null;
}
@@ -423,6 +455,10 @@ public class CollaborationRoleItemSemanticEditPolicyCN extends UMLBaseItemSemant
return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));
case ConstraintConstrainedElementEditPart.VISUAL_ID:
return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));
+ case ConnectorTimeObservationEditPart.VISUAL_ID:
+ return getGEFWrapper(new ConnectorTimeObservationReorientCommand(req));
+ case ConnectorDurationObservationEditPart.VISUAL_ID:
+ return getGEFWrapper(new ConnectorDurationObservationReorientCommand(req));
}
return super.getReorientReferenceRelationshipCommand(req);
}
diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/CollaborationUseItemSemanticEditPolicyCN.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/CollaborationUseItemSemanticEditPolicyCN.java
index a41dae4518e..553552e8a30 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/CollaborationUseItemSemanticEditPolicyCN.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/CollaborationUseItemSemanticEditPolicyCN.java
@@ -34,6 +34,10 @@ import org.eclipse.papyrus.diagram.composite.edit.commands.CommentAnnotatedEleme
import org.eclipse.papyrus.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ComponentRealizationCreateCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ComponentRealizationReorientCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorDurationObservationCreateCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorDurationObservationReorientCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorTimeObservationCreateCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorTimeObservationReorientCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.DependencyCreateCommand;
@@ -59,6 +63,8 @@ import org.eclipse.papyrus.diagram.composite.edit.commands.UsageReorientCommand;
import org.eclipse.papyrus.diagram.composite.edit.parts.AbstractionEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.ComponentRealizationEditPart;
+import org.eclipse.papyrus.diagram.composite.edit.parts.ConnectorDurationObservationEditPart;
+import org.eclipse.papyrus.diagram.composite.edit.parts.ConnectorTimeObservationEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.DependencyEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.DeploymentEditPart;
@@ -180,6 +186,20 @@ public class CollaborationUseItemSemanticEditPolicyCN extends UMLBaseItemSemanti
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null,
+ incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null,
+ incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = view.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -323,6 +343,12 @@ public class CollaborationUseItemSemanticEditPolicyCN extends UMLBaseItemSemanti
if (UMLElementTypes.InformationFlow_4016 == req.getElementType()) {
return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));
}
+ if (UMLElementTypes.TimeObservationEvent_4018 == req.getElementType()) {
+ return null;
+ }
+ if (UMLElementTypes.DurationObservationEvent_4019 == req.getElementType()) {
+ return null;
+ }
return null;
}
@@ -372,6 +398,12 @@ public class CollaborationUseItemSemanticEditPolicyCN extends UMLBaseItemSemanti
if (UMLElementTypes.InformationFlow_4016 == req.getElementType()) {
return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));
}
+ if (UMLElementTypes.TimeObservationEvent_4018 == req.getElementType()) {
+ return getGEFWrapper(new ConnectorTimeObservationCreateCommand(req, req.getSource(), req.getTarget()));
+ }
+ if (UMLElementTypes.DurationObservationEvent_4019 == req.getElementType()) {
+ return getGEFWrapper(new ConnectorDurationObservationCreateCommand(req, req.getSource(), req.getTarget()));
+ }
return null;
}
@@ -423,6 +455,10 @@ public class CollaborationUseItemSemanticEditPolicyCN extends UMLBaseItemSemanti
return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));
case ConstraintConstrainedElementEditPart.VISUAL_ID:
return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));
+ case ConnectorTimeObservationEditPart.VISUAL_ID:
+ return getGEFWrapper(new ConnectorTimeObservationReorientCommand(req));
+ case ConnectorDurationObservationEditPart.VISUAL_ID:
+ return getGEFWrapper(new ConnectorDurationObservationReorientCommand(req));
}
return super.getReorientReferenceRelationshipCommand(req);
}
diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/ComponentCompositeItemSemanticEditPolicy.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/ComponentCompositeItemSemanticEditPolicy.java
index 254cc9e27bb..38aed607747 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/ComponentCompositeItemSemanticEditPolicy.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/ComponentCompositeItemSemanticEditPolicy.java
@@ -37,6 +37,10 @@ import org.eclipse.papyrus.diagram.composite.edit.commands.CommentAnnotatedEleme
import org.eclipse.papyrus.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ComponentRealizationCreateCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ComponentRealizationReorientCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorDurationObservationCreateCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorDurationObservationReorientCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorTimeObservationCreateCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorTimeObservationReorientCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.DependencyCreateCommand;
@@ -72,6 +76,8 @@ import org.eclipse.papyrus.diagram.composite.edit.parts.CommentEditPartCN;
import org.eclipse.papyrus.diagram.composite.edit.parts.ComponentCompositeCompartmentEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.ComponentCompositeEditPartCN;
import org.eclipse.papyrus.diagram.composite.edit.parts.ComponentRealizationEditPart;
+import org.eclipse.papyrus.diagram.composite.edit.parts.ConnectorDurationObservationEditPart;
+import org.eclipse.papyrus.diagram.composite.edit.parts.ConnectorTimeObservationEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.DataTypeEditPartCN;
import org.eclipse.papyrus.diagram.composite.edit.parts.DependencyEditPart;
@@ -221,6 +227,20 @@ public class ComponentCompositeItemSemanticEditPolicy extends UMLBaseItemSemanti
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null,
+ incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null,
+ incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = view.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -407,6 +427,20 @@ public class ComponentCompositeItemSemanticEditPolicy extends UMLBaseItemSemanti
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource().getElement(),
+ null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource().getElement(),
+ null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = node.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -584,6 +618,20 @@ public class ComponentCompositeItemSemanticEditPolicy extends UMLBaseItemSemanti
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -757,6 +805,20 @@ public class ComponentCompositeItemSemanticEditPolicy extends UMLBaseItemSemanti
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -930,6 +992,20 @@ public class ComponentCompositeItemSemanticEditPolicy extends UMLBaseItemSemanti
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -1103,6 +1179,20 @@ public class ComponentCompositeItemSemanticEditPolicy extends UMLBaseItemSemanti
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -1276,6 +1366,20 @@ public class ComponentCompositeItemSemanticEditPolicy extends UMLBaseItemSemanti
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -1449,6 +1553,20 @@ public class ComponentCompositeItemSemanticEditPolicy extends UMLBaseItemSemanti
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -1622,6 +1740,20 @@ public class ComponentCompositeItemSemanticEditPolicy extends UMLBaseItemSemanti
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -1795,6 +1927,20 @@ public class ComponentCompositeItemSemanticEditPolicy extends UMLBaseItemSemanti
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -1968,6 +2114,20 @@ public class ComponentCompositeItemSemanticEditPolicy extends UMLBaseItemSemanti
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -2141,6 +2301,20 @@ public class ComponentCompositeItemSemanticEditPolicy extends UMLBaseItemSemanti
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -2314,6 +2488,20 @@ public class ComponentCompositeItemSemanticEditPolicy extends UMLBaseItemSemanti
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -2487,6 +2675,20 @@ public class ComponentCompositeItemSemanticEditPolicy extends UMLBaseItemSemanti
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -2660,6 +2862,20 @@ public class ComponentCompositeItemSemanticEditPolicy extends UMLBaseItemSemanti
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -2833,6 +3049,20 @@ public class ComponentCompositeItemSemanticEditPolicy extends UMLBaseItemSemanti
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -3006,6 +3236,20 @@ public class ComponentCompositeItemSemanticEditPolicy extends UMLBaseItemSemanti
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -3179,6 +3423,20 @@ public class ComponentCompositeItemSemanticEditPolicy extends UMLBaseItemSemanti
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -3352,6 +3610,20 @@ public class ComponentCompositeItemSemanticEditPolicy extends UMLBaseItemSemanti
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -3525,6 +3797,20 @@ public class ComponentCompositeItemSemanticEditPolicy extends UMLBaseItemSemanti
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -3698,6 +3984,20 @@ public class ComponentCompositeItemSemanticEditPolicy extends UMLBaseItemSemanti
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -3871,6 +4171,20 @@ public class ComponentCompositeItemSemanticEditPolicy extends UMLBaseItemSemanti
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -4044,6 +4358,20 @@ public class ComponentCompositeItemSemanticEditPolicy extends UMLBaseItemSemanti
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -4217,6 +4545,20 @@ public class ComponentCompositeItemSemanticEditPolicy extends UMLBaseItemSemanti
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -4390,6 +4732,20 @@ public class ComponentCompositeItemSemanticEditPolicy extends UMLBaseItemSemanti
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -4563,6 +4919,20 @@ public class ComponentCompositeItemSemanticEditPolicy extends UMLBaseItemSemanti
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -4769,6 +5139,12 @@ public class ComponentCompositeItemSemanticEditPolicy extends UMLBaseItemSemanti
if (UMLElementTypes.InformationFlow_4016 == req.getElementType()) {
return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));
}
+ if (UMLElementTypes.TimeObservationEvent_4018 == req.getElementType()) {
+ return null;
+ }
+ if (UMLElementTypes.DurationObservationEvent_4019 == req.getElementType()) {
+ return null;
+ }
return null;
}
@@ -4818,6 +5194,12 @@ public class ComponentCompositeItemSemanticEditPolicy extends UMLBaseItemSemanti
if (UMLElementTypes.InformationFlow_4016 == req.getElementType()) {
return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));
}
+ if (UMLElementTypes.TimeObservationEvent_4018 == req.getElementType()) {
+ return getGEFWrapper(new ConnectorTimeObservationCreateCommand(req, req.getSource(), req.getTarget()));
+ }
+ if (UMLElementTypes.DurationObservationEvent_4019 == req.getElementType()) {
+ return getGEFWrapper(new ConnectorDurationObservationCreateCommand(req, req.getSource(), req.getTarget()));
+ }
return null;
}
@@ -4869,6 +5251,10 @@ public class ComponentCompositeItemSemanticEditPolicy extends UMLBaseItemSemanti
return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));
case ConstraintConstrainedElementEditPart.VISUAL_ID:
return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));
+ case ConnectorTimeObservationEditPart.VISUAL_ID:
+ return getGEFWrapper(new ConnectorTimeObservationReorientCommand(req));
+ case ConnectorDurationObservationEditPart.VISUAL_ID:
+ return getGEFWrapper(new ConnectorDurationObservationReorientCommand(req));
}
return super.getReorientReferenceRelationshipCommand(req);
}
diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/ComponentCompositeItemSemanticEditPolicyCN.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/ComponentCompositeItemSemanticEditPolicyCN.java
index f1451ac54fe..d398c405022 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/ComponentCompositeItemSemanticEditPolicyCN.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/ComponentCompositeItemSemanticEditPolicyCN.java
@@ -37,6 +37,10 @@ import org.eclipse.papyrus.diagram.composite.edit.commands.CommentAnnotatedEleme
import org.eclipse.papyrus.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ComponentRealizationCreateCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ComponentRealizationReorientCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorDurationObservationCreateCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorDurationObservationReorientCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorTimeObservationCreateCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorTimeObservationReorientCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.DependencyCreateCommand;
@@ -72,6 +76,8 @@ import org.eclipse.papyrus.diagram.composite.edit.parts.CommentEditPartCN;
import org.eclipse.papyrus.diagram.composite.edit.parts.ComponentCompositeCompartmentEditPartCN;
import org.eclipse.papyrus.diagram.composite.edit.parts.ComponentCompositeEditPartCN;
import org.eclipse.papyrus.diagram.composite.edit.parts.ComponentRealizationEditPart;
+import org.eclipse.papyrus.diagram.composite.edit.parts.ConnectorDurationObservationEditPart;
+import org.eclipse.papyrus.diagram.composite.edit.parts.ConnectorTimeObservationEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.DataTypeEditPartCN;
import org.eclipse.papyrus.diagram.composite.edit.parts.DependencyEditPart;
@@ -221,6 +227,20 @@ public class ComponentCompositeItemSemanticEditPolicyCN extends UMLBaseItemSeman
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null,
+ incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null,
+ incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = view.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -407,6 +427,20 @@ public class ComponentCompositeItemSemanticEditPolicyCN extends UMLBaseItemSeman
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource().getElement(),
+ null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource().getElement(),
+ null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = node.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -584,6 +618,20 @@ public class ComponentCompositeItemSemanticEditPolicyCN extends UMLBaseItemSeman
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -757,6 +805,20 @@ public class ComponentCompositeItemSemanticEditPolicyCN extends UMLBaseItemSeman
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -930,6 +992,20 @@ public class ComponentCompositeItemSemanticEditPolicyCN extends UMLBaseItemSeman
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -1103,6 +1179,20 @@ public class ComponentCompositeItemSemanticEditPolicyCN extends UMLBaseItemSeman
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -1276,6 +1366,20 @@ public class ComponentCompositeItemSemanticEditPolicyCN extends UMLBaseItemSeman
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -1449,6 +1553,20 @@ public class ComponentCompositeItemSemanticEditPolicyCN extends UMLBaseItemSeman
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -1622,6 +1740,20 @@ public class ComponentCompositeItemSemanticEditPolicyCN extends UMLBaseItemSeman
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -1795,6 +1927,20 @@ public class ComponentCompositeItemSemanticEditPolicyCN extends UMLBaseItemSeman
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -1968,6 +2114,20 @@ public class ComponentCompositeItemSemanticEditPolicyCN extends UMLBaseItemSeman
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -2141,6 +2301,20 @@ public class ComponentCompositeItemSemanticEditPolicyCN extends UMLBaseItemSeman
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -2314,6 +2488,20 @@ public class ComponentCompositeItemSemanticEditPolicyCN extends UMLBaseItemSeman
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -2487,6 +2675,20 @@ public class ComponentCompositeItemSemanticEditPolicyCN extends UMLBaseItemSeman
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -2660,6 +2862,20 @@ public class ComponentCompositeItemSemanticEditPolicyCN extends UMLBaseItemSeman
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -2833,6 +3049,20 @@ public class ComponentCompositeItemSemanticEditPolicyCN extends UMLBaseItemSeman
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -3006,6 +3236,20 @@ public class ComponentCompositeItemSemanticEditPolicyCN extends UMLBaseItemSeman
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -3179,6 +3423,20 @@ public class ComponentCompositeItemSemanticEditPolicyCN extends UMLBaseItemSeman
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -3352,6 +3610,20 @@ public class ComponentCompositeItemSemanticEditPolicyCN extends UMLBaseItemSeman
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -3525,6 +3797,20 @@ public class ComponentCompositeItemSemanticEditPolicyCN extends UMLBaseItemSeman
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -3698,6 +3984,20 @@ public class ComponentCompositeItemSemanticEditPolicyCN extends UMLBaseItemSeman
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -3871,6 +4171,20 @@ public class ComponentCompositeItemSemanticEditPolicyCN extends UMLBaseItemSeman
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -4044,6 +4358,20 @@ public class ComponentCompositeItemSemanticEditPolicyCN extends UMLBaseItemSeman
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -4217,6 +4545,20 @@ public class ComponentCompositeItemSemanticEditPolicyCN extends UMLBaseItemSeman
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -4390,6 +4732,20 @@ public class ComponentCompositeItemSemanticEditPolicyCN extends UMLBaseItemSeman
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -4563,6 +4919,20 @@ public class ComponentCompositeItemSemanticEditPolicyCN extends UMLBaseItemSeman
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -4769,6 +5139,12 @@ public class ComponentCompositeItemSemanticEditPolicyCN extends UMLBaseItemSeman
if (UMLElementTypes.InformationFlow_4016 == req.getElementType()) {
return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));
}
+ if (UMLElementTypes.TimeObservationEvent_4018 == req.getElementType()) {
+ return null;
+ }
+ if (UMLElementTypes.DurationObservationEvent_4019 == req.getElementType()) {
+ return null;
+ }
return null;
}
@@ -4818,6 +5194,12 @@ public class ComponentCompositeItemSemanticEditPolicyCN extends UMLBaseItemSeman
if (UMLElementTypes.InformationFlow_4016 == req.getElementType()) {
return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));
}
+ if (UMLElementTypes.TimeObservationEvent_4018 == req.getElementType()) {
+ return getGEFWrapper(new ConnectorTimeObservationCreateCommand(req, req.getSource(), req.getTarget()));
+ }
+ if (UMLElementTypes.DurationObservationEvent_4019 == req.getElementType()) {
+ return getGEFWrapper(new ConnectorDurationObservationCreateCommand(req, req.getSource(), req.getTarget()));
+ }
return null;
}
@@ -4869,6 +5251,10 @@ public class ComponentCompositeItemSemanticEditPolicyCN extends UMLBaseItemSeman
return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));
case ConstraintConstrainedElementEditPart.VISUAL_ID:
return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));
+ case ConnectorTimeObservationEditPart.VISUAL_ID:
+ return getGEFWrapper(new ConnectorTimeObservationReorientCommand(req));
+ case ConnectorDurationObservationEditPart.VISUAL_ID:
+ return getGEFWrapper(new ConnectorDurationObservationReorientCommand(req));
}
return super.getReorientReferenceRelationshipCommand(req);
}
diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/ComponentRealizationItemSemanticEditPolicy.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/ComponentRealizationItemSemanticEditPolicy.java
index 8182fb9be36..192f52b5421 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/ComponentRealizationItemSemanticEditPolicy.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/ComponentRealizationItemSemanticEditPolicy.java
@@ -25,6 +25,10 @@ import org.eclipse.papyrus.diagram.composite.edit.commands.CommentAnnotatedEleme
import org.eclipse.papyrus.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ComponentRealizationCreateCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ComponentRealizationReorientCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorDurationObservationCreateCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorDurationObservationReorientCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorTimeObservationCreateCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorTimeObservationReorientCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.DependencyCreateCommand;
@@ -50,6 +54,8 @@ import org.eclipse.papyrus.diagram.composite.edit.commands.UsageReorientCommand;
import org.eclipse.papyrus.diagram.composite.edit.parts.AbstractionEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.ComponentRealizationEditPart;
+import org.eclipse.papyrus.diagram.composite.edit.parts.ConnectorDurationObservationEditPart;
+import org.eclipse.papyrus.diagram.composite.edit.parts.ConnectorTimeObservationEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.DependencyEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.DeploymentEditPart;
@@ -137,6 +143,12 @@ public class ComponentRealizationItemSemanticEditPolicy extends UMLBaseItemSeman
if (UMLElementTypes.InformationFlow_4016 == req.getElementType()) {
return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));
}
+ if (UMLElementTypes.TimeObservationEvent_4018 == req.getElementType()) {
+ return null;
+ }
+ if (UMLElementTypes.DurationObservationEvent_4019 == req.getElementType()) {
+ return null;
+ }
return null;
}
@@ -186,6 +198,12 @@ public class ComponentRealizationItemSemanticEditPolicy extends UMLBaseItemSeman
if (UMLElementTypes.InformationFlow_4016 == req.getElementType()) {
return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));
}
+ if (UMLElementTypes.TimeObservationEvent_4018 == req.getElementType()) {
+ return getGEFWrapper(new ConnectorTimeObservationCreateCommand(req, req.getSource(), req.getTarget()));
+ }
+ if (UMLElementTypes.DurationObservationEvent_4019 == req.getElementType()) {
+ return getGEFWrapper(new ConnectorDurationObservationCreateCommand(req, req.getSource(), req.getTarget()));
+ }
return null;
}
@@ -237,6 +255,10 @@ public class ComponentRealizationItemSemanticEditPolicy extends UMLBaseItemSeman
return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));
case ConstraintConstrainedElementEditPart.VISUAL_ID:
return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));
+ case ConnectorTimeObservationEditPart.VISUAL_ID:
+ return getGEFWrapper(new ConnectorTimeObservationReorientCommand(req));
+ case ConnectorDurationObservationEditPart.VISUAL_ID:
+ return getGEFWrapper(new ConnectorDurationObservationReorientCommand(req));
}
return super.getReorientReferenceRelationshipCommand(req);
}
diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/ConnectorDurationObservationItemSemanticEditPolicy.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/ConnectorDurationObservationItemSemanticEditPolicy.java
new file mode 100644
index 00000000000..cb9975f1412
--- /dev/null
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/ConnectorDurationObservationItemSemanticEditPolicy.java
@@ -0,0 +1,40 @@
+/*****************************************************************************
+ * Copyright (c) 2009 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
+ *
+ * Contributors:
+ * Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.diagram.composite.edit.policies;
+
+import org.eclipse.gef.commands.Command;
+import org.eclipse.gmf.runtime.emf.type.core.commands.DestroyReferenceCommand;
+import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyReferenceRequest;
+import org.eclipse.papyrus.diagram.composite.providers.UMLElementTypes;
+
+/**
+ * @generated
+ */
+public class ConnectorDurationObservationItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {
+
+ /**
+ * @generated
+ */
+ public ConnectorDurationObservationItemSemanticEditPolicy() {
+ super(UMLElementTypes.DurationObservationEvent_4019);
+ }
+
+ /**
+ * @generated
+ */
+ protected Command getDestroyReferenceCommand(DestroyReferenceRequest req) {
+ return getGEFWrapper(new DestroyReferenceCommand(req));
+ }
+
+}
diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/ConnectorItemSemanticEditPolicy.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/ConnectorItemSemanticEditPolicy.java
index 3c712885051..3592d0030e6 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/ConnectorItemSemanticEditPolicy.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/ConnectorItemSemanticEditPolicy.java
@@ -25,6 +25,10 @@ import org.eclipse.papyrus.diagram.composite.edit.commands.CommentAnnotatedEleme
import org.eclipse.papyrus.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ComponentRealizationCreateCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ComponentRealizationReorientCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorDurationObservationCreateCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorDurationObservationReorientCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorTimeObservationCreateCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorTimeObservationReorientCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.DependencyCreateCommand;
@@ -50,6 +54,8 @@ import org.eclipse.papyrus.diagram.composite.edit.commands.UsageReorientCommand;
import org.eclipse.papyrus.diagram.composite.edit.parts.AbstractionEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.ComponentRealizationEditPart;
+import org.eclipse.papyrus.diagram.composite.edit.parts.ConnectorDurationObservationEditPart;
+import org.eclipse.papyrus.diagram.composite.edit.parts.ConnectorTimeObservationEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.DependencyEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.DeploymentEditPart;
@@ -137,6 +143,12 @@ public class ConnectorItemSemanticEditPolicy extends UMLBaseItemSemanticEditPoli
if (UMLElementTypes.InformationFlow_4016 == req.getElementType()) {
return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));
}
+ if (UMLElementTypes.TimeObservationEvent_4018 == req.getElementType()) {
+ return null;
+ }
+ if (UMLElementTypes.DurationObservationEvent_4019 == req.getElementType()) {
+ return null;
+ }
return null;
}
@@ -186,6 +198,12 @@ public class ConnectorItemSemanticEditPolicy extends UMLBaseItemSemanticEditPoli
if (UMLElementTypes.InformationFlow_4016 == req.getElementType()) {
return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));
}
+ if (UMLElementTypes.TimeObservationEvent_4018 == req.getElementType()) {
+ return getGEFWrapper(new ConnectorTimeObservationCreateCommand(req, req.getSource(), req.getTarget()));
+ }
+ if (UMLElementTypes.DurationObservationEvent_4019 == req.getElementType()) {
+ return getGEFWrapper(new ConnectorDurationObservationCreateCommand(req, req.getSource(), req.getTarget()));
+ }
return null;
}
@@ -237,6 +255,10 @@ public class ConnectorItemSemanticEditPolicy extends UMLBaseItemSemanticEditPoli
return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));
case ConstraintConstrainedElementEditPart.VISUAL_ID:
return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));
+ case ConnectorTimeObservationEditPart.VISUAL_ID:
+ return getGEFWrapper(new ConnectorTimeObservationReorientCommand(req));
+ case ConnectorDurationObservationEditPart.VISUAL_ID:
+ return getGEFWrapper(new ConnectorDurationObservationReorientCommand(req));
}
return super.getReorientReferenceRelationshipCommand(req);
}
diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/ConnectorTimeObservationItemSemanticEditPolicy.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/ConnectorTimeObservationItemSemanticEditPolicy.java
new file mode 100644
index 00000000000..521f50d1dbb
--- /dev/null
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/ConnectorTimeObservationItemSemanticEditPolicy.java
@@ -0,0 +1,40 @@
+/*****************************************************************************
+ * Copyright (c) 2009 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
+ *
+ * Contributors:
+ * Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.diagram.composite.edit.policies;
+
+import org.eclipse.gef.commands.Command;
+import org.eclipse.gmf.runtime.emf.type.core.commands.DestroyReferenceCommand;
+import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyReferenceRequest;
+import org.eclipse.papyrus.diagram.composite.providers.UMLElementTypes;
+
+/**
+ * @generated
+ */
+public class ConnectorTimeObservationItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {
+
+ /**
+ * @generated
+ */
+ public ConnectorTimeObservationItemSemanticEditPolicy() {
+ super(UMLElementTypes.TimeObservationEvent_4018);
+ }
+
+ /**
+ * @generated
+ */
+ protected Command getDestroyReferenceCommand(DestroyReferenceRequest req) {
+ return getGEFWrapper(new DestroyReferenceCommand(req));
+ }
+
+}
diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/ConstraintItemSemanticEditPolicy.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/ConstraintItemSemanticEditPolicy.java
index 381ce27015f..e134c07701b 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/ConstraintItemSemanticEditPolicy.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/ConstraintItemSemanticEditPolicy.java
@@ -34,6 +34,10 @@ import org.eclipse.papyrus.diagram.composite.edit.commands.CommentAnnotatedEleme
import org.eclipse.papyrus.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ComponentRealizationCreateCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ComponentRealizationReorientCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorDurationObservationCreateCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorDurationObservationReorientCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorTimeObservationCreateCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorTimeObservationReorientCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.DependencyCreateCommand;
@@ -59,6 +63,8 @@ import org.eclipse.papyrus.diagram.composite.edit.commands.UsageReorientCommand;
import org.eclipse.papyrus.diagram.composite.edit.parts.AbstractionEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.ComponentRealizationEditPart;
+import org.eclipse.papyrus.diagram.composite.edit.parts.ConnectorDurationObservationEditPart;
+import org.eclipse.papyrus.diagram.composite.edit.parts.ConnectorTimeObservationEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.DependencyEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.DeploymentEditPart;
@@ -180,6 +186,20 @@ public class ConstraintItemSemanticEditPolicy extends UMLBaseItemSemanticEditPol
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null,
+ incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null,
+ incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = view.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -330,6 +350,12 @@ public class ConstraintItemSemanticEditPolicy extends UMLBaseItemSemanticEditPol
if (UMLElementTypes.InformationFlow_4016 == req.getElementType()) {
return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));
}
+ if (UMLElementTypes.TimeObservationEvent_4018 == req.getElementType()) {
+ return null;
+ }
+ if (UMLElementTypes.DurationObservationEvent_4019 == req.getElementType()) {
+ return null;
+ }
return null;
}
@@ -379,6 +405,12 @@ public class ConstraintItemSemanticEditPolicy extends UMLBaseItemSemanticEditPol
if (UMLElementTypes.InformationFlow_4016 == req.getElementType()) {
return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));
}
+ if (UMLElementTypes.TimeObservationEvent_4018 == req.getElementType()) {
+ return getGEFWrapper(new ConnectorTimeObservationCreateCommand(req, req.getSource(), req.getTarget()));
+ }
+ if (UMLElementTypes.DurationObservationEvent_4019 == req.getElementType()) {
+ return getGEFWrapper(new ConnectorDurationObservationCreateCommand(req, req.getSource(), req.getTarget()));
+ }
return null;
}
@@ -430,6 +462,10 @@ public class ConstraintItemSemanticEditPolicy extends UMLBaseItemSemanticEditPol
return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));
case ConstraintConstrainedElementEditPart.VISUAL_ID:
return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));
+ case ConnectorTimeObservationEditPart.VISUAL_ID:
+ return getGEFWrapper(new ConnectorTimeObservationReorientCommand(req));
+ case ConnectorDurationObservationEditPart.VISUAL_ID:
+ return getGEFWrapper(new ConnectorDurationObservationReorientCommand(req));
}
return super.getReorientReferenceRelationshipCommand(req);
}
diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/CreationEventItemSemanticEditPolicy.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/CreationEventItemSemanticEditPolicy.java
index 85104063c00..b6bc1ac606c 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/CreationEventItemSemanticEditPolicy.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/CreationEventItemSemanticEditPolicy.java
@@ -34,6 +34,10 @@ import org.eclipse.papyrus.diagram.composite.edit.commands.CommentAnnotatedEleme
import org.eclipse.papyrus.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ComponentRealizationCreateCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ComponentRealizationReorientCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorDurationObservationCreateCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorDurationObservationReorientCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorTimeObservationCreateCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorTimeObservationReorientCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.DependencyCreateCommand;
@@ -59,6 +63,8 @@ import org.eclipse.papyrus.diagram.composite.edit.commands.UsageReorientCommand;
import org.eclipse.papyrus.diagram.composite.edit.parts.AbstractionEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.ComponentRealizationEditPart;
+import org.eclipse.papyrus.diagram.composite.edit.parts.ConnectorDurationObservationEditPart;
+import org.eclipse.papyrus.diagram.composite.edit.parts.ConnectorTimeObservationEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.DependencyEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.DeploymentEditPart;
@@ -180,6 +186,20 @@ public class CreationEventItemSemanticEditPolicy extends UMLBaseItemSemanticEdit
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null,
+ incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null,
+ incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = view.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -323,6 +343,12 @@ public class CreationEventItemSemanticEditPolicy extends UMLBaseItemSemanticEdit
if (UMLElementTypes.InformationFlow_4016 == req.getElementType()) {
return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));
}
+ if (UMLElementTypes.TimeObservationEvent_4018 == req.getElementType()) {
+ return null;
+ }
+ if (UMLElementTypes.DurationObservationEvent_4019 == req.getElementType()) {
+ return null;
+ }
return null;
}
@@ -372,6 +398,12 @@ public class CreationEventItemSemanticEditPolicy extends UMLBaseItemSemanticEdit
if (UMLElementTypes.InformationFlow_4016 == req.getElementType()) {
return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));
}
+ if (UMLElementTypes.TimeObservationEvent_4018 == req.getElementType()) {
+ return getGEFWrapper(new ConnectorTimeObservationCreateCommand(req, req.getSource(), req.getTarget()));
+ }
+ if (UMLElementTypes.DurationObservationEvent_4019 == req.getElementType()) {
+ return getGEFWrapper(new ConnectorDurationObservationCreateCommand(req, req.getSource(), req.getTarget()));
+ }
return null;
}
@@ -423,6 +455,10 @@ public class CreationEventItemSemanticEditPolicy extends UMLBaseItemSemanticEdit
return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));
case ConstraintConstrainedElementEditPart.VISUAL_ID:
return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));
+ case ConnectorTimeObservationEditPart.VISUAL_ID:
+ return getGEFWrapper(new ConnectorTimeObservationReorientCommand(req));
+ case ConnectorDurationObservationEditPart.VISUAL_ID:
+ return getGEFWrapper(new ConnectorDurationObservationReorientCommand(req));
}
return super.getReorientReferenceRelationshipCommand(req);
}
diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/DataTypeItemSemanticEditPolicy.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/DataTypeItemSemanticEditPolicy.java
index ea02ba9b154..a58b2eeb39d 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/DataTypeItemSemanticEditPolicy.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/DataTypeItemSemanticEditPolicy.java
@@ -36,6 +36,10 @@ import org.eclipse.papyrus.diagram.composite.edit.commands.CommentAnnotatedEleme
import org.eclipse.papyrus.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ComponentRealizationCreateCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ComponentRealizationReorientCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorDurationObservationCreateCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorDurationObservationReorientCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorTimeObservationCreateCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorTimeObservationReorientCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.DependencyCreateCommand;
@@ -61,6 +65,8 @@ import org.eclipse.papyrus.diagram.composite.edit.commands.UsageReorientCommand;
import org.eclipse.papyrus.diagram.composite.edit.parts.AbstractionEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.ComponentRealizationEditPart;
+import org.eclipse.papyrus.diagram.composite.edit.parts.ConnectorDurationObservationEditPart;
+import org.eclipse.papyrus.diagram.composite.edit.parts.ConnectorTimeObservationEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.DataTypeAttributeCompartmentEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.DataTypeOperationCompartmentEditPart;
@@ -186,6 +192,20 @@ public class DataTypeItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolic
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null,
+ incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null,
+ incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = view.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -374,6 +394,12 @@ public class DataTypeItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolic
if (UMLElementTypes.InformationFlow_4016 == req.getElementType()) {
return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));
}
+ if (UMLElementTypes.TimeObservationEvent_4018 == req.getElementType()) {
+ return null;
+ }
+ if (UMLElementTypes.DurationObservationEvent_4019 == req.getElementType()) {
+ return null;
+ }
return null;
}
@@ -423,6 +449,12 @@ public class DataTypeItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolic
if (UMLElementTypes.InformationFlow_4016 == req.getElementType()) {
return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));
}
+ if (UMLElementTypes.TimeObservationEvent_4018 == req.getElementType()) {
+ return getGEFWrapper(new ConnectorTimeObservationCreateCommand(req, req.getSource(), req.getTarget()));
+ }
+ if (UMLElementTypes.DurationObservationEvent_4019 == req.getElementType()) {
+ return getGEFWrapper(new ConnectorDurationObservationCreateCommand(req, req.getSource(), req.getTarget()));
+ }
return null;
}
@@ -474,6 +506,10 @@ public class DataTypeItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolic
return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));
case ConstraintConstrainedElementEditPart.VISUAL_ID:
return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));
+ case ConnectorTimeObservationEditPart.VISUAL_ID:
+ return getGEFWrapper(new ConnectorTimeObservationReorientCommand(req));
+ case ConnectorDurationObservationEditPart.VISUAL_ID:
+ return getGEFWrapper(new ConnectorDurationObservationReorientCommand(req));
}
return super.getReorientReferenceRelationshipCommand(req);
}
diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/DataTypeItemSemanticEditPolicyCN.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/DataTypeItemSemanticEditPolicyCN.java
index 8afed24f189..a43142d495a 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/DataTypeItemSemanticEditPolicyCN.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/DataTypeItemSemanticEditPolicyCN.java
@@ -36,6 +36,10 @@ import org.eclipse.papyrus.diagram.composite.edit.commands.CommentAnnotatedEleme
import org.eclipse.papyrus.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ComponentRealizationCreateCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ComponentRealizationReorientCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorDurationObservationCreateCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorDurationObservationReorientCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorTimeObservationCreateCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorTimeObservationReorientCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.DependencyCreateCommand;
@@ -61,6 +65,8 @@ import org.eclipse.papyrus.diagram.composite.edit.commands.UsageReorientCommand;
import org.eclipse.papyrus.diagram.composite.edit.parts.AbstractionEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.ComponentRealizationEditPart;
+import org.eclipse.papyrus.diagram.composite.edit.parts.ConnectorDurationObservationEditPart;
+import org.eclipse.papyrus.diagram.composite.edit.parts.ConnectorTimeObservationEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.DataTypeAttributeCompartmentEditPartCN;
import org.eclipse.papyrus.diagram.composite.edit.parts.DataTypeOperationCompartmentEditPartCN;
@@ -186,6 +192,20 @@ public class DataTypeItemSemanticEditPolicyCN extends UMLBaseItemSemanticEditPol
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null,
+ incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null,
+ incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = view.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -374,6 +394,12 @@ public class DataTypeItemSemanticEditPolicyCN extends UMLBaseItemSemanticEditPol
if (UMLElementTypes.InformationFlow_4016 == req.getElementType()) {
return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));
}
+ if (UMLElementTypes.TimeObservationEvent_4018 == req.getElementType()) {
+ return null;
+ }
+ if (UMLElementTypes.DurationObservationEvent_4019 == req.getElementType()) {
+ return null;
+ }
return null;
}
@@ -423,6 +449,12 @@ public class DataTypeItemSemanticEditPolicyCN extends UMLBaseItemSemanticEditPol
if (UMLElementTypes.InformationFlow_4016 == req.getElementType()) {
return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));
}
+ if (UMLElementTypes.TimeObservationEvent_4018 == req.getElementType()) {
+ return getGEFWrapper(new ConnectorTimeObservationCreateCommand(req, req.getSource(), req.getTarget()));
+ }
+ if (UMLElementTypes.DurationObservationEvent_4019 == req.getElementType()) {
+ return getGEFWrapper(new ConnectorDurationObservationCreateCommand(req, req.getSource(), req.getTarget()));
+ }
return null;
}
@@ -474,6 +506,10 @@ public class DataTypeItemSemanticEditPolicyCN extends UMLBaseItemSemanticEditPol
return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));
case ConstraintConstrainedElementEditPart.VISUAL_ID:
return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));
+ case ConnectorTimeObservationEditPart.VISUAL_ID:
+ return getGEFWrapper(new ConnectorTimeObservationReorientCommand(req));
+ case ConnectorDurationObservationEditPart.VISUAL_ID:
+ return getGEFWrapper(new ConnectorDurationObservationReorientCommand(req));
}
return super.getReorientReferenceRelationshipCommand(req);
}
diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/DependencyItemSemanticEditPolicy.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/DependencyItemSemanticEditPolicy.java
index 183d5083947..48f5608a537 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/DependencyItemSemanticEditPolicy.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/DependencyItemSemanticEditPolicy.java
@@ -25,6 +25,10 @@ import org.eclipse.papyrus.diagram.composite.edit.commands.CommentAnnotatedEleme
import org.eclipse.papyrus.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ComponentRealizationCreateCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ComponentRealizationReorientCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorDurationObservationCreateCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorDurationObservationReorientCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorTimeObservationCreateCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorTimeObservationReorientCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.DependencyCreateCommand;
@@ -50,6 +54,8 @@ import org.eclipse.papyrus.diagram.composite.edit.commands.UsageReorientCommand;
import org.eclipse.papyrus.diagram.composite.edit.parts.AbstractionEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.ComponentRealizationEditPart;
+import org.eclipse.papyrus.diagram.composite.edit.parts.ConnectorDurationObservationEditPart;
+import org.eclipse.papyrus.diagram.composite.edit.parts.ConnectorTimeObservationEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.DependencyEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.DeploymentEditPart;
@@ -137,6 +143,12 @@ public class DependencyItemSemanticEditPolicy extends UMLBaseItemSemanticEditPol
if (UMLElementTypes.InformationFlow_4016 == req.getElementType()) {
return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));
}
+ if (UMLElementTypes.TimeObservationEvent_4018 == req.getElementType()) {
+ return null;
+ }
+ if (UMLElementTypes.DurationObservationEvent_4019 == req.getElementType()) {
+ return null;
+ }
return null;
}
@@ -186,6 +198,12 @@ public class DependencyItemSemanticEditPolicy extends UMLBaseItemSemanticEditPol
if (UMLElementTypes.InformationFlow_4016 == req.getElementType()) {
return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));
}
+ if (UMLElementTypes.TimeObservationEvent_4018 == req.getElementType()) {
+ return getGEFWrapper(new ConnectorTimeObservationCreateCommand(req, req.getSource(), req.getTarget()));
+ }
+ if (UMLElementTypes.DurationObservationEvent_4019 == req.getElementType()) {
+ return getGEFWrapper(new ConnectorDurationObservationCreateCommand(req, req.getSource(), req.getTarget()));
+ }
return null;
}
@@ -237,6 +255,10 @@ public class DependencyItemSemanticEditPolicy extends UMLBaseItemSemanticEditPol
return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));
case ConstraintConstrainedElementEditPart.VISUAL_ID:
return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));
+ case ConnectorTimeObservationEditPart.VISUAL_ID:
+ return getGEFWrapper(new ConnectorTimeObservationReorientCommand(req));
+ case ConnectorDurationObservationEditPart.VISUAL_ID:
+ return getGEFWrapper(new ConnectorDurationObservationReorientCommand(req));
}
return super.getReorientReferenceRelationshipCommand(req);
}
diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/DeploymentItemSemanticEditPolicy.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/DeploymentItemSemanticEditPolicy.java
index 4b8c091fb2e..177344479ee 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/DeploymentItemSemanticEditPolicy.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/DeploymentItemSemanticEditPolicy.java
@@ -25,6 +25,10 @@ import org.eclipse.papyrus.diagram.composite.edit.commands.CommentAnnotatedEleme
import org.eclipse.papyrus.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ComponentRealizationCreateCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ComponentRealizationReorientCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorDurationObservationCreateCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorDurationObservationReorientCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorTimeObservationCreateCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorTimeObservationReorientCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.DependencyCreateCommand;
@@ -50,6 +54,8 @@ import org.eclipse.papyrus.diagram.composite.edit.commands.UsageReorientCommand;
import org.eclipse.papyrus.diagram.composite.edit.parts.AbstractionEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.ComponentRealizationEditPart;
+import org.eclipse.papyrus.diagram.composite.edit.parts.ConnectorDurationObservationEditPart;
+import org.eclipse.papyrus.diagram.composite.edit.parts.ConnectorTimeObservationEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.DependencyEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.DeploymentEditPart;
@@ -137,6 +143,12 @@ public class DeploymentItemSemanticEditPolicy extends UMLBaseItemSemanticEditPol
if (UMLElementTypes.InformationFlow_4016 == req.getElementType()) {
return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));
}
+ if (UMLElementTypes.TimeObservationEvent_4018 == req.getElementType()) {
+ return null;
+ }
+ if (UMLElementTypes.DurationObservationEvent_4019 == req.getElementType()) {
+ return null;
+ }
return null;
}
@@ -186,6 +198,12 @@ public class DeploymentItemSemanticEditPolicy extends UMLBaseItemSemanticEditPol
if (UMLElementTypes.InformationFlow_4016 == req.getElementType()) {
return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));
}
+ if (UMLElementTypes.TimeObservationEvent_4018 == req.getElementType()) {
+ return getGEFWrapper(new ConnectorTimeObservationCreateCommand(req, req.getSource(), req.getTarget()));
+ }
+ if (UMLElementTypes.DurationObservationEvent_4019 == req.getElementType()) {
+ return getGEFWrapper(new ConnectorDurationObservationCreateCommand(req, req.getSource(), req.getTarget()));
+ }
return null;
}
@@ -237,6 +255,10 @@ public class DeploymentItemSemanticEditPolicy extends UMLBaseItemSemanticEditPol
return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));
case ConstraintConstrainedElementEditPart.VISUAL_ID:
return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));
+ case ConnectorTimeObservationEditPart.VISUAL_ID:
+ return getGEFWrapper(new ConnectorTimeObservationReorientCommand(req));
+ case ConnectorDurationObservationEditPart.VISUAL_ID:
+ return getGEFWrapper(new ConnectorDurationObservationReorientCommand(req));
}
return super.getReorientReferenceRelationshipCommand(req);
}
diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/DeploymentSpecificationItemSemanticEditPolicy.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/DeploymentSpecificationItemSemanticEditPolicy.java
index facb96d3a76..26e90e24e6a 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/DeploymentSpecificationItemSemanticEditPolicy.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/DeploymentSpecificationItemSemanticEditPolicy.java
@@ -34,6 +34,10 @@ import org.eclipse.papyrus.diagram.composite.edit.commands.CommentAnnotatedEleme
import org.eclipse.papyrus.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ComponentRealizationCreateCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ComponentRealizationReorientCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorDurationObservationCreateCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorDurationObservationReorientCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorTimeObservationCreateCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorTimeObservationReorientCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.DependencyCreateCommand;
@@ -59,6 +63,8 @@ import org.eclipse.papyrus.diagram.composite.edit.commands.UsageReorientCommand;
import org.eclipse.papyrus.diagram.composite.edit.parts.AbstractionEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.ComponentRealizationEditPart;
+import org.eclipse.papyrus.diagram.composite.edit.parts.ConnectorDurationObservationEditPart;
+import org.eclipse.papyrus.diagram.composite.edit.parts.ConnectorTimeObservationEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.DependencyEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.DeploymentEditPart;
@@ -180,6 +186,20 @@ public class DeploymentSpecificationItemSemanticEditPolicy extends UMLBaseItemSe
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null,
+ incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null,
+ incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = view.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -323,6 +343,12 @@ public class DeploymentSpecificationItemSemanticEditPolicy extends UMLBaseItemSe
if (UMLElementTypes.InformationFlow_4016 == req.getElementType()) {
return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));
}
+ if (UMLElementTypes.TimeObservationEvent_4018 == req.getElementType()) {
+ return null;
+ }
+ if (UMLElementTypes.DurationObservationEvent_4019 == req.getElementType()) {
+ return null;
+ }
return null;
}
@@ -372,6 +398,12 @@ public class DeploymentSpecificationItemSemanticEditPolicy extends UMLBaseItemSe
if (UMLElementTypes.InformationFlow_4016 == req.getElementType()) {
return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));
}
+ if (UMLElementTypes.TimeObservationEvent_4018 == req.getElementType()) {
+ return getGEFWrapper(new ConnectorTimeObservationCreateCommand(req, req.getSource(), req.getTarget()));
+ }
+ if (UMLElementTypes.DurationObservationEvent_4019 == req.getElementType()) {
+ return getGEFWrapper(new ConnectorDurationObservationCreateCommand(req, req.getSource(), req.getTarget()));
+ }
return null;
}
@@ -423,6 +455,10 @@ public class DeploymentSpecificationItemSemanticEditPolicy extends UMLBaseItemSe
return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));
case ConstraintConstrainedElementEditPart.VISUAL_ID:
return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));
+ case ConnectorTimeObservationEditPart.VISUAL_ID:
+ return getGEFWrapper(new ConnectorTimeObservationReorientCommand(req));
+ case ConnectorDurationObservationEditPart.VISUAL_ID:
+ return getGEFWrapper(new ConnectorDurationObservationReorientCommand(req));
}
return super.getReorientReferenceRelationshipCommand(req);
}
diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/DeploymentSpecificationItemSemanticEditPolicyCN.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/DeploymentSpecificationItemSemanticEditPolicyCN.java
index 7b88ffe5798..505e0f379b3 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/DeploymentSpecificationItemSemanticEditPolicyCN.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/DeploymentSpecificationItemSemanticEditPolicyCN.java
@@ -34,6 +34,10 @@ import org.eclipse.papyrus.diagram.composite.edit.commands.CommentAnnotatedEleme
import org.eclipse.papyrus.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ComponentRealizationCreateCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ComponentRealizationReorientCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorDurationObservationCreateCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorDurationObservationReorientCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorTimeObservationCreateCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorTimeObservationReorientCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.DependencyCreateCommand;
@@ -59,6 +63,8 @@ import org.eclipse.papyrus.diagram.composite.edit.commands.UsageReorientCommand;
import org.eclipse.papyrus.diagram.composite.edit.parts.AbstractionEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.ComponentRealizationEditPart;
+import org.eclipse.papyrus.diagram.composite.edit.parts.ConnectorDurationObservationEditPart;
+import org.eclipse.papyrus.diagram.composite.edit.parts.ConnectorTimeObservationEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.DependencyEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.DeploymentEditPart;
@@ -180,6 +186,20 @@ public class DeploymentSpecificationItemSemanticEditPolicyCN extends UMLBaseItem
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null,
+ incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null,
+ incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = view.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -323,6 +343,12 @@ public class DeploymentSpecificationItemSemanticEditPolicyCN extends UMLBaseItem
if (UMLElementTypes.InformationFlow_4016 == req.getElementType()) {
return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));
}
+ if (UMLElementTypes.TimeObservationEvent_4018 == req.getElementType()) {
+ return null;
+ }
+ if (UMLElementTypes.DurationObservationEvent_4019 == req.getElementType()) {
+ return null;
+ }
return null;
}
@@ -372,6 +398,12 @@ public class DeploymentSpecificationItemSemanticEditPolicyCN extends UMLBaseItem
if (UMLElementTypes.InformationFlow_4016 == req.getElementType()) {
return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));
}
+ if (UMLElementTypes.TimeObservationEvent_4018 == req.getElementType()) {
+ return getGEFWrapper(new ConnectorTimeObservationCreateCommand(req, req.getSource(), req.getTarget()));
+ }
+ if (UMLElementTypes.DurationObservationEvent_4019 == req.getElementType()) {
+ return getGEFWrapper(new ConnectorDurationObservationCreateCommand(req, req.getSource(), req.getTarget()));
+ }
return null;
}
@@ -423,6 +455,10 @@ public class DeploymentSpecificationItemSemanticEditPolicyCN extends UMLBaseItem
return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));
case ConstraintConstrainedElementEditPart.VISUAL_ID:
return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));
+ case ConnectorTimeObservationEditPart.VISUAL_ID:
+ return getGEFWrapper(new ConnectorTimeObservationReorientCommand(req));
+ case ConnectorDurationObservationEditPart.VISUAL_ID:
+ return getGEFWrapper(new ConnectorDurationObservationReorientCommand(req));
}
return super.getReorientReferenceRelationshipCommand(req);
}
diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/DestructionEventItemSemanticEditPolicy.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/DestructionEventItemSemanticEditPolicy.java
index 0f13a387e9f..a4b6b8c2855 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/DestructionEventItemSemanticEditPolicy.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/DestructionEventItemSemanticEditPolicy.java
@@ -34,6 +34,10 @@ import org.eclipse.papyrus.diagram.composite.edit.commands.CommentAnnotatedEleme
import org.eclipse.papyrus.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ComponentRealizationCreateCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ComponentRealizationReorientCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorDurationObservationCreateCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorDurationObservationReorientCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorTimeObservationCreateCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorTimeObservationReorientCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.DependencyCreateCommand;
@@ -59,6 +63,8 @@ import org.eclipse.papyrus.diagram.composite.edit.commands.UsageReorientCommand;
import org.eclipse.papyrus.diagram.composite.edit.parts.AbstractionEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.ComponentRealizationEditPart;
+import org.eclipse.papyrus.diagram.composite.edit.parts.ConnectorDurationObservationEditPart;
+import org.eclipse.papyrus.diagram.composite.edit.parts.ConnectorTimeObservationEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.DependencyEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.DeploymentEditPart;
@@ -180,6 +186,20 @@ public class DestructionEventItemSemanticEditPolicy extends UMLBaseItemSemanticE
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null,
+ incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null,
+ incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = view.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -323,6 +343,12 @@ public class DestructionEventItemSemanticEditPolicy extends UMLBaseItemSemanticE
if (UMLElementTypes.InformationFlow_4016 == req.getElementType()) {
return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));
}
+ if (UMLElementTypes.TimeObservationEvent_4018 == req.getElementType()) {
+ return null;
+ }
+ if (UMLElementTypes.DurationObservationEvent_4019 == req.getElementType()) {
+ return null;
+ }
return null;
}
@@ -372,6 +398,12 @@ public class DestructionEventItemSemanticEditPolicy extends UMLBaseItemSemanticE
if (UMLElementTypes.InformationFlow_4016 == req.getElementType()) {
return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));
}
+ if (UMLElementTypes.TimeObservationEvent_4018 == req.getElementType()) {
+ return getGEFWrapper(new ConnectorTimeObservationCreateCommand(req, req.getSource(), req.getTarget()));
+ }
+ if (UMLElementTypes.DurationObservationEvent_4019 == req.getElementType()) {
+ return getGEFWrapper(new ConnectorDurationObservationCreateCommand(req, req.getSource(), req.getTarget()));
+ }
return null;
}
@@ -423,6 +455,10 @@ public class DestructionEventItemSemanticEditPolicy extends UMLBaseItemSemanticE
return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));
case ConstraintConstrainedElementEditPart.VISUAL_ID:
return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));
+ case ConnectorTimeObservationEditPart.VISUAL_ID:
+ return getGEFWrapper(new ConnectorTimeObservationReorientCommand(req));
+ case ConnectorDurationObservationEditPart.VISUAL_ID:
+ return getGEFWrapper(new ConnectorDurationObservationReorientCommand(req));
}
return super.getReorientReferenceRelationshipCommand(req);
}
diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/DeviceCompositeItemSemanticEditPolicy.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/DeviceCompositeItemSemanticEditPolicy.java
index 87eeb91cf98..fed450724c9 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/DeviceCompositeItemSemanticEditPolicy.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/DeviceCompositeItemSemanticEditPolicy.java
@@ -37,6 +37,10 @@ import org.eclipse.papyrus.diagram.composite.edit.commands.CommentAnnotatedEleme
import org.eclipse.papyrus.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ComponentRealizationCreateCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ComponentRealizationReorientCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorDurationObservationCreateCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorDurationObservationReorientCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorTimeObservationCreateCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorTimeObservationReorientCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.DependencyCreateCommand;
@@ -71,6 +75,8 @@ import org.eclipse.papyrus.diagram.composite.edit.parts.CommentAnnotatedElementE
import org.eclipse.papyrus.diagram.composite.edit.parts.CommentEditPartCN;
import org.eclipse.papyrus.diagram.composite.edit.parts.ComponentCompositeEditPartCN;
import org.eclipse.papyrus.diagram.composite.edit.parts.ComponentRealizationEditPart;
+import org.eclipse.papyrus.diagram.composite.edit.parts.ConnectorDurationObservationEditPart;
+import org.eclipse.papyrus.diagram.composite.edit.parts.ConnectorTimeObservationEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.DataTypeEditPartCN;
import org.eclipse.papyrus.diagram.composite.edit.parts.DependencyEditPart;
@@ -221,6 +227,20 @@ public class DeviceCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEd
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null,
+ incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null,
+ incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = view.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -407,6 +427,20 @@ public class DeviceCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEd
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource().getElement(),
+ null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource().getElement(),
+ null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = node.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -584,6 +618,20 @@ public class DeviceCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEd
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -757,6 +805,20 @@ public class DeviceCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEd
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -930,6 +992,20 @@ public class DeviceCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEd
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -1103,6 +1179,20 @@ public class DeviceCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEd
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -1276,6 +1366,20 @@ public class DeviceCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEd
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -1449,6 +1553,20 @@ public class DeviceCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEd
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -1622,6 +1740,20 @@ public class DeviceCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEd
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -1795,6 +1927,20 @@ public class DeviceCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEd
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -1968,6 +2114,20 @@ public class DeviceCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEd
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -2141,6 +2301,20 @@ public class DeviceCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEd
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -2314,6 +2488,20 @@ public class DeviceCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEd
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -2487,6 +2675,20 @@ public class DeviceCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEd
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -2660,6 +2862,20 @@ public class DeviceCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEd
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -2833,6 +3049,20 @@ public class DeviceCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEd
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -3006,6 +3236,20 @@ public class DeviceCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEd
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -3179,6 +3423,20 @@ public class DeviceCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEd
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -3352,6 +3610,20 @@ public class DeviceCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEd
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -3525,6 +3797,20 @@ public class DeviceCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEd
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -3698,6 +3984,20 @@ public class DeviceCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEd
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -3871,6 +4171,20 @@ public class DeviceCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEd
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -4044,6 +4358,20 @@ public class DeviceCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEd
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -4217,6 +4545,20 @@ public class DeviceCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEd
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -4390,6 +4732,20 @@ public class DeviceCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEd
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -4563,6 +4919,20 @@ public class DeviceCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEd
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -4769,6 +5139,12 @@ public class DeviceCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEd
if (UMLElementTypes.InformationFlow_4016 == req.getElementType()) {
return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));
}
+ if (UMLElementTypes.TimeObservationEvent_4018 == req.getElementType()) {
+ return null;
+ }
+ if (UMLElementTypes.DurationObservationEvent_4019 == req.getElementType()) {
+ return null;
+ }
return null;
}
@@ -4818,6 +5194,12 @@ public class DeviceCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEd
if (UMLElementTypes.InformationFlow_4016 == req.getElementType()) {
return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));
}
+ if (UMLElementTypes.TimeObservationEvent_4018 == req.getElementType()) {
+ return getGEFWrapper(new ConnectorTimeObservationCreateCommand(req, req.getSource(), req.getTarget()));
+ }
+ if (UMLElementTypes.DurationObservationEvent_4019 == req.getElementType()) {
+ return getGEFWrapper(new ConnectorDurationObservationCreateCommand(req, req.getSource(), req.getTarget()));
+ }
return null;
}
@@ -4869,6 +5251,10 @@ public class DeviceCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEd
return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));
case ConstraintConstrainedElementEditPart.VISUAL_ID:
return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));
+ case ConnectorTimeObservationEditPart.VISUAL_ID:
+ return getGEFWrapper(new ConnectorTimeObservationReorientCommand(req));
+ case ConnectorDurationObservationEditPart.VISUAL_ID:
+ return getGEFWrapper(new ConnectorDurationObservationReorientCommand(req));
}
return super.getReorientReferenceRelationshipCommand(req);
}
diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/DeviceCompositeItemSemanticEditPolicyCN.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/DeviceCompositeItemSemanticEditPolicyCN.java
index 7f7ed67c017..1aae655192d 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/DeviceCompositeItemSemanticEditPolicyCN.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/DeviceCompositeItemSemanticEditPolicyCN.java
@@ -37,6 +37,10 @@ import org.eclipse.papyrus.diagram.composite.edit.commands.CommentAnnotatedEleme
import org.eclipse.papyrus.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ComponentRealizationCreateCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ComponentRealizationReorientCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorDurationObservationCreateCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorDurationObservationReorientCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorTimeObservationCreateCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorTimeObservationReorientCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.DependencyCreateCommand;
@@ -71,6 +75,8 @@ import org.eclipse.papyrus.diagram.composite.edit.parts.CommentAnnotatedElementE
import org.eclipse.papyrus.diagram.composite.edit.parts.CommentEditPartCN;
import org.eclipse.papyrus.diagram.composite.edit.parts.ComponentCompositeEditPartCN;
import org.eclipse.papyrus.diagram.composite.edit.parts.ComponentRealizationEditPart;
+import org.eclipse.papyrus.diagram.composite.edit.parts.ConnectorDurationObservationEditPart;
+import org.eclipse.papyrus.diagram.composite.edit.parts.ConnectorTimeObservationEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.DataTypeEditPartCN;
import org.eclipse.papyrus.diagram.composite.edit.parts.DependencyEditPart;
@@ -221,6 +227,20 @@ public class DeviceCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemantic
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null,
+ incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null,
+ incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = view.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -407,6 +427,20 @@ public class DeviceCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemantic
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource().getElement(),
+ null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource().getElement(),
+ null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = node.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -584,6 +618,20 @@ public class DeviceCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemantic
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -757,6 +805,20 @@ public class DeviceCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemantic
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -930,6 +992,20 @@ public class DeviceCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemantic
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -1103,6 +1179,20 @@ public class DeviceCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemantic
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -1276,6 +1366,20 @@ public class DeviceCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemantic
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -1449,6 +1553,20 @@ public class DeviceCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemantic
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -1622,6 +1740,20 @@ public class DeviceCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemantic
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -1795,6 +1927,20 @@ public class DeviceCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemantic
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -1968,6 +2114,20 @@ public class DeviceCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemantic
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -2141,6 +2301,20 @@ public class DeviceCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemantic
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -2314,6 +2488,20 @@ public class DeviceCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemantic
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -2487,6 +2675,20 @@ public class DeviceCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemantic
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -2660,6 +2862,20 @@ public class DeviceCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemantic
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -2833,6 +3049,20 @@ public class DeviceCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemantic
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -3006,6 +3236,20 @@ public class DeviceCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemantic
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -3179,6 +3423,20 @@ public class DeviceCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemantic
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -3352,6 +3610,20 @@ public class DeviceCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemantic
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -3525,6 +3797,20 @@ public class DeviceCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemantic
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -3698,6 +3984,20 @@ public class DeviceCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemantic
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -3871,6 +4171,20 @@ public class DeviceCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemantic
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -4044,6 +4358,20 @@ public class DeviceCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemantic
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -4217,6 +4545,20 @@ public class DeviceCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemantic
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -4390,6 +4732,20 @@ public class DeviceCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemantic
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -4563,6 +4919,20 @@ public class DeviceCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemantic
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -4769,6 +5139,12 @@ public class DeviceCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemantic
if (UMLElementTypes.InformationFlow_4016 == req.getElementType()) {
return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));
}
+ if (UMLElementTypes.TimeObservationEvent_4018 == req.getElementType()) {
+ return null;
+ }
+ if (UMLElementTypes.DurationObservationEvent_4019 == req.getElementType()) {
+ return null;
+ }
return null;
}
@@ -4818,6 +5194,12 @@ public class DeviceCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemantic
if (UMLElementTypes.InformationFlow_4016 == req.getElementType()) {
return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));
}
+ if (UMLElementTypes.TimeObservationEvent_4018 == req.getElementType()) {
+ return getGEFWrapper(new ConnectorTimeObservationCreateCommand(req, req.getSource(), req.getTarget()));
+ }
+ if (UMLElementTypes.DurationObservationEvent_4019 == req.getElementType()) {
+ return getGEFWrapper(new ConnectorDurationObservationCreateCommand(req, req.getSource(), req.getTarget()));
+ }
return null;
}
@@ -4869,6 +5251,10 @@ public class DeviceCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemantic
return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));
case ConstraintConstrainedElementEditPart.VISUAL_ID:
return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));
+ case ConnectorTimeObservationEditPart.VISUAL_ID:
+ return getGEFWrapper(new ConnectorTimeObservationReorientCommand(req));
+ case ConnectorDurationObservationEditPart.VISUAL_ID:
+ return getGEFWrapper(new ConnectorDurationObservationReorientCommand(req));
}
return super.getReorientReferenceRelationshipCommand(req);
}
diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/DurationConstraintItemSemanticEditPolicy.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/DurationConstraintItemSemanticEditPolicy.java
index ae16c1988f8..cf2c28c3b86 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/DurationConstraintItemSemanticEditPolicy.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/DurationConstraintItemSemanticEditPolicy.java
@@ -34,6 +34,10 @@ import org.eclipse.papyrus.diagram.composite.edit.commands.CommentAnnotatedEleme
import org.eclipse.papyrus.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ComponentRealizationCreateCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ComponentRealizationReorientCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorDurationObservationCreateCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorDurationObservationReorientCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorTimeObservationCreateCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorTimeObservationReorientCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.DependencyCreateCommand;
@@ -59,6 +63,8 @@ import org.eclipse.papyrus.diagram.composite.edit.commands.UsageReorientCommand;
import org.eclipse.papyrus.diagram.composite.edit.parts.AbstractionEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.ComponentRealizationEditPart;
+import org.eclipse.papyrus.diagram.composite.edit.parts.ConnectorDurationObservationEditPart;
+import org.eclipse.papyrus.diagram.composite.edit.parts.ConnectorTimeObservationEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.DependencyEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.DeploymentEditPart;
@@ -180,6 +186,20 @@ public class DurationConstraintItemSemanticEditPolicy extends UMLBaseItemSemanti
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null,
+ incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null,
+ incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = view.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -330,6 +350,12 @@ public class DurationConstraintItemSemanticEditPolicy extends UMLBaseItemSemanti
if (UMLElementTypes.InformationFlow_4016 == req.getElementType()) {
return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));
}
+ if (UMLElementTypes.TimeObservationEvent_4018 == req.getElementType()) {
+ return null;
+ }
+ if (UMLElementTypes.DurationObservationEvent_4019 == req.getElementType()) {
+ return null;
+ }
return null;
}
@@ -379,6 +405,12 @@ public class DurationConstraintItemSemanticEditPolicy extends UMLBaseItemSemanti
if (UMLElementTypes.InformationFlow_4016 == req.getElementType()) {
return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));
}
+ if (UMLElementTypes.TimeObservationEvent_4018 == req.getElementType()) {
+ return getGEFWrapper(new ConnectorTimeObservationCreateCommand(req, req.getSource(), req.getTarget()));
+ }
+ if (UMLElementTypes.DurationObservationEvent_4019 == req.getElementType()) {
+ return getGEFWrapper(new ConnectorDurationObservationCreateCommand(req, req.getSource(), req.getTarget()));
+ }
return null;
}
@@ -430,6 +462,10 @@ public class DurationConstraintItemSemanticEditPolicy extends UMLBaseItemSemanti
return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));
case ConstraintConstrainedElementEditPart.VISUAL_ID:
return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));
+ case ConnectorTimeObservationEditPart.VISUAL_ID:
+ return getGEFWrapper(new ConnectorTimeObservationReorientCommand(req));
+ case ConnectorDurationObservationEditPart.VISUAL_ID:
+ return getGEFWrapper(new ConnectorDurationObservationReorientCommand(req));
}
return super.getReorientReferenceRelationshipCommand(req);
}
diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/DurationIntervalItemSemanticEditPolicy.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/DurationIntervalItemSemanticEditPolicy.java
index 93ad6a5945f..fbaad08845d 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/DurationIntervalItemSemanticEditPolicy.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/DurationIntervalItemSemanticEditPolicy.java
@@ -34,6 +34,10 @@ import org.eclipse.papyrus.diagram.composite.edit.commands.CommentAnnotatedEleme
import org.eclipse.papyrus.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ComponentRealizationCreateCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ComponentRealizationReorientCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorDurationObservationCreateCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorDurationObservationReorientCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorTimeObservationCreateCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorTimeObservationReorientCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.DependencyCreateCommand;
@@ -59,6 +63,8 @@ import org.eclipse.papyrus.diagram.composite.edit.commands.UsageReorientCommand;
import org.eclipse.papyrus.diagram.composite.edit.parts.AbstractionEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.ComponentRealizationEditPart;
+import org.eclipse.papyrus.diagram.composite.edit.parts.ConnectorDurationObservationEditPart;
+import org.eclipse.papyrus.diagram.composite.edit.parts.ConnectorTimeObservationEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.DependencyEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.DeploymentEditPart;
@@ -180,6 +186,20 @@ public class DurationIntervalItemSemanticEditPolicy extends UMLBaseItemSemanticE
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null,
+ incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null,
+ incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = view.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -323,6 +343,12 @@ public class DurationIntervalItemSemanticEditPolicy extends UMLBaseItemSemanticE
if (UMLElementTypes.InformationFlow_4016 == req.getElementType()) {
return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));
}
+ if (UMLElementTypes.TimeObservationEvent_4018 == req.getElementType()) {
+ return null;
+ }
+ if (UMLElementTypes.DurationObservationEvent_4019 == req.getElementType()) {
+ return null;
+ }
return null;
}
@@ -372,6 +398,12 @@ public class DurationIntervalItemSemanticEditPolicy extends UMLBaseItemSemanticE
if (UMLElementTypes.InformationFlow_4016 == req.getElementType()) {
return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));
}
+ if (UMLElementTypes.TimeObservationEvent_4018 == req.getElementType()) {
+ return getGEFWrapper(new ConnectorTimeObservationCreateCommand(req, req.getSource(), req.getTarget()));
+ }
+ if (UMLElementTypes.DurationObservationEvent_4019 == req.getElementType()) {
+ return getGEFWrapper(new ConnectorDurationObservationCreateCommand(req, req.getSource(), req.getTarget()));
+ }
return null;
}
@@ -423,6 +455,10 @@ public class DurationIntervalItemSemanticEditPolicy extends UMLBaseItemSemanticE
return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));
case ConstraintConstrainedElementEditPart.VISUAL_ID:
return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));
+ case ConnectorTimeObservationEditPart.VISUAL_ID:
+ return getGEFWrapper(new ConnectorTimeObservationReorientCommand(req));
+ case ConnectorDurationObservationEditPart.VISUAL_ID:
+ return getGEFWrapper(new ConnectorDurationObservationReorientCommand(req));
}
return super.getReorientReferenceRelationshipCommand(req);
}
diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/DurationItemSemanticEditPolicy.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/DurationItemSemanticEditPolicy.java
index dbc0c078e12..c02a3793e7f 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/DurationItemSemanticEditPolicy.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/DurationItemSemanticEditPolicy.java
@@ -34,6 +34,10 @@ import org.eclipse.papyrus.diagram.composite.edit.commands.CommentAnnotatedEleme
import org.eclipse.papyrus.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ComponentRealizationCreateCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ComponentRealizationReorientCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorDurationObservationCreateCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorDurationObservationReorientCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorTimeObservationCreateCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorTimeObservationReorientCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.DependencyCreateCommand;
@@ -59,6 +63,8 @@ import org.eclipse.papyrus.diagram.composite.edit.commands.UsageReorientCommand;
import org.eclipse.papyrus.diagram.composite.edit.parts.AbstractionEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.ComponentRealizationEditPart;
+import org.eclipse.papyrus.diagram.composite.edit.parts.ConnectorDurationObservationEditPart;
+import org.eclipse.papyrus.diagram.composite.edit.parts.ConnectorTimeObservationEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.DependencyEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.DeploymentEditPart;
@@ -180,6 +186,20 @@ public class DurationItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolic
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null,
+ incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null,
+ incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = view.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -323,6 +343,12 @@ public class DurationItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolic
if (UMLElementTypes.InformationFlow_4016 == req.getElementType()) {
return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));
}
+ if (UMLElementTypes.TimeObservationEvent_4018 == req.getElementType()) {
+ return null;
+ }
+ if (UMLElementTypes.DurationObservationEvent_4019 == req.getElementType()) {
+ return null;
+ }
return null;
}
@@ -372,6 +398,12 @@ public class DurationItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolic
if (UMLElementTypes.InformationFlow_4016 == req.getElementType()) {
return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));
}
+ if (UMLElementTypes.TimeObservationEvent_4018 == req.getElementType()) {
+ return getGEFWrapper(new ConnectorTimeObservationCreateCommand(req, req.getSource(), req.getTarget()));
+ }
+ if (UMLElementTypes.DurationObservationEvent_4019 == req.getElementType()) {
+ return getGEFWrapper(new ConnectorDurationObservationCreateCommand(req, req.getSource(), req.getTarget()));
+ }
return null;
}
@@ -423,6 +455,10 @@ public class DurationItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolic
return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));
case ConstraintConstrainedElementEditPart.VISUAL_ID:
return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));
+ case ConnectorTimeObservationEditPart.VISUAL_ID:
+ return getGEFWrapper(new ConnectorTimeObservationReorientCommand(req));
+ case ConnectorDurationObservationEditPart.VISUAL_ID:
+ return getGEFWrapper(new ConnectorDurationObservationReorientCommand(req));
}
return super.getReorientReferenceRelationshipCommand(req);
}
diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/DurationObservationItemSemanticEditPolicy.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/DurationObservationItemSemanticEditPolicy.java
index b0f541e7fba..9c3205cd79a 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/DurationObservationItemSemanticEditPolicy.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/DurationObservationItemSemanticEditPolicy.java
@@ -34,6 +34,10 @@ import org.eclipse.papyrus.diagram.composite.edit.commands.CommentAnnotatedEleme
import org.eclipse.papyrus.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ComponentRealizationCreateCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ComponentRealizationReorientCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorDurationObservationCreateCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorDurationObservationReorientCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorTimeObservationCreateCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorTimeObservationReorientCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.DependencyCreateCommand;
@@ -59,6 +63,8 @@ import org.eclipse.papyrus.diagram.composite.edit.commands.UsageReorientCommand;
import org.eclipse.papyrus.diagram.composite.edit.parts.AbstractionEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.ComponentRealizationEditPart;
+import org.eclipse.papyrus.diagram.composite.edit.parts.ConnectorDurationObservationEditPart;
+import org.eclipse.papyrus.diagram.composite.edit.parts.ConnectorTimeObservationEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.DependencyEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.DeploymentEditPart;
@@ -180,6 +186,20 @@ public class DurationObservationItemSemanticEditPolicy extends UMLBaseItemSemant
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null,
+ incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null,
+ incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = view.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -255,6 +275,13 @@ public class DurationObservationItemSemanticEditPolicy extends UMLBaseItemSemant
cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(outgoingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(outgoingLink.getSource().getElement(), null,
+ outgoingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));
+ continue;
+ }
}
EAnnotation annotation = view.getEAnnotation("Shortcut"); //$NON-NLS-1$
if (annotation == null) {
@@ -323,6 +350,12 @@ public class DurationObservationItemSemanticEditPolicy extends UMLBaseItemSemant
if (UMLElementTypes.InformationFlow_4016 == req.getElementType()) {
return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));
}
+ if (UMLElementTypes.TimeObservationEvent_4018 == req.getElementType()) {
+ return null;
+ }
+ if (UMLElementTypes.DurationObservationEvent_4019 == req.getElementType()) {
+ return getGEFWrapper(new ConnectorDurationObservationCreateCommand(req, req.getSource(), req.getTarget()));
+ }
return null;
}
@@ -372,6 +405,12 @@ public class DurationObservationItemSemanticEditPolicy extends UMLBaseItemSemant
if (UMLElementTypes.InformationFlow_4016 == req.getElementType()) {
return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));
}
+ if (UMLElementTypes.TimeObservationEvent_4018 == req.getElementType()) {
+ return getGEFWrapper(new ConnectorTimeObservationCreateCommand(req, req.getSource(), req.getTarget()));
+ }
+ if (UMLElementTypes.DurationObservationEvent_4019 == req.getElementType()) {
+ return getGEFWrapper(new ConnectorDurationObservationCreateCommand(req, req.getSource(), req.getTarget()));
+ }
return null;
}
@@ -423,6 +462,10 @@ public class DurationObservationItemSemanticEditPolicy extends UMLBaseItemSemant
return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));
case ConstraintConstrainedElementEditPart.VISUAL_ID:
return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));
+ case ConnectorTimeObservationEditPart.VISUAL_ID:
+ return getGEFWrapper(new ConnectorTimeObservationReorientCommand(req));
+ case ConnectorDurationObservationEditPart.VISUAL_ID:
+ return getGEFWrapper(new ConnectorDurationObservationReorientCommand(req));
}
return super.getReorientReferenceRelationshipCommand(req);
}
diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/EnumerationItemSemanticEditPolicy.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/EnumerationItemSemanticEditPolicy.java
index cddb9fef436..f0547839c0a 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/EnumerationItemSemanticEditPolicy.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/EnumerationItemSemanticEditPolicy.java
@@ -37,6 +37,10 @@ import org.eclipse.papyrus.diagram.composite.edit.commands.CommentAnnotatedEleme
import org.eclipse.papyrus.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ComponentRealizationCreateCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ComponentRealizationReorientCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorDurationObservationCreateCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorDurationObservationReorientCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorTimeObservationCreateCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorTimeObservationReorientCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.DependencyCreateCommand;
@@ -63,6 +67,8 @@ import org.eclipse.papyrus.diagram.composite.edit.commands.UsageReorientCommand;
import org.eclipse.papyrus.diagram.composite.edit.parts.AbstractionEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.ComponentRealizationEditPart;
+import org.eclipse.papyrus.diagram.composite.edit.parts.ConnectorDurationObservationEditPart;
+import org.eclipse.papyrus.diagram.composite.edit.parts.ConnectorTimeObservationEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.DependencyEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.DeploymentEditPart;
@@ -196,6 +202,20 @@ public class EnumerationItemSemanticEditPolicy extends UMLBaseItemSemanticEditPo
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null,
+ incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null,
+ incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = view.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -377,6 +397,12 @@ public class EnumerationItemSemanticEditPolicy extends UMLBaseItemSemanticEditPo
if (UMLElementTypes.InformationFlow_4016 == req.getElementType()) {
return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));
}
+ if (UMLElementTypes.TimeObservationEvent_4018 == req.getElementType()) {
+ return null;
+ }
+ if (UMLElementTypes.DurationObservationEvent_4019 == req.getElementType()) {
+ return null;
+ }
return null;
}
@@ -426,6 +452,12 @@ public class EnumerationItemSemanticEditPolicy extends UMLBaseItemSemanticEditPo
if (UMLElementTypes.InformationFlow_4016 == req.getElementType()) {
return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));
}
+ if (UMLElementTypes.TimeObservationEvent_4018 == req.getElementType()) {
+ return getGEFWrapper(new ConnectorTimeObservationCreateCommand(req, req.getSource(), req.getTarget()));
+ }
+ if (UMLElementTypes.DurationObservationEvent_4019 == req.getElementType()) {
+ return getGEFWrapper(new ConnectorDurationObservationCreateCommand(req, req.getSource(), req.getTarget()));
+ }
return null;
}
@@ -477,6 +509,10 @@ public class EnumerationItemSemanticEditPolicy extends UMLBaseItemSemanticEditPo
return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));
case ConstraintConstrainedElementEditPart.VISUAL_ID:
return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));
+ case ConnectorTimeObservationEditPart.VISUAL_ID:
+ return getGEFWrapper(new ConnectorTimeObservationReorientCommand(req));
+ case ConnectorDurationObservationEditPart.VISUAL_ID:
+ return getGEFWrapper(new ConnectorDurationObservationReorientCommand(req));
}
return super.getReorientReferenceRelationshipCommand(req);
}
diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/EnumerationItemSemanticEditPolicyCN.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/EnumerationItemSemanticEditPolicyCN.java
index 8a12c7c1aca..f88b9cc0e4a 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/EnumerationItemSemanticEditPolicyCN.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/EnumerationItemSemanticEditPolicyCN.java
@@ -37,6 +37,10 @@ import org.eclipse.papyrus.diagram.composite.edit.commands.CommentAnnotatedEleme
import org.eclipse.papyrus.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ComponentRealizationCreateCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ComponentRealizationReorientCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorDurationObservationCreateCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorDurationObservationReorientCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorTimeObservationCreateCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorTimeObservationReorientCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.DependencyCreateCommand;
@@ -63,6 +67,8 @@ import org.eclipse.papyrus.diagram.composite.edit.commands.UsageReorientCommand;
import org.eclipse.papyrus.diagram.composite.edit.parts.AbstractionEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.ComponentRealizationEditPart;
+import org.eclipse.papyrus.diagram.composite.edit.parts.ConnectorDurationObservationEditPart;
+import org.eclipse.papyrus.diagram.composite.edit.parts.ConnectorTimeObservationEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.DependencyEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.DeploymentEditPart;
@@ -196,6 +202,20 @@ public class EnumerationItemSemanticEditPolicyCN extends UMLBaseItemSemanticEdit
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null,
+ incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null,
+ incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = view.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -377,6 +397,12 @@ public class EnumerationItemSemanticEditPolicyCN extends UMLBaseItemSemanticEdit
if (UMLElementTypes.InformationFlow_4016 == req.getElementType()) {
return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));
}
+ if (UMLElementTypes.TimeObservationEvent_4018 == req.getElementType()) {
+ return null;
+ }
+ if (UMLElementTypes.DurationObservationEvent_4019 == req.getElementType()) {
+ return null;
+ }
return null;
}
@@ -426,6 +452,12 @@ public class EnumerationItemSemanticEditPolicyCN extends UMLBaseItemSemanticEdit
if (UMLElementTypes.InformationFlow_4016 == req.getElementType()) {
return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));
}
+ if (UMLElementTypes.TimeObservationEvent_4018 == req.getElementType()) {
+ return getGEFWrapper(new ConnectorTimeObservationCreateCommand(req, req.getSource(), req.getTarget()));
+ }
+ if (UMLElementTypes.DurationObservationEvent_4019 == req.getElementType()) {
+ return getGEFWrapper(new ConnectorDurationObservationCreateCommand(req, req.getSource(), req.getTarget()));
+ }
return null;
}
@@ -477,6 +509,10 @@ public class EnumerationItemSemanticEditPolicyCN extends UMLBaseItemSemanticEdit
return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));
case ConstraintConstrainedElementEditPart.VISUAL_ID:
return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));
+ case ConnectorTimeObservationEditPart.VISUAL_ID:
+ return getGEFWrapper(new ConnectorTimeObservationReorientCommand(req));
+ case ConnectorDurationObservationEditPart.VISUAL_ID:
+ return getGEFWrapper(new ConnectorDurationObservationReorientCommand(req));
}
return super.getReorientReferenceRelationshipCommand(req);
}
diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/ExecutionEnvironmentCompositeItemSemanticEditPolicy.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/ExecutionEnvironmentCompositeItemSemanticEditPolicy.java
index e4a468a51bf..b53bac87ec9 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/ExecutionEnvironmentCompositeItemSemanticEditPolicy.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/ExecutionEnvironmentCompositeItemSemanticEditPolicy.java
@@ -37,6 +37,10 @@ import org.eclipse.papyrus.diagram.composite.edit.commands.CommentAnnotatedEleme
import org.eclipse.papyrus.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ComponentRealizationCreateCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ComponentRealizationReorientCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorDurationObservationCreateCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorDurationObservationReorientCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorTimeObservationCreateCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorTimeObservationReorientCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.DependencyCreateCommand;
@@ -71,6 +75,8 @@ import org.eclipse.papyrus.diagram.composite.edit.parts.CommentAnnotatedElementE
import org.eclipse.papyrus.diagram.composite.edit.parts.CommentEditPartCN;
import org.eclipse.papyrus.diagram.composite.edit.parts.ComponentCompositeEditPartCN;
import org.eclipse.papyrus.diagram.composite.edit.parts.ComponentRealizationEditPart;
+import org.eclipse.papyrus.diagram.composite.edit.parts.ConnectorDurationObservationEditPart;
+import org.eclipse.papyrus.diagram.composite.edit.parts.ConnectorTimeObservationEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.DataTypeEditPartCN;
import org.eclipse.papyrus.diagram.composite.edit.parts.DependencyEditPart;
@@ -221,6 +227,20 @@ public class ExecutionEnvironmentCompositeItemSemanticEditPolicy extends UMLBase
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null,
+ incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null,
+ incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = view.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -407,6 +427,20 @@ public class ExecutionEnvironmentCompositeItemSemanticEditPolicy extends UMLBase
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource().getElement(),
+ null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource().getElement(),
+ null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = node.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -584,6 +618,20 @@ public class ExecutionEnvironmentCompositeItemSemanticEditPolicy extends UMLBase
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -757,6 +805,20 @@ public class ExecutionEnvironmentCompositeItemSemanticEditPolicy extends UMLBase
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -930,6 +992,20 @@ public class ExecutionEnvironmentCompositeItemSemanticEditPolicy extends UMLBase
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -1103,6 +1179,20 @@ public class ExecutionEnvironmentCompositeItemSemanticEditPolicy extends UMLBase
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -1276,6 +1366,20 @@ public class ExecutionEnvironmentCompositeItemSemanticEditPolicy extends UMLBase
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -1449,6 +1553,20 @@ public class ExecutionEnvironmentCompositeItemSemanticEditPolicy extends UMLBase
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -1622,6 +1740,20 @@ public class ExecutionEnvironmentCompositeItemSemanticEditPolicy extends UMLBase
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -1795,6 +1927,20 @@ public class ExecutionEnvironmentCompositeItemSemanticEditPolicy extends UMLBase
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -1968,6 +2114,20 @@ public class ExecutionEnvironmentCompositeItemSemanticEditPolicy extends UMLBase
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -2141,6 +2301,20 @@ public class ExecutionEnvironmentCompositeItemSemanticEditPolicy extends UMLBase
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -2314,6 +2488,20 @@ public class ExecutionEnvironmentCompositeItemSemanticEditPolicy extends UMLBase
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -2487,6 +2675,20 @@ public class ExecutionEnvironmentCompositeItemSemanticEditPolicy extends UMLBase
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -2660,6 +2862,20 @@ public class ExecutionEnvironmentCompositeItemSemanticEditPolicy extends UMLBase
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -2833,6 +3049,20 @@ public class ExecutionEnvironmentCompositeItemSemanticEditPolicy extends UMLBase
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -3006,6 +3236,20 @@ public class ExecutionEnvironmentCompositeItemSemanticEditPolicy extends UMLBase
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -3179,6 +3423,20 @@ public class ExecutionEnvironmentCompositeItemSemanticEditPolicy extends UMLBase
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -3352,6 +3610,20 @@ public class ExecutionEnvironmentCompositeItemSemanticEditPolicy extends UMLBase
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -3525,6 +3797,20 @@ public class ExecutionEnvironmentCompositeItemSemanticEditPolicy extends UMLBase
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -3698,6 +3984,20 @@ public class ExecutionEnvironmentCompositeItemSemanticEditPolicy extends UMLBase
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -3871,6 +4171,20 @@ public class ExecutionEnvironmentCompositeItemSemanticEditPolicy extends UMLBase
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -4044,6 +4358,20 @@ public class ExecutionEnvironmentCompositeItemSemanticEditPolicy extends UMLBase
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -4217,6 +4545,20 @@ public class ExecutionEnvironmentCompositeItemSemanticEditPolicy extends UMLBase
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -4390,6 +4732,20 @@ public class ExecutionEnvironmentCompositeItemSemanticEditPolicy extends UMLBase
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -4563,6 +4919,20 @@ public class ExecutionEnvironmentCompositeItemSemanticEditPolicy extends UMLBase
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -4769,6 +5139,12 @@ public class ExecutionEnvironmentCompositeItemSemanticEditPolicy extends UMLBase
if (UMLElementTypes.InformationFlow_4016 == req.getElementType()) {
return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));
}
+ if (UMLElementTypes.TimeObservationEvent_4018 == req.getElementType()) {
+ return null;
+ }
+ if (UMLElementTypes.DurationObservationEvent_4019 == req.getElementType()) {
+ return null;
+ }
return null;
}
@@ -4818,6 +5194,12 @@ public class ExecutionEnvironmentCompositeItemSemanticEditPolicy extends UMLBase
if (UMLElementTypes.InformationFlow_4016 == req.getElementType()) {
return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));
}
+ if (UMLElementTypes.TimeObservationEvent_4018 == req.getElementType()) {
+ return getGEFWrapper(new ConnectorTimeObservationCreateCommand(req, req.getSource(), req.getTarget()));
+ }
+ if (UMLElementTypes.DurationObservationEvent_4019 == req.getElementType()) {
+ return getGEFWrapper(new ConnectorDurationObservationCreateCommand(req, req.getSource(), req.getTarget()));
+ }
return null;
}
@@ -4869,6 +5251,10 @@ public class ExecutionEnvironmentCompositeItemSemanticEditPolicy extends UMLBase
return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));
case ConstraintConstrainedElementEditPart.VISUAL_ID:
return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));
+ case ConnectorTimeObservationEditPart.VISUAL_ID:
+ return getGEFWrapper(new ConnectorTimeObservationReorientCommand(req));
+ case ConnectorDurationObservationEditPart.VISUAL_ID:
+ return getGEFWrapper(new ConnectorDurationObservationReorientCommand(req));
}
return super.getReorientReferenceRelationshipCommand(req);
}
diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/ExecutionEnvironmentCompositeItemSemanticEditPolicyCN.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/ExecutionEnvironmentCompositeItemSemanticEditPolicyCN.java
index ef83f349f3b..49097ec24d6 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/ExecutionEnvironmentCompositeItemSemanticEditPolicyCN.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/ExecutionEnvironmentCompositeItemSemanticEditPolicyCN.java
@@ -37,6 +37,10 @@ import org.eclipse.papyrus.diagram.composite.edit.commands.CommentAnnotatedEleme
import org.eclipse.papyrus.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ComponentRealizationCreateCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ComponentRealizationReorientCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorDurationObservationCreateCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorDurationObservationReorientCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorTimeObservationCreateCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorTimeObservationReorientCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.DependencyCreateCommand;
@@ -71,6 +75,8 @@ import org.eclipse.papyrus.diagram.composite.edit.parts.CommentAnnotatedElementE
import org.eclipse.papyrus.diagram.composite.edit.parts.CommentEditPartCN;
import org.eclipse.papyrus.diagram.composite.edit.parts.ComponentCompositeEditPartCN;
import org.eclipse.papyrus.diagram.composite.edit.parts.ComponentRealizationEditPart;
+import org.eclipse.papyrus.diagram.composite.edit.parts.ConnectorDurationObservationEditPart;
+import org.eclipse.papyrus.diagram.composite.edit.parts.ConnectorTimeObservationEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.DataTypeEditPartCN;
import org.eclipse.papyrus.diagram.composite.edit.parts.DependencyEditPart;
@@ -221,6 +227,20 @@ public class ExecutionEnvironmentCompositeItemSemanticEditPolicyCN extends UMLBa
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null,
+ incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null,
+ incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = view.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -407,6 +427,20 @@ public class ExecutionEnvironmentCompositeItemSemanticEditPolicyCN extends UMLBa
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource().getElement(),
+ null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource().getElement(),
+ null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = node.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -584,6 +618,20 @@ public class ExecutionEnvironmentCompositeItemSemanticEditPolicyCN extends UMLBa
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -757,6 +805,20 @@ public class ExecutionEnvironmentCompositeItemSemanticEditPolicyCN extends UMLBa
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -930,6 +992,20 @@ public class ExecutionEnvironmentCompositeItemSemanticEditPolicyCN extends UMLBa
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -1103,6 +1179,20 @@ public class ExecutionEnvironmentCompositeItemSemanticEditPolicyCN extends UMLBa
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -1276,6 +1366,20 @@ public class ExecutionEnvironmentCompositeItemSemanticEditPolicyCN extends UMLBa
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -1449,6 +1553,20 @@ public class ExecutionEnvironmentCompositeItemSemanticEditPolicyCN extends UMLBa
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -1622,6 +1740,20 @@ public class ExecutionEnvironmentCompositeItemSemanticEditPolicyCN extends UMLBa
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -1795,6 +1927,20 @@ public class ExecutionEnvironmentCompositeItemSemanticEditPolicyCN extends UMLBa
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -1968,6 +2114,20 @@ public class ExecutionEnvironmentCompositeItemSemanticEditPolicyCN extends UMLBa
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -2141,6 +2301,20 @@ public class ExecutionEnvironmentCompositeItemSemanticEditPolicyCN extends UMLBa
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -2314,6 +2488,20 @@ public class ExecutionEnvironmentCompositeItemSemanticEditPolicyCN extends UMLBa
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -2487,6 +2675,20 @@ public class ExecutionEnvironmentCompositeItemSemanticEditPolicyCN extends UMLBa
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -2660,6 +2862,20 @@ public class ExecutionEnvironmentCompositeItemSemanticEditPolicyCN extends UMLBa
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -2833,6 +3049,20 @@ public class ExecutionEnvironmentCompositeItemSemanticEditPolicyCN extends UMLBa
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -3006,6 +3236,20 @@ public class ExecutionEnvironmentCompositeItemSemanticEditPolicyCN extends UMLBa
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -3179,6 +3423,20 @@ public class ExecutionEnvironmentCompositeItemSemanticEditPolicyCN extends UMLBa
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -3352,6 +3610,20 @@ public class ExecutionEnvironmentCompositeItemSemanticEditPolicyCN extends UMLBa
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -3525,6 +3797,20 @@ public class ExecutionEnvironmentCompositeItemSemanticEditPolicyCN extends UMLBa
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -3698,6 +3984,20 @@ public class ExecutionEnvironmentCompositeItemSemanticEditPolicyCN extends UMLBa
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -3871,6 +4171,20 @@ public class ExecutionEnvironmentCompositeItemSemanticEditPolicyCN extends UMLBa
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -4044,6 +4358,20 @@ public class ExecutionEnvironmentCompositeItemSemanticEditPolicyCN extends UMLBa
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -4217,6 +4545,20 @@ public class ExecutionEnvironmentCompositeItemSemanticEditPolicyCN extends UMLBa
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -4390,6 +4732,20 @@ public class ExecutionEnvironmentCompositeItemSemanticEditPolicyCN extends UMLBa
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -4563,6 +4919,20 @@ public class ExecutionEnvironmentCompositeItemSemanticEditPolicyCN extends UMLBa
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -4769,6 +5139,12 @@ public class ExecutionEnvironmentCompositeItemSemanticEditPolicyCN extends UMLBa
if (UMLElementTypes.InformationFlow_4016 == req.getElementType()) {
return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));
}
+ if (UMLElementTypes.TimeObservationEvent_4018 == req.getElementType()) {
+ return null;
+ }
+ if (UMLElementTypes.DurationObservationEvent_4019 == req.getElementType()) {
+ return null;
+ }
return null;
}
@@ -4818,6 +5194,12 @@ public class ExecutionEnvironmentCompositeItemSemanticEditPolicyCN extends UMLBa
if (UMLElementTypes.InformationFlow_4016 == req.getElementType()) {
return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));
}
+ if (UMLElementTypes.TimeObservationEvent_4018 == req.getElementType()) {
+ return getGEFWrapper(new ConnectorTimeObservationCreateCommand(req, req.getSource(), req.getTarget()));
+ }
+ if (UMLElementTypes.DurationObservationEvent_4019 == req.getElementType()) {
+ return getGEFWrapper(new ConnectorDurationObservationCreateCommand(req, req.getSource(), req.getTarget()));
+ }
return null;
}
@@ -4869,6 +5251,10 @@ public class ExecutionEnvironmentCompositeItemSemanticEditPolicyCN extends UMLBa
return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));
case ConstraintConstrainedElementEditPart.VISUAL_ID:
return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));
+ case ConnectorTimeObservationEditPart.VISUAL_ID:
+ return getGEFWrapper(new ConnectorTimeObservationReorientCommand(req));
+ case ConnectorDurationObservationEditPart.VISUAL_ID:
+ return getGEFWrapper(new ConnectorDurationObservationReorientCommand(req));
}
return super.getReorientReferenceRelationshipCommand(req);
}
diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/ExecutionEventItemSemanticEditPolicy.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/ExecutionEventItemSemanticEditPolicy.java
index 035a476fa06..88728bc228d 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/ExecutionEventItemSemanticEditPolicy.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/ExecutionEventItemSemanticEditPolicy.java
@@ -34,6 +34,10 @@ import org.eclipse.papyrus.diagram.composite.edit.commands.CommentAnnotatedEleme
import org.eclipse.papyrus.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ComponentRealizationCreateCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ComponentRealizationReorientCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorDurationObservationCreateCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorDurationObservationReorientCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorTimeObservationCreateCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorTimeObservationReorientCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.DependencyCreateCommand;
@@ -59,6 +63,8 @@ import org.eclipse.papyrus.diagram.composite.edit.commands.UsageReorientCommand;
import org.eclipse.papyrus.diagram.composite.edit.parts.AbstractionEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.ComponentRealizationEditPart;
+import org.eclipse.papyrus.diagram.composite.edit.parts.ConnectorDurationObservationEditPart;
+import org.eclipse.papyrus.diagram.composite.edit.parts.ConnectorTimeObservationEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.DependencyEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.DeploymentEditPart;
@@ -180,6 +186,20 @@ public class ExecutionEventItemSemanticEditPolicy extends UMLBaseItemSemanticEdi
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null,
+ incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null,
+ incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = view.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -323,6 +343,12 @@ public class ExecutionEventItemSemanticEditPolicy extends UMLBaseItemSemanticEdi
if (UMLElementTypes.InformationFlow_4016 == req.getElementType()) {
return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));
}
+ if (UMLElementTypes.TimeObservationEvent_4018 == req.getElementType()) {
+ return null;
+ }
+ if (UMLElementTypes.DurationObservationEvent_4019 == req.getElementType()) {
+ return null;
+ }
return null;
}
@@ -372,6 +398,12 @@ public class ExecutionEventItemSemanticEditPolicy extends UMLBaseItemSemanticEdi
if (UMLElementTypes.InformationFlow_4016 == req.getElementType()) {
return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));
}
+ if (UMLElementTypes.TimeObservationEvent_4018 == req.getElementType()) {
+ return getGEFWrapper(new ConnectorTimeObservationCreateCommand(req, req.getSource(), req.getTarget()));
+ }
+ if (UMLElementTypes.DurationObservationEvent_4019 == req.getElementType()) {
+ return getGEFWrapper(new ConnectorDurationObservationCreateCommand(req, req.getSource(), req.getTarget()));
+ }
return null;
}
@@ -423,6 +455,10 @@ public class ExecutionEventItemSemanticEditPolicy extends UMLBaseItemSemanticEdi
return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));
case ConstraintConstrainedElementEditPart.VISUAL_ID:
return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));
+ case ConnectorTimeObservationEditPart.VISUAL_ID:
+ return getGEFWrapper(new ConnectorTimeObservationReorientCommand(req));
+ case ConnectorDurationObservationEditPart.VISUAL_ID:
+ return getGEFWrapper(new ConnectorDurationObservationReorientCommand(req));
}
return super.getReorientReferenceRelationshipCommand(req);
}
diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/ExpressionItemSemanticEditPolicy.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/ExpressionItemSemanticEditPolicy.java
index 937c936ce71..8db6ddabc71 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/ExpressionItemSemanticEditPolicy.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/ExpressionItemSemanticEditPolicy.java
@@ -34,6 +34,10 @@ import org.eclipse.papyrus.diagram.composite.edit.commands.CommentAnnotatedEleme
import org.eclipse.papyrus.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ComponentRealizationCreateCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ComponentRealizationReorientCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorDurationObservationCreateCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorDurationObservationReorientCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorTimeObservationCreateCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorTimeObservationReorientCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.DependencyCreateCommand;
@@ -59,6 +63,8 @@ import org.eclipse.papyrus.diagram.composite.edit.commands.UsageReorientCommand;
import org.eclipse.papyrus.diagram.composite.edit.parts.AbstractionEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.ComponentRealizationEditPart;
+import org.eclipse.papyrus.diagram.composite.edit.parts.ConnectorDurationObservationEditPart;
+import org.eclipse.papyrus.diagram.composite.edit.parts.ConnectorTimeObservationEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.DependencyEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.DeploymentEditPart;
@@ -180,6 +186,20 @@ public class ExpressionItemSemanticEditPolicy extends UMLBaseItemSemanticEditPol
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null,
+ incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null,
+ incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = view.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -323,6 +343,12 @@ public class ExpressionItemSemanticEditPolicy extends UMLBaseItemSemanticEditPol
if (UMLElementTypes.InformationFlow_4016 == req.getElementType()) {
return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));
}
+ if (UMLElementTypes.TimeObservationEvent_4018 == req.getElementType()) {
+ return null;
+ }
+ if (UMLElementTypes.DurationObservationEvent_4019 == req.getElementType()) {
+ return null;
+ }
return null;
}
@@ -372,6 +398,12 @@ public class ExpressionItemSemanticEditPolicy extends UMLBaseItemSemanticEditPol
if (UMLElementTypes.InformationFlow_4016 == req.getElementType()) {
return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));
}
+ if (UMLElementTypes.TimeObservationEvent_4018 == req.getElementType()) {
+ return getGEFWrapper(new ConnectorTimeObservationCreateCommand(req, req.getSource(), req.getTarget()));
+ }
+ if (UMLElementTypes.DurationObservationEvent_4019 == req.getElementType()) {
+ return getGEFWrapper(new ConnectorDurationObservationCreateCommand(req, req.getSource(), req.getTarget()));
+ }
return null;
}
@@ -423,6 +455,10 @@ public class ExpressionItemSemanticEditPolicy extends UMLBaseItemSemanticEditPol
return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));
case ConstraintConstrainedElementEditPart.VISUAL_ID:
return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));
+ case ConnectorTimeObservationEditPart.VISUAL_ID:
+ return getGEFWrapper(new ConnectorTimeObservationReorientCommand(req));
+ case ConnectorDurationObservationEditPart.VISUAL_ID:
+ return getGEFWrapper(new ConnectorDurationObservationReorientCommand(req));
}
return super.getReorientReferenceRelationshipCommand(req);
}
diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/FunctionBehaviorCompositeItemSemanticEditPolicy.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/FunctionBehaviorCompositeItemSemanticEditPolicy.java
index ac752190776..01649d37466 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/FunctionBehaviorCompositeItemSemanticEditPolicy.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/FunctionBehaviorCompositeItemSemanticEditPolicy.java
@@ -37,6 +37,10 @@ import org.eclipse.papyrus.diagram.composite.edit.commands.CommentAnnotatedEleme
import org.eclipse.papyrus.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ComponentRealizationCreateCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ComponentRealizationReorientCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorDurationObservationCreateCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorDurationObservationReorientCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorTimeObservationCreateCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorTimeObservationReorientCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.DependencyCreateCommand;
@@ -71,6 +75,8 @@ import org.eclipse.papyrus.diagram.composite.edit.parts.CommentAnnotatedElementE
import org.eclipse.papyrus.diagram.composite.edit.parts.CommentEditPartCN;
import org.eclipse.papyrus.diagram.composite.edit.parts.ComponentCompositeEditPartCN;
import org.eclipse.papyrus.diagram.composite.edit.parts.ComponentRealizationEditPart;
+import org.eclipse.papyrus.diagram.composite.edit.parts.ConnectorDurationObservationEditPart;
+import org.eclipse.papyrus.diagram.composite.edit.parts.ConnectorTimeObservationEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.DataTypeEditPartCN;
import org.eclipse.papyrus.diagram.composite.edit.parts.DependencyEditPart;
@@ -221,6 +227,20 @@ public class FunctionBehaviorCompositeItemSemanticEditPolicy extends UMLBaseItem
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null,
+ incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null,
+ incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = view.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -407,6 +427,20 @@ public class FunctionBehaviorCompositeItemSemanticEditPolicy extends UMLBaseItem
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource().getElement(),
+ null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource().getElement(),
+ null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = node.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -584,6 +618,20 @@ public class FunctionBehaviorCompositeItemSemanticEditPolicy extends UMLBaseItem
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -757,6 +805,20 @@ public class FunctionBehaviorCompositeItemSemanticEditPolicy extends UMLBaseItem
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -930,6 +992,20 @@ public class FunctionBehaviorCompositeItemSemanticEditPolicy extends UMLBaseItem
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -1103,6 +1179,20 @@ public class FunctionBehaviorCompositeItemSemanticEditPolicy extends UMLBaseItem
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -1276,6 +1366,20 @@ public class FunctionBehaviorCompositeItemSemanticEditPolicy extends UMLBaseItem
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -1449,6 +1553,20 @@ public class FunctionBehaviorCompositeItemSemanticEditPolicy extends UMLBaseItem
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -1622,6 +1740,20 @@ public class FunctionBehaviorCompositeItemSemanticEditPolicy extends UMLBaseItem
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -1795,6 +1927,20 @@ public class FunctionBehaviorCompositeItemSemanticEditPolicy extends UMLBaseItem
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -1968,6 +2114,20 @@ public class FunctionBehaviorCompositeItemSemanticEditPolicy extends UMLBaseItem
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -2141,6 +2301,20 @@ public class FunctionBehaviorCompositeItemSemanticEditPolicy extends UMLBaseItem
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -2314,6 +2488,20 @@ public class FunctionBehaviorCompositeItemSemanticEditPolicy extends UMLBaseItem
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -2487,6 +2675,20 @@ public class FunctionBehaviorCompositeItemSemanticEditPolicy extends UMLBaseItem
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -2660,6 +2862,20 @@ public class FunctionBehaviorCompositeItemSemanticEditPolicy extends UMLBaseItem
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -2833,6 +3049,20 @@ public class FunctionBehaviorCompositeItemSemanticEditPolicy extends UMLBaseItem
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -3006,6 +3236,20 @@ public class FunctionBehaviorCompositeItemSemanticEditPolicy extends UMLBaseItem
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -3179,6 +3423,20 @@ public class FunctionBehaviorCompositeItemSemanticEditPolicy extends UMLBaseItem
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -3352,6 +3610,20 @@ public class FunctionBehaviorCompositeItemSemanticEditPolicy extends UMLBaseItem
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -3525,6 +3797,20 @@ public class FunctionBehaviorCompositeItemSemanticEditPolicy extends UMLBaseItem
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -3698,6 +3984,20 @@ public class FunctionBehaviorCompositeItemSemanticEditPolicy extends UMLBaseItem
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -3871,6 +4171,20 @@ public class FunctionBehaviorCompositeItemSemanticEditPolicy extends UMLBaseItem
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -4044,6 +4358,20 @@ public class FunctionBehaviorCompositeItemSemanticEditPolicy extends UMLBaseItem
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -4217,6 +4545,20 @@ public class FunctionBehaviorCompositeItemSemanticEditPolicy extends UMLBaseItem
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -4390,6 +4732,20 @@ public class FunctionBehaviorCompositeItemSemanticEditPolicy extends UMLBaseItem
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -4563,6 +4919,20 @@ public class FunctionBehaviorCompositeItemSemanticEditPolicy extends UMLBaseItem
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -4769,6 +5139,12 @@ public class FunctionBehaviorCompositeItemSemanticEditPolicy extends UMLBaseItem
if (UMLElementTypes.InformationFlow_4016 == req.getElementType()) {
return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));
}
+ if (UMLElementTypes.TimeObservationEvent_4018 == req.getElementType()) {
+ return null;
+ }
+ if (UMLElementTypes.DurationObservationEvent_4019 == req.getElementType()) {
+ return null;
+ }
return null;
}
@@ -4818,6 +5194,12 @@ public class FunctionBehaviorCompositeItemSemanticEditPolicy extends UMLBaseItem
if (UMLElementTypes.InformationFlow_4016 == req.getElementType()) {
return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));
}
+ if (UMLElementTypes.TimeObservationEvent_4018 == req.getElementType()) {
+ return getGEFWrapper(new ConnectorTimeObservationCreateCommand(req, req.getSource(), req.getTarget()));
+ }
+ if (UMLElementTypes.DurationObservationEvent_4019 == req.getElementType()) {
+ return getGEFWrapper(new ConnectorDurationObservationCreateCommand(req, req.getSource(), req.getTarget()));
+ }
return null;
}
@@ -4869,6 +5251,10 @@ public class FunctionBehaviorCompositeItemSemanticEditPolicy extends UMLBaseItem
return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));
case ConstraintConstrainedElementEditPart.VISUAL_ID:
return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));
+ case ConnectorTimeObservationEditPart.VISUAL_ID:
+ return getGEFWrapper(new ConnectorTimeObservationReorientCommand(req));
+ case ConnectorDurationObservationEditPart.VISUAL_ID:
+ return getGEFWrapper(new ConnectorDurationObservationReorientCommand(req));
}
return super.getReorientReferenceRelationshipCommand(req);
}
diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/FunctionBehaviorCompositeItemSemanticEditPolicyCN.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/FunctionBehaviorCompositeItemSemanticEditPolicyCN.java
index 79e3e82cd4e..920a9370003 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/FunctionBehaviorCompositeItemSemanticEditPolicyCN.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/FunctionBehaviorCompositeItemSemanticEditPolicyCN.java
@@ -37,6 +37,10 @@ import org.eclipse.papyrus.diagram.composite.edit.commands.CommentAnnotatedEleme
import org.eclipse.papyrus.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ComponentRealizationCreateCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ComponentRealizationReorientCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorDurationObservationCreateCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorDurationObservationReorientCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorTimeObservationCreateCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorTimeObservationReorientCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.DependencyCreateCommand;
@@ -71,6 +75,8 @@ import org.eclipse.papyrus.diagram.composite.edit.parts.CommentAnnotatedElementE
import org.eclipse.papyrus.diagram.composite.edit.parts.CommentEditPartCN;
import org.eclipse.papyrus.diagram.composite.edit.parts.ComponentCompositeEditPartCN;
import org.eclipse.papyrus.diagram.composite.edit.parts.ComponentRealizationEditPart;
+import org.eclipse.papyrus.diagram.composite.edit.parts.ConnectorDurationObservationEditPart;
+import org.eclipse.papyrus.diagram.composite.edit.parts.ConnectorTimeObservationEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.DataTypeEditPartCN;
import org.eclipse.papyrus.diagram.composite.edit.parts.DependencyEditPart;
@@ -221,6 +227,20 @@ public class FunctionBehaviorCompositeItemSemanticEditPolicyCN extends UMLBaseIt
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null,
+ incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null,
+ incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = view.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -407,6 +427,20 @@ public class FunctionBehaviorCompositeItemSemanticEditPolicyCN extends UMLBaseIt
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource().getElement(),
+ null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource().getElement(),
+ null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = node.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -584,6 +618,20 @@ public class FunctionBehaviorCompositeItemSemanticEditPolicyCN extends UMLBaseIt
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -757,6 +805,20 @@ public class FunctionBehaviorCompositeItemSemanticEditPolicyCN extends UMLBaseIt
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -930,6 +992,20 @@ public class FunctionBehaviorCompositeItemSemanticEditPolicyCN extends UMLBaseIt
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -1103,6 +1179,20 @@ public class FunctionBehaviorCompositeItemSemanticEditPolicyCN extends UMLBaseIt
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -1276,6 +1366,20 @@ public class FunctionBehaviorCompositeItemSemanticEditPolicyCN extends UMLBaseIt
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -1449,6 +1553,20 @@ public class FunctionBehaviorCompositeItemSemanticEditPolicyCN extends UMLBaseIt
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -1622,6 +1740,20 @@ public class FunctionBehaviorCompositeItemSemanticEditPolicyCN extends UMLBaseIt
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -1795,6 +1927,20 @@ public class FunctionBehaviorCompositeItemSemanticEditPolicyCN extends UMLBaseIt
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -1968,6 +2114,20 @@ public class FunctionBehaviorCompositeItemSemanticEditPolicyCN extends UMLBaseIt
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -2141,6 +2301,20 @@ public class FunctionBehaviorCompositeItemSemanticEditPolicyCN extends UMLBaseIt
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -2314,6 +2488,20 @@ public class FunctionBehaviorCompositeItemSemanticEditPolicyCN extends UMLBaseIt
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -2487,6 +2675,20 @@ public class FunctionBehaviorCompositeItemSemanticEditPolicyCN extends UMLBaseIt
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -2660,6 +2862,20 @@ public class FunctionBehaviorCompositeItemSemanticEditPolicyCN extends UMLBaseIt
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -2833,6 +3049,20 @@ public class FunctionBehaviorCompositeItemSemanticEditPolicyCN extends UMLBaseIt
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -3006,6 +3236,20 @@ public class FunctionBehaviorCompositeItemSemanticEditPolicyCN extends UMLBaseIt
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -3179,6 +3423,20 @@ public class FunctionBehaviorCompositeItemSemanticEditPolicyCN extends UMLBaseIt
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -3352,6 +3610,20 @@ public class FunctionBehaviorCompositeItemSemanticEditPolicyCN extends UMLBaseIt
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -3525,6 +3797,20 @@ public class FunctionBehaviorCompositeItemSemanticEditPolicyCN extends UMLBaseIt
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -3698,6 +3984,20 @@ public class FunctionBehaviorCompositeItemSemanticEditPolicyCN extends UMLBaseIt
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -3871,6 +4171,20 @@ public class FunctionBehaviorCompositeItemSemanticEditPolicyCN extends UMLBaseIt
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -4044,6 +4358,20 @@ public class FunctionBehaviorCompositeItemSemanticEditPolicyCN extends UMLBaseIt
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -4217,6 +4545,20 @@ public class FunctionBehaviorCompositeItemSemanticEditPolicyCN extends UMLBaseIt
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -4390,6 +4732,20 @@ public class FunctionBehaviorCompositeItemSemanticEditPolicyCN extends UMLBaseIt
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -4563,6 +4919,20 @@ public class FunctionBehaviorCompositeItemSemanticEditPolicyCN extends UMLBaseIt
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -4769,6 +5139,12 @@ public class FunctionBehaviorCompositeItemSemanticEditPolicyCN extends UMLBaseIt
if (UMLElementTypes.InformationFlow_4016 == req.getElementType()) {
return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));
}
+ if (UMLElementTypes.TimeObservationEvent_4018 == req.getElementType()) {
+ return null;
+ }
+ if (UMLElementTypes.DurationObservationEvent_4019 == req.getElementType()) {
+ return null;
+ }
return null;
}
@@ -4818,6 +5194,12 @@ public class FunctionBehaviorCompositeItemSemanticEditPolicyCN extends UMLBaseIt
if (UMLElementTypes.InformationFlow_4016 == req.getElementType()) {
return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));
}
+ if (UMLElementTypes.TimeObservationEvent_4018 == req.getElementType()) {
+ return getGEFWrapper(new ConnectorTimeObservationCreateCommand(req, req.getSource(), req.getTarget()));
+ }
+ if (UMLElementTypes.DurationObservationEvent_4019 == req.getElementType()) {
+ return getGEFWrapper(new ConnectorDurationObservationCreateCommand(req, req.getSource(), req.getTarget()));
+ }
return null;
}
@@ -4869,6 +5251,10 @@ public class FunctionBehaviorCompositeItemSemanticEditPolicyCN extends UMLBaseIt
return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));
case ConstraintConstrainedElementEditPart.VISUAL_ID:
return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));
+ case ConnectorTimeObservationEditPart.VISUAL_ID:
+ return getGEFWrapper(new ConnectorTimeObservationReorientCommand(req));
+ case ConnectorDurationObservationEditPart.VISUAL_ID:
+ return getGEFWrapper(new ConnectorDurationObservationReorientCommand(req));
}
return super.getReorientReferenceRelationshipCommand(req);
}
diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/InformationFlowItemSemanticEditPolicy.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/InformationFlowItemSemanticEditPolicy.java
index f0488418d92..a4728aa9561 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/InformationFlowItemSemanticEditPolicy.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/InformationFlowItemSemanticEditPolicy.java
@@ -25,6 +25,10 @@ import org.eclipse.papyrus.diagram.composite.edit.commands.CommentAnnotatedEleme
import org.eclipse.papyrus.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ComponentRealizationCreateCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ComponentRealizationReorientCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorDurationObservationCreateCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorDurationObservationReorientCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorTimeObservationCreateCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorTimeObservationReorientCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.DependencyCreateCommand;
@@ -50,6 +54,8 @@ import org.eclipse.papyrus.diagram.composite.edit.commands.UsageReorientCommand;
import org.eclipse.papyrus.diagram.composite.edit.parts.AbstractionEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.ComponentRealizationEditPart;
+import org.eclipse.papyrus.diagram.composite.edit.parts.ConnectorDurationObservationEditPart;
+import org.eclipse.papyrus.diagram.composite.edit.parts.ConnectorTimeObservationEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.DependencyEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.DeploymentEditPart;
@@ -137,6 +143,12 @@ public class InformationFlowItemSemanticEditPolicy extends UMLBaseItemSemanticEd
if (UMLElementTypes.InformationFlow_4016 == req.getElementType()) {
return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));
}
+ if (UMLElementTypes.TimeObservationEvent_4018 == req.getElementType()) {
+ return null;
+ }
+ if (UMLElementTypes.DurationObservationEvent_4019 == req.getElementType()) {
+ return null;
+ }
return null;
}
@@ -186,6 +198,12 @@ public class InformationFlowItemSemanticEditPolicy extends UMLBaseItemSemanticEd
if (UMLElementTypes.InformationFlow_4016 == req.getElementType()) {
return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));
}
+ if (UMLElementTypes.TimeObservationEvent_4018 == req.getElementType()) {
+ return getGEFWrapper(new ConnectorTimeObservationCreateCommand(req, req.getSource(), req.getTarget()));
+ }
+ if (UMLElementTypes.DurationObservationEvent_4019 == req.getElementType()) {
+ return getGEFWrapper(new ConnectorDurationObservationCreateCommand(req, req.getSource(), req.getTarget()));
+ }
return null;
}
@@ -237,6 +255,10 @@ public class InformationFlowItemSemanticEditPolicy extends UMLBaseItemSemanticEd
return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));
case ConstraintConstrainedElementEditPart.VISUAL_ID:
return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));
+ case ConnectorTimeObservationEditPart.VISUAL_ID:
+ return getGEFWrapper(new ConnectorTimeObservationReorientCommand(req));
+ case ConnectorDurationObservationEditPart.VISUAL_ID:
+ return getGEFWrapper(new ConnectorDurationObservationReorientCommand(req));
}
return super.getReorientReferenceRelationshipCommand(req);
}
diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/InformationItemItemSemanticEditPolicy.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/InformationItemItemSemanticEditPolicy.java
index 7ed80b006b9..12e7c7b5941 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/InformationItemItemSemanticEditPolicy.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/InformationItemItemSemanticEditPolicy.java
@@ -34,6 +34,10 @@ import org.eclipse.papyrus.diagram.composite.edit.commands.CommentAnnotatedEleme
import org.eclipse.papyrus.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ComponentRealizationCreateCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ComponentRealizationReorientCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorDurationObservationCreateCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorDurationObservationReorientCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorTimeObservationCreateCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorTimeObservationReorientCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.DependencyCreateCommand;
@@ -59,6 +63,8 @@ import org.eclipse.papyrus.diagram.composite.edit.commands.UsageReorientCommand;
import org.eclipse.papyrus.diagram.composite.edit.parts.AbstractionEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.ComponentRealizationEditPart;
+import org.eclipse.papyrus.diagram.composite.edit.parts.ConnectorDurationObservationEditPart;
+import org.eclipse.papyrus.diagram.composite.edit.parts.ConnectorTimeObservationEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.DependencyEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.DeploymentEditPart;
@@ -180,6 +186,20 @@ public class InformationItemItemSemanticEditPolicy extends UMLBaseItemSemanticEd
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null,
+ incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null,
+ incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = view.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -323,6 +343,12 @@ public class InformationItemItemSemanticEditPolicy extends UMLBaseItemSemanticEd
if (UMLElementTypes.InformationFlow_4016 == req.getElementType()) {
return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));
}
+ if (UMLElementTypes.TimeObservationEvent_4018 == req.getElementType()) {
+ return null;
+ }
+ if (UMLElementTypes.DurationObservationEvent_4019 == req.getElementType()) {
+ return null;
+ }
return null;
}
@@ -372,6 +398,12 @@ public class InformationItemItemSemanticEditPolicy extends UMLBaseItemSemanticEd
if (UMLElementTypes.InformationFlow_4016 == req.getElementType()) {
return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));
}
+ if (UMLElementTypes.TimeObservationEvent_4018 == req.getElementType()) {
+ return getGEFWrapper(new ConnectorTimeObservationCreateCommand(req, req.getSource(), req.getTarget()));
+ }
+ if (UMLElementTypes.DurationObservationEvent_4019 == req.getElementType()) {
+ return getGEFWrapper(new ConnectorDurationObservationCreateCommand(req, req.getSource(), req.getTarget()));
+ }
return null;
}
@@ -423,6 +455,10 @@ public class InformationItemItemSemanticEditPolicy extends UMLBaseItemSemanticEd
return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));
case ConstraintConstrainedElementEditPart.VISUAL_ID:
return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));
+ case ConnectorTimeObservationEditPart.VISUAL_ID:
+ return getGEFWrapper(new ConnectorTimeObservationReorientCommand(req));
+ case ConnectorDurationObservationEditPart.VISUAL_ID:
+ return getGEFWrapper(new ConnectorDurationObservationReorientCommand(req));
}
return super.getReorientReferenceRelationshipCommand(req);
}
diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/InformationItemItemSemanticEditPolicyCN.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/InformationItemItemSemanticEditPolicyCN.java
index f6aa2f7f115..167fb026fc1 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/InformationItemItemSemanticEditPolicyCN.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/InformationItemItemSemanticEditPolicyCN.java
@@ -34,6 +34,10 @@ import org.eclipse.papyrus.diagram.composite.edit.commands.CommentAnnotatedEleme
import org.eclipse.papyrus.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ComponentRealizationCreateCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ComponentRealizationReorientCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorDurationObservationCreateCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorDurationObservationReorientCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorTimeObservationCreateCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorTimeObservationReorientCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.DependencyCreateCommand;
@@ -59,6 +63,8 @@ import org.eclipse.papyrus.diagram.composite.edit.commands.UsageReorientCommand;
import org.eclipse.papyrus.diagram.composite.edit.parts.AbstractionEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.ComponentRealizationEditPart;
+import org.eclipse.papyrus.diagram.composite.edit.parts.ConnectorDurationObservationEditPart;
+import org.eclipse.papyrus.diagram.composite.edit.parts.ConnectorTimeObservationEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.DependencyEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.DeploymentEditPart;
@@ -180,6 +186,20 @@ public class InformationItemItemSemanticEditPolicyCN extends UMLBaseItemSemantic
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null,
+ incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null,
+ incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = view.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -323,6 +343,12 @@ public class InformationItemItemSemanticEditPolicyCN extends UMLBaseItemSemantic
if (UMLElementTypes.InformationFlow_4016 == req.getElementType()) {
return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));
}
+ if (UMLElementTypes.TimeObservationEvent_4018 == req.getElementType()) {
+ return null;
+ }
+ if (UMLElementTypes.DurationObservationEvent_4019 == req.getElementType()) {
+ return null;
+ }
return null;
}
@@ -372,6 +398,12 @@ public class InformationItemItemSemanticEditPolicyCN extends UMLBaseItemSemantic
if (UMLElementTypes.InformationFlow_4016 == req.getElementType()) {
return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));
}
+ if (UMLElementTypes.TimeObservationEvent_4018 == req.getElementType()) {
+ return getGEFWrapper(new ConnectorTimeObservationCreateCommand(req, req.getSource(), req.getTarget()));
+ }
+ if (UMLElementTypes.DurationObservationEvent_4019 == req.getElementType()) {
+ return getGEFWrapper(new ConnectorDurationObservationCreateCommand(req, req.getSource(), req.getTarget()));
+ }
return null;
}
@@ -423,6 +455,10 @@ public class InformationItemItemSemanticEditPolicyCN extends UMLBaseItemSemantic
return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));
case ConstraintConstrainedElementEditPart.VISUAL_ID:
return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));
+ case ConnectorTimeObservationEditPart.VISUAL_ID:
+ return getGEFWrapper(new ConnectorTimeObservationReorientCommand(req));
+ case ConnectorDurationObservationEditPart.VISUAL_ID:
+ return getGEFWrapper(new ConnectorDurationObservationReorientCommand(req));
}
return super.getReorientReferenceRelationshipCommand(req);
}
diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/InstanceValueItemSemanticEditPolicy.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/InstanceValueItemSemanticEditPolicy.java
index 82911d3abde..5b1d8b254c2 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/InstanceValueItemSemanticEditPolicy.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/InstanceValueItemSemanticEditPolicy.java
@@ -34,6 +34,10 @@ import org.eclipse.papyrus.diagram.composite.edit.commands.CommentAnnotatedEleme
import org.eclipse.papyrus.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ComponentRealizationCreateCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ComponentRealizationReorientCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorDurationObservationCreateCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorDurationObservationReorientCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorTimeObservationCreateCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorTimeObservationReorientCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.DependencyCreateCommand;
@@ -59,6 +63,8 @@ import org.eclipse.papyrus.diagram.composite.edit.commands.UsageReorientCommand;
import org.eclipse.papyrus.diagram.composite.edit.parts.AbstractionEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.ComponentRealizationEditPart;
+import org.eclipse.papyrus.diagram.composite.edit.parts.ConnectorDurationObservationEditPart;
+import org.eclipse.papyrus.diagram.composite.edit.parts.ConnectorTimeObservationEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.DependencyEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.DeploymentEditPart;
@@ -180,6 +186,20 @@ public class InstanceValueItemSemanticEditPolicy extends UMLBaseItemSemanticEdit
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null,
+ incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null,
+ incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = view.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -323,6 +343,12 @@ public class InstanceValueItemSemanticEditPolicy extends UMLBaseItemSemanticEdit
if (UMLElementTypes.InformationFlow_4016 == req.getElementType()) {
return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));
}
+ if (UMLElementTypes.TimeObservationEvent_4018 == req.getElementType()) {
+ return null;
+ }
+ if (UMLElementTypes.DurationObservationEvent_4019 == req.getElementType()) {
+ return null;
+ }
return null;
}
@@ -372,6 +398,12 @@ public class InstanceValueItemSemanticEditPolicy extends UMLBaseItemSemanticEdit
if (UMLElementTypes.InformationFlow_4016 == req.getElementType()) {
return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));
}
+ if (UMLElementTypes.TimeObservationEvent_4018 == req.getElementType()) {
+ return getGEFWrapper(new ConnectorTimeObservationCreateCommand(req, req.getSource(), req.getTarget()));
+ }
+ if (UMLElementTypes.DurationObservationEvent_4019 == req.getElementType()) {
+ return getGEFWrapper(new ConnectorDurationObservationCreateCommand(req, req.getSource(), req.getTarget()));
+ }
return null;
}
@@ -423,6 +455,10 @@ public class InstanceValueItemSemanticEditPolicy extends UMLBaseItemSemanticEdit
return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));
case ConstraintConstrainedElementEditPart.VISUAL_ID:
return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));
+ case ConnectorTimeObservationEditPart.VISUAL_ID:
+ return getGEFWrapper(new ConnectorTimeObservationReorientCommand(req));
+ case ConnectorDurationObservationEditPart.VISUAL_ID:
+ return getGEFWrapper(new ConnectorDurationObservationReorientCommand(req));
}
return super.getReorientReferenceRelationshipCommand(req);
}
diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/InteractionCompositeItemSemanticEditPolicy.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/InteractionCompositeItemSemanticEditPolicy.java
index 51c591c1240..1a65a7089b2 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/InteractionCompositeItemSemanticEditPolicy.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/InteractionCompositeItemSemanticEditPolicy.java
@@ -37,6 +37,10 @@ import org.eclipse.papyrus.diagram.composite.edit.commands.CommentAnnotatedEleme
import org.eclipse.papyrus.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ComponentRealizationCreateCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ComponentRealizationReorientCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorDurationObservationCreateCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorDurationObservationReorientCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorTimeObservationCreateCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorTimeObservationReorientCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.DependencyCreateCommand;
@@ -71,6 +75,8 @@ import org.eclipse.papyrus.diagram.composite.edit.parts.CommentAnnotatedElementE
import org.eclipse.papyrus.diagram.composite.edit.parts.CommentEditPartCN;
import org.eclipse.papyrus.diagram.composite.edit.parts.ComponentCompositeEditPartCN;
import org.eclipse.papyrus.diagram.composite.edit.parts.ComponentRealizationEditPart;
+import org.eclipse.papyrus.diagram.composite.edit.parts.ConnectorDurationObservationEditPart;
+import org.eclipse.papyrus.diagram.composite.edit.parts.ConnectorTimeObservationEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.DataTypeEditPartCN;
import org.eclipse.papyrus.diagram.composite.edit.parts.DependencyEditPart;
@@ -221,6 +227,20 @@ public class InteractionCompositeItemSemanticEditPolicy extends UMLBaseItemSeman
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null,
+ incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null,
+ incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = view.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -407,6 +427,20 @@ public class InteractionCompositeItemSemanticEditPolicy extends UMLBaseItemSeman
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource().getElement(),
+ null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource().getElement(),
+ null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = node.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -584,6 +618,20 @@ public class InteractionCompositeItemSemanticEditPolicy extends UMLBaseItemSeman
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -757,6 +805,20 @@ public class InteractionCompositeItemSemanticEditPolicy extends UMLBaseItemSeman
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -930,6 +992,20 @@ public class InteractionCompositeItemSemanticEditPolicy extends UMLBaseItemSeman
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -1103,6 +1179,20 @@ public class InteractionCompositeItemSemanticEditPolicy extends UMLBaseItemSeman
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -1276,6 +1366,20 @@ public class InteractionCompositeItemSemanticEditPolicy extends UMLBaseItemSeman
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -1449,6 +1553,20 @@ public class InteractionCompositeItemSemanticEditPolicy extends UMLBaseItemSeman
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -1622,6 +1740,20 @@ public class InteractionCompositeItemSemanticEditPolicy extends UMLBaseItemSeman
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -1795,6 +1927,20 @@ public class InteractionCompositeItemSemanticEditPolicy extends UMLBaseItemSeman
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -1968,6 +2114,20 @@ public class InteractionCompositeItemSemanticEditPolicy extends UMLBaseItemSeman
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -2141,6 +2301,20 @@ public class InteractionCompositeItemSemanticEditPolicy extends UMLBaseItemSeman
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -2314,6 +2488,20 @@ public class InteractionCompositeItemSemanticEditPolicy extends UMLBaseItemSeman
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -2487,6 +2675,20 @@ public class InteractionCompositeItemSemanticEditPolicy extends UMLBaseItemSeman
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -2660,6 +2862,20 @@ public class InteractionCompositeItemSemanticEditPolicy extends UMLBaseItemSeman
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -2833,6 +3049,20 @@ public class InteractionCompositeItemSemanticEditPolicy extends UMLBaseItemSeman
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -3006,6 +3236,20 @@ public class InteractionCompositeItemSemanticEditPolicy extends UMLBaseItemSeman
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -3179,6 +3423,20 @@ public class InteractionCompositeItemSemanticEditPolicy extends UMLBaseItemSeman
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -3352,6 +3610,20 @@ public class InteractionCompositeItemSemanticEditPolicy extends UMLBaseItemSeman
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -3525,6 +3797,20 @@ public class InteractionCompositeItemSemanticEditPolicy extends UMLBaseItemSeman
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -3698,6 +3984,20 @@ public class InteractionCompositeItemSemanticEditPolicy extends UMLBaseItemSeman
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -3871,6 +4171,20 @@ public class InteractionCompositeItemSemanticEditPolicy extends UMLBaseItemSeman
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -4044,6 +4358,20 @@ public class InteractionCompositeItemSemanticEditPolicy extends UMLBaseItemSeman
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -4217,6 +4545,20 @@ public class InteractionCompositeItemSemanticEditPolicy extends UMLBaseItemSeman
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -4390,6 +4732,20 @@ public class InteractionCompositeItemSemanticEditPolicy extends UMLBaseItemSeman
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -4563,6 +4919,20 @@ public class InteractionCompositeItemSemanticEditPolicy extends UMLBaseItemSeman
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -4769,6 +5139,12 @@ public class InteractionCompositeItemSemanticEditPolicy extends UMLBaseItemSeman
if (UMLElementTypes.InformationFlow_4016 == req.getElementType()) {
return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));
}
+ if (UMLElementTypes.TimeObservationEvent_4018 == req.getElementType()) {
+ return null;
+ }
+ if (UMLElementTypes.DurationObservationEvent_4019 == req.getElementType()) {
+ return null;
+ }
return null;
}
@@ -4818,6 +5194,12 @@ public class InteractionCompositeItemSemanticEditPolicy extends UMLBaseItemSeman
if (UMLElementTypes.InformationFlow_4016 == req.getElementType()) {
return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));
}
+ if (UMLElementTypes.TimeObservationEvent_4018 == req.getElementType()) {
+ return getGEFWrapper(new ConnectorTimeObservationCreateCommand(req, req.getSource(), req.getTarget()));
+ }
+ if (UMLElementTypes.DurationObservationEvent_4019 == req.getElementType()) {
+ return getGEFWrapper(new ConnectorDurationObservationCreateCommand(req, req.getSource(), req.getTarget()));
+ }
return null;
}
@@ -4869,6 +5251,10 @@ public class InteractionCompositeItemSemanticEditPolicy extends UMLBaseItemSeman
return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));
case ConstraintConstrainedElementEditPart.VISUAL_ID:
return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));
+ case ConnectorTimeObservationEditPart.VISUAL_ID:
+ return getGEFWrapper(new ConnectorTimeObservationReorientCommand(req));
+ case ConnectorDurationObservationEditPart.VISUAL_ID:
+ return getGEFWrapper(new ConnectorDurationObservationReorientCommand(req));
}
return super.getReorientReferenceRelationshipCommand(req);
}
diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/InteractionCompositeItemSemanticEditPolicyCN.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/InteractionCompositeItemSemanticEditPolicyCN.java
index bbf1ef4bf21..78b854d7cc0 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/InteractionCompositeItemSemanticEditPolicyCN.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/InteractionCompositeItemSemanticEditPolicyCN.java
@@ -37,6 +37,10 @@ import org.eclipse.papyrus.diagram.composite.edit.commands.CommentAnnotatedEleme
import org.eclipse.papyrus.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ComponentRealizationCreateCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ComponentRealizationReorientCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorDurationObservationCreateCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorDurationObservationReorientCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorTimeObservationCreateCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorTimeObservationReorientCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.DependencyCreateCommand;
@@ -71,6 +75,8 @@ import org.eclipse.papyrus.diagram.composite.edit.parts.CommentAnnotatedElementE
import org.eclipse.papyrus.diagram.composite.edit.parts.CommentEditPartCN;
import org.eclipse.papyrus.diagram.composite.edit.parts.ComponentCompositeEditPartCN;
import org.eclipse.papyrus.diagram.composite.edit.parts.ComponentRealizationEditPart;
+import org.eclipse.papyrus.diagram.composite.edit.parts.ConnectorDurationObservationEditPart;
+import org.eclipse.papyrus.diagram.composite.edit.parts.ConnectorTimeObservationEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.DataTypeEditPartCN;
import org.eclipse.papyrus.diagram.composite.edit.parts.DependencyEditPart;
@@ -221,6 +227,20 @@ public class InteractionCompositeItemSemanticEditPolicyCN extends UMLBaseItemSem
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null,
+ incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null,
+ incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = view.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -407,6 +427,20 @@ public class InteractionCompositeItemSemanticEditPolicyCN extends UMLBaseItemSem
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource().getElement(),
+ null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource().getElement(),
+ null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = node.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -584,6 +618,20 @@ public class InteractionCompositeItemSemanticEditPolicyCN extends UMLBaseItemSem
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -757,6 +805,20 @@ public class InteractionCompositeItemSemanticEditPolicyCN extends UMLBaseItemSem
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -930,6 +992,20 @@ public class InteractionCompositeItemSemanticEditPolicyCN extends UMLBaseItemSem
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -1103,6 +1179,20 @@ public class InteractionCompositeItemSemanticEditPolicyCN extends UMLBaseItemSem
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -1276,6 +1366,20 @@ public class InteractionCompositeItemSemanticEditPolicyCN extends UMLBaseItemSem
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -1449,6 +1553,20 @@ public class InteractionCompositeItemSemanticEditPolicyCN extends UMLBaseItemSem
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -1622,6 +1740,20 @@ public class InteractionCompositeItemSemanticEditPolicyCN extends UMLBaseItemSem
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -1795,6 +1927,20 @@ public class InteractionCompositeItemSemanticEditPolicyCN extends UMLBaseItemSem
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -1968,6 +2114,20 @@ public class InteractionCompositeItemSemanticEditPolicyCN extends UMLBaseItemSem
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -2141,6 +2301,20 @@ public class InteractionCompositeItemSemanticEditPolicyCN extends UMLBaseItemSem
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -2314,6 +2488,20 @@ public class InteractionCompositeItemSemanticEditPolicyCN extends UMLBaseItemSem
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -2487,6 +2675,20 @@ public class InteractionCompositeItemSemanticEditPolicyCN extends UMLBaseItemSem
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -2660,6 +2862,20 @@ public class InteractionCompositeItemSemanticEditPolicyCN extends UMLBaseItemSem
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -2833,6 +3049,20 @@ public class InteractionCompositeItemSemanticEditPolicyCN extends UMLBaseItemSem
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -3006,6 +3236,20 @@ public class InteractionCompositeItemSemanticEditPolicyCN extends UMLBaseItemSem
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -3179,6 +3423,20 @@ public class InteractionCompositeItemSemanticEditPolicyCN extends UMLBaseItemSem
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -3352,6 +3610,20 @@ public class InteractionCompositeItemSemanticEditPolicyCN extends UMLBaseItemSem
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -3525,6 +3797,20 @@ public class InteractionCompositeItemSemanticEditPolicyCN extends UMLBaseItemSem
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -3698,6 +3984,20 @@ public class InteractionCompositeItemSemanticEditPolicyCN extends UMLBaseItemSem
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -3871,6 +4171,20 @@ public class InteractionCompositeItemSemanticEditPolicyCN extends UMLBaseItemSem
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -4044,6 +4358,20 @@ public class InteractionCompositeItemSemanticEditPolicyCN extends UMLBaseItemSem
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -4217,6 +4545,20 @@ public class InteractionCompositeItemSemanticEditPolicyCN extends UMLBaseItemSem
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -4390,6 +4732,20 @@ public class InteractionCompositeItemSemanticEditPolicyCN extends UMLBaseItemSem
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -4563,6 +4919,20 @@ public class InteractionCompositeItemSemanticEditPolicyCN extends UMLBaseItemSem
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -4769,6 +5139,12 @@ public class InteractionCompositeItemSemanticEditPolicyCN extends UMLBaseItemSem
if (UMLElementTypes.InformationFlow_4016 == req.getElementType()) {
return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));
}
+ if (UMLElementTypes.TimeObservationEvent_4018 == req.getElementType()) {
+ return null;
+ }
+ if (UMLElementTypes.DurationObservationEvent_4019 == req.getElementType()) {
+ return null;
+ }
return null;
}
@@ -4818,6 +5194,12 @@ public class InteractionCompositeItemSemanticEditPolicyCN extends UMLBaseItemSem
if (UMLElementTypes.InformationFlow_4016 == req.getElementType()) {
return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));
}
+ if (UMLElementTypes.TimeObservationEvent_4018 == req.getElementType()) {
+ return getGEFWrapper(new ConnectorTimeObservationCreateCommand(req, req.getSource(), req.getTarget()));
+ }
+ if (UMLElementTypes.DurationObservationEvent_4019 == req.getElementType()) {
+ return getGEFWrapper(new ConnectorDurationObservationCreateCommand(req, req.getSource(), req.getTarget()));
+ }
return null;
}
@@ -4869,6 +5251,10 @@ public class InteractionCompositeItemSemanticEditPolicyCN extends UMLBaseItemSem
return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));
case ConstraintConstrainedElementEditPart.VISUAL_ID:
return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));
+ case ConnectorTimeObservationEditPart.VISUAL_ID:
+ return getGEFWrapper(new ConnectorTimeObservationReorientCommand(req));
+ case ConnectorDurationObservationEditPart.VISUAL_ID:
+ return getGEFWrapper(new ConnectorDurationObservationReorientCommand(req));
}
return super.getReorientReferenceRelationshipCommand(req);
}
diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/InteractionConstraintItemSemanticEditPolicy.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/InteractionConstraintItemSemanticEditPolicy.java
index a50dd71514b..9f231345692 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/InteractionConstraintItemSemanticEditPolicy.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/InteractionConstraintItemSemanticEditPolicy.java
@@ -34,6 +34,10 @@ import org.eclipse.papyrus.diagram.composite.edit.commands.CommentAnnotatedEleme
import org.eclipse.papyrus.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ComponentRealizationCreateCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ComponentRealizationReorientCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorDurationObservationCreateCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorDurationObservationReorientCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorTimeObservationCreateCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorTimeObservationReorientCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.DependencyCreateCommand;
@@ -59,6 +63,8 @@ import org.eclipse.papyrus.diagram.composite.edit.commands.UsageReorientCommand;
import org.eclipse.papyrus.diagram.composite.edit.parts.AbstractionEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.ComponentRealizationEditPart;
+import org.eclipse.papyrus.diagram.composite.edit.parts.ConnectorDurationObservationEditPart;
+import org.eclipse.papyrus.diagram.composite.edit.parts.ConnectorTimeObservationEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.DependencyEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.DeploymentEditPart;
@@ -180,6 +186,20 @@ public class InteractionConstraintItemSemanticEditPolicy extends UMLBaseItemSema
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null,
+ incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null,
+ incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = view.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -330,6 +350,12 @@ public class InteractionConstraintItemSemanticEditPolicy extends UMLBaseItemSema
if (UMLElementTypes.InformationFlow_4016 == req.getElementType()) {
return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));
}
+ if (UMLElementTypes.TimeObservationEvent_4018 == req.getElementType()) {
+ return null;
+ }
+ if (UMLElementTypes.DurationObservationEvent_4019 == req.getElementType()) {
+ return null;
+ }
return null;
}
@@ -379,6 +405,12 @@ public class InteractionConstraintItemSemanticEditPolicy extends UMLBaseItemSema
if (UMLElementTypes.InformationFlow_4016 == req.getElementType()) {
return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));
}
+ if (UMLElementTypes.TimeObservationEvent_4018 == req.getElementType()) {
+ return getGEFWrapper(new ConnectorTimeObservationCreateCommand(req, req.getSource(), req.getTarget()));
+ }
+ if (UMLElementTypes.DurationObservationEvent_4019 == req.getElementType()) {
+ return getGEFWrapper(new ConnectorDurationObservationCreateCommand(req, req.getSource(), req.getTarget()));
+ }
return null;
}
@@ -430,6 +462,10 @@ public class InteractionConstraintItemSemanticEditPolicy extends UMLBaseItemSema
return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));
case ConstraintConstrainedElementEditPart.VISUAL_ID:
return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));
+ case ConnectorTimeObservationEditPart.VISUAL_ID:
+ return getGEFWrapper(new ConnectorTimeObservationReorientCommand(req));
+ case ConnectorDurationObservationEditPart.VISUAL_ID:
+ return getGEFWrapper(new ConnectorDurationObservationReorientCommand(req));
}
return super.getReorientReferenceRelationshipCommand(req);
}
diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/InterfaceItemSemanticEditPolicy.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/InterfaceItemSemanticEditPolicy.java
index d2672c1541a..46f01f967f1 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/InterfaceItemSemanticEditPolicy.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/InterfaceItemSemanticEditPolicy.java
@@ -36,6 +36,10 @@ import org.eclipse.papyrus.diagram.composite.edit.commands.CommentAnnotatedEleme
import org.eclipse.papyrus.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ComponentRealizationCreateCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ComponentRealizationReorientCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorDurationObservationCreateCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorDurationObservationReorientCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorTimeObservationCreateCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorTimeObservationReorientCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.DependencyCreateCommand;
@@ -61,6 +65,8 @@ import org.eclipse.papyrus.diagram.composite.edit.commands.UsageReorientCommand;
import org.eclipse.papyrus.diagram.composite.edit.parts.AbstractionEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.ComponentRealizationEditPart;
+import org.eclipse.papyrus.diagram.composite.edit.parts.ConnectorDurationObservationEditPart;
+import org.eclipse.papyrus.diagram.composite.edit.parts.ConnectorTimeObservationEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.DependencyEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.DeploymentEditPart;
@@ -183,6 +189,20 @@ public class InterfaceItemSemanticEditPolicy extends UMLBaseItemSemanticEditPoli
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null,
+ incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null,
+ incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = view.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -346,6 +366,12 @@ public class InterfaceItemSemanticEditPolicy extends UMLBaseItemSemanticEditPoli
if (UMLElementTypes.InformationFlow_4016 == req.getElementType()) {
return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));
}
+ if (UMLElementTypes.TimeObservationEvent_4018 == req.getElementType()) {
+ return null;
+ }
+ if (UMLElementTypes.DurationObservationEvent_4019 == req.getElementType()) {
+ return null;
+ }
return null;
}
@@ -395,6 +421,12 @@ public class InterfaceItemSemanticEditPolicy extends UMLBaseItemSemanticEditPoli
if (UMLElementTypes.InformationFlow_4016 == req.getElementType()) {
return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));
}
+ if (UMLElementTypes.TimeObservationEvent_4018 == req.getElementType()) {
+ return getGEFWrapper(new ConnectorTimeObservationCreateCommand(req, req.getSource(), req.getTarget()));
+ }
+ if (UMLElementTypes.DurationObservationEvent_4019 == req.getElementType()) {
+ return getGEFWrapper(new ConnectorDurationObservationCreateCommand(req, req.getSource(), req.getTarget()));
+ }
return null;
}
@@ -446,6 +478,10 @@ public class InterfaceItemSemanticEditPolicy extends UMLBaseItemSemanticEditPoli
return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));
case ConstraintConstrainedElementEditPart.VISUAL_ID:
return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));
+ case ConnectorTimeObservationEditPart.VISUAL_ID:
+ return getGEFWrapper(new ConnectorTimeObservationReorientCommand(req));
+ case ConnectorDurationObservationEditPart.VISUAL_ID:
+ return getGEFWrapper(new ConnectorDurationObservationReorientCommand(req));
}
return super.getReorientReferenceRelationshipCommand(req);
}
diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/InterfaceItemSemanticEditPolicyCN.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/InterfaceItemSemanticEditPolicyCN.java
index 157e5acf362..07574311ac5 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/InterfaceItemSemanticEditPolicyCN.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/InterfaceItemSemanticEditPolicyCN.java
@@ -36,6 +36,10 @@ import org.eclipse.papyrus.diagram.composite.edit.commands.CommentAnnotatedEleme
import org.eclipse.papyrus.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ComponentRealizationCreateCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ComponentRealizationReorientCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorDurationObservationCreateCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorDurationObservationReorientCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorTimeObservationCreateCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorTimeObservationReorientCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.DependencyCreateCommand;
@@ -61,6 +65,8 @@ import org.eclipse.papyrus.diagram.composite.edit.commands.UsageReorientCommand;
import org.eclipse.papyrus.diagram.composite.edit.parts.AbstractionEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.ComponentRealizationEditPart;
+import org.eclipse.papyrus.diagram.composite.edit.parts.ConnectorDurationObservationEditPart;
+import org.eclipse.papyrus.diagram.composite.edit.parts.ConnectorTimeObservationEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.DependencyEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.DeploymentEditPart;
@@ -183,6 +189,20 @@ public class InterfaceItemSemanticEditPolicyCN extends UMLBaseItemSemanticEditPo
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null,
+ incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null,
+ incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = view.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -346,6 +366,12 @@ public class InterfaceItemSemanticEditPolicyCN extends UMLBaseItemSemanticEditPo
if (UMLElementTypes.InformationFlow_4016 == req.getElementType()) {
return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));
}
+ if (UMLElementTypes.TimeObservationEvent_4018 == req.getElementType()) {
+ return null;
+ }
+ if (UMLElementTypes.DurationObservationEvent_4019 == req.getElementType()) {
+ return null;
+ }
return null;
}
@@ -395,6 +421,12 @@ public class InterfaceItemSemanticEditPolicyCN extends UMLBaseItemSemanticEditPo
if (UMLElementTypes.InformationFlow_4016 == req.getElementType()) {
return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));
}
+ if (UMLElementTypes.TimeObservationEvent_4018 == req.getElementType()) {
+ return getGEFWrapper(new ConnectorTimeObservationCreateCommand(req, req.getSource(), req.getTarget()));
+ }
+ if (UMLElementTypes.DurationObservationEvent_4019 == req.getElementType()) {
+ return getGEFWrapper(new ConnectorDurationObservationCreateCommand(req, req.getSource(), req.getTarget()));
+ }
return null;
}
@@ -446,6 +478,10 @@ public class InterfaceItemSemanticEditPolicyCN extends UMLBaseItemSemanticEditPo
return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));
case ConstraintConstrainedElementEditPart.VISUAL_ID:
return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));
+ case ConnectorTimeObservationEditPart.VISUAL_ID:
+ return getGEFWrapper(new ConnectorTimeObservationReorientCommand(req));
+ case ConnectorDurationObservationEditPart.VISUAL_ID:
+ return getGEFWrapper(new ConnectorDurationObservationReorientCommand(req));
}
return super.getReorientReferenceRelationshipCommand(req);
}
diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/InterfaceRealizationItemSemanticEditPolicy.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/InterfaceRealizationItemSemanticEditPolicy.java
index 3843713f096..f0e540d258e 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/InterfaceRealizationItemSemanticEditPolicy.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/InterfaceRealizationItemSemanticEditPolicy.java
@@ -25,6 +25,10 @@ import org.eclipse.papyrus.diagram.composite.edit.commands.CommentAnnotatedEleme
import org.eclipse.papyrus.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ComponentRealizationCreateCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ComponentRealizationReorientCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorDurationObservationCreateCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorDurationObservationReorientCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorTimeObservationCreateCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorTimeObservationReorientCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.DependencyCreateCommand;
@@ -50,6 +54,8 @@ import org.eclipse.papyrus.diagram.composite.edit.commands.UsageReorientCommand;
import org.eclipse.papyrus.diagram.composite.edit.parts.AbstractionEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.ComponentRealizationEditPart;
+import org.eclipse.papyrus.diagram.composite.edit.parts.ConnectorDurationObservationEditPart;
+import org.eclipse.papyrus.diagram.composite.edit.parts.ConnectorTimeObservationEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.DependencyEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.DeploymentEditPart;
@@ -137,6 +143,12 @@ public class InterfaceRealizationItemSemanticEditPolicy extends UMLBaseItemSeman
if (UMLElementTypes.InformationFlow_4016 == req.getElementType()) {
return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));
}
+ if (UMLElementTypes.TimeObservationEvent_4018 == req.getElementType()) {
+ return null;
+ }
+ if (UMLElementTypes.DurationObservationEvent_4019 == req.getElementType()) {
+ return null;
+ }
return null;
}
@@ -186,6 +198,12 @@ public class InterfaceRealizationItemSemanticEditPolicy extends UMLBaseItemSeman
if (UMLElementTypes.InformationFlow_4016 == req.getElementType()) {
return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));
}
+ if (UMLElementTypes.TimeObservationEvent_4018 == req.getElementType()) {
+ return getGEFWrapper(new ConnectorTimeObservationCreateCommand(req, req.getSource(), req.getTarget()));
+ }
+ if (UMLElementTypes.DurationObservationEvent_4019 == req.getElementType()) {
+ return getGEFWrapper(new ConnectorDurationObservationCreateCommand(req, req.getSource(), req.getTarget()));
+ }
return null;
}
@@ -237,6 +255,10 @@ public class InterfaceRealizationItemSemanticEditPolicy extends UMLBaseItemSeman
return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));
case ConstraintConstrainedElementEditPart.VISUAL_ID:
return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));
+ case ConnectorTimeObservationEditPart.VISUAL_ID:
+ return getGEFWrapper(new ConnectorTimeObservationReorientCommand(req));
+ case ConnectorDurationObservationEditPart.VISUAL_ID:
+ return getGEFWrapper(new ConnectorDurationObservationReorientCommand(req));
}
return super.getReorientReferenceRelationshipCommand(req);
}
diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/IntervalConstraintItemSemanticEditPolicy.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/IntervalConstraintItemSemanticEditPolicy.java
index 966b5af64d0..4a46a20ae51 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/IntervalConstraintItemSemanticEditPolicy.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/IntervalConstraintItemSemanticEditPolicy.java
@@ -34,6 +34,10 @@ import org.eclipse.papyrus.diagram.composite.edit.commands.CommentAnnotatedEleme
import org.eclipse.papyrus.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ComponentRealizationCreateCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ComponentRealizationReorientCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorDurationObservationCreateCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorDurationObservationReorientCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorTimeObservationCreateCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorTimeObservationReorientCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.DependencyCreateCommand;
@@ -59,6 +63,8 @@ import org.eclipse.papyrus.diagram.composite.edit.commands.UsageReorientCommand;
import org.eclipse.papyrus.diagram.composite.edit.parts.AbstractionEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.ComponentRealizationEditPart;
+import org.eclipse.papyrus.diagram.composite.edit.parts.ConnectorDurationObservationEditPart;
+import org.eclipse.papyrus.diagram.composite.edit.parts.ConnectorTimeObservationEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.DependencyEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.DeploymentEditPart;
@@ -180,6 +186,20 @@ public class IntervalConstraintItemSemanticEditPolicy extends UMLBaseItemSemanti
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null,
+ incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null,
+ incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = view.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -330,6 +350,12 @@ public class IntervalConstraintItemSemanticEditPolicy extends UMLBaseItemSemanti
if (UMLElementTypes.InformationFlow_4016 == req.getElementType()) {
return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));
}
+ if (UMLElementTypes.TimeObservationEvent_4018 == req.getElementType()) {
+ return null;
+ }
+ if (UMLElementTypes.DurationObservationEvent_4019 == req.getElementType()) {
+ return null;
+ }
return null;
}
@@ -379,6 +405,12 @@ public class IntervalConstraintItemSemanticEditPolicy extends UMLBaseItemSemanti
if (UMLElementTypes.InformationFlow_4016 == req.getElementType()) {
return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));
}
+ if (UMLElementTypes.TimeObservationEvent_4018 == req.getElementType()) {
+ return getGEFWrapper(new ConnectorTimeObservationCreateCommand(req, req.getSource(), req.getTarget()));
+ }
+ if (UMLElementTypes.DurationObservationEvent_4019 == req.getElementType()) {
+ return getGEFWrapper(new ConnectorDurationObservationCreateCommand(req, req.getSource(), req.getTarget()));
+ }
return null;
}
@@ -430,6 +462,10 @@ public class IntervalConstraintItemSemanticEditPolicy extends UMLBaseItemSemanti
return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));
case ConstraintConstrainedElementEditPart.VISUAL_ID:
return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));
+ case ConnectorTimeObservationEditPart.VISUAL_ID:
+ return getGEFWrapper(new ConnectorTimeObservationReorientCommand(req));
+ case ConnectorDurationObservationEditPart.VISUAL_ID:
+ return getGEFWrapper(new ConnectorDurationObservationReorientCommand(req));
}
return super.getReorientReferenceRelationshipCommand(req);
}
diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/IntervalItemSemanticEditPolicy.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/IntervalItemSemanticEditPolicy.java
index bafd4ae2ad8..316f22ab436 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/IntervalItemSemanticEditPolicy.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/IntervalItemSemanticEditPolicy.java
@@ -34,6 +34,10 @@ import org.eclipse.papyrus.diagram.composite.edit.commands.CommentAnnotatedEleme
import org.eclipse.papyrus.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ComponentRealizationCreateCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ComponentRealizationReorientCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorDurationObservationCreateCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorDurationObservationReorientCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorTimeObservationCreateCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorTimeObservationReorientCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.DependencyCreateCommand;
@@ -59,6 +63,8 @@ import org.eclipse.papyrus.diagram.composite.edit.commands.UsageReorientCommand;
import org.eclipse.papyrus.diagram.composite.edit.parts.AbstractionEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.ComponentRealizationEditPart;
+import org.eclipse.papyrus.diagram.composite.edit.parts.ConnectorDurationObservationEditPart;
+import org.eclipse.papyrus.diagram.composite.edit.parts.ConnectorTimeObservationEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.DependencyEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.DeploymentEditPart;
@@ -180,6 +186,20 @@ public class IntervalItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolic
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null,
+ incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null,
+ incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = view.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -323,6 +343,12 @@ public class IntervalItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolic
if (UMLElementTypes.InformationFlow_4016 == req.getElementType()) {
return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));
}
+ if (UMLElementTypes.TimeObservationEvent_4018 == req.getElementType()) {
+ return null;
+ }
+ if (UMLElementTypes.DurationObservationEvent_4019 == req.getElementType()) {
+ return null;
+ }
return null;
}
@@ -372,6 +398,12 @@ public class IntervalItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolic
if (UMLElementTypes.InformationFlow_4016 == req.getElementType()) {
return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));
}
+ if (UMLElementTypes.TimeObservationEvent_4018 == req.getElementType()) {
+ return getGEFWrapper(new ConnectorTimeObservationCreateCommand(req, req.getSource(), req.getTarget()));
+ }
+ if (UMLElementTypes.DurationObservationEvent_4019 == req.getElementType()) {
+ return getGEFWrapper(new ConnectorDurationObservationCreateCommand(req, req.getSource(), req.getTarget()));
+ }
return null;
}
@@ -423,6 +455,10 @@ public class IntervalItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolic
return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));
case ConstraintConstrainedElementEditPart.VISUAL_ID:
return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));
+ case ConnectorTimeObservationEditPart.VISUAL_ID:
+ return getGEFWrapper(new ConnectorTimeObservationReorientCommand(req));
+ case ConnectorDurationObservationEditPart.VISUAL_ID:
+ return getGEFWrapper(new ConnectorDurationObservationReorientCommand(req));
}
return super.getReorientReferenceRelationshipCommand(req);
}
diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/LiteralBooleanItemSemanticEditPolicy.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/LiteralBooleanItemSemanticEditPolicy.java
index 18898a26992..cf028847563 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/LiteralBooleanItemSemanticEditPolicy.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/LiteralBooleanItemSemanticEditPolicy.java
@@ -34,6 +34,10 @@ import org.eclipse.papyrus.diagram.composite.edit.commands.CommentAnnotatedEleme
import org.eclipse.papyrus.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ComponentRealizationCreateCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ComponentRealizationReorientCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorDurationObservationCreateCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorDurationObservationReorientCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorTimeObservationCreateCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorTimeObservationReorientCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.DependencyCreateCommand;
@@ -59,6 +63,8 @@ import org.eclipse.papyrus.diagram.composite.edit.commands.UsageReorientCommand;
import org.eclipse.papyrus.diagram.composite.edit.parts.AbstractionEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.ComponentRealizationEditPart;
+import org.eclipse.papyrus.diagram.composite.edit.parts.ConnectorDurationObservationEditPart;
+import org.eclipse.papyrus.diagram.composite.edit.parts.ConnectorTimeObservationEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.DependencyEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.DeploymentEditPart;
@@ -180,6 +186,20 @@ public class LiteralBooleanItemSemanticEditPolicy extends UMLBaseItemSemanticEdi
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null,
+ incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null,
+ incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = view.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -323,6 +343,12 @@ public class LiteralBooleanItemSemanticEditPolicy extends UMLBaseItemSemanticEdi
if (UMLElementTypes.InformationFlow_4016 == req.getElementType()) {
return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));
}
+ if (UMLElementTypes.TimeObservationEvent_4018 == req.getElementType()) {
+ return null;
+ }
+ if (UMLElementTypes.DurationObservationEvent_4019 == req.getElementType()) {
+ return null;
+ }
return null;
}
@@ -372,6 +398,12 @@ public class LiteralBooleanItemSemanticEditPolicy extends UMLBaseItemSemanticEdi
if (UMLElementTypes.InformationFlow_4016 == req.getElementType()) {
return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));
}
+ if (UMLElementTypes.TimeObservationEvent_4018 == req.getElementType()) {
+ return getGEFWrapper(new ConnectorTimeObservationCreateCommand(req, req.getSource(), req.getTarget()));
+ }
+ if (UMLElementTypes.DurationObservationEvent_4019 == req.getElementType()) {
+ return getGEFWrapper(new ConnectorDurationObservationCreateCommand(req, req.getSource(), req.getTarget()));
+ }
return null;
}
@@ -423,6 +455,10 @@ public class LiteralBooleanItemSemanticEditPolicy extends UMLBaseItemSemanticEdi
return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));
case ConstraintConstrainedElementEditPart.VISUAL_ID:
return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));
+ case ConnectorTimeObservationEditPart.VISUAL_ID:
+ return getGEFWrapper(new ConnectorTimeObservationReorientCommand(req));
+ case ConnectorDurationObservationEditPart.VISUAL_ID:
+ return getGEFWrapper(new ConnectorDurationObservationReorientCommand(req));
}
return super.getReorientReferenceRelationshipCommand(req);
}
diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/LiteralIntegerItemSemanticEditPolicy.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/LiteralIntegerItemSemanticEditPolicy.java
index 60caba4246f..84bb6008a87 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/LiteralIntegerItemSemanticEditPolicy.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/LiteralIntegerItemSemanticEditPolicy.java
@@ -34,6 +34,10 @@ import org.eclipse.papyrus.diagram.composite.edit.commands.CommentAnnotatedEleme
import org.eclipse.papyrus.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ComponentRealizationCreateCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ComponentRealizationReorientCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorDurationObservationCreateCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorDurationObservationReorientCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorTimeObservationCreateCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorTimeObservationReorientCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.DependencyCreateCommand;
@@ -59,6 +63,8 @@ import org.eclipse.papyrus.diagram.composite.edit.commands.UsageReorientCommand;
import org.eclipse.papyrus.diagram.composite.edit.parts.AbstractionEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.ComponentRealizationEditPart;
+import org.eclipse.papyrus.diagram.composite.edit.parts.ConnectorDurationObservationEditPart;
+import org.eclipse.papyrus.diagram.composite.edit.parts.ConnectorTimeObservationEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.DependencyEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.DeploymentEditPart;
@@ -180,6 +186,20 @@ public class LiteralIntegerItemSemanticEditPolicy extends UMLBaseItemSemanticEdi
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null,
+ incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null,
+ incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = view.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -323,6 +343,12 @@ public class LiteralIntegerItemSemanticEditPolicy extends UMLBaseItemSemanticEdi
if (UMLElementTypes.InformationFlow_4016 == req.getElementType()) {
return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));
}
+ if (UMLElementTypes.TimeObservationEvent_4018 == req.getElementType()) {
+ return null;
+ }
+ if (UMLElementTypes.DurationObservationEvent_4019 == req.getElementType()) {
+ return null;
+ }
return null;
}
@@ -372,6 +398,12 @@ public class LiteralIntegerItemSemanticEditPolicy extends UMLBaseItemSemanticEdi
if (UMLElementTypes.InformationFlow_4016 == req.getElementType()) {
return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));
}
+ if (UMLElementTypes.TimeObservationEvent_4018 == req.getElementType()) {
+ return getGEFWrapper(new ConnectorTimeObservationCreateCommand(req, req.getSource(), req.getTarget()));
+ }
+ if (UMLElementTypes.DurationObservationEvent_4019 == req.getElementType()) {
+ return getGEFWrapper(new ConnectorDurationObservationCreateCommand(req, req.getSource(), req.getTarget()));
+ }
return null;
}
@@ -423,6 +455,10 @@ public class LiteralIntegerItemSemanticEditPolicy extends UMLBaseItemSemanticEdi
return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));
case ConstraintConstrainedElementEditPart.VISUAL_ID:
return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));
+ case ConnectorTimeObservationEditPart.VISUAL_ID:
+ return getGEFWrapper(new ConnectorTimeObservationReorientCommand(req));
+ case ConnectorDurationObservationEditPart.VISUAL_ID:
+ return getGEFWrapper(new ConnectorDurationObservationReorientCommand(req));
}
return super.getReorientReferenceRelationshipCommand(req);
}
diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/LiteralNullItemSemanticEditPolicy.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/LiteralNullItemSemanticEditPolicy.java
index 73f363a433c..37f95ec5c2a 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/LiteralNullItemSemanticEditPolicy.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/LiteralNullItemSemanticEditPolicy.java
@@ -34,6 +34,10 @@ import org.eclipse.papyrus.diagram.composite.edit.commands.CommentAnnotatedEleme
import org.eclipse.papyrus.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ComponentRealizationCreateCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ComponentRealizationReorientCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorDurationObservationCreateCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorDurationObservationReorientCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorTimeObservationCreateCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorTimeObservationReorientCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.DependencyCreateCommand;
@@ -59,6 +63,8 @@ import org.eclipse.papyrus.diagram.composite.edit.commands.UsageReorientCommand;
import org.eclipse.papyrus.diagram.composite.edit.parts.AbstractionEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.ComponentRealizationEditPart;
+import org.eclipse.papyrus.diagram.composite.edit.parts.ConnectorDurationObservationEditPart;
+import org.eclipse.papyrus.diagram.composite.edit.parts.ConnectorTimeObservationEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.DependencyEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.DeploymentEditPart;
@@ -180,6 +186,20 @@ public class LiteralNullItemSemanticEditPolicy extends UMLBaseItemSemanticEditPo
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null,
+ incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null,
+ incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = view.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -323,6 +343,12 @@ public class LiteralNullItemSemanticEditPolicy extends UMLBaseItemSemanticEditPo
if (UMLElementTypes.InformationFlow_4016 == req.getElementType()) {
return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));
}
+ if (UMLElementTypes.TimeObservationEvent_4018 == req.getElementType()) {
+ return null;
+ }
+ if (UMLElementTypes.DurationObservationEvent_4019 == req.getElementType()) {
+ return null;
+ }
return null;
}
@@ -372,6 +398,12 @@ public class LiteralNullItemSemanticEditPolicy extends UMLBaseItemSemanticEditPo
if (UMLElementTypes.InformationFlow_4016 == req.getElementType()) {
return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));
}
+ if (UMLElementTypes.TimeObservationEvent_4018 == req.getElementType()) {
+ return getGEFWrapper(new ConnectorTimeObservationCreateCommand(req, req.getSource(), req.getTarget()));
+ }
+ if (UMLElementTypes.DurationObservationEvent_4019 == req.getElementType()) {
+ return getGEFWrapper(new ConnectorDurationObservationCreateCommand(req, req.getSource(), req.getTarget()));
+ }
return null;
}
@@ -423,6 +455,10 @@ public class LiteralNullItemSemanticEditPolicy extends UMLBaseItemSemanticEditPo
return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));
case ConstraintConstrainedElementEditPart.VISUAL_ID:
return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));
+ case ConnectorTimeObservationEditPart.VISUAL_ID:
+ return getGEFWrapper(new ConnectorTimeObservationReorientCommand(req));
+ case ConnectorDurationObservationEditPart.VISUAL_ID:
+ return getGEFWrapper(new ConnectorDurationObservationReorientCommand(req));
}
return super.getReorientReferenceRelationshipCommand(req);
}
diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/LiteralStringItemSemanticEditPolicy.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/LiteralStringItemSemanticEditPolicy.java
index 629235b8451..9a96d7a95ad 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/LiteralStringItemSemanticEditPolicy.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/LiteralStringItemSemanticEditPolicy.java
@@ -34,6 +34,10 @@ import org.eclipse.papyrus.diagram.composite.edit.commands.CommentAnnotatedEleme
import org.eclipse.papyrus.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ComponentRealizationCreateCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ComponentRealizationReorientCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorDurationObservationCreateCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorDurationObservationReorientCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorTimeObservationCreateCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorTimeObservationReorientCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.DependencyCreateCommand;
@@ -59,6 +63,8 @@ import org.eclipse.papyrus.diagram.composite.edit.commands.UsageReorientCommand;
import org.eclipse.papyrus.diagram.composite.edit.parts.AbstractionEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.ComponentRealizationEditPart;
+import org.eclipse.papyrus.diagram.composite.edit.parts.ConnectorDurationObservationEditPart;
+import org.eclipse.papyrus.diagram.composite.edit.parts.ConnectorTimeObservationEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.DependencyEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.DeploymentEditPart;
@@ -180,6 +186,20 @@ public class LiteralStringItemSemanticEditPolicy extends UMLBaseItemSemanticEdit
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null,
+ incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null,
+ incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = view.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -323,6 +343,12 @@ public class LiteralStringItemSemanticEditPolicy extends UMLBaseItemSemanticEdit
if (UMLElementTypes.InformationFlow_4016 == req.getElementType()) {
return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));
}
+ if (UMLElementTypes.TimeObservationEvent_4018 == req.getElementType()) {
+ return null;
+ }
+ if (UMLElementTypes.DurationObservationEvent_4019 == req.getElementType()) {
+ return null;
+ }
return null;
}
@@ -372,6 +398,12 @@ public class LiteralStringItemSemanticEditPolicy extends UMLBaseItemSemanticEdit
if (UMLElementTypes.InformationFlow_4016 == req.getElementType()) {
return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));
}
+ if (UMLElementTypes.TimeObservationEvent_4018 == req.getElementType()) {
+ return getGEFWrapper(new ConnectorTimeObservationCreateCommand(req, req.getSource(), req.getTarget()));
+ }
+ if (UMLElementTypes.DurationObservationEvent_4019 == req.getElementType()) {
+ return getGEFWrapper(new ConnectorDurationObservationCreateCommand(req, req.getSource(), req.getTarget()));
+ }
return null;
}
@@ -423,6 +455,10 @@ public class LiteralStringItemSemanticEditPolicy extends UMLBaseItemSemanticEdit
return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));
case ConstraintConstrainedElementEditPart.VISUAL_ID:
return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));
+ case ConnectorTimeObservationEditPart.VISUAL_ID:
+ return getGEFWrapper(new ConnectorTimeObservationReorientCommand(req));
+ case ConnectorDurationObservationEditPart.VISUAL_ID:
+ return getGEFWrapper(new ConnectorDurationObservationReorientCommand(req));
}
return super.getReorientReferenceRelationshipCommand(req);
}
diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/LiteralUnlimitedNaturalItemSemanticEditPolicy.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/LiteralUnlimitedNaturalItemSemanticEditPolicy.java
index c9340df4b5d..e0a06f42315 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/LiteralUnlimitedNaturalItemSemanticEditPolicy.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/LiteralUnlimitedNaturalItemSemanticEditPolicy.java
@@ -34,6 +34,10 @@ import org.eclipse.papyrus.diagram.composite.edit.commands.CommentAnnotatedEleme
import org.eclipse.papyrus.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ComponentRealizationCreateCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ComponentRealizationReorientCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorDurationObservationCreateCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorDurationObservationReorientCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorTimeObservationCreateCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorTimeObservationReorientCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.DependencyCreateCommand;
@@ -59,6 +63,8 @@ import org.eclipse.papyrus.diagram.composite.edit.commands.UsageReorientCommand;
import org.eclipse.papyrus.diagram.composite.edit.parts.AbstractionEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.ComponentRealizationEditPart;
+import org.eclipse.papyrus.diagram.composite.edit.parts.ConnectorDurationObservationEditPart;
+import org.eclipse.papyrus.diagram.composite.edit.parts.ConnectorTimeObservationEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.DependencyEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.DeploymentEditPart;
@@ -180,6 +186,20 @@ public class LiteralUnlimitedNaturalItemSemanticEditPolicy extends UMLBaseItemSe
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null,
+ incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null,
+ incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = view.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -323,6 +343,12 @@ public class LiteralUnlimitedNaturalItemSemanticEditPolicy extends UMLBaseItemSe
if (UMLElementTypes.InformationFlow_4016 == req.getElementType()) {
return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));
}
+ if (UMLElementTypes.TimeObservationEvent_4018 == req.getElementType()) {
+ return null;
+ }
+ if (UMLElementTypes.DurationObservationEvent_4019 == req.getElementType()) {
+ return null;
+ }
return null;
}
@@ -372,6 +398,12 @@ public class LiteralUnlimitedNaturalItemSemanticEditPolicy extends UMLBaseItemSe
if (UMLElementTypes.InformationFlow_4016 == req.getElementType()) {
return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));
}
+ if (UMLElementTypes.TimeObservationEvent_4018 == req.getElementType()) {
+ return getGEFWrapper(new ConnectorTimeObservationCreateCommand(req, req.getSource(), req.getTarget()));
+ }
+ if (UMLElementTypes.DurationObservationEvent_4019 == req.getElementType()) {
+ return getGEFWrapper(new ConnectorDurationObservationCreateCommand(req, req.getSource(), req.getTarget()));
+ }
return null;
}
@@ -423,6 +455,10 @@ public class LiteralUnlimitedNaturalItemSemanticEditPolicy extends UMLBaseItemSe
return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));
case ConstraintConstrainedElementEditPart.VISUAL_ID:
return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));
+ case ConnectorTimeObservationEditPart.VISUAL_ID:
+ return getGEFWrapper(new ConnectorTimeObservationReorientCommand(req));
+ case ConnectorDurationObservationEditPart.VISUAL_ID:
+ return getGEFWrapper(new ConnectorDurationObservationReorientCommand(req));
}
return super.getReorientReferenceRelationshipCommand(req);
}
diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/ManifestationItemSemanticEditPolicy.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/ManifestationItemSemanticEditPolicy.java
index 02ac4c4d95b..acc28ee5c9a 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/ManifestationItemSemanticEditPolicy.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/ManifestationItemSemanticEditPolicy.java
@@ -25,6 +25,10 @@ import org.eclipse.papyrus.diagram.composite.edit.commands.CommentAnnotatedEleme
import org.eclipse.papyrus.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ComponentRealizationCreateCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ComponentRealizationReorientCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorDurationObservationCreateCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorDurationObservationReorientCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorTimeObservationCreateCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorTimeObservationReorientCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.DependencyCreateCommand;
@@ -50,6 +54,8 @@ import org.eclipse.papyrus.diagram.composite.edit.commands.UsageReorientCommand;
import org.eclipse.papyrus.diagram.composite.edit.parts.AbstractionEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.ComponentRealizationEditPart;
+import org.eclipse.papyrus.diagram.composite.edit.parts.ConnectorDurationObservationEditPart;
+import org.eclipse.papyrus.diagram.composite.edit.parts.ConnectorTimeObservationEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.DependencyEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.DeploymentEditPart;
@@ -137,6 +143,12 @@ public class ManifestationItemSemanticEditPolicy extends UMLBaseItemSemanticEdit
if (UMLElementTypes.InformationFlow_4016 == req.getElementType()) {
return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));
}
+ if (UMLElementTypes.TimeObservationEvent_4018 == req.getElementType()) {
+ return null;
+ }
+ if (UMLElementTypes.DurationObservationEvent_4019 == req.getElementType()) {
+ return null;
+ }
return null;
}
@@ -186,6 +198,12 @@ public class ManifestationItemSemanticEditPolicy extends UMLBaseItemSemanticEdit
if (UMLElementTypes.InformationFlow_4016 == req.getElementType()) {
return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));
}
+ if (UMLElementTypes.TimeObservationEvent_4018 == req.getElementType()) {
+ return getGEFWrapper(new ConnectorTimeObservationCreateCommand(req, req.getSource(), req.getTarget()));
+ }
+ if (UMLElementTypes.DurationObservationEvent_4019 == req.getElementType()) {
+ return getGEFWrapper(new ConnectorDurationObservationCreateCommand(req, req.getSource(), req.getTarget()));
+ }
return null;
}
@@ -237,6 +255,10 @@ public class ManifestationItemSemanticEditPolicy extends UMLBaseItemSemanticEdit
return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));
case ConstraintConstrainedElementEditPart.VISUAL_ID:
return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));
+ case ConnectorTimeObservationEditPart.VISUAL_ID:
+ return getGEFWrapper(new ConnectorTimeObservationReorientCommand(req));
+ case ConnectorDurationObservationEditPart.VISUAL_ID:
+ return getGEFWrapper(new ConnectorDurationObservationReorientCommand(req));
}
return super.getReorientReferenceRelationshipCommand(req);
}
diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/NodeCompositeItemSemanticEditPolicy.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/NodeCompositeItemSemanticEditPolicy.java
index cb7027a9c57..0c333d4ffd8 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/NodeCompositeItemSemanticEditPolicy.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/NodeCompositeItemSemanticEditPolicy.java
@@ -37,6 +37,10 @@ import org.eclipse.papyrus.diagram.composite.edit.commands.CommentAnnotatedEleme
import org.eclipse.papyrus.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ComponentRealizationCreateCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ComponentRealizationReorientCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorDurationObservationCreateCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorDurationObservationReorientCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorTimeObservationCreateCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorTimeObservationReorientCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.DependencyCreateCommand;
@@ -71,6 +75,8 @@ import org.eclipse.papyrus.diagram.composite.edit.parts.CommentAnnotatedElementE
import org.eclipse.papyrus.diagram.composite.edit.parts.CommentEditPartCN;
import org.eclipse.papyrus.diagram.composite.edit.parts.ComponentCompositeEditPartCN;
import org.eclipse.papyrus.diagram.composite.edit.parts.ComponentRealizationEditPart;
+import org.eclipse.papyrus.diagram.composite.edit.parts.ConnectorDurationObservationEditPart;
+import org.eclipse.papyrus.diagram.composite.edit.parts.ConnectorTimeObservationEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.DataTypeEditPartCN;
import org.eclipse.papyrus.diagram.composite.edit.parts.DependencyEditPart;
@@ -221,6 +227,20 @@ public class NodeCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEdit
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null,
+ incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null,
+ incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = view.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -407,6 +427,20 @@ public class NodeCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEdit
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource().getElement(),
+ null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource().getElement(),
+ null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = node.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -584,6 +618,20 @@ public class NodeCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEdit
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -757,6 +805,20 @@ public class NodeCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEdit
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -930,6 +992,20 @@ public class NodeCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEdit
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -1103,6 +1179,20 @@ public class NodeCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEdit
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -1276,6 +1366,20 @@ public class NodeCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEdit
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -1449,6 +1553,20 @@ public class NodeCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEdit
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -1622,6 +1740,20 @@ public class NodeCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEdit
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -1795,6 +1927,20 @@ public class NodeCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEdit
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -1968,6 +2114,20 @@ public class NodeCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEdit
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -2141,6 +2301,20 @@ public class NodeCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEdit
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -2314,6 +2488,20 @@ public class NodeCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEdit
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -2487,6 +2675,20 @@ public class NodeCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEdit
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -2660,6 +2862,20 @@ public class NodeCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEdit
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -2833,6 +3049,20 @@ public class NodeCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEdit
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -3006,6 +3236,20 @@ public class NodeCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEdit
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -3179,6 +3423,20 @@ public class NodeCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEdit
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -3352,6 +3610,20 @@ public class NodeCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEdit
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -3525,6 +3797,20 @@ public class NodeCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEdit
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -3698,6 +3984,20 @@ public class NodeCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEdit
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -3871,6 +4171,20 @@ public class NodeCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEdit
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -4044,6 +4358,20 @@ public class NodeCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEdit
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -4217,6 +4545,20 @@ public class NodeCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEdit
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -4390,6 +4732,20 @@ public class NodeCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEdit
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -4563,6 +4919,20 @@ public class NodeCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEdit
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -4769,6 +5139,12 @@ public class NodeCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEdit
if (UMLElementTypes.InformationFlow_4016 == req.getElementType()) {
return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));
}
+ if (UMLElementTypes.TimeObservationEvent_4018 == req.getElementType()) {
+ return null;
+ }
+ if (UMLElementTypes.DurationObservationEvent_4019 == req.getElementType()) {
+ return null;
+ }
return null;
}
@@ -4818,6 +5194,12 @@ public class NodeCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEdit
if (UMLElementTypes.InformationFlow_4016 == req.getElementType()) {
return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));
}
+ if (UMLElementTypes.TimeObservationEvent_4018 == req.getElementType()) {
+ return getGEFWrapper(new ConnectorTimeObservationCreateCommand(req, req.getSource(), req.getTarget()));
+ }
+ if (UMLElementTypes.DurationObservationEvent_4019 == req.getElementType()) {
+ return getGEFWrapper(new ConnectorDurationObservationCreateCommand(req, req.getSource(), req.getTarget()));
+ }
return null;
}
@@ -4869,6 +5251,10 @@ public class NodeCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEdit
return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));
case ConstraintConstrainedElementEditPart.VISUAL_ID:
return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));
+ case ConnectorTimeObservationEditPart.VISUAL_ID:
+ return getGEFWrapper(new ConnectorTimeObservationReorientCommand(req));
+ case ConnectorDurationObservationEditPart.VISUAL_ID:
+ return getGEFWrapper(new ConnectorDurationObservationReorientCommand(req));
}
return super.getReorientReferenceRelationshipCommand(req);
}
diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/NodeCompositeItemSemanticEditPolicycN.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/NodeCompositeItemSemanticEditPolicycN.java
index e028904e530..b20b8868da7 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/NodeCompositeItemSemanticEditPolicycN.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/NodeCompositeItemSemanticEditPolicycN.java
@@ -37,6 +37,10 @@ import org.eclipse.papyrus.diagram.composite.edit.commands.CommentAnnotatedEleme
import org.eclipse.papyrus.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ComponentRealizationCreateCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ComponentRealizationReorientCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorDurationObservationCreateCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorDurationObservationReorientCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorTimeObservationCreateCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorTimeObservationReorientCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.DependencyCreateCommand;
@@ -71,6 +75,8 @@ import org.eclipse.papyrus.diagram.composite.edit.parts.CommentAnnotatedElementE
import org.eclipse.papyrus.diagram.composite.edit.parts.CommentEditPartCN;
import org.eclipse.papyrus.diagram.composite.edit.parts.ComponentCompositeEditPartCN;
import org.eclipse.papyrus.diagram.composite.edit.parts.ComponentRealizationEditPart;
+import org.eclipse.papyrus.diagram.composite.edit.parts.ConnectorDurationObservationEditPart;
+import org.eclipse.papyrus.diagram.composite.edit.parts.ConnectorTimeObservationEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.DataTypeEditPartCN;
import org.eclipse.papyrus.diagram.composite.edit.parts.DependencyEditPart;
@@ -221,6 +227,20 @@ public class NodeCompositeItemSemanticEditPolicycN extends UMLBaseItemSemanticEd
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null,
+ incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null,
+ incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = view.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -407,6 +427,20 @@ public class NodeCompositeItemSemanticEditPolicycN extends UMLBaseItemSemanticEd
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource().getElement(),
+ null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource().getElement(),
+ null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = node.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -584,6 +618,20 @@ public class NodeCompositeItemSemanticEditPolicycN extends UMLBaseItemSemanticEd
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -757,6 +805,20 @@ public class NodeCompositeItemSemanticEditPolicycN extends UMLBaseItemSemanticEd
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -930,6 +992,20 @@ public class NodeCompositeItemSemanticEditPolicycN extends UMLBaseItemSemanticEd
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -1103,6 +1179,20 @@ public class NodeCompositeItemSemanticEditPolicycN extends UMLBaseItemSemanticEd
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -1276,6 +1366,20 @@ public class NodeCompositeItemSemanticEditPolicycN extends UMLBaseItemSemanticEd
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -1449,6 +1553,20 @@ public class NodeCompositeItemSemanticEditPolicycN extends UMLBaseItemSemanticEd
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -1622,6 +1740,20 @@ public class NodeCompositeItemSemanticEditPolicycN extends UMLBaseItemSemanticEd
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -1795,6 +1927,20 @@ public class NodeCompositeItemSemanticEditPolicycN extends UMLBaseItemSemanticEd
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -1968,6 +2114,20 @@ public class NodeCompositeItemSemanticEditPolicycN extends UMLBaseItemSemanticEd
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -2141,6 +2301,20 @@ public class NodeCompositeItemSemanticEditPolicycN extends UMLBaseItemSemanticEd
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -2314,6 +2488,20 @@ public class NodeCompositeItemSemanticEditPolicycN extends UMLBaseItemSemanticEd
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -2487,6 +2675,20 @@ public class NodeCompositeItemSemanticEditPolicycN extends UMLBaseItemSemanticEd
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -2660,6 +2862,20 @@ public class NodeCompositeItemSemanticEditPolicycN extends UMLBaseItemSemanticEd
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -2833,6 +3049,20 @@ public class NodeCompositeItemSemanticEditPolicycN extends UMLBaseItemSemanticEd
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -3006,6 +3236,20 @@ public class NodeCompositeItemSemanticEditPolicycN extends UMLBaseItemSemanticEd
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -3179,6 +3423,20 @@ public class NodeCompositeItemSemanticEditPolicycN extends UMLBaseItemSemanticEd
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -3352,6 +3610,20 @@ public class NodeCompositeItemSemanticEditPolicycN extends UMLBaseItemSemanticEd
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -3525,6 +3797,20 @@ public class NodeCompositeItemSemanticEditPolicycN extends UMLBaseItemSemanticEd
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -3698,6 +3984,20 @@ public class NodeCompositeItemSemanticEditPolicycN extends UMLBaseItemSemanticEd
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -3871,6 +4171,20 @@ public class NodeCompositeItemSemanticEditPolicycN extends UMLBaseItemSemanticEd
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -4044,6 +4358,20 @@ public class NodeCompositeItemSemanticEditPolicycN extends UMLBaseItemSemanticEd
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -4217,6 +4545,20 @@ public class NodeCompositeItemSemanticEditPolicycN extends UMLBaseItemSemanticEd
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -4390,6 +4732,20 @@ public class NodeCompositeItemSemanticEditPolicycN extends UMLBaseItemSemanticEd
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -4563,6 +4919,20 @@ public class NodeCompositeItemSemanticEditPolicycN extends UMLBaseItemSemanticEd
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -4769,6 +5139,12 @@ public class NodeCompositeItemSemanticEditPolicycN extends UMLBaseItemSemanticEd
if (UMLElementTypes.InformationFlow_4016 == req.getElementType()) {
return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));
}
+ if (UMLElementTypes.TimeObservationEvent_4018 == req.getElementType()) {
+ return null;
+ }
+ if (UMLElementTypes.DurationObservationEvent_4019 == req.getElementType()) {
+ return null;
+ }
return null;
}
@@ -4818,6 +5194,12 @@ public class NodeCompositeItemSemanticEditPolicycN extends UMLBaseItemSemanticEd
if (UMLElementTypes.InformationFlow_4016 == req.getElementType()) {
return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));
}
+ if (UMLElementTypes.TimeObservationEvent_4018 == req.getElementType()) {
+ return getGEFWrapper(new ConnectorTimeObservationCreateCommand(req, req.getSource(), req.getTarget()));
+ }
+ if (UMLElementTypes.DurationObservationEvent_4019 == req.getElementType()) {
+ return getGEFWrapper(new ConnectorDurationObservationCreateCommand(req, req.getSource(), req.getTarget()));
+ }
return null;
}
@@ -4869,6 +5251,10 @@ public class NodeCompositeItemSemanticEditPolicycN extends UMLBaseItemSemanticEd
return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));
case ConstraintConstrainedElementEditPart.VISUAL_ID:
return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));
+ case ConnectorTimeObservationEditPart.VISUAL_ID:
+ return getGEFWrapper(new ConnectorTimeObservationReorientCommand(req));
+ case ConnectorDurationObservationEditPart.VISUAL_ID:
+ return getGEFWrapper(new ConnectorDurationObservationReorientCommand(req));
}
return super.getReorientReferenceRelationshipCommand(req);
}
diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/OpaqueBehaviorCompositeItemSemanticEditPolicy.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/OpaqueBehaviorCompositeItemSemanticEditPolicy.java
index a79a6f42b08..d572936b315 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/OpaqueBehaviorCompositeItemSemanticEditPolicy.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/OpaqueBehaviorCompositeItemSemanticEditPolicy.java
@@ -37,6 +37,10 @@ import org.eclipse.papyrus.diagram.composite.edit.commands.CommentAnnotatedEleme
import org.eclipse.papyrus.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ComponentRealizationCreateCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ComponentRealizationReorientCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorDurationObservationCreateCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorDurationObservationReorientCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorTimeObservationCreateCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorTimeObservationReorientCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.DependencyCreateCommand;
@@ -71,6 +75,8 @@ import org.eclipse.papyrus.diagram.composite.edit.parts.CommentAnnotatedElementE
import org.eclipse.papyrus.diagram.composite.edit.parts.CommentEditPartCN;
import org.eclipse.papyrus.diagram.composite.edit.parts.ComponentCompositeEditPartCN;
import org.eclipse.papyrus.diagram.composite.edit.parts.ComponentRealizationEditPart;
+import org.eclipse.papyrus.diagram.composite.edit.parts.ConnectorDurationObservationEditPart;
+import org.eclipse.papyrus.diagram.composite.edit.parts.ConnectorTimeObservationEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.DataTypeEditPartCN;
import org.eclipse.papyrus.diagram.composite.edit.parts.DependencyEditPart;
@@ -221,6 +227,20 @@ public class OpaqueBehaviorCompositeItemSemanticEditPolicy extends UMLBaseItemSe
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null,
+ incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null,
+ incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = view.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -407,6 +427,20 @@ public class OpaqueBehaviorCompositeItemSemanticEditPolicy extends UMLBaseItemSe
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource().getElement(),
+ null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource().getElement(),
+ null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = node.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -584,6 +618,20 @@ public class OpaqueBehaviorCompositeItemSemanticEditPolicy extends UMLBaseItemSe
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -757,6 +805,20 @@ public class OpaqueBehaviorCompositeItemSemanticEditPolicy extends UMLBaseItemSe
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -930,6 +992,20 @@ public class OpaqueBehaviorCompositeItemSemanticEditPolicy extends UMLBaseItemSe
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -1103,6 +1179,20 @@ public class OpaqueBehaviorCompositeItemSemanticEditPolicy extends UMLBaseItemSe
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -1276,6 +1366,20 @@ public class OpaqueBehaviorCompositeItemSemanticEditPolicy extends UMLBaseItemSe
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -1449,6 +1553,20 @@ public class OpaqueBehaviorCompositeItemSemanticEditPolicy extends UMLBaseItemSe
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -1622,6 +1740,20 @@ public class OpaqueBehaviorCompositeItemSemanticEditPolicy extends UMLBaseItemSe
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -1795,6 +1927,20 @@ public class OpaqueBehaviorCompositeItemSemanticEditPolicy extends UMLBaseItemSe
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -1968,6 +2114,20 @@ public class OpaqueBehaviorCompositeItemSemanticEditPolicy extends UMLBaseItemSe
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -2141,6 +2301,20 @@ public class OpaqueBehaviorCompositeItemSemanticEditPolicy extends UMLBaseItemSe
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -2314,6 +2488,20 @@ public class OpaqueBehaviorCompositeItemSemanticEditPolicy extends UMLBaseItemSe
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -2487,6 +2675,20 @@ public class OpaqueBehaviorCompositeItemSemanticEditPolicy extends UMLBaseItemSe
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -2660,6 +2862,20 @@ public class OpaqueBehaviorCompositeItemSemanticEditPolicy extends UMLBaseItemSe
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -2833,6 +3049,20 @@ public class OpaqueBehaviorCompositeItemSemanticEditPolicy extends UMLBaseItemSe
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -3006,6 +3236,20 @@ public class OpaqueBehaviorCompositeItemSemanticEditPolicy extends UMLBaseItemSe
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -3179,6 +3423,20 @@ public class OpaqueBehaviorCompositeItemSemanticEditPolicy extends UMLBaseItemSe
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -3352,6 +3610,20 @@ public class OpaqueBehaviorCompositeItemSemanticEditPolicy extends UMLBaseItemSe
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -3525,6 +3797,20 @@ public class OpaqueBehaviorCompositeItemSemanticEditPolicy extends UMLBaseItemSe
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -3698,6 +3984,20 @@ public class OpaqueBehaviorCompositeItemSemanticEditPolicy extends UMLBaseItemSe
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -3871,6 +4171,20 @@ public class OpaqueBehaviorCompositeItemSemanticEditPolicy extends UMLBaseItemSe
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -4044,6 +4358,20 @@ public class OpaqueBehaviorCompositeItemSemanticEditPolicy extends UMLBaseItemSe
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -4217,6 +4545,20 @@ public class OpaqueBehaviorCompositeItemSemanticEditPolicy extends UMLBaseItemSe
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -4390,6 +4732,20 @@ public class OpaqueBehaviorCompositeItemSemanticEditPolicy extends UMLBaseItemSe
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -4563,6 +4919,20 @@ public class OpaqueBehaviorCompositeItemSemanticEditPolicy extends UMLBaseItemSe
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -4769,6 +5139,12 @@ public class OpaqueBehaviorCompositeItemSemanticEditPolicy extends UMLBaseItemSe
if (UMLElementTypes.InformationFlow_4016 == req.getElementType()) {
return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));
}
+ if (UMLElementTypes.TimeObservationEvent_4018 == req.getElementType()) {
+ return null;
+ }
+ if (UMLElementTypes.DurationObservationEvent_4019 == req.getElementType()) {
+ return null;
+ }
return null;
}
@@ -4818,6 +5194,12 @@ public class OpaqueBehaviorCompositeItemSemanticEditPolicy extends UMLBaseItemSe
if (UMLElementTypes.InformationFlow_4016 == req.getElementType()) {
return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));
}
+ if (UMLElementTypes.TimeObservationEvent_4018 == req.getElementType()) {
+ return getGEFWrapper(new ConnectorTimeObservationCreateCommand(req, req.getSource(), req.getTarget()));
+ }
+ if (UMLElementTypes.DurationObservationEvent_4019 == req.getElementType()) {
+ return getGEFWrapper(new ConnectorDurationObservationCreateCommand(req, req.getSource(), req.getTarget()));
+ }
return null;
}
@@ -4869,6 +5251,10 @@ public class OpaqueBehaviorCompositeItemSemanticEditPolicy extends UMLBaseItemSe
return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));
case ConstraintConstrainedElementEditPart.VISUAL_ID:
return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));
+ case ConnectorTimeObservationEditPart.VISUAL_ID:
+ return getGEFWrapper(new ConnectorTimeObservationReorientCommand(req));
+ case ConnectorDurationObservationEditPart.VISUAL_ID:
+ return getGEFWrapper(new ConnectorDurationObservationReorientCommand(req));
}
return super.getReorientReferenceRelationshipCommand(req);
}
diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/OpaqueBehaviorCompositeItemSemanticEditPolicyCN.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/OpaqueBehaviorCompositeItemSemanticEditPolicyCN.java
index 07e512e5d17..83042a362ac 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/OpaqueBehaviorCompositeItemSemanticEditPolicyCN.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/OpaqueBehaviorCompositeItemSemanticEditPolicyCN.java
@@ -37,6 +37,10 @@ import org.eclipse.papyrus.diagram.composite.edit.commands.CommentAnnotatedEleme
import org.eclipse.papyrus.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ComponentRealizationCreateCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ComponentRealizationReorientCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorDurationObservationCreateCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorDurationObservationReorientCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorTimeObservationCreateCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorTimeObservationReorientCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.DependencyCreateCommand;
@@ -71,6 +75,8 @@ import org.eclipse.papyrus.diagram.composite.edit.parts.CommentAnnotatedElementE
import org.eclipse.papyrus.diagram.composite.edit.parts.CommentEditPartCN;
import org.eclipse.papyrus.diagram.composite.edit.parts.ComponentCompositeEditPartCN;
import org.eclipse.papyrus.diagram.composite.edit.parts.ComponentRealizationEditPart;
+import org.eclipse.papyrus.diagram.composite.edit.parts.ConnectorDurationObservationEditPart;
+import org.eclipse.papyrus.diagram.composite.edit.parts.ConnectorTimeObservationEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.DataTypeEditPartCN;
import org.eclipse.papyrus.diagram.composite.edit.parts.DependencyEditPart;
@@ -221,6 +227,20 @@ public class OpaqueBehaviorCompositeItemSemanticEditPolicyCN extends UMLBaseItem
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null,
+ incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null,
+ incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = view.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -407,6 +427,20 @@ public class OpaqueBehaviorCompositeItemSemanticEditPolicyCN extends UMLBaseItem
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource().getElement(),
+ null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource().getElement(),
+ null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = node.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -584,6 +618,20 @@ public class OpaqueBehaviorCompositeItemSemanticEditPolicyCN extends UMLBaseItem
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -757,6 +805,20 @@ public class OpaqueBehaviorCompositeItemSemanticEditPolicyCN extends UMLBaseItem
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -930,6 +992,20 @@ public class OpaqueBehaviorCompositeItemSemanticEditPolicyCN extends UMLBaseItem
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -1103,6 +1179,20 @@ public class OpaqueBehaviorCompositeItemSemanticEditPolicyCN extends UMLBaseItem
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -1276,6 +1366,20 @@ public class OpaqueBehaviorCompositeItemSemanticEditPolicyCN extends UMLBaseItem
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -1449,6 +1553,20 @@ public class OpaqueBehaviorCompositeItemSemanticEditPolicyCN extends UMLBaseItem
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -1622,6 +1740,20 @@ public class OpaqueBehaviorCompositeItemSemanticEditPolicyCN extends UMLBaseItem
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -1795,6 +1927,20 @@ public class OpaqueBehaviorCompositeItemSemanticEditPolicyCN extends UMLBaseItem
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -1968,6 +2114,20 @@ public class OpaqueBehaviorCompositeItemSemanticEditPolicyCN extends UMLBaseItem
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -2141,6 +2301,20 @@ public class OpaqueBehaviorCompositeItemSemanticEditPolicyCN extends UMLBaseItem
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -2314,6 +2488,20 @@ public class OpaqueBehaviorCompositeItemSemanticEditPolicyCN extends UMLBaseItem
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -2487,6 +2675,20 @@ public class OpaqueBehaviorCompositeItemSemanticEditPolicyCN extends UMLBaseItem
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -2660,6 +2862,20 @@ public class OpaqueBehaviorCompositeItemSemanticEditPolicyCN extends UMLBaseItem
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -2833,6 +3049,20 @@ public class OpaqueBehaviorCompositeItemSemanticEditPolicyCN extends UMLBaseItem
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -3006,6 +3236,20 @@ public class OpaqueBehaviorCompositeItemSemanticEditPolicyCN extends UMLBaseItem
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -3179,6 +3423,20 @@ public class OpaqueBehaviorCompositeItemSemanticEditPolicyCN extends UMLBaseItem
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -3352,6 +3610,20 @@ public class OpaqueBehaviorCompositeItemSemanticEditPolicyCN extends UMLBaseItem
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -3525,6 +3797,20 @@ public class OpaqueBehaviorCompositeItemSemanticEditPolicyCN extends UMLBaseItem
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -3698,6 +3984,20 @@ public class OpaqueBehaviorCompositeItemSemanticEditPolicyCN extends UMLBaseItem
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -3871,6 +4171,20 @@ public class OpaqueBehaviorCompositeItemSemanticEditPolicyCN extends UMLBaseItem
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -4044,6 +4358,20 @@ public class OpaqueBehaviorCompositeItemSemanticEditPolicyCN extends UMLBaseItem
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -4217,6 +4545,20 @@ public class OpaqueBehaviorCompositeItemSemanticEditPolicyCN extends UMLBaseItem
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -4390,6 +4732,20 @@ public class OpaqueBehaviorCompositeItemSemanticEditPolicyCN extends UMLBaseItem
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -4563,6 +4919,20 @@ public class OpaqueBehaviorCompositeItemSemanticEditPolicyCN extends UMLBaseItem
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -4769,6 +5139,12 @@ public class OpaqueBehaviorCompositeItemSemanticEditPolicyCN extends UMLBaseItem
if (UMLElementTypes.InformationFlow_4016 == req.getElementType()) {
return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));
}
+ if (UMLElementTypes.TimeObservationEvent_4018 == req.getElementType()) {
+ return null;
+ }
+ if (UMLElementTypes.DurationObservationEvent_4019 == req.getElementType()) {
+ return null;
+ }
return null;
}
@@ -4818,6 +5194,12 @@ public class OpaqueBehaviorCompositeItemSemanticEditPolicyCN extends UMLBaseItem
if (UMLElementTypes.InformationFlow_4016 == req.getElementType()) {
return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));
}
+ if (UMLElementTypes.TimeObservationEvent_4018 == req.getElementType()) {
+ return getGEFWrapper(new ConnectorTimeObservationCreateCommand(req, req.getSource(), req.getTarget()));
+ }
+ if (UMLElementTypes.DurationObservationEvent_4019 == req.getElementType()) {
+ return getGEFWrapper(new ConnectorDurationObservationCreateCommand(req, req.getSource(), req.getTarget()));
+ }
return null;
}
@@ -4869,6 +5251,10 @@ public class OpaqueBehaviorCompositeItemSemanticEditPolicyCN extends UMLBaseItem
return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));
case ConstraintConstrainedElementEditPart.VISUAL_ID:
return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));
+ case ConnectorTimeObservationEditPart.VISUAL_ID:
+ return getGEFWrapper(new ConnectorTimeObservationReorientCommand(req));
+ case ConnectorDurationObservationEditPart.VISUAL_ID:
+ return getGEFWrapper(new ConnectorDurationObservationReorientCommand(req));
}
return super.getReorientReferenceRelationshipCommand(req);
}
diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/OpaqueExpressionItemSemanticEditPolicy.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/OpaqueExpressionItemSemanticEditPolicy.java
index d63a2efba08..0d61c3b3d6f 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/OpaqueExpressionItemSemanticEditPolicy.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/OpaqueExpressionItemSemanticEditPolicy.java
@@ -34,6 +34,10 @@ import org.eclipse.papyrus.diagram.composite.edit.commands.CommentAnnotatedEleme
import org.eclipse.papyrus.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ComponentRealizationCreateCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ComponentRealizationReorientCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorDurationObservationCreateCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorDurationObservationReorientCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorTimeObservationCreateCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorTimeObservationReorientCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.DependencyCreateCommand;
@@ -59,6 +63,8 @@ import org.eclipse.papyrus.diagram.composite.edit.commands.UsageReorientCommand;
import org.eclipse.papyrus.diagram.composite.edit.parts.AbstractionEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.ComponentRealizationEditPart;
+import org.eclipse.papyrus.diagram.composite.edit.parts.ConnectorDurationObservationEditPart;
+import org.eclipse.papyrus.diagram.composite.edit.parts.ConnectorTimeObservationEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.DependencyEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.DeploymentEditPart;
@@ -180,6 +186,20 @@ public class OpaqueExpressionItemSemanticEditPolicy extends UMLBaseItemSemanticE
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null,
+ incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null,
+ incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = view.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -323,6 +343,12 @@ public class OpaqueExpressionItemSemanticEditPolicy extends UMLBaseItemSemanticE
if (UMLElementTypes.InformationFlow_4016 == req.getElementType()) {
return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));
}
+ if (UMLElementTypes.TimeObservationEvent_4018 == req.getElementType()) {
+ return null;
+ }
+ if (UMLElementTypes.DurationObservationEvent_4019 == req.getElementType()) {
+ return null;
+ }
return null;
}
@@ -372,6 +398,12 @@ public class OpaqueExpressionItemSemanticEditPolicy extends UMLBaseItemSemanticE
if (UMLElementTypes.InformationFlow_4016 == req.getElementType()) {
return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));
}
+ if (UMLElementTypes.TimeObservationEvent_4018 == req.getElementType()) {
+ return getGEFWrapper(new ConnectorTimeObservationCreateCommand(req, req.getSource(), req.getTarget()));
+ }
+ if (UMLElementTypes.DurationObservationEvent_4019 == req.getElementType()) {
+ return getGEFWrapper(new ConnectorDurationObservationCreateCommand(req, req.getSource(), req.getTarget()));
+ }
return null;
}
@@ -423,6 +455,10 @@ public class OpaqueExpressionItemSemanticEditPolicy extends UMLBaseItemSemanticE
return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));
case ConstraintConstrainedElementEditPart.VISUAL_ID:
return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));
+ case ConnectorTimeObservationEditPart.VISUAL_ID:
+ return getGEFWrapper(new ConnectorTimeObservationReorientCommand(req));
+ case ConnectorDurationObservationEditPart.VISUAL_ID:
+ return getGEFWrapper(new ConnectorDurationObservationReorientCommand(req));
}
return super.getReorientReferenceRelationshipCommand(req);
}
diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/PortItemSemanticEditPolicy.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/PortItemSemanticEditPolicy.java
index e2c8797f082..39e037e7224 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/PortItemSemanticEditPolicy.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/PortItemSemanticEditPolicy.java
@@ -34,6 +34,10 @@ import org.eclipse.papyrus.diagram.composite.edit.commands.CommentAnnotatedEleme
import org.eclipse.papyrus.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ComponentRealizationCreateCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ComponentRealizationReorientCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorDurationObservationCreateCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorDurationObservationReorientCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorTimeObservationCreateCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorTimeObservationReorientCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.DependencyCreateCommand;
@@ -59,6 +63,8 @@ import org.eclipse.papyrus.diagram.composite.edit.commands.UsageReorientCommand;
import org.eclipse.papyrus.diagram.composite.edit.parts.AbstractionEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.ComponentRealizationEditPart;
+import org.eclipse.papyrus.diagram.composite.edit.parts.ConnectorDurationObservationEditPart;
+import org.eclipse.papyrus.diagram.composite.edit.parts.ConnectorTimeObservationEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.DependencyEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.DeploymentEditPart;
@@ -180,6 +186,20 @@ public class PortItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null,
+ incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null,
+ incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = view.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -323,6 +343,12 @@ public class PortItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {
if (UMLElementTypes.InformationFlow_4016 == req.getElementType()) {
return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));
}
+ if (UMLElementTypes.TimeObservationEvent_4018 == req.getElementType()) {
+ return null;
+ }
+ if (UMLElementTypes.DurationObservationEvent_4019 == req.getElementType()) {
+ return null;
+ }
return null;
}
@@ -372,6 +398,12 @@ public class PortItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {
if (UMLElementTypes.InformationFlow_4016 == req.getElementType()) {
return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));
}
+ if (UMLElementTypes.TimeObservationEvent_4018 == req.getElementType()) {
+ return getGEFWrapper(new ConnectorTimeObservationCreateCommand(req, req.getSource(), req.getTarget()));
+ }
+ if (UMLElementTypes.DurationObservationEvent_4019 == req.getElementType()) {
+ return getGEFWrapper(new ConnectorDurationObservationCreateCommand(req, req.getSource(), req.getTarget()));
+ }
return null;
}
@@ -423,6 +455,10 @@ public class PortItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {
return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));
case ConstraintConstrainedElementEditPart.VISUAL_ID:
return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));
+ case ConnectorTimeObservationEditPart.VISUAL_ID:
+ return getGEFWrapper(new ConnectorTimeObservationReorientCommand(req));
+ case ConnectorDurationObservationEditPart.VISUAL_ID:
+ return getGEFWrapper(new ConnectorDurationObservationReorientCommand(req));
}
return super.getReorientReferenceRelationshipCommand(req);
}
diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/PrimitiveTypeItemSemanticEditPolicy.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/PrimitiveTypeItemSemanticEditPolicy.java
index a6d712269f2..adaa720ed9a 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/PrimitiveTypeItemSemanticEditPolicy.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/PrimitiveTypeItemSemanticEditPolicy.java
@@ -34,6 +34,10 @@ import org.eclipse.papyrus.diagram.composite.edit.commands.CommentAnnotatedEleme
import org.eclipse.papyrus.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ComponentRealizationCreateCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ComponentRealizationReorientCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorDurationObservationCreateCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorDurationObservationReorientCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorTimeObservationCreateCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorTimeObservationReorientCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.DependencyCreateCommand;
@@ -59,6 +63,8 @@ import org.eclipse.papyrus.diagram.composite.edit.commands.UsageReorientCommand;
import org.eclipse.papyrus.diagram.composite.edit.parts.AbstractionEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.ComponentRealizationEditPart;
+import org.eclipse.papyrus.diagram.composite.edit.parts.ConnectorDurationObservationEditPart;
+import org.eclipse.papyrus.diagram.composite.edit.parts.ConnectorTimeObservationEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.DependencyEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.DeploymentEditPart;
@@ -180,6 +186,20 @@ public class PrimitiveTypeItemSemanticEditPolicy extends UMLBaseItemSemanticEdit
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null,
+ incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null,
+ incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = view.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -323,6 +343,12 @@ public class PrimitiveTypeItemSemanticEditPolicy extends UMLBaseItemSemanticEdit
if (UMLElementTypes.InformationFlow_4016 == req.getElementType()) {
return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));
}
+ if (UMLElementTypes.TimeObservationEvent_4018 == req.getElementType()) {
+ return null;
+ }
+ if (UMLElementTypes.DurationObservationEvent_4019 == req.getElementType()) {
+ return null;
+ }
return null;
}
@@ -372,6 +398,12 @@ public class PrimitiveTypeItemSemanticEditPolicy extends UMLBaseItemSemanticEdit
if (UMLElementTypes.InformationFlow_4016 == req.getElementType()) {
return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));
}
+ if (UMLElementTypes.TimeObservationEvent_4018 == req.getElementType()) {
+ return getGEFWrapper(new ConnectorTimeObservationCreateCommand(req, req.getSource(), req.getTarget()));
+ }
+ if (UMLElementTypes.DurationObservationEvent_4019 == req.getElementType()) {
+ return getGEFWrapper(new ConnectorDurationObservationCreateCommand(req, req.getSource(), req.getTarget()));
+ }
return null;
}
@@ -423,6 +455,10 @@ public class PrimitiveTypeItemSemanticEditPolicy extends UMLBaseItemSemanticEdit
return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));
case ConstraintConstrainedElementEditPart.VISUAL_ID:
return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));
+ case ConnectorTimeObservationEditPart.VISUAL_ID:
+ return getGEFWrapper(new ConnectorTimeObservationReorientCommand(req));
+ case ConnectorDurationObservationEditPart.VISUAL_ID:
+ return getGEFWrapper(new ConnectorDurationObservationReorientCommand(req));
}
return super.getReorientReferenceRelationshipCommand(req);
}
diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/PrimitiveTypeItemSemanticEditPolicyCN.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/PrimitiveTypeItemSemanticEditPolicyCN.java
index fcf8113b196..10abd860ad3 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/PrimitiveTypeItemSemanticEditPolicyCN.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/PrimitiveTypeItemSemanticEditPolicyCN.java
@@ -34,6 +34,10 @@ import org.eclipse.papyrus.diagram.composite.edit.commands.CommentAnnotatedEleme
import org.eclipse.papyrus.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ComponentRealizationCreateCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ComponentRealizationReorientCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorDurationObservationCreateCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorDurationObservationReorientCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorTimeObservationCreateCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorTimeObservationReorientCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.DependencyCreateCommand;
@@ -59,6 +63,8 @@ import org.eclipse.papyrus.diagram.composite.edit.commands.UsageReorientCommand;
import org.eclipse.papyrus.diagram.composite.edit.parts.AbstractionEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.ComponentRealizationEditPart;
+import org.eclipse.papyrus.diagram.composite.edit.parts.ConnectorDurationObservationEditPart;
+import org.eclipse.papyrus.diagram.composite.edit.parts.ConnectorTimeObservationEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.DependencyEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.DeploymentEditPart;
@@ -180,6 +186,20 @@ public class PrimitiveTypeItemSemanticEditPolicyCN extends UMLBaseItemSemanticEd
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null,
+ incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null,
+ incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = view.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -323,6 +343,12 @@ public class PrimitiveTypeItemSemanticEditPolicyCN extends UMLBaseItemSemanticEd
if (UMLElementTypes.InformationFlow_4016 == req.getElementType()) {
return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));
}
+ if (UMLElementTypes.TimeObservationEvent_4018 == req.getElementType()) {
+ return null;
+ }
+ if (UMLElementTypes.DurationObservationEvent_4019 == req.getElementType()) {
+ return null;
+ }
return null;
}
@@ -372,6 +398,12 @@ public class PrimitiveTypeItemSemanticEditPolicyCN extends UMLBaseItemSemanticEd
if (UMLElementTypes.InformationFlow_4016 == req.getElementType()) {
return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));
}
+ if (UMLElementTypes.TimeObservationEvent_4018 == req.getElementType()) {
+ return getGEFWrapper(new ConnectorTimeObservationCreateCommand(req, req.getSource(), req.getTarget()));
+ }
+ if (UMLElementTypes.DurationObservationEvent_4019 == req.getElementType()) {
+ return getGEFWrapper(new ConnectorDurationObservationCreateCommand(req, req.getSource(), req.getTarget()));
+ }
return null;
}
@@ -423,6 +455,10 @@ public class PrimitiveTypeItemSemanticEditPolicyCN extends UMLBaseItemSemanticEd
return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));
case ConstraintConstrainedElementEditPart.VISUAL_ID:
return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));
+ case ConnectorTimeObservationEditPart.VISUAL_ID:
+ return getGEFWrapper(new ConnectorTimeObservationReorientCommand(req));
+ case ConnectorDurationObservationEditPart.VISUAL_ID:
+ return getGEFWrapper(new ConnectorDurationObservationReorientCommand(req));
}
return super.getReorientReferenceRelationshipCommand(req);
}
diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/PropertyPartItemSemanticEditPolicyCN.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/PropertyPartItemSemanticEditPolicyCN.java
index 0948593e9cb..8091b0252d9 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/PropertyPartItemSemanticEditPolicyCN.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/PropertyPartItemSemanticEditPolicyCN.java
@@ -37,6 +37,10 @@ import org.eclipse.papyrus.diagram.composite.edit.commands.CommentAnnotatedEleme
import org.eclipse.papyrus.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ComponentRealizationCreateCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ComponentRealizationReorientCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorDurationObservationCreateCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorDurationObservationReorientCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorTimeObservationCreateCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorTimeObservationReorientCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.DependencyCreateCommand;
@@ -64,6 +68,8 @@ import org.eclipse.papyrus.diagram.composite.edit.parts.AbstractionEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.CommentEditPartCN;
import org.eclipse.papyrus.diagram.composite.edit.parts.ComponentRealizationEditPart;
+import org.eclipse.papyrus.diagram.composite.edit.parts.ConnectorDurationObservationEditPart;
+import org.eclipse.papyrus.diagram.composite.edit.parts.ConnectorTimeObservationEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.DependencyEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.DeploymentEditPart;
@@ -198,6 +204,20 @@ public class PropertyPartItemSemanticEditPolicyCN extends UMLBaseItemSemanticEdi
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null,
+ incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null,
+ incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = view.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -384,6 +404,20 @@ public class PropertyPartItemSemanticEditPolicyCN extends UMLBaseItemSemanticEdi
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource().getElement(),
+ null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource().getElement(),
+ null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = node.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -561,6 +595,20 @@ public class PropertyPartItemSemanticEditPolicyCN extends UMLBaseItemSemanticEdi
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -767,6 +815,12 @@ public class PropertyPartItemSemanticEditPolicyCN extends UMLBaseItemSemanticEdi
if (UMLElementTypes.InformationFlow_4016 == req.getElementType()) {
return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));
}
+ if (UMLElementTypes.TimeObservationEvent_4018 == req.getElementType()) {
+ return null;
+ }
+ if (UMLElementTypes.DurationObservationEvent_4019 == req.getElementType()) {
+ return null;
+ }
return null;
}
@@ -816,6 +870,12 @@ public class PropertyPartItemSemanticEditPolicyCN extends UMLBaseItemSemanticEdi
if (UMLElementTypes.InformationFlow_4016 == req.getElementType()) {
return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));
}
+ if (UMLElementTypes.TimeObservationEvent_4018 == req.getElementType()) {
+ return getGEFWrapper(new ConnectorTimeObservationCreateCommand(req, req.getSource(), req.getTarget()));
+ }
+ if (UMLElementTypes.DurationObservationEvent_4019 == req.getElementType()) {
+ return getGEFWrapper(new ConnectorDurationObservationCreateCommand(req, req.getSource(), req.getTarget()));
+ }
return null;
}
@@ -867,6 +927,10 @@ public class PropertyPartItemSemanticEditPolicyCN extends UMLBaseItemSemanticEdi
return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));
case ConstraintConstrainedElementEditPart.VISUAL_ID:
return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));
+ case ConnectorTimeObservationEditPart.VISUAL_ID:
+ return getGEFWrapper(new ConnectorTimeObservationReorientCommand(req));
+ case ConnectorDurationObservationEditPart.VISUAL_ID:
+ return getGEFWrapper(new ConnectorDurationObservationReorientCommand(req));
}
return super.getReorientReferenceRelationshipCommand(req);
}
diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/ProtocolStateMachineCompositeItemSemanticEditPolicy.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/ProtocolStateMachineCompositeItemSemanticEditPolicy.java
index 4e7245772c4..f60e77d737a 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/ProtocolStateMachineCompositeItemSemanticEditPolicy.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/ProtocolStateMachineCompositeItemSemanticEditPolicy.java
@@ -37,6 +37,10 @@ import org.eclipse.papyrus.diagram.composite.edit.commands.CommentAnnotatedEleme
import org.eclipse.papyrus.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ComponentRealizationCreateCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ComponentRealizationReorientCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorDurationObservationCreateCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorDurationObservationReorientCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorTimeObservationCreateCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorTimeObservationReorientCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.DependencyCreateCommand;
@@ -71,6 +75,8 @@ import org.eclipse.papyrus.diagram.composite.edit.parts.CommentAnnotatedElementE
import org.eclipse.papyrus.diagram.composite.edit.parts.CommentEditPartCN;
import org.eclipse.papyrus.diagram.composite.edit.parts.ComponentCompositeEditPartCN;
import org.eclipse.papyrus.diagram.composite.edit.parts.ComponentRealizationEditPart;
+import org.eclipse.papyrus.diagram.composite.edit.parts.ConnectorDurationObservationEditPart;
+import org.eclipse.papyrus.diagram.composite.edit.parts.ConnectorTimeObservationEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.DataTypeEditPartCN;
import org.eclipse.papyrus.diagram.composite.edit.parts.DependencyEditPart;
@@ -221,6 +227,20 @@ public class ProtocolStateMachineCompositeItemSemanticEditPolicy extends UMLBase
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null,
+ incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null,
+ incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = view.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -407,6 +427,20 @@ public class ProtocolStateMachineCompositeItemSemanticEditPolicy extends UMLBase
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource().getElement(),
+ null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource().getElement(),
+ null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = node.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -584,6 +618,20 @@ public class ProtocolStateMachineCompositeItemSemanticEditPolicy extends UMLBase
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -757,6 +805,20 @@ public class ProtocolStateMachineCompositeItemSemanticEditPolicy extends UMLBase
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -930,6 +992,20 @@ public class ProtocolStateMachineCompositeItemSemanticEditPolicy extends UMLBase
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -1103,6 +1179,20 @@ public class ProtocolStateMachineCompositeItemSemanticEditPolicy extends UMLBase
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -1276,6 +1366,20 @@ public class ProtocolStateMachineCompositeItemSemanticEditPolicy extends UMLBase
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -1449,6 +1553,20 @@ public class ProtocolStateMachineCompositeItemSemanticEditPolicy extends UMLBase
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -1622,6 +1740,20 @@ public class ProtocolStateMachineCompositeItemSemanticEditPolicy extends UMLBase
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -1795,6 +1927,20 @@ public class ProtocolStateMachineCompositeItemSemanticEditPolicy extends UMLBase
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -1968,6 +2114,20 @@ public class ProtocolStateMachineCompositeItemSemanticEditPolicy extends UMLBase
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -2141,6 +2301,20 @@ public class ProtocolStateMachineCompositeItemSemanticEditPolicy extends UMLBase
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -2314,6 +2488,20 @@ public class ProtocolStateMachineCompositeItemSemanticEditPolicy extends UMLBase
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -2487,6 +2675,20 @@ public class ProtocolStateMachineCompositeItemSemanticEditPolicy extends UMLBase
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -2660,6 +2862,20 @@ public class ProtocolStateMachineCompositeItemSemanticEditPolicy extends UMLBase
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -2833,6 +3049,20 @@ public class ProtocolStateMachineCompositeItemSemanticEditPolicy extends UMLBase
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -3006,6 +3236,20 @@ public class ProtocolStateMachineCompositeItemSemanticEditPolicy extends UMLBase
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -3179,6 +3423,20 @@ public class ProtocolStateMachineCompositeItemSemanticEditPolicy extends UMLBase
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -3352,6 +3610,20 @@ public class ProtocolStateMachineCompositeItemSemanticEditPolicy extends UMLBase
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -3525,6 +3797,20 @@ public class ProtocolStateMachineCompositeItemSemanticEditPolicy extends UMLBase
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -3698,6 +3984,20 @@ public class ProtocolStateMachineCompositeItemSemanticEditPolicy extends UMLBase
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -3871,6 +4171,20 @@ public class ProtocolStateMachineCompositeItemSemanticEditPolicy extends UMLBase
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -4044,6 +4358,20 @@ public class ProtocolStateMachineCompositeItemSemanticEditPolicy extends UMLBase
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -4217,6 +4545,20 @@ public class ProtocolStateMachineCompositeItemSemanticEditPolicy extends UMLBase
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -4390,6 +4732,20 @@ public class ProtocolStateMachineCompositeItemSemanticEditPolicy extends UMLBase
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -4563,6 +4919,20 @@ public class ProtocolStateMachineCompositeItemSemanticEditPolicy extends UMLBase
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -4769,6 +5139,12 @@ public class ProtocolStateMachineCompositeItemSemanticEditPolicy extends UMLBase
if (UMLElementTypes.InformationFlow_4016 == req.getElementType()) {
return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));
}
+ if (UMLElementTypes.TimeObservationEvent_4018 == req.getElementType()) {
+ return null;
+ }
+ if (UMLElementTypes.DurationObservationEvent_4019 == req.getElementType()) {
+ return null;
+ }
return null;
}
@@ -4818,6 +5194,12 @@ public class ProtocolStateMachineCompositeItemSemanticEditPolicy extends UMLBase
if (UMLElementTypes.InformationFlow_4016 == req.getElementType()) {
return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));
}
+ if (UMLElementTypes.TimeObservationEvent_4018 == req.getElementType()) {
+ return getGEFWrapper(new ConnectorTimeObservationCreateCommand(req, req.getSource(), req.getTarget()));
+ }
+ if (UMLElementTypes.DurationObservationEvent_4019 == req.getElementType()) {
+ return getGEFWrapper(new ConnectorDurationObservationCreateCommand(req, req.getSource(), req.getTarget()));
+ }
return null;
}
@@ -4869,6 +5251,10 @@ public class ProtocolStateMachineCompositeItemSemanticEditPolicy extends UMLBase
return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));
case ConstraintConstrainedElementEditPart.VISUAL_ID:
return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));
+ case ConnectorTimeObservationEditPart.VISUAL_ID:
+ return getGEFWrapper(new ConnectorTimeObservationReorientCommand(req));
+ case ConnectorDurationObservationEditPart.VISUAL_ID:
+ return getGEFWrapper(new ConnectorDurationObservationReorientCommand(req));
}
return super.getReorientReferenceRelationshipCommand(req);
}
diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/ProtocolStateMachineCompositeItemSemanticEditPolicyCN.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/ProtocolStateMachineCompositeItemSemanticEditPolicyCN.java
index 53d2711ba73..5ae993d2775 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/ProtocolStateMachineCompositeItemSemanticEditPolicyCN.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/ProtocolStateMachineCompositeItemSemanticEditPolicyCN.java
@@ -37,6 +37,10 @@ import org.eclipse.papyrus.diagram.composite.edit.commands.CommentAnnotatedEleme
import org.eclipse.papyrus.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ComponentRealizationCreateCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ComponentRealizationReorientCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorDurationObservationCreateCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorDurationObservationReorientCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorTimeObservationCreateCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorTimeObservationReorientCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.DependencyCreateCommand;
@@ -71,6 +75,8 @@ import org.eclipse.papyrus.diagram.composite.edit.parts.CommentAnnotatedElementE
import org.eclipse.papyrus.diagram.composite.edit.parts.CommentEditPartCN;
import org.eclipse.papyrus.diagram.composite.edit.parts.ComponentCompositeEditPartCN;
import org.eclipse.papyrus.diagram.composite.edit.parts.ComponentRealizationEditPart;
+import org.eclipse.papyrus.diagram.composite.edit.parts.ConnectorDurationObservationEditPart;
+import org.eclipse.papyrus.diagram.composite.edit.parts.ConnectorTimeObservationEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.DataTypeEditPartCN;
import org.eclipse.papyrus.diagram.composite.edit.parts.DependencyEditPart;
@@ -221,6 +227,20 @@ public class ProtocolStateMachineCompositeItemSemanticEditPolicyCN extends UMLBa
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null,
+ incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null,
+ incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = view.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -407,6 +427,20 @@ public class ProtocolStateMachineCompositeItemSemanticEditPolicyCN extends UMLBa
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource().getElement(),
+ null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource().getElement(),
+ null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = node.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -584,6 +618,20 @@ public class ProtocolStateMachineCompositeItemSemanticEditPolicyCN extends UMLBa
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -757,6 +805,20 @@ public class ProtocolStateMachineCompositeItemSemanticEditPolicyCN extends UMLBa
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -930,6 +992,20 @@ public class ProtocolStateMachineCompositeItemSemanticEditPolicyCN extends UMLBa
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -1103,6 +1179,20 @@ public class ProtocolStateMachineCompositeItemSemanticEditPolicyCN extends UMLBa
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -1276,6 +1366,20 @@ public class ProtocolStateMachineCompositeItemSemanticEditPolicyCN extends UMLBa
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -1449,6 +1553,20 @@ public class ProtocolStateMachineCompositeItemSemanticEditPolicyCN extends UMLBa
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -1622,6 +1740,20 @@ public class ProtocolStateMachineCompositeItemSemanticEditPolicyCN extends UMLBa
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -1795,6 +1927,20 @@ public class ProtocolStateMachineCompositeItemSemanticEditPolicyCN extends UMLBa
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -1968,6 +2114,20 @@ public class ProtocolStateMachineCompositeItemSemanticEditPolicyCN extends UMLBa
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -2141,6 +2301,20 @@ public class ProtocolStateMachineCompositeItemSemanticEditPolicyCN extends UMLBa
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -2314,6 +2488,20 @@ public class ProtocolStateMachineCompositeItemSemanticEditPolicyCN extends UMLBa
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -2487,6 +2675,20 @@ public class ProtocolStateMachineCompositeItemSemanticEditPolicyCN extends UMLBa
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -2660,6 +2862,20 @@ public class ProtocolStateMachineCompositeItemSemanticEditPolicyCN extends UMLBa
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -2833,6 +3049,20 @@ public class ProtocolStateMachineCompositeItemSemanticEditPolicyCN extends UMLBa
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -3006,6 +3236,20 @@ public class ProtocolStateMachineCompositeItemSemanticEditPolicyCN extends UMLBa
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -3179,6 +3423,20 @@ public class ProtocolStateMachineCompositeItemSemanticEditPolicyCN extends UMLBa
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -3352,6 +3610,20 @@ public class ProtocolStateMachineCompositeItemSemanticEditPolicyCN extends UMLBa
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -3525,6 +3797,20 @@ public class ProtocolStateMachineCompositeItemSemanticEditPolicyCN extends UMLBa
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -3698,6 +3984,20 @@ public class ProtocolStateMachineCompositeItemSemanticEditPolicyCN extends UMLBa
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -3871,6 +4171,20 @@ public class ProtocolStateMachineCompositeItemSemanticEditPolicyCN extends UMLBa
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -4044,6 +4358,20 @@ public class ProtocolStateMachineCompositeItemSemanticEditPolicyCN extends UMLBa
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -4217,6 +4545,20 @@ public class ProtocolStateMachineCompositeItemSemanticEditPolicyCN extends UMLBa
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -4390,6 +4732,20 @@ public class ProtocolStateMachineCompositeItemSemanticEditPolicyCN extends UMLBa
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -4563,6 +4919,20 @@ public class ProtocolStateMachineCompositeItemSemanticEditPolicyCN extends UMLBa
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -4769,6 +5139,12 @@ public class ProtocolStateMachineCompositeItemSemanticEditPolicyCN extends UMLBa
if (UMLElementTypes.InformationFlow_4016 == req.getElementType()) {
return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));
}
+ if (UMLElementTypes.TimeObservationEvent_4018 == req.getElementType()) {
+ return null;
+ }
+ if (UMLElementTypes.DurationObservationEvent_4019 == req.getElementType()) {
+ return null;
+ }
return null;
}
@@ -4818,6 +5194,12 @@ public class ProtocolStateMachineCompositeItemSemanticEditPolicyCN extends UMLBa
if (UMLElementTypes.InformationFlow_4016 == req.getElementType()) {
return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));
}
+ if (UMLElementTypes.TimeObservationEvent_4018 == req.getElementType()) {
+ return getGEFWrapper(new ConnectorTimeObservationCreateCommand(req, req.getSource(), req.getTarget()));
+ }
+ if (UMLElementTypes.DurationObservationEvent_4019 == req.getElementType()) {
+ return getGEFWrapper(new ConnectorDurationObservationCreateCommand(req, req.getSource(), req.getTarget()));
+ }
return null;
}
@@ -4869,6 +5251,10 @@ public class ProtocolStateMachineCompositeItemSemanticEditPolicyCN extends UMLBa
return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));
case ConstraintConstrainedElementEditPart.VISUAL_ID:
return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));
+ case ConnectorTimeObservationEditPart.VISUAL_ID:
+ return getGEFWrapper(new ConnectorTimeObservationReorientCommand(req));
+ case ConnectorDurationObservationEditPart.VISUAL_ID:
+ return getGEFWrapper(new ConnectorDurationObservationReorientCommand(req));
}
return super.getReorientReferenceRelationshipCommand(req);
}
diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/RealizationItemSemanticEditPolicy.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/RealizationItemSemanticEditPolicy.java
index 873b913d13b..9c5faaf4a56 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/RealizationItemSemanticEditPolicy.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/RealizationItemSemanticEditPolicy.java
@@ -25,6 +25,10 @@ import org.eclipse.papyrus.diagram.composite.edit.commands.CommentAnnotatedEleme
import org.eclipse.papyrus.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ComponentRealizationCreateCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ComponentRealizationReorientCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorDurationObservationCreateCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorDurationObservationReorientCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorTimeObservationCreateCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorTimeObservationReorientCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.DependencyCreateCommand;
@@ -50,6 +54,8 @@ import org.eclipse.papyrus.diagram.composite.edit.commands.UsageReorientCommand;
import org.eclipse.papyrus.diagram.composite.edit.parts.AbstractionEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.ComponentRealizationEditPart;
+import org.eclipse.papyrus.diagram.composite.edit.parts.ConnectorDurationObservationEditPart;
+import org.eclipse.papyrus.diagram.composite.edit.parts.ConnectorTimeObservationEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.DependencyEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.DeploymentEditPart;
@@ -137,6 +143,12 @@ public class RealizationItemSemanticEditPolicy extends UMLBaseItemSemanticEditPo
if (UMLElementTypes.InformationFlow_4016 == req.getElementType()) {
return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));
}
+ if (UMLElementTypes.TimeObservationEvent_4018 == req.getElementType()) {
+ return null;
+ }
+ if (UMLElementTypes.DurationObservationEvent_4019 == req.getElementType()) {
+ return null;
+ }
return null;
}
@@ -186,6 +198,12 @@ public class RealizationItemSemanticEditPolicy extends UMLBaseItemSemanticEditPo
if (UMLElementTypes.InformationFlow_4016 == req.getElementType()) {
return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));
}
+ if (UMLElementTypes.TimeObservationEvent_4018 == req.getElementType()) {
+ return getGEFWrapper(new ConnectorTimeObservationCreateCommand(req, req.getSource(), req.getTarget()));
+ }
+ if (UMLElementTypes.DurationObservationEvent_4019 == req.getElementType()) {
+ return getGEFWrapper(new ConnectorDurationObservationCreateCommand(req, req.getSource(), req.getTarget()));
+ }
return null;
}
@@ -237,6 +255,10 @@ public class RealizationItemSemanticEditPolicy extends UMLBaseItemSemanticEditPo
return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));
case ConstraintConstrainedElementEditPart.VISUAL_ID:
return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));
+ case ConnectorTimeObservationEditPart.VISUAL_ID:
+ return getGEFWrapper(new ConnectorTimeObservationReorientCommand(req));
+ case ConnectorDurationObservationEditPart.VISUAL_ID:
+ return getGEFWrapper(new ConnectorDurationObservationReorientCommand(req));
}
return super.getReorientReferenceRelationshipCommand(req);
}
diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/RoleBindingItemSemanticEditPolicy.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/RoleBindingItemSemanticEditPolicy.java
index 5358033217c..30f2e61413c 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/RoleBindingItemSemanticEditPolicy.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/RoleBindingItemSemanticEditPolicy.java
@@ -25,6 +25,10 @@ import org.eclipse.papyrus.diagram.composite.edit.commands.CommentAnnotatedEleme
import org.eclipse.papyrus.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ComponentRealizationCreateCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ComponentRealizationReorientCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorDurationObservationCreateCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorDurationObservationReorientCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorTimeObservationCreateCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorTimeObservationReorientCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.DependencyCreateCommand;
@@ -50,6 +54,8 @@ import org.eclipse.papyrus.diagram.composite.edit.commands.UsageReorientCommand;
import org.eclipse.papyrus.diagram.composite.edit.parts.AbstractionEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.ComponentRealizationEditPart;
+import org.eclipse.papyrus.diagram.composite.edit.parts.ConnectorDurationObservationEditPart;
+import org.eclipse.papyrus.diagram.composite.edit.parts.ConnectorTimeObservationEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.DependencyEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.DeploymentEditPart;
@@ -137,6 +143,12 @@ public class RoleBindingItemSemanticEditPolicy extends UMLBaseItemSemanticEditPo
if (UMLElementTypes.InformationFlow_4016 == req.getElementType()) {
return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));
}
+ if (UMLElementTypes.TimeObservationEvent_4018 == req.getElementType()) {
+ return null;
+ }
+ if (UMLElementTypes.DurationObservationEvent_4019 == req.getElementType()) {
+ return null;
+ }
return null;
}
@@ -186,6 +198,12 @@ public class RoleBindingItemSemanticEditPolicy extends UMLBaseItemSemanticEditPo
if (UMLElementTypes.InformationFlow_4016 == req.getElementType()) {
return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));
}
+ if (UMLElementTypes.TimeObservationEvent_4018 == req.getElementType()) {
+ return getGEFWrapper(new ConnectorTimeObservationCreateCommand(req, req.getSource(), req.getTarget()));
+ }
+ if (UMLElementTypes.DurationObservationEvent_4019 == req.getElementType()) {
+ return getGEFWrapper(new ConnectorDurationObservationCreateCommand(req, req.getSource(), req.getTarget()));
+ }
return null;
}
@@ -237,6 +255,10 @@ public class RoleBindingItemSemanticEditPolicy extends UMLBaseItemSemanticEditPo
return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));
case ConstraintConstrainedElementEditPart.VISUAL_ID:
return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));
+ case ConnectorTimeObservationEditPart.VISUAL_ID:
+ return getGEFWrapper(new ConnectorTimeObservationReorientCommand(req));
+ case ConnectorDurationObservationEditPart.VISUAL_ID:
+ return getGEFWrapper(new ConnectorDurationObservationReorientCommand(req));
}
return super.getReorientReferenceRelationshipCommand(req);
}
diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/SendOperationEventItemSemanticEditPolicy.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/SendOperationEventItemSemanticEditPolicy.java
index a32a85bcc3b..794ed87155a 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/SendOperationEventItemSemanticEditPolicy.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/SendOperationEventItemSemanticEditPolicy.java
@@ -34,6 +34,10 @@ import org.eclipse.papyrus.diagram.composite.edit.commands.CommentAnnotatedEleme
import org.eclipse.papyrus.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ComponentRealizationCreateCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ComponentRealizationReorientCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorDurationObservationCreateCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorDurationObservationReorientCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorTimeObservationCreateCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorTimeObservationReorientCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.DependencyCreateCommand;
@@ -59,6 +63,8 @@ import org.eclipse.papyrus.diagram.composite.edit.commands.UsageReorientCommand;
import org.eclipse.papyrus.diagram.composite.edit.parts.AbstractionEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.ComponentRealizationEditPart;
+import org.eclipse.papyrus.diagram.composite.edit.parts.ConnectorDurationObservationEditPart;
+import org.eclipse.papyrus.diagram.composite.edit.parts.ConnectorTimeObservationEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.DependencyEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.DeploymentEditPart;
@@ -180,6 +186,20 @@ public class SendOperationEventItemSemanticEditPolicy extends UMLBaseItemSemanti
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null,
+ incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null,
+ incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = view.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -323,6 +343,12 @@ public class SendOperationEventItemSemanticEditPolicy extends UMLBaseItemSemanti
if (UMLElementTypes.InformationFlow_4016 == req.getElementType()) {
return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));
}
+ if (UMLElementTypes.TimeObservationEvent_4018 == req.getElementType()) {
+ return null;
+ }
+ if (UMLElementTypes.DurationObservationEvent_4019 == req.getElementType()) {
+ return null;
+ }
return null;
}
@@ -372,6 +398,12 @@ public class SendOperationEventItemSemanticEditPolicy extends UMLBaseItemSemanti
if (UMLElementTypes.InformationFlow_4016 == req.getElementType()) {
return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));
}
+ if (UMLElementTypes.TimeObservationEvent_4018 == req.getElementType()) {
+ return getGEFWrapper(new ConnectorTimeObservationCreateCommand(req, req.getSource(), req.getTarget()));
+ }
+ if (UMLElementTypes.DurationObservationEvent_4019 == req.getElementType()) {
+ return getGEFWrapper(new ConnectorDurationObservationCreateCommand(req, req.getSource(), req.getTarget()));
+ }
return null;
}
@@ -423,6 +455,10 @@ public class SendOperationEventItemSemanticEditPolicy extends UMLBaseItemSemanti
return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));
case ConstraintConstrainedElementEditPart.VISUAL_ID:
return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));
+ case ConnectorTimeObservationEditPart.VISUAL_ID:
+ return getGEFWrapper(new ConnectorTimeObservationReorientCommand(req));
+ case ConnectorDurationObservationEditPart.VISUAL_ID:
+ return getGEFWrapper(new ConnectorDurationObservationReorientCommand(req));
}
return super.getReorientReferenceRelationshipCommand(req);
}
diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/SendSignalEventItemSemanticEditPolicy.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/SendSignalEventItemSemanticEditPolicy.java
index ad7401d1119..01d9d5ea047 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/SendSignalEventItemSemanticEditPolicy.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/SendSignalEventItemSemanticEditPolicy.java
@@ -34,6 +34,10 @@ import org.eclipse.papyrus.diagram.composite.edit.commands.CommentAnnotatedEleme
import org.eclipse.papyrus.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ComponentRealizationCreateCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ComponentRealizationReorientCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorDurationObservationCreateCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorDurationObservationReorientCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorTimeObservationCreateCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorTimeObservationReorientCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.DependencyCreateCommand;
@@ -59,6 +63,8 @@ import org.eclipse.papyrus.diagram.composite.edit.commands.UsageReorientCommand;
import org.eclipse.papyrus.diagram.composite.edit.parts.AbstractionEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.ComponentRealizationEditPart;
+import org.eclipse.papyrus.diagram.composite.edit.parts.ConnectorDurationObservationEditPart;
+import org.eclipse.papyrus.diagram.composite.edit.parts.ConnectorTimeObservationEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.DependencyEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.DeploymentEditPart;
@@ -180,6 +186,20 @@ public class SendSignalEventItemSemanticEditPolicy extends UMLBaseItemSemanticEd
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null,
+ incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null,
+ incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = view.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -323,6 +343,12 @@ public class SendSignalEventItemSemanticEditPolicy extends UMLBaseItemSemanticEd
if (UMLElementTypes.InformationFlow_4016 == req.getElementType()) {
return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));
}
+ if (UMLElementTypes.TimeObservationEvent_4018 == req.getElementType()) {
+ return null;
+ }
+ if (UMLElementTypes.DurationObservationEvent_4019 == req.getElementType()) {
+ return null;
+ }
return null;
}
@@ -372,6 +398,12 @@ public class SendSignalEventItemSemanticEditPolicy extends UMLBaseItemSemanticEd
if (UMLElementTypes.InformationFlow_4016 == req.getElementType()) {
return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));
}
+ if (UMLElementTypes.TimeObservationEvent_4018 == req.getElementType()) {
+ return getGEFWrapper(new ConnectorTimeObservationCreateCommand(req, req.getSource(), req.getTarget()));
+ }
+ if (UMLElementTypes.DurationObservationEvent_4019 == req.getElementType()) {
+ return getGEFWrapper(new ConnectorDurationObservationCreateCommand(req, req.getSource(), req.getTarget()));
+ }
return null;
}
@@ -423,6 +455,10 @@ public class SendSignalEventItemSemanticEditPolicy extends UMLBaseItemSemanticEd
return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));
case ConstraintConstrainedElementEditPart.VISUAL_ID:
return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));
+ case ConnectorTimeObservationEditPart.VISUAL_ID:
+ return getGEFWrapper(new ConnectorTimeObservationReorientCommand(req));
+ case ConnectorDurationObservationEditPart.VISUAL_ID:
+ return getGEFWrapper(new ConnectorDurationObservationReorientCommand(req));
}
return super.getReorientReferenceRelationshipCommand(req);
}
diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/SignalEventItemSemanticEditPolicy.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/SignalEventItemSemanticEditPolicy.java
index ede92ab46b2..1ad93f1753a 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/SignalEventItemSemanticEditPolicy.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/SignalEventItemSemanticEditPolicy.java
@@ -34,6 +34,10 @@ import org.eclipse.papyrus.diagram.composite.edit.commands.CommentAnnotatedEleme
import org.eclipse.papyrus.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ComponentRealizationCreateCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ComponentRealizationReorientCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorDurationObservationCreateCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorDurationObservationReorientCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorTimeObservationCreateCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorTimeObservationReorientCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.DependencyCreateCommand;
@@ -59,6 +63,8 @@ import org.eclipse.papyrus.diagram.composite.edit.commands.UsageReorientCommand;
import org.eclipse.papyrus.diagram.composite.edit.parts.AbstractionEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.ComponentRealizationEditPart;
+import org.eclipse.papyrus.diagram.composite.edit.parts.ConnectorDurationObservationEditPart;
+import org.eclipse.papyrus.diagram.composite.edit.parts.ConnectorTimeObservationEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.DependencyEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.DeploymentEditPart;
@@ -180,6 +186,20 @@ public class SignalEventItemSemanticEditPolicy extends UMLBaseItemSemanticEditPo
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null,
+ incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null,
+ incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = view.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -323,6 +343,12 @@ public class SignalEventItemSemanticEditPolicy extends UMLBaseItemSemanticEditPo
if (UMLElementTypes.InformationFlow_4016 == req.getElementType()) {
return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));
}
+ if (UMLElementTypes.TimeObservationEvent_4018 == req.getElementType()) {
+ return null;
+ }
+ if (UMLElementTypes.DurationObservationEvent_4019 == req.getElementType()) {
+ return null;
+ }
return null;
}
@@ -372,6 +398,12 @@ public class SignalEventItemSemanticEditPolicy extends UMLBaseItemSemanticEditPo
if (UMLElementTypes.InformationFlow_4016 == req.getElementType()) {
return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));
}
+ if (UMLElementTypes.TimeObservationEvent_4018 == req.getElementType()) {
+ return getGEFWrapper(new ConnectorTimeObservationCreateCommand(req, req.getSource(), req.getTarget()));
+ }
+ if (UMLElementTypes.DurationObservationEvent_4019 == req.getElementType()) {
+ return getGEFWrapper(new ConnectorDurationObservationCreateCommand(req, req.getSource(), req.getTarget()));
+ }
return null;
}
@@ -423,6 +455,10 @@ public class SignalEventItemSemanticEditPolicy extends UMLBaseItemSemanticEditPo
return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));
case ConstraintConstrainedElementEditPart.VISUAL_ID:
return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));
+ case ConnectorTimeObservationEditPart.VISUAL_ID:
+ return getGEFWrapper(new ConnectorTimeObservationReorientCommand(req));
+ case ConnectorDurationObservationEditPart.VISUAL_ID:
+ return getGEFWrapper(new ConnectorDurationObservationReorientCommand(req));
}
return super.getReorientReferenceRelationshipCommand(req);
}
diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/SignalItemSemanticEditPolicy.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/SignalItemSemanticEditPolicy.java
index a854e64abb7..fd0d9700b7f 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/SignalItemSemanticEditPolicy.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/SignalItemSemanticEditPolicy.java
@@ -34,6 +34,10 @@ import org.eclipse.papyrus.diagram.composite.edit.commands.CommentAnnotatedEleme
import org.eclipse.papyrus.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ComponentRealizationCreateCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ComponentRealizationReorientCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorDurationObservationCreateCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorDurationObservationReorientCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorTimeObservationCreateCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorTimeObservationReorientCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.DependencyCreateCommand;
@@ -59,6 +63,8 @@ import org.eclipse.papyrus.diagram.composite.edit.commands.UsageReorientCommand;
import org.eclipse.papyrus.diagram.composite.edit.parts.AbstractionEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.ComponentRealizationEditPart;
+import org.eclipse.papyrus.diagram.composite.edit.parts.ConnectorDurationObservationEditPart;
+import org.eclipse.papyrus.diagram.composite.edit.parts.ConnectorTimeObservationEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.DependencyEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.DeploymentEditPart;
@@ -180,6 +186,20 @@ public class SignalItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null,
+ incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null,
+ incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = view.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -323,6 +343,12 @@ public class SignalItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy
if (UMLElementTypes.InformationFlow_4016 == req.getElementType()) {
return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));
}
+ if (UMLElementTypes.TimeObservationEvent_4018 == req.getElementType()) {
+ return null;
+ }
+ if (UMLElementTypes.DurationObservationEvent_4019 == req.getElementType()) {
+ return null;
+ }
return null;
}
@@ -372,6 +398,12 @@ public class SignalItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy
if (UMLElementTypes.InformationFlow_4016 == req.getElementType()) {
return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));
}
+ if (UMLElementTypes.TimeObservationEvent_4018 == req.getElementType()) {
+ return getGEFWrapper(new ConnectorTimeObservationCreateCommand(req, req.getSource(), req.getTarget()));
+ }
+ if (UMLElementTypes.DurationObservationEvent_4019 == req.getElementType()) {
+ return getGEFWrapper(new ConnectorDurationObservationCreateCommand(req, req.getSource(), req.getTarget()));
+ }
return null;
}
@@ -423,6 +455,10 @@ public class SignalItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy
return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));
case ConstraintConstrainedElementEditPart.VISUAL_ID:
return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));
+ case ConnectorTimeObservationEditPart.VISUAL_ID:
+ return getGEFWrapper(new ConnectorTimeObservationReorientCommand(req));
+ case ConnectorDurationObservationEditPart.VISUAL_ID:
+ return getGEFWrapper(new ConnectorDurationObservationReorientCommand(req));
}
return super.getReorientReferenceRelationshipCommand(req);
}
diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/SignalItemSemanticEditPolicyCN.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/SignalItemSemanticEditPolicyCN.java
index a8b18ece105..9cb62abb4ea 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/SignalItemSemanticEditPolicyCN.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/SignalItemSemanticEditPolicyCN.java
@@ -34,6 +34,10 @@ import org.eclipse.papyrus.diagram.composite.edit.commands.CommentAnnotatedEleme
import org.eclipse.papyrus.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ComponentRealizationCreateCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ComponentRealizationReorientCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorDurationObservationCreateCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorDurationObservationReorientCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorTimeObservationCreateCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorTimeObservationReorientCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.DependencyCreateCommand;
@@ -59,6 +63,8 @@ import org.eclipse.papyrus.diagram.composite.edit.commands.UsageReorientCommand;
import org.eclipse.papyrus.diagram.composite.edit.parts.AbstractionEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.ComponentRealizationEditPart;
+import org.eclipse.papyrus.diagram.composite.edit.parts.ConnectorDurationObservationEditPart;
+import org.eclipse.papyrus.diagram.composite.edit.parts.ConnectorTimeObservationEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.DependencyEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.DeploymentEditPart;
@@ -180,6 +186,20 @@ public class SignalItemSemanticEditPolicyCN extends UMLBaseItemSemanticEditPolic
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null,
+ incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null,
+ incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = view.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -323,6 +343,12 @@ public class SignalItemSemanticEditPolicyCN extends UMLBaseItemSemanticEditPolic
if (UMLElementTypes.InformationFlow_4016 == req.getElementType()) {
return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));
}
+ if (UMLElementTypes.TimeObservationEvent_4018 == req.getElementType()) {
+ return null;
+ }
+ if (UMLElementTypes.DurationObservationEvent_4019 == req.getElementType()) {
+ return null;
+ }
return null;
}
@@ -372,6 +398,12 @@ public class SignalItemSemanticEditPolicyCN extends UMLBaseItemSemanticEditPolic
if (UMLElementTypes.InformationFlow_4016 == req.getElementType()) {
return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));
}
+ if (UMLElementTypes.TimeObservationEvent_4018 == req.getElementType()) {
+ return getGEFWrapper(new ConnectorTimeObservationCreateCommand(req, req.getSource(), req.getTarget()));
+ }
+ if (UMLElementTypes.DurationObservationEvent_4019 == req.getElementType()) {
+ return getGEFWrapper(new ConnectorDurationObservationCreateCommand(req, req.getSource(), req.getTarget()));
+ }
return null;
}
@@ -423,6 +455,10 @@ public class SignalItemSemanticEditPolicyCN extends UMLBaseItemSemanticEditPolic
return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));
case ConstraintConstrainedElementEditPart.VISUAL_ID:
return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));
+ case ConnectorTimeObservationEditPart.VISUAL_ID:
+ return getGEFWrapper(new ConnectorTimeObservationReorientCommand(req));
+ case ConnectorDurationObservationEditPart.VISUAL_ID:
+ return getGEFWrapper(new ConnectorDurationObservationReorientCommand(req));
}
return super.getReorientReferenceRelationshipCommand(req);
}
diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/StateMachineCompositeItemSemanticEditPolicy.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/StateMachineCompositeItemSemanticEditPolicy.java
index 31cf2728ac2..bb7e9222997 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/StateMachineCompositeItemSemanticEditPolicy.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/StateMachineCompositeItemSemanticEditPolicy.java
@@ -37,6 +37,10 @@ import org.eclipse.papyrus.diagram.composite.edit.commands.CommentAnnotatedEleme
import org.eclipse.papyrus.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ComponentRealizationCreateCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ComponentRealizationReorientCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorDurationObservationCreateCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorDurationObservationReorientCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorTimeObservationCreateCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorTimeObservationReorientCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.DependencyCreateCommand;
@@ -71,6 +75,8 @@ import org.eclipse.papyrus.diagram.composite.edit.parts.CommentAnnotatedElementE
import org.eclipse.papyrus.diagram.composite.edit.parts.CommentEditPartCN;
import org.eclipse.papyrus.diagram.composite.edit.parts.ComponentCompositeEditPartCN;
import org.eclipse.papyrus.diagram.composite.edit.parts.ComponentRealizationEditPart;
+import org.eclipse.papyrus.diagram.composite.edit.parts.ConnectorDurationObservationEditPart;
+import org.eclipse.papyrus.diagram.composite.edit.parts.ConnectorTimeObservationEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.DataTypeEditPartCN;
import org.eclipse.papyrus.diagram.composite.edit.parts.DependencyEditPart;
@@ -221,6 +227,20 @@ public class StateMachineCompositeItemSemanticEditPolicy extends UMLBaseItemSema
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null,
+ incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null,
+ incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = view.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -407,6 +427,20 @@ public class StateMachineCompositeItemSemanticEditPolicy extends UMLBaseItemSema
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource().getElement(),
+ null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource().getElement(),
+ null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = node.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -584,6 +618,20 @@ public class StateMachineCompositeItemSemanticEditPolicy extends UMLBaseItemSema
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -757,6 +805,20 @@ public class StateMachineCompositeItemSemanticEditPolicy extends UMLBaseItemSema
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -930,6 +992,20 @@ public class StateMachineCompositeItemSemanticEditPolicy extends UMLBaseItemSema
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -1103,6 +1179,20 @@ public class StateMachineCompositeItemSemanticEditPolicy extends UMLBaseItemSema
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -1276,6 +1366,20 @@ public class StateMachineCompositeItemSemanticEditPolicy extends UMLBaseItemSema
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -1449,6 +1553,20 @@ public class StateMachineCompositeItemSemanticEditPolicy extends UMLBaseItemSema
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -1622,6 +1740,20 @@ public class StateMachineCompositeItemSemanticEditPolicy extends UMLBaseItemSema
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -1795,6 +1927,20 @@ public class StateMachineCompositeItemSemanticEditPolicy extends UMLBaseItemSema
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -1968,6 +2114,20 @@ public class StateMachineCompositeItemSemanticEditPolicy extends UMLBaseItemSema
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -2141,6 +2301,20 @@ public class StateMachineCompositeItemSemanticEditPolicy extends UMLBaseItemSema
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -2314,6 +2488,20 @@ public class StateMachineCompositeItemSemanticEditPolicy extends UMLBaseItemSema
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -2487,6 +2675,20 @@ public class StateMachineCompositeItemSemanticEditPolicy extends UMLBaseItemSema
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -2660,6 +2862,20 @@ public class StateMachineCompositeItemSemanticEditPolicy extends UMLBaseItemSema
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -2833,6 +3049,20 @@ public class StateMachineCompositeItemSemanticEditPolicy extends UMLBaseItemSema
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -3006,6 +3236,20 @@ public class StateMachineCompositeItemSemanticEditPolicy extends UMLBaseItemSema
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -3179,6 +3423,20 @@ public class StateMachineCompositeItemSemanticEditPolicy extends UMLBaseItemSema
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -3352,6 +3610,20 @@ public class StateMachineCompositeItemSemanticEditPolicy extends UMLBaseItemSema
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -3525,6 +3797,20 @@ public class StateMachineCompositeItemSemanticEditPolicy extends UMLBaseItemSema
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -3698,6 +3984,20 @@ public class StateMachineCompositeItemSemanticEditPolicy extends UMLBaseItemSema
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -3871,6 +4171,20 @@ public class StateMachineCompositeItemSemanticEditPolicy extends UMLBaseItemSema
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -4044,6 +4358,20 @@ public class StateMachineCompositeItemSemanticEditPolicy extends UMLBaseItemSema
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -4217,6 +4545,20 @@ public class StateMachineCompositeItemSemanticEditPolicy extends UMLBaseItemSema
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -4390,6 +4732,20 @@ public class StateMachineCompositeItemSemanticEditPolicy extends UMLBaseItemSema
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -4563,6 +4919,20 @@ public class StateMachineCompositeItemSemanticEditPolicy extends UMLBaseItemSema
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -4769,6 +5139,12 @@ public class StateMachineCompositeItemSemanticEditPolicy extends UMLBaseItemSema
if (UMLElementTypes.InformationFlow_4016 == req.getElementType()) {
return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));
}
+ if (UMLElementTypes.TimeObservationEvent_4018 == req.getElementType()) {
+ return null;
+ }
+ if (UMLElementTypes.DurationObservationEvent_4019 == req.getElementType()) {
+ return null;
+ }
return null;
}
@@ -4818,6 +5194,12 @@ public class StateMachineCompositeItemSemanticEditPolicy extends UMLBaseItemSema
if (UMLElementTypes.InformationFlow_4016 == req.getElementType()) {
return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));
}
+ if (UMLElementTypes.TimeObservationEvent_4018 == req.getElementType()) {
+ return getGEFWrapper(new ConnectorTimeObservationCreateCommand(req, req.getSource(), req.getTarget()));
+ }
+ if (UMLElementTypes.DurationObservationEvent_4019 == req.getElementType()) {
+ return getGEFWrapper(new ConnectorDurationObservationCreateCommand(req, req.getSource(), req.getTarget()));
+ }
return null;
}
@@ -4869,6 +5251,10 @@ public class StateMachineCompositeItemSemanticEditPolicy extends UMLBaseItemSema
return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));
case ConstraintConstrainedElementEditPart.VISUAL_ID:
return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));
+ case ConnectorTimeObservationEditPart.VISUAL_ID:
+ return getGEFWrapper(new ConnectorTimeObservationReorientCommand(req));
+ case ConnectorDurationObservationEditPart.VISUAL_ID:
+ return getGEFWrapper(new ConnectorDurationObservationReorientCommand(req));
}
return super.getReorientReferenceRelationshipCommand(req);
}
diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/StateMachineCompositeItemSemanticEditPolicyCN.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/StateMachineCompositeItemSemanticEditPolicyCN.java
index 0523f679b99..351bc3d1bd7 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/StateMachineCompositeItemSemanticEditPolicyCN.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/StateMachineCompositeItemSemanticEditPolicyCN.java
@@ -37,6 +37,10 @@ import org.eclipse.papyrus.diagram.composite.edit.commands.CommentAnnotatedEleme
import org.eclipse.papyrus.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ComponentRealizationCreateCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ComponentRealizationReorientCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorDurationObservationCreateCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorDurationObservationReorientCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorTimeObservationCreateCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorTimeObservationReorientCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.DependencyCreateCommand;
@@ -71,6 +75,8 @@ import org.eclipse.papyrus.diagram.composite.edit.parts.CommentAnnotatedElementE
import org.eclipse.papyrus.diagram.composite.edit.parts.CommentEditPartCN;
import org.eclipse.papyrus.diagram.composite.edit.parts.ComponentCompositeEditPartCN;
import org.eclipse.papyrus.diagram.composite.edit.parts.ComponentRealizationEditPart;
+import org.eclipse.papyrus.diagram.composite.edit.parts.ConnectorDurationObservationEditPart;
+import org.eclipse.papyrus.diagram.composite.edit.parts.ConnectorTimeObservationEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.DataTypeEditPartCN;
import org.eclipse.papyrus.diagram.composite.edit.parts.DependencyEditPart;
@@ -221,6 +227,20 @@ public class StateMachineCompositeItemSemanticEditPolicyCN extends UMLBaseItemSe
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null,
+ incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null,
+ incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = view.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -407,6 +427,20 @@ public class StateMachineCompositeItemSemanticEditPolicyCN extends UMLBaseItemSe
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource().getElement(),
+ null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource().getElement(),
+ null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = node.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -584,6 +618,20 @@ public class StateMachineCompositeItemSemanticEditPolicyCN extends UMLBaseItemSe
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -757,6 +805,20 @@ public class StateMachineCompositeItemSemanticEditPolicyCN extends UMLBaseItemSe
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -930,6 +992,20 @@ public class StateMachineCompositeItemSemanticEditPolicyCN extends UMLBaseItemSe
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -1103,6 +1179,20 @@ public class StateMachineCompositeItemSemanticEditPolicyCN extends UMLBaseItemSe
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -1276,6 +1366,20 @@ public class StateMachineCompositeItemSemanticEditPolicyCN extends UMLBaseItemSe
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -1449,6 +1553,20 @@ public class StateMachineCompositeItemSemanticEditPolicyCN extends UMLBaseItemSe
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -1622,6 +1740,20 @@ public class StateMachineCompositeItemSemanticEditPolicyCN extends UMLBaseItemSe
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -1795,6 +1927,20 @@ public class StateMachineCompositeItemSemanticEditPolicyCN extends UMLBaseItemSe
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -1968,6 +2114,20 @@ public class StateMachineCompositeItemSemanticEditPolicyCN extends UMLBaseItemSe
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -2141,6 +2301,20 @@ public class StateMachineCompositeItemSemanticEditPolicyCN extends UMLBaseItemSe
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -2314,6 +2488,20 @@ public class StateMachineCompositeItemSemanticEditPolicyCN extends UMLBaseItemSe
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -2487,6 +2675,20 @@ public class StateMachineCompositeItemSemanticEditPolicyCN extends UMLBaseItemSe
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -2660,6 +2862,20 @@ public class StateMachineCompositeItemSemanticEditPolicyCN extends UMLBaseItemSe
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -2833,6 +3049,20 @@ public class StateMachineCompositeItemSemanticEditPolicyCN extends UMLBaseItemSe
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -3006,6 +3236,20 @@ public class StateMachineCompositeItemSemanticEditPolicyCN extends UMLBaseItemSe
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -3179,6 +3423,20 @@ public class StateMachineCompositeItemSemanticEditPolicyCN extends UMLBaseItemSe
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -3352,6 +3610,20 @@ public class StateMachineCompositeItemSemanticEditPolicyCN extends UMLBaseItemSe
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -3525,6 +3797,20 @@ public class StateMachineCompositeItemSemanticEditPolicyCN extends UMLBaseItemSe
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -3698,6 +3984,20 @@ public class StateMachineCompositeItemSemanticEditPolicyCN extends UMLBaseItemSe
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -3871,6 +4171,20 @@ public class StateMachineCompositeItemSemanticEditPolicyCN extends UMLBaseItemSe
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -4044,6 +4358,20 @@ public class StateMachineCompositeItemSemanticEditPolicyCN extends UMLBaseItemSe
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -4217,6 +4545,20 @@ public class StateMachineCompositeItemSemanticEditPolicyCN extends UMLBaseItemSe
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -4390,6 +4732,20 @@ public class StateMachineCompositeItemSemanticEditPolicyCN extends UMLBaseItemSe
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -4563,6 +4919,20 @@ public class StateMachineCompositeItemSemanticEditPolicyCN extends UMLBaseItemSe
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource()
+ .getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = cnode.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -4769,6 +5139,12 @@ public class StateMachineCompositeItemSemanticEditPolicyCN extends UMLBaseItemSe
if (UMLElementTypes.InformationFlow_4016 == req.getElementType()) {
return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));
}
+ if (UMLElementTypes.TimeObservationEvent_4018 == req.getElementType()) {
+ return null;
+ }
+ if (UMLElementTypes.DurationObservationEvent_4019 == req.getElementType()) {
+ return null;
+ }
return null;
}
@@ -4818,6 +5194,12 @@ public class StateMachineCompositeItemSemanticEditPolicyCN extends UMLBaseItemSe
if (UMLElementTypes.InformationFlow_4016 == req.getElementType()) {
return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));
}
+ if (UMLElementTypes.TimeObservationEvent_4018 == req.getElementType()) {
+ return getGEFWrapper(new ConnectorTimeObservationCreateCommand(req, req.getSource(), req.getTarget()));
+ }
+ if (UMLElementTypes.DurationObservationEvent_4019 == req.getElementType()) {
+ return getGEFWrapper(new ConnectorDurationObservationCreateCommand(req, req.getSource(), req.getTarget()));
+ }
return null;
}
@@ -4869,6 +5251,10 @@ public class StateMachineCompositeItemSemanticEditPolicyCN extends UMLBaseItemSe
return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));
case ConstraintConstrainedElementEditPart.VISUAL_ID:
return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));
+ case ConnectorTimeObservationEditPart.VISUAL_ID:
+ return getGEFWrapper(new ConnectorTimeObservationReorientCommand(req));
+ case ConnectorDurationObservationEditPart.VISUAL_ID:
+ return getGEFWrapper(new ConnectorDurationObservationReorientCommand(req));
}
return super.getReorientReferenceRelationshipCommand(req);
}
diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/StringExpressionItemSemanticEditPolicy.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/StringExpressionItemSemanticEditPolicy.java
index f8c006b550b..4d6bfb8eb00 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/StringExpressionItemSemanticEditPolicy.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/StringExpressionItemSemanticEditPolicy.java
@@ -34,6 +34,10 @@ import org.eclipse.papyrus.diagram.composite.edit.commands.CommentAnnotatedEleme
import org.eclipse.papyrus.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ComponentRealizationCreateCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ComponentRealizationReorientCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorDurationObservationCreateCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorDurationObservationReorientCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorTimeObservationCreateCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorTimeObservationReorientCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.DependencyCreateCommand;
@@ -59,6 +63,8 @@ import org.eclipse.papyrus.diagram.composite.edit.commands.UsageReorientCommand;
import org.eclipse.papyrus.diagram.composite.edit.parts.AbstractionEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.ComponentRealizationEditPart;
+import org.eclipse.papyrus.diagram.composite.edit.parts.ConnectorDurationObservationEditPart;
+import org.eclipse.papyrus.diagram.composite.edit.parts.ConnectorTimeObservationEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.DependencyEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.DeploymentEditPart;
@@ -180,6 +186,20 @@ public class StringExpressionItemSemanticEditPolicy extends UMLBaseItemSemanticE
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null,
+ incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null,
+ incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = view.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -323,6 +343,12 @@ public class StringExpressionItemSemanticEditPolicy extends UMLBaseItemSemanticE
if (UMLElementTypes.InformationFlow_4016 == req.getElementType()) {
return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));
}
+ if (UMLElementTypes.TimeObservationEvent_4018 == req.getElementType()) {
+ return null;
+ }
+ if (UMLElementTypes.DurationObservationEvent_4019 == req.getElementType()) {
+ return null;
+ }
return null;
}
@@ -372,6 +398,12 @@ public class StringExpressionItemSemanticEditPolicy extends UMLBaseItemSemanticE
if (UMLElementTypes.InformationFlow_4016 == req.getElementType()) {
return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));
}
+ if (UMLElementTypes.TimeObservationEvent_4018 == req.getElementType()) {
+ return getGEFWrapper(new ConnectorTimeObservationCreateCommand(req, req.getSource(), req.getTarget()));
+ }
+ if (UMLElementTypes.DurationObservationEvent_4019 == req.getElementType()) {
+ return getGEFWrapper(new ConnectorDurationObservationCreateCommand(req, req.getSource(), req.getTarget()));
+ }
return null;
}
@@ -423,6 +455,10 @@ public class StringExpressionItemSemanticEditPolicy extends UMLBaseItemSemanticE
return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));
case ConstraintConstrainedElementEditPart.VISUAL_ID:
return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));
+ case ConnectorTimeObservationEditPart.VISUAL_ID:
+ return getGEFWrapper(new ConnectorTimeObservationReorientCommand(req));
+ case ConnectorDurationObservationEditPart.VISUAL_ID:
+ return getGEFWrapper(new ConnectorDurationObservationReorientCommand(req));
}
return super.getReorientReferenceRelationshipCommand(req);
}
diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/SubstitutionItemSemanticEditPolicy.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/SubstitutionItemSemanticEditPolicy.java
index 9d2993edff6..8f98d46ee0a 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/SubstitutionItemSemanticEditPolicy.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/SubstitutionItemSemanticEditPolicy.java
@@ -25,6 +25,10 @@ import org.eclipse.papyrus.diagram.composite.edit.commands.CommentAnnotatedEleme
import org.eclipse.papyrus.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ComponentRealizationCreateCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ComponentRealizationReorientCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorDurationObservationCreateCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorDurationObservationReorientCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorTimeObservationCreateCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorTimeObservationReorientCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.DependencyCreateCommand;
@@ -50,6 +54,8 @@ import org.eclipse.papyrus.diagram.composite.edit.commands.UsageReorientCommand;
import org.eclipse.papyrus.diagram.composite.edit.parts.AbstractionEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.ComponentRealizationEditPart;
+import org.eclipse.papyrus.diagram.composite.edit.parts.ConnectorDurationObservationEditPart;
+import org.eclipse.papyrus.diagram.composite.edit.parts.ConnectorTimeObservationEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.DependencyEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.DeploymentEditPart;
@@ -137,6 +143,12 @@ public class SubstitutionItemSemanticEditPolicy extends UMLBaseItemSemanticEditP
if (UMLElementTypes.InformationFlow_4016 == req.getElementType()) {
return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));
}
+ if (UMLElementTypes.TimeObservationEvent_4018 == req.getElementType()) {
+ return null;
+ }
+ if (UMLElementTypes.DurationObservationEvent_4019 == req.getElementType()) {
+ return null;
+ }
return null;
}
@@ -186,6 +198,12 @@ public class SubstitutionItemSemanticEditPolicy extends UMLBaseItemSemanticEditP
if (UMLElementTypes.InformationFlow_4016 == req.getElementType()) {
return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));
}
+ if (UMLElementTypes.TimeObservationEvent_4018 == req.getElementType()) {
+ return getGEFWrapper(new ConnectorTimeObservationCreateCommand(req, req.getSource(), req.getTarget()));
+ }
+ if (UMLElementTypes.DurationObservationEvent_4019 == req.getElementType()) {
+ return getGEFWrapper(new ConnectorDurationObservationCreateCommand(req, req.getSource(), req.getTarget()));
+ }
return null;
}
@@ -237,6 +255,10 @@ public class SubstitutionItemSemanticEditPolicy extends UMLBaseItemSemanticEditP
return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));
case ConstraintConstrainedElementEditPart.VISUAL_ID:
return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));
+ case ConnectorTimeObservationEditPart.VISUAL_ID:
+ return getGEFWrapper(new ConnectorTimeObservationReorientCommand(req));
+ case ConnectorDurationObservationEditPart.VISUAL_ID:
+ return getGEFWrapper(new ConnectorDurationObservationReorientCommand(req));
}
return super.getReorientReferenceRelationshipCommand(req);
}
diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/TimeConstraintItemSemanticEditPolicy.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/TimeConstraintItemSemanticEditPolicy.java
index d623df48882..1565f781541 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/TimeConstraintItemSemanticEditPolicy.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/TimeConstraintItemSemanticEditPolicy.java
@@ -34,6 +34,10 @@ import org.eclipse.papyrus.diagram.composite.edit.commands.CommentAnnotatedEleme
import org.eclipse.papyrus.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ComponentRealizationCreateCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ComponentRealizationReorientCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorDurationObservationCreateCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorDurationObservationReorientCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorTimeObservationCreateCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorTimeObservationReorientCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.DependencyCreateCommand;
@@ -59,6 +63,8 @@ import org.eclipse.papyrus.diagram.composite.edit.commands.UsageReorientCommand;
import org.eclipse.papyrus.diagram.composite.edit.parts.AbstractionEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.ComponentRealizationEditPart;
+import org.eclipse.papyrus.diagram.composite.edit.parts.ConnectorDurationObservationEditPart;
+import org.eclipse.papyrus.diagram.composite.edit.parts.ConnectorTimeObservationEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.DependencyEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.DeploymentEditPart;
@@ -180,6 +186,20 @@ public class TimeConstraintItemSemanticEditPolicy extends UMLBaseItemSemanticEdi
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null,
+ incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null,
+ incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = view.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -330,6 +350,12 @@ public class TimeConstraintItemSemanticEditPolicy extends UMLBaseItemSemanticEdi
if (UMLElementTypes.InformationFlow_4016 == req.getElementType()) {
return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));
}
+ if (UMLElementTypes.TimeObservationEvent_4018 == req.getElementType()) {
+ return null;
+ }
+ if (UMLElementTypes.DurationObservationEvent_4019 == req.getElementType()) {
+ return null;
+ }
return null;
}
@@ -379,6 +405,12 @@ public class TimeConstraintItemSemanticEditPolicy extends UMLBaseItemSemanticEdi
if (UMLElementTypes.InformationFlow_4016 == req.getElementType()) {
return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));
}
+ if (UMLElementTypes.TimeObservationEvent_4018 == req.getElementType()) {
+ return getGEFWrapper(new ConnectorTimeObservationCreateCommand(req, req.getSource(), req.getTarget()));
+ }
+ if (UMLElementTypes.DurationObservationEvent_4019 == req.getElementType()) {
+ return getGEFWrapper(new ConnectorDurationObservationCreateCommand(req, req.getSource(), req.getTarget()));
+ }
return null;
}
@@ -430,6 +462,10 @@ public class TimeConstraintItemSemanticEditPolicy extends UMLBaseItemSemanticEdi
return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));
case ConstraintConstrainedElementEditPart.VISUAL_ID:
return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));
+ case ConnectorTimeObservationEditPart.VISUAL_ID:
+ return getGEFWrapper(new ConnectorTimeObservationReorientCommand(req));
+ case ConnectorDurationObservationEditPart.VISUAL_ID:
+ return getGEFWrapper(new ConnectorDurationObservationReorientCommand(req));
}
return super.getReorientReferenceRelationshipCommand(req);
}
diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/TimeEventItemSemanticEditPolicy.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/TimeEventItemSemanticEditPolicy.java
index ee381d1aee1..cf5a42a8055 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/TimeEventItemSemanticEditPolicy.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/TimeEventItemSemanticEditPolicy.java
@@ -34,6 +34,10 @@ import org.eclipse.papyrus.diagram.composite.edit.commands.CommentAnnotatedEleme
import org.eclipse.papyrus.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ComponentRealizationCreateCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ComponentRealizationReorientCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorDurationObservationCreateCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorDurationObservationReorientCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorTimeObservationCreateCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorTimeObservationReorientCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.DependencyCreateCommand;
@@ -59,6 +63,8 @@ import org.eclipse.papyrus.diagram.composite.edit.commands.UsageReorientCommand;
import org.eclipse.papyrus.diagram.composite.edit.parts.AbstractionEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.ComponentRealizationEditPart;
+import org.eclipse.papyrus.diagram.composite.edit.parts.ConnectorDurationObservationEditPart;
+import org.eclipse.papyrus.diagram.composite.edit.parts.ConnectorTimeObservationEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.DependencyEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.DeploymentEditPart;
@@ -180,6 +186,20 @@ public class TimeEventItemSemanticEditPolicy extends UMLBaseItemSemanticEditPoli
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null,
+ incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null,
+ incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = view.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -323,6 +343,12 @@ public class TimeEventItemSemanticEditPolicy extends UMLBaseItemSemanticEditPoli
if (UMLElementTypes.InformationFlow_4016 == req.getElementType()) {
return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));
}
+ if (UMLElementTypes.TimeObservationEvent_4018 == req.getElementType()) {
+ return null;
+ }
+ if (UMLElementTypes.DurationObservationEvent_4019 == req.getElementType()) {
+ return null;
+ }
return null;
}
@@ -372,6 +398,12 @@ public class TimeEventItemSemanticEditPolicy extends UMLBaseItemSemanticEditPoli
if (UMLElementTypes.InformationFlow_4016 == req.getElementType()) {
return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));
}
+ if (UMLElementTypes.TimeObservationEvent_4018 == req.getElementType()) {
+ return getGEFWrapper(new ConnectorTimeObservationCreateCommand(req, req.getSource(), req.getTarget()));
+ }
+ if (UMLElementTypes.DurationObservationEvent_4019 == req.getElementType()) {
+ return getGEFWrapper(new ConnectorDurationObservationCreateCommand(req, req.getSource(), req.getTarget()));
+ }
return null;
}
@@ -423,6 +455,10 @@ public class TimeEventItemSemanticEditPolicy extends UMLBaseItemSemanticEditPoli
return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));
case ConstraintConstrainedElementEditPart.VISUAL_ID:
return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));
+ case ConnectorTimeObservationEditPart.VISUAL_ID:
+ return getGEFWrapper(new ConnectorTimeObservationReorientCommand(req));
+ case ConnectorDurationObservationEditPart.VISUAL_ID:
+ return getGEFWrapper(new ConnectorDurationObservationReorientCommand(req));
}
return super.getReorientReferenceRelationshipCommand(req);
}
diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/TimeExpressionItemSemanticEditPolicy.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/TimeExpressionItemSemanticEditPolicy.java
index 0a6db1398a9..f28f761a7ec 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/TimeExpressionItemSemanticEditPolicy.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/TimeExpressionItemSemanticEditPolicy.java
@@ -34,6 +34,10 @@ import org.eclipse.papyrus.diagram.composite.edit.commands.CommentAnnotatedEleme
import org.eclipse.papyrus.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ComponentRealizationCreateCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ComponentRealizationReorientCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorDurationObservationCreateCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorDurationObservationReorientCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorTimeObservationCreateCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorTimeObservationReorientCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.DependencyCreateCommand;
@@ -59,6 +63,8 @@ import org.eclipse.papyrus.diagram.composite.edit.commands.UsageReorientCommand;
import org.eclipse.papyrus.diagram.composite.edit.parts.AbstractionEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.ComponentRealizationEditPart;
+import org.eclipse.papyrus.diagram.composite.edit.parts.ConnectorDurationObservationEditPart;
+import org.eclipse.papyrus.diagram.composite.edit.parts.ConnectorTimeObservationEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.DependencyEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.DeploymentEditPart;
@@ -180,6 +186,20 @@ public class TimeExpressionItemSemanticEditPolicy extends UMLBaseItemSemanticEdi
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null,
+ incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null,
+ incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = view.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -323,6 +343,12 @@ public class TimeExpressionItemSemanticEditPolicy extends UMLBaseItemSemanticEdi
if (UMLElementTypes.InformationFlow_4016 == req.getElementType()) {
return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));
}
+ if (UMLElementTypes.TimeObservationEvent_4018 == req.getElementType()) {
+ return null;
+ }
+ if (UMLElementTypes.DurationObservationEvent_4019 == req.getElementType()) {
+ return null;
+ }
return null;
}
@@ -372,6 +398,12 @@ public class TimeExpressionItemSemanticEditPolicy extends UMLBaseItemSemanticEdi
if (UMLElementTypes.InformationFlow_4016 == req.getElementType()) {
return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));
}
+ if (UMLElementTypes.TimeObservationEvent_4018 == req.getElementType()) {
+ return getGEFWrapper(new ConnectorTimeObservationCreateCommand(req, req.getSource(), req.getTarget()));
+ }
+ if (UMLElementTypes.DurationObservationEvent_4019 == req.getElementType()) {
+ return getGEFWrapper(new ConnectorDurationObservationCreateCommand(req, req.getSource(), req.getTarget()));
+ }
return null;
}
@@ -423,6 +455,10 @@ public class TimeExpressionItemSemanticEditPolicy extends UMLBaseItemSemanticEdi
return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));
case ConstraintConstrainedElementEditPart.VISUAL_ID:
return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));
+ case ConnectorTimeObservationEditPart.VISUAL_ID:
+ return getGEFWrapper(new ConnectorTimeObservationReorientCommand(req));
+ case ConnectorDurationObservationEditPart.VISUAL_ID:
+ return getGEFWrapper(new ConnectorDurationObservationReorientCommand(req));
}
return super.getReorientReferenceRelationshipCommand(req);
}
diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/TimeIntervalItemSemanticEditPolicy.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/TimeIntervalItemSemanticEditPolicy.java
index 96039199c1e..4febfc01235 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/TimeIntervalItemSemanticEditPolicy.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/TimeIntervalItemSemanticEditPolicy.java
@@ -34,6 +34,10 @@ import org.eclipse.papyrus.diagram.composite.edit.commands.CommentAnnotatedEleme
import org.eclipse.papyrus.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ComponentRealizationCreateCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ComponentRealizationReorientCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorDurationObservationCreateCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorDurationObservationReorientCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorTimeObservationCreateCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorTimeObservationReorientCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.DependencyCreateCommand;
@@ -59,6 +63,8 @@ import org.eclipse.papyrus.diagram.composite.edit.commands.UsageReorientCommand;
import org.eclipse.papyrus.diagram.composite.edit.parts.AbstractionEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.ComponentRealizationEditPart;
+import org.eclipse.papyrus.diagram.composite.edit.parts.ConnectorDurationObservationEditPart;
+import org.eclipse.papyrus.diagram.composite.edit.parts.ConnectorTimeObservationEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.DependencyEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.DeploymentEditPart;
@@ -180,6 +186,20 @@ public class TimeIntervalItemSemanticEditPolicy extends UMLBaseItemSemanticEditP
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null,
+ incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null,
+ incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = view.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -323,6 +343,12 @@ public class TimeIntervalItemSemanticEditPolicy extends UMLBaseItemSemanticEditP
if (UMLElementTypes.InformationFlow_4016 == req.getElementType()) {
return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));
}
+ if (UMLElementTypes.TimeObservationEvent_4018 == req.getElementType()) {
+ return null;
+ }
+ if (UMLElementTypes.DurationObservationEvent_4019 == req.getElementType()) {
+ return null;
+ }
return null;
}
@@ -372,6 +398,12 @@ public class TimeIntervalItemSemanticEditPolicy extends UMLBaseItemSemanticEditP
if (UMLElementTypes.InformationFlow_4016 == req.getElementType()) {
return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));
}
+ if (UMLElementTypes.TimeObservationEvent_4018 == req.getElementType()) {
+ return getGEFWrapper(new ConnectorTimeObservationCreateCommand(req, req.getSource(), req.getTarget()));
+ }
+ if (UMLElementTypes.DurationObservationEvent_4019 == req.getElementType()) {
+ return getGEFWrapper(new ConnectorDurationObservationCreateCommand(req, req.getSource(), req.getTarget()));
+ }
return null;
}
@@ -423,6 +455,10 @@ public class TimeIntervalItemSemanticEditPolicy extends UMLBaseItemSemanticEditP
return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));
case ConstraintConstrainedElementEditPart.VISUAL_ID:
return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));
+ case ConnectorTimeObservationEditPart.VISUAL_ID:
+ return getGEFWrapper(new ConnectorTimeObservationReorientCommand(req));
+ case ConnectorDurationObservationEditPart.VISUAL_ID:
+ return getGEFWrapper(new ConnectorDurationObservationReorientCommand(req));
}
return super.getReorientReferenceRelationshipCommand(req);
}
diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/TimeObservationItemSemanticEditPolicy.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/TimeObservationItemSemanticEditPolicy.java
index 5f2167ce01d..66f8c8921a7 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/TimeObservationItemSemanticEditPolicy.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/TimeObservationItemSemanticEditPolicy.java
@@ -34,6 +34,10 @@ import org.eclipse.papyrus.diagram.composite.edit.commands.CommentAnnotatedEleme
import org.eclipse.papyrus.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ComponentRealizationCreateCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ComponentRealizationReorientCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorDurationObservationCreateCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorDurationObservationReorientCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorTimeObservationCreateCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorTimeObservationReorientCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.DependencyCreateCommand;
@@ -59,6 +63,8 @@ import org.eclipse.papyrus.diagram.composite.edit.commands.UsageReorientCommand;
import org.eclipse.papyrus.diagram.composite.edit.parts.AbstractionEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.ComponentRealizationEditPart;
+import org.eclipse.papyrus.diagram.composite.edit.parts.ConnectorDurationObservationEditPart;
+import org.eclipse.papyrus.diagram.composite.edit.parts.ConnectorTimeObservationEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.DependencyEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.DeploymentEditPart;
@@ -180,6 +186,20 @@ public class TimeObservationItemSemanticEditPolicy extends UMLBaseItemSemanticEd
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null,
+ incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null,
+ incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = view.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -255,6 +275,13 @@ public class TimeObservationItemSemanticEditPolicy extends UMLBaseItemSemanticEd
cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(outgoingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(outgoingLink.getSource().getElement(), null,
+ outgoingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));
+ continue;
+ }
}
EAnnotation annotation = view.getEAnnotation("Shortcut"); //$NON-NLS-1$
if (annotation == null) {
@@ -323,6 +350,12 @@ public class TimeObservationItemSemanticEditPolicy extends UMLBaseItemSemanticEd
if (UMLElementTypes.InformationFlow_4016 == req.getElementType()) {
return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));
}
+ if (UMLElementTypes.TimeObservationEvent_4018 == req.getElementType()) {
+ return getGEFWrapper(new ConnectorTimeObservationCreateCommand(req, req.getSource(), req.getTarget()));
+ }
+ if (UMLElementTypes.DurationObservationEvent_4019 == req.getElementType()) {
+ return null;
+ }
return null;
}
@@ -372,6 +405,12 @@ public class TimeObservationItemSemanticEditPolicy extends UMLBaseItemSemanticEd
if (UMLElementTypes.InformationFlow_4016 == req.getElementType()) {
return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));
}
+ if (UMLElementTypes.TimeObservationEvent_4018 == req.getElementType()) {
+ return getGEFWrapper(new ConnectorTimeObservationCreateCommand(req, req.getSource(), req.getTarget()));
+ }
+ if (UMLElementTypes.DurationObservationEvent_4019 == req.getElementType()) {
+ return getGEFWrapper(new ConnectorDurationObservationCreateCommand(req, req.getSource(), req.getTarget()));
+ }
return null;
}
@@ -423,6 +462,10 @@ public class TimeObservationItemSemanticEditPolicy extends UMLBaseItemSemanticEd
return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));
case ConstraintConstrainedElementEditPart.VISUAL_ID:
return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));
+ case ConnectorTimeObservationEditPart.VISUAL_ID:
+ return getGEFWrapper(new ConnectorTimeObservationReorientCommand(req));
+ case ConnectorDurationObservationEditPart.VISUAL_ID:
+ return getGEFWrapper(new ConnectorDurationObservationReorientCommand(req));
}
return super.getReorientReferenceRelationshipCommand(req);
}
diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/UMLBaseItemSemanticEditPolicy.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/UMLBaseItemSemanticEditPolicy.java
index 1857575c931..e65ff1eacf0 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/UMLBaseItemSemanticEditPolicy.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/UMLBaseItemSemanticEditPolicy.java
@@ -54,10 +54,12 @@ import org.eclipse.uml2.uml.Comment;
import org.eclipse.uml2.uml.ConnectableElement;
import org.eclipse.uml2.uml.ConnectorEnd;
import org.eclipse.uml2.uml.Constraint;
+import org.eclipse.uml2.uml.DurationObservation;
import org.eclipse.uml2.uml.Element;
import org.eclipse.uml2.uml.NamedElement;
import org.eclipse.uml2.uml.Package;
import org.eclipse.uml2.uml.StructuredClassifier;
+import org.eclipse.uml2.uml.TimeObservation;
/**
* @generated
@@ -446,6 +448,32 @@ public class UMLBaseItemSemanticEditPolicy extends SemanticEditPolicy {
/**
* @generated
*/
+ public static boolean canCreateTimeObservationEvent_4018(TimeObservation source, NamedElement target) {
+ if (source != null) {
+ if (source.getEvent() != null) {
+ return false;
+ }
+ }
+
+ return canExistTimeObservationEvent_4018(source, target);
+ }
+
+ /**
+ * @generated
+ */
+ public static boolean canCreateDurationObservationEvent_4019(DurationObservation source, NamedElement target) {
+ if (source != null) {
+ if (source.getEvents().size() >= 2 || source.getEvents().contains(target)) {
+ return false;
+ }
+ }
+
+ return canExistDurationObservationEvent_4019(source, target);
+ }
+
+ /**
+ * @generated
+ */
public static boolean canExistLink_4001() {
return true;
}
@@ -578,5 +606,19 @@ public class UMLBaseItemSemanticEditPolicy extends SemanticEditPolicy {
public static boolean canExistInformationFlow_4016(Package container, Element source, Element target) {
return true;
}
+
+ /**
+ * @generated
+ */
+ public static boolean canExistTimeObservationEvent_4018(TimeObservation source, NamedElement target) {
+ return true;
+ }
+
+ /**
+ * @generated
+ */
+ public static boolean canExistDurationObservationEvent_4019(DurationObservation source, NamedElement target) {
+ return true;
+ }
}
}
diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/UsageItemSemanticEditPolicy.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/UsageItemSemanticEditPolicy.java
index b65d362655b..63025c3306f 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/UsageItemSemanticEditPolicy.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/UsageItemSemanticEditPolicy.java
@@ -25,6 +25,10 @@ import org.eclipse.papyrus.diagram.composite.edit.commands.CommentAnnotatedEleme
import org.eclipse.papyrus.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ComponentRealizationCreateCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ComponentRealizationReorientCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorDurationObservationCreateCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorDurationObservationReorientCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorTimeObservationCreateCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorTimeObservationReorientCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.DependencyCreateCommand;
@@ -50,6 +54,8 @@ import org.eclipse.papyrus.diagram.composite.edit.commands.UsageReorientCommand;
import org.eclipse.papyrus.diagram.composite.edit.parts.AbstractionEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.ComponentRealizationEditPart;
+import org.eclipse.papyrus.diagram.composite.edit.parts.ConnectorDurationObservationEditPart;
+import org.eclipse.papyrus.diagram.composite.edit.parts.ConnectorTimeObservationEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.DependencyEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.DeploymentEditPart;
@@ -137,6 +143,12 @@ public class UsageItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {
if (UMLElementTypes.InformationFlow_4016 == req.getElementType()) {
return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));
}
+ if (UMLElementTypes.TimeObservationEvent_4018 == req.getElementType()) {
+ return null;
+ }
+ if (UMLElementTypes.DurationObservationEvent_4019 == req.getElementType()) {
+ return null;
+ }
return null;
}
@@ -186,6 +198,12 @@ public class UsageItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {
if (UMLElementTypes.InformationFlow_4016 == req.getElementType()) {
return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));
}
+ if (UMLElementTypes.TimeObservationEvent_4018 == req.getElementType()) {
+ return getGEFWrapper(new ConnectorTimeObservationCreateCommand(req, req.getSource(), req.getTarget()));
+ }
+ if (UMLElementTypes.DurationObservationEvent_4019 == req.getElementType()) {
+ return getGEFWrapper(new ConnectorDurationObservationCreateCommand(req, req.getSource(), req.getTarget()));
+ }
return null;
}
@@ -237,6 +255,10 @@ public class UsageItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {
return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));
case ConstraintConstrainedElementEditPart.VISUAL_ID:
return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));
+ case ConnectorTimeObservationEditPart.VISUAL_ID:
+ return getGEFWrapper(new ConnectorTimeObservationReorientCommand(req));
+ case ConnectorDurationObservationEditPart.VISUAL_ID:
+ return getGEFWrapper(new ConnectorDurationObservationReorientCommand(req));
}
return super.getReorientReferenceRelationshipCommand(req);
}
diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/UseCaseItemSemanticEditPolicy.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/UseCaseItemSemanticEditPolicy.java
index 5e84c52243c..4e0f3995b34 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/UseCaseItemSemanticEditPolicy.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/UseCaseItemSemanticEditPolicy.java
@@ -34,6 +34,10 @@ import org.eclipse.papyrus.diagram.composite.edit.commands.CommentAnnotatedEleme
import org.eclipse.papyrus.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ComponentRealizationCreateCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ComponentRealizationReorientCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorDurationObservationCreateCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorDurationObservationReorientCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorTimeObservationCreateCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorTimeObservationReorientCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.DependencyCreateCommand;
@@ -59,6 +63,8 @@ import org.eclipse.papyrus.diagram.composite.edit.commands.UsageReorientCommand;
import org.eclipse.papyrus.diagram.composite.edit.parts.AbstractionEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.ComponentRealizationEditPart;
+import org.eclipse.papyrus.diagram.composite.edit.parts.ConnectorDurationObservationEditPart;
+import org.eclipse.papyrus.diagram.composite.edit.parts.ConnectorTimeObservationEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.DependencyEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.DeploymentEditPart;
@@ -180,6 +186,20 @@ public class UseCaseItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null,
+ incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null,
+ incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = view.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -323,6 +343,12 @@ public class UseCaseItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy
if (UMLElementTypes.InformationFlow_4016 == req.getElementType()) {
return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));
}
+ if (UMLElementTypes.TimeObservationEvent_4018 == req.getElementType()) {
+ return null;
+ }
+ if (UMLElementTypes.DurationObservationEvent_4019 == req.getElementType()) {
+ return null;
+ }
return null;
}
@@ -372,6 +398,12 @@ public class UseCaseItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy
if (UMLElementTypes.InformationFlow_4016 == req.getElementType()) {
return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));
}
+ if (UMLElementTypes.TimeObservationEvent_4018 == req.getElementType()) {
+ return getGEFWrapper(new ConnectorTimeObservationCreateCommand(req, req.getSource(), req.getTarget()));
+ }
+ if (UMLElementTypes.DurationObservationEvent_4019 == req.getElementType()) {
+ return getGEFWrapper(new ConnectorDurationObservationCreateCommand(req, req.getSource(), req.getTarget()));
+ }
return null;
}
@@ -423,6 +455,10 @@ public class UseCaseItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy
return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));
case ConstraintConstrainedElementEditPart.VISUAL_ID:
return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));
+ case ConnectorTimeObservationEditPart.VISUAL_ID:
+ return getGEFWrapper(new ConnectorTimeObservationReorientCommand(req));
+ case ConnectorDurationObservationEditPart.VISUAL_ID:
+ return getGEFWrapper(new ConnectorDurationObservationReorientCommand(req));
}
return super.getReorientReferenceRelationshipCommand(req);
}
diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/UseCaseItemSemanticEditPolicyCN.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/UseCaseItemSemanticEditPolicyCN.java
index 6a63568e08d..f3eeee76adf 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/UseCaseItemSemanticEditPolicyCN.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/UseCaseItemSemanticEditPolicyCN.java
@@ -34,6 +34,10 @@ import org.eclipse.papyrus.diagram.composite.edit.commands.CommentAnnotatedEleme
import org.eclipse.papyrus.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ComponentRealizationCreateCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ComponentRealizationReorientCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorDurationObservationCreateCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorDurationObservationReorientCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorTimeObservationCreateCommand;
+import org.eclipse.papyrus.diagram.composite.edit.commands.ConnectorTimeObservationReorientCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;
import org.eclipse.papyrus.diagram.composite.edit.commands.DependencyCreateCommand;
@@ -59,6 +63,8 @@ import org.eclipse.papyrus.diagram.composite.edit.commands.UsageReorientCommand;
import org.eclipse.papyrus.diagram.composite.edit.parts.AbstractionEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.ComponentRealizationEditPart;
+import org.eclipse.papyrus.diagram.composite.edit.parts.ConnectorDurationObservationEditPart;
+import org.eclipse.papyrus.diagram.composite.edit.parts.ConnectorTimeObservationEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.DependencyEditPart;
import org.eclipse.papyrus.diagram.composite.edit.parts.DeploymentEditPart;
@@ -180,6 +186,20 @@ public class UseCaseItemSemanticEditPolicyCN extends UMLBaseItemSemanticEditPoli
cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
continue;
}
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorTimeObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null,
+ incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
+ if (UMLVisualIDRegistry.getVisualID(incomingLink) == ConnectorDurationObservationEditPart.VISUAL_ID) {
+ DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null,
+ incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(r));
+ cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
+ continue;
+ }
}
for (Iterator it = view.getSourceEdges().iterator(); it.hasNext();) {
Edge outgoingLink = (Edge) it.next();
@@ -323,6 +343,12 @@ public class UseCaseItemSemanticEditPolicyCN extends UMLBaseItemSemanticEditPoli
if (UMLElementTypes.InformationFlow_4016 == req.getElementType()) {
return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));
}
+ if (UMLElementTypes.TimeObservationEvent_4018 == req.getElementType()) {
+ return null;
+ }
+ if (UMLElementTypes.DurationObservationEvent_4019 == req.getElementType()) {
+ return null;
+ }
return null;
}
@@ -372,6 +398,12 @@ public class UseCaseItemSemanticEditPolicyCN extends UMLBaseItemSemanticEditPoli
if (UMLElementTypes.InformationFlow_4016 == req.getElementType()) {
return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));
}
+ if (UMLElementTypes.TimeObservationEvent_4018 == req.getElementType()) {
+ return getGEFWrapper(new ConnectorTimeObservationCreateCommand(req, req.getSource(), req.getTarget()));
+ }
+ if (UMLElementTypes.DurationObservationEvent_4019 == req.getElementType()) {
+ return getGEFWrapper(new ConnectorDurationObservationCreateCommand(req, req.getSource(), req.getTarget()));
+ }
return null;
}
@@ -423,6 +455,10 @@ public class UseCaseItemSemanticEditPolicyCN extends UMLBaseItemSemanticEditPoli
return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));
case ConstraintConstrainedElementEditPart.VISUAL_ID:
return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));
+ case ConnectorTimeObservationEditPart.VISUAL_ID:
+ return getGEFWrapper(new ConnectorTimeObservationReorientCommand(req));
+ case ConnectorDurationObservationEditPart.VISUAL_ID:
+ return getGEFWrapper(new ConnectorDurationObservationReorientCommand(req));
}
return super.getReorientReferenceRelationshipCommand(req);
}
diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/part/Messages.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/part/Messages.java
index 4e0752827c8..ef31a2b646c 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/part/Messages.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/part/Messages.java
@@ -346,12 +346,32 @@ public class Messages extends NLS {
/**
* @generated
*/
- public static String Contraint8CreationTool_title;
+ public static String Constraint8CreationTool_title;
/**
* @generated
*/
- public static String Contraint8CreationTool_desc;
+ public static String Constraint8CreationTool_desc;
+
+ /**
+ * @generated
+ */
+ public static String TimeObservation9CreationTool_title;
+
+ /**
+ * @generated
+ */
+ public static String TimeObservation9CreationTool_desc;
+
+ /**
+ * @generated
+ */
+ public static String DurationObservation10CreationTool_title;
+
+ /**
+ * @generated
+ */
+ public static String DurationObservation10CreationTool_desc;
/**
* @generated
diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/part/UMLDiagramEditor.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/part/UMLDiagramEditor.java
index 13e899d671f..4ebd5225fee 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/part/UMLDiagramEditor.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/part/UMLDiagramEditor.java
@@ -15,11 +15,12 @@ package org.eclipse.papyrus.diagram.composite.part;
import java.util.EventObject;
+import org.eclipse.core.commands.operations.IUndoableOperation;
import org.eclipse.core.resources.IMarker;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.emf.common.ui.URIEditorInput;
import org.eclipse.emf.transaction.TransactionalEditingDomain;
+import org.eclipse.gef.GraphicalViewer;
import org.eclipse.gef.KeyHandler;
import org.eclipse.gef.Tool;
import org.eclipse.gef.commands.CommandStackListener;
@@ -34,19 +35,26 @@ import org.eclipse.gmf.runtime.diagram.ui.actions.ActionIds;
import org.eclipse.gmf.runtime.diagram.ui.internal.parts.PaletteToolTransferDragSourceListener;
import org.eclipse.gmf.runtime.diagram.ui.resources.editor.document.IDocumentProvider;
import org.eclipse.gmf.runtime.diagram.ui.resources.editor.parts.DiagramDocumentEditor;
+import org.eclipse.gmf.runtime.notation.Diagram;
+import org.eclipse.jface.util.LocalSelectionTransfer;
+import org.eclipse.jface.viewers.ISelection;
import org.eclipse.papyrus.core.adaptor.gmf.GmfMultiDiagramDocumentProvider;
+import org.eclipse.papyrus.core.editor.IMultiDiagramEditor;
import org.eclipse.papyrus.core.services.ServiceException;
import org.eclipse.papyrus.core.services.ServicesRegistry;
+import org.eclipse.papyrus.diagram.common.listeners.DropTargetListener;
import org.eclipse.papyrus.diagram.common.part.PapyrusPaletteContextMenuProvider;
import org.eclipse.papyrus.diagram.common.part.PapyrusPaletteViewer;
import org.eclipse.papyrus.diagram.common.service.PapyrusPaletteService;
import org.eclipse.swt.SWT;
+import org.eclipse.swt.dnd.TransferData;
import org.eclipse.swt.events.KeyEvent;
import org.eclipse.swt.events.MouseEvent;
import org.eclipse.swt.events.MouseListener;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.ui.IEditorInput;
-import org.eclipse.ui.IFileEditorInput;
+import org.eclipse.ui.IEditorPart;
+import org.eclipse.ui.IWorkbenchPart;
import org.eclipse.ui.ide.IGotoMarker;
import org.eclipse.ui.part.ShowInContext;
@@ -75,20 +83,32 @@ public class UMLDiagramEditor extends DiagramDocumentEditor implements IProvider
*/
private MouseListener paletteMouseListener = null;
- // FIXME Remove it when the super.isDirty will work...
- private boolean isDirty = false;
+ /**
+ * @generated
+ */
+ private IUndoableOperation savedOperation = null;
- /** The editing domain. */
+ /**
+ * @generated
+ */
private TransactionalEditingDomain editingDomain;
- /** The document provider. */
+ /**
+ * @generated
+ */
private IDocumentProvider documentProvider;
/**
* @generated
*/
- public UMLDiagramEditor(ServicesRegistry servicesRegistry) throws ServiceException {
+ private Diagram diagram;
+
+ /**
+ * @generated
+ */
+ public UMLDiagramEditor(ServicesRegistry servicesRegistry, Diagram diagram) throws ServiceException {
super(true);
+ this.diagram = diagram;
// adds a listener to the palette service, which reacts to palette customizations
PapyrusPaletteService.getInstance().addProviderChangeListener(this);
@@ -141,24 +161,13 @@ public class UMLDiagramEditor extends DiagramDocumentEditor implements IProvider
/**
* @generated
*/
- protected IDocumentProvider getDocumentProvider(IEditorInput input) {
- if (input instanceof IFileEditorInput || input instanceof URIEditorInput) {
- return UMLDiagramEditorPlugin.getInstance().getDocumentProvider();
- }
- return super.getDocumentProvider(input);
+ protected final IDocumentProvider getDocumentProvider(IEditorInput input) {
+ return documentProvider;
}
/**
* @generated
*/
- /**
- * Overrides getEditingDomain.
- *
- * {@inheritDoc}
- *
- * @see org.eclipse.papyrus.diagram.clazz.part.UMLDiagramEditor#getEditingDomain()
- */
- @Override
public TransactionalEditingDomain getEditingDomain() {
return editingDomain;
}
@@ -166,12 +175,8 @@ public class UMLDiagramEditor extends DiagramDocumentEditor implements IProvider
/**
* @generated
*/
- protected void setDocumentProvider(IEditorInput input) {
- if (input instanceof IFileEditorInput || input instanceof URIEditorInput) {
- setDocumentProvider(UMLDiagramEditorPlugin.getInstance().getDocumentProvider());
- } else {
- super.setDocumentProvider(input);
- }
+ protected final void setDocumentProvider(IEditorInput input) {
+ // Already set in the constructor
}
/**
@@ -198,7 +203,7 @@ public class UMLDiagramEditor extends DiagramDocumentEditor implements IProvider
/**
* @generated
*/
- protected void performSaveAs(org.eclipse.core.runtime.IProgressMonitor progressMonitor) {
+ protected void performSaveAs(IProgressMonitor progressMonitor) {
// Nothing
}
@@ -223,14 +228,6 @@ public class UMLDiagramEditor extends DiagramDocumentEditor implements IProvider
/**
* @generated
*/
- /**
- * Overrides createEditingDomain.
- *
- * {@inheritDoc}
- *
- * @see DiagramDocumentEditor#createEditingDomain()
- */
- @Override
protected TransactionalEditingDomain createEditingDomain() {
// Already configured
return editingDomain;
@@ -239,20 +236,12 @@ public class UMLDiagramEditor extends DiagramDocumentEditor implements IProvider
/**
* @generated
*/
- /**
- * Overrides configureDiagramEditDomain.
- *
- * {@inheritDoc}
- *
- * @see DiagramDocumentEditor#configureDiagramEditDomain()
- */
- @Override
protected void configureDiagramEditDomain() {
super.configureDiagramEditDomain();
getDiagramEditDomain().getDiagramCommandStack().addCommandStackListener(new CommandStackListener() {
public void commandStackChanged(EventObject event) {
- isDirty = true;
+ firePropertyChange(IEditorPart.PROP_DIRTY);
}
});
}
@@ -260,33 +249,17 @@ public class UMLDiagramEditor extends DiagramDocumentEditor implements IProvider
/**
* @generated
*/
- /**
- * Overrides doSave.
- *
- * {@inheritDoc}
- *
- * @see DiagramDocumentEditor#doSave(org.eclipse.core.runtime.IProgressMonitor)
- */
- @Override
public void doSave(IProgressMonitor progressMonitor) {
// The saving of the resource is done by the CoreMultiDiagramEditor
- // Just notify the command stack here
- isDirty = false;
+ savedOperation = getOperationHistory().getUndoOperation(getUndoContext());
}
/**
* @generated
*/
- /**
- * Overrides isDirty.
- *
- * {@inheritDoc}
- *
- * @see DiagramDocumentEditor#isDirty()
- */
- @Override
public boolean isDirty() {
- return isDirty;
+ IUndoableOperation op = getOperationHistory().getUndoOperation(getUndoContext());
+ return savedOperation != op;
}
/**
@@ -468,4 +441,75 @@ public class UMLDiagramEditor extends DiagramDocumentEditor implements IProvider
};
}
+
+ /**
+ * @generated
+ */
+ @Override
+ public GraphicalViewer getGraphicalViewer() {
+ return super.getGraphicalViewer();
+ }
+
+ /**
+ * @generated
+ */
+ public Diagram getDiagram() {
+ return diagram;
+ }
+
+ /**
+ * @generated
+ */
+ public void setDiagram(Diagram diagram) {
+ this.diagram = diagram;
+ }
+
+ /**
+ * @generated
+ */
+ @Override
+ protected void initializeGraphicalViewer() {
+ super.initializeGraphicalViewer();
+
+ // Enable Drop
+ getDiagramGraphicalViewer().addDropTargetListener(
+ new DropTargetListener(getDiagramGraphicalViewer(), LocalSelectionTransfer.getTransfer()) {
+
+ @Override
+ protected Object getJavaObject(TransferData data) {
+ return LocalSelectionTransfer.getTransfer().nativeToJava(data);
+ }
+
+ @Override
+ protected TransactionalEditingDomain getTransactionalEditingDomain() {
+ return getEditingDomain();
+ }
+ });
+
+ }
+
+ /**
+ * @generated
+ */
+ @Override
+ public void selectionChanged(IWorkbenchPart part, ISelection selection) {
+ if (getSite().getPage().getActiveEditor() instanceof IMultiDiagramEditor) {
+ IMultiDiagramEditor editor = (IMultiDiagramEditor) getSite().getPage().getActiveEditor();
+ // If not the active editor, ignore selection changed.
+ if (this.equals(editor.getActiveEditor())) {
+ updateActions(getSelectionActions());
+ super.selectionChanged(part, selection);
+ } else {
+ super.selectionChanged(part, selection);
+ }
+ } else {
+ super.selectionChanged(part, selection);
+ }
+ // from
+ // org.eclipse.gmf.runtime.diagram.ui.resources.editor.parts.DiagramDocumentEditor.selectionChanged(IWorkbenchPart,
+ // ISelection)
+ if (part == this) {
+ rebuildStatusLine();
+ }
+ }
}
diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/part/UMLDiagramEditorUtil.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/part/UMLDiagramEditorUtil.java
index d10e83d39fe..99c62719378 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/part/UMLDiagramEditorUtil.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/part/UMLDiagramEditorUtil.java
@@ -352,7 +352,7 @@ public class UMLDiagramEditorUtil {
View view = (View) element;
if (view.getDiagram() == scope.getDiagram()) {
element2ViewMap.put(element, element); // take only those that part of
- // our diagram
+ // our diagram
}
}
}
diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/part/UMLDiagramUpdater.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/part/UMLDiagramUpdater.java
index 7156f593dc6..b194c11277d 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/part/UMLDiagramUpdater.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/part/UMLDiagramUpdater.java
@@ -5278,14 +5278,20 @@ public class UMLDiagramUpdater {
* @generated
*/
public static List getDurationObservation_2093ContainedLinks(View view) {
- return Collections.EMPTY_LIST;
+ DurationObservation modelElement = (DurationObservation) view.getElement();
+ List result = new LinkedList();
+ result.addAll(getOutgoingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement));
+ return result;
}
/**
* @generated
*/
public static List getTimeObservation_2094ContainedLinks(View view) {
- return Collections.EMPTY_LIST;
+ TimeObservation modelElement = (TimeObservation) view.getElement();
+ List result = new LinkedList();
+ result.addAll(getOutgoingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement));
+ return result;
}
/**
@@ -5985,6 +5991,8 @@ public class UMLDiagramUpdater {
result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferences));
result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015(modelElement, crossReferences));
result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4016(modelElement, crossReferences));
+ result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferences));
+ result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferences));
return result;
}
@@ -6010,6 +6018,8 @@ public class UMLDiagramUpdater {
result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferences));
result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015(modelElement, crossReferences));
result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4016(modelElement, crossReferences));
+ result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferences));
+ result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferences));
return result;
}
@@ -6035,6 +6045,8 @@ public class UMLDiagramUpdater {
result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferences));
result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015(modelElement, crossReferences));
result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4016(modelElement, crossReferences));
+ result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferences));
+ result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferences));
return result;
}
@@ -6060,6 +6072,8 @@ public class UMLDiagramUpdater {
result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferences));
result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015(modelElement, crossReferences));
result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4016(modelElement, crossReferences));
+ result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferences));
+ result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferences));
return result;
}
@@ -6085,6 +6099,8 @@ public class UMLDiagramUpdater {
result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferences));
result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015(modelElement, crossReferences));
result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4016(modelElement, crossReferences));
+ result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferences));
+ result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferences));
return result;
}
@@ -6110,6 +6126,8 @@ public class UMLDiagramUpdater {
result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferences));
result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015(modelElement, crossReferences));
result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4016(modelElement, crossReferences));
+ result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferences));
+ result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferences));
return result;
}
@@ -6135,6 +6153,8 @@ public class UMLDiagramUpdater {
result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferences));
result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015(modelElement, crossReferences));
result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4016(modelElement, crossReferences));
+ result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferences));
+ result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferences));
return result;
}
@@ -6160,6 +6180,8 @@ public class UMLDiagramUpdater {
result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferences));
result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015(modelElement, crossReferences));
result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4016(modelElement, crossReferences));
+ result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferences));
+ result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferences));
return result;
}
@@ -6185,6 +6207,8 @@ public class UMLDiagramUpdater {
result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferences));
result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015(modelElement, crossReferences));
result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4016(modelElement, crossReferences));
+ result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferences));
+ result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferences));
return result;
}
@@ -6210,6 +6234,8 @@ public class UMLDiagramUpdater {
result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferences));
result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015(modelElement, crossReferences));
result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4016(modelElement, crossReferences));
+ result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferences));
+ result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferences));
return result;
}
@@ -6235,6 +6261,8 @@ public class UMLDiagramUpdater {
result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferences));
result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015(modelElement, crossReferences));
result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4016(modelElement, crossReferences));
+ result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferences));
+ result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferences));
return result;
}
@@ -6260,6 +6288,8 @@ public class UMLDiagramUpdater {
result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferences));
result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015(modelElement, crossReferences));
result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4016(modelElement, crossReferences));
+ result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferences));
+ result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferences));
return result;
}
@@ -6285,6 +6315,8 @@ public class UMLDiagramUpdater {
result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferences));
result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015(modelElement, crossReferences));
result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4016(modelElement, crossReferences));
+ result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferences));
+ result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferences));
return result;
}
@@ -6310,6 +6342,8 @@ public class UMLDiagramUpdater {
result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferences));
result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015(modelElement, crossReferences));
result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4016(modelElement, crossReferences));
+ result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferences));
+ result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferences));
return result;
}
@@ -6335,6 +6369,8 @@ public class UMLDiagramUpdater {
result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferences));
result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015(modelElement, crossReferences));
result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4016(modelElement, crossReferences));
+ result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferences));
+ result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferences));
return result;
}
@@ -6360,6 +6396,8 @@ public class UMLDiagramUpdater {
result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferences));
result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015(modelElement, crossReferences));
result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4016(modelElement, crossReferences));
+ result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferences));
+ result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferences));
return result;
}
@@ -6385,6 +6423,8 @@ public class UMLDiagramUpdater {
result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferences));
result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015(modelElement, crossReferences));
result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4016(modelElement, crossReferences));
+ result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferences));
+ result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferences));
return result;
}
@@ -6410,6 +6450,8 @@ public class UMLDiagramUpdater {
result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferences));
result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015(modelElement, crossReferences));
result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4016(modelElement, crossReferences));
+ result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferences));
+ result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferences));
return result;
}
@@ -6435,6 +6477,8 @@ public class UMLDiagramUpdater {
result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferences));
result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015(modelElement, crossReferences));
result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4016(modelElement, crossReferences));
+ result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferences));
+ result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferences));
return result;
}
@@ -6460,6 +6504,8 @@ public class UMLDiagramUpdater {
result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferences));
result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015(modelElement, crossReferences));
result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4016(modelElement, crossReferences));
+ result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferences));
+ result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferences));
return result;
}
@@ -6485,6 +6531,8 @@ public class UMLDiagramUpdater {
result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferences));
result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015(modelElement, crossReferences));
result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4016(modelElement, crossReferences));
+ result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferences));
+ result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferences));
return result;
}
@@ -6510,6 +6558,8 @@ public class UMLDiagramUpdater {
result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferences));
result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015(modelElement, crossReferences));
result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4016(modelElement, crossReferences));
+ result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferences));
+ result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferences));
return result;
}
@@ -6535,6 +6585,8 @@ public class UMLDiagramUpdater {
result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferences));
result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015(modelElement, crossReferences));
result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4016(modelElement, crossReferences));
+ result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferences));
+ result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferences));
return result;
}
@@ -6560,6 +6612,8 @@ public class UMLDiagramUpdater {
result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferences));
result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015(modelElement, crossReferences));
result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4016(modelElement, crossReferences));
+ result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferences));
+ result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferences));
return result;
}
@@ -6585,6 +6639,8 @@ public class UMLDiagramUpdater {
result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferences));
result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015(modelElement, crossReferences));
result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4016(modelElement, crossReferences));
+ result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferences));
+ result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferences));
return result;
}
@@ -6610,6 +6666,8 @@ public class UMLDiagramUpdater {
result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferences));
result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015(modelElement, crossReferences));
result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4016(modelElement, crossReferences));
+ result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferences));
+ result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferences));
return result;
}
@@ -6635,6 +6693,8 @@ public class UMLDiagramUpdater {
result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferences));
result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015(modelElement, crossReferences));
result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4016(modelElement, crossReferences));
+ result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferences));
+ result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferences));
return result;
}
@@ -6660,6 +6720,8 @@ public class UMLDiagramUpdater {
result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferences));
result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015(modelElement, crossReferences));
result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4016(modelElement, crossReferences));
+ result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferences));
+ result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferences));
return result;
}
@@ -6685,6 +6747,8 @@ public class UMLDiagramUpdater {
result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferences));
result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015(modelElement, crossReferences));
result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4016(modelElement, crossReferences));
+ result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferences));
+ result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferences));
return result;
}
@@ -6710,6 +6774,8 @@ public class UMLDiagramUpdater {
result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferences));
result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015(modelElement, crossReferences));
result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4016(modelElement, crossReferences));
+ result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferences));
+ result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferences));
return result;
}
@@ -6735,6 +6801,8 @@ public class UMLDiagramUpdater {
result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferences));
result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015(modelElement, crossReferences));
result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4016(modelElement, crossReferences));
+ result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferences));
+ result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferences));
return result;
}
@@ -6760,6 +6828,8 @@ public class UMLDiagramUpdater {
result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferences));
result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015(modelElement, crossReferences));
result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4016(modelElement, crossReferences));
+ result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferences));
+ result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferences));
return result;
}
@@ -6785,6 +6855,8 @@ public class UMLDiagramUpdater {
result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferences));
result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015(modelElement, crossReferences));
result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4016(modelElement, crossReferences));
+ result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferences));
+ result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferences));
return result;
}
@@ -6810,6 +6882,8 @@ public class UMLDiagramUpdater {
result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferences));
result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015(modelElement, crossReferences));
result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4016(modelElement, crossReferences));
+ result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferences));
+ result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferences));
return result;
}
@@ -6835,6 +6909,8 @@ public class UMLDiagramUpdater {
result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferences));
result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015(modelElement, crossReferences));
result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4016(modelElement, crossReferences));
+ result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferences));
+ result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferences));
return result;
}
@@ -6860,6 +6936,8 @@ public class UMLDiagramUpdater {
result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferences));
result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015(modelElement, crossReferences));
result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4016(modelElement, crossReferences));
+ result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferences));
+ result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferences));
return result;
}
@@ -6885,6 +6963,8 @@ public class UMLDiagramUpdater {
result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferences));
result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015(modelElement, crossReferences));
result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4016(modelElement, crossReferences));
+ result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferences));
+ result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferences));
return result;
}
@@ -6910,6 +6990,8 @@ public class UMLDiagramUpdater {
result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferences));
result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015(modelElement, crossReferences));
result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4016(modelElement, crossReferences));
+ result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferences));
+ result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferences));
return result;
}
@@ -6935,6 +7017,8 @@ public class UMLDiagramUpdater {
result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferences));
result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015(modelElement, crossReferences));
result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4016(modelElement, crossReferences));
+ result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferences));
+ result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferences));
return result;
}
@@ -6960,6 +7044,8 @@ public class UMLDiagramUpdater {
result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferences));
result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015(modelElement, crossReferences));
result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4016(modelElement, crossReferences));
+ result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferences));
+ result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferences));
return result;
}
@@ -6985,6 +7071,8 @@ public class UMLDiagramUpdater {
result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferences));
result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015(modelElement, crossReferences));
result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4016(modelElement, crossReferences));
+ result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferences));
+ result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferences));
return result;
}
@@ -7010,6 +7098,8 @@ public class UMLDiagramUpdater {
result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferences));
result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015(modelElement, crossReferences));
result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4016(modelElement, crossReferences));
+ result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferences));
+ result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferences));
return result;
}
@@ -7035,6 +7125,8 @@ public class UMLDiagramUpdater {
result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferences));
result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015(modelElement, crossReferences));
result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4016(modelElement, crossReferences));
+ result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferences));
+ result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferences));
return result;
}
@@ -7060,6 +7152,8 @@ public class UMLDiagramUpdater {
result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferences));
result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015(modelElement, crossReferences));
result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4016(modelElement, crossReferences));
+ result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferences));
+ result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferences));
return result;
}
@@ -7085,6 +7179,8 @@ public class UMLDiagramUpdater {
result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferences));
result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015(modelElement, crossReferences));
result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4016(modelElement, crossReferences));
+ result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferences));
+ result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferences));
return result;
}
@@ -7110,6 +7206,8 @@ public class UMLDiagramUpdater {
result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferences));
result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015(modelElement, crossReferences));
result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4016(modelElement, crossReferences));
+ result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferences));
+ result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferences));
return result;
}
@@ -7135,6 +7233,8 @@ public class UMLDiagramUpdater {
result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferences));
result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015(modelElement, crossReferences));
result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4016(modelElement, crossReferences));
+ result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferences));
+ result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferences));
return result;
}
@@ -7160,6 +7260,8 @@ public class UMLDiagramUpdater {
result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferences));
result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015(modelElement, crossReferences));
result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4016(modelElement, crossReferences));
+ result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferences));
+ result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferences));
return result;
}
@@ -7185,6 +7287,8 @@ public class UMLDiagramUpdater {
result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferences));
result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015(modelElement, crossReferences));
result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4016(modelElement, crossReferences));
+ result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferences));
+ result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferences));
return result;
}
@@ -7225,6 +7329,8 @@ public class UMLDiagramUpdater {
result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferences));
result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015(modelElement, crossReferences));
result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4016(modelElement, crossReferences));
+ result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferences));
+ result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferences));
return result;
}
@@ -7250,6 +7356,8 @@ public class UMLDiagramUpdater {
result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferences));
result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015(modelElement, crossReferences));
result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4016(modelElement, crossReferences));
+ result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferences));
+ result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferences));
return result;
}
@@ -7275,6 +7383,8 @@ public class UMLDiagramUpdater {
result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferences));
result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015(modelElement, crossReferences));
result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4016(modelElement, crossReferences));
+ result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferences));
+ result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferences));
return result;
}
@@ -7300,6 +7410,8 @@ public class UMLDiagramUpdater {
result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferences));
result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015(modelElement, crossReferences));
result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4016(modelElement, crossReferences));
+ result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferences));
+ result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferences));
return result;
}
@@ -7325,6 +7437,8 @@ public class UMLDiagramUpdater {
result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferences));
result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015(modelElement, crossReferences));
result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4016(modelElement, crossReferences));
+ result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferences));
+ result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferences));
return result;
}
@@ -7350,6 +7464,8 @@ public class UMLDiagramUpdater {
result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferences));
result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015(modelElement, crossReferences));
result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4016(modelElement, crossReferences));
+ result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferences));
+ result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferences));
return result;
}
@@ -7375,6 +7491,8 @@ public class UMLDiagramUpdater {
result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferences));
result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015(modelElement, crossReferences));
result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4016(modelElement, crossReferences));
+ result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferences));
+ result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferences));
return result;
}
@@ -7400,6 +7518,8 @@ public class UMLDiagramUpdater {
result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferences));
result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015(modelElement, crossReferences));
result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4016(modelElement, crossReferences));
+ result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferences));
+ result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferences));
return result;
}
@@ -7425,6 +7545,8 @@ public class UMLDiagramUpdater {
result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferences));
result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015(modelElement, crossReferences));
result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4016(modelElement, crossReferences));
+ result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferences));
+ result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferences));
return result;
}
@@ -7450,6 +7572,8 @@ public class UMLDiagramUpdater {
result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferences));
result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015(modelElement, crossReferences));
result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4016(modelElement, crossReferences));
+ result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferences));
+ result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferences));
return result;
}
@@ -7475,6 +7599,8 @@ public class UMLDiagramUpdater {
result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferences));
result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015(modelElement, crossReferences));
result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4016(modelElement, crossReferences));
+ result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferences));
+ result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferences));
return result;
}
@@ -7500,6 +7626,8 @@ public class UMLDiagramUpdater {
result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferences));
result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015(modelElement, crossReferences));
result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4016(modelElement, crossReferences));
+ result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferences));
+ result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferences));
return result;
}
@@ -7525,6 +7653,8 @@ public class UMLDiagramUpdater {
result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferences));
result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015(modelElement, crossReferences));
result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4016(modelElement, crossReferences));
+ result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferences));
+ result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferences));
return result;
}
@@ -7550,6 +7680,8 @@ public class UMLDiagramUpdater {
result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferences));
result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015(modelElement, crossReferences));
result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4016(modelElement, crossReferences));
+ result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferences));
+ result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferences));
return result;
}
@@ -7575,6 +7707,8 @@ public class UMLDiagramUpdater {
result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferences));
result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015(modelElement, crossReferences));
result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4016(modelElement, crossReferences));
+ result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferences));
+ result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferences));
return result;
}
@@ -7600,6 +7734,8 @@ public class UMLDiagramUpdater {
result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferences));
result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015(modelElement, crossReferences));
result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4016(modelElement, crossReferences));
+ result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferences));
+ result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferences));
return result;
}
@@ -7625,6 +7761,8 @@ public class UMLDiagramUpdater {
result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferences));
result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015(modelElement, crossReferences));
result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4016(modelElement, crossReferences));
+ result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferences));
+ result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferences));
return result;
}
@@ -7650,6 +7788,8 @@ public class UMLDiagramUpdater {
result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferences));
result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015(modelElement, crossReferences));
result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4016(modelElement, crossReferences));
+ result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferences));
+ result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferences));
return result;
}
@@ -7675,6 +7815,8 @@ public class UMLDiagramUpdater {
result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferences));
result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015(modelElement, crossReferences));
result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4016(modelElement, crossReferences));
+ result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferences));
+ result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferences));
return result;
}
@@ -7700,6 +7842,8 @@ public class UMLDiagramUpdater {
result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferences));
result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015(modelElement, crossReferences));
result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4016(modelElement, crossReferences));
+ result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferences));
+ result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferences));
return result;
}
@@ -7725,6 +7869,8 @@ public class UMLDiagramUpdater {
result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferences));
result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015(modelElement, crossReferences));
result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4016(modelElement, crossReferences));
+ result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferences));
+ result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferences));
return result;
}
@@ -7750,6 +7896,8 @@ public class UMLDiagramUpdater {
result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferences));
result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015(modelElement, crossReferences));
result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4016(modelElement, crossReferences));
+ result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferences));
+ result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferences));
return result;
}
@@ -7775,6 +7923,8 @@ public class UMLDiagramUpdater {
result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferences));
result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015(modelElement, crossReferences));
result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4016(modelElement, crossReferences));
+ result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferences));
+ result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferences));
return result;
}
@@ -7800,6 +7950,8 @@ public class UMLDiagramUpdater {
result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferences));
result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015(modelElement, crossReferences));
result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4016(modelElement, crossReferences));
+ result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferences));
+ result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferences));
return result;
}
@@ -7825,6 +7977,8 @@ public class UMLDiagramUpdater {
result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferences));
result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015(modelElement, crossReferences));
result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4016(modelElement, crossReferences));
+ result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferences));
+ result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferences));
return result;
}
@@ -7850,6 +8004,8 @@ public class UMLDiagramUpdater {
result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferences));
result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015(modelElement, crossReferences));
result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4016(modelElement, crossReferences));
+ result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferences));
+ result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferences));
return result;
}
@@ -7875,6 +8031,8 @@ public class UMLDiagramUpdater {
result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferences));
result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015(modelElement, crossReferences));
result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4016(modelElement, crossReferences));
+ result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferences));
+ result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferences));
return result;
}
@@ -7900,6 +8058,8 @@ public class UMLDiagramUpdater {
result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferences));
result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015(modelElement, crossReferences));
result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4016(modelElement, crossReferences));
+ result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferences));
+ result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferences));
return result;
}
@@ -7925,6 +8085,8 @@ public class UMLDiagramUpdater {
result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferences));
result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015(modelElement, crossReferences));
result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4016(modelElement, crossReferences));
+ result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferences));
+ result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferences));
return result;
}
@@ -7950,6 +8112,8 @@ public class UMLDiagramUpdater {
result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferences));
result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015(modelElement, crossReferences));
result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4016(modelElement, crossReferences));
+ result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferences));
+ result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferences));
return result;
}
@@ -7975,6 +8139,8 @@ public class UMLDiagramUpdater {
result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferences));
result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015(modelElement, crossReferences));
result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4016(modelElement, crossReferences));
+ result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferences));
+ result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferences));
return result;
}
@@ -8127,6 +8293,8 @@ public class UMLDiagramUpdater {
result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferences));
result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015(modelElement, crossReferences));
result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4016(modelElement, crossReferences));
+ result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferences));
+ result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferences));
return result;
}
@@ -8152,6 +8320,8 @@ public class UMLDiagramUpdater {
result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferences));
result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015(modelElement, crossReferences));
result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4016(modelElement, crossReferences));
+ result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferences));
+ result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferences));
return result;
}
@@ -8177,6 +8347,8 @@ public class UMLDiagramUpdater {
result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferences));
result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015(modelElement, crossReferences));
result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4016(modelElement, crossReferences));
+ result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferences));
+ result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferences));
return result;
}
@@ -8202,6 +8374,8 @@ public class UMLDiagramUpdater {
result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferences));
result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015(modelElement, crossReferences));
result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4016(modelElement, crossReferences));
+ result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferences));
+ result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferences));
return result;
}
@@ -8227,6 +8401,8 @@ public class UMLDiagramUpdater {
result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferences));
result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015(modelElement, crossReferences));
result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4016(modelElement, crossReferences));
+ result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferences));
+ result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferences));
return result;
}
@@ -8252,6 +8428,8 @@ public class UMLDiagramUpdater {
result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferences));
result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015(modelElement, crossReferences));
result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4016(modelElement, crossReferences));
+ result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferences));
+ result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferences));
return result;
}
@@ -8277,6 +8455,8 @@ public class UMLDiagramUpdater {
result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferences));
result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015(modelElement, crossReferences));
result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4016(modelElement, crossReferences));
+ result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferences));
+ result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferences));
return result;
}
@@ -8302,6 +8482,8 @@ public class UMLDiagramUpdater {
result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferences));
result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015(modelElement, crossReferences));
result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4016(modelElement, crossReferences));
+ result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferences));
+ result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferences));
return result;
}
@@ -8327,6 +8509,8 @@ public class UMLDiagramUpdater {
result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferences));
result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015(modelElement, crossReferences));
result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4016(modelElement, crossReferences));
+ result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferences));
+ result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferences));
return result;
}
@@ -8352,6 +8536,8 @@ public class UMLDiagramUpdater {
result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferences));
result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015(modelElement, crossReferences));
result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4016(modelElement, crossReferences));
+ result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferences));
+ result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferences));
return result;
}
@@ -8377,6 +8563,8 @@ public class UMLDiagramUpdater {
result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferences));
result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015(modelElement, crossReferences));
result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4016(modelElement, crossReferences));
+ result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferences));
+ result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferences));
return result;
}
@@ -8417,6 +8605,8 @@ public class UMLDiagramUpdater {
result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferences));
result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015(modelElement, crossReferences));
result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4016(modelElement, crossReferences));
+ result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferences));
+ result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferences));
return result;
}
@@ -9131,6 +9321,7 @@ public class UMLDiagramUpdater {
result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010(modelElement));
result.addAll(getOutgoingTypeModelFacetLinks_Generalization_4015(modelElement));
result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4016(modelElement));
+ result.addAll(getOutgoingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement));
return result;
}
@@ -9152,6 +9343,7 @@ public class UMLDiagramUpdater {
result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010(modelElement));
result.addAll(getOutgoingTypeModelFacetLinks_Generalization_4015(modelElement));
result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4016(modelElement));
+ result.addAll(getOutgoingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement));
return result;
}
@@ -11371,6 +11563,40 @@ public class UMLDiagramUpdater {
/**
* @generated
*/
+ private static Collection getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(NamedElement target,
+ Map crossReferences) {
+ Collection result = new LinkedList();
+ Collection settings = (Collection) crossReferences.get(target);
+ for (Iterator it = settings.iterator(); it.hasNext();) {
+ EStructuralFeature.Setting setting = (EStructuralFeature.Setting) it.next();
+ if (setting.getEStructuralFeature() == UMLPackage.eINSTANCE.getTimeObservation_Event()) {
+ result.add(new UMLLinkDescriptor(setting.getEObject(), target,
+ UMLElementTypes.TimeObservationEvent_4018, ConnectorTimeObservationEditPart.VISUAL_ID));
+ }
+ }
+ return result;
+ }
+
+ /**
+ * @generated
+ */
+ private static Collection getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(NamedElement target,
+ Map crossReferences) {
+ Collection result = new LinkedList();
+ Collection settings = (Collection) crossReferences.get(target);
+ for (Iterator it = settings.iterator(); it.hasNext();) {
+ EStructuralFeature.Setting setting = (EStructuralFeature.Setting) it.next();
+ if (setting.getEStructuralFeature() == UMLPackage.eINSTANCE.getDurationObservation_Event()) {
+ result.add(new UMLLinkDescriptor(setting.getEObject(), target,
+ UMLElementTypes.DurationObservationEvent_4019, ConnectorDurationObservationEditPart.VISUAL_ID));
+ }
+ }
+ return result;
+ }
+
+ /**
+ * @generated
+ */
private static Collection getOutgoingFeatureModelFacetLinks_Comment_AnnotatedElement_4002(Comment source) {
Collection result = new LinkedList();
for (Iterator destinations = source.getAnnotatedElements().iterator(); destinations.hasNext();) {
@@ -12005,4 +12231,32 @@ public class UMLDiagramUpdater {
return result;
}
+ /**
+ * @generated
+ */
+ private static Collection getOutgoingFeatureModelFacetLinks_TimeObservation_Event_4018(TimeObservation source) {
+ Collection result = new LinkedList();
+ NamedElement destination = source.getEvent();
+ if (destination == null) {
+ return result;
+ }
+ result.add(new UMLLinkDescriptor(source, destination, UMLElementTypes.TimeObservationEvent_4018,
+ ConnectorTimeObservationEditPart.VISUAL_ID));
+ return result;
+ }
+
+ /**
+ * @generated
+ */
+ private static Collection getOutgoingFeatureModelFacetLinks_DurationObservation_Event_4019(
+ DurationObservation source) {
+ Collection result = new LinkedList();
+ for (Iterator destinations = source.getEvents().iterator(); destinations.hasNext();) {
+ NamedElement destination = (NamedElement) destinations.next();
+ result.add(new UMLLinkDescriptor(source, destination, UMLElementTypes.DurationObservationEvent_4019,
+ ConnectorDurationObservationEditPart.VISUAL_ID));
+ }
+ return result;
+ }
+
}
diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/part/UMLPaletteFactory.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/part/UMLPaletteFactory.java
index 28cdd5b1db4..3ae475a7061 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/part/UMLPaletteFactory.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/part/UMLPaletteFactory.java
@@ -18,9 +18,9 @@ import java.util.List;
import org.eclipse.gef.Tool;
import org.eclipse.gmf.runtime.diagram.ui.services.palette.PaletteFactory;
-import org.eclipse.gmf.runtime.diagram.ui.tools.UnspecifiedTypeConnectionTool;
-import org.eclipse.gmf.runtime.diagram.ui.tools.UnspecifiedTypeCreationTool;
import org.eclipse.gmf.runtime.emf.type.core.IElementType;
+import org.eclipse.papyrus.diagram.common.service.AspectUnspecifiedTypeConnectionTool;
+import org.eclipse.papyrus.diagram.common.service.AspectUnspecifiedTypeCreationTool;
import org.eclipse.papyrus.diagram.composite.providers.UMLElementTypes;
/**
@@ -66,7 +66,17 @@ public class UMLPaletteFactory extends PaletteFactory.Adapter {
/**
* @generated
*/
- private final static String CREATECONTRAINT8CREATIONTOOL = "createContraint8CreationTool"; //$NON-NLS-1$
+ private final static String CREATECONSTRAINT8CREATIONTOOL = "createConstraint8CreationTool"; //$NON-NLS-1$
+
+ /**
+ * @generated
+ */
+ private final static String CREATETIMEOBSERVATION9CREATIONTOOL = "createTimeObservation9CreationTool"; //$NON-NLS-1$
+
+ /**
+ * @generated
+ */
+ private final static String CREATEDURATIONOBSERVATION10CREATIONTOOL = "createDurationObservation10CreationTool"; //$NON-NLS-1$
/**
* @generated
@@ -145,8 +155,14 @@ public class UMLPaletteFactory extends PaletteFactory.Adapter {
if (toolId.equals(CREATECOMMENT7CREATIONTOOL)) {
return createComment7CreationTool();
}
- if (toolId.equals(CREATECONTRAINT8CREATIONTOOL)) {
- return createContraint8CreationTool();
+ if (toolId.equals(CREATECONSTRAINT8CREATIONTOOL)) {
+ return createConstraint8CreationTool();
+ }
+ if (toolId.equals(CREATETIMEOBSERVATION9CREATIONTOOL)) {
+ return createTimeObservation9CreationTool();
+ }
+ if (toolId.equals(CREATEDURATIONOBSERVATION10CREATIONTOOL)) {
+ return createDurationObservation10CreationTool();
}
if (toolId.equals(CREATELINK1CREATIONTOOL)) {
return createLink1CreationTool();
@@ -193,7 +209,8 @@ public class UMLPaletteFactory extends PaletteFactory.Adapter {
List<IElementType> types = new ArrayList<IElementType>(2);
types.add(UMLElementTypes.Class_2073);
types.add(UMLElementTypes.Class_3085);
- Tool tool = new UnspecifiedTypeCreationTool(types);
+
+ Tool tool = new AspectUnspecifiedTypeCreationTool(types);
return tool;
}
@@ -203,7 +220,8 @@ public class UMLPaletteFactory extends PaletteFactory.Adapter {
private Tool createProperty2CreationTool() {
List<IElementType> types = new ArrayList<IElementType>(1);
types.add(UMLElementTypes.Property_3070);
- Tool tool = new UnspecifiedTypeCreationTool(types);
+
+ Tool tool = new AspectUnspecifiedTypeCreationTool(types);
return tool;
}
@@ -213,7 +231,8 @@ public class UMLPaletteFactory extends PaletteFactory.Adapter {
private Tool createPort3CreationTool() {
List<IElementType> types = new ArrayList<IElementType>(1);
types.add(UMLElementTypes.Port_3069);
- Tool tool = new UnspecifiedTypeCreationTool(types);
+
+ Tool tool = new AspectUnspecifiedTypeCreationTool(types);
return tool;
}
@@ -224,7 +243,8 @@ public class UMLPaletteFactory extends PaletteFactory.Adapter {
List<IElementType> types = new ArrayList<IElementType>(2);
types.add(UMLElementTypes.Collaboration_3086);
types.add(UMLElementTypes.Collaboration_2075);
- Tool tool = new UnspecifiedTypeCreationTool(types);
+
+ Tool tool = new AspectUnspecifiedTypeCreationTool(types);
return tool;
}
@@ -234,7 +254,8 @@ public class UMLPaletteFactory extends PaletteFactory.Adapter {
private Tool createCollaborationRole5CreationTool() {
List<IElementType> types = new ArrayList<IElementType>(1);
types.add(UMLElementTypes.ConnectableElement_3115);
- Tool tool = new UnspecifiedTypeCreationTool(types);
+
+ Tool tool = new AspectUnspecifiedTypeCreationTool(types);
return tool;
}
@@ -244,7 +265,8 @@ public class UMLPaletteFactory extends PaletteFactory.Adapter {
private Tool createCollaborationUse6CreationTool() {
List<IElementType> types = new ArrayList<IElementType>(1);
types.add(UMLElementTypes.CollaborationUse_3071);
- Tool tool = new UnspecifiedTypeCreationTool(types);
+
+ Tool tool = new AspectUnspecifiedTypeCreationTool(types);
return tool;
}
@@ -255,17 +277,41 @@ public class UMLPaletteFactory extends PaletteFactory.Adapter {
List<IElementType> types = new ArrayList<IElementType>(2);
types.add(UMLElementTypes.Comment_3097);
types.add(UMLElementTypes.Comment_2109);
- Tool tool = new UnspecifiedTypeCreationTool(types);
+
+ Tool tool = new AspectUnspecifiedTypeCreationTool(types);
return tool;
}
/**
* @generated
*/
- private Tool createContraint8CreationTool() {
+ private Tool createConstraint8CreationTool() {
List<IElementType> types = new ArrayList<IElementType>(1);
types.add(UMLElementTypes.Constraint_2114);
- Tool tool = new UnspecifiedTypeCreationTool(types);
+
+ Tool tool = new AspectUnspecifiedTypeCreationTool(types);
+ return tool;
+ }
+
+ /**
+ * @generated
+ */
+ private Tool createTimeObservation9CreationTool() {
+ List<IElementType> types = new ArrayList<IElementType>(1);
+ types.add(UMLElementTypes.TimeObservation_2094);
+
+ Tool tool = new AspectUnspecifiedTypeCreationTool(types);
+ return tool;
+ }
+
+ /**
+ * @generated
+ */
+ private Tool createDurationObservation10CreationTool() {
+ List<IElementType> types = new ArrayList<IElementType>(1);
+ types.add(UMLElementTypes.DurationObservation_2093);
+
+ Tool tool = new AspectUnspecifiedTypeCreationTool(types);
return tool;
}
@@ -273,10 +319,13 @@ public class UMLPaletteFactory extends PaletteFactory.Adapter {
* @generated
*/
private Tool createLink1CreationTool() {
- List<IElementType> types = new ArrayList<IElementType>(2);
+ List<IElementType> types = new ArrayList<IElementType>(4);
types.add(UMLElementTypes.CommentAnnotatedElement_4002);
types.add(UMLElementTypes.ConstraintConstrainedElement_4003);
- Tool tool = new UnspecifiedTypeConnectionTool(types);
+ types.add(UMLElementTypes.TimeObservationEvent_4018);
+ types.add(UMLElementTypes.DurationObservationEvent_4019);
+
+ Tool tool = new AspectUnspecifiedTypeConnectionTool(types);
return tool;
}
@@ -286,7 +335,8 @@ public class UMLPaletteFactory extends PaletteFactory.Adapter {
private Tool createConnector2CreationTool() {
List<IElementType> types = new ArrayList<IElementType>(1);
types.add(UMLElementTypes.Connector_4013);
- Tool tool = new UnspecifiedTypeConnectionTool(types);
+
+ Tool tool = new AspectUnspecifiedTypeConnectionTool(types);
return tool;
}
@@ -296,7 +346,8 @@ public class UMLPaletteFactory extends PaletteFactory.Adapter {
private Tool createRoleBinding3CreationTool() {
List<IElementType> types = new ArrayList<IElementType>(1);
types.add(UMLElementTypes.Dependency_4017);
- Tool tool = new UnspecifiedTypeConnectionTool(types);
+
+ Tool tool = new AspectUnspecifiedTypeConnectionTool(types);
return tool;
}
@@ -306,7 +357,8 @@ public class UMLPaletteFactory extends PaletteFactory.Adapter {
private Tool createGeneralization4CreationTool() {
List<IElementType> types = new ArrayList<IElementType>(1);
types.add(UMLElementTypes.Generalization_4015);
- Tool tool = new UnspecifiedTypeConnectionTool(types);
+
+ Tool tool = new AspectUnspecifiedTypeConnectionTool(types);
return tool;
}
@@ -316,7 +368,8 @@ public class UMLPaletteFactory extends PaletteFactory.Adapter {
private Tool createRealization5CreationTool() {
List<IElementType> types = new ArrayList<IElementType>(1);
types.add(UMLElementTypes.Realization_4006);
- Tool tool = new UnspecifiedTypeConnectionTool(types);
+
+ Tool tool = new AspectUnspecifiedTypeConnectionTool(types);
return tool;
}
@@ -326,7 +379,8 @@ public class UMLPaletteFactory extends PaletteFactory.Adapter {
private Tool createSubstitution6CreationTool() {
List<IElementType> types = new ArrayList<IElementType>(1);
types.add(UMLElementTypes.Substitution_4011);
- Tool tool = new UnspecifiedTypeConnectionTool(types);
+
+ Tool tool = new AspectUnspecifiedTypeConnectionTool(types);
return tool;
}
@@ -336,7 +390,8 @@ public class UMLPaletteFactory extends PaletteFactory.Adapter {
private Tool createAbstraction7CreationTool() {
List<IElementType> types = new ArrayList<IElementType>(1);
types.add(UMLElementTypes.Abstraction_4007);
- Tool tool = new UnspecifiedTypeConnectionTool(types);
+
+ Tool tool = new AspectUnspecifiedTypeConnectionTool(types);
return tool;
}
@@ -346,7 +401,8 @@ public class UMLPaletteFactory extends PaletteFactory.Adapter {
private Tool createUsage8CreationTool() {
List<IElementType> types = new ArrayList<IElementType>(1);
types.add(UMLElementTypes.Usage_4008);
- Tool tool = new UnspecifiedTypeConnectionTool(types);
+
+ Tool tool = new AspectUnspecifiedTypeConnectionTool(types);
return tool;
}
@@ -356,7 +412,8 @@ public class UMLPaletteFactory extends PaletteFactory.Adapter {
private Tool createDependency9CreationTool() {
List<IElementType> types = new ArrayList<IElementType>(1);
types.add(UMLElementTypes.Dependency_4010);
- Tool tool = new UnspecifiedTypeConnectionTool(types);
+
+ Tool tool = new AspectUnspecifiedTypeConnectionTool(types);
return tool;
}
diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/part/UMLVisualIDRegistry.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/part/UMLVisualIDRegistry.java
index 576ab8ef840..9d5bd4cae07 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/part/UMLVisualIDRegistry.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/part/UMLVisualIDRegistry.java
@@ -3818,11 +3818,17 @@ public class UMLVisualIDRegistry {
if (DurationObservationNameEditPart.VISUAL_ID == nodeVisualID) {
return true;
}
+ if (DurationObservationStereotypeLabelEditPart.VISUAL_ID == nodeVisualID) {
+ return true;
+ }
break;
case TimeObservationEditPart.VISUAL_ID:
if (TimeObservationNameEditPart.VISUAL_ID == nodeVisualID) {
return true;
}
+ if (TimeObservationStereotypeLabelEditPart.VISUAL_ID == nodeVisualID) {
+ return true;
+ }
break;
case LiteralBooleanEditPart.VISUAL_ID:
if (LiteralBooleanNameEditPart.VISUAL_ID == nodeVisualID) {
@@ -6691,6 +6697,12 @@ public class UMLVisualIDRegistry {
viewInfo = new BaseViewInfo(4016, ViewInfo.Edge, "");
root.addNode(1000, viewInfo);
+ viewInfo = new BaseViewInfo(4018, ViewInfo.Edge, "");
+ root.addNode(1000, viewInfo);
+
+ viewInfo = new BaseViewInfo(4019, ViewInfo.Edge, "");
+ root.addNode(1000, viewInfo);
+
viewInfo = new BaseViewInfo(3069, ViewInfo.Node, "Port");
root.addNode(2073, viewInfo);
diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/providers/UMLElementTypes.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/providers/UMLElementTypes.java
index 8eded88399a..894aae98ba8 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/providers/UMLElementTypes.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/providers/UMLElementTypes.java
@@ -636,6 +636,16 @@ public class UMLElementTypes extends ElementInitializers {
/**
* @generated
*/
+ public static final IElementType TimeObservationEvent_4018 = getElementType("org.eclipse.papyrus.diagram.composite.TimeObservationEvent_4018"); //$NON-NLS-1$
+
+ /**
+ * @generated
+ */
+ public static final IElementType DurationObservationEvent_4019 = getElementType("org.eclipse.papyrus.diagram.composite.DurationObservationEvent_4019"); //$NON-NLS-1$
+
+ /**
+ * @generated
+ */
private static ImageRegistry getImageRegistry() {
if (imageRegistry == null) {
imageRegistry = new ImageRegistry();
@@ -967,6 +977,10 @@ public class UMLElementTypes extends ElementInitializers {
elements.put(Generalization_4015, UMLPackage.eINSTANCE.getGeneralization());
elements.put(InformationFlow_4016, UMLPackage.eINSTANCE.getInformationFlow());
+
+ elements.put(TimeObservationEvent_4018, UMLPackage.eINSTANCE.getTimeObservation_Event());
+
+ elements.put(DurationObservationEvent_4019, UMLPackage.eINSTANCE.getDurationObservation_Event());
}
return (ENamedElement) elements.get(type);
}
@@ -1099,6 +1113,8 @@ public class UMLElementTypes extends ElementInitializers {
KNOWN_ELEMENT_TYPES.add(Connector_4013);
KNOWN_ELEMENT_TYPES.add(Generalization_4015);
KNOWN_ELEMENT_TYPES.add(InformationFlow_4016);
+ KNOWN_ELEMENT_TYPES.add(TimeObservationEvent_4018);
+ KNOWN_ELEMENT_TYPES.add(DurationObservationEvent_4019);
}
return KNOWN_ELEMENT_TYPES.contains(elementType);
}
@@ -1338,6 +1354,10 @@ public class UMLElementTypes extends ElementInitializers {
return Generalization_4015;
case InformationFlowEditPart.VISUAL_ID:
return InformationFlow_4016;
+ case ConnectorTimeObservationEditPart.VISUAL_ID:
+ return TimeObservationEvent_4018;
+ case ConnectorDurationObservationEditPart.VISUAL_ID:
+ return DurationObservationEvent_4019;
}
return null;
}
diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/providers/UMLParserProvider.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/providers/UMLParserProvider.java
index 802df4210eb..a3eb812bc69 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/providers/UMLParserProvider.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/providers/UMLParserProvider.java
@@ -700,41 +700,65 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
/**
* @generated
*/
- private IParser durationObservationName_5176Parser;
+ private IParser durationObservationName_5151Parser;
/**
* @generated
*/
- private IParser getDurationObservationName_5176Parser() {
- if (durationObservationName_5176Parser == null) {
+ private IParser getDurationObservationName_5151Parser() {
+ if (durationObservationName_5151Parser == null) {
EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() };
MessageFormatParser parser = new MessageFormatParser(features);
- parser.setViewPattern("{0} "); //$NON-NLS-1$
- parser.setEditorPattern("{0}"); //$NON-NLS-1$
- parser.setEditPattern("{0}"); //$NON-NLS-1$
- durationObservationName_5176Parser = parser;
+ durationObservationName_5151Parser = parser;
+ }
+ return durationObservationName_5151Parser;
+ }
+
+ /**
+ * @generated
+ */
+ private AppliedStereotypeParser durationObservationName_5152Parser;
+
+ /**
+ * @generated
+ */
+ private IParser getDurationObservationName_5152Parser() {
+ if (durationObservationName_5152Parser == null) {
+ durationObservationName_5152Parser = new AppliedStereotypeParser();
}
- return durationObservationName_5176Parser;
+ return durationObservationName_5152Parser;
}
/**
* @generated
*/
- private IParser timeObservationName_5177Parser;
+ private IParser timeObservationName_5142Parser;
/**
* @generated
*/
- private IParser getTimeObservationName_5177Parser() {
- if (timeObservationName_5177Parser == null) {
+ private IParser getTimeObservationName_5142Parser() {
+ if (timeObservationName_5142Parser == null) {
EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() };
MessageFormatParser parser = new MessageFormatParser(features);
- parser.setViewPattern("{0} "); //$NON-NLS-1$
- parser.setEditorPattern("{0}"); //$NON-NLS-1$
- parser.setEditPattern("{0}"); //$NON-NLS-1$
- timeObservationName_5177Parser = parser;
+ timeObservationName_5142Parser = parser;
+ }
+ return timeObservationName_5142Parser;
+ }
+
+ /**
+ * @generated
+ */
+ private AppliedStereotypeParser timeObservationName_5143Parser;
+
+ /**
+ * @generated
+ */
+ private IParser getTimeObservationName_5143Parser() {
+ if (timeObservationName_5143Parser == null) {
+ timeObservationName_5143Parser = new AppliedStereotypeParser();
}
- return timeObservationName_5177Parser;
+ return timeObservationName_5143Parser;
}
/**
@@ -2461,9 +2485,13 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
case ExecutionEventNameEditPart.VISUAL_ID:
return getExecutionEventName_5175Parser();
case DurationObservationNameEditPart.VISUAL_ID:
- return getDurationObservationName_5176Parser();
+ return getDurationObservationName_5151Parser();
+ case DurationObservationStereotypeLabelEditPart.VISUAL_ID:
+ return getDurationObservationName_5152Parser();
case TimeObservationNameEditPart.VISUAL_ID:
- return getTimeObservationName_5177Parser();
+ return getTimeObservationName_5142Parser();
+ case TimeObservationStereotypeLabelEditPart.VISUAL_ID:
+ return getTimeObservationName_5143Parser();
case LiteralBooleanNameEditPart.VISUAL_ID:
return getLiteralBooleanName_5178Parser();
case LiteralIntegerNameEditPart.VISUAL_ID:
diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/providers/UMLViewProvider.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/providers/UMLViewProvider.java
index 9ec49611926..23d52089da9 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/providers/UMLViewProvider.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/providers/UMLViewProvider.java
@@ -132,12 +132,12 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
String elementTypeHint = ((IHintedType) elementType).getSemanticHint();
if (!op.getSemanticHint().equals(elementTypeHint)) {
return false; // if semantic hint is specified it should be the same as in
- // element type
+ // element type
}
if (domainElement != null
&& visualID != UMLVisualIDRegistry.getNodeVisualID(op.getContainerView(), domainElement)) {
return false; // visual id for node EClass should match visual id from element
- // type
+ // type
}
} else {
if (!PackageEditPart.MODEL_ID.equals(UMLVisualIDRegistry.getModelID(op.getContainerView()))) {
@@ -245,7 +245,7 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
if (domainElement == null
|| visualID != UMLVisualIDRegistry.getNodeVisualID(op.getContainerView(), domainElement)) {
return false; // visual id in semantic hint should match visual id for
- // domain element
+ // domain element
}
break;
default:
@@ -325,7 +325,7 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
String elementTypeHint = ((IHintedType) elementType).getSemanticHint();
if (elementTypeHint == null || (op.getSemanticHint() != null && !elementTypeHint.equals(op.getSemanticHint()))) {
return false; // our hint is visual id and must be specified, and it should be the same
- // as in element type
+ // as in element type
}
int visualID = UMLVisualIDRegistry.getVisualID(elementTypeHint);
EObject domainElement = getSemanticElement(op.getSemanticAdapter());
@@ -614,6 +614,10 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
case InformationFlowEditPart.VISUAL_ID:
return createInformationFlow_4016(getSemanticElement(semanticAdapter), containerView, index, persisted,
preferencesHint);
+ case ConnectorTimeObservationEditPart.VISUAL_ID:
+ return createTimeObservationEvent_4018(containerView, index, persisted, preferencesHint);
+ case ConnectorDurationObservationEditPart.VISUAL_ID:
+ return createDurationObservationEvent_4019(containerView, index, persisted, preferencesHint);
}
// can never happen, provided #provides(CreateEdgeViewOperation) is correct
return null;
@@ -1474,10 +1478,7 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
*/
public Node createDurationObservation_2093(EObject domainElement, View containerView, int index, boolean persisted,
PreferencesHint preferencesHint) {
- Node node = NotationFactory.eINSTANCE.createNode();
- node.getStyles().add(NotationFactory.eINSTANCE.createDescriptionStyle());
- node.getStyles().add(NotationFactory.eINSTANCE.createFontStyle());
- node.getStyles().add(NotationFactory.eINSTANCE.createFillStyle());
+ Shape node = NotationFactory.eINSTANCE.createShape();
node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());
node.setType(UMLVisualIDRegistry.getType(DurationObservationEditPart.VISUAL_ID));
ViewUtil.insertChildView(containerView, node, index, persisted);
@@ -1486,11 +1487,23 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
// initializeFromPreferences
final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();
+ initForegroundFromPrefs(node, prefStore, "DurationObservation");
+
initFontStyleFromPrefs(node, prefStore, "DurationObservation");
initBackgroundFromPrefs(node, prefStore, "DurationObservation");
- Node label5176 = createLabel(node, UMLVisualIDRegistry.getType(DurationObservationNameEditPart.VISUAL_ID));
+ Node label5151 = createLabel(node, UMLVisualIDRegistry.getType(DurationObservationNameEditPart.VISUAL_ID));
+ label5151.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());
+ Location location5151 = (Location) label5151.getLayoutConstraint();
+ location5151.setX(0);
+ location5151.setY(5);
+ Node label5152 = createLabel(node, UMLVisualIDRegistry
+ .getType(DurationObservationStereotypeLabelEditPart.VISUAL_ID));
+ label5152.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());
+ Location location5152 = (Location) label5152.getLayoutConstraint();
+ location5152.setX(0);
+ location5152.setY(5);
return node;
}
@@ -1499,10 +1512,7 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
*/
public Node createTimeObservation_2094(EObject domainElement, View containerView, int index, boolean persisted,
PreferencesHint preferencesHint) {
- Node node = NotationFactory.eINSTANCE.createNode();
- node.getStyles().add(NotationFactory.eINSTANCE.createDescriptionStyle());
- node.getStyles().add(NotationFactory.eINSTANCE.createFontStyle());
- node.getStyles().add(NotationFactory.eINSTANCE.createFillStyle());
+ Shape node = NotationFactory.eINSTANCE.createShape();
node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());
node.setType(UMLVisualIDRegistry.getType(TimeObservationEditPart.VISUAL_ID));
ViewUtil.insertChildView(containerView, node, index, persisted);
@@ -1511,11 +1521,23 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
// initializeFromPreferences
final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();
+ initForegroundFromPrefs(node, prefStore, "TimeObservation");
+
initFontStyleFromPrefs(node, prefStore, "TimeObservation");
initBackgroundFromPrefs(node, prefStore, "TimeObservation");
- Node label5177 = createLabel(node, UMLVisualIDRegistry.getType(TimeObservationNameEditPart.VISUAL_ID));
+ Node label5142 = createLabel(node, UMLVisualIDRegistry.getType(TimeObservationNameEditPart.VISUAL_ID));
+ label5142.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());
+ Location location5142 = (Location) label5142.getLayoutConstraint();
+ location5142.setX(0);
+ location5142.setY(5);
+ Node label5143 = createLabel(node, UMLVisualIDRegistry
+ .getType(TimeObservationStereotypeLabelEditPart.VISUAL_ID));
+ label5143.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());
+ Location location5143 = (Location) label5143.getLayoutConstraint();
+ location5143.setX(0);
+ location5143.setY(5);
return node;
}
@@ -3446,6 +3468,58 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
/**
* @generated
*/
+ public Edge createTimeObservationEvent_4018(View containerView, int index, boolean persisted,
+ PreferencesHint preferencesHint) {
+ Connector edge = NotationFactory.eINSTANCE.createConnector();
+ edge.getStyles().add(NotationFactory.eINSTANCE.createFontStyle());
+ RelativeBendpoints bendpoints = NotationFactory.eINSTANCE.createRelativeBendpoints();
+ ArrayList points = new ArrayList(2);
+ points.add(new RelativeBendpoint());
+ points.add(new RelativeBendpoint());
+ bendpoints.setPoints(points);
+ edge.setBendpoints(bendpoints);
+ ViewUtil.insertChildView(containerView, edge, index, persisted);
+ edge.setType(UMLVisualIDRegistry.getType(ConnectorTimeObservationEditPart.VISUAL_ID));
+ edge.setElement(null);
+ // initializePreferences
+ final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();
+
+ Routing routing = Routing.get(prefStore.getInt(IPreferenceConstants.PREF_LINE_STYLE));
+ if (routing != null) {
+ ViewUtil.setStructuralFeatureValue(edge, NotationPackage.eINSTANCE.getRoutingStyle_Routing(), routing);
+ }
+ return edge;
+ }
+
+ /**
+ * @generated
+ */
+ public Edge createDurationObservationEvent_4019(View containerView, int index, boolean persisted,
+ PreferencesHint preferencesHint) {
+ Connector edge = NotationFactory.eINSTANCE.createConnector();
+ edge.getStyles().add(NotationFactory.eINSTANCE.createFontStyle());
+ RelativeBendpoints bendpoints = NotationFactory.eINSTANCE.createRelativeBendpoints();
+ ArrayList points = new ArrayList(2);
+ points.add(new RelativeBendpoint());
+ points.add(new RelativeBendpoint());
+ bendpoints.setPoints(points);
+ edge.setBendpoints(bendpoints);
+ ViewUtil.insertChildView(containerView, edge, index, persisted);
+ edge.setType(UMLVisualIDRegistry.getType(ConnectorDurationObservationEditPart.VISUAL_ID));
+ edge.setElement(null);
+ // initializePreferences
+ final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();
+
+ Routing routing = Routing.get(prefStore.getInt(IPreferenceConstants.PREF_LINE_STYLE));
+ if (routing != null) {
+ ViewUtil.setStructuralFeatureValue(edge, NotationPackage.eINSTANCE.getRoutingStyle_Routing(), routing);
+ }
+ return edge;
+ }
+
+ /**
+ * @generated
+ */
private void stampShortcut(View containerView, Node target) {
if (!PackageEditPart.MODEL_ID.equals(UMLVisualIDRegistry.getModelID(containerView))) {
EAnnotation shortcutAnnotation = EcoreFactory.eINSTANCE.createEAnnotation();
@@ -3479,6 +3553,8 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
} else {
rv = NotationFactory.eINSTANCE.createDecorationNode();
}
+ rv.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());
+
if (hasTitle) {
TitleStyle ts = NotationFactory.eINSTANCE.createTitleStyle();
ts.setShowTitle(true);

Back to the top