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

20 files changed, 60 insertions, 49 deletions

diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode/META-INF/MANIFEST.MF b/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode/META-INF/MANIFEST.MF
index ce545700a3b..ccc8e7e1367 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode/META-INF/MANIFEST.MF
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode/META-INF/MANIFEST.MF
@@ -10,15 +10,14 @@ Require-Bundle: org.eclipse.emf.edit.ui,
  org.eclipse.core.expressions;bundle-version="3.4.400",

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

  com.google.guava;bundle-version="11.0.0",

- org.eclipse.equinox.registry,

- org.eclipse.emf.workspace,

- org.eclipse.gmf.runtime.common.core,

- org.eclipse.gmf.runtime.emf.commands.core,

  org.eclipse.gmf.runtime.emf.type.core,

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

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

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

- org.eclipse.papyrus.infra.services.edit;bundle-version="1.2.0"

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

+ org.eclipse.papyrus.infra.core.sashwindows.di;bundle-version="1.2.0",

+ org.eclipse.papyrus.infra.core.sasheditor.di;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/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode/plugin.xml b/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode/plugin.xml
index 38292af0361..21a1aaee0c4 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode/plugin.xml
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode/plugin.xml
@@ -26,7 +26,7 @@
             priority="9"
             startKind="startup">
          <dependsOn
-               serviceKeyRef="org.eclipse.papyrus.infra.core.lifecycleevents.ILifeCycleEventsProvider">
+               serviceKeyRef="org.eclipse.papyrus.infra.ui.lifecycleevents.ILifeCycleEventsProvider">
          </dependsOn>
          <dependsOn
                serviceKeyRef="org.eclipse.papyrus.infra.services.controlmode.service.IUncontrolledObjectsProvider">
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode/src/org/eclipse/papyrus/infra/services/controlmode/commands/LoadDiagramCommand.java b/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode/src/org/eclipse/papyrus/infra/services/controlmode/commands/LoadDiagramCommand.java
index b39ffad2732..4c7b74f71f9 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode/src/org/eclipse/papyrus/infra/services/controlmode/commands/LoadDiagramCommand.java
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode/src/org/eclipse/papyrus/infra/services/controlmode/commands/LoadDiagramCommand.java
@@ -1,5 +1,5 @@
 /*****************************************************************************

- * Copyright (c) 2014 CEA LIST and others.

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

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

  * Contributors:

  *   CEA LIST - Initial API and implementation

+ *   Christian W. Damus - bug 485220

  *   

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

 

@@ -17,7 +18,7 @@ import java.util.List;
 

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

 import org.eclipse.emf.ecore.resource.Resource;

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

+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.ServiceUtilsForResource;

 

@@ -57,7 +58,7 @@ public class LoadDiagramCommand implements Runnable {
 	public LoadDiagramCommand(Resource resource) {

 

 		try {

-			pageManager = ServiceUtilsForResource.getInstance().getIPageManager(resource);

+			pageManager = ServiceUtilsForResource.getInstance().getService(IPageManager.class, resource);

 		} catch (ServiceException e) {

 			// nothing to do

 		}

diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode/src/org/eclipse/papyrus/infra/services/controlmode/listener/LoadResourceSnippet.java b/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode/src/org/eclipse/papyrus/infra/services/controlmode/listener/LoadResourceSnippet.java
index 7f5287822e9..5d59edf742f 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode/src/org/eclipse/papyrus/infra/services/controlmode/listener/LoadResourceSnippet.java
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode/src/org/eclipse/papyrus/infra/services/controlmode/listener/LoadResourceSnippet.java
@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Copyright (c) 2014 CEA LIST and others.
+ * Copyright (c) 2014, 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
@@ -8,6 +8,7 @@
  *
  * Contributors:
  *   Céline Janssens (ALL4TEC) celine.janssens@all4tec.net - Initial API and implementation
+ *   Christian W. Damus - bug 485220
  *   
  *****************************************************************************/
 
@@ -20,8 +21,7 @@ import org.eclipse.emf.transaction.RollbackException;
 import org.eclipse.papyrus.infra.core.resource.IModelSetSnippet;
 import org.eclipse.papyrus.infra.core.resource.ModelSet;
 import org.eclipse.papyrus.infra.core.resource.ResourceAdapter;
-import org.eclipse.papyrus.infra.core.sasheditor.di.contentprovider.internal.PageManagerImpl;
-import org.eclipse.papyrus.infra.core.sasheditor.di.contentprovider.utils.TransactionHelper;
+import org.eclipse.papyrus.infra.core.utils.TransactionHelper;
 import org.eclipse.papyrus.infra.services.controlmode.commands.LoadDiagramCommand;
 
 
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode/src/org/eclipse/papyrus/infra/services/controlmode/listener/UncontrolModeSaveListener.java b/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode/src/org/eclipse/papyrus/infra/services/controlmode/listener/UncontrolModeSaveListener.java
index fe057ddc229..0855d6dca5f 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode/src/org/eclipse/papyrus/infra/services/controlmode/listener/UncontrolModeSaveListener.java
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode/src/org/eclipse/papyrus/infra/services/controlmode/listener/UncontrolModeSaveListener.java
@@ -18,13 +18,13 @@ import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.resource.Resource;
 import org.eclipse.emf.transaction.RollbackException;
 import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.papyrus.infra.core.lifecycleevents.DoSaveEvent;
-import org.eclipse.papyrus.infra.core.lifecycleevents.ISaveEventListener;
 import org.eclipse.papyrus.infra.core.services.ServiceException;
 import org.eclipse.papyrus.infra.core.utils.ServiceUtils;
 import org.eclipse.papyrus.infra.core.utils.TransactionHelper;
 import org.eclipse.papyrus.infra.services.controlmode.ControlModePlugin;
 import org.eclipse.papyrus.infra.services.controlmode.service.IUncontrolledObjectsProvider;
+import org.eclipse.papyrus.infra.ui.lifecycleevents.DoSaveEvent;
+import org.eclipse.papyrus.infra.ui.lifecycleevents.ISaveEventListener;
 
 
 /**
@@ -58,7 +58,7 @@ public class UncontrolModeSaveListener implements ISaveEventListener {
 	 *
 	 * @param event
 	 *            the event
-	 * @see org.eclipse.papyrus.infra.core.lifecycleevents.ISaveEventListener#doSaveAs(org.eclipse.papyrus.infra.core.lifecycleevents.DoSaveEvent)
+	 * @see org.eclipse.papyrus.infra.ui.lifecycleevents.ISaveEventListener#doSaveAs(org.eclipse.papyrus.infra.ui.lifecycleevents.DoSaveEvent)
 	 */
 	public void doSaveAs(DoSaveEvent event) {
 		doSave(event);
@@ -69,7 +69,7 @@ public class UncontrolModeSaveListener implements ISaveEventListener {
 	 *
 	 * @param event
 	 *            the event
-	 * @see org.eclipse.papyrus.infra.core.lifecycleevents.ISaveEventListener#doSave(org.eclipse.papyrus.infra.core.lifecycleevents.DoSaveEvent)
+	 * @see org.eclipse.papyrus.infra.ui.lifecycleevents.ISaveEventListener#doSave(org.eclipse.papyrus.infra.ui.lifecycleevents.DoSaveEvent)
 	 */
 	public void doSave(DoSaveEvent event) {
 
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode/src/org/eclipse/papyrus/infra/services/controlmode/service/ControlModeService.java b/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode/src/org/eclipse/papyrus/infra/services/controlmode/service/ControlModeService.java
index 2027c42cba2..89f48ab34c9 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode/src/org/eclipse/papyrus/infra/services/controlmode/service/ControlModeService.java
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode/src/org/eclipse/papyrus/infra/services/controlmode/service/ControlModeService.java
@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Copyright (c) 2014 CEA LIST and others.
+ * Copyright (c) 2014, 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
@@ -8,18 +8,19 @@
  *
  * Contributors:
  *   Gabriel Pascual (ALL4TEC) gabriel.pascual@all4tec.net - Initial API and implementation
+ *   Christian W. Damus - bug 485220
  *   
  *****************************************************************************/
 
 package org.eclipse.papyrus.infra.services.controlmode.service;
 
-import org.eclipse.papyrus.infra.core.lifecycleevents.ILifeCycleEventsProvider;
-import org.eclipse.papyrus.infra.core.lifecycleevents.ISaveEventListener;
 import org.eclipse.papyrus.infra.core.services.IService;
 import org.eclipse.papyrus.infra.core.services.ServiceException;
 import org.eclipse.papyrus.infra.core.services.ServicesRegistry;
 import org.eclipse.papyrus.infra.core.utils.ServiceUtils;
 import org.eclipse.papyrus.infra.services.controlmode.listener.UncontrolModeSaveListener;
+import org.eclipse.papyrus.infra.ui.lifecycleevents.ILifeCycleEventsProvider;
+import org.eclipse.papyrus.infra.ui.lifecycleevents.ISaveEventListener;
 
 /**
  * Service to registry SaveListener for Uncontrol.
@@ -56,7 +57,7 @@ public class ControlModeService implements IService {
 	 */
 	public void init(ServicesRegistry servicesRegistry) throws ServiceException {
 
-		lifeCycleEventsProvider = ServiceUtils.getInstance().getILifeCycleEventsProvider(servicesRegistry);
+		lifeCycleEventsProvider = ServiceUtils.getInstance().getService(ILifeCycleEventsProvider.class, servicesRegistry);
 		uncontrolledObjectsProvider = ServiceUtils.getInstance().getService(IUncontrolledObjectsProvider.class, servicesRegistry);
 
 
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode/src/org/eclipse/papyrus/infra/services/controlmode/ui/OptionalMessageDialog.java b/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode/src/org/eclipse/papyrus/infra/services/controlmode/ui/OptionalMessageDialog.java
index d44e0f786e3..3f36fd63072 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode/src/org/eclipse/papyrus/infra/services/controlmode/ui/OptionalMessageDialog.java
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode/src/org/eclipse/papyrus/infra/services/controlmode/ui/OptionalMessageDialog.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2011 IBM Corporation and others.
+ * Copyright (c) 2000, 2016 IBM Corporation, 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
  * which accompanies this distribution, and is available at
@@ -7,13 +7,14 @@
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
+ *     Christian W. Damus - bug 485220
  *******************************************************************************/
 package org.eclipse.papyrus.infra.services.controlmode.ui;
 
 import org.eclipse.jface.dialogs.IDialogConstants;
 import org.eclipse.jface.dialogs.IDialogSettings;
 import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.papyrus.infra.core.Activator;
+import org.eclipse.papyrus.infra.services.controlmode.ControlModePlugin;
 import org.eclipse.papyrus.infra.services.controlmode.messages.Messages;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.SelectionAdapter;
@@ -111,10 +112,10 @@ public class OptionalMessageDialog extends MessageDialog {
 	 * @return the settings to be used
 	 */
 	private static IDialogSettings getDialogSettings() {
-		IDialogSettings settings = Activator.getDefault().getDialogSettings();
+		IDialogSettings settings = ControlModePlugin.getDefault().getDialogSettings();
 		settings = settings.getSection(STORE_ID);
 		if (settings == null) {
-			settings = Activator.getDefault().getDialogSettings().addNewSection(STORE_ID);
+			settings = ControlModePlugin.getDefault().getDialogSettings().addNewSection(STORE_ID);
 		}
 		return settings;
 	}
@@ -139,7 +140,7 @@ public class OptionalMessageDialog extends MessageDialog {
 	 * Clears all remembered information about hidden dialogs
 	 */
 	public static void clearAllRememberedStates() {
-		IDialogSettings settings = Activator.getDefault().getDialogSettings();
+		IDialogSettings settings = ControlModePlugin.getDefault().getDialogSettings();
 		settings.addNewSection(STORE_ID);
 	}
 }
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.navigation/META-INF/MANIFEST.MF b/plugins/infra/services/org.eclipse.papyrus.infra.services.navigation/META-INF/MANIFEST.MF
index 78ab51e991f..13e90b26c28 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.navigation/META-INF/MANIFEST.MF
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.navigation/META-INF/MANIFEST.MF
@@ -7,7 +7,8 @@ Require-Bundle: org.eclipse.ui,
  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.widgets;bundle-version="1.2.0",

- org.eclipse.jface

+ org.eclipse.jface,

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

 Bundle-Vendor: Eclipse Modeling Project

 Bundle-ActivationPolicy: lazy

 Bundle-Version: 1.2.0.qualifier

diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.navigation/src/org/eclipse/papyrus/infra/services/navigation/provider/impl/ActiveEditorNavigationTargetProvider.java b/plugins/infra/services/org.eclipse.papyrus.infra.services.navigation/src/org/eclipse/papyrus/infra/services/navigation/provider/impl/ActiveEditorNavigationTargetProvider.java
index 837ce51f8be..01aa8a27373 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.navigation/src/org/eclipse/papyrus/infra/services/navigation/provider/impl/ActiveEditorNavigationTargetProvider.java
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.navigation/src/org/eclipse/papyrus/infra/services/navigation/provider/impl/ActiveEditorNavigationTargetProvider.java
@@ -13,10 +13,10 @@
  *****************************************************************************/

 package org.eclipse.papyrus.infra.services.navigation.provider.impl;

 

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

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

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

 import org.eclipse.papyrus.infra.services.navigation.provider.NavigationTargetProvider;

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

 import org.eclipse.papyrus.infra.widgets.util.IRevealSemanticElement;

 import org.eclipse.papyrus.infra.widgets.util.NavigationTarget;

 import org.eclipse.papyrus.infra.widgets.util.RevealSemanticElementWrapper;

diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.openelement/META-INF/MANIFEST.MF b/plugins/infra/services/org.eclipse.papyrus.infra.services.openelement/META-INF/MANIFEST.MF
index 9bb19169d4e..61829247955 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.openelement/META-INF/MANIFEST.MF
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.openelement/META-INF/MANIFEST.MF
@@ -9,7 +9,10 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0",

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

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

- org.eclipse.papyrus.infra.services.navigation;bundle-version="1.2.0"

+ org.eclipse.papyrus.infra.services.navigation;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.sashwindows.di;bundle-version="1.2.0"

 Bundle-Vendor: Eclipse Modeling Project

 Bundle-ActivationPolicy: lazy

 Bundle-Version: 1.2.0.qualifier

diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.openelement/src/org/eclipse/papyrus/infra/services/openelement/service/OpenElementService.java b/plugins/infra/services/org.eclipse.papyrus.infra.services.openelement/src/org/eclipse/papyrus/infra/services/openelement/service/OpenElementService.java
index 7c2b5000a27..00e19b6c125 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.openelement/src/org/eclipse/papyrus/infra/services/openelement/service/OpenElementService.java
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.openelement/src/org/eclipse/papyrus/infra/services/openelement/service/OpenElementService.java
@@ -12,9 +12,9 @@
 package org.eclipse.papyrus.infra.services.openelement.service;

 

 import org.eclipse.emf.ecore.EObject;

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

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

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

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

 import org.eclipse.ui.PartInitException;

 

 /**

diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.openelement/src/org/eclipse/papyrus/infra/services/openelement/service/impl/OpenElementServiceImpl.java b/plugins/infra/services/org.eclipse.papyrus.infra.services.openelement/src/org/eclipse/papyrus/infra/services/openelement/service/impl/OpenElementServiceImpl.java
index f1579e31a0f..94505d40048 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.openelement/src/org/eclipse/papyrus/infra/services/openelement/service/impl/OpenElementServiceImpl.java
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.openelement/src/org/eclipse/papyrus/infra/services/openelement/service/impl/OpenElementServiceImpl.java
@@ -29,18 +29,18 @@ import org.eclipse.emf.ecore.EStructuralFeature;
 import org.eclipse.emf.ecore.resource.Resource;

 import org.eclipse.emf.ecore.util.EcoreUtil;

 import org.eclipse.emf.transaction.RunnableWithResult;

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

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

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

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

 import org.eclipse.papyrus.infra.core.resource.sasheditor.SashModel;

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

+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.EMFHelper;

 import org.eclipse.papyrus.infra.services.navigation.service.NavigationService;

 import org.eclipse.papyrus.infra.services.openelement.Activator;

 import org.eclipse.papyrus.infra.services.openelement.service.OpenElementService;

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

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

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

 import org.eclipse.swt.widgets.Display;

 import org.eclipse.ui.IEditorInput;

 import org.eclipse.ui.IWorkbenchPage;

diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.preferences/META-INF/MANIFEST.MF b/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.preferences/META-INF/MANIFEST.MF
index 9795e217a31..4d0609a636d 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.preferences/META-INF/MANIFEST.MF
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.preferences/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.core.resources;bundle-version="3.8.0",

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

- org.eclipse.papyrus.infra.services.resourceloading;bundle-version="1.2.0"

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

+ org.eclipse.emf.common;bundle-version="2.12.0"

 Bundle-Vendor: %providerName

 Bundle-ActivationPolicy: lazy

 Bundle-Version: 1.2.0.qualifier

diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/META-INF/MANIFEST.MF b/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/META-INF/MANIFEST.MF
index b55fc457e2c..d21ae07957e 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/META-INF/MANIFEST.MF
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/META-INF/MANIFEST.MF
@@ -13,11 +13,13 @@ Require-Bundle: org.eclipse.papyrus.infra.core;bundle-version="1.2.0",
  org.eclipse.gmf.runtime.notation;bundle-version="1.5.0",

  org.eclipse.gmf.runtime.diagram.ui;bundle-version="1.5.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",

  org.eclipse.ui.ide;bundle-version="3.8.0",

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

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

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

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

+ org.eclipse.papyrus.infra.emf;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/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/plugin.xml b/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/plugin.xml
index 88f75898483..a98ea1234d0 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/plugin.xml
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/plugin.xml
@@ -39,7 +39,7 @@
       </loadingStrategy>

    </extension>

    <extension

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

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

       <editorDiagram

             factoryClass="org.eclipse.papyrus.infra.services.resourceloading.editor.UnloadResourcesEditorFactory">

       </editorDiagram>

diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/src/org/eclipse/papyrus/infra/services/resourceloading/editor/UnloadResourcesEditorFactory.java b/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/src/org/eclipse/papyrus/infra/services/resourceloading/editor/UnloadResourcesEditorFactory.java
index 7f33cf92a82..0c4f87fc896 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/src/org/eclipse/papyrus/infra/services/resourceloading/editor/UnloadResourcesEditorFactory.java
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/src/org/eclipse/papyrus/infra/services/resourceloading/editor/UnloadResourcesEditorFactory.java
@@ -4,10 +4,10 @@ import org.eclipse.emf.common.util.URI;
 import org.eclipse.emf.ecore.EObject;

 import org.eclipse.emf.ecore.InternalEObject;

 import org.eclipse.emf.ecore.xml.type.AnyType;

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

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

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

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

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

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

 

 

 public class UnloadResourcesEditorFactory implements IPluggableEditorFactory {

diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/src/org/eclipse/papyrus/infra/services/resourceloading/strategies/AskUserStrategy.java b/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/src/org/eclipse/papyrus/infra/services/resourceloading/strategies/AskUserStrategy.java
index 77c2aa65b9e..94f12c8d020 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/src/org/eclipse/papyrus/infra/services/resourceloading/strategies/AskUserStrategy.java
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/src/org/eclipse/papyrus/infra/services/resourceloading/strategies/AskUserStrategy.java
@@ -26,11 +26,11 @@ import org.eclipse.emf.common.util.URI;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.resource.Resource;
 import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.papyrus.infra.core.editor.IMultiDiagramEditor;
 import org.eclipse.papyrus.infra.core.resource.ModelSet;
-import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IPageManager;
+import org.eclipse.papyrus.infra.core.sashwindows.di.service.IPageManager;
 import org.eclipse.papyrus.infra.core.services.ServiceException;
 import org.eclipse.papyrus.infra.services.resourceloading.ILoadingStrategy;
+import org.eclipse.papyrus.infra.ui.editor.IMultiDiagramEditor;
 import org.eclipse.papyrus.infra.widgets.toolbox.notification.INotification;
 import org.eclipse.papyrus.infra.widgets.toolbox.notification.NotificationRunnable;
 import org.eclipse.papyrus.infra.widgets.toolbox.notification.Type;
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/src/org/eclipse/papyrus/infra/services/resourceloading/util/LoadingUtils.java b/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/src/org/eclipse/papyrus/infra/services/resourceloading/util/LoadingUtils.java
index d74bc11d2dd..4944ada0793 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/src/org/eclipse/papyrus/infra/services/resourceloading/util/LoadingUtils.java
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/src/org/eclipse/papyrus/infra/services/resourceloading/util/LoadingUtils.java
@@ -38,15 +38,15 @@ import org.eclipse.gef.util.EditPartUtilities;
 import org.eclipse.gmf.runtime.diagram.ui.parts.IDiagramGraphicalViewer;
 import org.eclipse.gmf.runtime.notation.Diagram;
 import org.eclipse.jface.operation.IRunnableWithProgress;
-import org.eclipse.papyrus.infra.core.editor.IMultiDiagramEditor;
 import org.eclipse.papyrus.infra.core.resource.ModelSet;
 import org.eclipse.papyrus.infra.core.resource.sasheditor.DiModel;
-import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IPageManager;
+import org.eclipse.papyrus.infra.core.sashwindows.di.service.IPageManager;
 import org.eclipse.papyrus.infra.core.services.ServiceException;
-import org.eclipse.papyrus.infra.core.utils.TransactionHelper;
 import org.eclipse.papyrus.infra.gmfdiag.common.model.NotationModel;
 import org.eclipse.papyrus.infra.services.resourceloading.Activator;
 import org.eclipse.papyrus.infra.services.resourceloading.Messages;
+import org.eclipse.papyrus.infra.ui.editor.IMultiDiagramEditor;
+import org.eclipse.papyrus.infra.ui.util.TransactionUIHelper;
 import org.eclipse.papyrus.infra.widgets.toolbox.notification.Type;
 import org.eclipse.papyrus.infra.widgets.toolbox.notification.builders.NotificationBuilder;
 import org.eclipse.papyrus.uml.tools.model.UmlModel;
@@ -268,7 +268,7 @@ public class LoadingUtils {
 											Diagram diag = ((Diagram) eobject);
 											if (pageMngr.isOpen(diag)) {
 
-												IDiagramGraphicalViewer graphicalViewer = (IDiagramGraphicalViewer) core.getAdapter(IDiagramGraphicalViewer.class);
+												IDiagramGraphicalViewer graphicalViewer = core.getAdapter(IDiagramGraphicalViewer.class);
 												if (graphicalViewer == null) {
 													continue;
 												}
@@ -308,11 +308,11 @@ public class LoadingUtils {
 	}
 
 	static void runInEditingDomain(TransactionalEditingDomain domain, IEditorPart editorContext, IRunnableWithProgress operation) {
-		final IWorkbenchSiteProgressService progress = (IWorkbenchSiteProgressService) editorContext.getSite().getService(IWorkbenchSiteProgressService.class);
+		final IWorkbenchSiteProgressService progress = editorContext.getSite().getService(IWorkbenchSiteProgressService.class);
 
 		try {
 			progress.incrementBusy();
-			progress.busyCursorWhile(TransactionHelper.createPrivilegedRunnableWithProgress(domain, operation));
+			progress.busyCursorWhile(TransactionUIHelper.createPrivilegedRunnableWithProgress(domain, operation));
 		} catch (InterruptedException e) {
 			Activator.log.error(e);
 		} catch (InvocationTargetException e) {
@@ -329,6 +329,7 @@ public class LoadingUtils {
 	 * @see #getExtensions(ModelSet)
 	 */
 	private static final Set<String> COMMON_EXTENSIONS = new HashSet<String>();
+
 	static {
 		COMMON_EXTENSIONS.add(UmlModel.UML_FILE_EXTENSION);
 		COMMON_EXTENSIONS.add(NotationModel.NOTATION_FILE_EXTENSION);
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.validation/META-INF/MANIFEST.MF b/plugins/infra/services/org.eclipse.papyrus.infra.services.validation/META-INF/MANIFEST.MF
index 6de36ac057f..d89c4ab7b87 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.validation/META-INF/MANIFEST.MF
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.validation/META-INF/MANIFEST.MF
@@ -17,7 +17,8 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.2.0",

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

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

- org.eclipse.papyrus.infra.services.markerlistener;bundle-version="1.2.0"

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

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

 Bundle-Vendor: %pluginProvider

 Bundle-ActivationPolicy: lazy

 Bundle-Version: 1.2.0.qualifier

diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.validation/src/org/eclipse/papyrus/infra/services/validation/preferences/PreferencePage.java b/plugins/infra/services/org.eclipse.papyrus.infra.services.validation/src/org/eclipse/papyrus/infra/services/validation/preferences/PreferencePage.java
index 84251fa911c..cfea834cf2a 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.validation/src/org/eclipse/papyrus/infra/services/validation/preferences/PreferencePage.java
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.validation/src/org/eclipse/papyrus/infra/services/validation/preferences/PreferencePage.java
@@ -17,13 +17,13 @@ import org.eclipse.emf.common.notify.impl.NotificationImpl;
 import org.eclipse.jface.preference.BooleanFieldEditor;
 import org.eclipse.jface.preference.FieldEditorPreferencePage;
 import org.eclipse.jface.preference.RadioGroupFieldEditor;
-import org.eclipse.papyrus.infra.core.editor.IMultiDiagramEditor;
 import org.eclipse.papyrus.infra.core.resource.ModelSet;
 import org.eclipse.papyrus.infra.core.services.ServiceException;
 import org.eclipse.papyrus.infra.core.services.ServicesRegistry;
-import org.eclipse.papyrus.infra.core.utils.EditorUtils;
 import org.eclipse.papyrus.infra.services.validation.Activator;
 import org.eclipse.papyrus.infra.services.validation.Messages;
+import org.eclipse.papyrus.infra.ui.editor.IMultiDiagramEditor;
+import org.eclipse.papyrus.infra.ui.util.EditorUtils;
 import org.eclipse.ui.IWorkbench;
 import org.eclipse.ui.IWorkbenchPreferencePage;