Bug 571948 - [Core][Editor] When the editor is opening the tool should

display progress informations

* Export IStatusService as api

Change-Id: Ibc6fdb202d3640f08a526384d63d4c883840d68b
Signed-off-by: Pauline DEVILLE <pauline.deville@cea.fr>
Signed-off-by: Vincent Lorenzo <vincent.lorenzo@cea.fr>

17 files changed, 44 insertions, 34 deletions

diff --git a/features/papyrus-main-features/org.eclipse.papyrus.infra.nattable.feature/pom.xml b/features/papyrus-main-features/org.eclipse.papyrus.infra.nattable.feature/pom.xml
index 3b816531f10..e678548d784 100644
--- a/features/papyrus-main-features/org.eclipse.papyrus.infra.nattable.feature/pom.xml
+++ b/features/papyrus-main-features/org.eclipse.papyrus.infra.nattable.feature/pom.xml
@@ -1,10 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
-	    <groupId>org.eclipse.papyrus</groupId>
-	    <artifactId>org.eclipse.papyrus.features</artifactId>
-	    <version>0.0.1-SNAPSHOT</version>
+		<groupId>org.eclipse.papyrus</groupId>
+		<artifactId>org.eclipse.papyrus.features</artifactId>
+		<version>0.0.1-SNAPSHOT</version>
 	</parent>
 	<artifactId>org.eclipse.papyrus.infra.nattable.feature</artifactId>
 	<version>4.0.0-SNAPSHOT</version>
diff --git a/features/papyrus-main-features/org.eclipse.papyrus.infra.services.feature/pom.xml b/features/papyrus-main-features/org.eclipse.papyrus.infra.services.feature/pom.xml
index 1875f142102..1fe20f2e817 100644
--- a/features/papyrus-main-features/org.eclipse.papyrus.infra.services.feature/pom.xml
+++ b/features/papyrus-main-features/org.eclipse.papyrus.infra.services.feature/pom.xml
@@ -1,10 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
-	    <groupId>org.eclipse.papyrus</groupId>
-	    <artifactId>org.eclipse.papyrus.features</artifactId>
-	    <version>0.0.1-SNAPSHOT</version>
+		<groupId>org.eclipse.papyrus</groupId>
+		<artifactId>org.eclipse.papyrus.features</artifactId>
+		<version>0.0.1-SNAPSHOT</version>
 	</parent>
 	<artifactId>org.eclipse.papyrus.infra.services.feature</artifactId>
 	<version>3.0.0-SNAPSHOT</version>
diff --git a/features/papyrus-main-features/org.eclipse.papyrus.infra.ui.feature/feature.xml b/features/papyrus-main-features/org.eclipse.papyrus.infra.ui.feature/feature.xml
index 41e251a7421..6d5478ca634 100644
--- a/features/papyrus-main-features/org.eclipse.papyrus.infra.ui.feature/feature.xml
+++ b/features/papyrus-main-features/org.eclipse.papyrus.infra.ui.feature/feature.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <feature
       id="org.eclipse.papyrus.infra.ui.feature"
-      version="3.0.0.qualifier"
       label="%featureName"
-      provider-name="%providerName" 
+      version="3.1.0.qualifier"
+      provider-name="%providerName"
       license-feature="org.eclipse.license"
       license-feature-version="2.0.2">
 
diff --git a/features/papyrus-main-features/org.eclipse.papyrus.infra.ui.feature/pom.xml b/features/papyrus-main-features/org.eclipse.papyrus.infra.ui.feature/pom.xml
index 66cb26a91c3..9f921e530c2 100644
--- a/features/papyrus-main-features/org.eclipse.papyrus.infra.ui.feature/pom.xml
+++ b/features/papyrus-main-features/org.eclipse.papyrus.infra.ui.feature/pom.xml
@@ -1,12 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
-	    <groupId>org.eclipse.papyrus</groupId>
-	    <artifactId>org.eclipse.papyrus.features</artifactId>
-	    <version>0.0.1-SNAPSHOT</version>
+		<groupId>org.eclipse.papyrus</groupId>
+		<artifactId>org.eclipse.papyrus.features</artifactId>
+		<version>0.0.1-SNAPSHOT</version>
 	</parent>
 	<artifactId>org.eclipse.papyrus.infra.ui.feature</artifactId>
-	<version>3.0.0-SNAPSHOT</version>
+	<version>3.1.0-SNAPSHOT</version>
 	<packaging>eclipse-feature</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/.classpath b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/.classpath
index e801ebfb468..b1592a80554 100644
--- a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/.classpath
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/.classpath
@@ -3,5 +3,6 @@
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="src" path="api"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/.settings/.api_filters b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/.settings/.api_filters
deleted file mode 100644
index 182b0a9ba3c..00000000000
--- a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/.settings/.api_filters
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<component id="org.eclipse.papyrus.infra.ui" version="2">
-    <resource path="META-INF/MANIFEST.MF">
-        <filter id="926941240">
-            <message_arguments>
-                <message_argument value="3.1.0"/>
-                <message_argument value="3.0.0"/>
-            </message_arguments>
-        </filter>
-    </resource>
-</component>
diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/META-INF/MANIFEST.MF b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/META-INF/MANIFEST.MF
index afff5ae0631..69d5d9722b8 100644
--- a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/META-INF/MANIFEST.MF
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/META-INF/MANIFEST.MF
@@ -1,5 +1,6 @@
 Manifest-Version: 1.0
 Export-Package: org.eclipse.papyrus.infra.ui,
+ org.eclipse.papyrus.infra.ui.api.services,
  org.eclipse.papyrus.infra.ui.command,
  org.eclipse.papyrus.infra.ui.contentoutline,
  org.eclipse.papyrus.infra.ui.converter,
@@ -44,7 +45,7 @@ Require-Bundle: org.eclipse.core.databinding;bundle-version="[1.9.0,2.0.0)",
  org.eclipse.ui.views.properties.tabbed;bundle-version="[3.8.0,4.0.0)",
  org.eclipse.uml2.types;bundle-version="[2.5.0,3.0.0)"
 Bundle-Vendor: %providerName
-Bundle-Version: 3.1.100.qualifier
+Bundle-Version: 3.2.0.qualifier
 Eclipse-BuddyPolicy: dependent
 Bundle-ManifestVersion: 2
 Bundle-Activator: org.eclipse.papyrus.infra.ui.Activator
diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/internal/services/status/IStatusService.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/api/org/eclipse/papyrus/infra/ui/api/services/IStatusService.java
index f0a48bbc9e8..a8002149d6c 100644
--- a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/internal/services/status/IStatusService.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/api/org/eclipse/papyrus/infra/ui/api/services/IStatusService.java
@@ -13,10 +13,12 @@
  *
  *****************************************************************************/
 
-package org.eclipse.papyrus.infra.ui.internal.services.status;
+package org.eclipse.papyrus.infra.ui.api.services;
 
 /**
  * This OSGI service should be use to display a dialog with ProgressBar and trace the evolution of an operation
+ *
+ * @since 3.2
  */
 public interface IStatusService {
 
diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/internal/services/status/StatusServiceEvent.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/api/org/eclipse/papyrus/infra/ui/api/services/StatusServiceEvent.java
index 63ee3bdbc7d..a887a59165f 100644
--- a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/internal/services/status/StatusServiceEvent.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/api/org/eclipse/papyrus/infra/ui/api/services/StatusServiceEvent.java
@@ -13,10 +13,12 @@
  *
  *****************************************************************************/
 
-package org.eclipse.papyrus.infra.ui.internal.services.status;
+package org.eclipse.papyrus.infra.ui.api.services;
 
 /**
  * Events used by the status service
+ *
+ * @since 3.2
  */
 public interface StatusServiceEvent {
 
diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/build.properties b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/build.properties
index 404777cc537..6d022d322e6 100644
--- a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/build.properties
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/build.properties
@@ -1,4 +1,5 @@
-source.. = src/
+source.. = 	src/,\
+			api/			
 output.. = bin/
 bin.includes = plugin.xml,\
                META-INF/,\
diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/pom.xml b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/pom.xml
index cb5214c2f6a..77ba081eec3 100644
--- a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/pom.xml
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/pom.xml
@@ -9,7 +9,7 @@
 		<version>0.0.1-SNAPSHOT</version>
 	</parent>
 	<artifactId>org.eclipse.papyrus.infra.ui</artifactId>
-	<version>3.1.100-SNAPSHOT</version>
+	<version>3.2.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 	<description>Plugin dedicated to manage generic menus and actions, linked to EMF but not to UML nor GMF technologies.</description>
 </project>
\ No newline at end of file
diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/Activator.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/Activator.java
index 0b88cf77696..3ede5b6fadb 100644
--- a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/Activator.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/Activator.java
@@ -23,7 +23,7 @@ import org.eclipse.papyrus.infra.core.services.ServicesRegistry;
 import org.eclipse.papyrus.infra.core.services.spi.IContextualServiceRegistryTracker;
 import org.eclipse.papyrus.infra.tools.spi.IExecutorServiceFactory;
 import org.eclipse.papyrus.infra.tools.spi.INotificationBuilderFactory;
-import org.eclipse.papyrus.infra.ui.internal.services.status.IStatusService;
+import org.eclipse.papyrus.infra.ui.api.services.IStatusService;
 import org.eclipse.papyrus.infra.ui.internal.services.status.StatusService;
 import org.eclipse.papyrus.infra.ui.util.UIUtil;
 import org.eclipse.papyrus.infra.ui.util.WorkbenchPartHelper;
diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editor/CoreMultiDiagramEditor.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editor/CoreMultiDiagramEditor.java
index b94f31b759c..935794df58d 100644
--- a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editor/CoreMultiDiagramEditor.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editor/CoreMultiDiagramEditor.java
@@ -77,13 +77,13 @@ import org.eclipse.papyrus.infra.core.utils.ServiceUtils;
 import org.eclipse.papyrus.infra.emf.resource.ICrossReferenceIndex;
 import org.eclipse.papyrus.infra.emf.resource.ShardResourceLocator;
 import org.eclipse.papyrus.infra.ui.Activator;
+import org.eclipse.papyrus.infra.ui.api.services.IStatusService;
 import org.eclipse.papyrus.infra.ui.contentoutline.ContentOutlineRegistry;
 import org.eclipse.papyrus.infra.ui.editor.IReloadableEditor.DirtyPolicy;
 import org.eclipse.papyrus.infra.ui.editor.reload.EditorReloadEvent;
 import org.eclipse.papyrus.infra.ui.editor.reload.IEditorReloadListener;
 import org.eclipse.papyrus.infra.ui.internal.services.status.BeginStatusEvent;
 import org.eclipse.papyrus.infra.ui.internal.services.status.EndStatusEvent;
-import org.eclipse.papyrus.infra.ui.internal.services.status.IStatusService;
 import org.eclipse.papyrus.infra.ui.internal.services.status.StepStatusEvent;
 import org.eclipse.papyrus.infra.ui.lifecycleevents.DoSaveEvent;
 import org.eclipse.papyrus.infra.ui.lifecycleevents.IEditorInputChangedListener;
diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/internal/services/status/BeginStatusEvent.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/internal/services/status/BeginStatusEvent.java
index fbc42fea9ed..ac9bbb90e6c 100644
--- a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/internal/services/status/BeginStatusEvent.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/internal/services/status/BeginStatusEvent.java
@@ -15,6 +15,8 @@
 
 package org.eclipse.papyrus.infra.ui.internal.services.status;
 
+import org.eclipse.papyrus.infra.ui.api.services.StatusServiceEvent;
+
 /**
  * This is an event send at the end of the execution we want to trace
  *
diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/internal/services/status/EndStatusEvent.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/internal/services/status/EndStatusEvent.java
index d83e4b3569f..8e32ff9bceb 100644
--- a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/internal/services/status/EndStatusEvent.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/internal/services/status/EndStatusEvent.java
@@ -15,6 +15,8 @@
 
 package org.eclipse.papyrus.infra.ui.internal.services.status;
 
+import org.eclipse.papyrus.infra.ui.api.services.StatusServiceEvent;
+
 /**
  * This is an event send at the end of the execution we want to trace
  */
diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/internal/services/status/StatusService.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/internal/services/status/StatusService.java
index 4be8d4d1092..85faee7fef5 100644
--- a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/internal/services/status/StatusService.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/internal/services/status/StatusService.java
@@ -16,6 +16,8 @@
 package org.eclipse.papyrus.infra.ui.internal.services.status;
 
 import org.eclipse.papyrus.infra.ui.Activator;
+import org.eclipse.papyrus.infra.ui.api.services.IStatusService;
+import org.eclipse.papyrus.infra.ui.api.services.StatusServiceEvent;
 import org.eclipse.swt.widgets.Display;
 import org.eclipse.swt.widgets.Shell;
 
@@ -33,7 +35,7 @@ public class StatusService implements IStatusService {
 
 	/**
 	 *
-	 * @see org.eclipse.papyrus.infra.ui.internal.services.status.IStatusService#trigger(org.eclipse.papyrus.infra.ui.internal.services.status.StatusServiceEvent)
+	 * @see org.eclipse.papyrus.infra.ui.api.services.IStatusService#trigger(org.eclipse.papyrus.infra.ui.api.services.StatusServiceEvent)
 	 *
 	 * @param event
 	 */
diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/internal/services/status/StepStatusEvent.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/internal/services/status/StepStatusEvent.java
index 0dac746699a..2200f4bb0c4 100644
--- a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/internal/services/status/StepStatusEvent.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/internal/services/status/StepStatusEvent.java
@@ -15,6 +15,8 @@
 
 package org.eclipse.papyrus.infra.ui.internal.services.status;
 
+import org.eclipse.papyrus.infra.ui.api.services.StatusServiceEvent;
+
 /**
  * This is an event send during an execution to trace a step of it
  */