[439898] Move ModelingModelProvider from oes.ui to oes

Bug: 439898
Change-Id: I6ef6c94730d220e05226c9f39c2cdf1708a71c14
Signed-off-by: Pierre-Charles David <pierre-charles.david@obeo.fr>

15 files changed, 73 insertions, 84 deletions

diff --git a/plugins/org.eclipse.sirius.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.sirius.ui/META-INF/MANIFEST.MF
index 19c15f1504..3ace9c0556 100644
--- a/plugins/org.eclipse.sirius.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.sirius.ui/META-INF/MANIFEST.MF
@@ -50,8 +50,8 @@ Export-Package: org.eclipse.sirius.ui.business.api.action;version="2.0.4",
  org.eclipse.sirius.ui.tools.api.views.common.item;version="2.0.4",
  org.eclipse.sirius.ui.tools.api.views.modelexplorerview;version="2.0.4",
  org.eclipse.sirius.ui.tools.api.views.modelexplorerview.resourcelistener;version="2.0.4",
- org.eclipse.sirius.ui.tools.api.wizards.page;version="2.0.4",
  org.eclipse.sirius.ui.tools.api.wizards;version="5.1.0",
+ org.eclipse.sirius.ui.tools.api.wizards.page;version="2.0.4",
  org.eclipse.sirius.ui.tools.internal.actions.analysis;version="2.0.4";x-internal:=true,
  org.eclipse.sirius.ui.tools.internal.actions.control;version="2.0.4";x-internal:=true,
  org.eclipse.sirius.ui.tools.internal.actions.copy;version="2.0.4";x-internal:=true,
@@ -77,7 +77,6 @@ Export-Package: org.eclipse.sirius.ui.business.api.action;version="2.0.4",
  org.eclipse.sirius.ui.tools.internal.views.common.item;version="2.0.4";x-internal:=true,
  org.eclipse.sirius.ui.tools.internal.views.common.modelingproject;version="2.0.5";x-internal:=true,
  org.eclipse.sirius.ui.tools.internal.views.common.modelingproject.manager;version="2.0.4";x-internal:=true,
- org.eclipse.sirius.ui.tools.internal.views.common.modelingproject.model;version="2.0.4";x-internal:=true,
  org.eclipse.sirius.ui.tools.internal.views.common.modelingproject.resourcelistener;version="2.0.4";x-internal:=true,
  org.eclipse.sirius.ui.tools.internal.views.common.navigator;version="3.0.0";x-internal:=true,
  org.eclipse.sirius.ui.tools.internal.views.common.navigator.adapters;version="2.0.4";x-internal:=true,
diff --git a/plugins/org.eclipse.sirius.ui/plugin.properties b/plugins/org.eclipse.sirius.ui/plugin.properties
index 70ce8451e0..2e99afdf1f 100644
--- a/plugins/org.eclipse.sirius.ui/plugin.properties
+++ b/plugins/org.eclipse.sirius.ui/plugin.properties
@@ -1,5 +1,5 @@
 # ====================================================================
-# Copyright (c) 2007, 2017 THALES GLOBAL SERVICES and others.
+# Copyright (c) 2007, 2018 THALES GLOBAL SERVICES 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
@@ -198,12 +198,6 @@ Messages_createRepresentationInputDialog_NewRepresentationNameLabel=Name:
 Messages_createRepresentationInputDialog_RepresentationDescriptionLabel=Representation description: {0}
 Messages_createRepresentationInputDialog_Title=New {0}
 Messages_createRepresentationInputDialog_DefaultRepresentationDescName=Representation
-ModelingModelProvider_addAnotherRepresentationFile = Add another representations file to "{0}" may invalidate it.
-ModelingModelProvider_addAnotherRepresentationFileSeveralProjects = Add another representations file to {0} may invalidate them.
-ModelingModelProvider_mainRepresentationFileDeleted = Deletion of the main representations file of "{0}" will invalidate it.
-ModelingModelProvider_mainRepresentationFilesOfSomeProjectsDeleted = Deletion of the main representations files of some modeling projects ({0}) will invalidate them.
-ModelingModelProvider_satusUnsaveDataWillBeLostWithProjectNames = Some modeling projects ({0}) contain unsaved data. This data will be lost.
-ModelingModelProvider_satusUnsavedDataWillBeLost = This modeling project contains unsaved data. This data will be lost.
 ModelingProjectManagerImpl_addingModelingNatureTask = Add Modeling Project nature
 ModelingProjectManagerImpl_convertToModelingProjectTask = Conversion to Modeling Project
 ModelingProjectManagerImpl_createModelingProjectTask = Modeling Project creation : {0}
@@ -396,7 +390,6 @@ ViewpointsSelectionWizardPage_documentation_none = No documentation available
 ViewpointsSelectionWizardPage_documentation_title = Documentation
 ViewpointsSelectionWizardPage_message = Select viewpoints to activate
 ViewpointsSelectionWizardPage_title = Select viewpoints
-ModelingModelProvider.name=Sirius Modeling Workspace
 category.siriusCommands.name = Sirius Commands
 command.control.name = Control
 command.uncontrol.name = Uncontrol
@@ -432,7 +425,6 @@ migrateODesignToODesignActionLabel=Migrate Description File
 navigatorContent.siriusContent.name = Sirius Content Management
 propertyTab.default.label = Default
 repairActionLabel=Repair
-InvalidModelingProjectMarkerUpdaterJob_updateMarkers = Update Markers
 
 _Pref_RefreshOnRepresentationOpening = true
 _Pref_AutoRefresh = true
diff --git a/plugins/org.eclipse.sirius.ui/plugin.xml b/plugins/org.eclipse.sirius.ui/plugin.xml
index 8a37746ad7..b71540ee2d 100644
--- a/plugins/org.eclipse.sirius.ui/plugin.xml
+++ b/plugins/org.eclipse.sirius.ui/plugin.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?eclipse version="3.0"?>
 <!--
-  Copyright (c) 2007, 2011 THALES GLOBAL SERVICES
+  Copyright (c) 2007, 2018 THALES GLOBAL SERVICES 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
@@ -592,20 +592,6 @@
 	        name="%_UI_ModelingProjectWizard_label">
 	</command>
 	</extension>
-	
-		
-   <extension
-         id="modelProvider"
-         name="%ModelingModelProvider.name"
-         point="org.eclipse.core.resources.modelProviders">
-      <modelProvider
-            class="org.eclipse.sirius.ui.tools.internal.views.common.modelingproject.model.ModelingModelProvider"/>
-      <extends-model id="org.eclipse.core.resources.modelProvider"/>
-      <enablement>
-          <test property="org.eclipse.core.resources.projectNature" value="org.eclipse.sirius.nature.modelingproject" />
-      </enablement>
-   </extension>
-
    
    <extension point="org.eclipse.emf.edit.itemProviderAdapterFactories">
       <!-- @generated contribution -->
diff --git a/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/api/views/modelexplorerview/resourcelistener/DefaultModelingProjectResourceListener.java b/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/api/views/modelexplorerview/resourcelistener/DefaultModelingProjectResourceListener.java
index 60dd6238ee..5cfb90de63 100644
--- a/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/api/views/modelexplorerview/resourcelistener/DefaultModelingProjectResourceListener.java
+++ b/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/api/views/modelexplorerview/resourcelistener/DefaultModelingProjectResourceListener.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2011, 2017 THALES GLOBAL SERVICES.
+ * Copyright (c) 2011, 2018 THALES GLOBAL SERVICES 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
@@ -25,9 +25,9 @@ import org.eclipse.sirius.business.api.modelingproject.ModelingProject;
 import org.eclipse.sirius.business.api.session.Session;
 import org.eclipse.sirius.business.internal.modelingproject.manager.AttachSemanticResourcesJob;
 import org.eclipse.sirius.business.internal.modelingproject.manager.InitializeModelingProjectJob;
+import org.eclipse.sirius.business.internal.modelingproject.marker.InvalidModelingProjectMarkerUpdaterJob;
 import org.eclipse.sirius.ext.base.Option;
 import org.eclipse.sirius.ui.tools.api.project.ModelingProjectManager;
-import org.eclipse.sirius.ui.tools.internal.views.common.modelingproject.InvalidModelingProjectMarkerUpdaterJob;
 import org.eclipse.sirius.viewpoint.provider.SiriusEditPlugin;
 
 import com.google.common.collect.Lists;
diff --git a/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/internal/views/common/navigator/OpenSessionOnExpandListener.java b/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/internal/views/common/navigator/OpenSessionOnExpandListener.java
index 18edef81a8..0ddcfb6a38 100644
--- a/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/internal/views/common/navigator/OpenSessionOnExpandListener.java
+++ b/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/internal/views/common/navigator/OpenSessionOnExpandListener.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2011, 2016 THALES GLOBAL SERVICES and others.
+ * Copyright (c) 2011, 2018 THALES GLOBAL SERVICES 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
@@ -27,10 +27,10 @@ import org.eclipse.jface.viewers.TreeExpansionEvent;
 import org.eclipse.sirius.business.api.helper.SiriusUtil;
 import org.eclipse.sirius.business.api.modelingproject.AbstractRepresentationsFileJob;
 import org.eclipse.sirius.business.api.modelingproject.ModelingProject;
+import org.eclipse.sirius.business.internal.modelingproject.marker.InvalidModelingProjectMarkerUpdaterJob;
 import org.eclipse.sirius.ext.base.Option;
 import org.eclipse.sirius.ext.base.Options;
 import org.eclipse.sirius.ui.tools.api.project.ModelingProjectManager;
-import org.eclipse.sirius.ui.tools.internal.views.common.modelingproject.InvalidModelingProjectMarkerUpdaterJob;
 import org.eclipse.sirius.ui.tools.internal.views.common.modelingproject.OpenRepresentationsFileJob;
 import org.eclipse.sirius.viewpoint.provider.Messages;
 import org.eclipse.ui.progress.UIJob;
diff --git a/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/internal/views/modelexplorer/ModelExplorerView.java b/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/internal/views/modelexplorer/ModelExplorerView.java
index 4a6826047d..65fc9c2218 100644
--- a/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/internal/views/modelexplorer/ModelExplorerView.java
+++ b/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/internal/views/modelexplorer/ModelExplorerView.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2011, 2017 THALES GLOBAL SERVICES and others.
+ * Copyright (c) 2011, 2018 THALES GLOBAL SERVICES 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
@@ -27,6 +27,7 @@ import org.eclipse.jface.viewers.DoubleClickEvent;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.sirius.business.api.modelingproject.ModelingProject;
 import org.eclipse.sirius.business.api.query.FileQuery;
+import org.eclipse.sirius.business.internal.modelingproject.marker.InvalidModelingProjectMarkerUpdaterJob;
 import org.eclipse.sirius.common.tools.api.util.StringUtil;
 import org.eclipse.sirius.common.ui.tools.api.util.SWTUtil;
 import org.eclipse.sirius.common.ui.tools.api.view.IExpandSelectionTarget;
@@ -36,7 +37,6 @@ import org.eclipse.sirius.ui.tools.api.project.ModelingProjectManager;
 import org.eclipse.sirius.ui.tools.api.views.LockDecorationUpdater;
 import org.eclipse.sirius.ui.tools.api.views.modelexplorerview.IModelExplorerTabExtension;
 import org.eclipse.sirius.ui.tools.api.views.modelexplorerview.IModelExplorerView;
-import org.eclipse.sirius.ui.tools.internal.views.common.modelingproject.InvalidModelingProjectMarkerUpdaterJob;
 import org.eclipse.sirius.ui.tools.internal.views.common.navigator.filter.FilteredCommonTree;
 import org.eclipse.sirius.ui.tools.internal.views.modelexplorer.extension.tab.CommonNavigatorTab;
 import org.eclipse.sirius.ui.tools.internal.views.modelexplorer.extension.tab.ModelExplorerTabDescriptor;
diff --git a/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/viewpoint/provider/Messages.java b/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/viewpoint/provider/Messages.java
index e6b014c853..174682c977 100644
--- a/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/viewpoint/provider/Messages.java
+++ b/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/viewpoint/provider/Messages.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2015, 2017 Obeo.
+ * Copyright (c) 2015, 2018 Obeo.
  * 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
@@ -547,9 +547,6 @@ public final class Messages {
     public static String HierarchyLabelProvider_elementWihtoutNameLabel;
 
     @TranslatableMessage
-    public static String InvalidModelingProjectMarkerUpdaterJob_updateMarkers;
-
-    @TranslatableMessage
     public static String LoadEMFResourceRunnableWithProgress_loadResourceTask;
 
     @TranslatableMessage
@@ -577,24 +574,6 @@ public final class Messages {
     public static String Messages_createRepresentationInputDialog_DefaultRepresentationDescName;
 
     @TranslatableMessage
-    public static String ModelingModelProvider_addAnotherRepresentationFile;
-
-    @TranslatableMessage
-    public static String ModelingModelProvider_addAnotherRepresentationFileSeveralProjects;
-
-    @TranslatableMessage
-    public static String ModelingModelProvider_mainRepresentationFileDeleted;
-
-    @TranslatableMessage
-    public static String ModelingModelProvider_mainRepresentationFilesOfSomeProjectsDeleted;
-
-    @TranslatableMessage
-    public static String ModelingModelProvider_satusUnsaveDataWillBeLostWithProjectNames;
-
-    @TranslatableMessage
-    public static String ModelingModelProvider_satusUnsavedDataWillBeLost;
-
-    @TranslatableMessage
     public static String ModelingProjectManagerImpl_addingModelingNatureTask;
 
     @TranslatableMessage
diff --git a/plugins/org.eclipse.sirius/META-INF/MANIFEST.MF b/plugins/org.eclipse.sirius/META-INF/MANIFEST.MF
index 0a7bf4c6e3..52be991545 100644
--- a/plugins/org.eclipse.sirius/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.sirius/META-INF/MANIFEST.MF
@@ -37,7 +37,7 @@ Export-Package: org.eclipse.sirius.business.api.action;version="2.0.4",
  org.eclipse.sirius.business.api.tool;version="2.0.4",
  org.eclipse.sirius.business.internal.color;version="2.0.4";x-internal:=true,
  org.eclipse.sirius.business.internal.command.control;version="2.0.4";x-internal:=true,
- org.eclipse.sirius.business.internal.componentization;x-internal:=true,
+ org.eclipse.sirius.business.internal.componentization;version="6.0.0";x-internal:=true,
  org.eclipse.sirius.business.internal.dialect;version="3.0.0";x-internal:=true,
  org.eclipse.sirius.business.internal.dialect.command;version="2.0.4";x-internal:=true,
  org.eclipse.sirius.business.internal.dialect.description;version="3.0.0";x-internal:=true,
@@ -60,6 +60,7 @@ Export-Package: org.eclipse.sirius.business.api.action;version="2.0.4",
  org.eclipse.sirius.business.internal.migration.description;version="2.1.0";x-internal:=true,
  org.eclipse.sirius.business.internal.migration.resource;version="2.0.4";x-internal:=true,
  org.eclipse.sirius.business.internal.migration.resource.session.commands;version="2.0.4";x-internal:=true,
+ org.eclipse.sirius.business.internal.modelingproject;version="6.0.0";x-internal:=true,
  org.eclipse.sirius.business.internal.modelingproject.manager;version="2.0.5";x-internal:=true,
  org.eclipse.sirius.business.internal.modelingproject.marker;version="2.0.4";x-internal:=true,
  org.eclipse.sirius.business.internal.query;version="3.0.1";x-internal:=true,
diff --git a/plugins/org.eclipse.sirius/plugin.properties b/plugins/org.eclipse.sirius/plugin.properties
index 8f906aa193..4f4506404c 100644
--- a/plugins/org.eclipse.sirius/plugin.properties
+++ b/plugins/org.eclipse.sirius/plugin.properties
@@ -1,5 +1,5 @@
 # ====================================================================
-# Copyright (c) 2007, 2016 THALES GLOBAL SERVICES
+# Copyright (c) 2007, 2018 THALES GLOBAL SERVICES 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
@@ -167,6 +167,7 @@ FeatureContributor_unmodifiableFeatureErrorMsg = Target feature not modifiable.
 FeatureContributor_noTargetFeatureErrorMsg = No target feature specified.
 ForTask_label = a for task
 IInterpreterMessages_invalidFeatureErrorMsg = Invalid feature as name
+InvalidModelingProjectMarkerUpdaterJob_updateMarkers = Update Markers
 IPropertiesProvider_unfoundPropertyErrorMsg = The property was not found
 ISiriusMessages_invalidAirdFileErrorMsg = The following diagram file is not valid : 
 ISiriusMessages_invalidDescFileErrorMsg = The following description file is not valid : 
@@ -197,6 +198,13 @@ MigrationUtil_toBigErrorMsg = The size of the file is too big to get its content
 MigrationUtil_loadingMsg = Loading File
 MigrationUtil_IOErrorMsg = I/O Error
 MigrationUtil_invalidMappingErrorMsg = the mapping is not valid
+ModelingModelProvider_addAnotherRepresentationFile = Add another representations file to "{0}" may invalidate it.
+ModelingModelProvider_addAnotherRepresentationFileSeveralProjects = Add another representations file to {0} may invalidate them.
+ModelingModelProvider_mainRepresentationFileDeleted = Deletion of the main representations file of "{0}" will invalidate it.
+ModelingModelProvider_mainRepresentationFilesOfSomeProjectsDeleted = Deletion of the main representations files of some modeling projects ({0}) will invalidate them.
+ModelingModelProvider_satusUnsaveDataWillBeLostWithProjectNames = Some modeling projects ({0}) contain unsaved data. This data will be lost.
+ModelingModelProvider_satusUnsavedDataWillBeLost = This modeling project contains unsaved data. This data will be lost.
+ModelingModelProvider.name=Sirius Modeling Workspace
 ModelingProject_getMainRepFileURIMsg = Get main representations resource URI
 ModelingProjectQuery_severalRepresentationsFiles = Found {0} main representations files (that means not referenced by another) in "{1}": {2}. A modeling project must contain only one.
 ModelingProjectQuery_mustContainOneRepFileMsg = Zero representations file found in "{0}". A modeling project must contain one.
diff --git a/plugins/org.eclipse.sirius/plugin.xml b/plugins/org.eclipse.sirius/plugin.xml
index a360acc0c7..a4e2016eaf 100644
--- a/plugins/org.eclipse.sirius/plugin.xml
+++ b/plugins/org.eclipse.sirius/plugin.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?eclipse version="3.0"?>
 <!--
-  Copyright (c) 2007, 2016 THALES GLOBAL SERVICES and others.
+  Copyright (c) 2007, 2018 THALES GLOBAL SERVICES 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
@@ -453,4 +453,16 @@
              class="org.eclipse.sirius.business.internal.logger.OCERuntimeLoggerSpy">
        </logger>
    </extension>
+
+   <extension
+         id="modelProvider"
+         name="%ModelingModelProvider.name"
+         point="org.eclipse.core.resources.modelProviders">
+      <modelProvider class="org.eclipse.sirius.business.internal.modelingproject.ModelingModelProvider"/>
+      <extends-model id="org.eclipse.core.resources.modelProvider"/>
+      <enablement>
+          <test property="org.eclipse.core.resources.projectNature" value="org.eclipse.sirius.nature.modelingproject" />
+      </enablement>
+   </extension>
+
 </plugin>
diff --git a/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/internal/views/common/modelingproject/model/ModelingElementResourceMapping.java b/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/modelingproject/ModelingElementResourceMapping.java
index 97d1b92289..38f6d1b8fc 100644
--- a/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/internal/views/common/modelingproject/model/ModelingElementResourceMapping.java
+++ b/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/modelingproject/ModelingElementResourceMapping.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2012 THALES GLOBAL SERVICES.
+ * Copyright (c) 2012, 2018 THALES GLOBAL SERVICES 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
@@ -8,7 +8,7 @@
  * Contributors:
  *    Obeo - initial API and implementation
  *******************************************************************************/
-package org.eclipse.sirius.ui.tools.internal.views.common.modelingproject.model;
+package org.eclipse.sirius.business.internal.modelingproject;
 
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.resources.IResource;
diff --git a/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/internal/views/common/modelingproject/model/ModelingModelProvider.java b/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/modelingproject/ModelingModelProvider.java
index e4c5a3fd53..189993a227 100644
--- a/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/internal/views/common/modelingproject/model/ModelingModelProvider.java
+++ b/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/modelingproject/ModelingModelProvider.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2011, 2016 THALES GLOBAL SERVICES and others.
+ * Copyright (c) 2011, 2018 THALES GLOBAL SERVICES 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
@@ -8,7 +8,7 @@
  * Contributors:
  *    Obeo - initial API and implementation
  *******************************************************************************/
-package org.eclipse.sirius.ui.tools.internal.views.common.modelingproject.model;
+package org.eclipse.sirius.business.internal.modelingproject;
 
 import java.text.MessageFormat;
 import java.util.ArrayList;
@@ -34,10 +34,10 @@ import org.eclipse.sirius.business.api.modelingproject.ModelingProject;
 import org.eclipse.sirius.business.api.query.FileQuery;
 import org.eclipse.sirius.business.api.session.Session;
 import org.eclipse.sirius.business.api.session.SessionStatus;
+import org.eclipse.sirius.business.internal.modelingproject.marker.InvalidModelingProjectMarkerUpdaterJob;
 import org.eclipse.sirius.ext.base.Option;
-import org.eclipse.sirius.ui.tools.internal.views.common.modelingproject.InvalidModelingProjectMarkerUpdaterJob;
+import org.eclipse.sirius.viewpoint.Messages;
 import org.eclipse.sirius.viewpoint.SiriusPlugin;
-import org.eclipse.sirius.viewpoint.provider.Messages;
 
 /**
  * Modeling-aware model provider.
diff --git a/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/internal/views/common/modelingproject/model/ModelingResourceMapping.java b/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/modelingproject/ModelingResourceMapping.java
index 293ce656b7..dcae147613 100644
--- a/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/internal/views/common/modelingproject/model/ModelingResourceMapping.java
+++ b/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/modelingproject/ModelingResourceMapping.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2011 THALES GLOBAL SERVICES.
+ * Copyright (c) 2011, 2018 THALES GLOBAL SERVICES 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
@@ -8,7 +8,7 @@
  * Contributors:
  *    Obeo - initial API and implementation
  *******************************************************************************/
-package org.eclipse.sirius.ui.tools.internal.views.common.modelingproject.model;
+package org.eclipse.sirius.business.internal.modelingproject;
 
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.resources.IResource;
@@ -20,7 +20,7 @@ import org.eclipse.core.runtime.IProgressMonitor;
 
 /**
  * Resource mapping for the modeling model provider.
- * 
+ *
  * @author <a href="mailto:laurent.redor@obeo.fr">Laurent Redor</a>
  */
 public final class ModelingResourceMapping extends ResourceMapping {
@@ -30,7 +30,7 @@ public final class ModelingResourceMapping extends ResourceMapping {
 
     /**
      * Creates a new java resource mapping.
-     * 
+     *
      * @param resource
      *            the resource to map
      */
@@ -39,30 +39,22 @@ public final class ModelingResourceMapping extends ResourceMapping {
         fResource = resource;
     }
 
-    /**
-     * {@inheritDoc}
-     */
+    @Override
     public Object getModelObject() {
         return fResource;
     }
 
-    /**
-     * {@inheritDoc}
-     */
+    @Override
     public String getModelProviderId() {
         return ModelingModelProvider.MODELING_MODEL_PROVIDER_ID;
     }
 
-    /**
-     * {@inheritDoc}
-     */
+    @Override
     public IProject[] getProjects() {
         return new IProject[] { fResource.getProject() };
     }
 
-    /**
-     * {@inheritDoc}
-     */
+    @Override
     public ResourceTraversal[] getTraversals(final ResourceMappingContext context, final IProgressMonitor monitor) {
         return new ResourceTraversal[] { new ResourceTraversal(new IResource[] { fResource }, IResource.DEPTH_INFINITE, IResource.NONE) };
     }
diff --git a/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/internal/views/common/modelingproject/InvalidModelingProjectMarkerUpdaterJob.java b/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/modelingproject/marker/InvalidModelingProjectMarkerUpdaterJob.java
index f66f757c3f..57561de98b 100644
--- a/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/internal/views/common/modelingproject/InvalidModelingProjectMarkerUpdaterJob.java
+++ b/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/modelingproject/marker/InvalidModelingProjectMarkerUpdaterJob.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2016 THALES GLOBAL SERVICES and others.
+ * Copyright (c) 2016, 2018 THALES GLOBAL SERVICES 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
@@ -8,7 +8,7 @@
  * Contributors:
  *    Obeo - initial API and implementation
  *******************************************************************************/
-package org.eclipse.sirius.ui.tools.internal.views.common.modelingproject;
+package org.eclipse.sirius.business.internal.modelingproject.marker;
 
 import org.eclipse.core.resources.IMarker;
 import org.eclipse.core.resources.IProject;
@@ -18,9 +18,8 @@ import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Status;
-import org.eclipse.sirius.business.internal.modelingproject.marker.ModelingMarker;
+import org.eclipse.sirius.viewpoint.Messages;
 import org.eclipse.sirius.viewpoint.SiriusPlugin;
-import org.eclipse.sirius.viewpoint.provider.Messages;
 
 /**
  * A {@link WorkspaceJob} to update markers for a invalid project.
diff --git a/plugins/org.eclipse.sirius/src/org/eclipse/sirius/viewpoint/Messages.java b/plugins/org.eclipse.sirius/src/org/eclipse/sirius/viewpoint/Messages.java
index 582c5d42f6..04b34d535a 100644
--- a/plugins/org.eclipse.sirius/src/org/eclipse/sirius/viewpoint/Messages.java
+++ b/plugins/org.eclipse.sirius/src/org/eclipse/sirius/viewpoint/Messages.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2015, 2016 Obeo.
+ * Copyright (c) 2015, 2018 Obeo.
  * 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
@@ -352,6 +352,9 @@ public final class Messages {
     public static String InvalidPermissionCommand_label;
 
     @TranslatableMessage
+    public static String InvalidModelingProjectMarkerUpdaterJob_updateMarkers;
+
+    @TranslatableMessage
     public static String SavingPolicyImpl_savingErrorMsg;
 
     @TranslatableMessage
@@ -388,6 +391,24 @@ public final class Messages {
     public static String MigrationUtil_invalidMappingErrorMsg;
 
     @TranslatableMessage
+    public static String ModelingModelProvider_addAnotherRepresentationFile;
+
+    @TranslatableMessage
+    public static String ModelingModelProvider_addAnotherRepresentationFileSeveralProjects;
+
+    @TranslatableMessage
+    public static String ModelingModelProvider_mainRepresentationFileDeleted;
+
+    @TranslatableMessage
+    public static String ModelingModelProvider_mainRepresentationFilesOfSomeProjectsDeleted;
+
+    @TranslatableMessage
+    public static String ModelingModelProvider_satusUnsavedDataWillBeLost;
+
+    @TranslatableMessage
+    public static String ModelingModelProvider_satusUnsaveDataWillBeLostWithProjectNames;
+
+    @TranslatableMessage
     public static String ModelingProject_getMainRepFileURIMsg;
 
     @TranslatableMessage