diff options
| author | ashatilov | 2015-04-06 11:43:34 +0000 |
|---|---|---|
| committer | Camille Letavernier | 2015-04-21 15:35:54 +0000 |
| commit | 3418e7d6a681c00e15a8c88ace9429004efa73fa (patch) | |
| tree | 9dbd0af3c7f8cada414f62273aa07ce822bb9ece | |
| parent | d7cb8c027350eed0ba355196225d4e13211f0d80 (diff) | |
| download | org.eclipse.papyrus-3418e7d6a681c00e15a8c88ace9429004efa73fa.tar.gz org.eclipse.papyrus-3418e7d6a681c00e15a8c88ace9429004efa73fa.tar.xz org.eclipse.papyrus-3418e7d6a681c00e15a8c88ace9429004efa73fa.zip | |
Bug 463769 - Stereotype compartment can not be restored
- Timing diagram contribution
Change-Id: I8e1d76d4d37e9d585a6bcf17805f9bd1d2d74508
Signed-off-by: ashatilov <montages.as@gmail.com>
Reviewed-on: https://git.eclipse.org/r/45323
Reviewed-by: Michael Golubev <golubev@montages.com>
Tested-by: Hudson CI
Reviewed-by: Camille Letavernier <camille.letavernier@cea.fr>
4 files changed, 12 insertions, 4 deletions
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src/org/eclipse/papyrus/uml/diagram/timing/edit/parts/CompactStateInvariantEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src/org/eclipse/papyrus/uml/diagram/timing/edit/parts/CompactStateInvariantEditPartCN.java index a6e7ad42eb3..b5a471f6c69 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src/org/eclipse/papyrus/uml/diagram/timing/edit/parts/CompactStateInvariantEditPartCN.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src/org/eclipse/papyrus/uml/diagram/timing/edit/parts/CompactStateInvariantEditPartCN.java @@ -35,6 +35,7 @@ import org.eclipse.gmf.runtime.diagram.ui.figures.BorderItemLocator; import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;
import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure;
import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;
+import org.eclipse.gmf.runtime.notation.BasicCompartment;
import org.eclipse.gmf.runtime.notation.Edge;
import org.eclipse.gmf.runtime.notation.NotationPackage;
import org.eclipse.gmf.runtime.notation.View;
@@ -145,7 +146,8 @@ public class CompactStateInvariantEditPartCN extends NodeEditPart { if (NotationPackage.eINSTANCE.getView_Visible().equals(event.getFeature())) {
Object notifier = event.getNotifier();
List<?> modelChildren = ((View) getModel()).getChildren();
- if (!(notifier instanceof Edge)) {
+ if (false == notifier instanceof Edge
+ && false == notifier instanceof BasicCompartment) {
if (modelChildren.contains(event.getNotifier())) {
return;
}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src/org/eclipse/papyrus/uml/diagram/timing/edit/parts/FullStateInvariantEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src/org/eclipse/papyrus/uml/diagram/timing/edit/parts/FullStateInvariantEditPartCN.java index 7e48ff3c144..cf52118a53c 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src/org/eclipse/papyrus/uml/diagram/timing/edit/parts/FullStateInvariantEditPartCN.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src/org/eclipse/papyrus/uml/diagram/timing/edit/parts/FullStateInvariantEditPartCN.java @@ -33,6 +33,7 @@ import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles; import org.eclipse.gmf.runtime.diagram.ui.figures.BorderItemLocator;
import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure;
import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;
+import org.eclipse.gmf.runtime.notation.BasicCompartment;
import org.eclipse.gmf.runtime.notation.Edge;
import org.eclipse.gmf.runtime.notation.NotationPackage;
import org.eclipse.gmf.runtime.notation.View;
@@ -143,7 +144,8 @@ public class FullStateInvariantEditPartCN extends NodeEditPart { if (NotationPackage.eINSTANCE.getView_Visible().equals(event.getFeature())) {
Object notifier = event.getNotifier();
List<?> modelChildren = ((View) getModel()).getChildren();
- if (!(notifier instanceof Edge)) {
+ if (false == notifier instanceof Edge
+ && false == notifier instanceof BasicCompartment) {
if (modelChildren.contains(event.getNotifier())) {
return;
}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src/org/eclipse/papyrus/uml/diagram/timing/edit/parts/MessageOccurrenceSpecificationEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src/org/eclipse/papyrus/uml/diagram/timing/edit/parts/MessageOccurrenceSpecificationEditPartCN.java index 7ac5a368730..e81de730da5 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src/org/eclipse/papyrus/uml/diagram/timing/edit/parts/MessageOccurrenceSpecificationEditPartCN.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src/org/eclipse/papyrus/uml/diagram/timing/edit/parts/MessageOccurrenceSpecificationEditPartCN.java @@ -34,6 +34,7 @@ import org.eclipse.gmf.runtime.diagram.ui.figures.BorderItemLocator; import org.eclipse.gmf.runtime.diagram.ui.figures.IBorderItemLocator;
import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure;
import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;
+import org.eclipse.gmf.runtime.notation.BasicCompartment;
import org.eclipse.gmf.runtime.notation.Edge;
import org.eclipse.gmf.runtime.notation.NotationPackage;
import org.eclipse.gmf.runtime.notation.View;
@@ -146,7 +147,8 @@ public class MessageOccurrenceSpecificationEditPartCN extends NodeEditPart { if (NotationPackage.eINSTANCE.getView_Visible().equals(event.getFeature())) {
Object notifier = event.getNotifier();
List<?> modelChildren = ((View) getModel()).getChildren();
- if (!(notifier instanceof Edge)) {
+ if (false == notifier instanceof Edge
+ && false == notifier instanceof BasicCompartment) {
if (modelChildren.contains(event.getNotifier())) {
return;
}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src/org/eclipse/papyrus/uml/diagram/timing/edit/parts/OccurrenceSpecificationEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src/org/eclipse/papyrus/uml/diagram/timing/edit/parts/OccurrenceSpecificationEditPartCN.java index 36054d5fb4e..3ca9a53a2fb 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src/org/eclipse/papyrus/uml/diagram/timing/edit/parts/OccurrenceSpecificationEditPartCN.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src/org/eclipse/papyrus/uml/diagram/timing/edit/parts/OccurrenceSpecificationEditPartCN.java @@ -34,6 +34,7 @@ import org.eclipse.gmf.runtime.diagram.ui.figures.BorderItemLocator; import org.eclipse.gmf.runtime.diagram.ui.figures.IBorderItemLocator;
import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure;
import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;
+import org.eclipse.gmf.runtime.notation.BasicCompartment;
import org.eclipse.gmf.runtime.notation.Edge;
import org.eclipse.gmf.runtime.notation.NotationPackage;
import org.eclipse.gmf.runtime.notation.View;
@@ -146,7 +147,8 @@ public class OccurrenceSpecificationEditPartCN extends NodeEditPart { if (NotationPackage.eINSTANCE.getView_Visible().equals(event.getFeature())) {
Object notifier = event.getNotifier();
List<?> modelChildren = ((View) getModel()).getChildren();
- if (!(notifier instanceof Edge)) {
+ if (false == notifier instanceof Edge
+ && false == notifier instanceof BasicCompartment) {
if (modelChildren.contains(event.getNotifier())) {
return;
}
|