Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStéphane Bégaudeau2016-03-30 14:38:03 +0000
committerPierre-Charles David2016-03-31 07:37:17 +0000
commiteb8420dd4a0c577ab6f049f8aa093151fe44bded (patch)
tree4eaddd0e510ea0334af85893e3f3c44db3944fc6
parent8c8e42f9c3c4b63abd7cc6e8f840fa5a6574226e (diff)
downloadorg.eclipse.sirius-eb8420dd4a0c577ab6f049f8aa093151fe44bded.tar.gz
org.eclipse.sirius-eb8420dd4a0c577ab6f049f8aa093151fe44bded.tar.xz
org.eclipse.sirius-eb8420dd4a0c577ab6f049f8aa093151fe44bded.zip
[482528] Convert the EPackages for EEF
Change-Id: Ib0c3c3b4e26a0c9882a6f0a701d418949bbe902d Signed-off-by: Stéphane Bégaudeau <stephane.begaudeau@obeo.fr>
-rw-r--r--incubation/org.eclipse.sirius.ui.properties/src/org/eclipse/sirius/ui/properties/internal/tabprovider/ViewDescriptionConverter.java15
1 files changed, 15 insertions, 0 deletions
diff --git a/incubation/org.eclipse.sirius.ui.properties/src/org/eclipse/sirius/ui/properties/internal/tabprovider/ViewDescriptionConverter.java b/incubation/org.eclipse.sirius.ui.properties/src/org/eclipse/sirius/ui/properties/internal/tabprovider/ViewDescriptionConverter.java
index 2dcd1919b1..9ed3b35f92 100644
--- a/incubation/org.eclipse.sirius.ui.properties/src/org/eclipse/sirius/ui/properties/internal/tabprovider/ViewDescriptionConverter.java
+++ b/incubation/org.eclipse.sirius.ui.properties/src/org/eclipse/sirius/ui/properties/internal/tabprovider/ViewDescriptionConverter.java
@@ -11,6 +11,7 @@
package org.eclipse.sirius.ui.properties.internal.tabprovider;
import java.util.HashMap;
+import java.util.LinkedHashSet;
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
@@ -38,6 +39,8 @@ import org.eclipse.eef.EEFViewDescription;
import org.eclipse.eef.EEFWidgetDescription;
import org.eclipse.eef.EEF_VALIDATION_SEVERITY_DESCRIPTION;
import org.eclipse.eef.EefFactory;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EPackage;
import org.eclipse.emf.ecore.util.EcoreUtil;
import org.eclipse.sirius.properties.ButtonDescription;
import org.eclipse.sirius.properties.CheckboxDescription;
@@ -54,6 +57,7 @@ import org.eclipse.sirius.properties.RadioDescription;
import org.eclipse.sirius.properties.SelectDescription;
import org.eclipse.sirius.properties.TextAreaDescription;
import org.eclipse.sirius.properties.TextDescription;
+import org.eclipse.sirius.properties.ViewExtensionDescription;
import org.eclipse.sirius.properties.WidgetDescription;
import org.eclipse.sirius.viewpoint.description.tool.InitialOperation;
import org.eclipse.sirius.viewpoint.description.validation.ERROR_LEVEL;
@@ -94,6 +98,17 @@ public class ViewDescriptionConverter {
public EEFViewDescription convert() {
EEFViewDescription view = EefFactory.eINSTANCE.createEEFViewDescription();
+ Set<EPackage> ePackages = new LinkedHashSet<>();
+ for (PageDescription pageDescription : pageDescriptions) {
+ EObject eContainer = pageDescription.eContainer();
+ if (eContainer instanceof ViewExtensionDescription) {
+ ViewExtensionDescription viewExtensionDescription = (ViewExtensionDescription) eContainer;
+ ePackages.addAll(viewExtensionDescription.getMetamodels());
+ }
+ }
+
+ view.getEPackages().addAll(ePackages);
+
// TODO Replace by the retrieval of the label from the label provider
view.setLabelExpression("feature:name");

Back to the top