Bug 485220: [Architecture] Provide a more modular architecture (& builds) for Papyrus

https://bugs.eclipse.org/bugs/show_bug.cgi?id=485220

Refactor the Properties Model bundles into the Infra Layer.

The *.views.properties.model[.edit,.editor] bundles are renamed as
*.infra.properties[.edit,.editor].  The packages within are
correspondingly renamed.  To support upgrade installation, special p2
update metadata tells the p2 engine how these bundles have been renamed,
ensuring proper replacement of the old *.views.properties.model* bundles,
because otherwise the clash of EMF model registrations would cause
run-time errors.

The *.views.properties.environment extension point is moved to
*.infra.properties.environments.

The *.views.properties.context extension point has the <context>
element moved to a new *.infra.properties.contexts point.  The
<preferencePageBinding> element remains.

JUnit tests pass, at least inasmuch as they pass in the nightly builds.

Change-Id: I6445808f8eb1144b08c0cd5f0a487d1bad229a4c

14 files changed, 71 insertions, 71 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 8a736422f41..c0d8e21fed1 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
@@ -7,11 +7,11 @@ Export-Package: org.eclipse.papyrus.customization.properties.generation,
 Require-Bundle: org.eclipse.ui;bundle-version="3.6.1",

  org.eclipse.osgi;bundle-version="3.6.1",

  org.eclipse.core.runtime;bundle-version="3.6.0",

- org.eclipse.papyrus.views.properties.model;bundle-version="1.2.0",

+ org.eclipse.papyrus.infra.properties;bundle-version="1.2.0",

  org.eclipse.m2m.qvt.oml;bundle-version="3.0.1",

  org.eclipse.m2m.qvt.oml.common;bundle-version="2.1.0",

  org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0",

- org.eclipse.papyrus.views.properties.model.edit;bundle-version="1.2.0",

+ org.eclipse.papyrus.infra.properties.edit;bundle-version="1.2.0",

  org.eclipse.emf.common.ui;bundle-version="2.6.0",

  org.eclipse.core.resources;bundle-version="3.6.0",

  org.eclipse.uml2.uml;bundle-version="3.1.1",

diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties.generation/model/LayoutEuristic.ecore b/plugins/customization/org.eclipse.papyrus.customization.properties.generation/model/LayoutEuristic.ecore
index 3aef013fa8c..e693c82623c 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties.generation/model/LayoutEuristic.ecore
+++ b/plugins/customization/org.eclipse.papyrus.customization.properties.generation/model/LayoutEuristic.ecore
@@ -5,15 +5,15 @@
     nsURI="http://www.eclipse.org/papyrus/properties/layoutEuristic" nsPrefix="layout">

   <eClassifiers xsi:type="ecore:EClass" name="Config">

     <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="defaultTextEditor" eType="ecore:EClass platform:/plugin/org.eclipse.papyrus.views.properties.model/Model/Properties.ecore#//environment/PropertyEditorType"/>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="defaultBooleanEditor" eType="ecore:EClass platform:/plugin/org.eclipse.papyrus.views.properties.model/Model/Properties.ecore#//environment/PropertyEditorType"/>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="defaultIntegerEditor" eType="ecore:EClass platform:/plugin/org.eclipse.papyrus.views.properties.model/Model/Properties.ecore#//environment/PropertyEditorType"/>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="defaultEnumEditor" eType="ecore:EClass platform:/plugin/org.eclipse.papyrus.views.properties.model/Model/Properties.ecore#//environment/PropertyEditorType"/>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="defaultTextEditor" eType="ecore:EClass platform:/plugin/org.eclipse.papyrus.infra.properties/Model/Properties.ecore#//environment/PropertyEditorType"/>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="defaultBooleanEditor" eType="ecore:EClass platform:/plugin/org.eclipse.papyrus.infra.properties/Model/Properties.ecore#//environment/PropertyEditorType"/>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="defaultIntegerEditor" eType="ecore:EClass platform:/plugin/org.eclipse.papyrus.infra.properties/Model/Properties.ecore#//environment/PropertyEditorType"/>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="defaultEnumEditor" eType="ecore:EClass platform:/plugin/org.eclipse.papyrus.infra.properties/Model/Properties.ecore#//environment/PropertyEditorType"/>

     <eStructuralFeatures xsi:type="ecore:EReference" name="defaultReferenceEditor"

-        eType="ecore:EClass platform:/plugin/org.eclipse.papyrus.views.properties.model/Model/Properties.ecore#//environment/PropertyEditorType"/>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="defaultSectionLayout" eType="ecore:EClass platform:/plugin/org.eclipse.papyrus.views.properties.model/Model/Properties.ecore#//environment/LayoutType"/>

+        eType="ecore:EClass platform:/plugin/org.eclipse.papyrus.infra.properties/Model/Properties.ecore#//environment/PropertyEditorType"/>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="defaultSectionLayout" eType="ecore:EClass platform:/plugin/org.eclipse.papyrus.infra.properties/Model/Properties.ecore#//environment/LayoutType"/>

     <eStructuralFeatures xsi:type="ecore:EReference" name="defaultModelElementFactory"

-        eType="ecore:EClass platform:/plugin/org.eclipse.papyrus.views.properties.model/Model/Properties.ecore#//environment/ModelElementFactoryDescriptor"/>

+        eType="ecore:EClass platform:/plugin/org.eclipse.papyrus.infra.properties/Model/Properties.ecore#//environment/ModelElementFactoryDescriptor"/>

     <eStructuralFeatures xsi:type="ecore:EAttribute" name="layoutKind" eType="#//LayoutKind"/>

   </eClassifiers>

   <eClassifiers xsi:type="ecore:EEnum" name="LayoutKind">

diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties.generation/src/org/eclipse/papyrus/customization/properties/generation/generators/AbstractQVTGenerator.java b/plugins/customization/org.eclipse.papyrus.customization.properties.generation/src/org/eclipse/papyrus/customization/properties/generation/generators/AbstractQVTGenerator.java
index 1adfbbb1bd0..7e664840de4 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties.generation/src/org/eclipse/papyrus/customization/properties/generation/generators/AbstractQVTGenerator.java
+++ b/plugins/customization/org.eclipse.papyrus.customization.properties.generation/src/org/eclipse/papyrus/customization/properties/generation/generators/AbstractQVTGenerator.java
@@ -38,7 +38,7 @@ import org.eclipse.m2m.qvt.oml.ModelExtent;
 import org.eclipse.m2m.qvt.oml.TransformationExecutor;

 import org.eclipse.papyrus.customization.properties.generation.Activator;

 import org.eclipse.papyrus.infra.emf.utils.EMFHelper;

-import org.eclipse.papyrus.views.properties.contexts.Context;

+import org.eclipse.papyrus.infra.properties.contexts.Context;

 import org.eclipse.swt.widgets.Event;

 import org.eclipse.swt.widgets.Listener;

 

diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties.generation/src/org/eclipse/papyrus/customization/properties/generation/generators/EcoreGenerator.java b/plugins/customization/org.eclipse.papyrus.customization.properties.generation/src/org/eclipse/papyrus/customization/properties/generation/generators/EcoreGenerator.java
index e0a44895752..c9d1b229e7a 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties.generation/src/org/eclipse/papyrus/customization/properties/generation/generators/EcoreGenerator.java
+++ b/plugins/customization/org.eclipse.papyrus.customization.properties.generation/src/org/eclipse/papyrus/customization/properties/generation/generators/EcoreGenerator.java
@@ -39,8 +39,8 @@ import org.eclipse.m2m.qvt.oml.ModelExtent;
 import org.eclipse.papyrus.customization.properties.generation.Activator;

 import org.eclipse.papyrus.customization.properties.generation.messages.Messages;

 import org.eclipse.papyrus.customization.properties.generation.wizard.widget.FileChooser;

-import org.eclipse.papyrus.views.properties.contexts.DataContextElement;

-import org.eclipse.papyrus.views.properties.contexts.Property;

+import org.eclipse.papyrus.infra.properties.contexts.DataContextElement;

+import org.eclipse.papyrus.infra.properties.contexts.Property;

 import org.eclipse.papyrus.views.properties.root.PropertiesRoot;

 import org.eclipse.papyrus.views.properties.runtime.ConfigurationManager;

 import org.eclipse.swt.SWT;

diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties.generation/src/org/eclipse/papyrus/customization/properties/generation/generators/EditContextGenerator.java b/plugins/customization/org.eclipse.papyrus.customization.properties.generation/src/org/eclipse/papyrus/customization/properties/generation/generators/EditContextGenerator.java
index 52e9a1047f3..7c23a341749 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties.generation/src/org/eclipse/papyrus/customization/properties/generation/generators/EditContextGenerator.java
+++ b/plugins/customization/org.eclipse.papyrus.customization.properties.generation/src/org/eclipse/papyrus/customization/properties/generation/generators/EditContextGenerator.java
@@ -20,10 +20,10 @@ import java.util.List;
 import org.eclipse.core.databinding.observable.value.IObservableValue;

 import org.eclipse.emf.common.util.URI;

 import org.eclipse.papyrus.customization.properties.generation.messages.Messages;

-import org.eclipse.papyrus.views.properties.contexts.Context;

-import org.eclipse.papyrus.views.properties.contexts.DataContextElement;

-import org.eclipse.papyrus.views.properties.contexts.Property;

-import org.eclipse.papyrus.views.properties.contexts.View;

+import org.eclipse.papyrus.infra.properties.contexts.Context;

+import org.eclipse.papyrus.infra.properties.contexts.DataContextElement;

+import org.eclipse.papyrus.infra.properties.contexts.Property;

+import org.eclipse.papyrus.infra.properties.contexts.View;

 import org.eclipse.swt.widgets.Composite;

 import org.eclipse.swt.widgets.Listener;

 

diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties.generation/src/org/eclipse/papyrus/customization/properties/generation/generators/IGenerator.java b/plugins/customization/org.eclipse.papyrus.customization.properties.generation/src/org/eclipse/papyrus/customization/properties/generation/generators/IGenerator.java
index 5d71b90e995..683ab418956 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties.generation/src/org/eclipse/papyrus/customization/properties/generation/generators/IGenerator.java
+++ b/plugins/customization/org.eclipse.papyrus.customization.properties.generation/src/org/eclipse/papyrus/customization/properties/generation/generators/IGenerator.java
@@ -18,9 +18,9 @@ import java.util.List;
 

 import org.eclipse.core.databinding.observable.value.IObservableValue;

 import org.eclipse.emf.common.util.URI;

-import org.eclipse.papyrus.views.properties.contexts.Context;

-import org.eclipse.papyrus.views.properties.contexts.DataContextElement;

-import org.eclipse.papyrus.views.properties.contexts.Property;

+import org.eclipse.papyrus.infra.properties.contexts.Context;

+import org.eclipse.papyrus.infra.properties.contexts.DataContextElement;

+import org.eclipse.papyrus.infra.properties.contexts.Property;

 import org.eclipse.swt.widgets.Composite;

 import org.eclipse.swt.widgets.Listener;

 

diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties.generation/src/org/eclipse/papyrus/customization/properties/generation/generators/ProfileGenerator.java b/plugins/customization/org.eclipse.papyrus.customization.properties.generation/src/org/eclipse/papyrus/customization/properties/generation/generators/ProfileGenerator.java
index 736253e9af7..92066951805 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties.generation/src/org/eclipse/papyrus/customization/properties/generation/generators/ProfileGenerator.java
+++ b/plugins/customization/org.eclipse.papyrus.customization.properties.generation/src/org/eclipse/papyrus/customization/properties/generation/generators/ProfileGenerator.java
@@ -31,9 +31,9 @@ import org.eclipse.m2m.qvt.oml.ModelExtent;
 import org.eclipse.papyrus.customization.properties.generation.Activator;

 import org.eclipse.papyrus.customization.properties.generation.messages.Messages;

 import org.eclipse.papyrus.customization.properties.generation.wizard.widget.FileChooser;

-import org.eclipse.papyrus.views.properties.contexts.Context;

-import org.eclipse.papyrus.views.properties.contexts.DataContextElement;

-import org.eclipse.papyrus.views.properties.contexts.Property;

+import org.eclipse.papyrus.infra.properties.contexts.Context;

+import org.eclipse.papyrus.infra.properties.contexts.DataContextElement;

+import org.eclipse.papyrus.infra.properties.contexts.Property;

 import org.eclipse.papyrus.views.properties.root.PropertiesRoot;

 import org.eclipse.papyrus.views.properties.runtime.ConfigurationManager;

 import org.eclipse.swt.SWT;

diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties.generation/src/org/eclipse/papyrus/customization/properties/generation/layout/ILayoutGenerator.java b/plugins/customization/org.eclipse.papyrus.customization.properties.generation/src/org/eclipse/papyrus/customization/properties/generation/layout/ILayoutGenerator.java
index 3868477323e..b20c6034afc 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties.generation/src/org/eclipse/papyrus/customization/properties/generation/layout/ILayoutGenerator.java
+++ b/plugins/customization/org.eclipse.papyrus.customization.properties.generation/src/org/eclipse/papyrus/customization/properties/generation/layout/ILayoutGenerator.java
@@ -14,9 +14,9 @@ package org.eclipse.papyrus.customization.properties.generation.layout;
 import java.util.List;

 

 import org.eclipse.papyrus.customization.properties.generation.generators.IGenerator;

-import org.eclipse.papyrus.views.properties.contexts.Section;

-import org.eclipse.papyrus.views.properties.contexts.View;

-import org.eclipse.papyrus.views.properties.ui.PropertyEditor;

+import org.eclipse.papyrus.infra.properties.contexts.Section;

+import org.eclipse.papyrus.infra.properties.contexts.View;

+import org.eclipse.papyrus.infra.properties.ui.PropertyEditor;

 

 /**

  * An interface for defining Layout generators.

diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties.generation/src/org/eclipse/papyrus/customization/properties/generation/layout/ProfileWithDatatypes.java b/plugins/customization/org.eclipse.papyrus.customization.properties.generation/src/org/eclipse/papyrus/customization/properties/generation/layout/ProfileWithDatatypes.java
index 7e9a5a42f40..cf236ea2259 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties.generation/src/org/eclipse/papyrus/customization/properties/generation/layout/ProfileWithDatatypes.java
+++ b/plugins/customization/org.eclipse.papyrus.customization.properties.generation/src/org/eclipse/papyrus/customization/properties/generation/layout/ProfileWithDatatypes.java
@@ -16,23 +16,23 @@ import java.util.List;
 import org.eclipse.papyrus.customization.properties.generation.Activator;

 import org.eclipse.papyrus.customization.properties.generation.generators.IGenerator;

 import org.eclipse.papyrus.customization.properties.generation.generators.ProfileGenerator;

-import org.eclipse.papyrus.views.properties.contexts.Context;

-import org.eclipse.papyrus.views.properties.contexts.DataContextElement;

-import org.eclipse.papyrus.views.properties.contexts.DataContextPackage;

-import org.eclipse.papyrus.views.properties.contexts.DataContextRoot;

-import org.eclipse.papyrus.views.properties.contexts.Property;

-import org.eclipse.papyrus.views.properties.contexts.View;

-import org.eclipse.papyrus.views.properties.environment.CompositeWidgetType;

-import org.eclipse.papyrus.views.properties.environment.Environment;

-import org.eclipse.papyrus.views.properties.environment.LayoutType;

-import org.eclipse.papyrus.views.properties.environment.PropertyEditorType;

-import org.eclipse.papyrus.views.properties.environment.Type;

+import org.eclipse.papyrus.infra.properties.contexts.Context;

+import org.eclipse.papyrus.infra.properties.contexts.DataContextElement;

+import org.eclipse.papyrus.infra.properties.contexts.DataContextPackage;

+import org.eclipse.papyrus.infra.properties.contexts.DataContextRoot;

+import org.eclipse.papyrus.infra.properties.contexts.Property;

+import org.eclipse.papyrus.infra.properties.contexts.View;

+import org.eclipse.papyrus.infra.properties.environment.CompositeWidgetType;

+import org.eclipse.papyrus.infra.properties.environment.Environment;

+import org.eclipse.papyrus.infra.properties.environment.LayoutType;

+import org.eclipse.papyrus.infra.properties.environment.PropertyEditorType;

+import org.eclipse.papyrus.infra.properties.environment.Type;

+import org.eclipse.papyrus.infra.properties.ui.CompositeWidget;

+import org.eclipse.papyrus.infra.properties.ui.Layout;

+import org.eclipse.papyrus.infra.properties.ui.PropertyEditor;

+import org.eclipse.papyrus.infra.properties.ui.UiFactory;

+import org.eclipse.papyrus.infra.properties.ui.ValueAttribute;

 import org.eclipse.papyrus.views.properties.runtime.ConfigurationManager;

-import org.eclipse.papyrus.views.properties.ui.CompositeWidget;

-import org.eclipse.papyrus.views.properties.ui.Layout;

-import org.eclipse.papyrus.views.properties.ui.PropertyEditor;

-import org.eclipse.papyrus.views.properties.ui.UiFactory;

-import org.eclipse.papyrus.views.properties.ui.ValueAttribute;

 import org.eclipse.papyrus.views.properties.util.PropertiesUtil;

 import org.eclipse.uml2.uml.Package;

 import org.eclipse.uml2.uml.UMLPackage;

diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties.generation/src/org/eclipse/papyrus/customization/properties/generation/layout/StandardLayoutGenerator.java b/plugins/customization/org.eclipse.papyrus.customization.properties.generation/src/org/eclipse/papyrus/customization/properties/generation/layout/StandardLayoutGenerator.java
index 225a0f40ae5..0eac05ca8e8 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties.generation/src/org/eclipse/papyrus/customization/properties/generation/layout/StandardLayoutGenerator.java
+++ b/plugins/customization/org.eclipse.papyrus.customization.properties.generation/src/org/eclipse/papyrus/customization/properties/generation/layout/StandardLayoutGenerator.java
@@ -25,20 +25,20 @@ import org.eclipse.emf.ecore.resource.Resource;
 import org.eclipse.papyrus.customization.properties.generation.Activator;

 import org.eclipse.papyrus.customization.properties.generation.generators.IGenerator;

 import org.eclipse.papyrus.customization.properties.generation.messages.Messages;

-import org.eclipse.papyrus.views.properties.contexts.ContextsFactory;

-import org.eclipse.papyrus.views.properties.contexts.Property;

-import org.eclipse.papyrus.views.properties.contexts.Section;

-import org.eclipse.papyrus.views.properties.contexts.View;

-import org.eclipse.papyrus.views.properties.environment.CompositeWidgetType;

-import org.eclipse.papyrus.views.properties.environment.LayoutType;

-import org.eclipse.papyrus.views.properties.environment.Namespace;

-import org.eclipse.papyrus.views.properties.environment.Type;

+import org.eclipse.papyrus.infra.properties.contexts.ContextsFactory;

+import org.eclipse.papyrus.infra.properties.contexts.Property;

+import org.eclipse.papyrus.infra.properties.contexts.Section;

+import org.eclipse.papyrus.infra.properties.contexts.View;

+import org.eclipse.papyrus.infra.properties.environment.CompositeWidgetType;

+import org.eclipse.papyrus.infra.properties.environment.LayoutType;

+import org.eclipse.papyrus.infra.properties.environment.Namespace;

+import org.eclipse.papyrus.infra.properties.environment.Type;

+import org.eclipse.papyrus.infra.properties.ui.CompositeWidget;

+import org.eclipse.papyrus.infra.properties.ui.Layout;

+import org.eclipse.papyrus.infra.properties.ui.PropertyEditor;

+import org.eclipse.papyrus.infra.properties.ui.UiFactory;

+import org.eclipse.papyrus.infra.properties.ui.ValueAttribute;

 import org.eclipse.papyrus.views.properties.runtime.ConfigurationManager;

-import org.eclipse.papyrus.views.properties.ui.CompositeWidget;

-import org.eclipse.papyrus.views.properties.ui.Layout;

-import org.eclipse.papyrus.views.properties.ui.PropertyEditor;

-import org.eclipse.papyrus.views.properties.ui.UiFactory;

-import org.eclipse.papyrus.views.properties.ui.ValueAttribute;

 import org.eclipse.papyrus.views.properties.util.PropertiesUtil;

 

 /**

diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties.generation/src/org/eclipse/papyrus/customization/properties/generation/providers/DataContextPropertiesContentProvider.java b/plugins/customization/org.eclipse.papyrus.customization.properties.generation/src/org/eclipse/papyrus/customization/properties/generation/providers/DataContextPropertiesContentProvider.java
index 4a5a3b35626..fb0de1742e3 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties.generation/src/org/eclipse/papyrus/customization/properties/generation/providers/DataContextPropertiesContentProvider.java
+++ b/plugins/customization/org.eclipse.papyrus.customization.properties.generation/src/org/eclipse/papyrus/customization/properties/generation/providers/DataContextPropertiesContentProvider.java
@@ -14,7 +14,7 @@ package org.eclipse.papyrus.customization.properties.generation.providers;
 import java.util.List;

 

 import org.eclipse.papyrus.customization.properties.providers.PropertyContentProvider;

-import org.eclipse.papyrus.views.properties.contexts.Context;

+import org.eclipse.papyrus.infra.properties.contexts.Context;

 

 

 public class DataContextPropertiesContentProvider extends PropertyContentProvider {

diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties.generation/src/org/eclipse/papyrus/customization/properties/generation/providers/DataContextPropertiesLabelProvider.java b/plugins/customization/org.eclipse.papyrus.customization.properties.generation/src/org/eclipse/papyrus/customization/properties/generation/providers/DataContextPropertiesLabelProvider.java
index 1ea93fa026c..db9154adf96 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties.generation/src/org/eclipse/papyrus/customization/properties/generation/providers/DataContextPropertiesLabelProvider.java
+++ b/plugins/customization/org.eclipse.papyrus.customization.properties.generation/src/org/eclipse/papyrus/customization/properties/generation/providers/DataContextPropertiesLabelProvider.java
@@ -20,7 +20,7 @@ import org.eclipse.jface.viewers.ViewerCell;
 import org.eclipse.papyrus.customization.properties.generation.wizard.SelectFieldsPage;

 import org.eclipse.papyrus.customization.properties.providers.ContextLabelProvider;

 import org.eclipse.papyrus.infra.emf.utils.EMFHelper;

-import org.eclipse.papyrus.views.properties.contexts.Property;

+import org.eclipse.papyrus.infra.properties.contexts.Property;

 import org.eclipse.swt.graphics.Image;

 

 public class DataContextPropertiesLabelProvider extends StyledCellLabelProvider {

diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties.generation/src/org/eclipse/papyrus/customization/properties/generation/wizard/CreateContextWizard.java b/plugins/customization/org.eclipse.papyrus.customization.properties.generation/src/org/eclipse/papyrus/customization/properties/generation/wizard/CreateContextWizard.java
index bbb75165918..061fa453c94 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties.generation/src/org/eclipse/papyrus/customization/properties/generation/wizard/CreateContextWizard.java
+++ b/plugins/customization/org.eclipse.papyrus.customization.properties.generation/src/org/eclipse/papyrus/customization/properties/generation/wizard/CreateContextWizard.java
@@ -37,17 +37,17 @@ import org.eclipse.papyrus.customization.properties.generation.generators.IGener
 import org.eclipse.papyrus.customization.properties.generation.layout.ILayoutGenerator;

 import org.eclipse.papyrus.customization.properties.generation.messages.Messages;

 import org.eclipse.papyrus.customization.properties.generation.wizard.widget.TernaryButton;

-import org.eclipse.papyrus.views.properties.contexts.Context;

-import org.eclipse.papyrus.views.properties.contexts.ContextsFactory;

-import org.eclipse.papyrus.views.properties.contexts.DataContextElement;

-import org.eclipse.papyrus.views.properties.contexts.Property;

-import org.eclipse.papyrus.views.properties.contexts.Section;

-import org.eclipse.papyrus.views.properties.contexts.Tab;

-import org.eclipse.papyrus.views.properties.contexts.View;

+import org.eclipse.papyrus.infra.properties.contexts.Context;

+import org.eclipse.papyrus.infra.properties.contexts.ContextsFactory;

+import org.eclipse.papyrus.infra.properties.contexts.DataContextElement;

+import org.eclipse.papyrus.infra.properties.contexts.Property;

+import org.eclipse.papyrus.infra.properties.contexts.Section;

+import org.eclipse.papyrus.infra.properties.contexts.Tab;

+import org.eclipse.papyrus.infra.properties.contexts.View;

+import org.eclipse.papyrus.infra.properties.ui.PropertyEditor;

+import org.eclipse.papyrus.infra.properties.ui.UiFactory;

+import org.eclipse.papyrus.infra.properties.ui.ValueAttribute;

 import org.eclipse.papyrus.views.properties.runtime.ConfigurationManager;

-import org.eclipse.papyrus.views.properties.ui.PropertyEditor;

-import org.eclipse.papyrus.views.properties.ui.UiFactory;

-import org.eclipse.papyrus.views.properties.ui.ValueAttribute;

 import org.eclipse.ui.INewWizard;

 import org.eclipse.ui.IWorkbench;

 

diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties.generation/src/org/eclipse/papyrus/customization/properties/generation/wizard/SelectFieldsPage.java b/plugins/customization/org.eclipse.papyrus.customization.properties.generation/src/org/eclipse/papyrus/customization/properties/generation/wizard/SelectFieldsPage.java
index 5c8d2bf814f..631eacbb11c 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties.generation/src/org/eclipse/papyrus/customization/properties/generation/wizard/SelectFieldsPage.java
+++ b/plugins/customization/org.eclipse.papyrus.customization.properties.generation/src/org/eclipse/papyrus/customization/properties/generation/wizard/SelectFieldsPage.java
@@ -32,11 +32,11 @@ import org.eclipse.papyrus.customization.properties.generation.providers.DataCon
 import org.eclipse.papyrus.customization.properties.generation.providers.DataContextPropertiesLabelProvider;

 import org.eclipse.papyrus.customization.properties.generation.wizard.widget.TernaryButton;

 import org.eclipse.papyrus.infra.emf.utils.EMFHelper;

-import org.eclipse.papyrus.views.properties.contexts.Context;

-import org.eclipse.papyrus.views.properties.contexts.DataContextElement;

-import org.eclipse.papyrus.views.properties.contexts.DataContextPackage;

-import org.eclipse.papyrus.views.properties.contexts.DataContextRoot;

-import org.eclipse.papyrus.views.properties.contexts.Property;

+import org.eclipse.papyrus.infra.properties.contexts.Context;

+import org.eclipse.papyrus.infra.properties.contexts.DataContextElement;

+import org.eclipse.papyrus.infra.properties.contexts.DataContextPackage;

+import org.eclipse.papyrus.infra.properties.contexts.DataContextRoot;

+import org.eclipse.papyrus.infra.properties.contexts.Property;

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.custom.TreeEditor;

 import org.eclipse.swt.layout.GridData;