Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPierre-Charles David2016-10-21 09:26:22 +0000
committerPierre-Charles David2016-10-21 09:26:26 +0000
commit29441d85eb0e1aec14492d6f5786563b0e7b5cf5 (patch)
tree02107673295cc5df97c80f2ccd60b34179ca7837
parentcbec02a4bf4f98f4abaed316fe4b046646ed01e4 (diff)
downloadorg.eclipse.sirius-29441d85eb0e1aec14492d6f5786563b0e7b5cf5.tar.gz
org.eclipse.sirius-29441d85eb0e1aec14492d6f5786563b0e7b5cf5.tar.xz
org.eclipse.sirius-29441d85eb0e1aec14492d6f5786563b0e7b5cf5.zip
[506059] Make the default rules only appear on the top-level Group element
Bug: 506059 Change-Id: I3cbc15f2af91110253d1419d8109d449a6708297 Signed-off-by: Pierre-Charles David <pierre-charles.david@obeo.fr>
-rw-r--r--plugins/org.eclipse.sirius.editor.properties/src/org/eclipse/sirius/editor/properties/DefaultRulesCreationExtender.java9
1 files changed, 6 insertions, 3 deletions
diff --git a/plugins/org.eclipse.sirius.editor.properties/src/org/eclipse/sirius/editor/properties/DefaultRulesCreationExtender.java b/plugins/org.eclipse.sirius.editor.properties/src/org/eclipse/sirius/editor/properties/DefaultRulesCreationExtender.java
index 83ccbbb559..bf51f658d6 100644
--- a/plugins/org.eclipse.sirius.editor.properties/src/org/eclipse/sirius/editor/properties/DefaultRulesCreationExtender.java
+++ b/plugins/org.eclipse.sirius.editor.properties/src/org/eclipse/sirius/editor/properties/DefaultRulesCreationExtender.java
@@ -22,6 +22,7 @@ import org.eclipse.sirius.editor.tools.internal.menu.CustomChildTextAdapter;
import org.eclipse.sirius.properties.ViewExtensionDescription;
import org.eclipse.sirius.ui.properties.internal.tabprovider.SiriusTabDescriptorProvider;
import org.eclipse.sirius.viewpoint.description.DescriptionPackage;
+import org.eclipse.sirius.viewpoint.description.Group;
/**
* Contributes the default rules model to the creation context menu in the VSM editor.
@@ -33,9 +34,11 @@ public class DefaultRulesCreationExtender implements IChildCreationExtender {
@Override
public Collection<?> getNewChildDescriptors(Object object, EditingDomain editingDomain) {
ArrayList<Object> result = new ArrayList<Object>();
- ViewExtensionDescription rules = EcoreUtil.copy(SiriusTabDescriptorProvider.getDefaultRules());
- rules.eAdapters().add(new CustomChildTextAdapter(Messages.ImportingDefaultPropertiesViewDescriptionCommand_text));
- result.add(new CommandParameter(null, DescriptionPackage.Literals.GROUP__EXTENSIONS, rules));
+ if (object instanceof Group) {
+ ViewExtensionDescription rules = EcoreUtil.copy(SiriusTabDescriptorProvider.getDefaultRules());
+ rules.eAdapters().add(new CustomChildTextAdapter(Messages.ImportingDefaultPropertiesViewDescriptionCommand_text));
+ result.add(new CommandParameter(null, DescriptionPackage.Literals.GROUP__EXTENSIONS, rules));
+ }
return result;
}

Back to the top