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.tools
bundle to org.eclipse.papyrus.infra.ui.  Accordingly move tests
into a new org.eclipse.papyrus.infra.ui.tests bundle.

Two crucial UI dependencies are inverted by introduction of new
OSGi services with core interfaces specified in the non-UI layer:

* IExecutorService extends Java Platform's ExecutorService with
  APIs for synchronous execution (a la Display.syncExec).  A new
  CoreExecutors class in the infra.tools bundle supplies the instance
  provided by the OSGi service implementation in the infra.ui bundle.
  This provides compatibility for clients of various UIUtil APIs that
  they can no longer access

* IContextualServiceRegistryTracker abstracts the concept of the
  default ServicesRegistry found in the currently active editor, which
  the ServiceUtilsForHandlers class (and hence all of its clients)
  relies on.  Again an OSGi service implementation in the infra.ui
  bundle supplies the implementation of this tracker, which is exposed
  in infra.core through the service-utils API

Also move UI-dependent APIs from the org.eclipse.papyrus.infra.core
bundle into org.eclipse.papyrus.infra.ui.  This includes

* moving the 'papyrusDiagram' and 'papyrusContentOutline' extension
  points into the org.eclipse.papyrus.infra.ui namespace

* moving various UI-related services such as EditorLifeycleManager,
  SaveLayoutBeforeClose, and the IMultiDiagramEditor, itself, into the
  org.eclipse.papyrus.infra.ui bundle

This necessitates not only widespread refactorings on the moved APIs,
but also concomitant move of other APIs in other bundles because they
cannot plausibly use these moved APIs from their new home in
org.eclipse.papyrus.infra.ui and/or they cannot reasonably also be moved
to the UI bundle and/or they must be used by bundles that now have no UI
dependency:

* the DI/sash-windows EMF model is moved out of infra.core.sasheditor.di
  bundle into a new model-only org.eclipse.papyrus.infra.sashwindows.di
  bundle (which symbolic name incidentally now better reflects the
  contained Java package names)

* the IPageManager and ILocalPageService interfaces are moved out of
  infra.core.sasheditor.di bundle because they need to remain accessible
  by headless code such as the edit advices that ensure deletion of
  sash-model pages for notations that are deleted.  These are now in a
  package named org.eclipse.papyrus.infra.code.sashwindows.di.service.
  Accordingly the class hierarchy implementing the IPageManager
  interface is changed:  the obsolete PageMngrImpl is deleted, replaced
  by a BasicPageManagerImpl which now the PageManagerImpl extends.  A
  service factory creates the basic page manager in a headless context,
  but is overridden by the UI-aware implementation when the UI bundles
  are installed

* the MultiDiagramEditorGefDelegate (which has a GEF 3 dependency) is
  moved from the org.eclipse.papyrus.infra.core.sasheditor bundle to a
  new org.eclipse.papyrus.infra.gmfdiag.gef bundle.  Its usage for an
  adapter of ActionRegistry type is extracted out of the
  CoreMultiDiagramEditor class into a new external adapter-factory in
  the infra.gmfdiag.gef bundle

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

Change-Id: I573dee5d9312d6e5746d74575350d0152b591ab3

19 files changed, 53 insertions, 53 deletions

diff --git a/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.texteditor.cdt/META-INF/MANIFEST.MF b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.texteditor.cdt/META-INF/MANIFEST.MF
index 3e9446e008f..0704ac4555d 100644
--- a/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.texteditor.cdt/META-INF/MANIFEST.MF
+++ b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.texteditor.cdt/META-INF/MANIFEST.MF
@@ -22,7 +22,11 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.papyrus.uml.diagram.common;bundle-version="1.2.0",
  org.eclipse.papyrus.codegen.extensionpoints;bundle-version="1.2.0",
  org.eclipse.papyrus.cpp.codegen;bundle-version="1.2.0",
- org.eclipse.papyrus.qompass.ui;bundle-version="1.2.0"
+ org.eclipse.papyrus.qompass.ui;bundle-version="1.2.0",
+ org.eclipse.papyrus.infra.ui;bundle-version="1.2.0",
+ org.eclipse.papyrus.infra.core.sasheditor;bundle-version="1.2.0",
+ org.eclipse.papyrus.infra.core.sasheditor.di;bundle-version="1.2.0",
+ org.eclipse.papyrus.infra.core.sashwindows.di;bundle-version="1.2.0"
 Bundle-Vendor: %providerName
 Bundle-ActivationPolicy: lazy
 Bundle-Version: 1.2.0.qualifier
diff --git a/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.texteditor.cdt/plugin.xml b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.texteditor.cdt/plugin.xml
index 56bc6713d41..5f3fa8ff755 100644
--- a/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.texteditor.cdt/plugin.xml
+++ b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.texteditor.cdt/plugin.xml
@@ -17,7 +17,7 @@
       </command>

    </extension>

    <extension

-         point="org.eclipse.papyrus.infra.core.papyrusDiagram">

+         point="org.eclipse.papyrus.infra.ui.papyrusDiagram">

       <editorDiagram

             factoryClass="org.eclipse.papyrus.texteditor.cdt.factory.PapyrusCDTEditorFactory"

             icon="icons/texteditor.gif">

diff --git a/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.texteditor.cdt/src/org/eclipse/papyrus/texteditor/cdt/CommandSupport.java b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.texteditor.cdt/src/org/eclipse/papyrus/texteditor/cdt/CommandSupport.java
index a3e32434420..d1b408c7852 100644
--- a/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.texteditor.cdt/src/org/eclipse/papyrus/texteditor/cdt/CommandSupport.java
+++ b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.texteditor.cdt/src/org/eclipse/papyrus/texteditor/cdt/CommandSupport.java
@@ -23,7 +23,7 @@ import org.eclipse.emf.transaction.TransactionalEditingDomain;
 import org.eclipse.gmf.runtime.common.core.command.CommandResult;
 import org.eclipse.gmf.runtime.emf.commands.core.command.AbstractTransactionalCommand;
 import org.eclipse.papyrus.infra.core.services.ServiceException;
-import org.eclipse.papyrus.infra.core.utils.ServiceUtilsForActionHandlers;
+import org.eclipse.papyrus.infra.ui.util.ServiceUtilsForActionHandlers;
 
 /**
  * Utility function. Allow execution of commands on a transactional command stack
diff --git a/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.texteditor.cdt/src/org/eclipse/papyrus/texteditor/cdt/editor/PapyrusCDTEditor.java b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.texteditor.cdt/src/org/eclipse/papyrus/texteditor/cdt/editor/PapyrusCDTEditor.java
index 4ae37530cac..3d37ad4570f 100644
--- a/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.texteditor.cdt/src/org/eclipse/papyrus/texteditor/cdt/editor/PapyrusCDTEditor.java
+++ b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.texteditor.cdt/src/org/eclipse/papyrus/texteditor/cdt/editor/PapyrusCDTEditor.java
@@ -36,12 +36,12 @@ import org.eclipse.jface.text.source.ISourceViewer;
 import org.eclipse.jface.text.source.IVerticalRuler;

 import org.eclipse.jface.viewers.ISelection;

 import org.eclipse.jface.viewers.ISelectionProvider;

-import org.eclipse.papyrus.infra.core.lifecycleevents.DoSaveEvent;

-import org.eclipse.papyrus.infra.core.lifecycleevents.ILifeCycleEventsProvider;

-import org.eclipse.papyrus.infra.core.lifecycleevents.ISaveAndDirtyService;

-import org.eclipse.papyrus.infra.core.lifecycleevents.ISaveEventListener;

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

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

+import org.eclipse.papyrus.infra.ui.lifecycleevents.DoSaveEvent;

+import org.eclipse.papyrus.infra.ui.lifecycleevents.ILifeCycleEventsProvider;

+import org.eclipse.papyrus.infra.ui.lifecycleevents.ISaveAndDirtyService;

+import org.eclipse.papyrus.infra.ui.lifecycleevents.ISaveEventListener;

 import org.eclipse.papyrus.texteditor.cdt.Activator;

 import org.eclipse.papyrus.texteditor.cdt.sync.ObtainICElement;

 import org.eclipse.papyrus.texteditor.cdt.sync.RevealCurrentOperation;

diff --git a/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.texteditor.cdt/src/org/eclipse/papyrus/texteditor/cdt/factory/PapyrusCDTEditorFactory.java b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.texteditor.cdt/src/org/eclipse/papyrus/texteditor/cdt/factory/PapyrusCDTEditorFactory.java
index f4f552858e7..ce3d0697767 100644
--- a/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.texteditor.cdt/src/org/eclipse/papyrus/texteditor/cdt/factory/PapyrusCDTEditorFactory.java
+++ b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.texteditor.cdt/src/org/eclipse/papyrus/texteditor/cdt/factory/PapyrusCDTEditorFactory.java
@@ -16,11 +16,11 @@
 package org.eclipse.papyrus.texteditor.cdt.factory;

 

 import org.eclipse.papyrus.infra.core.editor.BackboneException;

-import org.eclipse.papyrus.infra.core.extension.diagrameditor.AbstractEditorFactory;

-import org.eclipse.papyrus.infra.core.multidiagram.actionbarcontributor.ActionBarContributorRegistry;

 import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IEditorModel;

 import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IPageModel;

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

+import org.eclipse.papyrus.infra.ui.extension.diagrameditor.AbstractEditorFactory;

+import org.eclipse.papyrus.infra.ui.multidiagram.actionbarcontributor.ActionBarContributorRegistry;

 import org.eclipse.papyrus.texteditor.cdt.Activator;

 import org.eclipse.papyrus.texteditor.cdt.editor.PapyrusCDTEditor;

 import org.eclipse.papyrus.texteditor.model.texteditormodel.TextEditorModel;

@@ -42,7 +42,7 @@ public class PapyrusCDTEditorFactory extends AbstractEditorFactory {
 	/**

 	 * Create the IPageModel that is used by the SashWindows to manage the editor.

 	 *

-	 * @see org.eclipse.papyrus.infra.core.editorsfactory.IEditorFactory#createIPageModel(java.lang.Object)

+	 * @see org.eclipse.papyrus.infra.ui.editorsfactory.IEditorFactory#createIPageModel(java.lang.Object)

 	 *

 	 * @param pageIdentifier

 	 *            The model pushed in the sashmodel by the creation command

@@ -54,7 +54,7 @@ public class PapyrusCDTEditorFactory extends AbstractEditorFactory {
 	}

 

 	/**

-	 * @see org.eclipse.papyrus.infra.core.editorsfactory.IEditorFactory#isPageModelFactoryFor(java.lang.Object)

+	 * @see org.eclipse.papyrus.infra.ui.editorsfactory.IEditorFactory#isPageModelFactoryFor(java.lang.Object)

 	 *

 	 * @param pageIdentifier

 	 * @return

diff --git a/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.texteditor.cdt/src/org/eclipse/papyrus/texteditor/cdt/handler/PapyrusCDTEditorHandler.java b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.texteditor.cdt/src/org/eclipse/papyrus/texteditor/cdt/handler/PapyrusCDTEditorHandler.java
index 7d6df1edfc4..5131d325044 100644
--- a/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.texteditor.cdt/src/org/eclipse/papyrus/texteditor/cdt/handler/PapyrusCDTEditorHandler.java
+++ b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.texteditor.cdt/src/org/eclipse/papyrus/texteditor/cdt/handler/PapyrusCDTEditorHandler.java
@@ -1,6 +1,5 @@
 /*****************************************************************************

- * Copyright (c) 2012 CEA LIST.

- *

+ * Copyright (c) 2012, 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

@@ -10,6 +9,7 @@
  * Contributors:

  *  Vincent Lorenzo (CEA LIST) Vincent.Lorenzo@cea.fr - Initial API and implementation

  *  Ansgar Radermacher (CEA LIST) ansgar.radermacher@cea.fr

+ *  Christian W. Damus - bug 485220

  *

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

 package org.eclipse.papyrus.texteditor.cdt.handler;

@@ -31,13 +31,13 @@ import org.eclipse.papyrus.codegen.extensionpoints.ILangCodegen;
 import org.eclipse.papyrus.codegen.extensionpoints.LanguageCodegen;

 import org.eclipse.papyrus.commands.CheckedOperationHistory;

 import org.eclipse.papyrus.infra.core.resource.NotFoundException;

-import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IPageManager;

 import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ISashWindowsContentProvider;

 import org.eclipse.papyrus.infra.core.sasheditor.di.contentprovider.DiSashModelManager;

 import org.eclipse.papyrus.infra.core.sasheditor.editor.ISashWindowsContainer;

 import org.eclipse.papyrus.infra.core.sashwindows.di.PageRef;

 import org.eclipse.papyrus.infra.core.sashwindows.di.SashPanel;

 import org.eclipse.papyrus.infra.core.sashwindows.di.TabFolder;

+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.core.utils.ServiceUtils;

@@ -81,8 +81,7 @@ public class PapyrusCDTEditorHandler extends CmdHandler {
 		// Filter Classes (including Behaviors, since Behavior inherits from Class), Operation and Transition

 		if (selectedEObject instanceof Class ||

 				selectedEObject instanceof Operation ||

-				selectedEObject instanceof Transition)

-		{

+				selectedEObject instanceof Transition) {

 			URI uri = selectedEObject.eResource().getURI();

 

 			// URIConverter uriConverter = resource.getResourceSet().getURIConverter();

@@ -147,7 +146,7 @@ public class PapyrusCDTEditorHandler extends CmdHandler {
 	 */

 	public void doExecute(final ServicesRegistry serviceRegistry) throws ServiceException, NotFoundException {

 		// Get the page manager allowing to add/open an editor.

-		final IPageManager pageMngr = ServiceUtils.getInstance().getIPageManager(serviceRegistry);

+		final IPageManager pageMngr = ServiceUtils.getInstance().getService(IPageManager.class, serviceRegistry);

 

 		Classifier classifierToEdit = getClassifierToEdit();

 		TextEditorModel editorModel = getEditorModel(serviceRegistry, classifierToEdit);

@@ -163,7 +162,7 @@ public class PapyrusCDTEditorHandler extends CmdHandler {
 		if (codegen.getTargetProject(classifierToEdit, true) == null) {

 			return;

 		}

-		

+

 		if (selectedEObject instanceof Transition) {

 			Transition transition = (Transition) selectedEObject;

 			if (transition.getEffect() == null) {

@@ -182,8 +181,7 @@ public class PapyrusCDTEditorHandler extends CmdHandler {
 				if (pageMngr.isOpen(editorModelFinal)) {

 					// select existing editor

 					pageMngr.selectPage(editorModelFinal);

-				}

-				else {

+				} else {

 					pageMngr.openPage(editorModelFinal);

 				}

 				try {

@@ -194,13 +192,12 @@ public class PapyrusCDTEditorHandler extends CmdHandler {
 

 					if (rootModel instanceof TabFolder) {

 						// root = tabFolder, i.e. there is a single folder

-						ISashWindowsContainer sashContainer = ServiceUtils.getInstance().getISashWindowsContainer(serviceRegistry);

+						ISashWindowsContainer sashContainer = ServiceUtils.getInstance().getService(ISashWindowsContainer.class, serviceRegistry);

 						int index = lookupIndex((TabFolder) rootModel, editorModelFinal);

 						if (index != -1) {

 							sashContentProvider.createFolder(sashContainer.getSelectedTabFolderModel(), index, sashContainer.getSelectedTabFolderModel(), SWT.RIGHT);

 						}

-					}

-					else if (rootModel instanceof SashPanel) {

+					} else if (rootModel instanceof SashPanel) {

 						// multiple tab-folders exist. Find existing one and move editorModel to other

 						// TODO

 						// ISashWindowsContainer sashContainer = ServiceUtils.getInstance().getISashWindowsContainer(serviceRegistry);

@@ -234,8 +231,7 @@ public class PapyrusCDTEditorHandler extends CmdHandler {
 			return null;

 		}

 		editorModel.setGeneratorID(LanguageCodegen.getID(codegen));

-		TextEditorModelSharedResource model = (TextEditorModelSharedResource)

-				ServiceUtils.getInstance().getModelSet(serviceRegistry).getModelChecked(TextEditorModelSharedResource.MODEL_ID);

+		TextEditorModelSharedResource model = (TextEditorModelSharedResource) ServiceUtils.getInstance().getModelSet(serviceRegistry).getModelChecked(TextEditorModelSharedResource.MODEL_ID);

 		model.addTextEditorModel(editorModel);

 

 		return editorModel;

@@ -249,11 +245,9 @@ public class PapyrusCDTEditorHandler extends CmdHandler {
 	protected Classifier getClassifierToEdit() {

 		if (selectedEObject instanceof Operation) {

 			return ((Operation) selectedEObject).getFeaturingClassifiers().get(0);

-		}

-		else if (selectedEObject instanceof Transition) {

+		} else if (selectedEObject instanceof Transition) {

 			return ((Transition) selectedEObject).getContainer().getStateMachine().getContext();

-		}

-		else if (selectedEObject instanceof Behavior) {

+		} else if (selectedEObject instanceof Behavior) {

 			Element owner = (Behavior) selectedEObject;

 			while (owner != null) {

 				owner = owner.getOwner();

@@ -262,8 +256,7 @@ public class PapyrusCDTEditorHandler extends CmdHandler {
 				}

 			}

 			return null;

-		}

-		else if (selectedEObject instanceof Classifier) {

+		} else if (selectedEObject instanceof Classifier) {

 			// must be class or datatype

 			return (Classifier) selectedEObject;

 		}

@@ -282,8 +275,7 @@ public class PapyrusCDTEditorHandler extends CmdHandler {
 	 * @throws NotFoundException

 	 */

 	protected TextEditorModel getEditorModel(final ServicesRegistry serviceRegistry, Classifier classifierToEdit) throws ServiceException, NotFoundException {

-		TextEditorModelSharedResource model = (TextEditorModelSharedResource)

-				ServiceUtils.getInstance().getModelSet(serviceRegistry).getModelChecked(TextEditorModelSharedResource.MODEL_ID);

+		TextEditorModelSharedResource model = (TextEditorModelSharedResource) ServiceUtils.getInstance().getModelSet(serviceRegistry).getModelChecked(TextEditorModelSharedResource.MODEL_ID);

 		return model.getTextEditorModel(classifierToEdit);

 	}

 

diff --git a/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.views.cpp/META-INF/MANIFEST.MF b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.views.cpp/META-INF/MANIFEST.MF
index 3e836907323..4a263ec3c2e 100644
--- a/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.views.cpp/META-INF/MANIFEST.MF
+++ b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.views.cpp/META-INF/MANIFEST.MF
@@ -15,7 +15,8 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.gmf.runtime.emf.commands.core;bundle-version="1.4.0",

  org.eclipse.papyrus.uml.tools.utils;bundle-version="1.2.0",

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

- org.eclipse.uml2.uml.profile.standard;bundle-version="1.0.100"

+ org.eclipse.uml2.uml.profile.standard;bundle-version="1.0.100",

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

 Export-Package: org.eclipse.papyrus.views.cpp; uses:="org.eclipse.ui,

  com.cea.papyrus.views.panels,

  org.eclipse.jface.viewers,

diff --git a/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.views.cpp/src/org/eclipse/papyrus/views/cpp/CommandSupport.java b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.views.cpp/src/org/eclipse/papyrus/views/cpp/CommandSupport.java
index ab69b52fd0d..46c46adb5ae 100644
--- a/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.views.cpp/src/org/eclipse/papyrus/views/cpp/CommandSupport.java
+++ b/extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.views.cpp/src/org/eclipse/papyrus/views/cpp/CommandSupport.java
@@ -21,7 +21,7 @@ import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.emf.transaction.TransactionalEditingDomain;
 import org.eclipse.gmf.runtime.common.core.command.CommandResult;
 import org.eclipse.gmf.runtime.emf.commands.core.command.AbstractTransactionalCommand;
-import org.eclipse.papyrus.infra.core.utils.EditorUtils;
+import org.eclipse.papyrus.infra.ui.util.EditorUtils;
 
 /**
  * Utility function. Allow adaption to command stack
diff --git a/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.reverse.ui/META-INF/MANIFEST.MF b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.reverse.ui/META-INF/MANIFEST.MF
index b24c01b97bd..831105a95fd 100644
--- a/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.reverse.ui/META-INF/MANIFEST.MF
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.reverse.ui/META-INF/MANIFEST.MF
@@ -9,7 +9,8 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.gmf.runtime.diagram.core,

  org.eclipse.papyrus.infra.gmfdiag.dnd;bundle-version="1.2.0",

  org.eclipse.papyrus.infra.emf.diagram.common;bundle-version="1.2.0",

- org.eclipse.papyrus.uml.diagram.common;bundle-version="1.2.0"

+ org.eclipse.papyrus.uml.diagram.common;bundle-version="1.2.0",

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

 Bundle-Vendor: %providerName

 Bundle-ActivationPolicy: lazy

 Bundle-Version: 1.2.0.qualifier

diff --git a/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.reverse.ui/src/org/eclipse/papyrus/java/reverse/ui/DndReverseCodeHandler.java b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.reverse.ui/src/org/eclipse/papyrus/java/reverse/ui/DndReverseCodeHandler.java
index 5c5568282c7..491ddc1c18a 100644
--- a/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.reverse.ui/src/org/eclipse/papyrus/java/reverse/ui/DndReverseCodeHandler.java
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.reverse.ui/src/org/eclipse/papyrus/java/reverse/ui/DndReverseCodeHandler.java
@@ -28,7 +28,7 @@ import org.eclipse.jdt.core.IJavaElement;
 import org.eclipse.jdt.core.JavaModelException;
 import org.eclipse.jface.viewers.ISelection;
 import org.eclipse.jface.viewers.TreeSelection;
-import org.eclipse.papyrus.infra.core.editor.IMultiDiagramEditor;
+import org.eclipse.papyrus.infra.ui.editor.IMultiDiagramEditor;
 import org.eclipse.papyrus.java.reverse.ui.dialog.DndReverseCodeDialog;
 import org.eclipse.papyrus.java.reverse.ui.dialog.ReverseCodeDialog;
 import org.eclipse.papyrus.uml.diagram.common.util.MDTUtil;
diff --git a/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.reverse.ui/src/org/eclipse/papyrus/java/reverse/ui/ReverseCodeHandler.java b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.reverse.ui/src/org/eclipse/papyrus/java/reverse/ui/ReverseCodeHandler.java
index 433344eba35..6bd5d992149 100644
--- a/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.reverse.ui/src/org/eclipse/papyrus/java/reverse/ui/ReverseCodeHandler.java
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.reverse.ui/src/org/eclipse/papyrus/java/reverse/ui/ReverseCodeHandler.java
@@ -17,10 +17,10 @@ import org.eclipse.emf.transaction.RecordingCommand;
 import org.eclipse.emf.transaction.TransactionalEditingDomain;

 import org.eclipse.jface.dialogs.ErrorDialog;

 import org.eclipse.jface.window.Window;

-import org.eclipse.papyrus.infra.core.editor.IMultiDiagramEditor;

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

-import org.eclipse.papyrus.infra.core.utils.EditorUtils;

-import org.eclipse.papyrus.infra.core.utils.ServiceUtilsForActionHandlers;

+import org.eclipse.papyrus.infra.ui.editor.IMultiDiagramEditor;

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

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

 import org.eclipse.papyrus.java.reverse.ui.dialog.ReverseCodeDialog;

 import org.eclipse.papyrus.uml.tools.model.UmlUtils;

 import org.eclipse.swt.widgets.Shell;

diff --git a/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.reverse.ui/src/org/eclipse/papyrus/java/reverse/ui/handlers/CreateAssociationFromPropertyHandler.java b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.reverse.ui/src/org/eclipse/papyrus/java/reverse/ui/handlers/CreateAssociationFromPropertyHandler.java
index 848f5ea6cbc..f9388cdfd3b 100644
--- a/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.reverse.ui/src/org/eclipse/papyrus/java/reverse/ui/handlers/CreateAssociationFromPropertyHandler.java
+++ b/extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.reverse.ui/src/org/eclipse/papyrus/java/reverse/ui/handlers/CreateAssociationFromPropertyHandler.java
@@ -20,7 +20,7 @@ import org.eclipse.jface.viewers.ISelection;
 import org.eclipse.jface.viewers.IStructuredSelection;

 import org.eclipse.jface.viewers.TreeSelection;

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

-import org.eclipse.papyrus.infra.core.utils.ServiceUtilsForActionHandlers;

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

 import org.eclipse.papyrus.java.reverse.utils.TypeOperationsEnhanced;

 import org.eclipse.ui.IWorkbenchPage;

 import org.eclipse.ui.IWorkbenchWindow;

diff --git a/extraplugins/qompass/codegen/org.eclipse.papyrus.codegen.base/.classpath b/extraplugins/qompass/codegen/org.eclipse.papyrus.codegen.base/.classpath
index ad32c83a788..098194ca4b7 100644
--- a/extraplugins/qompass/codegen/org.eclipse.papyrus.codegen.base/.classpath
+++ b/extraplugins/qompass/codegen/org.eclipse.papyrus.codegen.base/.classpath
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="output" path="bin"/>
diff --git a/extraplugins/qompass/codegen/org.eclipse.papyrus.codegen.base/.settings/org.eclipse.jdt.core.prefs b/extraplugins/qompass/codegen/org.eclipse.papyrus.codegen.base/.settings/org.eclipse.jdt.core.prefs
index 94d61f00da6..f08be2b06c4 100644
--- a/extraplugins/qompass/codegen/org.eclipse.papyrus.codegen.base/.settings/org.eclipse.jdt.core.prefs
+++ b/extraplugins/qompass/codegen/org.eclipse.papyrus.codegen.base/.settings/org.eclipse.jdt.core.prefs
@@ -1,10 +1,10 @@
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
-org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
+org.eclipse.jdt.core.compiler.compliance=1.7
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.6
+org.eclipse.jdt.core.compiler.source=1.7
 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
diff --git a/extraplugins/qompass/codegen/org.eclipse.papyrus.codegen.base/META-INF/MANIFEST.MF b/extraplugins/qompass/codegen/org.eclipse.papyrus.codegen.base/META-INF/MANIFEST.MF
index a09b81b1fc6..671eafefef9 100644
--- a/extraplugins/qompass/codegen/org.eclipse.papyrus.codegen.base/META-INF/MANIFEST.MF
+++ b/extraplugins/qompass/codegen/org.eclipse.papyrus.codegen.base/META-INF/MANIFEST.MF
@@ -6,7 +6,8 @@ Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.papyrus.infra.core;bundle-version="1.2.0",

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

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

- org.eclipse.emf.transaction;bundle-version="1.8.0"

+ org.eclipse.emf.transaction;bundle-version="1.8.0",

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

 Export-Package: org.eclipse.papyrus.codegen.base,

  org.eclipse.papyrus.codegen.base.codesync

 Bundle-Vendor: %providerName

@@ -17,4 +18,4 @@ Bundle-Localization: plugin
 Bundle-ManifestVersion: 2

 Bundle-Activator: org.eclipse.papyrus.codegen.base.Activator

 Bundle-SymbolicName: org.eclipse.papyrus.codegen.base;singleton:=true

-Bundle-RequiredExecutionEnvironment: JavaSE-1.6

+Bundle-RequiredExecutionEnvironment: JavaSE-1.7

diff --git a/extraplugins/qompass/codegen/org.eclipse.papyrus.codegen.base/src/org/eclipse/papyrus/codegen/base/codesync/ManageChangeEvents.java b/extraplugins/qompass/codegen/org.eclipse.papyrus.codegen.base/src/org/eclipse/papyrus/codegen/base/codesync/ManageChangeEvents.java
index fdac34742d7..2b1c77b6402 100644
--- a/extraplugins/qompass/codegen/org.eclipse.papyrus.codegen.base/src/org/eclipse/papyrus/codegen/base/codesync/ManageChangeEvents.java
+++ b/extraplugins/qompass/codegen/org.eclipse.papyrus.codegen.base/src/org/eclipse/papyrus/codegen/base/codesync/ManageChangeEvents.java
@@ -20,12 +20,12 @@ import java.util.Map;
 import org.eclipse.emf.common.util.EList;
 import org.eclipse.emf.transaction.TransactionalEditingDomain;
 import org.eclipse.papyrus.codegen.base.Activator;
-import org.eclipse.papyrus.infra.core.editor.IMultiDiagramEditor;
-import org.eclipse.papyrus.infra.core.services.EditorLifecycleEventListener;
-import org.eclipse.papyrus.infra.core.services.EditorLifecycleManager;
 import org.eclipse.papyrus.infra.core.services.ServiceException;
 import org.eclipse.papyrus.infra.core.services.ServicesRegistry;
 import org.eclipse.papyrus.infra.emf.utils.ServiceUtilsForResourceSet;
+import org.eclipse.papyrus.infra.ui.editor.IMultiDiagramEditor;
+import org.eclipse.papyrus.infra.ui.services.EditorLifecycleEventListener;
+import org.eclipse.papyrus.infra.ui.services.EditorLifecycleManager;
 
 /**
  * Manage and update change events for incremental code generation
diff --git a/extraplugins/qompass/codegen/org.eclipse.papyrus.texteditor.modelexplorer/META-INF/MANIFEST.MF b/extraplugins/qompass/codegen/org.eclipse.papyrus.texteditor.modelexplorer/META-INF/MANIFEST.MF
index f3e062e8080..1b103be399d 100644
--- a/extraplugins/qompass/codegen/org.eclipse.papyrus.texteditor.modelexplorer/META-INF/MANIFEST.MF
+++ b/extraplugins/qompass/codegen/org.eclipse.papyrus.texteditor.modelexplorer/META-INF/MANIFEST.MF
@@ -21,5 +21,5 @@ Bundle-Version: 1.2.0.qualifier
 Bundle-ManifestVersion: 2

 Bundle-Activator: org.eclipse.papyrus.texteditor.modelexplorer.Activator

 Bundle-SymbolicName: org.eclipse.papyrus.texteditor.modelexplorer;singleton:=true

-Import-Package: org.eclipse.papyrus.infra.core.editorsfactory,

+Import-Package: org.eclipse.papyrus.infra.ui.editorsfactory,

  org.eclipse.papyrus.infra.viewpoints.policy

diff --git a/extraplugins/qompass/designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/META-INF/MANIFEST.MF b/extraplugins/qompass/designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/META-INF/MANIFEST.MF
index 6908c801140..b6f74cde686 100644
--- a/extraplugins/qompass/designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/META-INF/MANIFEST.MF
+++ b/extraplugins/qompass/designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/META-INF/MANIFEST.MF
@@ -16,7 +16,8 @@ Require-Bundle: org.eclipse.papyrus.fcm.profile;bundle-version="1.2.0",
  com.google.guava;bundle-version="11.0.0",

  org.eclipse.xtext.xbase.lib,

  org.eclipse.xtend.lib,

- org.eclipse.xtend.lib.macro

+ org.eclipse.xtend.lib.macro,

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

 Bundle-Vendor: %providerName

 Bundle-ActivationPolicy: lazy

 Bundle-Version: 1.2.0.qualifier

diff --git a/extraplugins/qompass/designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/src/org/eclipse/papyrus/qompass/modellibs/tracing/QompassTraceMechanism.java b/extraplugins/qompass/designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/src/org/eclipse/papyrus/qompass/modellibs/tracing/QompassTraceMechanism.java
index 8e286a6792e..adf406d18eb 100644
--- a/extraplugins/qompass/designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/src/org/eclipse/papyrus/qompass/modellibs/tracing/QompassTraceMechanism.java
+++ b/extraplugins/qompass/designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/src/org/eclipse/papyrus/qompass/modellibs/tracing/QompassTraceMechanism.java
@@ -16,10 +16,10 @@ import org.eclipse.papyrus.FCM.ContainerRule;
 import org.eclipse.papyrus.FCM.RuleApplication;
 import org.eclipse.papyrus.infra.core.resource.ModelSet;
 import org.eclipse.papyrus.infra.core.services.ServiceException;
-import org.eclipse.papyrus.infra.core.utils.ServiceUtilsForActionHandlers;
 import org.eclipse.papyrus.infra.services.tracepoints.ITraceMechanism;
 import org.eclipse.papyrus.infra.services.tracepoints.MarkerUtils;
 import org.eclipse.papyrus.infra.services.tracepoints.TraceActions.TAOperation;
+import org.eclipse.papyrus.infra.ui.util.ServiceUtilsForActionHandlers;
 import org.eclipse.papyrus.infra.services.tracepoints.TracepointConstants;
 import org.eclipse.papyrus.qompass.designer.core.Description;
 import org.eclipse.papyrus.qompass.designer.core.Log;