Bug 485220: [Architecture] Provide a more modular architecture

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

Move UI-dependent APIs from the org.eclipse.papyrus.infra.emf
bundle to a new org.eclipse.papyrus.infra.ui.emf bundle.  Accordingly
move tests into a new org.eclipse.papyrus.infra.ui.emf.tests bundle.

Now that we have an UI EMF bundle, move the editor-page advices from
the infra.ui bundle into it, which is a more appropriate home for them.

One UI dependency is removed by reordering of code in the
EMFHelper::getEObject(Object) API:

* the EMF Facet tree elements are once again IAdaptables, providing
  their encapsulated EObjects or EReferences as adapters. So, the
  case handling IAdaptable is moved ahead of the test for is-an-EObject
  because these tree elements are also EObjects but are not interesting
  in themselves

Also, the dialog-settings for the EMF Facet customization manager are
moved into the infra.ui.emf bundle, as is the lazy initialization of
the manager from those settings.  Clients are refactored to get the
customization manager from this new bundle (via a new ProviderHelper
API) to ensure this lazy initialization.

Various UI-dependent ServiceUtilsForXyz classes that were in the
infra.emf bundle but had nothing to do with EMF are moved into the
infra.ui bundle.

UI-dependent classes from the org.eclipse.papyrus.infra.emf.readonly
bundle are moved into the org.eclipse.papyrus.infra.ui.emf, also.
These include extraction of the editor reload listener from the
ReadOnlyManager class by means of a new general-purpose
IReadOnlyManagerProcessor OSGi service interface.

Tests all still pass (inasmuch as they do in the nightly master builds).

Change-Id: Ieb0993b2ed1a7a49890d3471c7b42bc4f218fec6

14 files changed, 27 insertions, 129 deletions

diff --git a/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/META-INF/MANIFEST.MF b/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/META-INF/MANIFEST.MF
index 2845497ce6d..1c3ea1c36da 100644
--- a/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/META-INF/MANIFEST.MF
+++ b/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/META-INF/MANIFEST.MF
@@ -54,7 +54,8 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.papyrus.emf.facet.util.emf.core;bundle-version="1.2.0",
  org.eclipse.papyrus.infra.viewpoints.policy;bundle-version="1.2.0",
  org.eclipse.papyrus.infra.ui;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.core.sashwindows.di;bundle-version="1.2.0"
+ org.eclipse.papyrus.infra.core.sashwindows.di;bundle-version="1.2.0",
+ org.eclipse.papyrus.infra.ui.emf;bundle-version="1.2.0"
 Bundle-Vendor: %providerName
 Bundle-ActivationPolicy: lazy
 Bundle-Version: 1.2.0.qualifier
diff --git a/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/plugin.xml b/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/plugin.xml
index c1d38f6b4ba..f21882a6c8f 100644
--- a/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/plugin.xml
+++ b/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/plugin.xml
@@ -38,7 +38,7 @@
       </viewerActionBinding>
    </extension>
    <extension point="org.eclipse.ui.navigator.navigatorContent">
-      <navigatorContent activeByDefault="false" contentProvider="org.eclipse.papyrus.infra.emf.providers.MoDiscoContentProvider" id="org.eclipse.papyrus.views.modelexplorer.navigatorContent" labelProvider="org.eclipse.jface.viewers.LabelProvider" name="Model Contents" priority="lowest">
+      <navigatorContent activeByDefault="false" contentProvider="org.eclipse.papyrus.infra.ui.emf.providers.MoDiscoContentProvider" id="org.eclipse.papyrus.views.modelexplorer.navigatorContent" labelProvider="org.eclipse.jface.viewers.LabelProvider" name="Model Contents" priority="lowest">
          <triggerPoints>
             <or>
                <instanceof value="org.eclipse.emf.ecore.EObject">
diff --git a/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/src/org/eclipse/papyrus/views/modelexplorer/Activator.java b/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/src/org/eclipse/papyrus/views/modelexplorer/Activator.java
index 7d4ef2d0232..bd3850b16e9 100644
--- a/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/src/org/eclipse/papyrus/views/modelexplorer/Activator.java
+++ b/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/src/org/eclipse/papyrus/views/modelexplorer/Activator.java
@@ -1,6 +1,5 @@
 /*****************************************************************************

- * Copyright (c) 2010 CEA LIST.

- *

+ * Copyright (c) 2010, 2016 CEA LIST, Christian W. Damus, and others.

  *

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

@@ -9,6 +8,7 @@
  *

  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

+ *  Christian W. Damus - bug 485220

  *

  *****************************************************************************/

 package org.eclipse.papyrus.views.modelexplorer;

@@ -25,13 +25,13 @@ import org.eclipse.emf.edit.EMFEditPlugin;
 import org.eclipse.jface.resource.ImageDescriptor;

 import org.eclipse.papyrus.emf.facet.custom.core.ICustomizationManager;

 import org.eclipse.papyrus.infra.core.log.LogHelper;

+import org.eclipse.papyrus.infra.ui.emf.utils.ProviderHelper;

 import org.eclipse.ui.plugin.AbstractUIPlugin;

 import org.osgi.framework.BundleContext;

 

 /**

  * The activator class controls the plug-in life cycle

  */

-@SuppressWarnings("restriction")

 public class Activator extends AbstractUIPlugin {

 

 	/** The plug-in ID */

@@ -47,15 +47,6 @@ public class Activator extends AbstractUIPlugin {
 	public Activator() {

 	}

 

-	private ICustomizationManager fCustomizationManager;

-

-	/*

-	 * (non-Javadoc)

-	 *

-	 * @see

-	 * org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext

-	 * )

-	 */

 	@Override

 	public void start(BundleContext context) throws Exception {

 		super.start(context);

@@ -87,13 +78,6 @@ public class Activator extends AbstractUIPlugin {
 		return ImageDescriptor.createFromURL(uri);

 	}

 

-	/*

-	 * (non-Javadoc)

-	 *

-	 * @see

-	 * org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext

-	 * )

-	 */

 	@Override

 	public void stop(BundleContext context) throws Exception {

 		plugin = null;

@@ -114,100 +98,9 @@ public class Activator extends AbstractUIPlugin {
 	 * @return the customization manager in charge to adapt element in modisco

 	 */

 	public ICustomizationManager getCustomizationManager() {

-		return org.eclipse.papyrus.infra.emf.Activator.getDefault().getCustomizationManager();

-	}

-

-	private void init(final ICustomizationManager customizationManager) {

-		// the appearance can be customized here:

-

-		// customizationManager.setShowDerivedLinks(true);

-		//

-		// try {

-		//

-		// // load customizations defined as default through the customization

-		// // extension

-		// List<MetamodelView> registryDefaultCustomizations = CustomizationsCatalog.getInstance().getRegistryDefaultCustomizations();

-		// for(MetamodelView metamodelView : registryDefaultCustomizations) {

-		// customizationManager.registerCustomization(metamodelView);

-		// }

-		// customizationManager.loadCustomizations();

-		// loadFacetsForCustomizations(registryDefaultCustomizations, customizationManager);

-		//

-		// } catch (Throwable e) {

-		// Activator.getDefault().getLog().log(new Status(IStatus.ERROR, Activator.PLUGIN_ID, "Error initializing customizations", e)); //$NON-NLS-1$

-		// }

+		return ProviderHelper.getCustomizationManager();

 	}

 

-	// /**

-	// * load the facets

-	// *

-	// * @param customizations

-	// * list of customization

-	// * @param customizationManager

-	// * the Customization Manager

-	// */

-	// protected void loadFacetsForCustomizations(final List<MetamodelView> customizations, final CustomizationManager customizationManager) {

-	// final Set<Facet> referencedFacets = new HashSet<Facet>();

-	// final Collection<FacetSet> facetSets = FacetSetCatalog.getSingleton().getAllFacetSets();

-	//

-	// for(MetamodelView customization : customizations) {

-	// String metamodelURI = customization.getMetamodelURI();

-	// // find customized FacetSet

-	// FacetSet customizedFacetSet = null;

-	// if(metamodelURI != null) {

-	// for(FacetSet facetSet : facetSets) {

-	// if(metamodelURI.equals(facetSet.getNsURI())) {

-	// customizedFacetSet = facetSet;

-	// break;

-	// }

-	// }

-	// }

-	// if(customizedFacetSet == null) {

-	// continue;

-	// }

-	//

-	// // find customized Facets

-	// EList<TypeView> types = customization.getTypes();

-	// for(TypeView typeView : types) {

-	// String metaclassName = typeView.getMetaclassName();

-	// Facet facet = findFacetWithFullyQualifiedName(metaclassName, customizedFacetSet);

-	// if(facet != null) {

-	// referencedFacets.add(facet);

-	// } else {

-	// Activator.log.warn(NLS.bind(Messages.BrowserActionBarContributor_missingRequiredFacet, new Object[]{ metaclassName, customizedFacetSet.getName(), customization.getName() }));

-	// }

-	// }

-	//

-	// for(Facet referencedFacet : referencedFacets) {

-	// customizationManager.loadFacet(referencedFacet);

-	// }

-	// }

-	//

-	// //

-	// // for modified facets

-	// // customizationManager.getInstancesForMetaclasses().buildDerivationTree();

-	// // customizationManager.getAppearanceConfiguration().touch();

-	// // customizationManager.refreshDelayed(true);

-	// }

-

-	// /**

-	// * fin a facet from

-	// *

-	// * @param metaclassName

-	// * @param customizedFacetSet

-	// * @return

-	// */

-	// private Facet findFacetWithFullyQualifiedName(final String metaclassName, final FacetSet customizedFacetSet) {

-	// EList<Facet> facets = customizedFacetSet.getFacets();

-	// for(Facet facet : facets) {

-	// String facetName = getMetaclassQualifiedName(facet);

-	// if(metaclassName.equals(facetName)) {

-	// return facet;

-	// }

-	// }

-	// return null;

-	// }

-

 	/**

 	 * @return the qualified name of the given metaclass

 	 */

diff --git a/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/src/org/eclipse/papyrus/views/modelexplorer/ModelExplorerView.java b/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/src/org/eclipse/papyrus/views/modelexplorer/ModelExplorerView.java
index 61daef45ed0..fe72adfb35c 100644
--- a/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/src/org/eclipse/papyrus/views/modelexplorer/ModelExplorerView.java
+++ b/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/src/org/eclipse/papyrus/views/modelexplorer/ModelExplorerView.java
@@ -61,7 +61,6 @@ import org.eclipse.papyrus.infra.core.services.ServiceException;
 import org.eclipse.papyrus.infra.core.services.ServicesRegistry;
 import org.eclipse.papyrus.infra.core.utils.AdapterUtils;
 import org.eclipse.papyrus.infra.core.utils.ServiceUtils;
-import org.eclipse.papyrus.infra.emf.providers.SemanticFromModelExplorer;
 import org.eclipse.papyrus.infra.emf.utils.EMFHelper;
 import org.eclipse.papyrus.infra.services.labelprovider.service.LabelProviderService;
 import org.eclipse.papyrus.infra.services.navigation.service.NavigableElement;
@@ -72,6 +71,7 @@ import org.eclipse.papyrus.infra.ui.editor.IReloadableEditor;
 import org.eclipse.papyrus.infra.ui.editor.reload.EditorReloadAdapter;
 import org.eclipse.papyrus.infra.ui.editor.reload.EditorReloadEvent;
 import org.eclipse.papyrus.infra.ui.editor.reload.TreeViewerContext;
+import org.eclipse.papyrus.infra.ui.emf.providers.SemanticFromModelExplorer;
 import org.eclipse.papyrus.infra.ui.lifecycleevents.IEditorInputChangedListener;
 import org.eclipse.papyrus.infra.ui.lifecycleevents.ISaveAndDirtyService;
 import org.eclipse.papyrus.infra.widgets.util.IRevealSemanticElement;
diff --git a/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/src/org/eclipse/papyrus/views/modelexplorer/handler/AbstractCommandHandler.java b/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/src/org/eclipse/papyrus/views/modelexplorer/handler/AbstractCommandHandler.java
index a88413906bc..6e89d41b6f9 100644
--- a/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/src/org/eclipse/papyrus/views/modelexplorer/handler/AbstractCommandHandler.java
+++ b/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/src/org/eclipse/papyrus/views/modelexplorer/handler/AbstractCommandHandler.java
@@ -31,7 +31,7 @@ import org.eclipse.jface.viewers.ISelection;
 import org.eclipse.jface.viewers.IStructuredSelection;

 import org.eclipse.papyrus.infra.core.services.ServiceException;

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

-import org.eclipse.papyrus.infra.emf.utils.ServiceUtilsForHandlers;

+import org.eclipse.papyrus.infra.ui.util.ServiceUtilsForHandlers;

 import org.eclipse.papyrus.views.modelexplorer.Activator;

 import org.eclipse.ui.handlers.HandlerUtil;

 

@@ -56,7 +56,7 @@ public abstract class AbstractCommandHandler extends AbstractModelExplorerHandle
 	 * Returns the command to execute (to be implemented

 	 * in children implementing this class)

 	 *

-	 * @return the command to execute

+	 * &#64;return the command to execute

 	 *

 	 * </pre>

 	 */

@@ -140,6 +140,7 @@ public abstract class AbstractCommandHandler extends AbstractModelExplorerHandle
 	 * @return null

 	 * @throws ExecutionException

 	 */

+	@Override

 	public Object execute(ExecutionEvent event) throws ExecutionException {

 		try {

 			ISelection selection = HandlerUtil.getCurrentSelection(event);

diff --git a/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/src/org/eclipse/papyrus/views/modelexplorer/handler/CloseHandler.java b/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/src/org/eclipse/papyrus/views/modelexplorer/handler/CloseHandler.java
index f1aecd3601a..17d5aa9ba23 100644
--- a/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/src/org/eclipse/papyrus/views/modelexplorer/handler/CloseHandler.java
+++ b/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/src/org/eclipse/papyrus/views/modelexplorer/handler/CloseHandler.java
@@ -25,7 +25,7 @@ import org.eclipse.emf.ecore.EObject;
 import org.eclipse.papyrus.infra.core.sashwindows.di.service.IPageManager;

 import org.eclipse.papyrus.infra.core.services.ServiceException;

 import org.eclipse.papyrus.infra.core.services.ServicesRegistry;

-import org.eclipse.papyrus.infra.emf.utils.ServiceUtilsForHandlers;

+import org.eclipse.papyrus.infra.ui.util.ServiceUtilsForHandlers;

 

 /**

  * This handler allows to Close Diagrams and Tables

@@ -60,6 +60,7 @@ public class CloseHandler extends AbstractModelExplorerHandler implements IExecu
 	 * @return

 	 * @throws ExecutionException

 	 */

+	@Override

 	public Object execute(ExecutionEvent event) throws ExecutionException {

 

 		final IPageManager pageMngr;

@@ -106,6 +107,7 @@ public class CloseHandler extends AbstractModelExplorerHandler implements IExecu
 	 * @param data

 	 * @throws CoreException

 	 */

+	@Override

 	public void setInitializationData(IConfigurationElement config, String propertyName, Object data) throws CoreException {

 		if (data instanceof Hashtable && this.parameterID != null) {

 			this.parameter = (String) ((Hashtable) data).get(this.parameterID);

diff --git a/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/src/org/eclipse/papyrus/views/modelexplorer/handler/LoadBrowserCustomization.java b/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/src/org/eclipse/papyrus/views/modelexplorer/handler/LoadBrowserCustomization.java
index d45b9051c64..21409f56a11 100644
--- a/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/src/org/eclipse/papyrus/views/modelexplorer/handler/LoadBrowserCustomization.java
+++ b/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/src/org/eclipse/papyrus/views/modelexplorer/handler/LoadBrowserCustomization.java
@@ -113,7 +113,7 @@ public class LoadBrowserCustomization extends AbstractHandler {
 

 

 				// Save the current state of the customizations

-				org.eclipse.papyrus.infra.emf.Activator.getDefault().saveCustomizationManagerState();

+				org.eclipse.papyrus.infra.ui.internal.emf.Activator.getDefault().saveCustomizationManagerState();

 			}

 

 			// // load customizations defined as default through the customization

diff --git a/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/src/org/eclipse/papyrus/views/modelexplorer/provider/PropertyTester.java b/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/src/org/eclipse/papyrus/views/modelexplorer/provider/PropertyTester.java
index f4bee137ce2..3183863f25e 100644
--- a/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/src/org/eclipse/papyrus/views/modelexplorer/provider/PropertyTester.java
+++ b/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/src/org/eclipse/papyrus/views/modelexplorer/provider/PropertyTester.java
@@ -27,7 +27,7 @@ import org.eclipse.papyrus.infra.core.sasheditor.di.contentprovider.IOpenable;
 import org.eclipse.papyrus.infra.core.sashwindows.di.service.IPageManager;

 import org.eclipse.papyrus.infra.core.services.ServiceException;

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

-import org.eclipse.papyrus.infra.emf.utils.ServiceUtilsForSelection;

+import org.eclipse.papyrus.infra.ui.util.ServiceUtilsForSelection;

 import org.eclipse.papyrus.views.modelexplorer.ModelExplorerPageBookView;

 import org.eclipse.ui.IWorkbenchPart;

 

diff --git a/plugins/views/properties/org.eclipse.papyrus.views.properties/META-INF/MANIFEST.MF b/plugins/views/properties/org.eclipse.papyrus.views.properties/META-INF/MANIFEST.MF
index ce85d396c2a..402d12d42a1 100644
--- a/plugins/views/properties/org.eclipse.papyrus.views.properties/META-INF/MANIFEST.MF
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties/META-INF/MANIFEST.MF
@@ -48,7 +48,8 @@ Require-Bundle: org.eclipse.emf;bundle-version="2.6.0",
  org.eclipse.papyrus.infra.widgets.toolbox;bundle-version="1.2.0",

  org.eclipse.papyrus.emf.facet.custom.ui;bundle-version="1.2.0",

  org.eclipse.papyrus.emf.facet.custom.core;bundle-version="1.2.0",

- org.eclipse.xwt;bundle-version="1.1.0"

+ org.eclipse.xwt;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.ui.emf;bundle-version="1.2.0"

 Bundle-Vendor: %Bundle-Vendor

 Bundle-Version: 1.2.0.qualifier

 Eclipse-BuddyPolicy: dependent

diff --git a/plugins/views/properties/org.eclipse.papyrus.views.properties/plugin.xml b/plugins/views/properties/org.eclipse.papyrus.views.properties/plugin.xml
index b379cd1e9f5..13fcc5e210f 100644
--- a/plugins/views/properties/org.eclipse.papyrus.views.properties/plugin.xml
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties/plugin.xml
@@ -62,7 +62,7 @@
    <extension

          point="org.eclipse.papyrus.views.properties.labelprovider">

       <labelProvider

-            labelProvider="org.eclipse.papyrus.infra.emf.providers.EMFFilteredLabelProvider"

+            labelProvider="org.eclipse.papyrus.infra.ui.emf.providers.EMFFilteredLabelProvider"

             priority="100">

       </labelProvider>

    </extension>

diff --git a/plugins/views/properties/org.eclipse.papyrus.views.properties/src/org/eclipse/papyrus/views/properties/creation/EcorePropertyEditorFactory.java b/plugins/views/properties/org.eclipse.papyrus.views.properties/src/org/eclipse/papyrus/views/properties/creation/EcorePropertyEditorFactory.java
index 78fb0a1245d..0f482e07f9e 100644
--- a/plugins/views/properties/org.eclipse.papyrus.views.properties/src/org/eclipse/papyrus/views/properties/creation/EcorePropertyEditorFactory.java
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties/src/org/eclipse/papyrus/views/properties/creation/EcorePropertyEditorFactory.java
@@ -35,9 +35,9 @@ import org.eclipse.emf.ecore.resource.ResourceSet;
 import org.eclipse.emf.ecore.util.EcoreUtil;

 import org.eclipse.jface.viewers.ILabelProvider;

 import org.eclipse.jface.window.Window;

-import org.eclipse.papyrus.infra.emf.dialog.NestedEditingDialogContext;

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

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

+import org.eclipse.papyrus.infra.ui.emf.dialog.NestedEditingDialogContext;

 import org.eclipse.papyrus.infra.widgets.providers.IStaticContentProvider;

 import org.eclipse.papyrus.views.properties.Activator;

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

diff --git a/plugins/views/properties/org.eclipse.papyrus.views.properties/src/org/eclipse/papyrus/views/properties/modelelement/AnnotationModelElement.java b/plugins/views/properties/org.eclipse.papyrus.views.properties/src/org/eclipse/papyrus/views/properties/modelelement/AnnotationModelElement.java
index d595d851b1d..f87493d778e 100644
--- a/plugins/views/properties/org.eclipse.papyrus.views.properties/src/org/eclipse/papyrus/views/properties/modelelement/AnnotationModelElement.java
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties/src/org/eclipse/papyrus/views/properties/modelelement/AnnotationModelElement.java
@@ -16,8 +16,8 @@ package org.eclipse.papyrus.views.properties.modelelement;
 import org.eclipse.core.databinding.observable.IObservable;

 import org.eclipse.emf.ecore.EModelElement;

 import org.eclipse.emf.edit.domain.EditingDomain;

-import org.eclipse.papyrus.infra.emf.databinding.AnnotationObservableValue;

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

+import org.eclipse.papyrus.infra.ui.emf.databinding.AnnotationObservableValue;

 

 /**

  * A ModelElement for handling EAnnotations

diff --git a/plugins/views/properties/org.eclipse.papyrus.views.properties/src/org/eclipse/papyrus/views/properties/modelelement/EMFModelElement.java b/plugins/views/properties/org.eclipse.papyrus.views.properties/src/org/eclipse/papyrus/views/properties/modelelement/EMFModelElement.java
index 6e5daf70755..d0cb3a43985 100644
--- a/plugins/views/properties/org.eclipse.papyrus.views.properties/src/org/eclipse/papyrus/views/properties/modelelement/EMFModelElement.java
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties/src/org/eclipse/papyrus/views/properties/modelelement/EMFModelElement.java
@@ -28,15 +28,15 @@ import org.eclipse.emf.ecore.EStructuralFeature;
 import org.eclipse.emf.edit.domain.EditingDomain;

 import org.eclipse.jface.viewers.ILabelProvider;

 import org.eclipse.papyrus.infra.core.services.ServiceException;

-import org.eclipse.papyrus.infra.emf.databinding.EMFObservableList;

-import org.eclipse.papyrus.infra.emf.databinding.EMFObservableValue;

-import org.eclipse.papyrus.infra.emf.dialog.NestedEditingDialogContext;

-import org.eclipse.papyrus.infra.emf.providers.EMFContentProvider;

-import org.eclipse.papyrus.infra.emf.providers.EMFLabelProvider;

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

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

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

 import org.eclipse.papyrus.infra.services.labelprovider.service.LabelProviderService;

+import org.eclipse.papyrus.infra.ui.emf.databinding.EMFObservableList;

+import org.eclipse.papyrus.infra.ui.emf.databinding.EMFObservableValue;

+import org.eclipse.papyrus.infra.ui.emf.dialog.NestedEditingDialogContext;

+import org.eclipse.papyrus.infra.ui.emf.providers.EMFContentProvider;

+import org.eclipse.papyrus.infra.ui.emf.providers.EMFLabelProvider;

 import org.eclipse.papyrus.infra.widgets.creation.ReferenceValueFactory;

 import org.eclipse.papyrus.infra.widgets.providers.IStaticContentProvider;

 import org.eclipse.papyrus.views.properties.Activator;

diff --git a/plugins/views/properties/org.eclipse.papyrus.views.properties/src/org/eclipse/papyrus/views/properties/providers/ContainerContentProvider.java b/plugins/views/properties/org.eclipse.papyrus.views.properties/src/org/eclipse/papyrus/views/properties/providers/ContainerContentProvider.java
index 5f29614e03d..353173db0cb 100644
--- a/plugins/views/properties/org.eclipse.papyrus.views.properties/src/org/eclipse/papyrus/views/properties/providers/ContainerContentProvider.java
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties/src/org/eclipse/papyrus/views/properties/providers/ContainerContentProvider.java
@@ -15,8 +15,8 @@ import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EObject;

 import org.eclipse.emf.ecore.EReference;

 import org.eclipse.jface.viewers.Viewer;

-import org.eclipse.papyrus.infra.emf.providers.strategy.SemanticEMFContentProvider;

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

+import org.eclipse.papyrus.infra.ui.emf.providers.strategy.SemanticEMFContentProvider;

 

 public class ContainerContentProvider extends SemanticEMFContentProvider {