diff options
| author | Céline Janssens | 2017-05-03 14:54:24 +0000 |
|---|---|---|
| committer | ptessier | 2017-05-08 14:58:10 +0000 |
| commit | fe0a81c2e06572bdafcb1c17638d9c7b9ac7a1df (patch) | |
| tree | ecd8434c800c862f803c8779230ee7219ff31846 /plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/providers/CustomValidationProvider.java | |
| parent | 50204ad32b0bb8103c3f999599febdf2cfd4833d (diff) | |
| download | org.eclipse.papyrus-fe0a81c2e06572bdafcb1c17638d9c7b9ac7a1df.tar.gz org.eclipse.papyrus-fe0a81c2e06572bdafcb1c17638d9c7b9ac7a1df.tar.xz org.eclipse.papyrus-fe0a81c2e06572bdafcb1c17638d9c7b9ac7a1df.zip | |
Bug 489116: [Sequence Diagram] Update Coregion
- Do not use CoRegion Edit Part and Figure
- Use Combined Fragment EditPart and Figure
- Add CoRegion Field in the Combined Fragment Figure
- Paint Brackets if needed
TODO: Delete the CombinedFragment2EditPart from the gmfGen
Change-Id: Ibfc206c5b42ab1369a098ae59e35c5916654a9b7
Signed-off-by: Céline Janssens <Celine.Janssens@all4tec.net>
Diffstat (limited to 'plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/providers/CustomValidationProvider.java')
| -rw-r--r-- | plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/providers/CustomValidationProvider.java | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/providers/CustomValidationProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/providers/CustomValidationProvider.java index b0e4ee6260b..4b6e247da22 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/providers/CustomValidationProvider.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/providers/CustomValidationProvider.java @@ -20,18 +20,17 @@ import org.eclipse.emf.validation.IValidationContext; import org.eclipse.emf.validation.model.IClientSelector;
import org.eclipse.gmf.runtime.notation.Bounds;
import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.CCombinedCompartmentEditPart;
import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.BehaviorExecutionSpecificationEditPart;
-import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.CombinedFragment2EditPart;
+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.CCombinedCompartmentEditPart;
import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.CombinedFragmentEditPart;
import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.InteractionOperandEditPart;
import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.LifelineEditPart;
import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.MessageAsyncEditPart;
-import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.MessageReplyEditPart;
import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.MessageCreateEditPart;
import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.MessageDeleteEditPart;
-import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.MessageLostEditPart;
import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.MessageFoundEditPart;
+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.MessageLostEditPart;
+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.MessageReplyEditPart;
import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.MessageSyncEditPart;
import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.SequenceDiagramEditPart;
import org.eclipse.papyrus.uml.diagram.sequence.part.UMLVisualIDRegistry;
@@ -63,7 +62,6 @@ public class CustomValidationProvider extends UMLValidationProvider { result = result || BehaviorExecutionSpecificationEditPart.VISUAL_ID.equals(id);
// CF and Interaction operands
result = result || CombinedFragmentEditPart.VISUAL_ID.equals(id);
- result = result || CombinedFragment2EditPart.VISUAL_ID.equals(id);
result = result || InteractionOperandEditPart.VISUAL_ID.equals(id);
// Time related : do nothing, the real event support will be also moved
// result = result || TimeConstraintEditPart.VISUAL_ID.equals(id);
|