diff options
| author | Maxime Porhel | 2016-09-21 09:56:12 +0000 |
|---|---|---|
| committer | Pierre-Charles David | 2016-09-22 12:53:41 +0000 |
| commit | 8390245bb2d43d5566597df3f00ab71fdaefbb64 (patch) | |
| tree | 22439c2fbdf9886bca2abb2869f264ccad3fb1ac | |
| parent | ee5d0e4c74d8114fb4df27e512e04d2adc2c907d (diff) | |
| download | org.eclipse.sirius-8390245bb2d43d5566597df3f00ab71fdaefbb64.tar.gz org.eclipse.sirius-8390245bb2d43d5566597df3f00ab71fdaefbb64.tar.xz org.eclipse.sirius-8390245bb2d43d5566597df3f00ab71fdaefbb64.zip | |
[501883] Show forbidden sides section for all border nodes styles
Bug: 501883
Change-Id: Ic85b83c79394ac01975a30472f83c7d4255c9abb
Signed-off-by: Maxime Porhel <maxime.porhel@obeo.fr>
| -rw-r--r-- | plugins/org.eclipse.sirius.editor.diagram/src-gen/org/eclipse/sirius/diagram/editor/properties/filters/style/nodestyledescription/NodeStyleDescriptionForbiddenSidesFilter.java | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/plugins/org.eclipse.sirius.editor.diagram/src-gen/org/eclipse/sirius/diagram/editor/properties/filters/style/nodestyledescription/NodeStyleDescriptionForbiddenSidesFilter.java b/plugins/org.eclipse.sirius.editor.diagram/src-gen/org/eclipse/sirius/diagram/editor/properties/filters/style/nodestyledescription/NodeStyleDescriptionForbiddenSidesFilter.java index 16665bbe3d..9b021f07c5 100644 --- a/plugins/org.eclipse.sirius.editor.diagram/src-gen/org/eclipse/sirius/diagram/editor/properties/filters/style/nodestyledescription/NodeStyleDescriptionForbiddenSidesFilter.java +++ b/plugins/org.eclipse.sirius.editor.diagram/src-gen/org/eclipse/sirius/diagram/editor/properties/filters/style/nodestyledescription/NodeStyleDescriptionForbiddenSidesFilter.java @@ -14,6 +14,7 @@ import org.eclipse.emf.ecore.EObject; // Start of user code specific imports import org.eclipse.emf.ecore.EStructuralFeature; +import org.eclipse.sirius.diagram.description.ConditionalNodeStyleDescription; import org.eclipse.sirius.diagram.description.DescriptionPackage; import org.eclipse.sirius.diagram.description.style.NodeStyleDescription; import org.eclipse.sirius.diagram.description.style.StylePackage; @@ -48,6 +49,9 @@ public class NodeStyleDescriptionForbiddenSidesFilter extends ViewpointPropertyF public boolean select(Object object) { if (super.select(object)) { EObject nodeMapping = ((NodeStyleDescription) object).eContainer(); + if (nodeMapping instanceof ConditionalNodeStyleDescription) { + nodeMapping = nodeMapping.eContainer(); + } // We display this property section only for nodeStyleDescription // contained in a borderNodeMapping (a NodeMapping referenced by the // parent borderNodeMapping feature) |