386118: [EMF Facet] Papyrus should progressively support EMF Facet 0.2

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

13 files changed, 355 insertions, 352 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 94dae150f57..f119e8bc100 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
@@ -44,7 +44,8 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.0.0",

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

  org.eclipse.papyrus.emf.facet.custom.metamodel,

- org.eclipse.papyrus.emf.facet.util.ui;bundle-version="0.4.0"

+ org.eclipse.papyrus.emf.facet.util.ui;bundle-version="0.4.0",

+ org.eclipse.papyrus.emf.facet.query.java.core

 Bundle-Vendor: %providerName

 Bundle-ActivationPolicy: lazy

 Bundle-Version: 1.0.0.qualifier

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 abb1d8bb337..a6c82a96464 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
@@ -15,24 +15,15 @@ package org.eclipse.papyrus.views.modelexplorer;
 

 import java.net.URL;

 import java.util.ArrayList;

-import java.util.Collection;

-import java.util.HashSet;

-import java.util.List;

-import java.util.Set;

 

 import org.eclipse.core.runtime.FileLocator;

 import org.eclipse.core.runtime.IPath;

-import org.eclipse.core.runtime.IStatus;

 import org.eclipse.core.runtime.Path;

-import org.eclipse.core.runtime.Status;

-import org.eclipse.emf.common.util.EList;

 import org.eclipse.emf.ecore.EClassifier;

 import org.eclipse.emf.ecore.EPackage;

 import org.eclipse.emf.edit.EMFEditPlugin;

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

-import org.eclipse.emf.facet.infra.browser.Messages;

 import org.eclipse.jface.resource.ImageDescriptor;

-import org.eclipse.osgi.util.NLS;

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

 import org.eclipse.ui.plugin.AbstractUIPlugin;

 import org.osgi.framework.BundleContext;

diff --git a/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/src/org/eclipse/papyrus/views/modelexplorer/DecoratingLabelProviderWTooltips.java b/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/src/org/eclipse/papyrus/views/modelexplorer/DecoratingLabelProviderWTooltips.java
index 858f3da6f5b..c87912ecd2c 100644
--- a/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/src/org/eclipse/papyrus/views/modelexplorer/DecoratingLabelProviderWTooltips.java
+++ b/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/src/org/eclipse/papyrus/views/modelexplorer/DecoratingLabelProviderWTooltips.java
@@ -23,7 +23,7 @@ import java.util.Observer;
 

 import org.eclipse.core.runtime.IAdaptable;

 import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.facet.infra.browser.uicore.internal.model.LinkItem;

+import org.eclipse.emf.facet.custom.metamodel.v0_2_0.internal.treeproxy.EReferenceTreeElement;

 import org.eclipse.jface.viewers.ILabelProvider;

 import org.eclipse.jface.viewers.LabelProviderChangedEvent;

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

@@ -116,7 +116,7 @@ public class DecoratingLabelProviderWTooltips extends NavigatorDecoratingLabelPr
 

 		//Set the adapter decoration with position as indicated by decoration (from decoration service)

 		if(element != null) {

-			if(element instanceof EObject || element instanceof LinkItem // fix for bug 391676

+			if(element instanceof EObject || element instanceof EReferenceTreeElement // fix for bug 391676

 				|| (element instanceof IAdaptable && ((IAdaptable)element).getAdapter(EObject.class) != null)) {

 				List<IPapyrusDecoration> decorations = decorationService.getDecorations(element, true);

 				if(decorations != null) {

diff --git a/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/src/org/eclipse/papyrus/views/modelexplorer/LinkNodeAdapterFactory.java b/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/src/org/eclipse/papyrus/views/modelexplorer/LinkNodeAdapterFactory.java
index a48dafd5514..c078e701185 100644
--- a/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/src/org/eclipse/papyrus/views/modelexplorer/LinkNodeAdapterFactory.java
+++ b/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/src/org/eclipse/papyrus/views/modelexplorer/LinkNodeAdapterFactory.java
@@ -12,7 +12,7 @@ package org.eclipse.papyrus.views.modelexplorer;
 

 import org.eclipse.core.runtime.IAdapterFactory;

 import org.eclipse.emf.ecore.EReference;

-import org.eclipse.emf.facet.infra.browser.uicore.internal.model.LinkItem;

+import org.eclipse.emf.facet.custom.metamodel.v0_2_0.internal.treeproxy.EReferenceTreeElement;

 

 /**

  * This factory returns a LinkNode instance for any adapter instancing LinkItem or EReference

@@ -24,7 +24,7 @@ public class LinkNodeAdapterFactory implements IAdapterFactory {
 

 	public Object getAdapter(Object adaptableObject, Class adapterType) {

 		if(adapterType == LinkNode.class) {

-			if(adaptableObject instanceof LinkItem || adaptableObject instanceof EReference) {

+			if(adaptableObject instanceof EReferenceTreeElement || adaptableObject instanceof EReference) {

 				return LinkNode.LinkNodeInstance;

 			}

 		}

diff --git a/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/src/org/eclipse/papyrus/views/modelexplorer/dialog/PapyrusLoadBrowserCustomizationDialog.java b/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/src/org/eclipse/papyrus/views/modelexplorer/dialog/PapyrusLoadBrowserCustomizationDialog.java
index 88fcbfaf584..75f9c2e4f4a 100644
--- a/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/src/org/eclipse/papyrus/views/modelexplorer/dialog/PapyrusLoadBrowserCustomizationDialog.java
+++ b/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/src/org/eclipse/papyrus/views/modelexplorer/dialog/PapyrusLoadBrowserCustomizationDialog.java
@@ -20,11 +20,11 @@ import java.util.List;
 import java.util.Set;

 

 import org.eclipse.emf.ecore.EPackage;

-import org.eclipse.emf.facet.infra.browser.custom.MetamodelView;

-import org.eclipse.emf.facet.infra.browser.custom.core.CustomizationsCatalog;

-import org.eclipse.emf.facet.infra.browser.uicore.internal.util.ImageProvider;

-import org.eclipse.emf.facet.infra.common.core.internal.utils.ModelUtils;

-import org.eclipse.emf.facet.infra.facet.FacetSet;

+//import org.eclipse.emf.facet.infra.browser.custom.MetamodelView;

+//import org.eclipse.emf.facet.infra.browser.custom.core.CustomizationsCatalog;

+//import org.eclipse.emf.facet.infra.browser.uicore.internal.util.ImageProvider;

+//import org.eclipse.emf.facet.infra.common.core.internal.utils.ModelUtils;

+//import org.eclipse.emf.facet.infra.facet.FacetSet;

 import org.eclipse.jface.dialogs.IDialogConstants;

 import org.eclipse.jface.viewers.ILabelProvider;

 import org.eclipse.jface.viewers.LabelProvider;

@@ -54,237 +54,242 @@ import org.eclipse.swt.widgets.Shell;
 @SuppressWarnings({ "deprecation", "restriction" })

 public class PapyrusLoadBrowserCustomizationDialog extends MultipleValueSelectorDialog {

 

-	protected final Collection<EPackage> ePackages;

-

-	/**

-	 * Creates a new dialog to select the EMF Facet uiCustom (Browser customizations) to apply

-	 * 

-	 * @param parentShell

-	 *        The parent shell for this dialog

-	 * @param initialSelection

-	 *        The list of browser customization currently applied

-	 * @param ePackages

-	 *        The list of EPackages used to filter the Browser Customizations to display. Only compatible browser customizations will be displayed to

-	 *        the user.

-	 *        This filter is only graphical (i.e. customizations which do not match these EPackages might still be returned by this dialog)

-	 * @param manager

-	 *        The Customization

-	 */

-	public PapyrusLoadBrowserCustomizationDialog(Shell parentShell, List<MetamodelView> initialSelection, Collection<EPackage> ePackages) {

-		this(parentShell, getElementSelector(ePackages), initialSelection, ePackages);

-	}

-

-	protected PapyrusLoadBrowserCustomizationDialog(Shell parentShell, IElementSelector selector, List<MetamodelView> initialSelection, Collection<EPackage> ePackages) {

+	public PapyrusLoadBrowserCustomizationDialog(Shell parentShell, IElementSelector selector) {

 		super(parentShell, selector);

-

-		this.ePackages = ePackages;

-

-		setInitialElementSelections(initialSelection);

-

-		setOrdered(true);

-		setLabelProvider(createLabelProvider());

-		setTitle("Select browser customizations");

+		// TODO Auto-generated constructor stub

 	}

 

-	/**

-	 * {@inheritDoc}

-	 * 

-	 * Adds the EMF Facet UICustom icon to the dialog

-	 */

-	@Override

-	protected void configureShell(Shell shell) {

-		super.configureShell(shell);

-		shell.setImage(ImageProvider.getInstance().getUiCustomIcon());

-	}

-

-	/**

-	 * The IElementSelector used for the left panel of this dialog. This is a simple ReferenceSelector for available UICustoms

-	 * 

-	 * @param ePackages

-	 *        The EPackages used to filter the compatible UICustom to display to the user

-	 * @return

-	 */

-	protected static IElementSelector getElementSelector(final Collection<EPackage> ePackages) {

-		ReferenceSelector selector = new ReferenceSelector(true) {

-

-			@Override

-			public void createControls(Composite parent) {

-				super.createControls(parent);

-				installCompatibleCustomizationViewerFilter(treeViewer, ePackages);

-			}

-		};

-

-		List<MetamodelView> registryAllCustomizations = CustomizationsCatalog.getInstance().getRegistryCustomizations();

-

-		IStaticContentProvider semanticProvider = new StaticContentProvider(registryAllCustomizations.toArray());

-		IStaticContentProvider filteredProvider = new FilteredContentProvider(semanticProvider);

-

-		selector.setContentProvider(filteredProvider);

-		selector.setLabelProvider(createLabelProvider());

-

-		return selector;

-	}

-

-	/**

-	 * The ID of the "Restore defaults" button

-	 */

-	public static final int RESTORE_ID = IDialogConstants.CLIENT_ID + 1;

-

-	/**

-	 * {@inheritDoc}

-	 * 

-	 * Adds a "restore defaults" button

-	 */

-	@Override

-	protected void createButtonsForButtonBar(Composite parent) {

-		createButton(parent, RESTORE_ID, "Restore defaults", false);

-		super.createButtonsForButtonBar(parent);

-	}

-

-	/**

-	 * {@inheritDoc}

-	 * 

-	 * Adds support for the Restore Default button/action

-	 */

-	@Override

-	protected void buttonPressed(int buttonId) {

-		if(buttonId == RESTORE_ID) {

-			restorePressed();

-		} else {

-			super.buttonPressed(buttonId);

-		}

-	}

-

-	/**

-	 * {@inheritDoc}

-	 * 

-	 * Installs a filter for the compatible UICustom models to display to the user

-	 */

-	@Override

-	public void create() {

-		super.create();

-		installCompatibleCustomizationViewerFilter(selectedElementsViewer, ePackages);

-		getShell().pack();

-	}

-

-	/**

-	 * Install the compatible UICustom filter to the given viewer

-	 * 

-	 * @param viewer

-	 *        The viewer to filter

-	 * @param ePackages

-	 *        The UICustom models will be displayed if they are compatible with one of these EPackages

-	 */

-	protected static void installCompatibleCustomizationViewerFilter(StructuredViewer viewer, Collection<EPackage> ePackages) {

-		List<ViewerFilter> currentFilters = ListHelper.asList(viewer.getFilters());

-		currentFilters.add(createCompatibleCustomizationViewerFilter(ePackages));

-		viewer.setFilters(currentFilters.toArray(new ViewerFilter[currentFilters.size()]));

-	}

-

-	/**

-	 * Creates a filter for the compatible UICustom

-	 * 

-	 * @param ePackages

-	 *        The UICustom models will be displayed if they are compatible with one of these EPackages

-	 */

-	protected static ViewerFilter createCompatibleCustomizationViewerFilter(Collection<EPackage> ePackages) {

-		final Set<String> ePackageURIs = new HashSet<String>();

-

-		for(EPackage ePackage : ePackages) {

-			ePackageURIs.add(ePackage.getNsURI());

-			final Set<EPackage> referencedPackages = ModelUtils.computeReferencedPackages(ePackage);

-			for(EPackage referencedEPackage : referencedPackages) {

-				ePackageURIs.add(referencedEPackage.getNsURI());

-			}

-		}

-

-		return new ViewerFilter() {

-

-			@Override

-			public boolean select(Viewer viewer, Object parentElement, Object element) {

-				if(element instanceof MetamodelView) {

-					MetamodelView customization = (MetamodelView)element;

-

-					String nsURI = customization.getMetamodelURI();

-

-					if(ePackageURIs.contains(nsURI)) {

-						return true;

-					}

-

-					EPackage ePackage = EPackage.Registry.INSTANCE.getEPackage(nsURI);

-					while(ePackage != null) {

-						if(ePackageURIs.contains(ePackage.getNsURI())) {

-							return true;

-						}

-

-						// allow customizations on Facets

-						if(ePackage instanceof FacetSet) {

-							FacetSet facetSet = (FacetSet)ePackage;

-							ePackage = facetSet.getExtendedPackage();

-						} else {

-							// allow customizations on sub-packages

-							ePackage = ePackage.getESuperPackage();

-						}

-					}

-

-					return false;

-				}

-

-				return true;

-			}

-

-		};

-	}

-

-	/**

-	 * The "restore defaults" action

-	 */

-	protected void restorePressed() {

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

-		Object[] filteredCustomizations = defaultCustomizations.toArray();

-

-		removeAllAction();

-		addElements(filteredCustomizations);

-		selector.setSelectedElements(allElements.toArray());

-	}

-

-	/**

-	 * Returns the list of selected customizations (including the ones hidden by the compatible EPackage filter)

-	 * 

-	 * @return

-	 */

-	public List<MetamodelView> getSelectedCustomizations() {

-		Object[] result = super.getResult();

-		List<MetamodelView> customizations = new ArrayList<MetamodelView>();

-		for(Object element : result) {

-			if(element instanceof MetamodelView) {

-				customizations.add((MetamodelView)element);

-			}

-		}

-

-		return customizations;

-	}

-

-	//Copied from {@link org.eclipse.emf.facet.infra.browser.custom.ui.dialogs.LoadCustomizationsDialog#createLabelProvider()}

-	/**

-	 * Creates a LabelProvider for EMF Facet MetamodelView elements

-	 * 

-	 * @return the label provider for the Dialog

-	 */

-	protected static ILabelProvider createLabelProvider() {

-		return new LabelProvider() {

-

-			@Override

-			public String getText(final Object element) {

-				final MetamodelView metamodelView = (MetamodelView)element;

-				return metamodelView.getName();

-			}

-

-			@Override

-			public Image getImage(final Object element) {

-				return ImageProvider.getInstance().getUiCustomIcon();

-			}

-		};

-	}

+///**	protected final Collection<EPackage> ePackages;

+//

+//	/**

+//	 * Creates a new dialog to select the EMF Facet uiCustom (Browser customizations) to apply

+//	 * 

+//	 * @param parentShell

+//	 *        The parent shell for this dialog

+//	 * @param initialSelection

+//	 *        The list of browser customization currently applied

+//	 * @param ePackages

+//	 *        The list of EPackages used to filter the Browser Customizations to display. Only compatible browser customizations will be displayed to

+//	 *        the user.

+//	 *        This filter is only graphical (i.e. customizations which do not match these EPackages might still be returned by this dialog)

+//	 * @param manager

+//	 *        The Customization

+//	 */

+//	public PapyrusLoadBrowserCustomizationDialog(Shell parentShell, List<MetamodelView> initialSelection, Collection<EPackage> ePackages) {

+//		this(parentShell, getElementSelector(ePackages), initialSelection, ePackages);

+//	}

+//

+//	protected PapyrusLoadBrowserCustomizationDialog(Shell parentShell, IElementSelector selector, List<MetamodelView> initialSelection, Collection<EPackage> ePackages) {

+//		super(parentShell, selector);

+//

+//		this.ePackages = ePackages;

+//

+//		setInitialElementSelections(initialSelection);

+//

+//		setOrdered(true);

+//		setLabelProvider(createLabelProvider());

+//		setTitle("Select browser customizations");

+//	}

+//

+//	/**

+//	 * {@inheritDoc}

+//	 * 

+//	 * Adds the EMF Facet UICustom icon to the dialog

+//	 */

+//	@Override

+//	protected void configureShell(Shell shell) {

+//		super.configureShell(shell);

+//		shell.setImage(ImageProvider.getInstance().getUiCustomIcon());

+//	}

+//

+//	/**

+//	 * The IElementSelector used for the left panel of this dialog. This is a simple ReferenceSelector for available UICustoms

+//	 * 

+//	 * @param ePackages

+//	 *        The EPackages used to filter the compatible UICustom to display to the user

+//	 * @return

+//	 */

+//	protected static IElementSelector getElementSelector(final Collection<EPackage> ePackages) {

+//		ReferenceSelector selector = new ReferenceSelector(true) {

+//

+//			@Override

+//			public void createControls(Composite parent) {

+//				super.createControls(parent);

+//				installCompatibleCustomizationViewerFilter(treeViewer, ePackages);

+//			}

+//		};

+//

+//		List<MetamodelView> registryAllCustomizations = CustomizationsCatalog.getInstance().getRegistryCustomizations();

+//

+//		IStaticContentProvider semanticProvider = new StaticContentProvider(registryAllCustomizations.toArray());

+//		IStaticContentProvider filteredProvider = new FilteredContentProvider(semanticProvider);

+//

+//		selector.setContentProvider(filteredProvider);

+//		selector.setLabelProvider(createLabelProvider());

+//

+//		return selector;

+//	}

+//

+//	/**

+//	 * The ID of the "Restore defaults" button

+//	 */

+//	public static final int RESTORE_ID = IDialogConstants.CLIENT_ID + 1;

+//

+//	/**

+//	 * {@inheritDoc}

+//	 * 

+//	 * Adds a "restore defaults" button

+//	 */

+//	@Override

+//	protected void createButtonsForButtonBar(Composite parent) {

+//		createButton(parent, RESTORE_ID, "Restore defaults", false);

+//		super.createButtonsForButtonBar(parent);

+//	}

+//

+//	/**

+//	 * {@inheritDoc}

+//	 * 

+//	 * Adds support for the Restore Default button/action

+//	 */

+//	@Override

+//	protected void buttonPressed(int buttonId) {

+//		if(buttonId == RESTORE_ID) {

+//			restorePressed();

+//		} else {

+//			super.buttonPressed(buttonId);

+//		}

+//	}

+//

+//	/**

+//	 * {@inheritDoc}

+//	 * 

+//	 * Installs a filter for the compatible UICustom models to display to the user

+//	 */

+//	@Override

+//	public void create() {

+//		super.create();

+//		installCompatibleCustomizationViewerFilter(selectedElementsViewer, ePackages);

+//		getShell().pack();

+//	}

+//

+//	/**

+//	 * Install the compatible UICustom filter to the given viewer

+//	 * 

+//	 * @param viewer

+//	 *        The viewer to filter

+//	 * @param ePackages

+//	 *        The UICustom models will be displayed if they are compatible with one of these EPackages

+//	 */

+//	protected static void installCompatibleCustomizationViewerFilter(StructuredViewer viewer, Collection<EPackage> ePackages) {

+//		List<ViewerFilter> currentFilters = ListHelper.asList(viewer.getFilters());

+//		currentFilters.add(createCompatibleCustomizationViewerFilter(ePackages));

+//		viewer.setFilters(currentFilters.toArray(new ViewerFilter[currentFilters.size()]));

+//	}

+//

+//	/**

+//	 * Creates a filter for the compatible UICustom

+//	 * 

+//	 * @param ePackages

+//	 *        The UICustom models will be displayed if they are compatible with one of these EPackages

+//	 */

+//	protected static ViewerFilter createCompatibleCustomizationViewerFilter(Collection<EPackage> ePackages) {

+//		final Set<String> ePackageURIs = new HashSet<String>();

+//

+//		for(EPackage ePackage : ePackages) {

+//			ePackageURIs.add(ePackage.getNsURI());

+//			final Set<EPackage> referencedPackages = ModelUtils.computeReferencedPackages(ePackage);

+//			for(EPackage referencedEPackage : referencedPackages) {

+//				ePackageURIs.add(referencedEPackage.getNsURI());

+//			}

+//		}

+//

+//		return new ViewerFilter() {

+//

+//			@Override

+//			public boolean select(Viewer viewer, Object parentElement, Object element) {

+//				if(element instanceof MetamodelView) {

+//					MetamodelView customization = (MetamodelView)element;

+//

+//					String nsURI = customization.getMetamodelURI();

+//

+//					if(ePackageURIs.contains(nsURI)) {

+//						return true;

+//					}

+//

+//					EPackage ePackage = EPackage.Registry.INSTANCE.getEPackage(nsURI);

+//					while(ePackage != null) {

+//						if(ePackageURIs.contains(ePackage.getNsURI())) {

+//							return true;

+//						}

+//

+//						// allow customizations on Facets

+//						if(ePackage instanceof FacetSet) {

+//							FacetSet facetSet = (FacetSet)ePackage;

+//							ePackage = facetSet.getExtendedPackage();

+//						} else {

+//							// allow customizations on sub-packages

+//							ePackage = ePackage.getESuperPackage();

+//						}

+//					}

+//

+//					return false;

+//				}

+//

+//				return true;

+//			}

+//

+//		};

+//	}

+//

+//	/**

+//	 * The "restore defaults" action

+//	 */

+//	protected void restorePressed() {

+//		List<MetamodelView> defaultCustomizations = CustomizationsCatalog.getInstance().getRegistryDefaultCustomizations();

+//		Object[] filteredCustomizations = defaultCustomizations.toArray();

+//

+//		removeAllAction();

+//		addElements(filteredCustomizations);

+//		selector.setSelectedElements(allElements.toArray());

+//	}

+//

+//	/**

+//	 * Returns the list of selected customizations (including the ones hidden by the compatible EPackage filter)

+//	 * 

+//	 * @return

+//	 */

+//	public List<MetamodelView> getSelectedCustomizations() {

+//		Object[] result = super.getResult();

+//		List<MetamodelView> customizations = new ArrayList<MetamodelView>();

+//		for(Object element : result) {

+//			if(element instanceof MetamodelView) {

+//				customizations.add((MetamodelView)element);

+//			}

+//		}

+//

+//		return customizations;

+//	}

+//

+//	//Copied from {@link org.eclipse.emf.facet.infra.browser.custom.ui.dialogs.LoadCustomizationsDialog#createLabelProvider()}

+//	/**

+//	 * Creates a LabelProvider for EMF Facet MetamodelView elements

+//	 * 

+//	 * @return the label provider for the Dialog

+//	 */

+//	protected static ILabelProvider createLabelProvider() {

+//		return new LabelProvider() {

+//

+//			@Override

+//			public String getText(final Object element) {

+//				final MetamodelView metamodelView = (MetamodelView)element;

+//				return metamodelView.getName();

+//			}

+//

+//			@Override

+//			public Image getImage(final Object element) {

+//				return ImageProvider.getInstance().getUiCustomIcon();

+//			}

+//		};

+//	}

 

 }

diff --git a/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/src/org/eclipse/papyrus/views/modelexplorer/dnd/CommonDropAdapterAssistant.java b/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/src/org/eclipse/papyrus/views/modelexplorer/dnd/CommonDropAdapterAssistant.java
index 4e277698801..72c48ffc09f 100644
--- a/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/src/org/eclipse/papyrus/views/modelexplorer/dnd/CommonDropAdapterAssistant.java
+++ b/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/src/org/eclipse/papyrus/views/modelexplorer/dnd/CommonDropAdapterAssistant.java
@@ -35,8 +35,8 @@ import org.eclipse.emf.ecore.EStructuralFeature;
 import org.eclipse.emf.ecore.resource.Resource;
 import org.eclipse.emf.ecore.util.EcoreUtil;
 import org.eclipse.emf.edit.domain.EditingDomain;
-import org.eclipse.emf.facet.infra.browser.uicore.internal.model.LinkItem;
-import org.eclipse.emf.facet.infra.browser.uicore.internal.model.ModelElementItem;
+import org.eclipse.emf.facet.custom.metamodel.v0_2_0.internal.treeproxy.EObjectTreeElement;
+import org.eclipse.emf.facet.custom.metamodel.v0_2_0.internal.treeproxy.EReferenceTreeElement;
 import org.eclipse.emf.transaction.TransactionalEditingDomain;
 import org.eclipse.gmf.runtime.common.core.command.ICommand;
 import org.eclipse.gmf.runtime.emf.commands.core.command.CompositeTransactionalCommand;
@@ -299,19 +299,19 @@ public class CommonDropAdapterAssistant extends org.eclipse.ui.navigator.CommonD
 		switch(dropAdapter.getCurrentOperation()) {
 		case DND.DROP_MOVE:
 			if(dropAdapter.getCurrentLocation() == ViewerDropAdapter.LOCATION_BEFORE) {
-				if(target instanceof ModelElementItem) {
+				if(target instanceof EObjectTreeElement) {
 					commandList = getOrderChangeCommand(target, true);
 				}
 			} else if(dropAdapter.getCurrentLocation() == ViewerDropAdapter.LOCATION_AFTER) {
-				if(target instanceof ModelElementItem) {
+				if(target instanceof EObjectTreeElement) {
 					commandList = getOrderChangeCommand(target, false);
 				}
 			} else if(dropAdapter.getCurrentLocation() == ViewerDropAdapter.LOCATION_ON) {
-				if(target instanceof ModelElementItem) {
+				if(target instanceof EObjectTreeElement) {
 					commandList = getDropIntoCommand(target, null);
 				}
-				if(target instanceof LinkItem) {
-					commandList = getDropIntoCommand(((LinkItem)target).getParent(), ((LinkItem)target).getReference());
+				if(target instanceof EReferenceTreeElement) {
+					commandList = getDropIntoCommand(((EReferenceTreeElement)target).getParent(), ((EReferenceTreeElement)target).getEReference());
 				}
 			}
 
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 dd0df344599..34c59047e64 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
@@ -35,13 +35,13 @@ import org.eclipse.emf.facet.custom.core.ICustomizationManager;
 import org.eclipse.emf.facet.custom.metamodel.v0_2_0.custom.Customization;

 import org.eclipse.emf.facet.custom.ui.internal.exported.dialog.ILoadCustomizationsDialog;

 import org.eclipse.emf.facet.custom.ui.internal.exported.dialog.ILoadCustomizationsDialogFactory;

-import org.eclipse.emf.facet.infra.browser.Messages;

-import org.eclipse.emf.facet.infra.browser.custom.MetamodelView;

-import org.eclipse.emf.facet.infra.browser.custom.TypeView;

-import org.eclipse.emf.facet.infra.browser.uicore.CustomizationManager;

-import org.eclipse.emf.facet.infra.facet.Facet;

-import org.eclipse.emf.facet.infra.facet.FacetSet;

-import org.eclipse.emf.facet.infra.facet.core.FacetSetCatalog;

+//import org.eclipse.emf.facet.infra.browser.Messages;

+//import org.eclipse.emf.facet.infra.browser.custom.MetamodelView;

+//import org.eclipse.emf.facet.infra.browser.custom.TypeView;

+//import org.eclipse.emf.facet.infra.browser.uicore.CustomizationManager;

+//import org.eclipse.emf.facet.infra.facet.Facet;

+//import org.eclipse.emf.facet.infra.facet.FacetSet;

+//import org.eclipse.emf.facet.infra.facet.core.FacetSetCatalog;

 import org.eclipse.emf.facet.util.ui.internal.exported.dialog.IDialogCallback;

 import org.eclipse.emf.facet.util.ui.internal.exported.dialog.IDialogCallbackWithPreCommit;

 import org.eclipse.jface.window.Window;

@@ -168,75 +168,75 @@ public class LoadBrowserCustomization extends AbstractHandler {
 		return ModelUtils.getModelSet();

 	}

 

-	/**

-	 * 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);

-			}

-		}

+//	/**

+//	 * 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;

-	}

+//	/**

+//	 * 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 */

 	public static String getMetaclassQualifiedName(final EClassifier eClass) {

diff --git a/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/src/org/eclipse/papyrus/views/modelexplorer/matching/LinkItemMatchingItem.java b/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/src/org/eclipse/papyrus/views/modelexplorer/matching/LinkItemMatchingItem.java
index a6e8223de46..9c82dfc4ee0 100644
--- a/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/src/org/eclipse/papyrus/views/modelexplorer/matching/LinkItemMatchingItem.java
+++ b/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/src/org/eclipse/papyrus/views/modelexplorer/matching/LinkItemMatchingItem.java
@@ -16,7 +16,7 @@ package org.eclipse.papyrus.views.modelexplorer.matching;
 

 import org.eclipse.emf.ecore.EObject;

 import org.eclipse.emf.ecore.EReference;

-import org.eclipse.emf.facet.infra.browser.uicore.internal.model.LinkItem;

+import org.eclipse.emf.facet.custom.metamodel.v0_2_0.internal.treeproxy.EReferenceTreeElement;

 

 /***

  * An IMatchingItem implementation that matches for LinkItems

@@ -35,9 +35,9 @@ public class LinkItemMatchingItem implements IMatchingItem {
 	}

 

 	public boolean matchingItemEquals(Object obj) {

-		if(obj instanceof LinkItem) {

+		if(obj instanceof EReferenceTreeElement) {

 			if(ref != null && parent != null) {

-				return parent.equals(((LinkItem)obj).getParent()) && ref.equals(((LinkItem)obj).getReference());

+				return parent.equals(((EReferenceTreeElement)obj).getParent()) && ref.equals(((EReferenceTreeElement)obj).getEReference());

 			}

 		}

 		return super.equals(obj);

diff --git a/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/src/org/eclipse/papyrus/views/modelexplorer/matching/ModelElementItemMatchingItem.java b/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/src/org/eclipse/papyrus/views/modelexplorer/matching/ModelElementItemMatchingItem.java
index d4b00750cf5..404469afdb0 100644
--- a/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/src/org/eclipse/papyrus/views/modelexplorer/matching/ModelElementItemMatchingItem.java
+++ b/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/src/org/eclipse/papyrus/views/modelexplorer/matching/ModelElementItemMatchingItem.java
@@ -15,7 +15,7 @@
 package org.eclipse.papyrus.views.modelexplorer.matching;

 

 import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.facet.infra.browser.uicore.internal.model.ModelElementItem;

+import org.eclipse.emf.facet.custom.metamodel.v0_2_0.internal.treeproxy.EObjectTreeElement;

 

 /***

  * An IMatchingItem implementation that matches for ModelElementItem

@@ -31,8 +31,8 @@ public class ModelElementItemMatchingItem implements IMatchingItem {
 	}

 

 	public boolean matchingItemEquals(Object obj) {

-		if(element != null && obj instanceof ModelElementItem) {

-			return element.equals(((ModelElementItem)obj).getEObject());

+		if(element != null && obj instanceof EObjectTreeElement) {

+			return element.equals(((EObjectTreeElement)obj).getEObject());

 		}

 		return super.equals(obj);

 	}

diff --git a/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/src/org/eclipse/papyrus/views/modelexplorer/queries/IsOpen.java b/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/src/org/eclipse/papyrus/views/modelexplorer/queries/IsOpen.java
index bcc7da7f1dc..cbc2c96f1e0 100644
--- a/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/src/org/eclipse/papyrus/views/modelexplorer/queries/IsOpen.java
+++ b/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/src/org/eclipse/papyrus/views/modelexplorer/queries/IsOpen.java
@@ -12,23 +12,26 @@
 package org.eclipse.papyrus.views.modelexplorer.queries;
 
 import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.facet.infra.query.core.exception.ModelQueryExecutionException;
-import org.eclipse.emf.facet.infra.query.core.java.IJavaModelQuery;
-import org.eclipse.emf.facet.infra.query.core.java.ParameterValueList;
 import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IPageManager;
 import org.eclipse.papyrus.infra.core.services.ServiceException;
 import org.eclipse.papyrus.infra.emf.utils.ServiceUtilsForEObject;
+import org.eclipse.emf.facet.efacet.core.IFacetManager;
+import org.eclipse.emf.facet.efacet.core.exception.DerivedTypedElementException;
+import org.eclipse.emf.facet.query.java.core.IJavaQuery2;
+import org.eclipse.emf.facet.query.java.core.IParameterValueList2;
 
 /** Tests whether a Page is opened */
-public class IsOpen implements IJavaModelQuery<EObject, Boolean> {
+public class IsOpen implements IJavaQuery2<EObject, Boolean> {
 
-	public Boolean evaluate(final EObject context, final ParameterValueList parameterValues) throws ModelQueryExecutionException {
+
+	public Boolean evaluate(EObject source, IParameterValueList2 parameterValues, IFacetManager facetManager) throws DerivedTypedElementException {
 		try {
-			IPageManager pageManager = ServiceUtilsForEObject.getInstance().getIPageManager(context);
-			return pageManager.isOpen(context);
+			IPageManager pageManager = ServiceUtilsForEObject.getInstance().getIPageManager(source);
+			return pageManager.isOpen(source);
 		} catch (ServiceException ex) {
 			//Ignore
 		}
 		return false;
+
 	}
 }
diff --git a/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/src/org/eclipse/papyrus/views/modelexplorer/queries/IsPage.java b/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/src/org/eclipse/papyrus/views/modelexplorer/queries/IsPage.java
index a946d4935dc..47ef97c2b35 100644
--- a/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/src/org/eclipse/papyrus/views/modelexplorer/queries/IsPage.java
+++ b/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/src/org/eclipse/papyrus/views/modelexplorer/queries/IsPage.java
@@ -12,20 +12,22 @@
 package org.eclipse.papyrus.views.modelexplorer.queries;
 
 import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.facet.infra.query.core.exception.ModelQueryExecutionException;
-import org.eclipse.emf.facet.infra.query.core.java.IJavaModelQuery;
-import org.eclipse.emf.facet.infra.query.core.java.ParameterValueList;
+import org.eclipse.emf.facet.efacet.core.IFacetManager;
+import org.eclipse.emf.facet.efacet.core.exception.DerivedTypedElementException;
+import org.eclipse.emf.facet.query.java.core.IJavaQuery2;
+import org.eclipse.emf.facet.query.java.core.IParameterValueList2;
 import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IPageManager;
 import org.eclipse.papyrus.infra.core.services.ServiceException;
 import org.eclipse.papyrus.infra.emf.utils.ServiceUtilsForEObject;
 
 /** Tests whether an element is a page */
-public class IsPage implements IJavaModelQuery<EObject, Boolean> {
+public class IsPage implements IJavaQuery2<EObject, Boolean> {
 
-	public Boolean evaluate(final EObject context, final ParameterValueList parameterValues) throws ModelQueryExecutionException {
+
+	public Boolean evaluate(EObject source, IParameterValueList2 parameterValues, IFacetManager facetManager) throws DerivedTypedElementException {
 		try {
-			IPageManager pageManager = ServiceUtilsForEObject.getInstance().getIPageManager(context);
-			return pageManager.allPages().contains(context);
+			IPageManager pageManager = ServiceUtilsForEObject.getInstance().getIPageManager(source);
+			return pageManager.allPages().contains(source);
 		} catch (ServiceException ex) {
 			//Ignore
 		}
diff --git a/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/src/org/eclipse/papyrus/views/modelexplorer/queries/IsReadOnly.java b/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/src/org/eclipse/papyrus/views/modelexplorer/queries/IsReadOnly.java
index 79dc3c1c7d4..b7f391ec345 100644
--- a/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/src/org/eclipse/papyrus/views/modelexplorer/queries/IsReadOnly.java
+++ b/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/src/org/eclipse/papyrus/views/modelexplorer/queries/IsReadOnly.java
@@ -16,21 +16,23 @@ package org.eclipse.papyrus.views.modelexplorer.queries;
 import org.eclipse.emf.ecore.EObject;

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

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

-import org.eclipse.emf.facet.infra.query.core.exception.ModelQueryExecutionException;

-import org.eclipse.emf.facet.infra.query.core.java.IJavaModelQuery;

-import org.eclipse.emf.facet.infra.query.core.java.ParameterValueList;

+import org.eclipse.emf.facet.efacet.core.IFacetManager;

+import org.eclipse.emf.facet.efacet.core.exception.DerivedTypedElementException;

+import org.eclipse.emf.facet.query.java.core.IJavaQuery2;

+import org.eclipse.emf.facet.query.java.core.IParameterValueList2;

 

 /**

  * Create a query which will return true if the ressource is in read only mode.

  * 

  */

 @Deprecated

-public class IsReadOnly implements IJavaModelQuery<EObject, Boolean> {

+public class IsReadOnly implements IJavaQuery2<EObject, Boolean> {

 

-	public Boolean evaluate(EObject context, ParameterValueList parameterValues) throws ModelQueryExecutionException {

-		EditingDomain editingDomain = AdapterFactoryEditingDomain.getEditingDomainFor(context);

+

+	public Boolean evaluate(EObject source, IParameterValueList2 parameterValues, IFacetManager facetManager) throws DerivedTypedElementException {

+		EditingDomain editingDomain = AdapterFactoryEditingDomain.getEditingDomainFor(source);

 		if(editingDomain != null) {

-			if(editingDomain.isReadOnly(context.eResource())) {

+			if(editingDomain.isReadOnly(source.eResource())) {

 				return true;

 			}

 		}

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 ac92fbebb5a..6977af84421 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
@@ -38,7 +38,6 @@ Require-Bundle: org.eclipse.emf;bundle-version="2.6.0",
  org.eclipse.papyrus.infra.tools;bundle-version="1.0.0",

  org.eclipse.papyrus.infra.constraints;bundle-version="1.0.0",

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

- org.eclipse.emf.facet.infra.browser.uicore;bundle-version="0.2.0",

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

  org.eclipse.emf.edit;bundle-version="2.8.0",

  org.eclipse.ui.views.properties.tabbed;bundle-version="3.5.300",