13 files changed, 17 insertions, 34 deletions
diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties.generation/META-INF/MANIFEST.MF b/plugins/customization/org.eclipse.papyrus.customization.properties.generation/META-INF/MANIFEST.MF
index 3d493556815..399e16c3026 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties.generation/META-INF/MANIFEST.MF
+++ b/plugins/customization/org.eclipse.papyrus.customization.properties.generation/META-INF/MANIFEST.MF
@@ -30,7 +30,8 @@ Require-Bundle: org.eclipse.ui;bundle-version="3.6.1",
  org.eclipse.papyrus.infra.emf;bundle-version="0.9.0",
  org.eclipse.m2m.qvt.oml.project;bundle-version="3.1.0",
  org.eclipse.papyrus.customization.properties;bundle-version="0.9.0",
- org.eclipse.papyrus.infra.widgets;bundle-version="0.9.0"
+ org.eclipse.papyrus.infra.widgets;bundle-version="0.9.0",
+ org.eclipse.emf.facet.infra.browser.uicore;bundle-version="0.2.1"
 Bundle-Vendor: %Bundle-Vendor
 Bundle-Version: 0.9.0.qualifier
 Bundle-ManifestVersion: 2
diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties.generation/src-gen/org/eclipse/papyrus/customization/properties/generation/fieldselection/ContextElement.java b/plugins/customization/org.eclipse.papyrus.customization.properties.generation/src-gen/org/eclipse/papyrus/customization/properties/generation/fieldselection/ContextElement.java
index 38e5bc93e67..2d04fdc1017 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties.generation/src-gen/org/eclipse/papyrus/customization/properties/generation/fieldselection/ContextElement.java
+++ b/plugins/customization/org.eclipse.papyrus.customization.properties.generation/src-gen/org/eclipse/papyrus/customization/properties/generation/fieldselection/ContextElement.java
@@ -7,7 +7,6 @@
 package org.eclipse.papyrus.customization.properties.generation.fieldselection;
 
 import org.eclipse.emf.common.util.EList;
-
 import org.eclipse.emf.ecore.EObject;
 
 /**
diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties.generation/src-gen/org/eclipse/papyrus/customization/properties/generation/fieldselection/FieldSelection.java b/plugins/customization/org.eclipse.papyrus.customization.properties.generation/src-gen/org/eclipse/papyrus/customization/properties/generation/fieldselection/FieldSelection.java
index b3630e1b9d8..312b4c6ed36 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties.generation/src-gen/org/eclipse/papyrus/customization/properties/generation/fieldselection/FieldSelection.java
+++ b/plugins/customization/org.eclipse.papyrus.customization.properties.generation/src-gen/org/eclipse/papyrus/customization/properties/generation/fieldselection/FieldSelection.java
@@ -7,7 +7,6 @@
 package org.eclipse.papyrus.customization.properties.generation.fieldselection;
 
 import org.eclipse.emf.common.util.EList;
-
 import org.eclipse.emf.ecore.EObject;
 
 /**
diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties.generation/src-gen/org/eclipse/papyrus/customization/properties/generation/fieldselection/PropertyDefinition.java b/plugins/customization/org.eclipse.papyrus.customization.properties.generation/src-gen/org/eclipse/papyrus/customization/properties/generation/fieldselection/PropertyDefinition.java
index 6330076a5a2..eee0a1a686b 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties.generation/src-gen/org/eclipse/papyrus/customization/properties/generation/fieldselection/PropertyDefinition.java
+++ b/plugins/customization/org.eclipse.papyrus.customization.properties.generation/src-gen/org/eclipse/papyrus/customization/properties/generation/fieldselection/PropertyDefinition.java
@@ -7,7 +7,6 @@
 package org.eclipse.papyrus.customization.properties.generation.fieldselection;
 
 import org.eclipse.emf.ecore.EObject;
-
 import org.eclipse.papyrus.customization.properties.generation.wizard.widget.TernaryButton.State;
 
 /**
diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties.generation/src-gen/org/eclipse/papyrus/customization/properties/generation/fieldselection/impl/ContextElementImpl.java b/plugins/customization/org.eclipse.papyrus.customization.properties.generation/src-gen/org/eclipse/papyrus/customization/properties/generation/fieldselection/impl/ContextElementImpl.java
index f91a8fca215..b7784a2e275 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties.generation/src-gen/org/eclipse/papyrus/customization/properties/generation/fieldselection/impl/ContextElementImpl.java
+++ b/plugins/customization/org.eclipse.papyrus.customization.properties.generation/src-gen/org/eclipse/papyrus/customization/properties/generation/fieldselection/impl/ContextElementImpl.java
@@ -10,18 +10,13 @@ import java.util.Collection;
 
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.common.notify.NotificationChain;
-
 import org.eclipse.emf.common.util.EList;
-
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.InternalEObject;
-
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
 import org.eclipse.emf.ecore.impl.EObjectImpl;
-
 import org.eclipse.emf.ecore.util.EObjectContainmentEList;
 import org.eclipse.emf.ecore.util.InternalEList;
-
 import org.eclipse.papyrus.customization.properties.generation.fieldselection.ContextElement;
 import org.eclipse.papyrus.customization.properties.generation.fieldselection.FieldSelectionPackage;
 import org.eclipse.papyrus.customization.properties.generation.fieldselection.PropertyDefinition;
diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties.generation/src-gen/org/eclipse/papyrus/customization/properties/generation/fieldselection/impl/FieldSelectionFactoryImpl.java b/plugins/customization/org.eclipse.papyrus.customization.properties.generation/src-gen/org/eclipse/papyrus/customization/properties/generation/fieldselection/impl/FieldSelectionFactoryImpl.java
index dd585f82fd9..b50ec82357b 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties.generation/src-gen/org/eclipse/papyrus/customization/properties/generation/fieldselection/impl/FieldSelectionFactoryImpl.java
+++ b/plugins/customization/org.eclipse.papyrus.customization.properties.generation/src-gen/org/eclipse/papyrus/customization/properties/generation/fieldselection/impl/FieldSelectionFactoryImpl.java
@@ -10,12 +10,13 @@ import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EDataType;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.EPackage;
-
 import org.eclipse.emf.ecore.impl.EFactoryImpl;
-
 import org.eclipse.emf.ecore.plugin.EcorePlugin;
-
-import org.eclipse.papyrus.customization.properties.generation.fieldselection.*;
+import org.eclipse.papyrus.customization.properties.generation.fieldselection.ContextElement;
+import org.eclipse.papyrus.customization.properties.generation.fieldselection.FieldSelection;
+import org.eclipse.papyrus.customization.properties.generation.fieldselection.FieldSelectionFactory;
+import org.eclipse.papyrus.customization.properties.generation.fieldselection.FieldSelectionPackage;
+import org.eclipse.papyrus.customization.properties.generation.fieldselection.PropertyDefinition;
 import org.eclipse.papyrus.customization.properties.generation.wizard.widget.TernaryButton.State;
 
 
diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties.generation/src-gen/org/eclipse/papyrus/customization/properties/generation/fieldselection/impl/FieldSelectionImpl.java b/plugins/customization/org.eclipse.papyrus.customization.properties.generation/src-gen/org/eclipse/papyrus/customization/properties/generation/fieldselection/impl/FieldSelectionImpl.java
index c39f998ad00..d17bb45e72d 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties.generation/src-gen/org/eclipse/papyrus/customization/properties/generation/fieldselection/impl/FieldSelectionImpl.java
+++ b/plugins/customization/org.eclipse.papyrus.customization.properties.generation/src-gen/org/eclipse/papyrus/customization/properties/generation/fieldselection/impl/FieldSelectionImpl.java
@@ -9,17 +9,12 @@ package org.eclipse.papyrus.customization.properties.generation.fieldselection.i
 import java.util.Collection;
 
 import org.eclipse.emf.common.notify.NotificationChain;
-
 import org.eclipse.emf.common.util.EList;
-
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.InternalEObject;
-
 import org.eclipse.emf.ecore.impl.EObjectImpl;
-
 import org.eclipse.emf.ecore.util.EObjectContainmentEList;
 import org.eclipse.emf.ecore.util.InternalEList;
-
 import org.eclipse.papyrus.customization.properties.generation.fieldselection.ContextElement;
 import org.eclipse.papyrus.customization.properties.generation.fieldselection.FieldSelection;
 import org.eclipse.papyrus.customization.properties.generation.fieldselection.FieldSelectionPackage;
diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties.generation/src-gen/org/eclipse/papyrus/customization/properties/generation/fieldselection/impl/FieldSelectionPackageImpl.java b/plugins/customization/org.eclipse.papyrus.customization.properties.generation/src-gen/org/eclipse/papyrus/customization/properties/generation/fieldselection/impl/FieldSelectionPackageImpl.java
index 0cf0ebe5534..e7d47b0e850 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties.generation/src-gen/org/eclipse/papyrus/customization/properties/generation/fieldselection/impl/FieldSelectionPackageImpl.java
+++ b/plugins/customization/org.eclipse.papyrus.customization.properties.generation/src-gen/org/eclipse/papyrus/customization/properties/generation/fieldselection/impl/FieldSelectionPackageImpl.java
@@ -11,9 +11,7 @@ import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EDataType;
 import org.eclipse.emf.ecore.EPackage;
 import org.eclipse.emf.ecore.EReference;
-
 import org.eclipse.emf.ecore.impl.EPackageImpl;
-
 import org.eclipse.papyrus.customization.properties.generation.fieldselection.ContextElement;
 import org.eclipse.papyrus.customization.properties.generation.fieldselection.FieldSelection;
 import org.eclipse.papyrus.customization.properties.generation.fieldselection.FieldSelectionFactory;
diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties.generation/src-gen/org/eclipse/papyrus/customization/properties/generation/fieldselection/impl/PropertyDefinitionImpl.java b/plugins/customization/org.eclipse.papyrus.customization.properties.generation/src-gen/org/eclipse/papyrus/customization/properties/generation/fieldselection/impl/PropertyDefinitionImpl.java
index 26584120949..754e3aff874 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties.generation/src-gen/org/eclipse/papyrus/customization/properties/generation/fieldselection/impl/PropertyDefinitionImpl.java
+++ b/plugins/customization/org.eclipse.papyrus.customization.properties.generation/src-gen/org/eclipse/papyrus/customization/properties/generation/fieldselection/impl/PropertyDefinitionImpl.java
@@ -7,12 +7,9 @@
 package org.eclipse.papyrus.customization.properties.generation.fieldselection.impl;
 
 import org.eclipse.emf.common.notify.Notification;
-
 import org.eclipse.emf.ecore.EClass;
-
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
 import org.eclipse.emf.ecore.impl.EObjectImpl;
-
 import org.eclipse.papyrus.customization.properties.generation.fieldselection.FieldSelectionFactory;
 import org.eclipse.papyrus.customization.properties.generation.fieldselection.FieldSelectionPackage;
 import org.eclipse.papyrus.customization.properties.generation.fieldselection.PropertyDefinition;
diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties.generation/src-gen/org/eclipse/papyrus/customization/properties/generation/fieldselection/util/FieldSelectionAdapterFactory.java b/plugins/customization/org.eclipse.papyrus.customization.properties.generation/src-gen/org/eclipse/papyrus/customization/properties/generation/fieldselection/util/FieldSelectionAdapterFactory.java
index 7ccac8432a6..9204c24e039 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties.generation/src-gen/org/eclipse/papyrus/customization/properties/generation/fieldselection/util/FieldSelectionAdapterFactory.java
+++ b/plugins/customization/org.eclipse.papyrus.customization.properties.generation/src-gen/org/eclipse/papyrus/customization/properties/generation/fieldselection/util/FieldSelectionAdapterFactory.java
@@ -8,12 +8,12 @@ package org.eclipse.papyrus.customization.properties.generation.fieldselection.u
 
 import org.eclipse.emf.common.notify.Adapter;
 import org.eclipse.emf.common.notify.Notifier;
-
 import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
-
 import org.eclipse.emf.ecore.EObject;
-
-import org.eclipse.papyrus.customization.properties.generation.fieldselection.*;
+import org.eclipse.papyrus.customization.properties.generation.fieldselection.ContextElement;
+import org.eclipse.papyrus.customization.properties.generation.fieldselection.FieldSelection;
+import org.eclipse.papyrus.customization.properties.generation.fieldselection.FieldSelectionPackage;
+import org.eclipse.papyrus.customization.properties.generation.fieldselection.PropertyDefinition;
 
 /**
  * <!-- begin-user-doc -->
diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties.generation/src-gen/org/eclipse/papyrus/customization/properties/generation/fieldselection/util/FieldSelectionSwitch.java b/plugins/customization/org.eclipse.papyrus.customization.properties.generation/src-gen/org/eclipse/papyrus/customization/properties/generation/fieldselection/util/FieldSelectionSwitch.java
index a3ea0ddecc2..4eef47e2de0 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties.generation/src-gen/org/eclipse/papyrus/customization/properties/generation/fieldselection/util/FieldSelectionSwitch.java
+++ b/plugins/customization/org.eclipse.papyrus.customization.properties.generation/src-gen/org/eclipse/papyrus/customization/properties/generation/fieldselection/util/FieldSelectionSwitch.java
@@ -6,14 +6,13 @@
  */
 package org.eclipse.papyrus.customization.properties.generation.fieldselection.util;
 
-import java.util.List;
-
-import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EObject;
-
 import org.eclipse.emf.ecore.EPackage;
 import org.eclipse.emf.ecore.util.Switch;
-import org.eclipse.papyrus.customization.properties.generation.fieldselection.*;
+import org.eclipse.papyrus.customization.properties.generation.fieldselection.ContextElement;
+import org.eclipse.papyrus.customization.properties.generation.fieldselection.FieldSelection;
+import org.eclipse.papyrus.customization.properties.generation.fieldselection.FieldSelectionPackage;
+import org.eclipse.papyrus.customization.properties.generation.fieldselection.PropertyDefinition;
 
 /**
  * <!-- begin-user-doc -->
diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties.generation/src/org/eclipse/papyrus/customization/properties/generation/extensionpoint/GeneratorExtensionPoint.java b/plugins/customization/org.eclipse.papyrus.customization.properties.generation/src/org/eclipse/papyrus/customization/properties/generation/extensionpoint/GeneratorExtensionPoint.java
index 1b4211f390c..1a545e909d9 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties.generation/src/org/eclipse/papyrus/customization/properties/generation/extensionpoint/GeneratorExtensionPoint.java
+++ b/plugins/customization/org.eclipse.papyrus.customization.properties.generation/src/org/eclipse/papyrus/customization/properties/generation/extensionpoint/GeneratorExtensionPoint.java
@@ -13,10 +13,10 @@ package org.eclipse.papyrus.customization.properties.generation.extensionpoint;
 
 import org.eclipse.core.runtime.IConfigurationElement;
 import org.eclipse.core.runtime.Platform;
+import org.eclipse.papyrus.customization.properties.generation.Activator;
 import org.eclipse.papyrus.customization.properties.generation.generators.IGenerator;
 import org.eclipse.papyrus.customization.properties.generation.wizard.CreateContextWizard;
 import org.eclipse.papyrus.infra.tools.util.ClassLoaderHelper;
-import org.eclipse.papyrus.views.properties.Activator;
 
 /**
  * Handles the extension point org.eclipse.papyrus.customization.properties.generation.generator
diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties.generation/src/org/eclipse/papyrus/customization/properties/generation/extensionpoint/LayoutExtensionPoint.java b/plugins/customization/org.eclipse.papyrus.customization.properties.generation/src/org/eclipse/papyrus/customization/properties/generation/extensionpoint/LayoutExtensionPoint.java
index 62dd568d2df..c0eb24f54b4 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties.generation/src/org/eclipse/papyrus/customization/properties/generation/extensionpoint/LayoutExtensionPoint.java
+++ b/plugins/customization/org.eclipse.papyrus.customization.properties.generation/src/org/eclipse/papyrus/customization/properties/generation/extensionpoint/LayoutExtensionPoint.java
@@ -13,10 +13,10 @@ package org.eclipse.papyrus.customization.properties.generation.extensionpoint;
 
 import org.eclipse.core.runtime.IConfigurationElement;
 import org.eclipse.core.runtime.Platform;
+import org.eclipse.papyrus.customization.properties.generation.Activator;
 import org.eclipse.papyrus.customization.properties.generation.layout.ILayoutGenerator;
 import org.eclipse.papyrus.customization.properties.generation.wizard.CreateContextWizard;
 import org.eclipse.papyrus.infra.tools.util.ClassLoaderHelper;
-import org.eclipse.papyrus.views.properties.Activator;
 
 /**
  * Handles the extension point org.eclipse.papyrus.customization.properties.generation.layout