diff options
| author | Mickael ADAM | 2014-09-30 07:25:10 +0000 |
|---|---|---|
| committer | Mickael ADAM | 2014-09-30 13:20:41 +0000 |
| commit | 54361511a2bdfcc89c44e5cec0e8920217f62797 (patch) | |
| tree | 3abeb25f7b0689031d7c9a9f08ea9337173ac4e3 /plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ConstraintAsLocalPostcondEditPart.java | |
| parent | 377cc40520d3a41d022d78c6a54afe25b5b6d213 (diff) | |
| parent | 23e8fac0e97cd5baa45424b9a7a0b0c646081c75 (diff) | |
| download | org.eclipse.papyrus-54361511a2bdfcc89c44e5cec0e8920217f62797.tar.gz org.eclipse.papyrus-54361511a2bdfcc89c44e5cec0e8920217f62797.tar.xz org.eclipse.papyrus-54361511a2bdfcc89c44e5cec0e8920217f62797.zip | |
Merge remote-tracking branch 'origin/master' into master2
Conflicts:
plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/META-INF/MANIFEST.MF
plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/META-INF/MANIFEST.MF
Change-Id: Ied01d9c181e70008eeb92a4d58f0f244e08f1981
Signed-off-by: Mickael ADAM <mickael.adam@ALL4TEC.net>
Diffstat (limited to 'plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ConstraintAsLocalPostcondEditPart.java')
| -rw-r--r-- | plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ConstraintAsLocalPostcondEditPart.java | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ConstraintAsLocalPostcondEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ConstraintAsLocalPostcondEditPart.java index 25de4e7d310..fe3a3392cdf 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ConstraintAsLocalPostcondEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ConstraintAsLocalPostcondEditPart.java @@ -18,7 +18,6 @@ import java.util.LinkedList; import java.util.List;
import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.Shape;
import org.eclipse.draw2d.StackLayout;
import org.eclipse.emf.common.notify.Notification;
import org.eclipse.emf.ecore.EStructuralFeature;
@@ -40,6 +39,7 @@ 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.infra.gmfdiag.common.figure.node.IPapyrusNodeFigure;
import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;
import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;
import org.eclipse.papyrus.uml.diagram.activity.edit.policies.ActivityDiagramChangeStereotypedShapeEditpolicy;
@@ -285,8 +285,8 @@ public class ConstraintAsLocalPostcondEditPart extends AbstractConstraintEditPar */
@Override
protected void setLineWidth(int width) {
- if (primaryShape instanceof Shape) {
- ((Shape) primaryShape).setLineWidth(width);
+ if (primaryShape instanceof IPapyrusNodeFigure) { // Manually replaced, waiting for next generation
+ ((IPapyrusNodeFigure) primaryShape).setLineWidth(width);
}
}
@@ -295,8 +295,8 @@ public class ConstraintAsLocalPostcondEditPart extends AbstractConstraintEditPar */
@Override
protected void setLineType(int style) {
- if (primaryShape instanceof Shape) {
- ((Shape) primaryShape).setLineStyle(style);
+ if (primaryShape instanceof IPapyrusNodeFigure) { // Manually replaced, waiting for next generation
+ ((IPapyrusNodeFigure) primaryShape).setLineStyle(style);
}
}
|