362162: [Architecture - Refactoring] The plug-ins should be renamed to match their layer's qualified name

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

434 files changed, 2369 insertions, 2351 deletions

diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.adaptor.emf/META-INF/MANIFEST.MF b/plugins/infra/core/org.eclipse.papyrus.infra.core.adaptor.emf/META-INF/MANIFEST.MF
index 95a9de41e6e..8563734c045 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.adaptor.emf/META-INF/MANIFEST.MF
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.adaptor.emf/META-INF/MANIFEST.MF
@@ -1,13 +1,13 @@
 Manifest-Version: 1.0

 Require-Bundle: org.eclipse.papyrus.infra.core;bundle-version="0.9.0"

-Export-Package: org.eclipse.papyrus.core.adaptor.emf

+Export-Package: org.eclipse.papyrus.infra.core.adaptor.emf

 Bundle-Vendor: %providerName

 Bundle-ActivationPolicy: lazy

 Bundle-Version: 0.9.0.qualifier

 Bundle-Localization: plugin

 Bundle-Name: %pluginName

 Bundle-ManifestVersion: 2

-Bundle-Activator: org.eclipse.papyrus.core.adaptor.emf.Activator

+Bundle-Activator: org.eclipse.papyrus.infra.core.adaptor.emf.Activator

 Bundle-SymbolicName: org.eclipse.papyrus.infra.core.adaptor.emf;singleton:=true

 Bundle-RequiredExecutionEnvironment: J2SE-1.5

 

diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.adaptor.emf/src/org/eclipse/papyrus/core/adaptor/emf/Activator.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.adaptor.emf/src/org/eclipse/papyrus/infra/core/adaptor/emf/Activator.java
index e40eedda638..a4af36f15be 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.adaptor.emf/src/org/eclipse/papyrus/core/adaptor/emf/Activator.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.adaptor.emf/src/org/eclipse/papyrus/infra/core/adaptor/emf/Activator.java
@@ -11,7 +11,7 @@
  *  Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Initial API and implementation

  *

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

-package org.eclipse.papyrus.core.adaptor.emf;

+package org.eclipse.papyrus.infra.core.adaptor.emf;

 

 import org.eclipse.ui.plugin.AbstractUIPlugin;

 import org.osgi.framework.BundleContext;

diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.adaptor.emf/src/org/eclipse/papyrus/core/adaptor/emf/CreateDiagramHandler.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.adaptor.emf/src/org/eclipse/papyrus/infra/core/adaptor/emf/CreateDiagramHandler.java
index 8b059add2d1..5391a7d49f5 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.adaptor.emf/src/org/eclipse/papyrus/core/adaptor/emf/CreateDiagramHandler.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.adaptor.emf/src/org/eclipse/papyrus/infra/core/adaptor/emf/CreateDiagramHandler.java
@@ -11,7 +11,7 @@
  *  Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Initial API and implementation

  *

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

-package org.eclipse.papyrus.core.adaptor.emf;

+package org.eclipse.papyrus.infra.core.adaptor.emf;

 

 import org.eclipse.core.commands.AbstractHandler;

 import org.eclipse.core.commands.ExecutionEvent;

@@ -22,9 +22,9 @@ import org.eclipse.emf.transaction.RecordingCommand;
 import org.eclipse.emf.transaction.TransactionalEditingDomain;

 import org.eclipse.gmf.runtime.notation.Diagram;

 import org.eclipse.gmf.runtime.notation.NotationFactory;

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

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

-import org.eclipse.papyrus.resource.notation.NotationUtils;

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

+import org.eclipse.papyrus.infra.core.resource.notation.NotationUtils;

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

 

 /**

  * Base class for create diagram Handlers.

@@ -68,7 +68,7 @@ public abstract class CreateDiagramHandler extends AbstractHandler implements IH
 	 * 

 	 * @param diagram

 	 *        The diagram to add to graphical model. This will be the diagram provided to

-	 *        {@link IPluggableEditorFactory#createIPageModel(Object, org.eclipse.papyrus.core.services.ServicesRegistry)}

+	 *        {@link IPluggableEditorFactory#createIPageModel(Object, org.eclipse.papyrus.infra.core.services.ServicesRegistry)}

 	 */

 	protected void addNewDiagram(String name, String type, EObject diagram) {

 

diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.adaptor.gmf/META-INF/MANIFEST.MF b/plugins/infra/core/org.eclipse.papyrus.infra.core.adaptor.gmf/META-INF/MANIFEST.MF
index da0af266390..e24a81c4974 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.adaptor.gmf/META-INF/MANIFEST.MF
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.adaptor.gmf/META-INF/MANIFEST.MF
@@ -1,5 +1,5 @@
 Manifest-Version: 1.0

-Export-Package: org.eclipse.papyrus.core.adaptor.gmf

+Export-Package: org.eclipse.papyrus.infra.core.adaptor.gmf

 Bundle-ActivationPolicy: lazy

 Bundle-ClassPath: .

 Bundle-Name: %pluginName

@@ -12,6 +12,6 @@ Require-Bundle: org.eclipse.emf.edit.ui;bundle-version="2.5.0",
 Bundle-Vendor: %providerName

 Bundle-Version: 0.9.0.qualifier

 Bundle-ManifestVersion: 2

-Bundle-Activator: org.eclipse.papyrus.core.adaptor.gmf.Activator

+Bundle-Activator: org.eclipse.papyrus.infra.core.adaptor.gmf.Activator

 Bundle-SymbolicName: org.eclipse.papyrus.infra.core.adaptor.gmf;singleton:=true

 

diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.adaptor.gmf/plugin.xml b/plugins/infra/core/org.eclipse.papyrus.infra.core.adaptor.gmf/plugin.xml
index 962dbda9e85..2d5eb997b99 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.adaptor.gmf/plugin.xml
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.adaptor.gmf/plugin.xml
@@ -22,9 +22,9 @@
 

 

 <extension

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

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

    <editorContext

-         contextClass="org.eclipse.papyrus.core.adaptor.gmf.GmfEditorContext"

+         contextClass="org.eclipse.papyrus.infra.core.adaptor.gmf.GmfEditorContext"

          id="com.cea.papyrus.gmf.editor.context">

    </editorContext>

    </extension>

diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.adaptor.gmf/schema/nestedEditor.exsd b/plugins/infra/core/org.eclipse.papyrus.infra.core.adaptor.gmf/schema/nestedEditor.exsd
index 31387a1a217..542d08cb1c9 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.adaptor.gmf/schema/nestedEditor.exsd
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.adaptor.gmf/schema/nestedEditor.exsd
@@ -62,10 +62,10 @@ Define a nested editor descriptor. This descriptor is used to add instance of th
             <annotation>

                <documentation>

                   The factory used to create an instance of the editor.

-The factory must implements org.eclipse.papyrus.core.adaptor.gmf.extension.IEditorFactory

+The factory must implements org.eclipse.papyrus.infra.core.adaptor.gmf.extension.IEditorFactory

                </documentation>

                <appinfo>

-                  <meta.attribute kind="java" basedOn="org.eclipse.papyrus.core.adaptor.gmf.extension.IEditorFactory"/>

+                  <meta.attribute kind="java" basedOn="org.eclipse.papyrus.infra.core.adaptor.gmf.extension.IEditorFactory"/>

                </appinfo>

             </annotation>

          </attribute>

@@ -129,7 +129,7 @@ The factory must implements org.eclipse.papyrus.core.adaptor.gmf.extension.IEdit
                   The action class implementing the creation of the root object.

                </documentation>

                <appinfo>

-                  <meta.attribute kind="java" basedOn="org.eclipse.papyrus.core.adaptor.gmf.extension.ICreateDiagramAction"/>

+                  <meta.attribute kind="java" basedOn="org.eclipse.papyrus.infra.core.adaptor.gmf.extension.ICreateDiagramAction"/>

                </appinfo>

             </annotation>

          </attribute>

diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.adaptor.gmf/src/org/eclipse/papyrus/core/adaptor/gmf/AbstractPapyrusGmfCreateDiagramCommandHandler.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.adaptor.gmf/src/org/eclipse/papyrus/infra/core/adaptor/gmf/AbstractPapyrusGmfCreateDiagramCommandHandler.java
index 9761aba8bfd..b1195a015f1 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.adaptor.gmf/src/org/eclipse/papyrus/core/adaptor/gmf/AbstractPapyrusGmfCreateDiagramCommandHandler.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.adaptor.gmf/src/org/eclipse/papyrus/infra/core/adaptor/gmf/AbstractPapyrusGmfCreateDiagramCommandHandler.java
@@ -11,7 +11,7 @@
  *  Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Initial API and implementation

  *

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

-package org.eclipse.papyrus.core.adaptor.gmf;

+package org.eclipse.papyrus.infra.core.adaptor.gmf;

 

 import java.util.ArrayList;

 

@@ -40,16 +40,16 @@ import org.eclipse.jface.viewers.ISelection;
 import org.eclipse.jface.viewers.IStructuredSelection;

 import org.eclipse.jface.window.Window;

 import org.eclipse.papyrus.commands.wrappers.GMFtoEMFCommandWrapper;

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

-import org.eclipse.papyrus.core.extension.commands.ICreationCommand;

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

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

-import org.eclipse.papyrus.core.utils.BusinessModelResolver;

-import org.eclipse.papyrus.core.utils.DiResourceSet;

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

-import org.eclipse.papyrus.core.utils.OpenDiagramCommand;

-import org.eclipse.papyrus.sasheditor.contentprovider.IPageMngr;

-import org.eclipse.papyrus.sasheditor.contentprovider.ISashWindowsContentProvider;

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

+import org.eclipse.papyrus.infra.core.extension.commands.ICreationCommand;

+import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IPageMngr;

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

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

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

+import org.eclipse.papyrus.infra.core.utils.BusinessModelResolver;

+import org.eclipse.papyrus.infra.core.utils.DiResourceSet;

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

+import org.eclipse.papyrus.infra.core.utils.OpenDiagramCommand;

 import org.eclipse.swt.widgets.Display;

 import org.eclipse.ui.IEditorPart;

 import org.eclipse.ui.IWorkbenchPage;

diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.adaptor.gmf/src/org/eclipse/papyrus/core/adaptor/gmf/Activator.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.adaptor.gmf/src/org/eclipse/papyrus/infra/core/adaptor/gmf/Activator.java
index 7d72f2f1fa6..1590460ccda 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.adaptor.gmf/src/org/eclipse/papyrus/core/adaptor/gmf/Activator.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.adaptor.gmf/src/org/eclipse/papyrus/infra/core/adaptor/gmf/Activator.java
@@ -11,7 +11,7 @@
  *  Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Initial API and implementation

  *

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

-package org.eclipse.papyrus.core.adaptor.gmf;

+package org.eclipse.papyrus.infra.core.adaptor.gmf;

 

 import java.util.ArrayList;

 import java.util.List;

@@ -30,7 +30,7 @@ import org.eclipse.emf.edit.provider.resource.ResourceItemProviderAdapterFactory
 import org.eclipse.emf.edit.ui.provider.ExtendedImageRegistry;

 import org.eclipse.gmf.runtime.diagram.core.preferences.PreferencesHint;

 import org.eclipse.jface.resource.ImageDescriptor;

-import org.eclipse.papyrus.log.LogHelper;

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

 import org.eclipse.swt.graphics.Image;

 import org.eclipse.ui.plugin.AbstractUIPlugin;

 import org.osgi.framework.BundleContext;

diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.adaptor.gmf/src/org/eclipse/papyrus/core/adaptor/gmf/DiagramsUtil.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.adaptor.gmf/src/org/eclipse/papyrus/infra/core/adaptor/gmf/DiagramsUtil.java
index 2e5b470b4ff..05a0a21e2be 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.adaptor.gmf/src/org/eclipse/papyrus/core/adaptor/gmf/DiagramsUtil.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.adaptor.gmf/src/org/eclipse/papyrus/infra/core/adaptor/gmf/DiagramsUtil.java
@@ -11,7 +11,7 @@
  *  Mathieu Velten (Atos Origin) mathieu.velten@atosorigin.com - Initial API and implementation

  *

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

-package org.eclipse.papyrus.core.adaptor.gmf;

+package org.eclipse.papyrus.infra.core.adaptor.gmf;

 

 import java.util.Collections;

 import java.util.LinkedList;

@@ -21,7 +21,7 @@ import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.resource.Resource;

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

 import org.eclipse.gmf.runtime.notation.Diagram;

-import org.eclipse.papyrus.core.utils.DiResourceSet;

+import org.eclipse.papyrus.infra.core.utils.DiResourceSet;

 

 

 public class DiagramsUtil {

diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.adaptor.gmf/src/org/eclipse/papyrus/core/adaptor/gmf/GmfEditorFactory.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.adaptor.gmf/src/org/eclipse/papyrus/infra/core/adaptor/gmf/GmfEditorFactory.java
index 989fc7e9096..c3a68ba04a1 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.adaptor.gmf/src/org/eclipse/papyrus/core/adaptor/gmf/GmfEditorFactory.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.adaptor.gmf/src/org/eclipse/papyrus/infra/core/adaptor/gmf/GmfEditorFactory.java
@@ -11,20 +11,20 @@
  *  Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Initial API and implementation

  *

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

-package org.eclipse.papyrus.core.adaptor.gmf;

+package org.eclipse.papyrus.infra.core.adaptor.gmf;

 

 import java.lang.reflect.Constructor;

 

 import org.eclipse.gef.ui.parts.GraphicalEditor;

 import org.eclipse.gmf.runtime.notation.Diagram;

 import org.eclipse.jface.resource.ImageDescriptor;

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

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

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

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

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

-import org.eclipse.papyrus.sasheditor.contentprovider.IEditorModel;

-import org.eclipse.papyrus.sasheditor.contentprovider.IPageModel;

+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.core.services.ServicesRegistry;

 import org.eclipse.swt.graphics.Image;

 import org.eclipse.ui.IEditorPart;

 import org.eclipse.ui.PartInitException;

@@ -56,7 +56,7 @@ public class GmfEditorFactory extends AbstractEditorFactory {
 	 * Return true if this PageModelFactory can create a PageModel for the specified pageIdentifier.

 	 * The pageIdentifier is an instance of Diagram.

 	 * 

-	 * @see org.eclipse.papyrus.core.extension.diagrameditor.IPluggableEditorFactory#isPageModelFactoryFor(java.lang.Object)

+	 * @see org.eclipse.papyrus.infra.core.extension.diagrameditor.IPluggableEditorFactory#isPageModelFactoryFor(java.lang.Object)

 	 * @param pageIdentifier

 	 * @return

 	 * 

@@ -78,7 +78,7 @@ public class GmfEditorFactory extends AbstractEditorFactory {
 

 	/**

 	 * 

-	 * @see org.eclipse.papyrus.core.extension.diagrameditor.IPluggableEditorFactory#createIPageModel(java.lang.Object)

+	 * @see org.eclipse.papyrus.infra.core.extension.diagrameditor.IPluggableEditorFactory#createIPageModel(java.lang.Object)

 	 * @param pageIdentifier

 	 * @return

 	 * 

@@ -118,7 +118,7 @@ public class GmfEditorFactory extends AbstractEditorFactory {
 		/**

 		 * Create the IEditor for the diagram.

 		 * 

-		 * @see org.eclipse.papyrus.sasheditor.contentprovider.IEditorModel#createIEditorPart()

+		 * @see org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IEditorModel#createIEditorPart()

 		 * @return

 		 * @throws PartInitException

 		 * 

@@ -141,7 +141,7 @@ public class GmfEditorFactory extends AbstractEditorFactory {
 		/**

 		 * Get the action bar requested by the Editor.

 		 * 

-		 * @see org.eclipse.papyrus.sasheditor.contentprovider.IEditorModel#getActionBarContributor()

+		 * @see org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IEditorModel#getActionBarContributor()

 		 * @return

 		 * 

 		 */

@@ -180,7 +180,7 @@ public class GmfEditorFactory extends AbstractEditorFactory {
 		/**

 		 * Get the underlying RawModel. Return the Diagram.

 		 * 

-		 * @see org.eclipse.papyrus.sasheditor.contentprovider.IPageModel#getRawModel()

+		 * @see org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IPageModel#getRawModel()

 		 * @return

 		 * 

 		 */

@@ -191,7 +191,7 @@ public class GmfEditorFactory extends AbstractEditorFactory {
 		/**

 		 * Get the icon to be shown by Tabs

 		 * 

-		 * @see org.eclipse.papyrus.sasheditor.contentprovider.IPageModel#getTabIcon()

+		 * @see org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IPageModel#getTabIcon()

 		 * @return

 		 * 

 		 */

@@ -206,7 +206,7 @@ public class GmfEditorFactory extends AbstractEditorFactory {
 		/**

 		 * Get the title of the Diagram.

 		 * 

-		 * @see org.eclipse.papyrus.sasheditor.contentprovider.IPageModel#getTabTitle()

+		 * @see org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IPageModel#getTabTitle()

 		 * @return

 		 * 

 		 */

diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.adaptor.gmf/src/org/eclipse/papyrus/core/adaptor/gmf/GmfMultiDiagramDocumentProvider.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.adaptor.gmf/src/org/eclipse/papyrus/infra/core/adaptor/gmf/GmfMultiDiagramDocumentProvider.java
index 6af275307f6..6c1a9b3820a 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.adaptor.gmf/src/org/eclipse/papyrus/core/adaptor/gmf/GmfMultiDiagramDocumentProvider.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.adaptor.gmf/src/org/eclipse/papyrus/infra/core/adaptor/gmf/GmfMultiDiagramDocumentProvider.java
@@ -11,7 +11,7 @@
  *  Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Initial API and implementation

  *

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

-package org.eclipse.papyrus.core.adaptor.gmf;

+package org.eclipse.papyrus.infra.core.adaptor.gmf;

 

 import java.io.IOException;

 import java.net.URISyntaxException;

diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.adaptor.gmf/src/org/eclipse/papyrus/core/adaptor/gmf/Messages.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.adaptor.gmf/src/org/eclipse/papyrus/infra/core/adaptor/gmf/Messages.java
index 976e2cf8f39..c3a6797ccf9 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.adaptor.gmf/src/org/eclipse/papyrus/core/adaptor/gmf/Messages.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.adaptor.gmf/src/org/eclipse/papyrus/infra/core/adaptor/gmf/Messages.java
@@ -11,7 +11,7 @@
  *  Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Initial API and implementation

  *

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

-package org.eclipse.papyrus.core.adaptor.gmf;

+package org.eclipse.papyrus.infra.core.adaptor.gmf;

 

 import org.eclipse.osgi.util.NLS;

 

diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.adaptor.gmf/src/org/eclipse/papyrus/core/adaptor/gmf/ModelManagerEditor.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.adaptor.gmf/src/org/eclipse/papyrus/infra/core/adaptor/gmf/ModelManagerEditor.java
index 790430cfa33..f1e898f02ae 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.adaptor.gmf/src/org/eclipse/papyrus/core/adaptor/gmf/ModelManagerEditor.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.adaptor.gmf/src/org/eclipse/papyrus/infra/core/adaptor/gmf/ModelManagerEditor.java
@@ -11,7 +11,7 @@
  *  Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Initial API and implementation

  *

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

-package org.eclipse.papyrus.core.adaptor.gmf;

+package org.eclipse.papyrus.infra.core.adaptor.gmf;

 

 import java.beans.PropertyChangeSupport;

 

diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.adaptor.gmf/src/org/eclipse/papyrus/core/adaptor/gmf/SemanticFromGMFElement.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.adaptor.gmf/src/org/eclipse/papyrus/infra/core/adaptor/gmf/SemanticFromGMFElement.java
index 7f75a88ebf5..d1b1fc795f3 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.adaptor.gmf/src/org/eclipse/papyrus/core/adaptor/gmf/SemanticFromGMFElement.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.adaptor.gmf/src/org/eclipse/papyrus/infra/core/adaptor/gmf/SemanticFromGMFElement.java
@@ -11,13 +11,13 @@
  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  *

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

-package org.eclipse.papyrus.core.adaptor.gmf;

+package org.eclipse.papyrus.infra.core.adaptor.gmf;

 

 import org.eclipse.core.runtime.IAdaptable;

 import org.eclipse.emf.ecore.EObject;

 import org.eclipse.gmf.runtime.diagram.ui.editparts.GraphicalEditPart;

 import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

-import org.eclipse.papyrus.core.IElementWithSemantic;

+import org.eclipse.papyrus.infra.core.IElementWithSemantic;

 

 /**

  * this class is used to obtain the semantic element for element of a gmf diagram

@@ -26,7 +26,7 @@ import org.eclipse.papyrus.core.IElementWithSemantic;
 public class SemanticFromGMFElement implements IElementWithSemantic {

 	/**

 	 * 

-	 * @see org.eclipse.papyrus.core.IElementWithSemantic#getSemanticElement(java.lang.Object)

+	 * @see org.eclipse.papyrus.infra.core.IElementWithSemantic#getSemanticElement(java.lang.Object)

 	 *

 	 * @param wrapper can be for examplean editpart of gmf

 	 * @return the semantic element linked to this or null element

diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.adaptor.gmf/src/org/eclipse/papyrus/core/adaptor/gmf/SynchronizableGmfDiagramEditor.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.adaptor.gmf/src/org/eclipse/papyrus/infra/core/adaptor/gmf/SynchronizableGmfDiagramEditor.java
index 920cd1efa16..4b553193a58 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.adaptor.gmf/src/org/eclipse/papyrus/core/adaptor/gmf/SynchronizableGmfDiagramEditor.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.adaptor.gmf/src/org/eclipse/papyrus/infra/core/adaptor/gmf/SynchronizableGmfDiagramEditor.java
@@ -11,7 +11,7 @@
  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  *

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

-package org.eclipse.papyrus.core.adaptor.gmf;

+package org.eclipse.papyrus.infra.core.adaptor.gmf;

 

 import java.util.Iterator;

 import java.util.List;

@@ -25,7 +25,7 @@ import org.eclipse.gmf.runtime.diagram.ui.editparts.IPrimaryEditPart;
 import org.eclipse.gmf.runtime.diagram.ui.parts.DiagramEditDomain;

 import org.eclipse.gmf.runtime.diagram.ui.resources.editor.parts.DiagramDocumentEditor;

 import org.eclipse.papyrus.commands.CheckedDiagramCommandStack;

-import org.eclipse.papyrus.core.ui.IRevealSemanticElement;

+import org.eclipse.papyrus.infra.core.ui.IRevealSemanticElement;

 

 /**

  /**

@@ -43,7 +43,7 @@ public class SynchronizableGmfDiagramEditor extends DiagramDocumentEditor implem
 

 	/**

 	 * reveal all editpart that represent an element in the given list.

-	 * @see org.eclipse.papyrus.core.ui.IRevealSemanticElement#revealSemanticElement(java.util.List)

+	 * @see org.eclipse.papyrus.infra.core.ui.IRevealSemanticElement#revealSemanticElement(java.util.List)

 	 * 

 	 */

 	public void revealSemanticElement(List<?> elementList) {

diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.adaptor.gmf/src/org/eclipse/papyrus/core/adaptor/gmf/UMLDiagramEditorUtil.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.adaptor.gmf/src/org/eclipse/papyrus/infra/core/adaptor/gmf/UMLDiagramEditorUtil.java
index 557bda65e46..29d549ca7a6 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.adaptor.gmf/src/org/eclipse/papyrus/core/adaptor/gmf/UMLDiagramEditorUtil.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.adaptor.gmf/src/org/eclipse/papyrus/infra/core/adaptor/gmf/UMLDiagramEditorUtil.java
@@ -11,7 +11,7 @@
  *  Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Initial API and implementation

  *

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

-package org.eclipse.papyrus.core.adaptor.gmf;

+package org.eclipse.papyrus.infra.core.adaptor.gmf;

 

 import java.util.HashMap;

 import java.util.Map;

diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.log/META-INF/MANIFEST.MF b/plugins/infra/core/org.eclipse.papyrus.infra.core.log/META-INF/MANIFEST.MF
index f4dc9b1fa38..35ff14081d5 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.log/META-INF/MANIFEST.MF
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.log/META-INF/MANIFEST.MF
@@ -1,12 +1,12 @@
 Manifest-Version: 1.0

-Export-Package: org.eclipse.papyrus.log

+Export-Package: org.eclipse.papyrus.infra.core.log

 Require-Bundle: org.eclipse.core.runtime

 Bundle-Vendor: %providerName

 Bundle-ActivationPolicy: lazy

 Bundle-Version: 0.9.0.qualifier

 Bundle-Localization: plugin

 Bundle-Name: %pluginName

-Bundle-Activator: org.eclipse.papyrus.log.internal.Activator

+Bundle-Activator: org.eclipse.papyrus.infra.core.log.internal.Activator

 Bundle-ManifestVersion: 2

 Bundle-SymbolicName: org.eclipse.papyrus.infra.core.log

 Bundle-RequiredExecutionEnvironment: J2SE-1.5

diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.log/src/org/eclipse/papyrus/log/LogHelper.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.log/src/org/eclipse/papyrus/infra/core/log/LogHelper.java
index 5db8c6fc71a..33a5ae706b0 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.log/src/org/eclipse/papyrus/log/LogHelper.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.log/src/org/eclipse/papyrus/infra/core/log/LogHelper.java
@@ -8,7 +8,7 @@
  * Contributors:

  *     Atos Origin - initial API and implementation

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

-package org.eclipse.papyrus.log;

+package org.eclipse.papyrus.infra.core.log;

 

 import java.lang.reflect.InvocationTargetException;

 import java.util.logging.Logger;

diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.log/src/org/eclipse/papyrus/log/internal/Activator.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.log/src/org/eclipse/papyrus/infra/core/log/internal/Activator.java
index e40f9fbc22d..384c6029c5e 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.log/src/org/eclipse/papyrus/log/internal/Activator.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.log/src/org/eclipse/papyrus/infra/core/log/internal/Activator.java
@@ -8,7 +8,7 @@
  * Contributors:

  *     Atos Origin - initial API and implementation

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

-package org.eclipse.papyrus.log.internal;

+package org.eclipse.papyrus.infra.core.log.internal;

 

 import org.eclipse.core.runtime.Plugin;

 import org.osgi.framework.BundleContext;

diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/.project b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/.project
index ebd7fbdba7e..46189987209 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/.project
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <projectDescription>

-	<name>org.eclipse.papyrus.infra.sasheditor.di</name>

+	<name>org.eclipse.papyrus.infra.core.sasheditor.di</name>

 	<comment></comment>

 	<projects>

 	</projects>

diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/META-INF/MANIFEST.MF b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/META-INF/MANIFEST.MF
index be0aa23f171..1fd48589df7 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/META-INF/MANIFEST.MF
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/META-INF/MANIFEST.MF
@@ -1,19 +1,19 @@
 Manifest-Version: 1.0

 Require-Bundle: org.eclipse.swt;bundle-version="3.5.0";visibility:=reexport,

- org.eclipse.papyrus.infra.sasheditor;bundle-version="0.9.0";visibility:=reexport,

+ org.eclipse.papyrus.infra.core.sasheditor;bundle-version="0.9.0";visibility:=reexport,

  org.eclipse.ui;bundle-version="3.6.0",

  org.eclipse.core.runtime;bundle-version="3.6.0",

  org.eclipse.emf.ecore;visibility:=reexport,

  org.eclipse.emf.ecore.xmi;bundle-version="2.5.0",

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

  org.eclipse.gmf.runtime.notation;bundle-version="1.5.0"

-Export-Package: org.eclipse.papyrus.sasheditor.contentprovider.di,

- org.eclipse.papyrus.sasheditor.contentprovider.di.commands,

- org.eclipse.papyrus.sasheditor.contentprovider.di.utils,

- org.eclipse.papyrus.sashwindows.di,

- org.eclipse.papyrus.sashwindows.di.exception,

- org.eclipse.papyrus.sashwindows.di.impl,

- org.eclipse.papyrus.sashwindows.di.util

+Export-Package: org.eclipse.papyrus.infra.core.sasheditor.di.contentprovider,

+ org.eclipse.papyrus.infra.core.sasheditor.di.contentprovider.commands,

+ org.eclipse.papyrus.infra.core.sasheditor.di.contentprovider.utils,

+ org.eclipse.papyrus.infra.core.sashwindows.di,

+ org.eclipse.papyrus.infra.core.sashwindows.di.exception,

+ org.eclipse.papyrus.infra.core.sashwindows.di.impl,

+ org.eclipse.papyrus.infra.core.sashwindows.di.util

 Bundle-Vendor: %providerName

 Bundle-ActivationPolicy: lazy

 Bundle-ClassPath: .

@@ -21,6 +21,6 @@ Bundle-Version: 0.9.0.qualifier
 Bundle-Localization: plugin

 Bundle-Name: %pluginName

 Bundle-ManifestVersion: 2

-Bundle-SymbolicName: org.eclipse.papyrus.infra.sasheditor.di;singleton:=true

+Bundle-SymbolicName: org.eclipse.papyrus.infra.core.sasheditor.di;singleton:=true

 Bundle-RequiredExecutionEnvironment: J2SE-1.5

 

diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/antBuild.xml b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/antBuild.xml
index 35ad5315f91..e332a1d501d 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/antBuild.xml
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/antBuild.xml
@@ -4,7 +4,7 @@
 

 	<property name="srcdir" value="src" />

 	<property name="sparedir" value="src-spare" />

-	<property name="plugin.default.name" value="org.eclipse.papyrus.sasheditor.di" />

+	<property name="plugin.default.name" value="org.eclipse.papyrus.infra.core.sasheditor.di" />

 	<property name="plugin.dir" value="../${plugin.default.name}" />
 	<property name="edit.plugin.dir" value="../${plugin.default.name}.edit" />

 	<property name="editor.plugin.dir" value="../${plugin.default.name}.editor" />
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/custom-src/org/eclipse/papyrus/sasheditor/contentprovider/di/DiSashModelMngr.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/custom-src/org/eclipse/papyrus/infra/core/sasheditor/di/contentprovider/DiSashModelMngr.java
index 60b3b6d10ac..cc22d3b7b16 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/custom-src/org/eclipse/papyrus/sasheditor/contentprovider/di/DiSashModelMngr.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/custom-src/org/eclipse/papyrus/infra/core/sasheditor/di/contentprovider/DiSashModelMngr.java
@@ -12,17 +12,17 @@
  *

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

 

-package org.eclipse.papyrus.sasheditor.contentprovider.di;

+package org.eclipse.papyrus.infra.core.sasheditor.di.contentprovider;

 

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

-import org.eclipse.papyrus.sasheditor.contentprovider.IContentChangedProvider;

-import org.eclipse.papyrus.sasheditor.contentprovider.IPageMngr;

-import org.eclipse.papyrus.sasheditor.contentprovider.ISashWindowsContentProvider;

-import org.eclipse.papyrus.sasheditor.contentprovider.di.internal.ContentChangedEventProvider;

-import org.eclipse.papyrus.sasheditor.contentprovider.di.internal.DiContentProvider;

-import org.eclipse.papyrus.sasheditor.contentprovider.di.internal.PageMngrImpl;

-import org.eclipse.papyrus.sashwindows.di.SashWindowsMngr;

-import org.eclipse.papyrus.sashwindows.di.util.DiUtils;

+import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IContentChangedProvider;

+import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IPageMngr;

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

+import org.eclipse.papyrus.infra.core.sasheditor.di.contentprovider.internal.ContentChangedEventProvider;

+import org.eclipse.papyrus.infra.core.sasheditor.di.contentprovider.internal.DiContentProvider;

+import org.eclipse.papyrus.infra.core.sasheditor.di.contentprovider.internal.PageMngrImpl;

+import org.eclipse.papyrus.infra.core.sashwindows.di.SashWindowsMngr;

+import org.eclipse.papyrus.infra.core.sashwindows.di.util.DiUtils;

 

 /**

  * Class used as main entry point to access a sash model build on EMF / di

diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/custom-src/org/eclipse/papyrus/sasheditor/contentprovider/di/IPageModelFactory.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/custom-src/org/eclipse/papyrus/infra/core/sasheditor/di/contentprovider/IPageModelFactory.java
index ee16f061b8d..0359df0d9e5 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/custom-src/org/eclipse/papyrus/sasheditor/contentprovider/di/IPageModelFactory.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/custom-src/org/eclipse/papyrus/infra/core/sasheditor/di/contentprovider/IPageModelFactory.java
@@ -12,11 +12,11 @@
  *

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

 

-package org.eclipse.papyrus.sasheditor.contentprovider.di;

+package org.eclipse.papyrus.infra.core.sasheditor.di.contentprovider;

 

 import org.eclipse.emf.ecore.EObject;

-import org.eclipse.papyrus.sasheditor.contentprovider.IPageMngr;

-import org.eclipse.papyrus.sasheditor.contentprovider.IPageModel;

+import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IPageMngr;

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

 

 /**

  * Factory used to create IPageModel from an object identifying a page.

diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/custom-src/org/eclipse/papyrus/sasheditor/contentprovider/di/TransactionalDiSashModelMngr.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/custom-src/org/eclipse/papyrus/infra/core/sasheditor/di/contentprovider/TransactionalDiSashModelMngr.java
index f7072add1dd..87888ff0681 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/custom-src/org/eclipse/papyrus/sasheditor/contentprovider/di/TransactionalDiSashModelMngr.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/custom-src/org/eclipse/papyrus/infra/core/sasheditor/di/contentprovider/TransactionalDiSashModelMngr.java
@@ -1,15 +1,15 @@
 /**

  * 

  */

-package org.eclipse.papyrus.sasheditor.contentprovider.di;

+package org.eclipse.papyrus.infra.core.sasheditor.di.contentprovider;

 

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

 import org.eclipse.emf.transaction.RecordingCommand;

 import org.eclipse.emf.transaction.TransactionalEditingDomain;

-import org.eclipse.papyrus.sasheditor.contentprovider.IPageMngr;

-import org.eclipse.papyrus.sasheditor.contentprovider.ISashWindowsContentProvider;

-import org.eclipse.papyrus.sasheditor.contentprovider.di.internal.TransactionalDiContentProvider;

-import org.eclipse.papyrus.sasheditor.contentprovider.di.internal.TransactionalPageMngrImpl;

+import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IPageMngr;

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

+import org.eclipse.papyrus.infra.core.sasheditor.di.contentprovider.internal.TransactionalDiContentProvider;

+import org.eclipse.papyrus.infra.core.sasheditor.di.contentprovider.internal.TransactionalPageMngrImpl;

 

 /**

  * DiSashModelMngr providing transactional commands to modify SashModel.

@@ -92,7 +92,7 @@ public class TransactionalDiSashModelMngr extends DiSashModelMngr {
 	/**

 	 * Return the transactional version

 	 * 

-	 * @see org.eclipse.papyrus.sasheditor.contentprovider.di.DiSashModelMngr#getISashWindowsContentProvider()

+	 * @see org.eclipse.papyrus.infra.core.sasheditor.di.contentprovider.DiSashModelMngr#getISashWindowsContentProvider()

 	 * @return

 	 * 

 	 */

@@ -104,7 +104,7 @@ public class TransactionalDiSashModelMngr extends DiSashModelMngr {
 	/**

 	 * Return the transactional version

 	 * 

-	 * @see org.eclipse.papyrus.sasheditor.contentprovider.di.DiSashModelMngr#getIPageMngr()

+	 * @see org.eclipse.papyrus.infra.core.sasheditor.di.contentprovider.DiSashModelMngr#getIPageMngr()

 	 * 

 	 * @return

 	 */

diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/custom-src/org/eclipse/papyrus/sasheditor/contentprovider/di/commands/CloseAllDiagramsCommand.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/custom-src/org/eclipse/papyrus/infra/core/sasheditor/di/contentprovider/commands/CloseAllDiagramsCommand.java
index fbd8c573cab..997ff32487c 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/custom-src/org/eclipse/papyrus/sasheditor/contentprovider/di/commands/CloseAllDiagramsCommand.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/custom-src/org/eclipse/papyrus/infra/core/sasheditor/di/contentprovider/commands/CloseAllDiagramsCommand.java
@@ -1,12 +1,12 @@
 /**

  * 

  */

-package org.eclipse.papyrus.sasheditor.contentprovider.di.commands;

+package org.eclipse.papyrus.infra.core.sasheditor.di.contentprovider.commands;

 

 import org.eclipse.core.commands.AbstractHandler;

 import org.eclipse.core.commands.ExecutionEvent;

 import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.papyrus.sasheditor.contentprovider.IPageMngr;

+import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IPageMngr;

 import org.eclipse.ui.IEditorPart;

 import org.eclipse.ui.handlers.HandlerUtil;

 

diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/custom-src/org/eclipse/papyrus/sasheditor/contentprovider/di/commands/CloseDiagramCommand.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/custom-src/org/eclipse/papyrus/infra/core/sasheditor/di/contentprovider/commands/CloseDiagramCommand.java
index 268fc6c9543..16d9ea06138 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/custom-src/org/eclipse/papyrus/sasheditor/contentprovider/di/commands/CloseDiagramCommand.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/custom-src/org/eclipse/papyrus/infra/core/sasheditor/di/contentprovider/commands/CloseDiagramCommand.java
@@ -1,14 +1,14 @@
 /**

  * 

  */

-package org.eclipse.papyrus.sasheditor.contentprovider.di.commands;

+package org.eclipse.papyrus.infra.core.sasheditor.di.contentprovider.commands;

 

 import org.eclipse.core.commands.AbstractHandler;

 import org.eclipse.core.commands.ExecutionEvent;

 import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.papyrus.sasheditor.contentprovider.IPageMngr;

-import org.eclipse.papyrus.sasheditor.editor.ISashWindowsContainer;

-import org.eclipse.papyrus.sashwindows.di.PageRef;

+import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IPageMngr;

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

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

 import org.eclipse.ui.IEditorPart;

 import org.eclipse.ui.handlers.HandlerUtil;

 

diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/custom-src/org/eclipse/papyrus/sasheditor/contentprovider/di/commands/CloseOtherDiagramsCommand.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/custom-src/org/eclipse/papyrus/infra/core/sasheditor/di/contentprovider/commands/CloseOtherDiagramsCommand.java
index b3f1020888d..f0030935646 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/custom-src/org/eclipse/papyrus/sasheditor/contentprovider/di/commands/CloseOtherDiagramsCommand.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/custom-src/org/eclipse/papyrus/infra/core/sasheditor/di/contentprovider/commands/CloseOtherDiagramsCommand.java
@@ -1,14 +1,14 @@
 /**

  * 

  */

-package org.eclipse.papyrus.sasheditor.contentprovider.di.commands;

+package org.eclipse.papyrus.infra.core.sasheditor.di.contentprovider.commands;

 

 import org.eclipse.core.commands.AbstractHandler;

 import org.eclipse.core.commands.ExecutionEvent;

 import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.papyrus.sasheditor.contentprovider.IPageMngr;

-import org.eclipse.papyrus.sasheditor.editor.ISashWindowsContainer;

-import org.eclipse.papyrus.sashwindows.di.PageRef;

+import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IPageMngr;

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

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

 import org.eclipse.ui.IEditorPart;

 import org.eclipse.ui.handlers.HandlerUtil;

 

diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/custom-src/org/eclipse/papyrus/sasheditor/contentprovider/di/internal/ContentChangedEventProvider.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/custom-src/org/eclipse/papyrus/infra/core/sasheditor/di/contentprovider/internal/ContentChangedEventProvider.java
index 3134c9c0372..4fd2f8b2e05 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/custom-src/org/eclipse/papyrus/sasheditor/contentprovider/di/internal/ContentChangedEventProvider.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/custom-src/org/eclipse/papyrus/infra/core/sasheditor/di/contentprovider/internal/ContentChangedEventProvider.java
@@ -1,21 +1,21 @@
 /**

  * 

  */

-package org.eclipse.papyrus.sasheditor.contentprovider.di.internal;

+package org.eclipse.papyrus.infra.core.sasheditor.di.contentprovider.internal;

 

 import java.util.ArrayList;

 import java.util.List;

 

 import org.eclipse.emf.common.notify.Notification;

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

-import org.eclipse.papyrus.sasheditor.contentprovider.IContentChangedListener;

-import org.eclipse.papyrus.sasheditor.contentprovider.IContentChangedListener.ContentEvent;

-import org.eclipse.papyrus.sasheditor.contentprovider.IContentChangedProvider;

-import org.eclipse.papyrus.sashwindows.di.AbstractPanel;

-import org.eclipse.papyrus.sashwindows.di.PageRef;

-import org.eclipse.papyrus.sashwindows.di.SashModel;

-import org.eclipse.papyrus.sashwindows.di.SashWindowsMngr;

-import org.eclipse.papyrus.sashwindows.di.Window;

+import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IContentChangedListener;

+import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IContentChangedProvider;

+import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IContentChangedListener.ContentEvent;

+import org.eclipse.papyrus.infra.core.sashwindows.di.AbstractPanel;

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

+import org.eclipse.papyrus.infra.core.sashwindows.di.SashModel;

+import org.eclipse.papyrus.infra.core.sashwindows.di.SashWindowsMngr;

+import org.eclipse.papyrus.infra.core.sashwindows.di.Window;

 

 /**

  * A class listening on changes on the internal model and delivering events to

diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/custom-src/org/eclipse/papyrus/sasheditor/contentprovider/di/internal/DiContentProvider.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/custom-src/org/eclipse/papyrus/infra/core/sasheditor/di/contentprovider/internal/DiContentProvider.java
index 76e55fc4bdd..894faa2455f 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/custom-src/org/eclipse/papyrus/sasheditor/contentprovider/di/internal/DiContentProvider.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/custom-src/org/eclipse/papyrus/infra/core/sasheditor/di/contentprovider/internal/DiContentProvider.java
@@ -12,17 +12,17 @@
  *

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

 

-package org.eclipse.papyrus.sasheditor.contentprovider.di.internal;

-

-import org.eclipse.papyrus.sasheditor.contentprovider.IAbstractPanelModel;

-import org.eclipse.papyrus.sasheditor.contentprovider.IContentChangedListener.ContentEvent;

-import org.eclipse.papyrus.sasheditor.contentprovider.ISashWindowsContentProvider;

-import org.eclipse.papyrus.sasheditor.contentprovider.ITabFolderModel;

-import org.eclipse.papyrus.sasheditor.contentprovider.di.IPageModelFactory;

-import org.eclipse.papyrus.sashwindows.di.DiFactory;

-import org.eclipse.papyrus.sashwindows.di.SashModel;

-import org.eclipse.papyrus.sashwindows.di.SashPanel;

-import org.eclipse.papyrus.sashwindows.di.TabFolder;

+package org.eclipse.papyrus.infra.core.sasheditor.di.contentprovider.internal;

+

+import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IAbstractPanelModel;

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

+import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ITabFolderModel;

+import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IContentChangedListener.ContentEvent;

+import org.eclipse.papyrus.infra.core.sasheditor.di.contentprovider.IPageModelFactory;

+import org.eclipse.papyrus.infra.core.sashwindows.di.DiFactory;

+import org.eclipse.papyrus.infra.core.sashwindows.di.SashModel;

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

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

 

 /**

  * EMF implementation of the {@link ISashWindowsContentProvider}.

@@ -107,8 +107,8 @@ public class DiContentProvider implements ISashWindowsContentProvider {
 	 * Add a page to the current folder. Create the Page (Editor or Component)

 	 * with the help of the factory.

 	 * 

-	 * @see org.eclipse.papyrus.sasheditor.contentprovider.ISashWindowsContentProvider#addPage(int,

-	 *      org.eclipse.papyrus.sasheditor.contentprovider.IPageModel)

+	 * @see org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ISashWindowsContentProvider#addPage(int,

+	 *      org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IPageModel)

 	 * 

 	 * @param index

 	 * @param tabItem

@@ -119,8 +119,8 @@ public class DiContentProvider implements ISashWindowsContentProvider {
 	}

 

 	/**

-	 * @see org.eclipse.papyrus.sasheditor.contentprovider.ISashWindowsContentProvider#createFolder(org.eclipse.papyrus.sasheditor.contentprovider.ITabFolderModel,

-	 *      int, org.eclipse.papyrus.sasheditor.contentprovider.ITabFolderModel, int)

+	 * @see org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ISashWindowsContentProvider#createFolder(org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ITabFolderModel,

+	 *      int, org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ITabFolderModel, int)

 	 * 

 	 * @param tabFolder

 	 * @param tabIndex

@@ -154,7 +154,7 @@ public class DiContentProvider implements ISashWindowsContentProvider {
 	/**

 	 * Set the current folder.

 	 * 

-	 * @see org.eclipse.papyrus.sasheditor.contentprovider.ISashWindowsContentProvider#setCurrentFolder(java.lang.Object)

+	 * @see org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ISashWindowsContentProvider#setCurrentFolder(java.lang.Object)

 	 * 

 	 * @param rawModel

 	 *        The object identifying the folder.

@@ -171,7 +171,7 @@ public class DiContentProvider implements ISashWindowsContentProvider {
 	 * Get the node used as root of the SashWindows. For now, this is the first

 	 * window.

 	 * 

-	 * @see org.eclipse.papyrus.sasheditor.contentprovider.ISashWindowsContentProvider#getRootModel()

+	 * @see org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ISashWindowsContentProvider#getRootModel()

 	 * 

 	 * @return

 	 */

@@ -183,7 +183,7 @@ public class DiContentProvider implements ISashWindowsContentProvider {
 	/**

 	 * Create the IPanelModel for the rootModel returned by {@link DiContentProvider#getRootModel()}.

 	 * 

-	 * @see org.eclipse.papyrus.sasheditor.contentprovider.ISashWindowsContentProvider#createChildSashModel(java.lang.Object)

+	 * @see org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ISashWindowsContentProvider#createChildSashModel(java.lang.Object)

 	 * 

 	 * @param root

 	 * @return

@@ -199,7 +199,7 @@ public class DiContentProvider implements ISashWindowsContentProvider {
 	}

 

 	/**

-	 * @see org.eclipse.papyrus.sasheditor.contentprovider.ISashWindowsContentProvider#movePage(org.eclipse.papyrus.sasheditor.contentprovider.ITabFolderModel,

+	 * @see org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ISashWindowsContentProvider#movePage(org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ITabFolderModel,

 	 *      int, int)

 	 * 

 	 * @param folderModel

@@ -216,8 +216,8 @@ public class DiContentProvider implements ISashWindowsContentProvider {
 	}

 

 	/**

-	 * @see org.eclipse.papyrus.sasheditor.contentprovider.ISashWindowsContentProvider#movePage(org.eclipse.papyrus.sasheditor.contentprovider.ITabFolderModel,

-	 *      int, org.eclipse.papyrus.sasheditor.contentprovider.ITabFolderModel, int)

+	 * @see org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ISashWindowsContentProvider#movePage(org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ITabFolderModel,

+	 *      int, org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ITabFolderModel, int)

 	 * 

 	 * @param srcFolderModel

 	 * @param sourceIndex

@@ -240,7 +240,7 @@ public class DiContentProvider implements ISashWindowsContentProvider {
 	/**

 	 * Remove specified page from the current folder.

 	 * 

-	 * @see org.eclipse.papyrus.sasheditor.contentprovider.ISashWindowsContentProvider#removePage(int)

+	 * @see org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ISashWindowsContentProvider#removePage(int)

 	 * 

 	 * @param index

 	 */

@@ -250,7 +250,7 @@ public class DiContentProvider implements ISashWindowsContentProvider {
 	}

 

 	/**

-	 * @see org.eclipse.papyrus.sasheditor.contentprovider.ISashWindowsContentProvider#removePage(org.eclipse.papyrus.sasheditor.contentprovider.IPageModel)

+	 * @see org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ISashWindowsContentProvider#removePage(org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IPageModel)

 	 * 

 	 * @param tabItem

 	 */

@@ -260,7 +260,7 @@ public class DiContentProvider implements ISashWindowsContentProvider {
 	}

 

 	/**

-	 * @see org.eclipse.papyrus.sasheditor.contentprovider.ISashWindowsContentProvider#removePage(org.eclipse.papyrus.sasheditor.contentprovider.ITabFolderModel,

+	 * @see org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ISashWindowsContentProvider#removePage(org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ITabFolderModel,

 	 *      int)

 	 * 

 	 * @param parentFolder

diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/custom-src/org/eclipse/papyrus/sasheditor/contentprovider/di/internal/PageMngrImpl.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/custom-src/org/eclipse/papyrus/infra/core/sasheditor/di/contentprovider/internal/PageMngrImpl.java
index a38cee57d76..23d568c6922 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/custom-src/org/eclipse/papyrus/sasheditor/contentprovider/di/internal/PageMngrImpl.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/custom-src/org/eclipse/papyrus/infra/core/sasheditor/di/contentprovider/internal/PageMngrImpl.java
@@ -13,7 +13,7 @@
  *

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

 

-package org.eclipse.papyrus.sasheditor.contentprovider.di.internal;

+package org.eclipse.papyrus.infra.core.sasheditor.di.contentprovider.internal;

 

 import java.util.ArrayList;

 import java.util.Iterator;

@@ -21,10 +21,10 @@ import java.util.List;
 import java.util.Stack;

 

 import org.eclipse.jface.viewers.ISelection;

-import org.eclipse.papyrus.sasheditor.contentprovider.IPageMngr;

-import org.eclipse.papyrus.sasheditor.editor.IPage;

-import org.eclipse.papyrus.sashwindows.di.PageRef;

-import org.eclipse.papyrus.sashwindows.di.SashWindowsMngr;

+import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IPageMngr;

+import org.eclipse.papyrus.infra.core.sasheditor.editor.IPage;

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

+import org.eclipse.papyrus.infra.core.sashwindows.di.SashWindowsMngr;

 import org.eclipse.ui.ISelectionService;

 import org.eclipse.ui.PlatformUI;

 

@@ -98,7 +98,7 @@ public class PageMngrImpl implements IPageMngr {
 	 * Add a page to the PageList. Do not open the corresponding editor. The

 	 * page will be visible in the list.

 	 * 

-	 * @see org.eclipse.papyrus.sasheditor.contentprovider.IPageMngr#addEditor(org.eclipse.emf.ecore.EObject)

+	 * @see org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IPageMngr#addEditor(org.eclipse.emf.ecore.EObject)

 	 * 

 	 * @param pageIdentifier

 	 */

@@ -110,7 +110,7 @@ public class PageMngrImpl implements IPageMngr {
 	}

 

 	/**

-	 * @see org.eclipse.papyrus.sasheditor.contentprovider.IPageMngr#allPages()

+	 * @see org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IPageMngr#allPages()

 	 * 

 	 * @return

 	 */

@@ -129,7 +129,7 @@ public class PageMngrImpl implements IPageMngr {
 	/**

 	 * Remove the page from the SashModel

 	 * 

-	 * @see org.eclipse.papyrus.sasheditor.contentprovider.IPageMngr#closePage(org.eclipse.emf.ecore.EObject)

+	 * @see org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IPageMngr#closePage(org.eclipse.emf.ecore.EObject)

 	 * 

 	 * @param pageIdentifier

 	 */

@@ -143,7 +143,7 @@ public class PageMngrImpl implements IPageMngr {
 	/**

 	 * Remove all pages from the SashModel. Left only the top level folder

 	 * 

-	 * @see org.eclipse.papyrus.sasheditor.contentprovider.IPageMngr#closePage(org.eclipse.emf.ecore.EObject)

+	 * @see org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IPageMngr#closePage(org.eclipse.emf.ecore.EObject)

 	 * 

 	 * @param pageIdentifier

 	 */

@@ -158,7 +158,7 @@ public class PageMngrImpl implements IPageMngr {
 	/**

 	 * Remove all pages from the SashModel. Left only the top level folder

 	 * 

-	 * @see org.eclipse.papyrus.sasheditor.contentprovider.IPageMngr#closePage(org.eclipse.emf.ecore.EObject)

+	 * @see org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IPageMngr#closePage(org.eclipse.emf.ecore.EObject)

 	 * 

 	 * @param pageIdentifier

 	 */

@@ -169,7 +169,7 @@ public class PageMngrImpl implements IPageMngr {
 	}

 

 	/**

-	 * @see org.eclipse.papyrus.sasheditor.contentprovider.IPageMngr#openPage(org.eclipse.emf.ecore.EObject)

+	 * @see org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IPageMngr#openPage(org.eclipse.emf.ecore.EObject)

 	 * 

 	 * @param pageIdentifier

 	 */

@@ -197,7 +197,7 @@ public class PageMngrImpl implements IPageMngr {
 	}

 

 	/**

-	 * @see org.eclipse.papyrus.sasheditor.contentprovider.IPageMngr#openPage(org.eclipse.emf.ecore.EObject)

+	 * @see org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IPageMngr#openPage(org.eclipse.emf.ecore.EObject)

 	 * 

 	 * @param pageIdentifier

 	 */

@@ -222,7 +222,7 @@ public class PageMngrImpl implements IPageMngr {
 	}

 

 	/**

-	 * @see org.eclipse.papyrus.sasheditor.contentprovider.IPageMngr#removePage(org.eclipse.emf.ecore.EObject)

+	 * @see org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IPageMngr#removePage(org.eclipse.emf.ecore.EObject)

 	 * 

 	 * @param pageIdentifier

 	 */

@@ -237,7 +237,7 @@ public class PageMngrImpl implements IPageMngr {
 

 	/**

 	 * 

-	 * @see org.eclipse.papyrus.sasheditor.contentprovider.IPageMngr#isOpen(java.lang.Object)

+	 * @see org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IPageMngr#isOpen(java.lang.Object)

 	 * @param pageIdentifier

 	 * @return

 	 * 

@@ -248,7 +248,7 @@ public class PageMngrImpl implements IPageMngr {
 

 	/**

 	 * 

-	 * @see org.eclipse.papyrus.sasheditor.contentprovider.IPageMngr#openPrevious()

+	 * @see org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IPageMngr#openPrevious()

 	 * 

 	 */

 	public void openPrevious() {

@@ -270,7 +270,7 @@ public class PageMngrImpl implements IPageMngr {
 

 	/**

 	 * 

-	 * @see org.eclipse.papyrus.sasheditor.contentprovider.IPageMngr#openNext()

+	 * @see org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IPageMngr#openNext()

 	 * 

 	 */

 	public void openNext() {

@@ -325,7 +325,7 @@ public class PageMngrImpl implements IPageMngr {
 

 	/**

 	 * 

-	 * @see org.eclipse.papyrus.sasheditor.contentprovider.IPageMngr#hasPreviousHistory()

+	 * @see org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IPageMngr#hasPreviousHistory()

 	 * 

 	 */

 	public boolean hasPreviousHistory() {

@@ -334,7 +334,7 @@ public class PageMngrImpl implements IPageMngr {
 

 	/**

 	 * 

-	 * @see org.eclipse.papyrus.sasheditor.contentprovider.IPageMngr#hasNextHistory()

+	 * @see org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IPageMngr#hasNextHistory()

 	 * 

 	 */

 	public boolean hasNextHistory() {

@@ -343,7 +343,7 @@ public class PageMngrImpl implements IPageMngr {
 

 	/**

 	 * 

-	 * @see org.eclipse.papyrus.sasheditor.contentprovider.IPageMngr#isInHsitory()

+	 * @see org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IPageMngr#isInHsitory()

 	 * 

 	 */

 	public int isInHsitory(Object pageIdentifier) {

diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/custom-src/org/eclipse/papyrus/sasheditor/contentprovider/di/internal/SashPanelModel.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/custom-src/org/eclipse/papyrus/infra/core/sasheditor/di/contentprovider/internal/SashPanelModel.java
index f8f95a74400..a742519fef7 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/custom-src/org/eclipse/papyrus/sasheditor/contentprovider/di/internal/SashPanelModel.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/custom-src/org/eclipse/papyrus/infra/core/sasheditor/di/contentprovider/internal/SashPanelModel.java
@@ -12,15 +12,15 @@
  *

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

 

-package org.eclipse.papyrus.sasheditor.contentprovider.di.internal;

+package org.eclipse.papyrus.infra.core.sasheditor.di.contentprovider.internal;

 

 import java.util.List;

 

-import org.eclipse.papyrus.sasheditor.contentprovider.IAbstractPanelModel;

-import org.eclipse.papyrus.sasheditor.contentprovider.ISashPanelModel;

-import org.eclipse.papyrus.sasheditor.contentprovider.di.IPageModelFactory;

-import org.eclipse.papyrus.sashwindows.di.SashPanel;

-import org.eclipse.papyrus.sashwindows.di.TabFolder;

+import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IAbstractPanelModel;

+import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ISashPanelModel;

+import org.eclipse.papyrus.infra.core.sasheditor.di.contentprovider.IPageModelFactory;

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

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

 

 /**

  * @author cedric dumoulin

@@ -47,7 +47,7 @@ public class SashPanelModel implements IAbstractPanelModel, ISashPanelModel {
 	}

 

 	/**

-	 * @see org.eclipse.papyrus.sasheditor.contentprovider.ISashPanelModel#getChildren()

+	 * @see org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ISashPanelModel#getChildren()

 	 * 

 	 * @return

 	 */

@@ -56,7 +56,7 @@ public class SashPanelModel implements IAbstractPanelModel, ISashPanelModel {
 	}

 

 	/**

-	 * @see org.eclipse.papyrus.sasheditor.contentprovider.ISashPanelModel#createChildSashModel(java.lang.Object)

+	 * @see org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ISashPanelModel#createChildSashModel(java.lang.Object)

 	 * 

 	 * @param child

 	 * @return

@@ -71,7 +71,7 @@ public class SashPanelModel implements IAbstractPanelModel, ISashPanelModel {
 	}

 

 	/**

-	 * @see org.eclipse.papyrus.sasheditor.contentprovider.ISashPanelModel#getSashDirection()

+	 * @see org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ISashPanelModel#getSashDirection()

 	 * 

 	 * @return

 	 */

diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/custom-src/org/eclipse/papyrus/sasheditor/contentprovider/di/internal/TabFolderModel.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/custom-src/org/eclipse/papyrus/infra/core/sasheditor/di/contentprovider/internal/TabFolderModel.java
index bb92e23b397..71e7a08e9f3 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/custom-src/org/eclipse/papyrus/sasheditor/contentprovider/di/internal/TabFolderModel.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/custom-src/org/eclipse/papyrus/infra/core/sasheditor/di/contentprovider/internal/TabFolderModel.java
@@ -12,15 +12,15 @@
  *

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

 

-package org.eclipse.papyrus.sasheditor.contentprovider.di.internal;

+package org.eclipse.papyrus.infra.core.sasheditor.di.contentprovider.internal;

 

 import java.util.List;

 

-import org.eclipse.papyrus.sasheditor.contentprovider.IPageModel;

-import org.eclipse.papyrus.sasheditor.contentprovider.ITabFolderModel;

-import org.eclipse.papyrus.sasheditor.contentprovider.di.IPageModelFactory;

-import org.eclipse.papyrus.sashwindows.di.PageRef;

-import org.eclipse.papyrus.sashwindows.di.TabFolder;

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

+import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ITabFolderModel;

+import org.eclipse.papyrus.infra.core.sasheditor.di.contentprovider.IPageModelFactory;

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

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

 

 /**

  * @author dumoulin

@@ -44,7 +44,7 @@ public class TabFolderModel implements ITabFolderModel {
 	}

 

 	/**

-	 * @see org.eclipse.papyrus.sasheditor.contentprovider.ITabFolderModel#getChildren()

+	 * @see org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ITabFolderModel#getChildren()

 	 * 

 	 * @return

 	 */

@@ -53,7 +53,7 @@ public class TabFolderModel implements ITabFolderModel {
 	}

 

 	/**

-	 * @see org.eclipse.papyrus.sasheditor.contentprovider.ITabFolderModel#createChildSashModel(java.lang.Object)

+	 * @see org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ITabFolderModel#createChildSashModel(java.lang.Object)

 	 * 

 	 * @param child

 	 *        The child object returned by {@link TabFolderModel#getChildren}

diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/custom-src/org/eclipse/papyrus/sasheditor/contentprovider/di/internal/TransactionalDiContentProvider.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/custom-src/org/eclipse/papyrus/infra/core/sasheditor/di/contentprovider/internal/TransactionalDiContentProvider.java
index 540004320aa..badba02fbaa 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/custom-src/org/eclipse/papyrus/sasheditor/contentprovider/di/internal/TransactionalDiContentProvider.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/custom-src/org/eclipse/papyrus/infra/core/sasheditor/di/contentprovider/internal/TransactionalDiContentProvider.java
@@ -1,13 +1,13 @@
 /**

  * 

  */

-package org.eclipse.papyrus.sasheditor.contentprovider.di.internal;

+package org.eclipse.papyrus.infra.core.sasheditor.di.contentprovider.internal;

 

 import org.eclipse.emf.transaction.RecordingCommand;

 import org.eclipse.emf.transaction.TransactionalEditingDomain;

-import org.eclipse.papyrus.sasheditor.contentprovider.IAbstractPanelModel;

-import org.eclipse.papyrus.sasheditor.contentprovider.ISashWindowsContentProvider;

-import org.eclipse.papyrus.sasheditor.contentprovider.ITabFolderModel;

+import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IAbstractPanelModel;

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

+import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ITabFolderModel;

 

 /**

  * A content provider based on EMF di and using Transactions. This

@@ -47,7 +47,7 @@ public class TransactionalDiContentProvider implements ISashWindowsContentProvid
 	}

 

 	/**

-	 * @see org.eclipse.papyrus.sasheditor.contentprovider.ISashWindowsContentProvider#addPage(java.lang.Object)

+	 * @see org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ISashWindowsContentProvider#addPage(java.lang.Object)

 	 * @param page

 	 * 

 	 */

@@ -67,7 +67,7 @@ public class TransactionalDiContentProvider implements ISashWindowsContentProvid
 	}

 

 	/**

-	 * @see org.eclipse.papyrus.sasheditor.contentprovider.ISashWindowsContentProvider#addPage(java.lang.Object, int)

+	 * @see org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ISashWindowsContentProvider#addPage(java.lang.Object, int)

 	 * @param page

 	 * @param index

 	 * 

@@ -88,7 +88,7 @@ public class TransactionalDiContentProvider implements ISashWindowsContentProvid
 	}

 

 	/**

-	 * @see org.eclipse.papyrus.sasheditor.contentprovider.ISashWindowsContentProvider#createChildSashModel(java.lang.Object)

+	 * @see org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ISashWindowsContentProvider#createChildSashModel(java.lang.Object)

 	 * @param root

 	 * @return

 	 * 

@@ -98,8 +98,8 @@ public class TransactionalDiContentProvider implements ISashWindowsContentProvid
 	}

 

 	/**

-	 * @see org.eclipse.papyrus.sasheditor.contentprovider.ISashWindowsContentProvider#createFolder(org.eclipse.papyrus.sasheditor.contentprovider.ITabFolderModel,

-	 *      int, org.eclipse.papyrus.sasheditor.contentprovider.ITabFolderModel, int)

+	 * @see org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ISashWindowsContentProvider#createFolder(org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ITabFolderModel,

+	 *      int, org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ITabFolderModel, int)

 	 * @param tabFolder

 	 * @param tabIndex

 	 * @param targetFolder

@@ -124,7 +124,7 @@ public class TransactionalDiContentProvider implements ISashWindowsContentProvid
 	/**

 	 * Keep trace of the current folder.

 	 * 

-	 * @see org.eclipse.papyrus.sasheditor.contentprovider.ISashWindowsContentProvider#setCurrentFolder(java.lang.Object)

+	 * @see org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ISashWindowsContentProvider#setCurrentFolder(java.lang.Object)

 	 * 

 	 * @param rawModel

 	 */

@@ -144,7 +144,7 @@ public class TransactionalDiContentProvider implements ISashWindowsContentProvid
 	}

 

 	/**

-	 * @see org.eclipse.papyrus.sasheditor.contentprovider.ISashWindowsContentProvider#getRootModel()

+	 * @see org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ISashWindowsContentProvider#getRootModel()

 	 * @return

 	 * 

 	 */

@@ -153,7 +153,7 @@ public class TransactionalDiContentProvider implements ISashWindowsContentProvid
 	}

 

 	/**

-	 * @see org.eclipse.papyrus.sasheditor.contentprovider.ISashWindowsContentProvider#movePage(org.eclipse.papyrus.sasheditor.contentprovider.ITabFolderModel,

+	 * @see org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ISashWindowsContentProvider#movePage(org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ITabFolderModel,

 	 *      int, int)

 	 * @param folderModel

 	 * @param oldIndex

@@ -176,8 +176,8 @@ public class TransactionalDiContentProvider implements ISashWindowsContentProvid
 	}

 

 	/**

-	 * @see org.eclipse.papyrus.sasheditor.contentprovider.ISashWindowsContentProvider#movePage(org.eclipse.papyrus.sasheditor.contentprovider.ITabFolderModel,

-	 *      int, org.eclipse.papyrus.sasheditor.contentprovider.ITabFolderModel, int)

+	 * @see org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ISashWindowsContentProvider#movePage(org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ITabFolderModel,

+	 *      int, org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ITabFolderModel, int)

 	 * @param srcFolderModel

 	 * @param sourceIndex

 	 * @param targetFolderModel

@@ -200,7 +200,7 @@ public class TransactionalDiContentProvider implements ISashWindowsContentProvid
 	}

 

 	/**

-	 * @see org.eclipse.papyrus.sasheditor.contentprovider.ISashWindowsContentProvider#removePage(int)

+	 * @see org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ISashWindowsContentProvider#removePage(int)

 	 * @param index

 	 * 

 	 */

@@ -220,7 +220,7 @@ public class TransactionalDiContentProvider implements ISashWindowsContentProvid
 	}

 

 	/**

-	 * @see org.eclipse.papyrus.sasheditor.contentprovider.ISashWindowsContentProvider#removePage(java.lang.Object)

+	 * @see org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ISashWindowsContentProvider#removePage(java.lang.Object)

 	 * @param page

 	 * 

 	 */

@@ -240,7 +240,7 @@ public class TransactionalDiContentProvider implements ISashWindowsContentProvid
 	}

 

 	/**

-	 * @see org.eclipse.papyrus.sasheditor.contentprovider.ISashWindowsContentProvider#removePage(org.eclipse.papyrus.sasheditor.contentprovider.ITabFolderModel,

+	 * @see org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ISashWindowsContentProvider#removePage(org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ITabFolderModel,

 	 *      int)

 	 * @param parentFolder

 	 * @param tabIndex

diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/custom-src/org/eclipse/papyrus/sasheditor/contentprovider/di/internal/TransactionalPageMngrImpl.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/custom-src/org/eclipse/papyrus/infra/core/sasheditor/di/contentprovider/internal/TransactionalPageMngrImpl.java
index 3bfe51eecb7..23d46c606f2 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/custom-src/org/eclipse/papyrus/sasheditor/contentprovider/di/internal/TransactionalPageMngrImpl.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/custom-src/org/eclipse/papyrus/infra/core/sasheditor/di/contentprovider/internal/TransactionalPageMngrImpl.java
@@ -12,14 +12,14 @@
  *

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

 

-package org.eclipse.papyrus.sasheditor.contentprovider.di.internal;

+package org.eclipse.papyrus.infra.core.sasheditor.di.contentprovider.internal;

 

 import java.util.List;

 

 import org.eclipse.emf.transaction.RecordingCommand;

 import org.eclipse.emf.transaction.TransactionalEditingDomain;

-import org.eclipse.papyrus.sasheditor.contentprovider.IPageMngr;

-import org.eclipse.papyrus.sasheditor.editor.IPage;

+import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IPageMngr;

+import org.eclipse.papyrus.infra.core.sasheditor.editor.IPage;

 

 /**

  * A PageMngr based on EMF di and using Transactions. This implementation is a

@@ -57,7 +57,7 @@ public class TransactionalPageMngrImpl implements IPageMngr {
 	}

 

 	/**

-	 * @see org.eclipse.papyrus.sasheditor.contentprovider.IPageMngr#addPage(java.lang.Object)

+	 * @see org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IPageMngr#addPage(java.lang.Object)

 	 * 

 	 * @param pageIdentifier

 	 */

@@ -73,7 +73,7 @@ public class TransactionalPageMngrImpl implements IPageMngr {
 	}

 

 	/**

-	 * @see org.eclipse.papyrus.sasheditor.contentprovider.IPageMngr#allPages()

+	 * @see org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IPageMngr#allPages()

 	 * 

 	 * @return

 	 */

@@ -82,7 +82,7 @@ public class TransactionalPageMngrImpl implements IPageMngr {
 	}

 

 	/**

-	 * @see org.eclipse.papyrus.sasheditor.contentprovider.IPageMngr#closePage(java.lang.Object)

+	 * @see org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IPageMngr#closePage(java.lang.Object)

 	 * 

 	 * @param pageIdentifier

 	 */

@@ -100,7 +100,7 @@ public class TransactionalPageMngrImpl implements IPageMngr {
 	/**

 	 * Remove all pages from the SashModel. Left only the top level folder

 	 * 

-	 * @see org.eclipse.papyrus.sasheditor.contentprovider.IPageMngr#closePage(org.eclipse.emf.ecore.EObject)

+	 * @see org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IPageMngr#closePage(org.eclipse.emf.ecore.EObject)

 	 * 

 	 * @param pageIdentifier

 	 */

@@ -117,7 +117,7 @@ public class TransactionalPageMngrImpl implements IPageMngr {
 

 	/**

 	 * 

-	 * @see org.eclipse.papyrus.sasheditor.contentprovider.IPageMngr#closePage(org.eclipse.emf.ecore.EObject)

+	 * @see org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IPageMngr#closePage(org.eclipse.emf.ecore.EObject)

 	 * 

 	 * @param pageIdentifier

 	 */

@@ -133,7 +133,7 @@ public class TransactionalPageMngrImpl implements IPageMngr {
 	}

 

 	/**

-	 * @see org.eclipse.papyrus.sasheditor.contentprovider.IPageMngr#openPage(java.lang.Object)

+	 * @see org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IPageMngr#openPage(java.lang.Object)

 	 * 

 	 * @param pageIdentifier

 	 */

@@ -149,7 +149,7 @@ public class TransactionalPageMngrImpl implements IPageMngr {
 	}

 

 	/**

-	 * @see org.eclipse.papyrus.sasheditor.contentprovider.IPageMngr#removePage(java.lang.Object)

+	 * @see org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IPageMngr#removePage(java.lang.Object)

 	 * 

 	 * @param pageIdentifier

 	 */

@@ -166,7 +166,7 @@ public class TransactionalPageMngrImpl implements IPageMngr {
 

 	/**

 	 * 

-	 * @see org.eclipse.papyrus.sasheditor.contentprovider.IPageMngr#isOpen(java.lang.Object)

+	 * @see org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IPageMngr#isOpen(java.lang.Object)

 	 * @param pageIdentifier

 	 * @return

 	 * 

@@ -177,7 +177,7 @@ public class TransactionalPageMngrImpl implements IPageMngr {
 

 	/**

 	 * 

-	 * @see org.eclipse.papyrus.sasheditor.contentprovider.IPageMngr#openPrevious()

+	 * @see org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IPageMngr#openPrevious()

 	 * 

 	 */

 	public void openPrevious() {

@@ -193,7 +193,7 @@ public class TransactionalPageMngrImpl implements IPageMngr {
 

 	/**

 	 * 

-	 * @see org.eclipse.papyrus.sasheditor.contentprovider.IPageMngr#openNext()

+	 * @see org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IPageMngr#openNext()

 	 * 

 	 */

 	public void openNext() {

diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/custom-src/org/eclipse/papyrus/sasheditor/contentprovider/di/utils/IPageUtils.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/custom-src/org/eclipse/papyrus/infra/core/sasheditor/di/contentprovider/utils/IPageUtils.java
index ddf15195761..f9c4dc46b39 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/custom-src/org/eclipse/papyrus/sasheditor/contentprovider/di/utils/IPageUtils.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/custom-src/org/eclipse/papyrus/infra/core/sasheditor/di/contentprovider/utils/IPageUtils.java
@@ -12,10 +12,10 @@
  *

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

 

-package org.eclipse.papyrus.sasheditor.contentprovider.di.utils;

+package org.eclipse.papyrus.infra.core.sasheditor.di.contentprovider.utils;

 

-import org.eclipse.papyrus.sasheditor.editor.IPage;

-import org.eclipse.papyrus.sashwindows.di.PageRef;

+import org.eclipse.papyrus.infra.core.sasheditor.editor.IPage;

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

 

 /**

  * Class providing a utility methods allowing to get the real Model from the {@link IPage#getRawModel()}. The utility takes into account the bug

diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/model/sashwindowsdi.genmodel b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/model/sashwindowsdi.genmodel
index bfe1f9595d3..a77210feaf8 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/model/sashwindowsdi.genmodel
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/model/sashwindowsdi.genmodel
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <genmodel:GenModel xmi:version="2.0"

     xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

-    xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:genmodel="http://www.eclipse.org/uml2/2.2.0/GenModel" modelDirectory="/org.eclipse.papyrus.sasheditor.di/src"

-    modelPluginID="org.eclipse.papyrus.sasheditor.di" modelName="Sashwindowsdi" importerID="org.eclipse.uml2.uml.ecore.importer"

+    xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:genmodel="http://www.eclipse.org/uml2/2.2.0/GenModel" modelDirectory="/org.eclipse.papyrus.infra.core.sasheditor.di/src"

+    modelPluginID="org.eclipse.papyrus.infra.core.sasheditor.di" modelName="Sashwindowsdi" importerID="org.eclipse.uml2.uml.ecore.importer"

     complianceLevel="5.0" copyrightFields="false" usedGenPackages="platform:/plugin/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore">

   <genAnnotations source="http://www.eclipse.org/emf/2002/GenModel/importer/org.eclipse.uml2.uml.ecore.importer">

     <details key="ECORE_TAGGED_VALUES" value="PROCESS"/>

diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/model/sashwindowsdi.uml b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/model/sashwindowsdi.uml
index 4dc964da7d6..014b02ff374 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/model/sashwindowsdi.uml
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/model/sashwindowsdi.uml
@@ -528,7 +528,7 @@ Used to insert a new SashPanel.</body>
       <appliedProfile href="pathmap://UML_PROFILES/Ecore.profile.uml#_0"/>

     </profileApplication>

   </uml:Model>

-  <Ecore:EPackage xmi:id="_zLIxUEJfEd6kIY39uis5Uw" nsPrefix="di2" nsURI="http://www.eclipse.org/papyrus/0.7.0/sashdi" basePackage="org.eclipse.papyrus.sashwindows.di"/>

+  <Ecore:EPackage xmi:id="_zLIxUEJfEd6kIY39uis5Uw" nsPrefix="di2" nsURI="http://www.eclipse.org/papyrus/0.7.0/sashdi" basePackage="org.eclipse.papyrus.infra.core.sashwindows.di"/>

   <Ecore_1:EPackage xmi:id="_mo48QEJgEd6kIY39uis5Uw" base_Package="_NuHhwEJVEd6kIY39uis5Uw" nsPrefix="di" nsURI="http://www.eclipse.org/papyrus/0.7.0/sashdi" basePackage="org.eclipse.papyrus.sashwindows" prefix="Di">

     <annotation>resource=XMI</annotation>

   </Ecore_1:EPackage>

diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/plugin.xml b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/plugin.xml
index ac17e8c0b29..392840484d8 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/plugin.xml
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/plugin.xml
@@ -13,7 +13,7 @@
    <extension point="org.eclipse.emf.ecore.generated_package">

       <package

             uri="http://www.eclipse.org/papyrus/0.7.0/sashdi"

-            class="org.eclipse.papyrus.sashwindows.di.DiPackage"

+            class="org.eclipse.papyrus.infra.core.sashwindows.di.DiPackage"

             genModel="model/sashwindowsdi.genmodel"/>

    </extension>

 

diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/src-spare/org/eclipse/papyrus/sashwindows/di/impl/PageListImpl.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/src-spare/org/eclipse/papyrus/sashwindows/di/impl/PageListImpl.java
index e89392e946f..974e4212191 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/src-spare/org/eclipse/papyrus/sashwindows/di/impl/PageListImpl.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/src-spare/org/eclipse/papyrus/sashwindows/di/impl/PageListImpl.java
@@ -4,7 +4,7 @@
  *

  * $Id$

  */

-package org.eclipse.papyrus.sashwindows.di.impl;

+package org.eclipse.papyrus.infra.core.sashwindows.di.impl;

 

 import java.util.ArrayList;

 import java.util.Collection;

@@ -22,10 +22,10 @@ import org.eclipse.emf.ecore.impl.EObjectImpl;
 import org.eclipse.emf.ecore.util.EObjectContainmentEList;

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

 

-import org.eclipse.papyrus.sashwindows.di.DiFactory;

-import org.eclipse.papyrus.sashwindows.di.DiPackage;

-import org.eclipse.papyrus.sashwindows.di.PageList;

-import org.eclipse.papyrus.sashwindows.di.PageRef;

+import org.eclipse.papyrus.infra.core.sashwindows.di.DiFactory;

+import org.eclipse.papyrus.infra.core.sashwindows.di.DiPackage;

+import org.eclipse.papyrus.infra.core.sashwindows.di.PageList;

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

 

 /**

  * <!-- begin-user-doc -->

@@ -34,7 +34,7 @@ import org.eclipse.papyrus.sashwindows.di.PageRef;
  * <p>

  * The following features are implemented:

  * <ul>

- *   <li>{@link org.eclipse.papyrus.sashwindows.di.impl.PageListImpl#getAvailablePage <em>Available Page</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.infra.core.sashwindows.di.impl.PageListImpl#getAvailablePage <em>Available Page</em>}</li>

  * </ul>

  * </p>

  *

diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/src-spare/org/eclipse/papyrus/sashwindows/di/impl/PageRefImpl.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/src-spare/org/eclipse/papyrus/sashwindows/di/impl/PageRefImpl.java
index bff08a4e3f7..fd29f53cf6f 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/src-spare/org/eclipse/papyrus/sashwindows/di/impl/PageRefImpl.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/src-spare/org/eclipse/papyrus/sashwindows/di/impl/PageRefImpl.java
@@ -4,7 +4,7 @@
  *

  * $Id$

  */

-package org.eclipse.papyrus.sashwindows.di.impl;

+package org.eclipse.papyrus.infra.core.sashwindows.di.impl;

 

 import org.eclipse.emf.common.notify.Notification;

 import org.eclipse.emf.common.notify.NotificationChain;

@@ -18,9 +18,9 @@ import org.eclipse.emf.ecore.impl.EObjectImpl;
 

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

 

-import org.eclipse.papyrus.sashwindows.di.DiPackage;

-import org.eclipse.papyrus.sashwindows.di.PageRef;

-import org.eclipse.papyrus.sashwindows.di.TabFolder;

+import org.eclipse.papyrus.infra.core.sashwindows.di.DiPackage;

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

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

 

 /**

  * <!-- begin-user-doc -->

@@ -29,8 +29,8 @@ import org.eclipse.papyrus.sashwindows.di.TabFolder;
  * <p>

  * The following features are implemented:

  * <ul>

- *   <li>{@link org.eclipse.papyrus.sashwindows.di.impl.PageRefImpl#getPageIdentifier <em>Page Identifier</em>}</li>

- *   <li>{@link org.eclipse.papyrus.sashwindows.di.impl.PageRefImpl#getParent <em>Parent</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.infra.core.sashwindows.di.impl.PageRefImpl#getPageIdentifier <em>Page Identifier</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.infra.core.sashwindows.di.impl.PageRefImpl#getParent <em>Parent</em>}</li>

  * </ul>

  * </p>

  *

diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/src-spare/org/eclipse/papyrus/sashwindows/di/impl/SashModelImpl.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/src-spare/org/eclipse/papyrus/sashwindows/di/impl/SashModelImpl.java
index 63953519ceb..cee4503c466 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/src-spare/org/eclipse/papyrus/sashwindows/di/impl/SashModelImpl.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/src-spare/org/eclipse/papyrus/sashwindows/di/impl/SashModelImpl.java
@@ -4,7 +4,7 @@
  *

  * $Id$

  */

-package org.eclipse.papyrus.sashwindows.di.impl;

+package org.eclipse.papyrus.infra.core.sashwindows.di.impl;

 

 import java.util.Collection;

 import java.util.List;

@@ -18,16 +18,16 @@ import org.eclipse.emf.ecore.impl.ENotificationImpl;
 import org.eclipse.emf.ecore.impl.EObjectImpl;

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

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

-import org.eclipse.papyrus.sashwindows.di.AbstractNode;

-import org.eclipse.papyrus.sashwindows.di.AbstractPanel;

-import org.eclipse.papyrus.sashwindows.di.DiFactory;

-import org.eclipse.papyrus.sashwindows.di.DiPackage;

-import org.eclipse.papyrus.sashwindows.di.PageRef;

-import org.eclipse.papyrus.sashwindows.di.SashModel;

-import org.eclipse.papyrus.sashwindows.di.SashPanel;

-import org.eclipse.papyrus.sashwindows.di.TabFolder;

-import org.eclipse.papyrus.sashwindows.di.Window;

-import org.eclipse.papyrus.sashwindows.di.util.DiSwitch;

+import org.eclipse.papyrus.infra.core.sashwindows.di.AbstractNode;

+import org.eclipse.papyrus.infra.core.sashwindows.di.AbstractPanel;

+import org.eclipse.papyrus.infra.core.sashwindows.di.DiFactory;

+import org.eclipse.papyrus.infra.core.sashwindows.di.DiPackage;

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

+import org.eclipse.papyrus.infra.core.sashwindows.di.SashModel;

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

+import org.eclipse.papyrus.infra.core.sashwindows.di.util.DiSwitch;

 import org.eclipse.swt.SWT;

 

 /**

@@ -37,8 +37,8 @@ import org.eclipse.swt.SWT;
  * <p>

  * The following features are implemented:

  * <ul>

- *   <li>{@link org.eclipse.papyrus.sashwindows.di.impl.SashModelImpl#getWindows <em>Windows</em>}</li>

- *   <li>{@link org.eclipse.papyrus.sashwindows.di.impl.SashModelImpl#getCurrentSelection <em>Current Selection</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.infra.core.sashwindows.di.impl.SashModelImpl#getWindows <em>Windows</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.infra.core.sashwindows.di.impl.SashModelImpl#getCurrentSelection <em>Current Selection</em>}</li>

  * </ul>

  * </p>

  *

@@ -80,7 +80,7 @@ public class SashModelImpl extends EObjectImpl implements SashModel {
 			

 			/**

 			 * Iterate over windows

-			 * @see org.eclipse.papyrus.sashwindows.di.util.DiSwitch#caseSashModel(org.eclipse.papyrus.sashwindows.di.SashModel)

+			 * @see org.eclipse.papyrus.infra.core.sashwindows.di.util.DiSwitch#caseSashModel(org.eclipse.papyrus.infra.core.sashwindows.di.SashModel)

 			 *

 			 * @param object

 			 * @return

@@ -99,7 +99,7 @@ public class SashModelImpl extends EObjectImpl implements SashModel {
 			

 			/**

 			 * Iterate over children

-			 * @see org.eclipse.papyrus.sashwindows.di.util.DiSwitch#caseSashPanel(org.eclipse.papyrus.sashwindows.di.SashPanel)

+			 * @see org.eclipse.papyrus.infra.core.sashwindows.di.util.DiSwitch#caseSashPanel(org.eclipse.papyrus.infra.core.sashwindows.di.SashPanel)

 			 *

 			 * @param object

 			 * @return

@@ -118,7 +118,7 @@ public class SashModelImpl extends EObjectImpl implements SashModel {
 			

 			/**

 			 * Iterate over PageRef

-			 * @see org.eclipse.papyrus.sashwindows.di.util.DiSwitch#caseTabFolder(org.eclipse.papyrus.sashwindows.di.TabFolder)

+			 * @see org.eclipse.papyrus.infra.core.sashwindows.di.util.DiSwitch#caseTabFolder(org.eclipse.papyrus.infra.core.sashwindows.di.TabFolder)

 			 *

 			 * @param object

 			 * @return

diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/src-spare/org/eclipse/papyrus/sashwindows/di/impl/SashPanelImpl.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/src-spare/org/eclipse/papyrus/sashwindows/di/impl/SashPanelImpl.java
index c7f05039fff..f4f555fa25e 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/src-spare/org/eclipse/papyrus/sashwindows/di/impl/SashPanelImpl.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/src-spare/org/eclipse/papyrus/sashwindows/di/impl/SashPanelImpl.java
@@ -4,7 +4,7 @@
  *

  * $Id$

  */

-package org.eclipse.papyrus.sashwindows.di.impl;

+package org.eclipse.papyrus.infra.core.sashwindows.di.impl;

 

 import java.util.Collection;

 import java.util.List;

@@ -22,10 +22,10 @@ import org.eclipse.emf.ecore.impl.ENotificationImpl;
 import org.eclipse.emf.ecore.util.EObjectContainmentEList;

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

 

-import org.eclipse.papyrus.sashwindows.di.AbstractNode;

-import org.eclipse.papyrus.sashwindows.di.AbstractPanel;

-import org.eclipse.papyrus.sashwindows.di.DiPackage;

-import org.eclipse.papyrus.sashwindows.di.SashPanel;

+import org.eclipse.papyrus.infra.core.sashwindows.di.AbstractNode;

+import org.eclipse.papyrus.infra.core.sashwindows.di.AbstractPanel;

+import org.eclipse.papyrus.infra.core.sashwindows.di.DiPackage;

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

 

 /**

  * <!-- begin-user-doc -->

@@ -34,9 +34,9 @@ import org.eclipse.papyrus.sashwindows.di.SashPanel;
  * <p>

  * The following features are implemented:

  * <ul>

- *   <li>{@link org.eclipse.papyrus.sashwindows.di.impl.SashPanelImpl#getChildren <em>Children</em>}</li>

- *   <li>{@link org.eclipse.papyrus.sashwindows.di.impl.SashPanelImpl#getSashPosition <em>Sash Position</em>}</li>

- *   <li>{@link org.eclipse.papyrus.sashwindows.di.impl.SashPanelImpl#getDirection <em>Direction</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.infra.core.sashwindows.di.impl.SashPanelImpl#getChildren <em>Children</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.infra.core.sashwindows.di.impl.SashPanelImpl#getSashPosition <em>Sash Position</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.infra.core.sashwindows.di.impl.SashPanelImpl#getDirection <em>Direction</em>}</li>

  * </ul>

  * </p>

  *

diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/src-spare/org/eclipse/papyrus/sashwindows/di/impl/TabFolderImpl.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/src-spare/org/eclipse/papyrus/sashwindows/di/impl/TabFolderImpl.java
index 087cfc1a282..072132603ab 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/src-spare/org/eclipse/papyrus/sashwindows/di/impl/TabFolderImpl.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/src-spare/org/eclipse/papyrus/sashwindows/di/impl/TabFolderImpl.java
@@ -4,7 +4,7 @@
  *

  * $Id$

  */

-package org.eclipse.papyrus.sashwindows.di.impl;

+package org.eclipse.papyrus.infra.core.sashwindows.di.impl;

 

 import java.util.Collection;

 

@@ -14,10 +14,10 @@ import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.InternalEObject;

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

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

-import org.eclipse.papyrus.sashwindows.di.DiFactory;

-import org.eclipse.papyrus.sashwindows.di.DiPackage;

-import org.eclipse.papyrus.sashwindows.di.PageRef;

-import org.eclipse.papyrus.sashwindows.di.TabFolder;

+import org.eclipse.papyrus.infra.core.sashwindows.di.DiFactory;

+import org.eclipse.papyrus.infra.core.sashwindows.di.DiPackage;

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

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

 

 /**

  * <!-- begin-user-doc -->

@@ -26,7 +26,7 @@ import org.eclipse.papyrus.sashwindows.di.TabFolder;
  * <p>

  * The following features are implemented:

  * <ul>

- *   <li>{@link org.eclipse.papyrus.sashwindows.di.impl.TabFolderImpl#getChildren <em>Children</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.infra.core.sashwindows.di.impl.TabFolderImpl#getChildren <em>Children</em>}</li>

  * </ul>

  * </p>

  *

@@ -56,7 +56,7 @@ public class TabFolderImpl extends AbstractPanelImpl implements TabFolder {
 

 	/**

 	 * 

-	 * @see org.eclipse.papyrus.sashwindows.di.TabFolder#movePage(int, int)

+	 * @see org.eclipse.papyrus.infra.core.sashwindows.di.TabFolder#movePage(int, int)

 	 *

 	 * @param oldIndex

 	 * @param newIndex

diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/src-spare/org/eclipse/papyrus/sashwindows/di/impl/WindowImpl.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/src-spare/org/eclipse/papyrus/sashwindows/di/impl/WindowImpl.java
index 7f4c528192a..089e0e3e360 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/src-spare/org/eclipse/papyrus/sashwindows/di/impl/WindowImpl.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/src-spare/org/eclipse/papyrus/sashwindows/di/impl/WindowImpl.java
@@ -4,18 +4,18 @@
  *

  * $Id$

  */

-package org.eclipse.papyrus.sashwindows.di.impl;

+package org.eclipse.papyrus.infra.core.sashwindows.di.impl;

 

 import org.eclipse.emf.common.notify.Notification;

 import org.eclipse.emf.common.notify.NotificationChain;

 import org.eclipse.emf.ecore.EClass;

 import org.eclipse.emf.ecore.InternalEObject;

 import org.eclipse.emf.ecore.impl.ENotificationImpl;

-import org.eclipse.papyrus.sashwindows.di.AbstractPanel;

-import org.eclipse.papyrus.sashwindows.di.DiPackage;

-import org.eclipse.papyrus.sashwindows.di.Position;

-import org.eclipse.papyrus.sashwindows.di.Size;

-import org.eclipse.papyrus.sashwindows.di.Window;

+import org.eclipse.papyrus.infra.core.sashwindows.di.AbstractPanel;

+import org.eclipse.papyrus.infra.core.sashwindows.di.DiPackage;

+import org.eclipse.papyrus.infra.core.sashwindows.di.Position;

+import org.eclipse.papyrus.infra.core.sashwindows.di.Size;

+import org.eclipse.papyrus.infra.core.sashwindows.di.Window;

 

 /**

  * <!-- begin-user-doc -->

@@ -24,9 +24,9 @@ import org.eclipse.papyrus.sashwindows.di.Window;
  * <p>

  * The following features are implemented:

  * <ul>

- *   <li>{@link org.eclipse.papyrus.sashwindows.di.impl.WindowImpl#getPanel <em>Panel</em>}</li>

- *   <li>{@link org.eclipse.papyrus.sashwindows.di.impl.WindowImpl#getPosition <em>Position</em>}</li>

- *   <li>{@link org.eclipse.papyrus.sashwindows.di.impl.WindowImpl#getSize <em>Size</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.infra.core.sashwindows.di.impl.WindowImpl#getPanel <em>Panel</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.infra.core.sashwindows.di.impl.WindowImpl#getPosition <em>Position</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.infra.core.sashwindows.di.impl.WindowImpl#getSize <em>Size</em>}</li>

  * </ul>

  * </p>

  *

diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/src-spare/org/eclipse/papyrus/sashwindows/di/util/DiUtils.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/src-spare/org/eclipse/papyrus/sashwindows/di/util/DiUtils.java
index 70056450b2c..5829076e157 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/src-spare/org/eclipse/papyrus/sashwindows/di/util/DiUtils.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/src-spare/org/eclipse/papyrus/sashwindows/di/util/DiUtils.java
@@ -12,15 +12,15 @@
  *

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

 

-package org.eclipse.papyrus.sashwindows.di.util;

+package org.eclipse.papyrus.infra.core.sashwindows.di.util;

 

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

-import org.eclipse.papyrus.sashwindows.di.DiFactory;

-import org.eclipse.papyrus.sashwindows.di.PageList;

-import org.eclipse.papyrus.sashwindows.di.SashModel;

-import org.eclipse.papyrus.sashwindows.di.SashWindowsMngr;

-import org.eclipse.papyrus.sashwindows.di.TabFolder;

-import org.eclipse.papyrus.sashwindows.di.Window;

+import org.eclipse.papyrus.infra.core.sashwindows.di.DiFactory;

+import org.eclipse.papyrus.infra.core.sashwindows.di.PageList;

+import org.eclipse.papyrus.infra.core.sashwindows.di.SashModel;

+import org.eclipse.papyrus.infra.core.sashwindows.di.SashWindowsMngr;

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

+import org.eclipse.papyrus.infra.core.sashwindows.di.Window;

 

 

 /**

diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/src/org/eclipse/papyrus/sashwindows/di/AbstractPage.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/src/org/eclipse/papyrus/infra/core/sashwindows/di/AbstractPage.java
index 15b0d907d99..8c07675e391 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/src/org/eclipse/papyrus/sashwindows/di/AbstractPage.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/src/org/eclipse/papyrus/infra/core/sashwindows/di/AbstractPage.java
@@ -4,7 +4,7 @@
  *

  * $Id$

  */

-package org.eclipse.papyrus.sashwindows.di;

+package org.eclipse.papyrus.infra.core.sashwindows.di;

 

 import org.eclipse.emf.ecore.EObject;

 

@@ -14,12 +14,12 @@ import org.eclipse.emf.ecore.EObject;
  * <p>

  * The following features are supported:

  * <ul>

- * <li>{@link org.eclipse.papyrus.sashwindows.di.AbstractPage#getPageIdentifier

+ * <li>{@link org.eclipse.papyrus.infra.core.sashwindows.di.AbstractPage#getPageIdentifier

  * <em>Page Identifier</em>}</li>

  * </ul>

  * </p>

  * 

- * @see org.eclipse.papyrus.sashwindows.di.DiPackage#getAbstractPage()

+ * @see org.eclipse.papyrus.infra.core.sashwindows.di.DiPackage#getAbstractPage()

  * @model

  * @generated

  */

@@ -35,16 +35,16 @@ public interface AbstractPage extends EObject {
 	 * 

 	 * @return the value of the '<em>Page Identifier</em>' attribute.

 	 * @see #setPageIdentifier(Object)

-	 * @see org.eclipse.papyrus.sashwindows.di.DiPackage#getAbstractPage_PageIdentifier()

+	 * @see org.eclipse.papyrus.infra.core.sashwindows.di.DiPackage#getAbstractPage_PageIdentifier()

 	 * @model unique="false"

-	 *        dataType="org.eclipse.papyrus.sashwindows.di.JavaObject"

+	 *        dataType="org.eclipse.papyrus.infra.core.sashwindows.di.JavaObject"

 	 *        required="true" ordered="false"

 	 * @generated

 	 */

 	Object getPageIdentifier();

 

 	/**

-	 * Sets the value of the ' {@link org.eclipse.papyrus.sashwindows.di.AbstractPage#getPageIdentifier

+	 * Sets the value of the ' {@link org.eclipse.papyrus.infra.core.sashwindows.di.AbstractPage#getPageIdentifier

 	 * <em>Page Identifier</em>}' attribute. <!-- begin-user-doc --> <!--

 	 * end-user-doc -->

 	 * 

diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/src/org/eclipse/papyrus/sashwindows/di/AbstractPanel.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/src/org/eclipse/papyrus/infra/core/sashwindows/di/AbstractPanel.java
index 6113ae01962..ca5361724b3 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/src/org/eclipse/papyrus/sashwindows/di/AbstractPanel.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/src/org/eclipse/papyrus/infra/core/sashwindows/di/AbstractPanel.java
@@ -4,7 +4,7 @@
  *

  * $Id$

  */

-package org.eclipse.papyrus.sashwindows.di;

+package org.eclipse.papyrus.infra.core.sashwindows.di;

 

 import org.eclipse.emf.ecore.EObject;

 

@@ -14,11 +14,11 @@ import org.eclipse.emf.ecore.EObject;
  * <p>

  * The following features are supported:

  * <ul>

- * <li>{@link org.eclipse.papyrus.sashwindows.di.AbstractPanel#getParent <em> Parent</em>}</li>

+ * <li>{@link org.eclipse.papyrus.infra.core.sashwindows.di.AbstractPanel#getParent <em> Parent</em>}</li>

  * </ul>

  * </p>

  * 

- * @see org.eclipse.papyrus.sashwindows.di.DiPackage#getAbstractPanel()

+ * @see org.eclipse.papyrus.infra.core.sashwindows.di.DiPackage#getAbstractPanel()

  * @model abstract="true"

  * @generated

  */

@@ -26,7 +26,7 @@ public interface AbstractPanel extends EObject {
 

 	/**

 	 * Returns the value of the '<em><b>Parent</b></em>' container reference. It

-	 * is bidirectional and its opposite is ' {@link org.eclipse.papyrus.sashwindows.di.PanelParent#getChildren

+	 * is bidirectional and its opposite is ' {@link org.eclipse.papyrus.infra.core.sashwindows.di.PanelParent#getChildren

 	 * <em>Children</em>}'. <!-- begin-user-doc -->

 	 * <p>

 	 * If the meaning of the '<em>Parent</em>' container reference isn't clear, there really should be more of a description here...

@@ -35,8 +35,8 @@ public interface AbstractPanel extends EObject {
 	 * 

 	 * @return the value of the '<em>Parent</em>' container reference.

 	 * @see #setParent(PanelParent)

-	 * @see org.eclipse.papyrus.sashwindows.di.DiPackage#getAbstractPanel_Parent()

-	 * @see org.eclipse.papyrus.sashwindows.di.PanelParent#getChildren

+	 * @see org.eclipse.papyrus.infra.core.sashwindows.di.DiPackage#getAbstractPanel_Parent()

+	 * @see org.eclipse.papyrus.infra.core.sashwindows.di.PanelParent#getChildren

 	 * @model opposite="children" required="true" transient="false"

 	 *        ordered="false"

 	 * @generated

@@ -44,7 +44,7 @@ public interface AbstractPanel extends EObject {
 	PanelParent getParent();

 

 	/**

-	 * Sets the value of the ' {@link org.eclipse.papyrus.sashwindows.di.AbstractPanel#getParent

+	 * Sets the value of the ' {@link org.eclipse.papyrus.infra.core.sashwindows.di.AbstractPanel#getParent

 	 * <em>Parent</em>}' container reference. <!-- begin-user-doc --> <!--

 	 * end-user-doc -->

 	 * 

diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/src/org/eclipse/papyrus/sashwindows/di/DiFactory.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/src/org/eclipse/papyrus/infra/core/sashwindows/di/DiFactory.java
index 74958488500..07a00b69899 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/src/org/eclipse/papyrus/sashwindows/di/DiFactory.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/src/org/eclipse/papyrus/infra/core/sashwindows/di/DiFactory.java
@@ -4,7 +4,7 @@
  *

  * $Id$

  */

-package org.eclipse.papyrus.sashwindows.di;

+package org.eclipse.papyrus.infra.core.sashwindows.di;

 

 import org.eclipse.emf.ecore.EFactory;

 

@@ -12,7 +12,7 @@ import org.eclipse.emf.ecore.EFactory;
  * <!-- begin-user-doc --> The <b>Factory</b> for the model. It provides a

  * create method for each non-abstract class of the model. <!-- end-user-doc -->

  * 

- * @see org.eclipse.papyrus.sashwindows.di.DiPackage

+ * @see org.eclipse.papyrus.infra.core.sashwindows.di.DiPackage

  * @generated

  */

 public interface DiFactory extends EFactory {

@@ -23,7 +23,7 @@ public interface DiFactory extends EFactory {
 	 * 

 	 * @generated

 	 */

-	DiFactory eINSTANCE = org.eclipse.papyrus.sashwindows.di.impl.DiFactoryImpl.init();

+	DiFactory eINSTANCE = org.eclipse.papyrus.infra.core.sashwindows.di.impl.DiFactoryImpl.init();

 

 	/**

 	 * Returns a new object of class '<em>Sash Model</em>'. <!-- begin-user-doc

diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/src/org/eclipse/papyrus/sashwindows/di/DiPackage.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/src/org/eclipse/papyrus/infra/core/sashwindows/di/DiPackage.java
index 35029867070..8d9c684e179 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/src/org/eclipse/papyrus/sashwindows/di/DiPackage.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/src/org/eclipse/papyrus/infra/core/sashwindows/di/DiPackage.java
@@ -4,7 +4,7 @@
  *

  * $Id$

  */

-package org.eclipse.papyrus.sashwindows.di;

+package org.eclipse.papyrus.infra.core.sashwindows.di;

 

 import org.eclipse.emf.ecore.EAttribute;

 import org.eclipse.emf.ecore.EClass;

@@ -23,7 +23,7 @@ import org.eclipse.emf.ecore.EReference;
  * </ul>

  * <!-- end-user-doc -->

  * 

- * @see org.eclipse.papyrus.sashwindows.di.DiFactory

+ * @see org.eclipse.papyrus.infra.core.sashwindows.di.DiFactory

  * @model kind="package"

  * @generated

  */

@@ -56,15 +56,15 @@ public interface DiPackage extends EPackage {
 	 * 

 	 * @generated

 	 */

-	DiPackage eINSTANCE = org.eclipse.papyrus.sashwindows.di.impl.DiPackageImpl.init();

+	DiPackage eINSTANCE = org.eclipse.papyrus.infra.core.sashwindows.di.impl.DiPackageImpl.init();

 

 	/**

-	 * The meta object id for the ' {@link org.eclipse.papyrus.sashwindows.di.impl.SashModelImpl

+	 * The meta object id for the ' {@link org.eclipse.papyrus.infra.core.sashwindows.di.impl.SashModelImpl

 	 * <em>Sash Model</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc

 	 * -->

 	 * 

-	 * @see org.eclipse.papyrus.sashwindows.di.impl.SashModelImpl

-	 * @see org.eclipse.papyrus.sashwindows.di.impl.DiPackageImpl#getSashModel()

+	 * @see org.eclipse.papyrus.infra.core.sashwindows.di.impl.SashModelImpl

+	 * @see org.eclipse.papyrus.infra.core.sashwindows.di.impl.DiPackageImpl#getSashModel()

 	 * @generated

 	 */

 	int SASH_MODEL = 0;

@@ -97,12 +97,12 @@ public interface DiPackage extends EPackage {
 	int SASH_MODEL_FEATURE_COUNT = 2;

 

 	/**

-	 * The meta object id for the ' {@link org.eclipse.papyrus.sashwindows.di.impl.PanelParentImpl

+	 * The meta object id for the ' {@link org.eclipse.papyrus.infra.core.sashwindows.di.impl.PanelParentImpl

 	 * <em>Panel Parent</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc

 	 * -->

 	 * 

-	 * @see org.eclipse.papyrus.sashwindows.di.impl.PanelParentImpl

-	 * @see org.eclipse.papyrus.sashwindows.di.impl.DiPackageImpl#getPanelParent()

+	 * @see org.eclipse.papyrus.infra.core.sashwindows.di.impl.PanelParentImpl

+	 * @see org.eclipse.papyrus.infra.core.sashwindows.di.impl.DiPackageImpl#getPanelParent()

 	 * @generated

 	 */

 	int PANEL_PARENT = 2;

@@ -126,11 +126,11 @@ public interface DiPackage extends EPackage {
 	int PANEL_PARENT_FEATURE_COUNT = 1;

 

 	/**

-	 * The meta object id for the ' {@link org.eclipse.papyrus.sashwindows.di.impl.WindowImpl

+	 * The meta object id for the ' {@link org.eclipse.papyrus.infra.core.sashwindows.di.impl.WindowImpl

 	 * <em>Window</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->

 	 * 

-	 * @see org.eclipse.papyrus.sashwindows.di.impl.WindowImpl

-	 * @see org.eclipse.papyrus.sashwindows.di.impl.DiPackageImpl#getWindow()

+	 * @see org.eclipse.papyrus.infra.core.sashwindows.di.impl.WindowImpl

+	 * @see org.eclipse.papyrus.infra.core.sashwindows.di.impl.DiPackageImpl#getWindow()

 	 * @generated

 	 */

 	int WINDOW = 1;

@@ -181,12 +181,12 @@ public interface DiPackage extends EPackage {
 	int WINDOW_FEATURE_COUNT = PANEL_PARENT_FEATURE_COUNT + 3;

 

 	/**

-	 * The meta object id for the ' {@link org.eclipse.papyrus.sashwindows.di.impl.AbstractPanelImpl

+	 * The meta object id for the ' {@link org.eclipse.papyrus.infra.core.sashwindows.di.impl.AbstractPanelImpl

 	 * <em>Abstract Panel</em>}' class. <!-- begin-user-doc --> <!--

 	 * end-user-doc -->

 	 * 

-	 * @see org.eclipse.papyrus.sashwindows.di.impl.AbstractPanelImpl

-	 * @see org.eclipse.papyrus.sashwindows.di.impl.DiPackageImpl#getAbstractPanel()

+	 * @see org.eclipse.papyrus.infra.core.sashwindows.di.impl.AbstractPanelImpl

+	 * @see org.eclipse.papyrus.infra.core.sashwindows.di.impl.DiPackageImpl#getAbstractPanel()

 	 * @generated

 	 */

 	int ABSTRACT_PANEL = 3;

@@ -210,11 +210,11 @@ public interface DiPackage extends EPackage {
 	int ABSTRACT_PANEL_FEATURE_COUNT = 1;

 

 	/**

-	 * The meta object id for the ' {@link org.eclipse.papyrus.sashwindows.di.impl.PositionImpl

+	 * The meta object id for the ' {@link org.eclipse.papyrus.infra.core.sashwindows.di.impl.PositionImpl

 	 * <em>Position</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->

 	 * 

-	 * @see org.eclipse.papyrus.sashwindows.di.impl.PositionImpl

-	 * @see org.eclipse.papyrus.sashwindows.di.impl.DiPackageImpl#getPosition()

+	 * @see org.eclipse.papyrus.infra.core.sashwindows.di.impl.PositionImpl

+	 * @see org.eclipse.papyrus.infra.core.sashwindows.di.impl.DiPackageImpl#getPosition()

 	 * @generated

 	 */

 	int POSITION = 4;

@@ -247,11 +247,11 @@ public interface DiPackage extends EPackage {
 	int POSITION_FEATURE_COUNT = 2;

 

 	/**

-	 * The meta object id for the ' {@link org.eclipse.papyrus.sashwindows.di.impl.SizeImpl <em>Size</em>}'

+	 * The meta object id for the ' {@link org.eclipse.papyrus.infra.core.sashwindows.di.impl.SizeImpl <em>Size</em>}'

 	 * class. <!-- begin-user-doc --> <!-- end-user-doc -->

 	 * 

-	 * @see org.eclipse.papyrus.sashwindows.di.impl.SizeImpl

-	 * @see org.eclipse.papyrus.sashwindows.di.impl.DiPackageImpl#getSize()

+	 * @see org.eclipse.papyrus.infra.core.sashwindows.di.impl.SizeImpl

+	 * @see org.eclipse.papyrus.infra.core.sashwindows.di.impl.DiPackageImpl#getSize()

 	 * @generated

 	 */

 	int SIZE = 5;

@@ -284,12 +284,12 @@ public interface DiPackage extends EPackage {
 	int SIZE_FEATURE_COUNT = 2;

 

 	/**

-	 * The meta object id for the ' {@link org.eclipse.papyrus.sashwindows.di.impl.TabFolderImpl

+	 * The meta object id for the ' {@link org.eclipse.papyrus.infra.core.sashwindows.di.impl.TabFolderImpl

 	 * <em>Tab Folder</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc

 	 * -->

 	 * 

-	 * @see org.eclipse.papyrus.sashwindows.di.impl.TabFolderImpl

-	 * @see org.eclipse.papyrus.sashwindows.di.impl.DiPackageImpl#getTabFolder()

+	 * @see org.eclipse.papyrus.infra.core.sashwindows.di.impl.TabFolderImpl

+	 * @see org.eclipse.papyrus.infra.core.sashwindows.di.impl.DiPackageImpl#getTabFolder()

 	 * @generated

 	 */

 	int TAB_FOLDER = 6;

@@ -322,11 +322,11 @@ public interface DiPackage extends EPackage {
 	int TAB_FOLDER_FEATURE_COUNT = ABSTRACT_PANEL_FEATURE_COUNT + 1;

 

 	/**

-	 * The meta object id for the ' {@link org.eclipse.papyrus.sashwindows.di.impl.PageRefImpl

+	 * The meta object id for the ' {@link org.eclipse.papyrus.infra.core.sashwindows.di.impl.PageRefImpl

 	 * <em>Page Ref</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->

 	 * 

-	 * @see org.eclipse.papyrus.sashwindows.di.impl.PageRefImpl

-	 * @see org.eclipse.papyrus.sashwindows.di.impl.DiPackageImpl#getPageRef()

+	 * @see org.eclipse.papyrus.infra.core.sashwindows.di.impl.PageRefImpl

+	 * @see org.eclipse.papyrus.infra.core.sashwindows.di.impl.DiPackageImpl#getPageRef()

 	 * @generated

 	 */

 	int PAGE_REF = 7;

@@ -377,12 +377,12 @@ public interface DiPackage extends EPackage {
 	int PAGE_REF_FEATURE_COUNT = 4;

 

 	/**

-	 * The meta object id for the ' {@link org.eclipse.papyrus.sashwindows.di.impl.SashPanelImpl

+	 * The meta object id for the ' {@link org.eclipse.papyrus.infra.core.sashwindows.di.impl.SashPanelImpl

 	 * <em>Sash Panel</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc

 	 * -->

 	 * 

-	 * @see org.eclipse.papyrus.sashwindows.di.impl.SashPanelImpl

-	 * @see org.eclipse.papyrus.sashwindows.di.impl.DiPackageImpl#getSashPanel()

+	 * @see org.eclipse.papyrus.infra.core.sashwindows.di.impl.SashPanelImpl

+	 * @see org.eclipse.papyrus.infra.core.sashwindows.di.impl.DiPackageImpl#getSashPanel()

 	 * @generated

 	 */

 	int SASH_PANEL = 8;

@@ -433,12 +433,12 @@ public interface DiPackage extends EPackage {
 	int SASH_PANEL_FEATURE_COUNT = ABSTRACT_PANEL_FEATURE_COUNT + 3;

 

 	/**

-	 * The meta object id for the ' {@link org.eclipse.papyrus.sashwindows.di.impl.AbstractPageImpl

+	 * The meta object id for the ' {@link org.eclipse.papyrus.infra.core.sashwindows.di.impl.AbstractPageImpl

 	 * <em>Abstract Page</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc

 	 * -->

 	 * 

-	 * @see org.eclipse.papyrus.sashwindows.di.impl.AbstractPageImpl

-	 * @see org.eclipse.papyrus.sashwindows.di.impl.DiPackageImpl#getAbstractPage()

+	 * @see org.eclipse.papyrus.infra.core.sashwindows.di.impl.AbstractPageImpl

+	 * @see org.eclipse.papyrus.infra.core.sashwindows.di.impl.DiPackageImpl#getAbstractPage()

 	 * @generated

 	 */

 	int ABSTRACT_PAGE = 9;

@@ -462,11 +462,11 @@ public interface DiPackage extends EPackage {
 	int ABSTRACT_PAGE_FEATURE_COUNT = 1;

 

 	/**

-	 * The meta object id for the ' {@link org.eclipse.papyrus.sashwindows.di.impl.PageListImpl

+	 * The meta object id for the ' {@link org.eclipse.papyrus.infra.core.sashwindows.di.impl.PageListImpl

 	 * <em>Page List</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->

 	 * 

-	 * @see org.eclipse.papyrus.sashwindows.di.impl.PageListImpl

-	 * @see org.eclipse.papyrus.sashwindows.di.impl.DiPackageImpl#getPageList()

+	 * @see org.eclipse.papyrus.infra.core.sashwindows.di.impl.PageListImpl

+	 * @see org.eclipse.papyrus.infra.core.sashwindows.di.impl.DiPackageImpl#getPageList()

 	 * @generated

 	 */

 	int PAGE_LIST = 10;

@@ -490,12 +490,12 @@ public interface DiPackage extends EPackage {
 	int PAGE_LIST_FEATURE_COUNT = 1;

 

 	/**

-	 * The meta object id for the ' {@link org.eclipse.papyrus.sashwindows.di.impl.SashWindowsMngrImpl

+	 * The meta object id for the ' {@link org.eclipse.papyrus.infra.core.sashwindows.di.impl.SashWindowsMngrImpl

 	 * <em>Sash Windows Mngr</em>}' class. <!-- begin-user-doc --> <!--

 	 * end-user-doc -->

 	 * 

-	 * @see org.eclipse.papyrus.sashwindows.di.impl.SashWindowsMngrImpl

-	 * @see org.eclipse.papyrus.sashwindows.di.impl.DiPackageImpl#getSashWindowsMngr()

+	 * @see org.eclipse.papyrus.infra.core.sashwindows.di.impl.SashWindowsMngrImpl

+	 * @see org.eclipse.papyrus.infra.core.sashwindows.di.impl.DiPackageImpl#getSashWindowsMngr()

 	 * @generated

 	 */

 	int SASH_WINDOWS_MNGR = 11;

@@ -531,7 +531,7 @@ public interface DiPackage extends EPackage {
 	 * The meta object id for the '<em>int</em>' data type. <!-- begin-user-doc

 	 * --> <!-- end-user-doc -->

 	 * 

-	 * @see org.eclipse.papyrus.sashwindows.di.impl.DiPackageImpl#getint()

+	 * @see org.eclipse.papyrus.infra.core.sashwindows.di.impl.DiPackageImpl#getint()

 	 * @generated

 	 */

 	int INT = 12;

@@ -541,7 +541,7 @@ public interface DiPackage extends EPackage {
 	 * begin-user-doc --> <!-- end-user-doc -->

 	 * 

 	 * @see java.lang.Object

-	 * @see org.eclipse.papyrus.sashwindows.di.impl.DiPackageImpl#getJavaObject()

+	 * @see org.eclipse.papyrus.infra.core.sashwindows.di.impl.DiPackageImpl#getJavaObject()

 	 * @generated

 	 */

 	int JAVA_OBJECT = 13;

@@ -550,7 +550,7 @@ public interface DiPackage extends EPackage {
 	 * The meta object id for the '<em>Float</em>' data type. <!--

 	 * begin-user-doc --> <!-- end-user-doc -->

 	 * 

-	 * @see org.eclipse.papyrus.sashwindows.di.impl.DiPackageImpl#getFloat()

+	 * @see org.eclipse.papyrus.infra.core.sashwindows.di.impl.DiPackageImpl#getFloat()

 	 * @generated

 	 */

 	int FLOAT = 14;

@@ -559,372 +559,372 @@ public interface DiPackage extends EPackage {
 	 * The meta object id for the '<em>boolean</em>' data type. <!--

 	 * begin-user-doc --> <!-- end-user-doc -->

 	 * 

-	 * @see org.eclipse.papyrus.sashwindows.di.impl.DiPackageImpl#getboolean()

+	 * @see org.eclipse.papyrus.infra.core.sashwindows.di.impl.DiPackageImpl#getboolean()

 	 * @generated

 	 */

 	int BOOLEAN = 15;

 

 	/**

-	 * Returns the meta object for class ' {@link org.eclipse.papyrus.sashwindows.di.SashModel <em>Sash Model</em>} '. <!-- begin-user-doc --> <!--

+	 * Returns the meta object for class ' {@link org.eclipse.papyrus.infra.core.sashwindows.di.SashModel <em>Sash Model</em>} '. <!-- begin-user-doc --> <!--

 	 * end-user-doc -->

 	 * 

 	 * @return the meta object for class '<em>Sash Model</em>'.

-	 * @see org.eclipse.papyrus.sashwindows.di.SashModel

+	 * @see org.eclipse.papyrus.infra.core.sashwindows.di.SashModel

 	 * @generated

 	 */

 	EClass getSashModel();

 

 	/**

-	 * Returns the meta object for the containment reference list ' {@link org.eclipse.papyrus.sashwindows.di.SashModel#getWindows

+	 * Returns the meta object for the containment reference list ' {@link org.eclipse.papyrus.infra.core.sashwindows.di.SashModel#getWindows

 	 * <em>Windows</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->

 	 * 

 	 * @return the meta object for the containment reference list ' <em>Windows</em>'.

-	 * @see org.eclipse.papyrus.sashwindows.di.SashModel#getWindows()

+	 * @see org.eclipse.papyrus.infra.core.sashwindows.di.SashModel#getWindows()

 	 * @see #getSashModel()

 	 * @generated

 	 */

 	EReference getSashModel_Windows();

 

 	/**

-	 * Returns the meta object for the reference ' {@link org.eclipse.papyrus.sashwindows.di.SashModel#getCurrentSelection

+	 * Returns the meta object for the reference ' {@link org.eclipse.papyrus.infra.core.sashwindows.di.SashModel#getCurrentSelection

 	 * <em>Current Selection</em>}'. <!-- begin-user-doc --> <!-- end-user-doc

 	 * -->

 	 * 

 	 * @return the meta object for the reference '<em>Current Selection</em>'.

-	 * @see org.eclipse.papyrus.sashwindows.di.SashModel#getCurrentSelection()

+	 * @see org.eclipse.papyrus.infra.core.sashwindows.di.SashModel#getCurrentSelection()

 	 * @see #getSashModel()

 	 * @generated

 	 */

 	EReference getSashModel_CurrentSelection();

 

 	/**

-	 * Returns the meta object for class ' {@link org.eclipse.papyrus.sashwindows.di.Window <em>Window</em>}'. <!--

+	 * Returns the meta object for class ' {@link org.eclipse.papyrus.infra.core.sashwindows.di.Window <em>Window</em>}'. <!--

 	 * begin-user-doc --> <!-- end-user-doc -->

 	 * 

 	 * @return the meta object for class '<em>Window</em>'.

-	 * @see org.eclipse.papyrus.sashwindows.di.Window

+	 * @see org.eclipse.papyrus.infra.core.sashwindows.di.Window

 	 * @generated

 	 */

 	EClass getWindow();

 

 	/**

-	 * Returns the meta object for the reference ' {@link org.eclipse.papyrus.sashwindows.di.Window#getPosition

+	 * Returns the meta object for the reference ' {@link org.eclipse.papyrus.infra.core.sashwindows.di.Window#getPosition

 	 * <em>Position</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->

 	 * 

 	 * @return the meta object for the reference '<em>Position</em>'.

-	 * @see org.eclipse.papyrus.sashwindows.di.Window#getPosition()

+	 * @see org.eclipse.papyrus.infra.core.sashwindows.di.Window#getPosition()

 	 * @see #getWindow()

 	 * @generated

 	 */

 	EReference getWindow_Position();

 

 	/**

-	 * Returns the meta object for the reference ' {@link org.eclipse.papyrus.sashwindows.di.Window#getSize <em>Size</em>}'.

+	 * Returns the meta object for the reference ' {@link org.eclipse.papyrus.infra.core.sashwindows.di.Window#getSize <em>Size</em>}'.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

 	 * 

 	 * @return the meta object for the reference '<em>Size</em>'.

-	 * @see org.eclipse.papyrus.sashwindows.di.Window#getSize()

+	 * @see org.eclipse.papyrus.infra.core.sashwindows.di.Window#getSize()

 	 * @see #getWindow()

 	 * @generated

 	 */

 	EReference getWindow_Size();

 

 	/**

-	 * Returns the meta object for the reference ' {@link org.eclipse.papyrus.sashwindows.di.Window#getPanel <em>Panel</em>} '. <!-- begin-user-doc

+	 * Returns the meta object for the reference ' {@link org.eclipse.papyrus.infra.core.sashwindows.di.Window#getPanel <em>Panel</em>} '. <!-- begin-user-doc

 	 * --> <!-- end-user-doc -->

 	 * 

 	 * @return the meta object for the reference '<em>Panel</em>'.

-	 * @see org.eclipse.papyrus.sashwindows.di.Window#getPanel()

+	 * @see org.eclipse.papyrus.infra.core.sashwindows.di.Window#getPanel()

 	 * @see #getWindow()

 	 * @generated

 	 */

 	EReference getWindow_Panel();

 

 	/**

-	 * Returns the meta object for class ' {@link org.eclipse.papyrus.sashwindows.di.PanelParent

+	 * Returns the meta object for class ' {@link org.eclipse.papyrus.infra.core.sashwindows.di.PanelParent

 	 * <em>Panel Parent</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->

 	 * 

 	 * @return the meta object for class '<em>Panel Parent</em>'.

-	 * @see org.eclipse.papyrus.sashwindows.di.PanelParent

+	 * @see org.eclipse.papyrus.infra.core.sashwindows.di.PanelParent

 	 * @generated

 	 */

 	EClass getPanelParent();

 

 	/**

-	 * Returns the meta object for the containment reference list ' {@link org.eclipse.papyrus.sashwindows.di.PanelParent#getChildren

+	 * Returns the meta object for the containment reference list ' {@link org.eclipse.papyrus.infra.core.sashwindows.di.PanelParent#getChildren

 	 * <em>Children</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->

 	 * 

 	 * @return the meta object for the containment reference list ' <em>Children</em>'.

-	 * @see org.eclipse.papyrus.sashwindows.di.PanelParent#getChildren()

+	 * @see org.eclipse.papyrus.infra.core.sashwindows.di.PanelParent#getChildren()

 	 * @see #getPanelParent()

 	 * @generated

 	 */

 	EReference getPanelParent_Children();

 

 	/**

-	 * Returns the meta object for class ' {@link org.eclipse.papyrus.sashwindows.di.AbstractPanel

+	 * Returns the meta object for class ' {@link org.eclipse.papyrus.infra.core.sashwindows.di.AbstractPanel

 	 * <em>Abstract Panel</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->

 	 * 

 	 * @return the meta object for class '<em>Abstract Panel</em>'.

-	 * @see org.eclipse.papyrus.sashwindows.di.AbstractPanel

+	 * @see org.eclipse.papyrus.infra.core.sashwindows.di.AbstractPanel

 	 * @generated

 	 */

 	EClass getAbstractPanel();

 

 	/**

-	 * Returns the meta object for the container reference ' {@link org.eclipse.papyrus.sashwindows.di.AbstractPanel#getParent

+	 * Returns the meta object for the container reference ' {@link org.eclipse.papyrus.infra.core.sashwindows.di.AbstractPanel#getParent

 	 * <em>Parent</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->

 	 * 

 	 * @return the meta object for the container reference '<em>Parent</em>'.

-	 * @see org.eclipse.papyrus.sashwindows.di.AbstractPanel#getParent()

+	 * @see org.eclipse.papyrus.infra.core.sashwindows.di.AbstractPanel#getParent()

 	 * @see #getAbstractPanel()

 	 * @generated

 	 */

 	EReference getAbstractPanel_Parent();

 

 	/**

-	 * Returns the meta object for class ' {@link org.eclipse.papyrus.sashwindows.di.Position <em>Position</em>}'.

+	 * Returns the meta object for class ' {@link org.eclipse.papyrus.infra.core.sashwindows.di.Position <em>Position</em>}'.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

 	 * 

 	 * @return the meta object for class '<em>Position</em>'.

-	 * @see org.eclipse.papyrus.sashwindows.di.Position

+	 * @see org.eclipse.papyrus.infra.core.sashwindows.di.Position

 	 * @generated

 	 */

 	EClass getPosition();

 

 	/**

-	 * Returns the meta object for the attribute ' {@link org.eclipse.papyrus.sashwindows.di.Position#getX <em>X</em>}'.

+	 * Returns the meta object for the attribute ' {@link org.eclipse.papyrus.infra.core.sashwindows.di.Position#getX <em>X</em>}'.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

 	 * 

 	 * @return the meta object for the attribute '<em>X</em>'.

-	 * @see org.eclipse.papyrus.sashwindows.di.Position#getX()

+	 * @see org.eclipse.papyrus.infra.core.sashwindows.di.Position#getX()

 	 * @see #getPosition()

 	 * @generated

 	 */

 	EAttribute getPosition_X();

 

 	/**

-	 * Returns the meta object for the attribute ' {@link org.eclipse.papyrus.sashwindows.di.Position#getY <em>Y</em>}'.

+	 * Returns the meta object for the attribute ' {@link org.eclipse.papyrus.infra.core.sashwindows.di.Position#getY <em>Y</em>}'.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

 	 * 

 	 * @return the meta object for the attribute '<em>Y</em>'.

-	 * @see org.eclipse.papyrus.sashwindows.di.Position#getY()

+	 * @see org.eclipse.papyrus.infra.core.sashwindows.di.Position#getY()

 	 * @see #getPosition()

 	 * @generated

 	 */

 	EAttribute getPosition_Y();

 

 	/**

-	 * Returns the meta object for class ' {@link org.eclipse.papyrus.sashwindows.di.Size <em>Size</em>}'. <!--

+	 * Returns the meta object for class ' {@link org.eclipse.papyrus.infra.core.sashwindows.di.Size <em>Size</em>}'. <!--

 	 * begin-user-doc --> <!-- end-user-doc -->

 	 * 

 	 * @return the meta object for class '<em>Size</em>'.

-	 * @see org.eclipse.papyrus.sashwindows.di.Size

+	 * @see org.eclipse.papyrus.infra.core.sashwindows.di.Size

 	 * @generated

 	 */

 	EClass getSize();

 

 	/**

-	 * Returns the meta object for the attribute ' {@link org.eclipse.papyrus.sashwindows.di.Size#getWidth <em>Width</em>}'.

+	 * Returns the meta object for the attribute ' {@link org.eclipse.papyrus.infra.core.sashwindows.di.Size#getWidth <em>Width</em>}'.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

 	 * 

 	 * @return the meta object for the attribute '<em>Width</em>'.

-	 * @see org.eclipse.papyrus.sashwindows.di.Size#getWidth()

+	 * @see org.eclipse.papyrus.infra.core.sashwindows.di.Size#getWidth()

 	 * @see #getSize()

 	 * @generated

 	 */

 	EAttribute getSize_Width();

 

 	/**

-	 * Returns the meta object for the attribute ' {@link org.eclipse.papyrus.sashwindows.di.Size#getLength <em>Length</em>} '. <!-- begin-user-doc

+	 * Returns the meta object for the attribute ' {@link org.eclipse.papyrus.infra.core.sashwindows.di.Size#getLength <em>Length</em>} '. <!-- begin-user-doc

 	 * --> <!-- end-user-doc -->

 	 * 

 	 * @return the meta object for the attribute '<em>Length</em>'.

-	 * @see org.eclipse.papyrus.sashwindows.di.Size#getLength()

+	 * @see org.eclipse.papyrus.infra.core.sashwindows.di.Size#getLength()

 	 * @see #getSize()

 	 * @generated

 	 */

 	EAttribute getSize_Length();

 

 	/**

-	 * Returns the meta object for class ' {@link org.eclipse.papyrus.sashwindows.di.TabFolder <em>Tab Folder</em>} '. <!-- begin-user-doc --> <!--

+	 * Returns the meta object for class ' {@link org.eclipse.papyrus.infra.core.sashwindows.di.TabFolder <em>Tab Folder</em>} '. <!-- begin-user-doc --> <!--

 	 * end-user-doc -->

 	 * 

 	 * @return the meta object for class '<em>Tab Folder</em>'.

-	 * @see org.eclipse.papyrus.sashwindows.di.TabFolder

+	 * @see org.eclipse.papyrus.infra.core.sashwindows.di.TabFolder

 	 * @generated

 	 */

 	EClass getTabFolder();

 

 	/**

-	 * Returns the meta object for the containment reference list ' {@link org.eclipse.papyrus.sashwindows.di.TabFolder#getChildren

+	 * Returns the meta object for the containment reference list ' {@link org.eclipse.papyrus.infra.core.sashwindows.di.TabFolder#getChildren

 	 * <em>Children</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->

 	 * 

 	 * @return the meta object for the containment reference list ' <em>Children</em>'.

-	 * @see org.eclipse.papyrus.sashwindows.di.TabFolder#getChildren()

+	 * @see org.eclipse.papyrus.infra.core.sashwindows.di.TabFolder#getChildren()

 	 * @see #getTabFolder()

 	 * @generated

 	 */

 	EReference getTabFolder_Children();

 

 	/**

-	 * Returns the meta object for class ' {@link org.eclipse.papyrus.sashwindows.di.PageRef <em>Page Ref</em>}'.

+	 * Returns the meta object for class ' {@link org.eclipse.papyrus.infra.core.sashwindows.di.PageRef <em>Page Ref</em>}'.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

 	 * 

 	 * @return the meta object for class '<em>Page Ref</em>'.

-	 * @see org.eclipse.papyrus.sashwindows.di.PageRef

+	 * @see org.eclipse.papyrus.infra.core.sashwindows.di.PageRef

 	 * @generated

 	 */

 	EClass getPageRef();

 

 	/**

-	 * Returns the meta object for the reference ' {@link org.eclipse.papyrus.sashwindows.di.PageRef#getEmfPageIdentifier

+	 * Returns the meta object for the reference ' {@link org.eclipse.papyrus.infra.core.sashwindows.di.PageRef#getEmfPageIdentifier

 	 * <em>Emf Page Identifier</em>}'. <!-- begin-user-doc --> <!-- end-user-doc

 	 * -->

 	 * 

 	 * @return the meta object for the reference '<em>Emf Page Identifier</em>'.

-	 * @see org.eclipse.papyrus.sashwindows.di.PageRef#getEmfPageIdentifier()

+	 * @see org.eclipse.papyrus.infra.core.sashwindows.di.PageRef#getEmfPageIdentifier()

 	 * @see #getPageRef()

 	 * @generated

 	 */

 	EReference getPageRef_EmfPageIdentifier();

 

 	/**

-	 * Returns the meta object for the attribute ' {@link org.eclipse.papyrus.sashwindows.di.PageRef#getPageIdentifier

+	 * Returns the meta object for the attribute ' {@link org.eclipse.papyrus.infra.core.sashwindows.di.PageRef#getPageIdentifier

 	 * <em>Page Identifier</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->

 	 * 

 	 * @return the meta object for the attribute '<em>Page Identifier</em>'.

-	 * @see org.eclipse.papyrus.sashwindows.di.PageRef#getPageIdentifier()

+	 * @see org.eclipse.papyrus.infra.core.sashwindows.di.PageRef#getPageIdentifier()

 	 * @see #getPageRef()

 	 * @generated

 	 */

 	EAttribute getPageRef_PageIdentifier();

 

 	/**

-	 * Returns the meta object for the attribute ' {@link org.eclipse.papyrus.sashwindows.di.PageRef#getObjectPageIdentifier

+	 * Returns the meta object for the attribute ' {@link org.eclipse.papyrus.infra.core.sashwindows.di.PageRef#getObjectPageIdentifier

 	 * <em>Object Page Identifier</em>}'. <!-- begin-user-doc --> <!--

 	 * end-user-doc -->

 	 * 

 	 * @return the meta object for the attribute ' <em>Object Page Identifier</em>'.

-	 * @see org.eclipse.papyrus.sashwindows.di.PageRef#getObjectPageIdentifier()

+	 * @see org.eclipse.papyrus.infra.core.sashwindows.di.PageRef#getObjectPageIdentifier()

 	 * @see #getPageRef()

 	 * @generated

 	 */

 	EAttribute getPageRef_ObjectPageIdentifier();

 

 	/**

-	 * Returns the meta object for the container reference ' {@link org.eclipse.papyrus.sashwindows.di.PageRef#getParent

+	 * Returns the meta object for the container reference ' {@link org.eclipse.papyrus.infra.core.sashwindows.di.PageRef#getParent

 	 * <em>Parent</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->

 	 * 

 	 * @return the meta object for the container reference '<em>Parent</em>'.

-	 * @see org.eclipse.papyrus.sashwindows.di.PageRef#getParent()

+	 * @see org.eclipse.papyrus.infra.core.sashwindows.di.PageRef#getParent()

 	 * @see #getPageRef()

 	 * @generated

 	 */

 	EReference getPageRef_Parent();

 

 	/**

-	 * Returns the meta object for class ' {@link org.eclipse.papyrus.sashwindows.di.SashPanel <em>Sash Panel</em>} '. <!-- begin-user-doc --> <!--

+	 * Returns the meta object for class ' {@link org.eclipse.papyrus.infra.core.sashwindows.di.SashPanel <em>Sash Panel</em>} '. <!-- begin-user-doc --> <!--

 	 * end-user-doc -->

 	 * 

 	 * @return the meta object for class '<em>Sash Panel</em>'.

-	 * @see org.eclipse.papyrus.sashwindows.di.SashPanel

+	 * @see org.eclipse.papyrus.infra.core.sashwindows.di.SashPanel

 	 * @generated

 	 */

 	EClass getSashPanel();

 

 	/**

-	 * Returns the meta object for the attribute ' {@link org.eclipse.papyrus.sashwindows.di.SashPanel#getSashPosition

+	 * Returns the meta object for the attribute ' {@link org.eclipse.papyrus.infra.core.sashwindows.di.SashPanel#getSashPosition

 	 * <em>Sash Position</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->

 	 * 

 	 * @return the meta object for the attribute '<em>Sash Position</em>'.

-	 * @see org.eclipse.papyrus.sashwindows.di.SashPanel#getSashPosition()

+	 * @see org.eclipse.papyrus.infra.core.sashwindows.di.SashPanel#getSashPosition()

 	 * @see #getSashPanel()

 	 * @generated

 	 */

 	EAttribute getSashPanel_SashPosition();

 

 	/**

-	 * Returns the meta object for the attribute ' {@link org.eclipse.papyrus.sashwindows.di.SashPanel#getDirection

+	 * Returns the meta object for the attribute ' {@link org.eclipse.papyrus.infra.core.sashwindows.di.SashPanel#getDirection

 	 * <em>Direction</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->

 	 * 

 	 * @return the meta object for the attribute '<em>Direction</em>'.

-	 * @see org.eclipse.papyrus.sashwindows.di.SashPanel#getDirection()

+	 * @see org.eclipse.papyrus.infra.core.sashwindows.di.SashPanel#getDirection()

 	 * @see #getSashPanel()

 	 * @generated

 	 */

 	EAttribute getSashPanel_Direction();

 

 	/**

-	 * Returns the meta object for class ' {@link org.eclipse.papyrus.sashwindows.di.AbstractPage

+	 * Returns the meta object for class ' {@link org.eclipse.papyrus.infra.core.sashwindows.di.AbstractPage

 	 * <em>Abstract Page</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->

 	 * 

 	 * @return the meta object for class '<em>Abstract Page</em>'.

-	 * @see org.eclipse.papyrus.sashwindows.di.AbstractPage

+	 * @see org.eclipse.papyrus.infra.core.sashwindows.di.AbstractPage

 	 * @generated

 	 */

 	EClass getAbstractPage();

 

 	/**

-	 * Returns the meta object for the attribute ' {@link org.eclipse.papyrus.sashwindows.di.AbstractPage#getPageIdentifier

+	 * Returns the meta object for the attribute ' {@link org.eclipse.papyrus.infra.core.sashwindows.di.AbstractPage#getPageIdentifier

 	 * <em>Page Identifier</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->

 	 * 

 	 * @return the meta object for the attribute '<em>Page Identifier</em>'.

-	 * @see org.eclipse.papyrus.sashwindows.di.AbstractPage#getPageIdentifier()

+	 * @see org.eclipse.papyrus.infra.core.sashwindows.di.AbstractPage#getPageIdentifier()

 	 * @see #getAbstractPage()

 	 * @generated

 	 */

 	EAttribute getAbstractPage_PageIdentifier();

 

 	/**

-	 * Returns the meta object for class ' {@link org.eclipse.papyrus.sashwindows.di.PageList <em>Page List</em>}'.

+	 * Returns the meta object for class ' {@link org.eclipse.papyrus.infra.core.sashwindows.di.PageList <em>Page List</em>}'.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

 	 * 

 	 * @return the meta object for class '<em>Page List</em>'.

-	 * @see org.eclipse.papyrus.sashwindows.di.PageList

+	 * @see org.eclipse.papyrus.infra.core.sashwindows.di.PageList

 	 * @generated

 	 */

 	EClass getPageList();

 

 	/**

-	 * Returns the meta object for the containment reference list ' {@link org.eclipse.papyrus.sashwindows.di.PageList#getAvailablePage

+	 * Returns the meta object for the containment reference list ' {@link org.eclipse.papyrus.infra.core.sashwindows.di.PageList#getAvailablePage

 	 * <em>Available Page</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->

 	 * 

 	 * @return the meta object for the containment reference list ' <em>Available Page</em>'.

-	 * @see org.eclipse.papyrus.sashwindows.di.PageList#getAvailablePage()

+	 * @see org.eclipse.papyrus.infra.core.sashwindows.di.PageList#getAvailablePage()

 	 * @see #getPageList()

 	 * @generated

 	 */

 	EReference getPageList_AvailablePage();

 

 	/**

-	 * Returns the meta object for class ' {@link org.eclipse.papyrus.sashwindows.di.SashWindowsMngr

+	 * Returns the meta object for class ' {@link org.eclipse.papyrus.infra.core.sashwindows.di.SashWindowsMngr

 	 * <em>Sash Windows Mngr</em>}'. <!-- begin-user-doc --> <!-- end-user-doc

 	 * -->

 	 * 

 	 * @return the meta object for class '<em>Sash Windows Mngr</em>'.

-	 * @see org.eclipse.papyrus.sashwindows.di.SashWindowsMngr

+	 * @see org.eclipse.papyrus.infra.core.sashwindows.di.SashWindowsMngr

 	 * @generated

 	 */

 	EClass getSashWindowsMngr();

 

 	/**

-	 * Returns the meta object for the containment reference ' {@link org.eclipse.papyrus.sashwindows.di.SashWindowsMngr#getPageList

+	 * Returns the meta object for the containment reference ' {@link org.eclipse.papyrus.infra.core.sashwindows.di.SashWindowsMngr#getPageList

 	 * <em>Page List</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->

 	 * 

 	 * @return the meta object for the containment reference '<em>Page List</em> '.

-	 * @see org.eclipse.papyrus.sashwindows.di.SashWindowsMngr#getPageList()

+	 * @see org.eclipse.papyrus.infra.core.sashwindows.di.SashWindowsMngr#getPageList()

 	 * @see #getSashWindowsMngr()

 	 * @generated

 	 */

 	EReference getSashWindowsMngr_PageList();

 

 	/**

-	 * Returns the meta object for the containment reference ' {@link org.eclipse.papyrus.sashwindows.di.SashWindowsMngr#getSashModel

+	 * Returns the meta object for the containment reference ' {@link org.eclipse.papyrus.infra.core.sashwindows.di.SashWindowsMngr#getSashModel

 	 * <em>Sash Model</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->

 	 * 

 	 * @return the meta object for the containment reference ' <em>Sash Model</em>'.

-	 * @see org.eclipse.papyrus.sashwindows.di.SashWindowsMngr#getSashModel()

+	 * @see org.eclipse.papyrus.infra.core.sashwindows.di.SashWindowsMngr#getSashModel()

 	 * @see #getSashWindowsMngr()

 	 * @generated

 	 */

@@ -996,12 +996,12 @@ public interface DiPackage extends EPackage {
 	interface Literals {

 

 		/**

-		 * The meta object literal for the ' {@link org.eclipse.papyrus.sashwindows.di.impl.SashModelImpl

+		 * The meta object literal for the ' {@link org.eclipse.papyrus.infra.core.sashwindows.di.impl.SashModelImpl

 		 * <em>Sash Model</em>}' class. <!-- begin-user-doc --> <!--

 		 * end-user-doc -->

 		 * 

-		 * @see org.eclipse.papyrus.sashwindows.di.impl.SashModelImpl

-		 * @see org.eclipse.papyrus.sashwindows.di.impl.DiPackageImpl#getSashModel()

+		 * @see org.eclipse.papyrus.infra.core.sashwindows.di.impl.SashModelImpl

+		 * @see org.eclipse.papyrus.infra.core.sashwindows.di.impl.DiPackageImpl#getSashModel()

 		 * @generated

 		 */

 		EClass SASH_MODEL = eINSTANCE.getSashModel();

@@ -1023,12 +1023,12 @@ public interface DiPackage extends EPackage {
 		EReference SASH_MODEL__CURRENT_SELECTION = eINSTANCE.getSashModel_CurrentSelection();

 

 		/**

-		 * The meta object literal for the ' {@link org.eclipse.papyrus.sashwindows.di.impl.WindowImpl

+		 * The meta object literal for the ' {@link org.eclipse.papyrus.infra.core.sashwindows.di.impl.WindowImpl

 		 * <em>Window</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc

 		 * -->

 		 * 

-		 * @see org.eclipse.papyrus.sashwindows.di.impl.WindowImpl

-		 * @see org.eclipse.papyrus.sashwindows.di.impl.DiPackageImpl#getWindow()

+		 * @see org.eclipse.papyrus.infra.core.sashwindows.di.impl.WindowImpl

+		 * @see org.eclipse.papyrus.infra.core.sashwindows.di.impl.DiPackageImpl#getWindow()

 		 * @generated

 		 */

 		EClass WINDOW = eINSTANCE.getWindow();

@@ -1058,12 +1058,12 @@ public interface DiPackage extends EPackage {
 		EReference WINDOW__PANEL = eINSTANCE.getWindow_Panel();

 

 		/**

-		 * The meta object literal for the ' {@link org.eclipse.papyrus.sashwindows.di.impl.PanelParentImpl

+		 * The meta object literal for the ' {@link org.eclipse.papyrus.infra.core.sashwindows.di.impl.PanelParentImpl

 		 * <em>Panel Parent</em>}' class. <!-- begin-user-doc --> <!--

 		 * end-user-doc -->

 		 * 

-		 * @see org.eclipse.papyrus.sashwindows.di.impl.PanelParentImpl

-		 * @see org.eclipse.papyrus.sashwindows.di.impl.DiPackageImpl#getPanelParent()

+		 * @see org.eclipse.papyrus.infra.core.sashwindows.di.impl.PanelParentImpl

+		 * @see org.eclipse.papyrus.infra.core.sashwindows.di.impl.DiPackageImpl#getPanelParent()

 		 * @generated

 		 */

 		EClass PANEL_PARENT = eINSTANCE.getPanelParent();

@@ -1078,12 +1078,12 @@ public interface DiPackage extends EPackage {
 		EReference PANEL_PARENT__CHILDREN = eINSTANCE.getPanelParent_Children();

 

 		/**

-		 * The meta object literal for the ' {@link org.eclipse.papyrus.sashwindows.di.impl.AbstractPanelImpl

+		 * The meta object literal for the ' {@link org.eclipse.papyrus.infra.core.sashwindows.di.impl.AbstractPanelImpl

 		 * <em>Abstract Panel</em>}' class. <!-- begin-user-doc --> <!--

 		 * end-user-doc -->

 		 * 

-		 * @see org.eclipse.papyrus.sashwindows.di.impl.AbstractPanelImpl

-		 * @see org.eclipse.papyrus.sashwindows.di.impl.DiPackageImpl#getAbstractPanel()

+		 * @see org.eclipse.papyrus.infra.core.sashwindows.di.impl.AbstractPanelImpl

+		 * @see org.eclipse.papyrus.infra.core.sashwindows.di.impl.DiPackageImpl#getAbstractPanel()

 		 * @generated

 		 */

 		EClass ABSTRACT_PANEL = eINSTANCE.getAbstractPanel();

@@ -1097,12 +1097,12 @@ public interface DiPackage extends EPackage {
 		EReference ABSTRACT_PANEL__PARENT = eINSTANCE.getAbstractPanel_Parent();

 

 		/**

-		 * The meta object literal for the ' {@link org.eclipse.papyrus.sashwindows.di.impl.PositionImpl

+		 * The meta object literal for the ' {@link org.eclipse.papyrus.infra.core.sashwindows.di.impl.PositionImpl

 		 * <em>Position</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc

 		 * -->

 		 * 

-		 * @see org.eclipse.papyrus.sashwindows.di.impl.PositionImpl

-		 * @see org.eclipse.papyrus.sashwindows.di.impl.DiPackageImpl#getPosition()

+		 * @see org.eclipse.papyrus.infra.core.sashwindows.di.impl.PositionImpl

+		 * @see org.eclipse.papyrus.infra.core.sashwindows.di.impl.DiPackageImpl#getPosition()

 		 * @generated

 		 */

 		EClass POSITION = eINSTANCE.getPosition();

@@ -1124,11 +1124,11 @@ public interface DiPackage extends EPackage {
 		EAttribute POSITION__Y = eINSTANCE.getPosition_Y();

 

 		/**

-		 * The meta object literal for the ' {@link org.eclipse.papyrus.sashwindows.di.impl.SizeImpl

+		 * The meta object literal for the ' {@link org.eclipse.papyrus.infra.core.sashwindows.di.impl.SizeImpl

 		 * <em>Size</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->

 		 * 

-		 * @see org.eclipse.papyrus.sashwindows.di.impl.SizeImpl

-		 * @see org.eclipse.papyrus.sashwindows.di.impl.DiPackageImpl#getSize()

+		 * @see org.eclipse.papyrus.infra.core.sashwindows.di.impl.SizeImpl

+		 * @see org.eclipse.papyrus.infra.core.sashwindows.di.impl.DiPackageImpl#getSize()

 		 * @generated

 		 */

 		EClass SIZE = eINSTANCE.getSize();

@@ -1150,12 +1150,12 @@ public interface DiPackage extends EPackage {
 		EAttribute SIZE__LENGTH = eINSTANCE.getSize_Length();

 

 		/**

-		 * The meta object literal for the ' {@link org.eclipse.papyrus.sashwindows.di.impl.TabFolderImpl

+		 * The meta object literal for the ' {@link org.eclipse.papyrus.infra.core.sashwindows.di.impl.TabFolderImpl

 		 * <em>Tab Folder</em>}' class. <!-- begin-user-doc --> <!--

 		 * end-user-doc -->

 		 * 

-		 * @see org.eclipse.papyrus.sashwindows.di.impl.TabFolderImpl

-		 * @see org.eclipse.papyrus.sashwindows.di.impl.DiPackageImpl#getTabFolder()

+		 * @see org.eclipse.papyrus.infra.core.sashwindows.di.impl.TabFolderImpl

+		 * @see org.eclipse.papyrus.infra.core.sashwindows.di.impl.DiPackageImpl#getTabFolder()

 		 * @generated

 		 */

 		EClass TAB_FOLDER = eINSTANCE.getTabFolder();

@@ -1170,12 +1170,12 @@ public interface DiPackage extends EPackage {
 		EReference TAB_FOLDER__CHILDREN = eINSTANCE.getTabFolder_Children();

 

 		/**

-		 * The meta object literal for the ' {@link org.eclipse.papyrus.sashwindows.di.impl.PageRefImpl

+		 * The meta object literal for the ' {@link org.eclipse.papyrus.infra.core.sashwindows.di.impl.PageRefImpl

 		 * <em>Page Ref</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc

 		 * -->

 		 * 

-		 * @see org.eclipse.papyrus.sashwindows.di.impl.PageRefImpl

-		 * @see org.eclipse.papyrus.sashwindows.di.impl.DiPackageImpl#getPageRef()

+		 * @see org.eclipse.papyrus.infra.core.sashwindows.di.impl.PageRefImpl

+		 * @see org.eclipse.papyrus.infra.core.sashwindows.di.impl.DiPackageImpl#getPageRef()

 		 * @generated

 		 */

 		EClass PAGE_REF = eINSTANCE.getPageRef();

@@ -1213,12 +1213,12 @@ public interface DiPackage extends EPackage {
 		EReference PAGE_REF__PARENT = eINSTANCE.getPageRef_Parent();

 

 		/**

-		 * The meta object literal for the ' {@link org.eclipse.papyrus.sashwindows.di.impl.SashPanelImpl

+		 * The meta object literal for the ' {@link org.eclipse.papyrus.infra.core.sashwindows.di.impl.SashPanelImpl

 		 * <em>Sash Panel</em>}' class. <!-- begin-user-doc --> <!--

 		 * end-user-doc -->

 		 * 

-		 * @see org.eclipse.papyrus.sashwindows.di.impl.SashPanelImpl

-		 * @see org.eclipse.papyrus.sashwindows.di.impl.DiPackageImpl#getSashPanel()

+		 * @see org.eclipse.papyrus.infra.core.sashwindows.di.impl.SashPanelImpl

+		 * @see org.eclipse.papyrus.infra.core.sashwindows.di.impl.DiPackageImpl#getSashPanel()

 		 * @generated

 		 */

 		EClass SASH_PANEL = eINSTANCE.getSashPanel();

@@ -1240,12 +1240,12 @@ public interface DiPackage extends EPackage {
 		EAttribute SASH_PANEL__DIRECTION = eINSTANCE.getSashPanel_Direction();

 

 		/**

-		 * The meta object literal for the ' {@link org.eclipse.papyrus.sashwindows.di.impl.AbstractPageImpl

+		 * The meta object literal for the ' {@link org.eclipse.papyrus.infra.core.sashwindows.di.impl.AbstractPageImpl

 		 * <em>Abstract Page</em>}' class. <!-- begin-user-doc --> <!--

 		 * end-user-doc -->

 		 * 

-		 * @see org.eclipse.papyrus.sashwindows.di.impl.AbstractPageImpl

-		 * @see org.eclipse.papyrus.sashwindows.di.impl.DiPackageImpl#getAbstractPage()

+		 * @see org.eclipse.papyrus.infra.core.sashwindows.di.impl.AbstractPageImpl

+		 * @see org.eclipse.papyrus.infra.core.sashwindows.di.impl.DiPackageImpl#getAbstractPage()

 		 * @generated

 		 */

 		EClass ABSTRACT_PAGE = eINSTANCE.getAbstractPage();

@@ -1259,12 +1259,12 @@ public interface DiPackage extends EPackage {
 		EAttribute ABSTRACT_PAGE__PAGE_IDENTIFIER = eINSTANCE.getAbstractPage_PageIdentifier();

 

 		/**

-		 * The meta object literal for the ' {@link org.eclipse.papyrus.sashwindows.di.impl.PageListImpl

+		 * The meta object literal for the ' {@link org.eclipse.papyrus.infra.core.sashwindows.di.impl.PageListImpl

 		 * <em>Page List</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc

 		 * -->

 		 * 

-		 * @see org.eclipse.papyrus.sashwindows.di.impl.PageListImpl

-		 * @see org.eclipse.papyrus.sashwindows.di.impl.DiPackageImpl#getPageList()

+		 * @see org.eclipse.papyrus.infra.core.sashwindows.di.impl.PageListImpl

+		 * @see org.eclipse.papyrus.infra.core.sashwindows.di.impl.DiPackageImpl#getPageList()

 		 * @generated

 		 */

 		EClass PAGE_LIST = eINSTANCE.getPageList();

@@ -1279,12 +1279,12 @@ public interface DiPackage extends EPackage {
 		EReference PAGE_LIST__AVAILABLE_PAGE = eINSTANCE.getPageList_AvailablePage();

 

 		/**

-		 * The meta object literal for the ' {@link org.eclipse.papyrus.sashwindows.di.impl.SashWindowsMngrImpl

+		 * The meta object literal for the ' {@link org.eclipse.papyrus.infra.core.sashwindows.di.impl.SashWindowsMngrImpl

 		 * <em>Sash Windows Mngr</em>}' class. <!-- begin-user-doc --> <!--

 		 * end-user-doc -->

 		 * 

-		 * @see org.eclipse.papyrus.sashwindows.di.impl.SashWindowsMngrImpl

-		 * @see org.eclipse.papyrus.sashwindows.di.impl.DiPackageImpl#getSashWindowsMngr()

+		 * @see org.eclipse.papyrus.infra.core.sashwindows.di.impl.SashWindowsMngrImpl

+		 * @see org.eclipse.papyrus.infra.core.sashwindows.di.impl.DiPackageImpl#getSashWindowsMngr()

 		 * @generated

 		 */

 		EClass SASH_WINDOWS_MNGR = eINSTANCE.getSashWindowsMngr();

@@ -1311,7 +1311,7 @@ public interface DiPackage extends EPackage {
 		 * The meta object literal for the '<em>int</em>' data type. <!--

 		 * begin-user-doc --> <!-- end-user-doc -->

 		 * 

-		 * @see org.eclipse.papyrus.sashwindows.di.impl.DiPackageImpl#getint()

+		 * @see org.eclipse.papyrus.infra.core.sashwindows.di.impl.DiPackageImpl#getint()

 		 * @generated

 		 */

 		EDataType INT = eINSTANCE.getint();

@@ -1321,7 +1321,7 @@ public interface DiPackage extends EPackage {
 		 * <!-- begin-user-doc --> <!-- end-user-doc -->

 		 * 

 		 * @see java.lang.Object

-		 * @see org.eclipse.papyrus.sashwindows.di.impl.DiPackageImpl#getJavaObject()

+		 * @see org.eclipse.papyrus.infra.core.sashwindows.di.impl.DiPackageImpl#getJavaObject()

 		 * @generated

 		 */

 		EDataType JAVA_OBJECT = eINSTANCE.getJavaObject();

@@ -1330,7 +1330,7 @@ public interface DiPackage extends EPackage {
 		 * The meta object literal for the '<em>Float</em>' data type. <!--

 		 * begin-user-doc --> <!-- end-user-doc -->

 		 * 

-		 * @see org.eclipse.papyrus.sashwindows.di.impl.DiPackageImpl#getFloat()

+		 * @see org.eclipse.papyrus.infra.core.sashwindows.di.impl.DiPackageImpl#getFloat()

 		 * @generated

 		 */

 		EDataType FLOAT = eINSTANCE.getFloat();

@@ -1339,7 +1339,7 @@ public interface DiPackage extends EPackage {
 		 * The meta object literal for the '<em>boolean</em>' data type. <!--

 		 * begin-user-doc --> <!-- end-user-doc -->

 		 * 

-		 * @see org.eclipse.papyrus.sashwindows.di.impl.DiPackageImpl#getboolean()

+		 * @see org.eclipse.papyrus.infra.core.sashwindows.di.impl.DiPackageImpl#getboolean()

 		 * @generated

 		 */

 		EDataType BOOLEAN = eINSTANCE.getboolean();

diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/src/org/eclipse/papyrus/sashwindows/di/PageList.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/src/org/eclipse/papyrus/infra/core/sashwindows/di/PageList.java
index 5adeab8fd16..2a59fb60323 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/src/org/eclipse/papyrus/sashwindows/di/PageList.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/src/org/eclipse/papyrus/infra/core/sashwindows/di/PageList.java
@@ -4,7 +4,7 @@
  *

  * $Id$

  */

-package org.eclipse.papyrus.sashwindows.di;

+package org.eclipse.papyrus.infra.core.sashwindows.di;

 

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

 import org.eclipse.emf.ecore.EObject;

@@ -15,11 +15,11 @@ import org.eclipse.emf.ecore.EObject;
  * <p>

  * The following features are supported:

  * <ul>

- * <li>{@link org.eclipse.papyrus.sashwindows.di.PageList#getAvailablePage <em> Available Page</em>}</li>

+ * <li>{@link org.eclipse.papyrus.infra.core.sashwindows.di.PageList#getAvailablePage <em> Available Page</em>}</li>

  * </ul>

  * </p>

  * 

- * @see org.eclipse.papyrus.sashwindows.di.DiPackage#getPageList()

+ * @see org.eclipse.papyrus.infra.core.sashwindows.di.DiPackage#getPageList()

  * @model

  * @generated

  */

@@ -27,7 +27,7 @@ public interface PageList extends EObject {
 

 	/**

 	 * Returns the value of the '<em><b>Available Page</b></em>' containment

-	 * reference list. The list contents are of type {@link org.eclipse.papyrus.sashwindows.di.PageRef}. <!-- begin-user-doc

+	 * reference list. The list contents are of type {@link org.eclipse.papyrus.infra.core.sashwindows.di.PageRef}. <!-- begin-user-doc

 	 * -->

 	 * <p>

 	 * If the meaning of the '<em>Available Page</em>' containment reference list isn't clear, there really should be more of a description here...

@@ -36,7 +36,7 @@ public interface PageList extends EObject {
 	 * 

 	 * @return the value of the '<em>Available Page</em>' containment reference

 	 *         list.

-	 * @see org.eclipse.papyrus.sashwindows.di.DiPackage#getPageList_AvailablePage()

+	 * @see org.eclipse.papyrus.infra.core.sashwindows.di.DiPackage#getPageList_AvailablePage()

 	 * @model containment="true" ordered="false"

 	 * @generated

 	 */

@@ -46,7 +46,7 @@ public interface PageList extends EObject {
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

 	 * 

 	 * @model

-	 *        pageIdentifierDataType="org.eclipse.papyrus.sashwindows.di.JavaObject"

+	 *        pageIdentifierDataType="org.eclipse.papyrus.infra.core.sashwindows.di.JavaObject"

 	 *        pageIdentifierRequired="true" pageIdentifierOrdered="false"

 	 * @generated

 	 */

@@ -56,7 +56,7 @@ public interface PageList extends EObject {
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

 	 * 

 	 * @model

-	 *        pageIdentifierDataType="org.eclipse.papyrus.sashwindows.di.JavaObject"

+	 *        pageIdentifierDataType="org.eclipse.papyrus.infra.core.sashwindows.di.JavaObject"

 	 *        pageIdentifierRequired="true" pageIdentifierOrdered="false"

 	 * @generated

 	 */

diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/src/org/eclipse/papyrus/sashwindows/di/PageRef.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/src/org/eclipse/papyrus/infra/core/sashwindows/di/PageRef.java
index ead3f96cba2..276fda77a42 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/src/org/eclipse/papyrus/sashwindows/di/PageRef.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/src/org/eclipse/papyrus/infra/core/sashwindows/di/PageRef.java
@@ -4,7 +4,7 @@
  *

  * $Id$

  */

-package org.eclipse.papyrus.sashwindows.di;

+package org.eclipse.papyrus.infra.core.sashwindows.di;

 

 import org.eclipse.emf.ecore.EObject;

 

@@ -14,17 +14,17 @@ import org.eclipse.emf.ecore.EObject;
  * <p>

  * The following features are supported:

  * <ul>

- * <li>{@link org.eclipse.papyrus.sashwindows.di.PageRef#getEmfPageIdentifier

+ * <li>{@link org.eclipse.papyrus.infra.core.sashwindows.di.PageRef#getEmfPageIdentifier

  * <em>Emf Page Identifier</em>}</li>

- * <li>{@link org.eclipse.papyrus.sashwindows.di.PageRef#getPageIdentifier <em> Page Identifier</em>}</li>

+ * <li>{@link org.eclipse.papyrus.infra.core.sashwindows.di.PageRef#getPageIdentifier <em> Page Identifier</em>}</li>

  * <li>

- * {@link org.eclipse.papyrus.sashwindows.di.PageRef#getObjectPageIdentifier

+ * {@link org.eclipse.papyrus.infra.core.sashwindows.di.PageRef#getObjectPageIdentifier

  * <em>Object Page Identifier</em>}</li>

- * <li>{@link org.eclipse.papyrus.sashwindows.di.PageRef#getParent <em>Parent </em>}</li>

+ * <li>{@link org.eclipse.papyrus.infra.core.sashwindows.di.PageRef#getParent <em>Parent </em>}</li>

  * </ul>

  * </p>

  * 

- * @see org.eclipse.papyrus.sashwindows.di.DiPackage#getPageRef()

+ * @see org.eclipse.papyrus.infra.core.sashwindows.di.DiPackage#getPageRef()

  * @model

  * @generated

  */

@@ -40,14 +40,14 @@ public interface PageRef extends EObject {
 	 * 

 	 * @return the value of the '<em>Emf Page Identifier</em>' reference.

 	 * @see #setEmfPageIdentifier(EObject)

-	 * @see org.eclipse.papyrus.sashwindows.di.DiPackage#getPageRef_EmfPageIdentifier()

+	 * @see org.eclipse.papyrus.infra.core.sashwindows.di.DiPackage#getPageRef_EmfPageIdentifier()

 	 * @model required="true" ordered="false"

 	 * @generated

 	 */

 	EObject getEmfPageIdentifier();

 

 	/**

-	 * Sets the value of the ' {@link org.eclipse.papyrus.sashwindows.di.PageRef#getEmfPageIdentifier

+	 * Sets the value of the ' {@link org.eclipse.papyrus.infra.core.sashwindows.di.PageRef#getEmfPageIdentifier

 	 * <em>Emf Page Identifier</em>}' reference. <!-- begin-user-doc --> <!--

 	 * end-user-doc -->

 	 * 

@@ -66,9 +66,9 @@ public interface PageRef extends EObject {
 	 * 

 	 * @return the value of the '<em>Page Identifier</em>' attribute.

 	 * @see #setPageIdentifier(Object)

-	 * @see org.eclipse.papyrus.sashwindows.di.DiPackage#getPageRef_PageIdentifier()

+	 * @see org.eclipse.papyrus.infra.core.sashwindows.di.DiPackage#getPageRef_PageIdentifier()

 	 * @model unique="false"

-	 *        dataType="org.eclipse.papyrus.sashwindows.di.JavaObject"

+	 *        dataType="org.eclipse.papyrus.infra.core.sashwindows.di.JavaObject"

 	 *        required="true" transient="true" volatile="true" derived="true"

 	 *        ordered="false"

 	 * @generated

@@ -76,7 +76,7 @@ public interface PageRef extends EObject {
 	Object getPageIdentifier();

 

 	/**

-	 * Sets the value of the ' {@link org.eclipse.papyrus.sashwindows.di.PageRef#getPageIdentifier

+	 * Sets the value of the ' {@link org.eclipse.papyrus.infra.core.sashwindows.di.PageRef#getPageIdentifier

 	 * <em>Page Identifier</em>}' attribute. <!-- begin-user-doc --> <!--

 	 * end-user-doc -->

 	 * 

@@ -95,16 +95,16 @@ public interface PageRef extends EObject {
 	 * 

 	 * @return the value of the '<em>Object Page Identifier</em>' attribute.

 	 * @see #setObjectPageIdentifier(Object)

-	 * @see org.eclipse.papyrus.sashwindows.di.DiPackage#getPageRef_ObjectPageIdentifier()

+	 * @see org.eclipse.papyrus.infra.core.sashwindows.di.DiPackage#getPageRef_ObjectPageIdentifier()

 	 * @model unique="false"

-	 *        dataType="org.eclipse.papyrus.sashwindows.di.JavaObject"

+	 *        dataType="org.eclipse.papyrus.infra.core.sashwindows.di.JavaObject"

 	 *        required="true" ordered="false"

 	 * @generated

 	 */

 	Object getObjectPageIdentifier();

 

 	/**

-	 * Sets the value of the ' {@link org.eclipse.papyrus.sashwindows.di.PageRef#getObjectPageIdentifier

+	 * Sets the value of the ' {@link org.eclipse.papyrus.infra.core.sashwindows.di.PageRef#getObjectPageIdentifier

 	 * <em>Object Page Identifier</em>}' attribute. <!-- begin-user-doc --> <!--

 	 * end-user-doc -->

 	 * 

@@ -118,7 +118,7 @@ public interface PageRef extends EObject {
 

 	/**

 	 * Returns the value of the '<em><b>Parent</b></em>' container reference. It

-	 * is bidirectional and its opposite is ' {@link org.eclipse.papyrus.sashwindows.di.TabFolder#getChildren

+	 * is bidirectional and its opposite is ' {@link org.eclipse.papyrus.infra.core.sashwindows.di.TabFolder#getChildren

 	 * <em>Children</em>}'. <!-- begin-user-doc -->

 	 * <p>

 	 * If the meaning of the '<em>Parent</em>' container reference isn't clear, there really should be more of a description here...

@@ -127,8 +127,8 @@ public interface PageRef extends EObject {
 	 * 

 	 * @return the value of the '<em>Parent</em>' container reference.

 	 * @see #setParent(TabFolder)

-	 * @see org.eclipse.papyrus.sashwindows.di.DiPackage#getPageRef_Parent()

-	 * @see org.eclipse.papyrus.sashwindows.di.TabFolder#getChildren

+	 * @see org.eclipse.papyrus.infra.core.sashwindows.di.DiPackage#getPageRef_Parent()

+	 * @see org.eclipse.papyrus.infra.core.sashwindows.di.TabFolder#getChildren

 	 * @model opposite="children" required="true" transient="false"

 	 *        ordered="false"

 	 * @generated

@@ -136,7 +136,7 @@ public interface PageRef extends EObject {
 	TabFolder getParent();

 

 	/**

-	 * Sets the value of the ' {@link org.eclipse.papyrus.sashwindows.di.PageRef#getParent

+	 * Sets the value of the ' {@link org.eclipse.papyrus.infra.core.sashwindows.di.PageRef#getParent

 	 * <em>Parent</em>}' container reference. <!-- begin-user-doc --> <!--

 	 * end-user-doc -->

 	 * 

@@ -151,7 +151,7 @@ public interface PageRef extends EObject {
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

 	 * 

 	 * @model required="true" ordered="false"

-	 *        pageIdentifierDataType="org.eclipse.papyrus.sashwindows.di.JavaObject"

+	 *        pageIdentifierDataType="org.eclipse.papyrus.infra.core.sashwindows.di.JavaObject"

 	 *        pageIdentifierRequired="true" pageIdentifierOrdered="false"

 	 * @generated

 	 */

diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/src/org/eclipse/papyrus/sashwindows/di/PanelParent.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/src/org/eclipse/papyrus/infra/core/sashwindows/di/PanelParent.java
index d89e850c058..56bd4062128 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/src/org/eclipse/papyrus/sashwindows/di/PanelParent.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/src/org/eclipse/papyrus/infra/core/sashwindows/di/PanelParent.java
@@ -4,7 +4,7 @@
  *

  * $Id$

  */

-package org.eclipse.papyrus.sashwindows.di;

+package org.eclipse.papyrus.infra.core.sashwindows.di;

 

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

 import org.eclipse.emf.ecore.EObject;

@@ -15,11 +15,11 @@ import org.eclipse.emf.ecore.EObject;
  * <p>

  * The following features are supported:

  * <ul>

- * <li>{@link org.eclipse.papyrus.sashwindows.di.PanelParent#getChildren <em> Children</em>}</li>

+ * <li>{@link org.eclipse.papyrus.infra.core.sashwindows.di.PanelParent#getChildren <em> Children</em>}</li>

  * </ul>

  * </p>

  * 

- * @see org.eclipse.papyrus.sashwindows.di.DiPackage#getPanelParent()

+ * @see org.eclipse.papyrus.infra.core.sashwindows.di.DiPackage#getPanelParent()

  * @model abstract="true"

  * @generated

  */

@@ -27,8 +27,8 @@ public interface PanelParent extends EObject {
 

 	/**

 	 * Returns the value of the '<em><b>Children</b></em>' containment reference

-	 * list. The list contents are of type {@link org.eclipse.papyrus.sashwindows.di.AbstractPanel}. It is

-	 * bidirectional and its opposite is ' {@link org.eclipse.papyrus.sashwindows.di.AbstractPanel#getParent

+	 * list. The list contents are of type {@link org.eclipse.papyrus.infra.core.sashwindows.di.AbstractPanel}. It is

+	 * bidirectional and its opposite is ' {@link org.eclipse.papyrus.infra.core.sashwindows.di.AbstractPanel#getParent

 	 * <em>Parent</em>}'. <!-- begin-user-doc -->

 	 * <p>

 	 * If the meaning of the '<em>Children</em>' containment reference list isn't clear, there really should be more of a description here...

@@ -36,8 +36,8 @@ public interface PanelParent extends EObject {
 	 * <!-- end-user-doc -->

 	 * 

 	 * @return the value of the '<em>Children</em>' containment reference list.

-	 * @see org.eclipse.papyrus.sashwindows.di.DiPackage#getPanelParent_Children()

-	 * @see org.eclipse.papyrus.sashwindows.di.AbstractPanel#getParent

+	 * @see org.eclipse.papyrus.infra.core.sashwindows.di.DiPackage#getPanelParent_Children()

+	 * @see org.eclipse.papyrus.infra.core.sashwindows.di.AbstractPanel#getParent

 	 * @model opposite="parent" containment="true" lower="2" upper="2"

 	 *        ordered="false"

 	 * @generated

diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/src/org/eclipse/papyrus/sashwindows/di/Position.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/src/org/eclipse/papyrus/infra/core/sashwindows/di/Position.java
index bd5562514af..48849a1b14d 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/src/org/eclipse/papyrus/sashwindows/di/Position.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/src/org/eclipse/papyrus/infra/core/sashwindows/di/Position.java
@@ -4,7 +4,7 @@
  *

  * $Id$

  */

-package org.eclipse.papyrus.sashwindows.di;

+package org.eclipse.papyrus.infra.core.sashwindows.di;

 

 import org.eclipse.emf.ecore.EObject;

 

@@ -14,12 +14,12 @@ import org.eclipse.emf.ecore.EObject;
  * <p>

  * The following features are supported:

  * <ul>

- * <li>{@link org.eclipse.papyrus.sashwindows.di.Position#getX <em>X</em>}</li>

- * <li>{@link org.eclipse.papyrus.sashwindows.di.Position#getY <em>Y</em>}</li>

+ * <li>{@link org.eclipse.papyrus.infra.core.sashwindows.di.Position#getX <em>X</em>}</li>

+ * <li>{@link org.eclipse.papyrus.infra.core.sashwindows.di.Position#getY <em>Y</em>}</li>

  * </ul>

  * </p>

  * 

- * @see org.eclipse.papyrus.sashwindows.di.DiPackage#getPosition()

+ * @see org.eclipse.papyrus.infra.core.sashwindows.di.DiPackage#getPosition()

  * @model

  * @generated

  */

@@ -35,14 +35,14 @@ public interface Position extends EObject {
 	 * 

 	 * @return the value of the '<em>X</em>' attribute.

 	 * @see #setX(int)

-	 * @see org.eclipse.papyrus.sashwindows.di.DiPackage#getPosition_X()

+	 * @see org.eclipse.papyrus.infra.core.sashwindows.di.DiPackage#getPosition_X()

 	 * @model unique="false" required="true" ordered="false"

 	 * @generated

 	 */

 	int getX();

 

 	/**

-	 * Sets the value of the ' {@link org.eclipse.papyrus.sashwindows.di.Position#getX <em>X</em>}'

+	 * Sets the value of the ' {@link org.eclipse.papyrus.infra.core.sashwindows.di.Position#getX <em>X</em>}'

 	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->

 	 * 

 	 * @param value

@@ -62,15 +62,15 @@ public interface Position extends EObject {
 	 * 

 	 * @return the value of the '<em>Y</em>' attribute.

 	 * @see #setY(int)

-	 * @see org.eclipse.papyrus.sashwindows.di.DiPackage#getPosition_Y()

-	 * @model unique="false" dataType="org.eclipse.papyrus.sashwindows.di.int"

+	 * @see org.eclipse.papyrus.infra.core.sashwindows.di.DiPackage#getPosition_Y()

+	 * @model unique="false" dataType="org.eclipse.papyrus.infra.core.sashwindows.di.int"

 	 *        required="true" ordered="false"

 	 * @generated

 	 */

 	int getY();

 

 	/**

-	 * Sets the value of the ' {@link org.eclipse.papyrus.sashwindows.di.Position#getY <em>Y</em>}'

+	 * Sets the value of the ' {@link org.eclipse.papyrus.infra.core.sashwindows.di.Position#getY <em>Y</em>}'

 	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->

 	 * 

 	 * @param value

diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/src/org/eclipse/papyrus/sashwindows/di/SashModel.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/src/org/eclipse/papyrus/infra/core/sashwindows/di/SashModel.java
index d3e4fa9f24b..7da668ac116 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/src/org/eclipse/papyrus/sashwindows/di/SashModel.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/src/org/eclipse/papyrus/infra/core/sashwindows/di/SashModel.java
@@ -4,7 +4,7 @@
  *

  * $Id$

  */

-package org.eclipse.papyrus.sashwindows.di;

+package org.eclipse.papyrus.infra.core.sashwindows.di;

 

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

 import org.eclipse.emf.ecore.EObject;

@@ -20,13 +20,13 @@ import org.eclipse.emf.ecore.EObject;
  * <p>

  * The following features are supported:

  * <ul>

- * <li>{@link org.eclipse.papyrus.sashwindows.di.SashModel#getWindows <em> Windows</em>}</li>

- * <li>{@link org.eclipse.papyrus.sashwindows.di.SashModel#getCurrentSelection

+ * <li>{@link org.eclipse.papyrus.infra.core.sashwindows.di.SashModel#getWindows <em> Windows</em>}</li>

+ * <li>{@link org.eclipse.papyrus.infra.core.sashwindows.di.SashModel#getCurrentSelection

  * <em>Current Selection</em>}</li>

  * </ul>

  * </p>

  * 

- * @see org.eclipse.papyrus.sashwindows.di.DiPackage#getSashModel()

+ * @see org.eclipse.papyrus.infra.core.sashwindows.di.DiPackage#getSashModel()

  * @model

  * @generated

  */

@@ -34,7 +34,7 @@ public interface SashModel extends EObject {
 

 	/**

 	 * Returns the value of the '<em><b>Windows</b></em>' containment reference

-	 * list. The list contents are of type {@link org.eclipse.papyrus.sashwindows.di.Window}. <!-- begin-user-doc

+	 * list. The list contents are of type {@link org.eclipse.papyrus.infra.core.sashwindows.di.Window}. <!-- begin-user-doc

 	 * -->

 	 * <p>

 	 * If the meaning of the '<em>Windows</em>' containment reference list isn't clear, there really should be more of a description here...

@@ -42,7 +42,7 @@ public interface SashModel extends EObject {
 	 * <!-- end-user-doc -->

 	 * 

 	 * @return the value of the '<em>Windows</em>' containment reference list.

-	 * @see org.eclipse.papyrus.sashwindows.di.DiPackage#getSashModel_Windows()

+	 * @see org.eclipse.papyrus.infra.core.sashwindows.di.DiPackage#getSashModel_Windows()

 	 * @model containment="true" ordered="false"

 	 * @generated

 	 */

@@ -58,14 +58,14 @@ public interface SashModel extends EObject {
 	 * 

 	 * @return the value of the '<em>Current Selection</em>' reference.

 	 * @see #setCurrentSelection(TabFolder)

-	 * @see org.eclipse.papyrus.sashwindows.di.DiPackage#getSashModel_CurrentSelection()

+	 * @see org.eclipse.papyrus.infra.core.sashwindows.di.DiPackage#getSashModel_CurrentSelection()

 	 * @model required="true" ordered="false"

 	 * @generated

 	 */

 	TabFolder getCurrentSelection();

 

 	/**

-	 * Sets the value of the ' {@link org.eclipse.papyrus.sashwindows.di.SashModel#getCurrentSelection

+	 * Sets the value of the ' {@link org.eclipse.papyrus.infra.core.sashwindows.di.SashModel#getCurrentSelection

 	 * <em>Current Selection</em>}' reference. <!-- begin-user-doc --> <!--

 	 * end-user-doc -->

 	 * 

@@ -80,7 +80,7 @@ public interface SashModel extends EObject {
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

 	 * 

 	 * @model

-	 *        pageIdentifierDataType="org.eclipse.papyrus.sashwindows.di.JavaObject"

+	 *        pageIdentifierDataType="org.eclipse.papyrus.infra.core.sashwindows.di.JavaObject"

 	 *        pageIdentifierRequired="true" pageIdentifierOrdered="false"

 	 * @generated

 	 */

@@ -90,7 +90,7 @@ public interface SashModel extends EObject {
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

 	 * 

 	 * @model

-	 *        pageIdentifierDataType="org.eclipse.papyrus.sashwindows.di.JavaObject"

+	 *        pageIdentifierDataType="org.eclipse.papyrus.infra.core.sashwindows.di.JavaObject"

 	 *        pageIdentifierRequired="true" pageIdentifierOrdered="false"

 	 * @generated

 	 */

@@ -103,7 +103,7 @@ public interface SashModel extends EObject {
 	 * end-model-doc -->

 	 * 

 	 * @model required="true" ordered="false"

-	 *        pageIdentifierDataType="org.eclipse.papyrus.sashwindows.di.JavaObject"

+	 *        pageIdentifierDataType="org.eclipse.papyrus.infra.core.sashwindows.di.JavaObject"

 	 *        pageIdentifierRequired="true" pageIdentifierOrdered="false"

 	 * @generated

 	 */

@@ -113,7 +113,7 @@ public interface SashModel extends EObject {
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

 	 * 

 	 * @model srcParentFolderRequired="true" srcParentFolderOrdered="false"

-	 *        srcIndexDataType="org.eclipse.papyrus.sashwindows.di.int"

+	 *        srcIndexDataType="org.eclipse.papyrus.infra.core.sashwindows.di.int"

 	 *        srcIndexRequired="true" srcIndexOrdered="false"

 	 *        targetParentFolderRequired="true"

 	 *        targetParentFolderOrdered="false" targetIndexRequired="true"

@@ -136,7 +136,7 @@ public interface SashModel extends EObject {
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

 	 * 

 	 * @model srcParentFolderRequired="true" srcParentFolderOrdered="false"

-	 *        srcIndexDataType="org.eclipse.papyrus.sashwindows.di.int"

+	 *        srcIndexDataType="org.eclipse.papyrus.infra.core.sashwindows.di.int"

 	 *        srcIndexRequired="true" srcIndexOrdered="false"

 	 *        targetParentFolderRequired="true"

 	 *        targetParentFolderOrdered="false"

@@ -168,7 +168,7 @@ public interface SashModel extends EObject {
 	 * folders are also removed. <!-- end-model-doc -->

 	 * 

 	 * @model

-	 *        pageIdentifierDataType="org.eclipse.papyrus.sashwindows.di.JavaObject"

+	 *        pageIdentifierDataType="org.eclipse.papyrus.infra.core.sashwindows.di.JavaObject"

 	 *        pageIdentifierRequired="true" pageIdentifierOrdered="false"

 	 * @generated

 	 */

diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/src/org/eclipse/papyrus/sashwindows/di/SashPanel.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/src/org/eclipse/papyrus/infra/core/sashwindows/di/SashPanel.java
index 5b247621ced..08747641939 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/src/org/eclipse/papyrus/sashwindows/di/SashPanel.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/src/org/eclipse/papyrus/infra/core/sashwindows/di/SashPanel.java
@@ -4,7 +4,7 @@
  *

  * $Id$

  */

-package org.eclipse.papyrus.sashwindows.di;

+package org.eclipse.papyrus.infra.core.sashwindows.di;

 

 /**

  * <!-- begin-user-doc --> A representation of the model object ' <em><b>Sash Panel</b></em>'. <!-- end-user-doc -->

@@ -12,12 +12,12 @@ package org.eclipse.papyrus.sashwindows.di;
  * <p>

  * The following features are supported:

  * <ul>

- * <li>{@link org.eclipse.papyrus.sashwindows.di.SashPanel#getSashPosition <em> Sash Position</em>}</li>

- * <li>{@link org.eclipse.papyrus.sashwindows.di.SashPanel#getDirection <em> Direction</em>}</li>

+ * <li>{@link org.eclipse.papyrus.infra.core.sashwindows.di.SashPanel#getSashPosition <em> Sash Position</em>}</li>

+ * <li>{@link org.eclipse.papyrus.infra.core.sashwindows.di.SashPanel#getDirection <em> Direction</em>}</li>

  * </ul>

  * </p>

  * 

- * @see org.eclipse.papyrus.sashwindows.di.DiPackage#getSashPanel()

+ * @see org.eclipse.papyrus.infra.core.sashwindows.di.DiPackage#getSashPanel()

  * @model

  * @generated

  */

@@ -31,15 +31,15 @@ public interface SashPanel extends AbstractPanel, PanelParent {
 	 * 

 	 * @return the value of the '<em>Sash Position</em>' attribute.

 	 * @see #setSashPosition(float)

-	 * @see org.eclipse.papyrus.sashwindows.di.DiPackage#getSashPanel_SashPosition()

-	 * @model unique="false" dataType="org.eclipse.papyrus.sashwindows.di.Float"

+	 * @see org.eclipse.papyrus.infra.core.sashwindows.di.DiPackage#getSashPanel_SashPosition()

+	 * @model unique="false" dataType="org.eclipse.papyrus.infra.core.sashwindows.di.Float"

 	 *        required="true" ordered="false"

 	 * @generated

 	 */

 	float getSashPosition();

 

 	/**

-	 * Sets the value of the ' {@link org.eclipse.papyrus.sashwindows.di.SashPanel#getSashPosition

+	 * Sets the value of the ' {@link org.eclipse.papyrus.infra.core.sashwindows.di.SashPanel#getSashPosition

 	 * <em>Sash Position</em>}' attribute. <!-- begin-user-doc --> <!--

 	 * end-user-doc -->

 	 * 

@@ -60,14 +60,14 @@ public interface SashPanel extends AbstractPanel, PanelParent {
 	 * 

 	 * @return the value of the '<em>Direction</em>' attribute.

 	 * @see #setDirection(int)

-	 * @see org.eclipse.papyrus.sashwindows.di.DiPackage#getSashPanel_Direction()

+	 * @see org.eclipse.papyrus.infra.core.sashwindows.di.DiPackage#getSashPanel_Direction()

 	 * @model unique="false" required="true" ordered="false"

 	 * @generated

 	 */

 	int getDirection();

 

 	/**

-	 * Sets the value of the ' {@link org.eclipse.papyrus.sashwindows.di.SashPanel#getDirection

+	 * Sets the value of the ' {@link org.eclipse.papyrus.infra.core.sashwindows.di.SashPanel#getDirection

 	 * <em>Direction</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc

 	 * -->

 	 * 

@@ -83,7 +83,7 @@ public interface SashPanel extends AbstractPanel, PanelParent {
 	 * 

 	 * @model leftChildRequired="true" leftChildOrdered="false"

 	 *        rightChildRequired="true" rightChildOrdered="false"

-	 *        directionDataType="org.eclipse.papyrus.sashwindows.di.int"

+	 *        directionDataType="org.eclipse.papyrus.infra.core.sashwindows.di.int"

 	 *        directionRequired="true" directionOrdered="false"

 	 * @generated

 	 */

diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/src/org/eclipse/papyrus/sashwindows/di/SashWindowsMngr.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/src/org/eclipse/papyrus/infra/core/sashwindows/di/SashWindowsMngr.java
index 748f20ad63f..218300d95e6 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/src/org/eclipse/papyrus/sashwindows/di/SashWindowsMngr.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/src/org/eclipse/papyrus/infra/core/sashwindows/di/SashWindowsMngr.java
@@ -4,7 +4,7 @@
  *

  * $Id$

  */

-package org.eclipse.papyrus.sashwindows.di;

+package org.eclipse.papyrus.infra.core.sashwindows.di;

 

 import org.eclipse.emf.ecore.EObject;

 

@@ -14,14 +14,14 @@ import org.eclipse.emf.ecore.EObject;
  * <p>

  * The following features are supported:

  * <ul>

- * <li>{@link org.eclipse.papyrus.sashwindows.di.SashWindowsMngr#getPageList

+ * <li>{@link org.eclipse.papyrus.infra.core.sashwindows.di.SashWindowsMngr#getPageList

  * <em>Page List</em>}</li>

- * <li>{@link org.eclipse.papyrus.sashwindows.di.SashWindowsMngr#getSashModel

+ * <li>{@link org.eclipse.papyrus.infra.core.sashwindows.di.SashWindowsMngr#getSashModel

  * <em>Sash Model</em>}</li>

  * </ul>

  * </p>

  * 

- * @see org.eclipse.papyrus.sashwindows.di.DiPackage#getSashWindowsMngr()

+ * @see org.eclipse.papyrus.infra.core.sashwindows.di.DiPackage#getSashWindowsMngr()

  * @model

  * @generated

  */

@@ -37,14 +37,14 @@ public interface SashWindowsMngr extends EObject {
 	 * 

 	 * @return the value of the '<em>Page List</em>' containment reference.

 	 * @see #setPageList(PageList)

-	 * @see org.eclipse.papyrus.sashwindows.di.DiPackage#getSashWindowsMngr_PageList()

+	 * @see org.eclipse.papyrus.infra.core.sashwindows.di.DiPackage#getSashWindowsMngr_PageList()

 	 * @model containment="true" required="true" ordered="false"

 	 * @generated

 	 */

 	PageList getPageList();

 

 	/**

-	 * Sets the value of the ' {@link org.eclipse.papyrus.sashwindows.di.SashWindowsMngr#getPageList

+	 * Sets the value of the ' {@link org.eclipse.papyrus.infra.core.sashwindows.di.SashWindowsMngr#getPageList

 	 * <em>Page List</em>}' containment reference. <!-- begin-user-doc --> <!--

 	 * end-user-doc -->

 	 * 

@@ -66,14 +66,14 @@ public interface SashWindowsMngr extends EObject {
 	 * 

 	 * @return the value of the '<em>Sash Model</em>' containment reference.

 	 * @see #setSashModel(SashModel)

-	 * @see org.eclipse.papyrus.sashwindows.di.DiPackage#getSashWindowsMngr_SashModel()

+	 * @see org.eclipse.papyrus.infra.core.sashwindows.di.DiPackage#getSashWindowsMngr_SashModel()

 	 * @model containment="true" required="true" ordered="false"

 	 * @generated

 	 */

 	SashModel getSashModel();

 

 	/**

-	 * Sets the value of the ' {@link org.eclipse.papyrus.sashwindows.di.SashWindowsMngr#getSashModel

+	 * Sets the value of the ' {@link org.eclipse.papyrus.infra.core.sashwindows.di.SashWindowsMngr#getSashModel

 	 * <em>Sash Model</em>}' containment reference. <!-- begin-user-doc --> <!--

 	 * end-user-doc -->

 	 * 

diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/src/org/eclipse/papyrus/sashwindows/di/Size.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/src/org/eclipse/papyrus/infra/core/sashwindows/di/Size.java
index 68181915663..a4e30ccc3a2 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/src/org/eclipse/papyrus/sashwindows/di/Size.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/src/org/eclipse/papyrus/infra/core/sashwindows/di/Size.java
@@ -4,7 +4,7 @@
  *

  * $Id$

  */

-package org.eclipse.papyrus.sashwindows.di;

+package org.eclipse.papyrus.infra.core.sashwindows.di;

 

 import org.eclipse.emf.ecore.EObject;

 

@@ -14,12 +14,12 @@ import org.eclipse.emf.ecore.EObject;
  * <p>

  * The following features are supported:

  * <ul>

- * <li>{@link org.eclipse.papyrus.sashwindows.di.Size#getWidth <em>Width</em>}</li>

- * <li>{@link org.eclipse.papyrus.sashwindows.di.Size#getLength <em>Length</em>}</li>

+ * <li>{@link org.eclipse.papyrus.infra.core.sashwindows.di.Size#getWidth <em>Width</em>}</li>

+ * <li>{@link org.eclipse.papyrus.infra.core.sashwindows.di.Size#getLength <em>Length</em>}</li>

  * </ul>

  * </p>

  * 

- * @see org.eclipse.papyrus.sashwindows.di.DiPackage#getSize()

+ * @see org.eclipse.papyrus.infra.core.sashwindows.di.DiPackage#getSize()

  * @model

  * @generated

  */

@@ -35,15 +35,15 @@ public interface Size extends EObject {
 	 * 

 	 * @return the value of the '<em>Width</em>' attribute.

 	 * @see #setWidth(int)

-	 * @see org.eclipse.papyrus.sashwindows.di.DiPackage#getSize_Width()

-	 * @model unique="false" dataType="org.eclipse.papyrus.sashwindows.di.int"

+	 * @see org.eclipse.papyrus.infra.core.sashwindows.di.DiPackage#getSize_Width()

+	 * @model unique="false" dataType="org.eclipse.papyrus.infra.core.sashwindows.di.int"

 	 *        required="true" ordered="false"

 	 * @generated

 	 */

 	int getWidth();

 

 	/**

-	 * Sets the value of the ' {@link org.eclipse.papyrus.sashwindows.di.Size#getWidth <em>Width</em>}'

+	 * Sets the value of the ' {@link org.eclipse.papyrus.infra.core.sashwindows.di.Size#getWidth <em>Width</em>}'

 	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->

 	 * 

 	 * @param value

@@ -63,15 +63,15 @@ public interface Size extends EObject {
 	 * 

 	 * @return the value of the '<em>Length</em>' attribute.

 	 * @see #setLength(int)

-	 * @see org.eclipse.papyrus.sashwindows.di.DiPackage#getSize_Length()

-	 * @model unique="false" dataType="org.eclipse.papyrus.sashwindows.di.int"

+	 * @see org.eclipse.papyrus.infra.core.sashwindows.di.DiPackage#getSize_Length()

+	 * @model unique="false" dataType="org.eclipse.papyrus.infra.core.sashwindows.di.int"

 	 *        required="true" ordered="false"

 	 * @generated

 	 */

 	int getLength();

 

 	/**

-	 * Sets the value of the ' {@link org.eclipse.papyrus.sashwindows.di.Size#getLength <em>Length</em>} ' attribute. <!-- begin-user-doc --> <!--

+	 * Sets the value of the ' {@link org.eclipse.papyrus.infra.core.sashwindows.di.Size#getLength <em>Length</em>} ' attribute. <!-- begin-user-doc --> <!--

 	 * end-user-doc -->

 	 * 

 	 * @param value

diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/src/org/eclipse/papyrus/sashwindows/di/TabFolder.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/src/org/eclipse/papyrus/infra/core/sashwindows/di/TabFolder.java
index 404bf40d269..bfc408fd610 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/src/org/eclipse/papyrus/sashwindows/di/TabFolder.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/src/org/eclipse/papyrus/infra/core/sashwindows/di/TabFolder.java
@@ -4,7 +4,7 @@
  *

  * $Id$

  */

-package org.eclipse.papyrus.sashwindows.di;

+package org.eclipse.papyrus.infra.core.sashwindows.di;

 

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

 

@@ -14,11 +14,11 @@ import org.eclipse.emf.common.util.EList;
  * <p>

  * The following features are supported:

  * <ul>

- * <li>{@link org.eclipse.papyrus.sashwindows.di.TabFolder#getChildren <em> Children</em>}</li>

+ * <li>{@link org.eclipse.papyrus.infra.core.sashwindows.di.TabFolder#getChildren <em> Children</em>}</li>

  * </ul>

  * </p>

  * 

- * @see org.eclipse.papyrus.sashwindows.di.DiPackage#getTabFolder()

+ * @see org.eclipse.papyrus.infra.core.sashwindows.di.DiPackage#getTabFolder()

  * @model

  * @generated

  */

@@ -26,8 +26,8 @@ public interface TabFolder extends AbstractPanel {
 

 	/**

 	 * Returns the value of the '<em><b>Children</b></em>' containment reference

-	 * list. The list contents are of type {@link org.eclipse.papyrus.sashwindows.di.PageRef}. It is bidirectional

-	 * and its opposite is ' {@link org.eclipse.papyrus.sashwindows.di.PageRef#getParent

+	 * list. The list contents are of type {@link org.eclipse.papyrus.infra.core.sashwindows.di.PageRef}. It is bidirectional

+	 * and its opposite is ' {@link org.eclipse.papyrus.infra.core.sashwindows.di.PageRef#getParent

 	 * <em>Parent</em>}'. <!-- begin-user-doc -->

 	 * <p>

 	 * If the meaning of the '<em>Children</em>' containment reference list isn't clear, there really should be more of a description here...

@@ -35,8 +35,8 @@ public interface TabFolder extends AbstractPanel {
 	 * <!-- end-user-doc -->

 	 * 

 	 * @return the value of the '<em>Children</em>' containment reference list.

-	 * @see org.eclipse.papyrus.sashwindows.di.DiPackage#getTabFolder_Children()

-	 * @see org.eclipse.papyrus.sashwindows.di.PageRef#getParent

+	 * @see org.eclipse.papyrus.infra.core.sashwindows.di.DiPackage#getTabFolder_Children()

+	 * @see org.eclipse.papyrus.infra.core.sashwindows.di.PageRef#getParent

 	 * @model opposite="parent" containment="true" ordered="false"

 	 * @generated

 	 */

@@ -46,7 +46,7 @@ public interface TabFolder extends AbstractPanel {
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

 	 * 

 	 * @model oldIndexRequired="true" oldIndexOrdered="false"

-	 *        newIndexDataType="org.eclipse.papyrus.sashwindows.di.int"

+	 *        newIndexDataType="org.eclipse.papyrus.infra.core.sashwindows.di.int"

 	 *        newIndexRequired="true" newIndexOrdered="false"

 	 * @generated

 	 */

@@ -56,7 +56,7 @@ public interface TabFolder extends AbstractPanel {
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

 	 * 

 	 * @model

-	 *        pageIdentifierDataType="org.eclipse.papyrus.sashwindows.di.JavaObject"

+	 *        pageIdentifierDataType="org.eclipse.papyrus.infra.core.sashwindows.di.JavaObject"

 	 *        pageIdentifierRequired="true" pageIdentifierOrdered="false"

 	 * @generated

 	 */

@@ -65,7 +65,7 @@ public interface TabFolder extends AbstractPanel {
 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

 	 * 

-	 * @model pageIndexDataType="org.eclipse.papyrus.sashwindows.di.int"

+	 * @model pageIndexDataType="org.eclipse.papyrus.infra.core.sashwindows.di.int"

 	 *        pageIndexRequired="true" pageIndexOrdered="false"

 	 * @generated

 	 */

diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/src/org/eclipse/papyrus/sashwindows/di/Window.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/src/org/eclipse/papyrus/infra/core/sashwindows/di/Window.java
index 258468affef..3bb74b64838 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/src/org/eclipse/papyrus/sashwindows/di/Window.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/src/org/eclipse/papyrus/infra/core/sashwindows/di/Window.java
@@ -4,7 +4,7 @@
  *

  * $Id$

  */

-package org.eclipse.papyrus.sashwindows.di;

+package org.eclipse.papyrus.infra.core.sashwindows.di;

 

 /**

  * <!-- begin-user-doc --> A representation of the model object ' <em><b>Window</b></em>'. <!-- end-user-doc -->

@@ -12,13 +12,13 @@ package org.eclipse.papyrus.sashwindows.di;
  * <p>

  * The following features are supported:

  * <ul>

- * <li>{@link org.eclipse.papyrus.sashwindows.di.Window#getPosition <em>Position </em>}</li>

- * <li>{@link org.eclipse.papyrus.sashwindows.di.Window#getSize <em>Size</em>}</li>

- * <li>{@link org.eclipse.papyrus.sashwindows.di.Window#getPanel <em>Panel</em>}</li>

+ * <li>{@link org.eclipse.papyrus.infra.core.sashwindows.di.Window#getPosition <em>Position </em>}</li>

+ * <li>{@link org.eclipse.papyrus.infra.core.sashwindows.di.Window#getSize <em>Size</em>}</li>

+ * <li>{@link org.eclipse.papyrus.infra.core.sashwindows.di.Window#getPanel <em>Panel</em>}</li>

  * </ul>

  * </p>

  * 

- * @see org.eclipse.papyrus.sashwindows.di.DiPackage#getWindow()

+ * @see org.eclipse.papyrus.infra.core.sashwindows.di.DiPackage#getWindow()

  * @model

  * @generated

  */

@@ -34,14 +34,14 @@ public interface Window extends PanelParent {
 	 * 

 	 * @return the value of the '<em>Position</em>' reference.

 	 * @see #setPosition(Position)

-	 * @see org.eclipse.papyrus.sashwindows.di.DiPackage#getWindow_Position()

+	 * @see org.eclipse.papyrus.infra.core.sashwindows.di.DiPackage#getWindow_Position()

 	 * @model required="true" ordered="false"

 	 * @generated

 	 */

 	Position getPosition();

 

 	/**

-	 * Sets the value of the ' {@link org.eclipse.papyrus.sashwindows.di.Window#getPosition

+	 * Sets the value of the ' {@link org.eclipse.papyrus.infra.core.sashwindows.di.Window#getPosition

 	 * <em>Position</em>}' reference. <!-- begin-user-doc --> <!-- end-user-doc

 	 * -->

 	 * 

@@ -62,14 +62,14 @@ public interface Window extends PanelParent {
 	 * 

 	 * @return the value of the '<em>Size</em>' reference.

 	 * @see #setSize(Size)

-	 * @see org.eclipse.papyrus.sashwindows.di.DiPackage#getWindow_Size()

+	 * @see org.eclipse.papyrus.infra.core.sashwindows.di.DiPackage#getWindow_Size()

 	 * @model required="true" ordered="false"

 	 * @generated

 	 */

 	Size getSize();

 

 	/**

-	 * Sets the value of the ' {@link org.eclipse.papyrus.sashwindows.di.Window#getSize <em>Size</em>}'

+	 * Sets the value of the ' {@link org.eclipse.papyrus.infra.core.sashwindows.di.Window#getSize <em>Size</em>}'

 	 * reference. <!-- begin-user-doc --> <!-- end-user-doc -->

 	 * 

 	 * @param value

@@ -86,7 +86,7 @@ public interface Window extends PanelParent {
 	 * 

 	 * @return the value of the '<em>Panel</em>' reference.

 	 * @see #setPanel(AbstractPanel)

-	 * @see org.eclipse.papyrus.sashwindows.di.DiPackage#getWindow_Panel()

+	 * @see org.eclipse.papyrus.infra.core.sashwindows.di.DiPackage#getWindow_Panel()

 	 * @model required="true" transient="true" volatile="true" derived="true"

 	 *        ordered="false"

 	 * @generated

@@ -94,7 +94,7 @@ public interface Window extends PanelParent {
 	AbstractPanel getPanel();

 

 	/**

-	 * Sets the value of the ' {@link org.eclipse.papyrus.sashwindows.di.Window#getPanel <em>Panel</em>} ' reference. <!-- begin-user-doc --> <!--

+	 * Sets the value of the ' {@link org.eclipse.papyrus.infra.core.sashwindows.di.Window#getPanel <em>Panel</em>} ' reference. <!-- begin-user-doc --> <!--

 	 * end-user-doc -->

 	 * 

 	 * @param value

diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/src/org/eclipse/papyrus/sashwindows/di/exception/SashEditorException.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/src/org/eclipse/papyrus/infra/core/sashwindows/di/exception/SashEditorException.java
index 886dbac1bda..20ba87d3952 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/src/org/eclipse/papyrus/sashwindows/di/exception/SashEditorException.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/src/org/eclipse/papyrus/infra/core/sashwindows/di/exception/SashEditorException.java
@@ -11,7 +11,7 @@
  *  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation

  *

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

-package org.eclipse.papyrus.sashwindows.di.exception;

+package org.eclipse.papyrus.infra.core.sashwindows.di.exception;

 

 /**

  * Exception for the Sash editor system

diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/src/org/eclipse/papyrus/sashwindows/di/impl/AbstractPageImpl.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/src/org/eclipse/papyrus/infra/core/sashwindows/di/impl/AbstractPageImpl.java
index e23205ce530..eb8526e617d 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/src/org/eclipse/papyrus/sashwindows/di/impl/AbstractPageImpl.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/src/org/eclipse/papyrus/infra/core/sashwindows/di/impl/AbstractPageImpl.java
@@ -4,14 +4,14 @@
  *

  * $Id$

  */

-package org.eclipse.papyrus.sashwindows.di.impl;

+package org.eclipse.papyrus.infra.core.sashwindows.di.impl;

 

 import org.eclipse.emf.common.notify.Notification;

 import org.eclipse.emf.ecore.EClass;

 import org.eclipse.emf.ecore.impl.ENotificationImpl;

 import org.eclipse.emf.ecore.impl.EObjectImpl;

-import org.eclipse.papyrus.sashwindows.di.AbstractPage;

-import org.eclipse.papyrus.sashwindows.di.DiPackage;

+import org.eclipse.papyrus.infra.core.sashwindows.di.AbstractPage;

+import org.eclipse.papyrus.infra.core.sashwindows.di.DiPackage;

 

 /**

  * <!-- begin-user-doc --> An implementation of the model object ' <em><b>Abstract Page</b></em>'. <!-- end-user-doc -->

@@ -19,7 +19,7 @@ import org.eclipse.papyrus.sashwindows.di.DiPackage;
  * The following features are implemented:

  * <ul>

  * <li>

- * {@link org.eclipse.papyrus.sashwindows.di.impl.AbstractPageImpl#getPageIdentifier

+ * {@link org.eclipse.papyrus.infra.core.sashwindows.di.impl.AbstractPageImpl#getPageIdentifier

  * <em>Page Identifier</em>}</li>

  * </ul>

  * </p>

diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/src/org/eclipse/papyrus/sashwindows/di/impl/AbstractPanelImpl.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/src/org/eclipse/papyrus/infra/core/sashwindows/di/impl/AbstractPanelImpl.java
index b0ebf5d9571..39ee2c1ffbd 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/src/org/eclipse/papyrus/sashwindows/di/impl/AbstractPanelImpl.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/src/org/eclipse/papyrus/infra/core/sashwindows/di/impl/AbstractPanelImpl.java
@@ -4,7 +4,7 @@
  *

  * $Id$

  */

-package org.eclipse.papyrus.sashwindows.di.impl;

+package org.eclipse.papyrus.infra.core.sashwindows.di.impl;

 

 import org.eclipse.emf.common.notify.Notification;

 import org.eclipse.emf.common.notify.NotificationChain;

@@ -13,9 +13,9 @@ import org.eclipse.emf.ecore.InternalEObject;
 import org.eclipse.emf.ecore.impl.ENotificationImpl;

 import org.eclipse.emf.ecore.impl.EObjectImpl;

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

-import org.eclipse.papyrus.sashwindows.di.AbstractPanel;

-import org.eclipse.papyrus.sashwindows.di.DiPackage;

-import org.eclipse.papyrus.sashwindows.di.PanelParent;

+import org.eclipse.papyrus.infra.core.sashwindows.di.AbstractPanel;

+import org.eclipse.papyrus.infra.core.sashwindows.di.DiPackage;

+import org.eclipse.papyrus.infra.core.sashwindows.di.PanelParent;

 

 /**

  * <!-- begin-user-doc --> An implementation of the model object ' <em><b>Abstract Panel</b></em>'. <!-- end-user-doc -->

@@ -23,7 +23,7 @@ import org.eclipse.papyrus.sashwindows.di.PanelParent;
  * The following features are implemented:

  * <ul>

  * <li>

- * {@link org.eclipse.papyrus.sashwindows.di.impl.AbstractPanelImpl#getParent

+ * {@link org.eclipse.papyrus.infra.core.sashwindows.di.impl.AbstractPanelImpl#getParent

  * <em>Parent</em>}</li>

  * </ul>

  * </p>

diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/src/org/eclipse/papyrus/sashwindows/di/impl/DiFactoryImpl.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/src/org/eclipse/papyrus/infra/core/sashwindows/di/impl/DiFactoryImpl.java
index 4d5899f3956..9366bb5323d 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/src/org/eclipse/papyrus/sashwindows/di/impl/DiFactoryImpl.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/src/org/eclipse/papyrus/infra/core/sashwindows/di/impl/DiFactoryImpl.java
@@ -4,7 +4,7 @@
  *

  * $Id$

  */

-package org.eclipse.papyrus.sashwindows.di.impl;

+package org.eclipse.papyrus.infra.core.sashwindows.di.impl;

 

 import org.eclipse.emf.ecore.EClass;

 import org.eclipse.emf.ecore.EDataType;

@@ -12,18 +12,18 @@ import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.EPackage;

 import org.eclipse.emf.ecore.impl.EFactoryImpl;

 import org.eclipse.emf.ecore.plugin.EcorePlugin;

-import org.eclipse.papyrus.sashwindows.di.AbstractPage;

-import org.eclipse.papyrus.sashwindows.di.DiFactory;

-import org.eclipse.papyrus.sashwindows.di.DiPackage;

-import org.eclipse.papyrus.sashwindows.di.PageList;

-import org.eclipse.papyrus.sashwindows.di.PageRef;

-import org.eclipse.papyrus.sashwindows.di.Position;

-import org.eclipse.papyrus.sashwindows.di.SashModel;

-import org.eclipse.papyrus.sashwindows.di.SashPanel;

-import org.eclipse.papyrus.sashwindows.di.SashWindowsMngr;

-import org.eclipse.papyrus.sashwindows.di.Size;

-import org.eclipse.papyrus.sashwindows.di.TabFolder;

-import org.eclipse.papyrus.sashwindows.di.Window;

+import org.eclipse.papyrus.infra.core.sashwindows.di.AbstractPage;

+import org.eclipse.papyrus.infra.core.sashwindows.di.DiFactory;

+import org.eclipse.papyrus.infra.core.sashwindows.di.DiPackage;

+import org.eclipse.papyrus.infra.core.sashwindows.di.PageList;

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

+import org.eclipse.papyrus.infra.core.sashwindows.di.Position;

+import org.eclipse.papyrus.infra.core.sashwindows.di.SashModel;

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

+import org.eclipse.papyrus.infra.core.sashwindows.di.SashWindowsMngr;

+import org.eclipse.papyrus.infra.core.sashwindows.di.Size;

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

+import org.eclipse.papyrus.infra.core.sashwindows.di.Window;

 

 /**

  * <!-- begin-user-doc --> An implementation of the model <b>Factory</b>. <!--

diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/src/org/eclipse/papyrus/sashwindows/di/impl/DiPackageImpl.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/src/org/eclipse/papyrus/infra/core/sashwindows/di/impl/DiPackageImpl.java
index 186f5db9175..5ed10305a5c 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/src/org/eclipse/papyrus/sashwindows/di/impl/DiPackageImpl.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/src/org/eclipse/papyrus/infra/core/sashwindows/di/impl/DiPackageImpl.java
@@ -4,7 +4,7 @@
  *

  * $Id$

  */

-package org.eclipse.papyrus.sashwindows.di.impl;

+package org.eclipse.papyrus.infra.core.sashwindows.di.impl;

 

 import org.eclipse.emf.ecore.EAttribute;

 import org.eclipse.emf.ecore.EClass;

@@ -14,20 +14,20 @@ import org.eclipse.emf.ecore.EPackage;
 import org.eclipse.emf.ecore.EReference;

 import org.eclipse.emf.ecore.EcorePackage;

 import org.eclipse.emf.ecore.impl.EPackageImpl;

-import org.eclipse.papyrus.sashwindows.di.AbstractPage;

-import org.eclipse.papyrus.sashwindows.di.AbstractPanel;

-import org.eclipse.papyrus.sashwindows.di.DiFactory;

-import org.eclipse.papyrus.sashwindows.di.DiPackage;

-import org.eclipse.papyrus.sashwindows.di.PageList;

-import org.eclipse.papyrus.sashwindows.di.PageRef;

-import org.eclipse.papyrus.sashwindows.di.PanelParent;

-import org.eclipse.papyrus.sashwindows.di.Position;

-import org.eclipse.papyrus.sashwindows.di.SashModel;

-import org.eclipse.papyrus.sashwindows.di.SashPanel;

-import org.eclipse.papyrus.sashwindows.di.SashWindowsMngr;

-import org.eclipse.papyrus.sashwindows.di.Size;

-import org.eclipse.papyrus.sashwindows.di.TabFolder;

-import org.eclipse.papyrus.sashwindows.di.Window;

+import org.eclipse.papyrus.infra.core.sashwindows.di.AbstractPage;

+import org.eclipse.papyrus.infra.core.sashwindows.di.AbstractPanel;

+import org.eclipse.papyrus.infra.core.sashwindows.di.DiFactory;

+import org.eclipse.papyrus.infra.core.sashwindows.di.DiPackage;

+import org.eclipse.papyrus.infra.core.sashwindows.di.PageList;

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

+import org.eclipse.papyrus.infra.core.sashwindows.di.PanelParent;

+import org.eclipse.papyrus.infra.core.sashwindows.di.Position;

+import org.eclipse.papyrus.infra.core.sashwindows.di.SashModel;

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

+import org.eclipse.papyrus.infra.core.sashwindows.di.SashWindowsMngr;

+import org.eclipse.papyrus.infra.core.sashwindows.di.Size;

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

+import org.eclipse.papyrus.infra.core.sashwindows.di.Window;

 

 /**

  * <!-- begin-user-doc --> An implementation of the model <b>Package</b>. <!--

@@ -157,7 +157,7 @@ public class DiPackageImpl extends EPackageImpl implements DiPackage {
 	 * package, or returns the registered package, if one already exists. <!-- begin-user-doc --> <!-- end-user-doc -->

 	 * 

 	 * @see org.eclipse.emf.ecore.EPackage.Registry

-	 * @see org.eclipse.papyrus.sashwindows.di.DiPackage#eNS_URI

+	 * @see org.eclipse.papyrus.infra.core.sashwindows.di.DiPackage#eNS_URI

 	 * @see #init()

 	 * @generated

 	 */

diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/src/org/eclipse/papyrus/sashwindows/di/impl/PageListImpl.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/src/org/eclipse/papyrus/infra/core/sashwindows/di/impl/PageListImpl.java
index 6892142dd75..15f359aa0a4 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/src/org/eclipse/papyrus/sashwindows/di/impl/PageListImpl.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/src/org/eclipse/papyrus/infra/core/sashwindows/di/impl/PageListImpl.java
@@ -4,7 +4,7 @@
  *

  * $Id$

  */

-package org.eclipse.papyrus.sashwindows.di.impl;

+package org.eclipse.papyrus.infra.core.sashwindows.di.impl;

 

 import java.util.Collection;

 

@@ -15,10 +15,10 @@ import org.eclipse.emf.ecore.InternalEObject;
 import org.eclipse.emf.ecore.impl.EObjectImpl;

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

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

-import org.eclipse.papyrus.sashwindows.di.DiFactory;

-import org.eclipse.papyrus.sashwindows.di.DiPackage;

-import org.eclipse.papyrus.sashwindows.di.PageList;

-import org.eclipse.papyrus.sashwindows.di.PageRef;

+import org.eclipse.papyrus.infra.core.sashwindows.di.DiFactory;

+import org.eclipse.papyrus.infra.core.sashwindows.di.DiPackage;

+import org.eclipse.papyrus.infra.core.sashwindows.di.PageList;

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

 

 /**

  * <!-- begin-user-doc --> An implementation of the model object ' <em><b>Page List</b></em>'. <!-- end-user-doc -->

@@ -26,7 +26,7 @@ import org.eclipse.papyrus.sashwindows.di.PageRef;
  * The following features are implemented:

  * <ul>

  * <li>

- * {@link org.eclipse.papyrus.sashwindows.di.impl.PageListImpl#getAvailablePage

+ * {@link org.eclipse.papyrus.infra.core.sashwindows.di.impl.PageListImpl#getAvailablePage

  * <em>Available Page</em>}</li>

  * </ul>

  * </p>

diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/src/org/eclipse/papyrus/sashwindows/di/impl/PageRefImpl.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/src/org/eclipse/papyrus/infra/core/sashwindows/di/impl/PageRefImpl.java
index 5cac4e48c5c..18e137e3b86 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/src/org/eclipse/papyrus/sashwindows/di/impl/PageRefImpl.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/src/org/eclipse/papyrus/infra/core/sashwindows/di/impl/PageRefImpl.java
@@ -4,7 +4,7 @@
  *

  * $Id$

  */

-package org.eclipse.papyrus.sashwindows.di.impl;

+package org.eclipse.papyrus.infra.core.sashwindows.di.impl;

 

 import org.eclipse.emf.common.notify.Notification;

 import org.eclipse.emf.common.notify.NotificationChain;

@@ -14,9 +14,9 @@ import org.eclipse.emf.ecore.InternalEObject;
 import org.eclipse.emf.ecore.impl.ENotificationImpl;

 import org.eclipse.emf.ecore.impl.EObjectImpl;

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

-import org.eclipse.papyrus.sashwindows.di.DiPackage;

-import org.eclipse.papyrus.sashwindows.di.PageRef;

-import org.eclipse.papyrus.sashwindows.di.TabFolder;

+import org.eclipse.papyrus.infra.core.sashwindows.di.DiPackage;

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

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

 

 /**

  * <!-- begin-user-doc --> An implementation of the model object ' <em><b>Page Ref</b></em>'. <!-- end-user-doc -->

@@ -24,15 +24,15 @@ import org.eclipse.papyrus.sashwindows.di.TabFolder;
  * The following features are implemented:

  * <ul>

  * <li>

- * {@link org.eclipse.papyrus.sashwindows.di.impl.PageRefImpl#getEmfPageIdentifier

+ * {@link org.eclipse.papyrus.infra.core.sashwindows.di.impl.PageRefImpl#getEmfPageIdentifier

  * <em>Emf Page Identifier</em>}</li>

  * <li>

- * {@link org.eclipse.papyrus.sashwindows.di.impl.PageRefImpl#getPageIdentifier

+ * {@link org.eclipse.papyrus.infra.core.sashwindows.di.impl.PageRefImpl#getPageIdentifier

  * <em>Page Identifier</em>}</li>

  * <li>

- * {@link org.eclipse.papyrus.sashwindows.di.impl.PageRefImpl#getObjectPageIdentifier

+ * {@link org.eclipse.papyrus.infra.core.sashwindows.di.impl.PageRefImpl#getObjectPageIdentifier

  * <em>Object Page Identifier</em>}</li>

- * <li>{@link org.eclipse.papyrus.sashwindows.di.impl.PageRefImpl#getParent <em> Parent</em>}</li>

+ * <li>{@link org.eclipse.papyrus.infra.core.sashwindows.di.impl.PageRefImpl#getParent <em> Parent</em>}</li>

  * </ul>

  * </p>

  * 

diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/src/org/eclipse/papyrus/sashwindows/di/impl/PanelParentImpl.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/src/org/eclipse/papyrus/infra/core/sashwindows/di/impl/PanelParentImpl.java
index 7c2267121ff..e70af59c414 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/src/org/eclipse/papyrus/sashwindows/di/impl/PanelParentImpl.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/src/org/eclipse/papyrus/infra/core/sashwindows/di/impl/PanelParentImpl.java
@@ -4,7 +4,7 @@
  *

  * $Id$

  */

-package org.eclipse.papyrus.sashwindows.di.impl;

+package org.eclipse.papyrus.infra.core.sashwindows.di.impl;

 

 import java.util.Collection;

 

@@ -15,9 +15,9 @@ import org.eclipse.emf.ecore.InternalEObject;
 import org.eclipse.emf.ecore.impl.EObjectImpl;

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

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

-import org.eclipse.papyrus.sashwindows.di.AbstractPanel;

-import org.eclipse.papyrus.sashwindows.di.DiPackage;

-import org.eclipse.papyrus.sashwindows.di.PanelParent;

+import org.eclipse.papyrus.infra.core.sashwindows.di.AbstractPanel;

+import org.eclipse.papyrus.infra.core.sashwindows.di.DiPackage;

+import org.eclipse.papyrus.infra.core.sashwindows.di.PanelParent;

 

 /**

  * <!-- begin-user-doc --> An implementation of the model object ' <em><b>Panel Parent</b></em>'. <!-- end-user-doc -->

@@ -25,7 +25,7 @@ import org.eclipse.papyrus.sashwindows.di.PanelParent;
  * The following features are implemented:

  * <ul>

  * <li>

- * {@link org.eclipse.papyrus.sashwindows.di.impl.PanelParentImpl#getChildren

+ * {@link org.eclipse.papyrus.infra.core.sashwindows.di.impl.PanelParentImpl#getChildren

  * <em>Children</em>}</li>

  * </ul>

  * </p>

diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/src/org/eclipse/papyrus/sashwindows/di/impl/PositionImpl.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/src/org/eclipse/papyrus/infra/core/sashwindows/di/impl/PositionImpl.java
index a71cb442356..78d381bfcc5 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/src/org/eclipse/papyrus/sashwindows/di/impl/PositionImpl.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/src/org/eclipse/papyrus/infra/core/sashwindows/di/impl/PositionImpl.java
@@ -4,22 +4,22 @@
  *

  * $Id$

  */

-package org.eclipse.papyrus.sashwindows.di.impl;

+package org.eclipse.papyrus.infra.core.sashwindows.di.impl;

 

 import org.eclipse.emf.common.notify.Notification;

 import org.eclipse.emf.ecore.EClass;

 import org.eclipse.emf.ecore.impl.ENotificationImpl;

 import org.eclipse.emf.ecore.impl.EObjectImpl;

-import org.eclipse.papyrus.sashwindows.di.DiPackage;

-import org.eclipse.papyrus.sashwindows.di.Position;

+import org.eclipse.papyrus.infra.core.sashwindows.di.DiPackage;

+import org.eclipse.papyrus.infra.core.sashwindows.di.Position;

 

 /**

  * <!-- begin-user-doc --> An implementation of the model object ' <em><b>Position</b></em>'. <!-- end-user-doc -->

  * <p>

  * The following features are implemented:

  * <ul>

- * <li>{@link org.eclipse.papyrus.sashwindows.di.impl.PositionImpl#getX <em>X </em>}</li>

- * <li>{@link org.eclipse.papyrus.sashwindows.di.impl.PositionImpl#getY <em>Y </em>}</li>

+ * <li>{@link org.eclipse.papyrus.infra.core.sashwindows.di.impl.PositionImpl#getX <em>X </em>}</li>

+ * <li>{@link org.eclipse.papyrus.infra.core.sashwindows.di.impl.PositionImpl#getY <em>Y </em>}</li>

  * </ul>

  * </p>

  * 

diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/src/org/eclipse/papyrus/sashwindows/di/impl/SashModelImpl.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/src/org/eclipse/papyrus/infra/core/sashwindows/di/impl/SashModelImpl.java
index 90536345fb0..b2d8a843e8a 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/src/org/eclipse/papyrus/sashwindows/di/impl/SashModelImpl.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/src/org/eclipse/papyrus/infra/core/sashwindows/di/impl/SashModelImpl.java
@@ -4,7 +4,7 @@
  *

  * $Id$

  */

-package org.eclipse.papyrus.sashwindows.di.impl;

+package org.eclipse.papyrus.infra.core.sashwindows.di.impl;

 

 import java.util.Collection;

 import java.util.List;

@@ -18,16 +18,16 @@ import org.eclipse.emf.ecore.impl.ENotificationImpl;
 import org.eclipse.emf.ecore.impl.EObjectImpl;

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

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

-import org.eclipse.papyrus.sashwindows.di.AbstractPanel;

-import org.eclipse.papyrus.sashwindows.di.DiFactory;

-import org.eclipse.papyrus.sashwindows.di.DiPackage;

-import org.eclipse.papyrus.sashwindows.di.PageRef;

-import org.eclipse.papyrus.sashwindows.di.PanelParent;

-import org.eclipse.papyrus.sashwindows.di.SashModel;

-import org.eclipse.papyrus.sashwindows.di.SashPanel;

-import org.eclipse.papyrus.sashwindows.di.TabFolder;

-import org.eclipse.papyrus.sashwindows.di.Window;

-import org.eclipse.papyrus.sashwindows.di.util.DiSwitch;

+import org.eclipse.papyrus.infra.core.sashwindows.di.AbstractPanel;

+import org.eclipse.papyrus.infra.core.sashwindows.di.DiFactory;

+import org.eclipse.papyrus.infra.core.sashwindows.di.DiPackage;

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

+import org.eclipse.papyrus.infra.core.sashwindows.di.PanelParent;

+import org.eclipse.papyrus.infra.core.sashwindows.di.SashModel;

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

+import org.eclipse.papyrus.infra.core.sashwindows.di.util.DiSwitch;

 import org.eclipse.swt.SWT;

 

 /**

@@ -35,10 +35,10 @@ import org.eclipse.swt.SWT;
  * <p>

  * The following features are implemented:

  * <ul>

- * <li>{@link org.eclipse.papyrus.sashwindows.di.impl.SashModelImpl#getWindows

+ * <li>{@link org.eclipse.papyrus.infra.core.sashwindows.di.impl.SashModelImpl#getWindows

  * <em>Windows</em>}</li>

  * <li>

- * {@link org.eclipse.papyrus.sashwindows.di.impl.SashModelImpl#getCurrentSelection

+ * {@link org.eclipse.papyrus.infra.core.sashwindows.di.impl.SashModelImpl#getCurrentSelection

  * <em>Current Selection</em>}</li>

  * </ul>

  * </p>

@@ -173,7 +173,7 @@ public class SashModelImpl extends EObjectImpl implements SashModel {
 			/**

 			 * Iterate over windows

 			 * 

-			 * @see org.eclipse.papyrus.sashwindows.di.util.DiSwitch#caseSashModel(org.eclipse.papyrus.sashwindows.di.SashModel)

+			 * @see org.eclipse.papyrus.infra.core.sashwindows.di.util.DiSwitch#caseSashModel(org.eclipse.papyrus.infra.core.sashwindows.di.SashModel)

 			 * 

 			 * @param object

 			 * @return

@@ -191,7 +191,7 @@ public class SashModelImpl extends EObjectImpl implements SashModel {
 

 			/**

 			 * 

-			 * @see org.eclipse.papyrus.sashwindows.di.util.DiSwitch#caseWindow(org.eclipse.papyrus.sashwindows.di.Window)

+			 * @see org.eclipse.papyrus.infra.core.sashwindows.di.util.DiSwitch#caseWindow(org.eclipse.papyrus.infra.core.sashwindows.di.Window)

 			 * 

 			 * @param object

 			 * @return

@@ -212,7 +212,7 @@ public class SashModelImpl extends EObjectImpl implements SashModel {
 			/**

 			 * Iterate over children

 			 * 

-			 * @see org.eclipse.papyrus.sashwindows.di.util.DiSwitch#caseSashPanel(org.eclipse.papyrus.sashwindows.di.SashPanel)

+			 * @see org.eclipse.papyrus.infra.core.sashwindows.di.util.DiSwitch#caseSashPanel(org.eclipse.papyrus.infra.core.sashwindows.di.SashPanel)

 			 * 

 			 * @param object

 			 * @return

@@ -231,7 +231,7 @@ public class SashModelImpl extends EObjectImpl implements SashModel {
 			/**

 			 * Iterate over PageRef

 			 * 

-			 * @see org.eclipse.papyrus.sashwindows.di.util.DiSwitch#caseTabFolder(org.eclipse.papyrus.sashwindows.di.TabFolder)

+			 * @see org.eclipse.papyrus.infra.core.sashwindows.di.util.DiSwitch#caseTabFolder(org.eclipse.papyrus.infra.core.sashwindows.di.TabFolder)

 			 * 

 			 * @param object

 			 * @return

@@ -268,7 +268,7 @@ public class SashModelImpl extends EObjectImpl implements SashModel {
 			/**

 			 * Iterate over windows

 			 * 

-			 * @see org.eclipse.papyrus.sashwindows.di.util.DiSwitch#caseSashModel(org.eclipse.papyrus.sashwindows.di.SashModel)

+			 * @see org.eclipse.papyrus.infra.core.sashwindows.di.util.DiSwitch#caseSashModel(org.eclipse.papyrus.infra.core.sashwindows.di.SashModel)

 			 * 

 			 * @param object

 			 * @return

@@ -286,7 +286,7 @@ public class SashModelImpl extends EObjectImpl implements SashModel {
 

 			/**

 			 * 

-			 * @see org.eclipse.papyrus.sashwindows.di.util.DiSwitch#caseWindow(org.eclipse.papyrus.sashwindows.di.Window)

+			 * @see org.eclipse.papyrus.infra.core.sashwindows.di.util.DiSwitch#caseWindow(org.eclipse.papyrus.infra.core.sashwindows.di.Window)

 			 * 

 			 * @param object

 			 * @return

@@ -307,7 +307,7 @@ public class SashModelImpl extends EObjectImpl implements SashModel {
 			/**

 			 * Iterate over children

 			 * 

-			 * @see org.eclipse.papyrus.sashwindows.di.util.DiSwitch#caseSashPanel(org.eclipse.papyrus.sashwindows.di.SashPanel)

+			 * @see org.eclipse.papyrus.infra.core.sashwindows.di.util.DiSwitch#caseSashPanel(org.eclipse.papyrus.infra.core.sashwindows.di.SashPanel)

 			 * 

 			 * @param object

 			 * @return

@@ -326,7 +326,7 @@ public class SashModelImpl extends EObjectImpl implements SashModel {
 			/**

 			 * Iterate over PageRef

 			 * 

-			 * @see org.eclipse.papyrus.sashwindows.di.util.DiSwitch#caseTabFolder(org.eclipse.papyrus.sashwindows.di.TabFolder)

+			 * @see org.eclipse.papyrus.infra.core.sashwindows.di.util.DiSwitch#caseTabFolder(org.eclipse.papyrus.infra.core.sashwindows.di.TabFolder)

 			 * 

 			 * @param object

 			 * @return

diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/src/org/eclipse/papyrus/sashwindows/di/impl/SashPanelImpl.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/src/org/eclipse/papyrus/infra/core/sashwindows/di/impl/SashPanelImpl.java
index 27785ae9ea0..9e83e63a224 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/src/org/eclipse/papyrus/sashwindows/di/impl/SashPanelImpl.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/src/org/eclipse/papyrus/infra/core/sashwindows/di/impl/SashPanelImpl.java
@@ -4,7 +4,7 @@
  *

  * $Id$

  */

-package org.eclipse.papyrus.sashwindows.di.impl;

+package org.eclipse.papyrus.infra.core.sashwindows.di.impl;

 

 import java.util.Collection;

 import java.util.List;

@@ -17,23 +17,23 @@ import org.eclipse.emf.ecore.InternalEObject;
 import org.eclipse.emf.ecore.impl.ENotificationImpl;

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

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

-import org.eclipse.papyrus.sashwindows.di.AbstractPanel;

-import org.eclipse.papyrus.sashwindows.di.DiPackage;

-import org.eclipse.papyrus.sashwindows.di.PanelParent;

-import org.eclipse.papyrus.sashwindows.di.SashPanel;

+import org.eclipse.papyrus.infra.core.sashwindows.di.AbstractPanel;

+import org.eclipse.papyrus.infra.core.sashwindows.di.DiPackage;

+import org.eclipse.papyrus.infra.core.sashwindows.di.PanelParent;

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

 

 /**

  * <!-- begin-user-doc --> An implementation of the model object ' <em><b>Sash Panel</b></em>'. <!-- end-user-doc -->

  * <p>

  * The following features are implemented:

  * <ul>

- * <li>{@link org.eclipse.papyrus.sashwindows.di.impl.SashPanelImpl#getChildren

+ * <li>{@link org.eclipse.papyrus.infra.core.sashwindows.di.impl.SashPanelImpl#getChildren

  * <em>Children</em>}</li>

  * <li>

- * {@link org.eclipse.papyrus.sashwindows.di.impl.SashPanelImpl#getSashPosition

+ * {@link org.eclipse.papyrus.infra.core.sashwindows.di.impl.SashPanelImpl#getSashPosition

  * <em>Sash Position</em>}</li>

  * <li>

- * {@link org.eclipse.papyrus.sashwindows.di.impl.SashPanelImpl#getDirection

+ * {@link org.eclipse.papyrus.infra.core.sashwindows.di.impl.SashPanelImpl#getDirection

  * <em>Direction</em>}</li>

  * </ul>

  * </p>

diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/src/org/eclipse/papyrus/sashwindows/di/impl/SashWindowsMngrImpl.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/src/org/eclipse/papyrus/infra/core/sashwindows/di/impl/SashWindowsMngrImpl.java
index 5eab0b6166e..4f0d533f750 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/src/org/eclipse/papyrus/sashwindows/di/impl/SashWindowsMngrImpl.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/src/org/eclipse/papyrus/infra/core/sashwindows/di/impl/SashWindowsMngrImpl.java
@@ -4,7 +4,7 @@
  *

  * $Id$

  */

-package org.eclipse.papyrus.sashwindows.di.impl;

+package org.eclipse.papyrus.infra.core.sashwindows.di.impl;

 

 import org.eclipse.emf.common.notify.Notification;

 import org.eclipse.emf.common.notify.NotificationChain;

@@ -12,10 +12,10 @@ import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.InternalEObject;

 import org.eclipse.emf.ecore.impl.ENotificationImpl;

 import org.eclipse.emf.ecore.impl.EObjectImpl;

-import org.eclipse.papyrus.sashwindows.di.DiPackage;

-import org.eclipse.papyrus.sashwindows.di.PageList;

-import org.eclipse.papyrus.sashwindows.di.SashModel;

-import org.eclipse.papyrus.sashwindows.di.SashWindowsMngr;

+import org.eclipse.papyrus.infra.core.sashwindows.di.DiPackage;

+import org.eclipse.papyrus.infra.core.sashwindows.di.PageList;

+import org.eclipse.papyrus.infra.core.sashwindows.di.SashModel;

+import org.eclipse.papyrus.infra.core.sashwindows.di.SashWindowsMngr;

 

 /**

  * <!-- begin-user-doc --> An implementation of the model object ' <em><b>Sash Windows Mngr</b></em>'. <!-- end-user-doc -->

@@ -23,10 +23,10 @@ import org.eclipse.papyrus.sashwindows.di.SashWindowsMngr;
  * The following features are implemented:

  * <ul>

  * <li>

- * {@link org.eclipse.papyrus.sashwindows.di.impl.SashWindowsMngrImpl#getPageList

+ * {@link org.eclipse.papyrus.infra.core.sashwindows.di.impl.SashWindowsMngrImpl#getPageList

  * <em>Page List</em>}</li>

  * <li>

- * {@link org.eclipse.papyrus.sashwindows.di.impl.SashWindowsMngrImpl#getSashModel

+ * {@link org.eclipse.papyrus.infra.core.sashwindows.di.impl.SashWindowsMngrImpl#getSashModel

  * <em>Sash Model</em>}</li>

  * </ul>

  * </p>

diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/src/org/eclipse/papyrus/sashwindows/di/impl/SizeImpl.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/src/org/eclipse/papyrus/infra/core/sashwindows/di/impl/SizeImpl.java
index c9f21d134b5..f63082fc72d 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/src/org/eclipse/papyrus/sashwindows/di/impl/SizeImpl.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/src/org/eclipse/papyrus/infra/core/sashwindows/di/impl/SizeImpl.java
@@ -4,22 +4,22 @@
  *

  * $Id$

  */

-package org.eclipse.papyrus.sashwindows.di.impl;

+package org.eclipse.papyrus.infra.core.sashwindows.di.impl;

 

 import org.eclipse.emf.common.notify.Notification;

 import org.eclipse.emf.ecore.EClass;

 import org.eclipse.emf.ecore.impl.ENotificationImpl;

 import org.eclipse.emf.ecore.impl.EObjectImpl;

-import org.eclipse.papyrus.sashwindows.di.DiPackage;

-import org.eclipse.papyrus.sashwindows.di.Size;

+import org.eclipse.papyrus.infra.core.sashwindows.di.DiPackage;

+import org.eclipse.papyrus.infra.core.sashwindows.di.Size;

 

 /**

  * <!-- begin-user-doc --> An implementation of the model object ' <em><b>Size</b></em>'. <!-- end-user-doc -->

  * <p>

  * The following features are implemented:

  * <ul>

- * <li>{@link org.eclipse.papyrus.sashwindows.di.impl.SizeImpl#getWidth <em> Width</em>}</li>

- * <li>{@link org.eclipse.papyrus.sashwindows.di.impl.SizeImpl#getLength <em> Length</em>}</li>

+ * <li>{@link org.eclipse.papyrus.infra.core.sashwindows.di.impl.SizeImpl#getWidth <em> Width</em>}</li>

+ * <li>{@link org.eclipse.papyrus.infra.core.sashwindows.di.impl.SizeImpl#getLength <em> Length</em>}</li>

  * </ul>

  * </p>

  * 

diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/src/org/eclipse/papyrus/sashwindows/di/impl/TabFolderImpl.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/src/org/eclipse/papyrus/infra/core/sashwindows/di/impl/TabFolderImpl.java
index d34ae761bd8..2cfb025f9f4 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/src/org/eclipse/papyrus/sashwindows/di/impl/TabFolderImpl.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/src/org/eclipse/papyrus/infra/core/sashwindows/di/impl/TabFolderImpl.java
@@ -4,7 +4,7 @@
  *

  * $Id$

  */

-package org.eclipse.papyrus.sashwindows.di.impl;

+package org.eclipse.papyrus.infra.core.sashwindows.di.impl;

 

 import java.util.Collection;

 

@@ -14,17 +14,17 @@ import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.InternalEObject;

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

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

-import org.eclipse.papyrus.sashwindows.di.DiFactory;

-import org.eclipse.papyrus.sashwindows.di.DiPackage;

-import org.eclipse.papyrus.sashwindows.di.PageRef;

-import org.eclipse.papyrus.sashwindows.di.TabFolder;

+import org.eclipse.papyrus.infra.core.sashwindows.di.DiFactory;

+import org.eclipse.papyrus.infra.core.sashwindows.di.DiPackage;

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

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

 

 /**

  * <!-- begin-user-doc --> An implementation of the model object ' <em><b>Tab Folder</b></em>'. <!-- end-user-doc -->

  * <p>

  * The following features are implemented:

  * <ul>

- * <li>{@link org.eclipse.papyrus.sashwindows.di.impl.TabFolderImpl#getChildren

+ * <li>{@link org.eclipse.papyrus.infra.core.sashwindows.di.impl.TabFolderImpl#getChildren

  * <em>Children</em>}</li>

  * </ul>

  * </p>

@@ -185,7 +185,7 @@ public class TabFolderImpl extends AbstractPanelImpl implements TabFolder {
 

 	/**

 	 * 

-	 * @see org.eclipse.papyrus.sashwindows.di.TabFolder#movePage(int, int)

+	 * @see org.eclipse.papyrus.infra.core.sashwindows.di.TabFolder#movePage(int, int)

 	 * 

 	 * @param oldIndex

 	 * @param newIndex

diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/src/org/eclipse/papyrus/sashwindows/di/impl/WindowImpl.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/src/org/eclipse/papyrus/infra/core/sashwindows/di/impl/WindowImpl.java
index facc3f33e50..8a419aff6f3 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/src/org/eclipse/papyrus/sashwindows/di/impl/WindowImpl.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/src/org/eclipse/papyrus/infra/core/sashwindows/di/impl/WindowImpl.java
@@ -4,28 +4,28 @@
  *

  * $Id$

  */

-package org.eclipse.papyrus.sashwindows.di.impl;

+package org.eclipse.papyrus.infra.core.sashwindows.di.impl;

 

 import org.eclipse.emf.common.notify.Notification;

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

 import org.eclipse.emf.ecore.EClass;

 import org.eclipse.emf.ecore.InternalEObject;

 import org.eclipse.emf.ecore.impl.ENotificationImpl;

-import org.eclipse.papyrus.sashwindows.di.AbstractPanel;

-import org.eclipse.papyrus.sashwindows.di.DiPackage;

-import org.eclipse.papyrus.sashwindows.di.Position;

-import org.eclipse.papyrus.sashwindows.di.Size;

-import org.eclipse.papyrus.sashwindows.di.Window;

+import org.eclipse.papyrus.infra.core.sashwindows.di.AbstractPanel;

+import org.eclipse.papyrus.infra.core.sashwindows.di.DiPackage;

+import org.eclipse.papyrus.infra.core.sashwindows.di.Position;

+import org.eclipse.papyrus.infra.core.sashwindows.di.Size;

+import org.eclipse.papyrus.infra.core.sashwindows.di.Window;

 

 /**

  * <!-- begin-user-doc --> An implementation of the model object ' <em><b>Window</b></em>'. <!-- end-user-doc -->

  * <p>

  * The following features are implemented:

  * <ul>

- * <li>{@link org.eclipse.papyrus.sashwindows.di.impl.WindowImpl#getPosition

+ * <li>{@link org.eclipse.papyrus.infra.core.sashwindows.di.impl.WindowImpl#getPosition

  * <em>Position</em>}</li>

- * <li>{@link org.eclipse.papyrus.sashwindows.di.impl.WindowImpl#getSize <em> Size</em>}</li>

- * <li>{@link org.eclipse.papyrus.sashwindows.di.impl.WindowImpl#getPanel <em> Panel</em>}</li>

+ * <li>{@link org.eclipse.papyrus.infra.core.sashwindows.di.impl.WindowImpl#getSize <em> Size</em>}</li>

+ * <li>{@link org.eclipse.papyrus.infra.core.sashwindows.di.impl.WindowImpl#getPanel <em> Panel</em>}</li>

  * </ul>

  * </p>

  * 

diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/src/org/eclipse/papyrus/sashwindows/di/util/DiAdapterFactory.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/src/org/eclipse/papyrus/infra/core/sashwindows/di/util/DiAdapterFactory.java
index dfbc7aa800d..20dbe948eb0 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/src/org/eclipse/papyrus/sashwindows/di/util/DiAdapterFactory.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/src/org/eclipse/papyrus/infra/core/sashwindows/di/util/DiAdapterFactory.java
@@ -4,32 +4,32 @@
  *

  * $Id$

  */

-package org.eclipse.papyrus.sashwindows.di.util;

+package org.eclipse.papyrus.infra.core.sashwindows.di.util;

 

 import org.eclipse.emf.common.notify.Adapter;

 import org.eclipse.emf.common.notify.Notifier;

 import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;

 import org.eclipse.emf.ecore.EObject;

-import org.eclipse.papyrus.sashwindows.di.AbstractPage;

-import org.eclipse.papyrus.sashwindows.di.AbstractPanel;

-import org.eclipse.papyrus.sashwindows.di.DiPackage;

-import org.eclipse.papyrus.sashwindows.di.PageList;

-import org.eclipse.papyrus.sashwindows.di.PageRef;

-import org.eclipse.papyrus.sashwindows.di.PanelParent;

-import org.eclipse.papyrus.sashwindows.di.Position;

-import org.eclipse.papyrus.sashwindows.di.SashModel;

-import org.eclipse.papyrus.sashwindows.di.SashPanel;

-import org.eclipse.papyrus.sashwindows.di.SashWindowsMngr;

-import org.eclipse.papyrus.sashwindows.di.Size;

-import org.eclipse.papyrus.sashwindows.di.TabFolder;

-import org.eclipse.papyrus.sashwindows.di.Window;

+import org.eclipse.papyrus.infra.core.sashwindows.di.AbstractPage;

+import org.eclipse.papyrus.infra.core.sashwindows.di.AbstractPanel;

+import org.eclipse.papyrus.infra.core.sashwindows.di.DiPackage;

+import org.eclipse.papyrus.infra.core.sashwindows.di.PageList;

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

+import org.eclipse.papyrus.infra.core.sashwindows.di.PanelParent;

+import org.eclipse.papyrus.infra.core.sashwindows.di.Position;

+import org.eclipse.papyrus.infra.core.sashwindows.di.SashModel;

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

+import org.eclipse.papyrus.infra.core.sashwindows.di.SashWindowsMngr;

+import org.eclipse.papyrus.infra.core.sashwindows.di.Size;

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

+import org.eclipse.papyrus.infra.core.sashwindows.di.Window;

 

 /**

  * <!-- begin-user-doc --> The <b>Adapter Factory</b> for the model. It provides

  * an adapter <code>createXXX</code> method for each class of the model. <!--

  * end-user-doc -->

  * 

- * @see org.eclipse.papyrus.sashwindows.di.DiPackage

+ * @see org.eclipse.papyrus.infra.core.sashwindows.di.DiPackage

  * @generated

  */

 public class DiAdapterFactory extends AdapterFactoryImpl {

@@ -162,13 +162,13 @@ public class DiAdapterFactory extends AdapterFactoryImpl {
 	}

 

 	/**

-	 * Creates a new adapter for an object of class ' {@link org.eclipse.papyrus.sashwindows.di.SashModel <em>Sash Model</em>} '. <!-- begin-user-doc

+	 * Creates a new adapter for an object of class ' {@link org.eclipse.papyrus.infra.core.sashwindows.di.SashModel <em>Sash Model</em>} '. <!-- begin-user-doc

 	 * --> This default implementation returns null so

 	 * that we can easily ignore cases; it's useful to ignore a case when

 	 * inheritance will catch all the cases anyway. <!-- end-user-doc -->

 	 * 

 	 * @return the new adapter.

-	 * @see org.eclipse.papyrus.sashwindows.di.SashModel

+	 * @see org.eclipse.papyrus.infra.core.sashwindows.di.SashModel

 	 * @generated

 	 */

 	public Adapter createSashModelAdapter() {

@@ -176,13 +176,13 @@ public class DiAdapterFactory extends AdapterFactoryImpl {
 	}

 

 	/**

-	 * Creates a new adapter for an object of class ' {@link org.eclipse.papyrus.sashwindows.di.Window <em>Window</em>}'. <!--

+	 * Creates a new adapter for an object of class ' {@link org.eclipse.papyrus.infra.core.sashwindows.di.Window <em>Window</em>}'. <!--

 	 * begin-user-doc --> This default implementation returns null so that we

 	 * can easily ignore cases; it's useful to ignore a case when inheritance

 	 * will catch all the cases anyway. <!-- end-user-doc -->

 	 * 

 	 * @return the new adapter.

-	 * @see org.eclipse.papyrus.sashwindows.di.Window

+	 * @see org.eclipse.papyrus.infra.core.sashwindows.di.Window

 	 * @generated

 	 */

 	public Adapter createWindowAdapter() {

@@ -190,14 +190,14 @@ public class DiAdapterFactory extends AdapterFactoryImpl {
 	}

 

 	/**

-	 * Creates a new adapter for an object of class ' {@link org.eclipse.papyrus.sashwindows.di.PanelParent

+	 * Creates a new adapter for an object of class ' {@link org.eclipse.papyrus.infra.core.sashwindows.di.PanelParent

 	 * <em>Panel Parent</em>}'. <!-- begin-user-doc --> This default

 	 * implementation returns null so that we can easily ignore cases; it's

 	 * useful to ignore a case when inheritance will catch all the cases anyway.

 	 * <!-- end-user-doc -->

 	 * 

 	 * @return the new adapter.

-	 * @see org.eclipse.papyrus.sashwindows.di.PanelParent

+	 * @see org.eclipse.papyrus.infra.core.sashwindows.di.PanelParent

 	 * @generated

 	 */

 	public Adapter createPanelParentAdapter() {

@@ -205,14 +205,14 @@ public class DiAdapterFactory extends AdapterFactoryImpl {
 	}

 

 	/**

-	 * Creates a new adapter for an object of class ' {@link org.eclipse.papyrus.sashwindows.di.AbstractPanel

+	 * Creates a new adapter for an object of class ' {@link org.eclipse.papyrus.infra.core.sashwindows.di.AbstractPanel

 	 * <em>Abstract Panel</em>}'. <!-- begin-user-doc --> This default

 	 * implementation returns null so that we can easily ignore cases; it's

 	 * useful to ignore a case when inheritance will catch all the cases anyway.

 	 * <!-- end-user-doc -->

 	 * 

 	 * @return the new adapter.

-	 * @see org.eclipse.papyrus.sashwindows.di.AbstractPanel

+	 * @see org.eclipse.papyrus.infra.core.sashwindows.di.AbstractPanel

 	 * @generated

 	 */

 	public Adapter createAbstractPanelAdapter() {

@@ -220,13 +220,13 @@ public class DiAdapterFactory extends AdapterFactoryImpl {
 	}

 

 	/**

-	 * Creates a new adapter for an object of class ' {@link org.eclipse.papyrus.sashwindows.di.Position <em>Position</em>}'.

+	 * Creates a new adapter for an object of class ' {@link org.eclipse.papyrus.infra.core.sashwindows.di.Position <em>Position</em>}'.

 	 * <!-- begin-user-doc --> This default implementation returns null so that

 	 * we can easily ignore cases; it's useful to ignore a case when inheritance

 	 * will catch all the cases anyway. <!-- end-user-doc -->

 	 * 

 	 * @return the new adapter.

-	 * @see org.eclipse.papyrus.sashwindows.di.Position

+	 * @see org.eclipse.papyrus.infra.core.sashwindows.di.Position

 	 * @generated

 	 */

 	public Adapter createPositionAdapter() {

@@ -234,13 +234,13 @@ public class DiAdapterFactory extends AdapterFactoryImpl {
 	}

 

 	/**

-	 * Creates a new adapter for an object of class ' {@link org.eclipse.papyrus.sashwindows.di.Size <em>Size</em>}'. <!--

+	 * Creates a new adapter for an object of class ' {@link org.eclipse.papyrus.infra.core.sashwindows.di.Size <em>Size</em>}'. <!--

 	 * begin-user-doc --> This default implementation returns null so that we

 	 * can easily ignore cases; it's useful to ignore a case when inheritance

 	 * will catch all the cases anyway. <!-- end-user-doc -->

 	 * 

 	 * @return the new adapter.

-	 * @see org.eclipse.papyrus.sashwindows.di.Size

+	 * @see org.eclipse.papyrus.infra.core.sashwindows.di.Size

 	 * @generated

 	 */

 	public Adapter createSizeAdapter() {

@@ -248,13 +248,13 @@ public class DiAdapterFactory extends AdapterFactoryImpl {
 	}

 

 	/**

-	 * Creates a new adapter for an object of class ' {@link org.eclipse.papyrus.sashwindows.di.TabFolder <em>Tab Folder</em>} '. <!-- begin-user-doc

+	 * Creates a new adapter for an object of class ' {@link org.eclipse.papyrus.infra.core.sashwindows.di.TabFolder <em>Tab Folder</em>} '. <!-- begin-user-doc

 	 * --> This default implementation returns null so

 	 * that we can easily ignore cases; it's useful to ignore a case when

 	 * inheritance will catch all the cases anyway. <!-- end-user-doc -->

 	 * 

 	 * @return the new adapter.

-	 * @see org.eclipse.papyrus.sashwindows.di.TabFolder

+	 * @see org.eclipse.papyrus.infra.core.sashwindows.di.TabFolder

 	 * @generated

 	 */

 	public Adapter createTabFolderAdapter() {

@@ -262,13 +262,13 @@ public class DiAdapterFactory extends AdapterFactoryImpl {
 	}

 

 	/**

-	 * Creates a new adapter for an object of class ' {@link org.eclipse.papyrus.sashwindows.di.PageRef <em>Page Ref</em>}'.

+	 * Creates a new adapter for an object of class ' {@link org.eclipse.papyrus.infra.core.sashwindows.di.PageRef <em>Page Ref</em>}'.

 	 * <!-- begin-user-doc --> This default implementation returns null so that

 	 * we can easily ignore cases; it's useful to ignore a case when inheritance

 	 * will catch all the cases anyway. <!-- end-user-doc -->

 	 * 

 	 * @return the new adapter.

-	 * @see org.eclipse.papyrus.sashwindows.di.PageRef

+	 * @see org.eclipse.papyrus.infra.core.sashwindows.di.PageRef

 	 * @generated

 	 */

 	public Adapter createPageRefAdapter() {

@@ -276,13 +276,13 @@ public class DiAdapterFactory extends AdapterFactoryImpl {
 	}

 

 	/**

-	 * Creates a new adapter for an object of class ' {@link org.eclipse.papyrus.sashwindows.di.SashPanel <em>Sash Panel</em>} '. <!-- begin-user-doc

+	 * Creates a new adapter for an object of class ' {@link org.eclipse.papyrus.infra.core.sashwindows.di.SashPanel <em>Sash Panel</em>} '. <!-- begin-user-doc

 	 * --> This default implementation returns null so

 	 * that we can easily ignore cases; it's useful to ignore a case when

 	 * inheritance will catch all the cases anyway. <!-- end-user-doc -->

 	 * 

 	 * @return the new adapter.

-	 * @see org.eclipse.papyrus.sashwindows.di.SashPanel

+	 * @see org.eclipse.papyrus.infra.core.sashwindows.di.SashPanel

 	 * @generated

 	 */

 	public Adapter createSashPanelAdapter() {

@@ -290,14 +290,14 @@ public class DiAdapterFactory extends AdapterFactoryImpl {
 	}

 

 	/**

-	 * Creates a new adapter for an object of class ' {@link org.eclipse.papyrus.sashwindows.di.AbstractPage

+	 * Creates a new adapter for an object of class ' {@link org.eclipse.papyrus.infra.core.sashwindows.di.AbstractPage

 	 * <em>Abstract Page</em>}'. <!-- begin-user-doc --> This default

 	 * implementation returns null so that we can easily ignore cases; it's

 	 * useful to ignore a case when inheritance will catch all the cases anyway.

 	 * <!-- end-user-doc -->

 	 * 

 	 * @return the new adapter.

-	 * @see org.eclipse.papyrus.sashwindows.di.AbstractPage

+	 * @see org.eclipse.papyrus.infra.core.sashwindows.di.AbstractPage

 	 * @generated

 	 */

 	public Adapter createAbstractPageAdapter() {

@@ -305,13 +305,13 @@ public class DiAdapterFactory extends AdapterFactoryImpl {
 	}

 

 	/**

-	 * Creates a new adapter for an object of class ' {@link org.eclipse.papyrus.sashwindows.di.PageList <em>Page List</em>}'.

+	 * Creates a new adapter for an object of class ' {@link org.eclipse.papyrus.infra.core.sashwindows.di.PageList <em>Page List</em>}'.

 	 * <!-- begin-user-doc --> This default implementation returns null so that

 	 * we can easily ignore cases; it's useful to ignore a case when inheritance

 	 * will catch all the cases anyway. <!-- end-user-doc -->

 	 * 

 	 * @return the new adapter.

-	 * @see org.eclipse.papyrus.sashwindows.di.PageList

+	 * @see org.eclipse.papyrus.infra.core.sashwindows.di.PageList

 	 * @generated

 	 */

 	public Adapter createPageListAdapter() {

@@ -319,14 +319,14 @@ public class DiAdapterFactory extends AdapterFactoryImpl {
 	}

 

 	/**

-	 * Creates a new adapter for an object of class ' {@link org.eclipse.papyrus.sashwindows.di.SashWindowsMngr

+	 * Creates a new adapter for an object of class ' {@link org.eclipse.papyrus.infra.core.sashwindows.di.SashWindowsMngr

 	 * <em>Sash Windows Mngr</em>}'. <!-- begin-user-doc --> This default

 	 * implementation returns null so that we can easily ignore cases; it's

 	 * useful to ignore a case when inheritance will catch all the cases anyway.

 	 * <!-- end-user-doc -->

 	 * 

 	 * @return the new adapter.

-	 * @see org.eclipse.papyrus.sashwindows.di.SashWindowsMngr

+	 * @see org.eclipse.papyrus.infra.core.sashwindows.di.SashWindowsMngr

 	 * @generated

 	 */

 	public Adapter createSashWindowsMngrAdapter() {

diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/src/org/eclipse/papyrus/sashwindows/di/util/DiResourceFactoryImpl.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/src/org/eclipse/papyrus/infra/core/sashwindows/di/util/DiResourceFactoryImpl.java
index 6c5a9f534ad..6703c73d8ee 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/src/org/eclipse/papyrus/sashwindows/di/util/DiResourceFactoryImpl.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/src/org/eclipse/papyrus/infra/core/sashwindows/di/util/DiResourceFactoryImpl.java
@@ -4,7 +4,7 @@
  *

  * $Id$

  */

-package org.eclipse.papyrus.sashwindows.di.util;

+package org.eclipse.papyrus.infra.core.sashwindows.di.util;

 

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

 

@@ -18,7 +18,7 @@ import org.eclipse.emf.ecore.xmi.XMLResource;
  * <!-- begin-user-doc --> The <b>Resource Factory</b> associated with the

  * package. <!-- end-user-doc -->

  * 

- * @see org.eclipse.papyrus.sashwindows.di.util.DiResourceImpl

+ * @see org.eclipse.papyrus.infra.core.sashwindows.di.util.DiResourceImpl

  * @generated

  */

 public class DiResourceFactoryImpl extends ResourceFactoryImpl {

diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/src/org/eclipse/papyrus/sashwindows/di/util/DiResourceImpl.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/src/org/eclipse/papyrus/infra/core/sashwindows/di/util/DiResourceImpl.java
index 82185bd6c72..a47292b81a1 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/src/org/eclipse/papyrus/sashwindows/di/util/DiResourceImpl.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/src/org/eclipse/papyrus/infra/core/sashwindows/di/util/DiResourceImpl.java
@@ -4,7 +4,7 @@
  *

  * $Id$

  */

-package org.eclipse.papyrus.sashwindows.di.util;

+package org.eclipse.papyrus.infra.core.sashwindows.di.util;

 

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

 

@@ -14,7 +14,7 @@ import org.eclipse.emf.ecore.xmi.impl.XMIResourceImpl;
  * <!-- begin-user-doc --> The <b>Resource </b> associated with the package.

  * <!-- end-user-doc -->

  * 

- * @see org.eclipse.papyrus.sashwindows.di.util.DiResourceFactoryImpl

+ * @see org.eclipse.papyrus.infra.core.sashwindows.di.util.DiResourceFactoryImpl

  * @generated

  */

 public class DiResourceImpl extends XMIResourceImpl {

diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/src/org/eclipse/papyrus/sashwindows/di/util/DiSwitch.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/src/org/eclipse/papyrus/infra/core/sashwindows/di/util/DiSwitch.java
index a3d1b247220..128c79d4158 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/src/org/eclipse/papyrus/sashwindows/di/util/DiSwitch.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/src/org/eclipse/papyrus/infra/core/sashwindows/di/util/DiSwitch.java
@@ -4,25 +4,25 @@
  *

  * $Id$

  */

-package org.eclipse.papyrus.sashwindows.di.util;

+package org.eclipse.papyrus.infra.core.sashwindows.di.util;

 

 import java.util.List;

 

 import org.eclipse.emf.ecore.EClass;

 import org.eclipse.emf.ecore.EObject;

-import org.eclipse.papyrus.sashwindows.di.AbstractPage;

-import org.eclipse.papyrus.sashwindows.di.AbstractPanel;

-import org.eclipse.papyrus.sashwindows.di.DiPackage;

-import org.eclipse.papyrus.sashwindows.di.PageList;

-import org.eclipse.papyrus.sashwindows.di.PageRef;

-import org.eclipse.papyrus.sashwindows.di.PanelParent;

-import org.eclipse.papyrus.sashwindows.di.Position;

-import org.eclipse.papyrus.sashwindows.di.SashModel;

-import org.eclipse.papyrus.sashwindows.di.SashPanel;

-import org.eclipse.papyrus.sashwindows.di.SashWindowsMngr;

-import org.eclipse.papyrus.sashwindows.di.Size;

-import org.eclipse.papyrus.sashwindows.di.TabFolder;

-import org.eclipse.papyrus.sashwindows.di.Window;

+import org.eclipse.papyrus.infra.core.sashwindows.di.AbstractPage;

+import org.eclipse.papyrus.infra.core.sashwindows.di.AbstractPanel;

+import org.eclipse.papyrus.infra.core.sashwindows.di.DiPackage;

+import org.eclipse.papyrus.infra.core.sashwindows.di.PageList;

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

+import org.eclipse.papyrus.infra.core.sashwindows.di.PanelParent;

+import org.eclipse.papyrus.infra.core.sashwindows.di.Position;

+import org.eclipse.papyrus.infra.core.sashwindows.di.SashModel;

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

+import org.eclipse.papyrus.infra.core.sashwindows.di.SashWindowsMngr;

+import org.eclipse.papyrus.infra.core.sashwindows.di.Size;

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

+import org.eclipse.papyrus.infra.core.sashwindows.di.Window;

 

 /**

  * <!-- begin-user-doc --> The <b>Switch</b> for the model's inheritance

@@ -31,7 +31,7 @@ import org.eclipse.papyrus.sashwindows.di.Window;
  * inheritance hierarchy until a non-null result is returned, which is the

  * result of the switch. <!-- end-user-doc -->

  * 

- * @see org.eclipse.papyrus.sashwindows.di.DiPackage

+ * @see org.eclipse.papyrus.infra.core.sashwindows.di.DiPackage

  * @generated

  */

 public class DiSwitch<T> {

diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/src/org/eclipse/papyrus/sashwindows/di/util/DiUtils.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/src/org/eclipse/papyrus/infra/core/sashwindows/di/util/DiUtils.java
index 143152efdd5..d236265bf4e 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/src/org/eclipse/papyrus/sashwindows/di/util/DiUtils.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/src/org/eclipse/papyrus/infra/core/sashwindows/di/util/DiUtils.java
@@ -13,18 +13,18 @@
  *

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

 

-package org.eclipse.papyrus.sashwindows.di.util;

+package org.eclipse.papyrus.infra.core.sashwindows.di.util;

 

 import org.eclipse.emf.ecore.EObject;

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

-import org.eclipse.papyrus.sashwindows.di.DiFactory;

-import org.eclipse.papyrus.sashwindows.di.PageList;

-import org.eclipse.papyrus.sashwindows.di.PageRef;

-import org.eclipse.papyrus.sashwindows.di.SashModel;

-import org.eclipse.papyrus.sashwindows.di.SashWindowsMngr;

-import org.eclipse.papyrus.sashwindows.di.TabFolder;

-import org.eclipse.papyrus.sashwindows.di.Window;

-import org.eclipse.papyrus.sashwindows.di.exception.SashEditorException;

+import org.eclipse.papyrus.infra.core.sashwindows.di.DiFactory;

+import org.eclipse.papyrus.infra.core.sashwindows.di.PageList;

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

+import org.eclipse.papyrus.infra.core.sashwindows.di.SashModel;

+import org.eclipse.papyrus.infra.core.sashwindows.di.SashWindowsMngr;

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

+import org.eclipse.papyrus.infra.core.sashwindows.di.Window;

+import org.eclipse.papyrus.infra.core.sashwindows.di.exception.SashEditorException;

 

 /**

  * Set of utility methods

diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/.project b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/.project
index e063ebdd0ba..c456b7b004d 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/.project
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <projectDescription>

-	<name>org.eclipse.papyrus.infra.sasheditor</name>

+	<name>org.eclipse.papyrus.infra.core.sasheditor</name>

 	<comment></comment>

 	<projects>

 	</projects>

diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/META-INF/MANIFEST.MF b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/META-INF/MANIFEST.MF
index 3fc38c15051..b44549d50b4 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/META-INF/MANIFEST.MF
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/META-INF/MANIFEST.MF
@@ -1,11 +1,11 @@
 Manifest-Version: 1.0

-Export-Package: org.eclipse.papyrus.sasheditor,

- org.eclipse.papyrus.sasheditor.contentprovider,

- org.eclipse.papyrus.sasheditor.contentprovider.simple,

- org.eclipse.papyrus.sasheditor.editor,

- org.eclipse.papyrus.sasheditor.editor.actionbarcontributor,

- org.eclipse.papyrus.sasheditor.editor.gef,

- org.eclipse.papyrus.sasheditor.multipage.editor

+Export-Package: org.eclipse.papyrus.infra.core.sasheditor,

+ org.eclipse.papyrus.infra.core.sasheditor.contentprovider,

+ org.eclipse.papyrus.infra.core.sasheditor.contentprovider.simple,

+ org.eclipse.papyrus.infra.core.sasheditor.editor,

+ org.eclipse.papyrus.infra.core.sasheditor.editor.actionbarcontributor,

+ org.eclipse.papyrus.infra.core.sasheditor.editor.gef,

+ org.eclipse.papyrus.infra.core.sasheditor.multipage.editor

 Bundle-ActivationPolicy: lazy

 Bundle-ClassPath: .

 Bundle-Name: %pluginName

@@ -19,6 +19,6 @@ Require-Bundle: org.eclipse.ui,
 Bundle-Vendor: %providerName

 Bundle-Version: 0.9.0.qualifier

 Bundle-ManifestVersion: 2

-Bundle-Activator: org.eclipse.papyrus.sasheditor.Activator

-Bundle-SymbolicName: org.eclipse.papyrus.infra.sasheditor;singleton:=true

+Bundle-Activator: org.eclipse.papyrus.infra.core.sasheditor.Activator

+Bundle-SymbolicName: org.eclipse.papyrus.infra.core.sasheditor;singleton:=true

 

diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/plugin.xml b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/plugin.xml
index 7b37e3d36b8..1154f2335a6 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/plugin.xml
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/plugin.xml
@@ -9,14 +9,14 @@
    <extension

          point="org.eclipse.core.runtime.preferences">

       <initializer

-            class="org.eclipse.papyrus.sasheditor.internal.preferences.TabTooltipPreferenceInitializer">

+            class="org.eclipse.papyrus.infra.core.sasheditor.internal.preferences.TabTooltipPreferenceInitializer">

       </initializer>

    </extension>

    <extension

          point="org.eclipse.ui.preferencePages">

       <page

-            category="org.eclipse.papyrus.preferences.generalcategory"

-            class="org.eclipse.papyrus.sasheditor.internal.preferences.TabTooltipPreferencePage"

+            category="org.eclipse.papyrus.infra.gmfdiag.preferences.generalcategory"

+            class="org.eclipse.papyrus.infra.core.sasheditor.internal.preferences.TabTooltipPreferencePage"

             id="org.eclipse.papyrus.sasheditor.preferences.tabtooltip"

             name="SashWindows Tab Tooltips">

       </page>

diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/schema/nestedEditor.exsd b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/schema/nestedEditor.exsd
index da28e6dcb61..6f6270abade 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/schema/nestedEditor.exsd
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/schema/nestedEditor.exsd
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>

 <!-- Schema file written by PDE -->

-<schema targetNamespace="org.eclipse.papyrus.sasheditor" xmlns="http://www.w3.org/2001/XMLSchema">

+<schema targetNamespace="org.eclipse.papyrus.infra.core.sasheditor" xmlns="http://www.w3.org/2001/XMLSchema">

 <annotation>

       <appinfo>

-         <meta.schema plugin="org.eclipse.papyrus.sasheditor" id="nestedEditor" name="NestedEditor"/>

+         <meta.schema plugin="org.eclipse.papyrus.infra.core.sasheditor" id="nestedEditor" name="NestedEditor"/>

       </appinfo>

       <documentation>

          Define a nested editor descriptor. This descriptor is used to add instance of the described editor to a multi diagram editor.

@@ -61,10 +61,10 @@
             <annotation>

                <documentation>

                   The factory used to create an instance of the editor.

-The factory must implements org.eclipse.papyrus.sasheditor.extension.IEditorFactory

+The factory must implements org.eclipse.papyrus.infra.core.sasheditor.extension.IEditorFactory

                </documentation>

                <appinfo>

-                  <meta.attribute kind="java" basedOn="org.eclipse.papyrus.sasheditor.extension.IEditorFactory"/>

+                  <meta.attribute kind="java" basedOn="org.eclipse.papyrus.infra.core.sasheditor.extension.IEditorFactory"/>

                </appinfo>

             </annotation>

          </attribute>

@@ -128,7 +128,7 @@ The factory must implements org.eclipse.papyrus.sasheditor.extension.IEditorFact
                   The action class implementing the creation of the root object.

                </documentation>

                <appinfo>

-                  <meta.attribute kind="java" basedOn="org.eclipse.papyrus.sasheditor.extension.ICreateDiagramAction"/>

+                  <meta.attribute kind="java" basedOn="org.eclipse.papyrus.infra.core.sasheditor.extension.ICreateDiagramAction"/>

                </appinfo>

             </annotation>

          </attribute>

diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/sasheditor/Activator.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/Activator.java
index 5ef671afa0a..8ccf67d7458 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/sasheditor/Activator.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/Activator.java
@@ -11,9 +11,9 @@
  *  Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Initial API and implementation

  *

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

-package org.eclipse.papyrus.sasheditor;

+package org.eclipse.papyrus.infra.core.sasheditor;

 

-import org.eclipse.papyrus.log.LogHelper;

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

 import org.eclipse.ui.plugin.AbstractUIPlugin;

 import org.osgi.framework.BundleContext;

 

@@ -23,7 +23,7 @@ import org.osgi.framework.BundleContext;
 public class Activator extends AbstractUIPlugin {

 

 	/** Plugin ID */

-	public static final String PLUGIN_ID = "org.eclipse.papyrus.infra.sasheditor";

+	public static final String PLUGIN_ID = "org.eclipse.papyrus.infra.core.sasheditor";

 

 	/** shared instance of the plugin */

 	private static Activator plugin;

diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/sasheditor/contentprovider/IAbstractPanelModel.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/contentprovider/IAbstractPanelModel.java
index b356dd43ed6..09e99acb271 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/sasheditor/contentprovider/IAbstractPanelModel.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/contentprovider/IAbstractPanelModel.java
@@ -1,7 +1,7 @@
 /**

  * 

  */

-package org.eclipse.papyrus.sasheditor.contentprovider;

+package org.eclipse.papyrus.infra.core.sasheditor.contentprovider;

 

 /**

  * A Panel represent a SashPanel or a TabFolder. This interface is the common

diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/sasheditor/contentprovider/IComponentModel.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/contentprovider/IComponentModel.java
index 6078b7d2228..cee689ab34d 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/sasheditor/contentprovider/IComponentModel.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/contentprovider/IComponentModel.java
@@ -1,7 +1,7 @@
 /**

  * 

  */

-package org.eclipse.papyrus.sasheditor.contentprovider;

+package org.eclipse.papyrus.infra.core.sasheditor.contentprovider;

 

 import org.eclipse.swt.widgets.Composite;

 

diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/sasheditor/contentprovider/IContentChangedListener.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/contentprovider/IContentChangedListener.java
index 3339af725be..aa94ebacea2 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/sasheditor/contentprovider/IContentChangedListener.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/contentprovider/IContentChangedListener.java
@@ -1,7 +1,7 @@
 /**

  * 

  */

-package org.eclipse.papyrus.sasheditor.contentprovider;

+package org.eclipse.papyrus.infra.core.sasheditor.contentprovider;

 

 /**

  * Interface to be implemented by classes needing to be notified when the

diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/sasheditor/contentprovider/IContentChangedProvider.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/contentprovider/IContentChangedProvider.java
index 718420b124a..f286b3afc54 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/sasheditor/contentprovider/IContentChangedProvider.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/contentprovider/IContentChangedProvider.java
@@ -1,4 +1,4 @@
-package org.eclipse.papyrus.sasheditor.contentprovider;

+package org.eclipse.papyrus.infra.core.sasheditor.contentprovider;

 

 /**

  * Interface implemented by classes firing events when the ContentProvider

diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/sasheditor/contentprovider/IEditorModel.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/contentprovider/IEditorModel.java
index 804174b4367..d0af56907a0 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/sasheditor/contentprovider/IEditorModel.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/contentprovider/IEditorModel.java
@@ -11,7 +11,7 @@
  *  Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Initial API and implementation

  *

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

-package org.eclipse.papyrus.sasheditor.contentprovider;

+package org.eclipse.papyrus.infra.core.sasheditor.contentprovider;

 

 import org.eclipse.ui.IEditorPart;

 import org.eclipse.ui.PartInitException;

diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/sasheditor/contentprovider/IPageMngr.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/contentprovider/IPageMngr.java
index 8b3bd6a1f53..0ff2e2607b5 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/sasheditor/contentprovider/IPageMngr.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/contentprovider/IPageMngr.java
@@ -13,13 +13,13 @@
  *

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

 

-package org.eclipse.papyrus.sasheditor.contentprovider;

+package org.eclipse.papyrus.infra.core.sasheditor.contentprovider;

 

 import java.util.List;

 

-import org.eclipse.papyrus.sasheditor.editor.IPageChangedListener;

-import org.eclipse.papyrus.sasheditor.editor.SashContainerEventsListener;

-import org.eclipse.papyrus.sasheditor.editor.SashWindowsContainer;

+import org.eclipse.papyrus.infra.core.sasheditor.editor.IPageChangedListener;

+import org.eclipse.papyrus.infra.core.sasheditor.editor.SashContainerEventsListener;

+import org.eclipse.papyrus.infra.core.sasheditor.editor.SashWindowsContainer;

 

 /**

  * Interface providing method to manage pages in the Sash Windows system. This

diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/sasheditor/contentprovider/IPageModel.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/contentprovider/IPageModel.java
index b692ab3f457..98739beaf17 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/sasheditor/contentprovider/IPageModel.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/contentprovider/IPageModel.java
@@ -1,7 +1,7 @@
 /**

  * 

  */

-package org.eclipse.papyrus.sasheditor.contentprovider;

+package org.eclipse.papyrus.infra.core.sasheditor.contentprovider;

 

 import org.eclipse.swt.graphics.Image;

 

diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/sasheditor/contentprovider/ISashPanelModel.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/contentprovider/ISashPanelModel.java
index d2bb3a4d716..af353c760b8 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/sasheditor/contentprovider/ISashPanelModel.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/contentprovider/ISashPanelModel.java
@@ -1,4 +1,4 @@
-package org.eclipse.papyrus.sasheditor.contentprovider;

+package org.eclipse.papyrus.infra.core.sasheditor.contentprovider;

 

 import java.util.List;

 

diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/sasheditor/contentprovider/ISashWindowsContentProvider.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/contentprovider/ISashWindowsContentProvider.java
index 85a4b334684..eb8c17206b6 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/sasheditor/contentprovider/ISashWindowsContentProvider.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/contentprovider/ISashWindowsContentProvider.java
@@ -1,4 +1,4 @@
-package org.eclipse.papyrus.sasheditor.contentprovider;

+package org.eclipse.papyrus.infra.core.sasheditor.contentprovider;

 

 /**

  * This interface is used by the sash windows system to discover its content. It

diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/sasheditor/contentprovider/ITabFolderModel.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/contentprovider/ITabFolderModel.java
index ead64a94024..c1238b958f1 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/sasheditor/contentprovider/ITabFolderModel.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/contentprovider/ITabFolderModel.java
@@ -1,4 +1,4 @@
-package org.eclipse.papyrus.sasheditor.contentprovider;

+package org.eclipse.papyrus.infra.core.sasheditor.contentprovider;

 

 import java.util.List;

 

diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/sasheditor/contentprovider/simple/AbstractModel.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/contentprovider/simple/AbstractModel.java
index 8cf1745019e..ce6f2fcda62 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/sasheditor/contentprovider/simple/AbstractModel.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/contentprovider/simple/AbstractModel.java
@@ -11,7 +11,7 @@
  *  Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Initial API and implementation

  *

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

-package org.eclipse.papyrus.sasheditor.contentprovider.simple;

+package org.eclipse.papyrus.infra.core.sasheditor.contentprovider.simple;

 

 /**

  * @author dumoulin

diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/sasheditor/contentprovider/simple/AbstractPanelModel.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/contentprovider/simple/AbstractPanelModel.java
index 10409b68d83..c9cb164e529 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/sasheditor/contentprovider/simple/AbstractPanelModel.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/contentprovider/simple/AbstractPanelModel.java
@@ -11,10 +11,10 @@
  *  Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Initial API and implementation

  *

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

-package org.eclipse.papyrus.sasheditor.contentprovider.simple;

+package org.eclipse.papyrus.infra.core.sasheditor.contentprovider.simple;

 

-import org.eclipse.papyrus.sasheditor.contentprovider.IAbstractPanelModel;

-import org.eclipse.papyrus.sasheditor.contentprovider.IPageModel;

+import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IAbstractPanelModel;

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

 

 /**

  * @author dumoulin

diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/sasheditor/contentprovider/simple/RootModel.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/contentprovider/simple/RootModel.java
index 37b173a81da..4fe1d8e97e4 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/sasheditor/contentprovider/simple/RootModel.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/contentprovider/simple/RootModel.java
@@ -11,9 +11,9 @@
  *  Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Initial API and implementation

  *

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

-package org.eclipse.papyrus.sasheditor.contentprovider.simple;

+package org.eclipse.papyrus.infra.core.sasheditor.contentprovider.simple;

 

-import org.eclipse.papyrus.sasheditor.contentprovider.IPageModel;

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

 

 /**

  * @author dumoulin

diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/sasheditor/contentprovider/simple/SashPanelModel.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/contentprovider/simple/SashPanelModel.java
index fd378209b8d..e36ae91c710 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/sasheditor/contentprovider/simple/SashPanelModel.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/contentprovider/simple/SashPanelModel.java
@@ -11,14 +11,14 @@
  *  Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Initial API and implementation

  *

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

-package org.eclipse.papyrus.sasheditor.contentprovider.simple;

+package org.eclipse.papyrus.infra.core.sasheditor.contentprovider.simple;

 

 import java.util.Arrays;

 import java.util.List;

 

-import org.eclipse.papyrus.sasheditor.contentprovider.IAbstractPanelModel;

-import org.eclipse.papyrus.sasheditor.contentprovider.IPageModel;

-import org.eclipse.papyrus.sasheditor.contentprovider.ISashPanelModel;

+import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IAbstractPanelModel;

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

+import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ISashPanelModel;

 

 /**

  * Simple implementation of the {@link ISashPanelModel}.

diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/sasheditor/contentprovider/simple/SimpleSashWindowsContentProvider.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/contentprovider/simple/SimpleSashWindowsContentProvider.java
index 97eb83f42f6..d87ee839e65 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/sasheditor/contentprovider/simple/SimpleSashWindowsContentProvider.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/contentprovider/simple/SimpleSashWindowsContentProvider.java
@@ -11,19 +11,19 @@
  *  Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Initial API and implementation

  *

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

-package org.eclipse.papyrus.sasheditor.contentprovider.simple;

+package org.eclipse.papyrus.infra.core.sasheditor.contentprovider.simple;

 

 import java.util.ArrayList;

 import java.util.List;

 

-import org.eclipse.papyrus.sasheditor.contentprovider.IAbstractPanelModel;

-import org.eclipse.papyrus.sasheditor.contentprovider.IContentChangedListener;

-import org.eclipse.papyrus.sasheditor.contentprovider.IContentChangedListener.ContentEvent;

-import org.eclipse.papyrus.sasheditor.contentprovider.IContentChangedProvider;

-import org.eclipse.papyrus.sasheditor.contentprovider.IPageModel;

-import org.eclipse.papyrus.sasheditor.contentprovider.ISashWindowsContentProvider;

-import org.eclipse.papyrus.sasheditor.contentprovider.ITabFolderModel;

-import org.eclipse.papyrus.sasheditor.editor.SashWindowsContainer;

+import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IAbstractPanelModel;

+import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IContentChangedListener;

+import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IContentChangedProvider;

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

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

+import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ITabFolderModel;

+import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IContentChangedListener.ContentEvent;

+import org.eclipse.papyrus.infra.core.sasheditor.editor.SashWindowsContainer;

 import org.eclipse.swt.SWT;

 

 /**

@@ -120,7 +120,7 @@ public class SimpleSashWindowsContentProvider implements ISashWindowsContentProv
 	 * Move a Page inside the folder. {@inheritDoc}

 	 */

 	public void movePage(ITabFolderModel folderModel, int oldIndex, int newIndex) {

-		org.eclipse.papyrus.sasheditor.Activator.log.debug("movePage()");

+		org.eclipse.papyrus.infra.core.sasheditor.Activator.log.debug("movePage()");

 		((TabFolderModel)folderModel).moveTab(oldIndex, newIndex);

 

 	}

@@ -131,7 +131,7 @@ public class SimpleSashWindowsContentProvider implements ISashWindowsContentProv
 	 */

 	public void movePage(ITabFolderModel srcFolderModel, int sourceIndex, ITabFolderModel targetFolderModel, int targetIndex) {

 		// This implementation use (TabFolderModel), so we can cast safely

-		org.eclipse.papyrus.sasheditor.Activator.log.debug("movePage()");

+		org.eclipse.papyrus.infra.core.sasheditor.Activator.log.debug("movePage()");

 		if(sourceIndex == -1) {

 			moveAllPages(srcFolderModel, targetFolderModel);

 			return;

@@ -182,7 +182,7 @@ public class SimpleSashWindowsContentProvider implements ISashWindowsContentProv
 	 *        SWT.TOP, DOWN, LEFT, RIGHT.

 	 */

 	public void createFolder(ITabFolderModel sourceFolder, int tabIndex, ITabFolderModel referenceFolder, int side) {

-		org.eclipse.papyrus.sasheditor.Activator.log.debug("createFolder()");

+		org.eclipse.papyrus.infra.core.sasheditor.Activator.log.debug("createFolder()");

 

 		ITabFolderModel newFolder = doCreateFolder((TabFolderModel)sourceFolder, tabIndex, (TabFolderModel)referenceFolder, side);

 		contentChangedListenerManager.fireContentChanged(new ContentEvent(ContentEvent.CHANGED, this, sourceFolder));

@@ -205,7 +205,7 @@ public class SimpleSashWindowsContentProvider implements ISashWindowsContentProv
 	 *        SWT.TOP, DOWN, LEFT, RIGHT.

 	 */

 	public ITabFolderModel createFolder(ITabFolderModel referenceFolder, int side) {

-		org.eclipse.papyrus.sasheditor.Activator.log.debug("createFolder()");

+		org.eclipse.papyrus.infra.core.sasheditor.Activator.log.debug("createFolder()");

 

 		ITabFolderModel newFolder = doCreateFolder((TabFolderModel)referenceFolder, side);

 		contentChangedListenerManager.fireContentChanged(new ContentEvent(ContentEvent.CHANGED, this, referenceFolder));

@@ -421,7 +421,7 @@ public class SimpleSashWindowsContentProvider implements ISashWindowsContentProv
 	/**

 	 * Set the the current Folder.

 	 * 

-	 * @see org.eclipse.papyrus.sasheditor.contentprovider.ISashWindowsContentProvider#setCurrentFolder(java.lang.Object)

+	 * @see org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ISashWindowsContentProvider#setCurrentFolder(java.lang.Object)

 	 * 

 	 * @param rawModel

 	 *        Object identifying the current folder. In this implementation,

diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/sasheditor/contentprovider/simple/TabFolderModel.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/contentprovider/simple/TabFolderModel.java
index 2d69cc3cc2d..67ce0bff0ed 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/sasheditor/contentprovider/simple/TabFolderModel.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/contentprovider/simple/TabFolderModel.java
@@ -11,14 +11,14 @@
  *  Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Initial API and implementation

  *

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

-package org.eclipse.papyrus.sasheditor.contentprovider.simple;

+package org.eclipse.papyrus.infra.core.sasheditor.contentprovider.simple;

 

 import java.util.ArrayList;

 import java.util.List;

 

-import org.eclipse.papyrus.sasheditor.contentprovider.IContentChangedListener.ContentEvent;

-import org.eclipse.papyrus.sasheditor.contentprovider.IPageModel;

-import org.eclipse.papyrus.sasheditor.contentprovider.ITabFolderModel;

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

+import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ITabFolderModel;

+import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IContentChangedListener.ContentEvent;

 

 /**

  * Basic implementation allowing to add item to be shown.

diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/sasheditor/contentprovider/singlefolder/SingleFolderContentProvider.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/contentprovider/singlefolder/SingleFolderContentProvider.java
index a2a6ca51a3a..6ac26058385 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/sasheditor/contentprovider/singlefolder/SingleFolderContentProvider.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/contentprovider/singlefolder/SingleFolderContentProvider.java
@@ -11,18 +11,18 @@
  *  Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Initial API and implementation

  *

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

-package org.eclipse.papyrus.sasheditor.contentprovider.singlefolder;

+package org.eclipse.papyrus.infra.core.sasheditor.contentprovider.singlefolder;

 

 import java.util.ArrayList;

 import java.util.List;

 

-import org.eclipse.papyrus.sasheditor.contentprovider.IAbstractPanelModel;

-import org.eclipse.papyrus.sasheditor.contentprovider.IContentChangedListener;

-import org.eclipse.papyrus.sasheditor.contentprovider.IContentChangedListener.ContentEvent;

-import org.eclipse.papyrus.sasheditor.contentprovider.IContentChangedProvider;

-import org.eclipse.papyrus.sasheditor.contentprovider.IPageModel;

-import org.eclipse.papyrus.sasheditor.contentprovider.ISashWindowsContentProvider;

-import org.eclipse.papyrus.sasheditor.contentprovider.ITabFolderModel;

+import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IAbstractPanelModel;

+import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IContentChangedListener;

+import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IContentChangedProvider;

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

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

+import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ITabFolderModel;

+import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IContentChangedListener.ContentEvent;

 

 /**

  * A simple implementation of providers allowing only one single folder

@@ -173,7 +173,7 @@ public class SingleFolderContentProvider implements ISashWindowsContentProvider,
 	/**

 	 * Do nothing as we can't have other folders.

 	 * 

-	 * @see org.eclipse.papyrus.sasheditor.contentprovider.ISashWindowsContentProvider#setCurrentFolder(java.lang.Object)

+	 * @see org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ISashWindowsContentProvider#setCurrentFolder(java.lang.Object)

 	 * 

 	 * @param rawModel

 	 */

diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/sasheditor/contentprovider/singlefolder/SingleFolderModel.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/contentprovider/singlefolder/SingleFolderModel.java
index caf77cddc3b..482b7391783 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/sasheditor/contentprovider/singlefolder/SingleFolderModel.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/contentprovider/singlefolder/SingleFolderModel.java
@@ -11,14 +11,14 @@
  *  Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Initial API and implementation

  *

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

-package org.eclipse.papyrus.sasheditor.contentprovider.singlefolder;

+package org.eclipse.papyrus.infra.core.sasheditor.contentprovider.singlefolder;

 

 import java.util.ArrayList;

 import java.util.List;

 

-import org.eclipse.papyrus.sasheditor.contentprovider.IContentChangedListener.ContentEvent;

-import org.eclipse.papyrus.sasheditor.contentprovider.IPageModel;

-import org.eclipse.papyrus.sasheditor.contentprovider.ITabFolderModel;

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

+import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ITabFolderModel;

+import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IContentChangedListener.ContentEvent;

 

 /**

  * Basic implementation allowing to add item to be shown.

diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/sasheditor/editor/AbstractMultiPageSashEditor.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/editor/AbstractMultiPageSashEditor.java
index 57152130a33..d36c81f83b9 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/sasheditor/editor/AbstractMultiPageSashEditor.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/editor/AbstractMultiPageSashEditor.java
@@ -11,14 +11,14 @@
  *  Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Initial API and implementation

  *

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

-package org.eclipse.papyrus.sasheditor.editor;

+package org.eclipse.papyrus.infra.core.sasheditor.editor;

 

 import java.util.ArrayList;

 import java.util.List;

 

 import org.eclipse.core.runtime.NullProgressMonitor;

-import org.eclipse.papyrus.sasheditor.contentprovider.ISashWindowsContentProvider;

-import org.eclipse.papyrus.sasheditor.internal.eclipsecopy.MultiPageSelectionProvider;

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

+import org.eclipse.papyrus.infra.core.sasheditor.internal.eclipsecopy.MultiPageSelectionProvider;

 import org.eclipse.swt.widgets.Composite;

 import org.eclipse.swt.widgets.Display;

 import org.eclipse.ui.IEditorInput;

@@ -246,7 +246,7 @@ public abstract class AbstractMultiPageSashEditor extends EditorPart implements
 	 * Papyrus GMF UML IEditor. It doesn't work on other kind of IEditor. It

 	 * introduce problems in IEditor of other kinds

 	 * 

-	 * @see org.eclipse.papyrus.sasheditor.editor.ISashWindowsContainer#isDirty()

+	 * @see org.eclipse.papyrus.infra.core.sasheditor.editor.ISashWindowsContainer#isDirty()

 	 * @deprecated A SaveAndDirtyService is used instead.

 	 */

 	@Override

diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/sasheditor/editor/IComponentPage.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/editor/IComponentPage.java
index d8d8ee812d8..f7a49058ead 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/sasheditor/editor/IComponentPage.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/editor/IComponentPage.java
@@ -1,7 +1,7 @@
 /**

  * 

  */

-package org.eclipse.papyrus.sasheditor.editor;

+package org.eclipse.papyrus.infra.core.sasheditor.editor;

 

 /**

  * Allows to access to properties of a Sash ComponentPage. This interface allows

diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/sasheditor/editor/IEditorPage.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/editor/IEditorPage.java
index 2b37cab9260..5254420bdc9 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/sasheditor/editor/IEditorPage.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/editor/IEditorPage.java
@@ -1,7 +1,7 @@
 /**

  * 

  */

-package org.eclipse.papyrus.sasheditor.editor;

+package org.eclipse.papyrus.infra.core.sasheditor.editor;

 

 import org.eclipse.ui.IEditorPart;

 

diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/sasheditor/editor/IMultiEditorManager.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/editor/IMultiEditorManager.java
index 4417541b6e4..b85e8f00fc8 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/sasheditor/editor/IMultiEditorManager.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/editor/IMultiEditorManager.java
@@ -11,9 +11,9 @@
  *  Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Initial API and implementation

  *

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

-package org.eclipse.papyrus.sasheditor.editor;

+package org.eclipse.papyrus.infra.core.sasheditor.editor;

 

-import org.eclipse.papyrus.sasheditor.internal.EditorPart;

+import org.eclipse.papyrus.infra.core.sasheditor.internal.EditorPart;

 import org.eclipse.ui.IEditorInput;

 import org.eclipse.ui.IEditorSite;

 import org.eclipse.ui.IWorkbenchPartSite;

diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/sasheditor/editor/IMultiPageEditorPart.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/editor/IMultiPageEditorPart.java
index 3111bf2ee07..d6bbcabdbe8 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/sasheditor/editor/IMultiPageEditorPart.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/editor/IMultiPageEditorPart.java
@@ -11,7 +11,7 @@
  *  Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Initial API and implementation

  *

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

-package org.eclipse.papyrus.sasheditor.editor;

+package org.eclipse.papyrus.infra.core.sasheditor.editor;

 

 import org.eclipse.ui.IEditorPart;

 import org.eclipse.ui.IEditorSite;

diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/sasheditor/editor/IPage.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/editor/IPage.java
index 243c2038507..d2a683905fe 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/sasheditor/editor/IPage.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/editor/IPage.java
@@ -1,7 +1,7 @@
 /**

  * 

  */

-package org.eclipse.papyrus.sasheditor.editor;

+package org.eclipse.papyrus.infra.core.sasheditor.editor;

 

 import org.eclipse.swt.graphics.Image;

 import org.eclipse.swt.widgets.Control;

diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/sasheditor/editor/IPageChangedListener.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/editor/IPageChangedListener.java
index 036f9efe3d4..0037bc7be0b 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/sasheditor/editor/IPageChangedListener.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/editor/IPageChangedListener.java
@@ -1,7 +1,7 @@
 /**

  * 

  */

-package org.eclipse.papyrus.sasheditor.editor;

+package org.eclipse.papyrus.infra.core.sasheditor.editor;

 

 /**

  * @author cedric dumoulin

diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/sasheditor/editor/IPageImageUtils.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/editor/IPageImageUtils.java
index 8caf041ec09..e83f22af035 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/sasheditor/editor/IPageImageUtils.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/editor/IPageImageUtils.java
@@ -12,7 +12,7 @@
  *

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

 

-package org.eclipse.papyrus.sasheditor.editor;

+package org.eclipse.papyrus.infra.core.sasheditor.editor;

 

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.graphics.GC;

diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/sasheditor/editor/IPageVisitor.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/editor/IPageVisitor.java
index 1aab9135b8d..e2e41c10eeb 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/sasheditor/editor/IPageVisitor.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/editor/IPageVisitor.java
@@ -1,7 +1,7 @@
 /**

  * 

  */

-package org.eclipse.papyrus.sasheditor.editor;

+package org.eclipse.papyrus.infra.core.sasheditor.editor;

 

 /**

  * A Visitor used to visit all the {@link IPage} of a {@link SashWindowsContainer}.

diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/sasheditor/editor/ISashWindowsContainer.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/editor/ISashWindowsContainer.java
index 07e8cc87812..8f75f476643 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/sasheditor/editor/ISashWindowsContainer.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/editor/ISashWindowsContainer.java
@@ -1,9 +1,9 @@
-package org.eclipse.papyrus.sasheditor.editor;

+package org.eclipse.papyrus.infra.core.sasheditor.editor;

 

 import java.util.List;

 

 import org.eclipse.jface.action.MenuManager;

-import org.eclipse.papyrus.sasheditor.contentprovider.ISashWindowsContentProvider;

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

 import org.eclipse.ui.IEditorPart;

 

 public interface ISashWindowsContainer {

@@ -71,7 +71,7 @@ public interface ISashWindowsContainer {
 	 * Add a listener on Page LifeCycle events. This implementation delegates to

 	 * the internal PageTracker.

 	 * 

-	 * @see org.eclipse.papyrus.sasheditor.editor.ISashWindowsContainer#addPageChangedListener(org.eclipse.papyrus.sasheditor.editor.IPageChangedListener)

+	 * @see org.eclipse.papyrus.infra.core.sasheditor.editor.ISashWindowsContainer#addPageChangedListener(org.eclipse.papyrus.infra.core.sasheditor.editor.IPageChangedListener)

 	 * @param listener

 	 * 

 	 */

@@ -80,7 +80,7 @@ public interface ISashWindowsContainer {
 	/**

 	 * Remove a listener on Page LifeCycle events.

 	 * 

-	 * @see org.eclipse.papyrus.sasheditor.editor.ISashWindowsContainer#removePageChangedListener(org.eclipse.papyrus.sasheditor.editor.IPageChangedListener)

+	 * @see org.eclipse.papyrus.infra.core.sasheditor.editor.ISashWindowsContainer#removePageChangedListener(org.eclipse.papyrus.infra.core.sasheditor.editor.IPageChangedListener)

 	 * @param listener

 	 * 

 	 */

diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/sasheditor/editor/ISashWindowsContainerChangedListener.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/editor/ISashWindowsContainerChangedListener.java
index fc51c1cff83..4b9e0f5c99d 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/sasheditor/editor/ISashWindowsContainerChangedListener.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/editor/ISashWindowsContainerChangedListener.java
@@ -1,7 +1,7 @@
 /**

  * 

  */

-package org.eclipse.papyrus.sasheditor.editor;

+package org.eclipse.papyrus.infra.core.sasheditor.editor;

 

 /**

  * @author dumoulin

diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/sasheditor/editor/SashContainerEventsListener.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/editor/SashContainerEventsListener.java
index ab61acb4b19..f1ddd4e4524 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/sasheditor/editor/SashContainerEventsListener.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/editor/SashContainerEventsListener.java
@@ -1,7 +1,7 @@
 /**

  * 

  */

-package org.eclipse.papyrus.sasheditor.editor;

+package org.eclipse.papyrus.infra.core.sasheditor.editor;

 

 /**

  * Interface to be implemented by listeners on {@link SashWindowsContainer} life

diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/sasheditor/editor/SashTabDecorationSynchronizer.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/editor/SashTabDecorationSynchronizer.java
index ec33c3a008a..5e480d5f43e 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/sasheditor/editor/SashTabDecorationSynchronizer.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/editor/SashTabDecorationSynchronizer.java
@@ -1,7 +1,7 @@
 /**

  * 

  */

-package org.eclipse.papyrus.sasheditor.editor;

+package org.eclipse.papyrus.infra.core.sasheditor.editor;

 

 import java.util.logging.Logger;

 

diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/sasheditor/editor/SashWindowsContainer.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/editor/SashWindowsContainer.java
index 740d01436ee..09c0f835087 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/sasheditor/editor/SashWindowsContainer.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/editor/SashWindowsContainer.java
@@ -11,9 +11,9 @@
  *  Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Initial API and implementation

  *

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

-package org.eclipse.papyrus.sasheditor.editor;

+package org.eclipse.papyrus.infra.core.sasheditor.editor;

 

-import static org.eclipse.papyrus.sasheditor.Activator.log;

+import static org.eclipse.papyrus.infra.core.sasheditor.Activator.log;

 

 import java.util.ArrayList;

 import java.util.List;

@@ -21,28 +21,28 @@ import java.util.concurrent.atomic.AtomicBoolean;
 

 import org.eclipse.jface.action.MenuManager;

 import org.eclipse.jface.util.Geometry;

-import org.eclipse.papyrus.sasheditor.contentprovider.IComponentModel;

-import org.eclipse.papyrus.sasheditor.contentprovider.IEditorModel;

-import org.eclipse.papyrus.sasheditor.contentprovider.IPageModel;

-import org.eclipse.papyrus.sasheditor.contentprovider.ISashWindowsContentProvider;

-import org.eclipse.papyrus.sasheditor.internal.AbstractPanelPart;

-import org.eclipse.papyrus.sasheditor.internal.AbstractPart;

-import org.eclipse.papyrus.sasheditor.internal.ActiveEditorServicesSwitcher;

-import org.eclipse.papyrus.sasheditor.internal.ActivePageTracker;

-import org.eclipse.papyrus.sasheditor.internal.ComponentPart;

-import org.eclipse.papyrus.sasheditor.internal.EditorPart;

-import org.eclipse.papyrus.sasheditor.internal.IPartVisitor;

-import org.eclipse.papyrus.sasheditor.internal.LookupIPageByIEditorPartVisitor;

-import org.eclipse.papyrus.sasheditor.internal.LookupModelPageVisitor;

-import org.eclipse.papyrus.sasheditor.internal.PTabFolder;

-import org.eclipse.papyrus.sasheditor.internal.PagePart;

-import org.eclipse.papyrus.sasheditor.internal.PageVisitorWrapper;

-import org.eclipse.papyrus.sasheditor.internal.PartLists;

-import org.eclipse.papyrus.sasheditor.internal.PartVisitor;

-import org.eclipse.papyrus.sasheditor.internal.RootPart;

-import org.eclipse.papyrus.sasheditor.internal.SashContainerEventsProvider;

-import org.eclipse.papyrus.sasheditor.internal.ShowPartStatusVisitor;

-import org.eclipse.papyrus.sasheditor.internal.TabFolderPart;

+import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IComponentModel;

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

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

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

+import org.eclipse.papyrus.infra.core.sasheditor.internal.AbstractPanelPart;

+import org.eclipse.papyrus.infra.core.sasheditor.internal.AbstractPart;

+import org.eclipse.papyrus.infra.core.sasheditor.internal.ActiveEditorServicesSwitcher;

+import org.eclipse.papyrus.infra.core.sasheditor.internal.ActivePageTracker;

+import org.eclipse.papyrus.infra.core.sasheditor.internal.ComponentPart;

+import org.eclipse.papyrus.infra.core.sasheditor.internal.EditorPart;

+import org.eclipse.papyrus.infra.core.sasheditor.internal.IPartVisitor;

+import org.eclipse.papyrus.infra.core.sasheditor.internal.LookupIPageByIEditorPartVisitor;

+import org.eclipse.papyrus.infra.core.sasheditor.internal.LookupModelPageVisitor;

+import org.eclipse.papyrus.infra.core.sasheditor.internal.PTabFolder;

+import org.eclipse.papyrus.infra.core.sasheditor.internal.PagePart;

+import org.eclipse.papyrus.infra.core.sasheditor.internal.PageVisitorWrapper;

+import org.eclipse.papyrus.infra.core.sasheditor.internal.PartLists;

+import org.eclipse.papyrus.infra.core.sasheditor.internal.PartVisitor;

+import org.eclipse.papyrus.infra.core.sasheditor.internal.RootPart;

+import org.eclipse.papyrus.infra.core.sasheditor.internal.SashContainerEventsProvider;

+import org.eclipse.papyrus.infra.core.sasheditor.internal.ShowPartStatusVisitor;

+import org.eclipse.papyrus.infra.core.sasheditor.internal.TabFolderPart;

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.graphics.Cursor;

 import org.eclipse.swt.graphics.Point;

@@ -300,7 +300,7 @@ public class SashWindowsContainer implements ISashWindowsContainer {
 	}

 

 	/**

-	 * @see org.eclipse.papyrus.sasheditor.editor.ISashWindowsContainer#getActiveEditor()

+	 * @see org.eclipse.papyrus.infra.core.sasheditor.editor.ISashWindowsContainer#getActiveEditor()

 	 * @return

 	 * 

 	 */

@@ -364,7 +364,7 @@ public class SashWindowsContainer implements ISashWindowsContainer {
 	}

 

 	/**

-	 * @see org.eclipse.papyrus.sasheditor.editor.ISashWindowsContainer#setFocus()

+	 * @see org.eclipse.papyrus.infra.core.sasheditor.editor.ISashWindowsContainer#setFocus()

 	 * 

 	 */

 	public void setFocus() {

@@ -386,7 +386,7 @@ public class SashWindowsContainer implements ISashWindowsContainer {
 	/**

 	 * Refresh the tabs. Is we are already currently refreshing, simply return.

 	 * 

-	 * @see org.eclipse.papyrus.sasheditor.editor.ISashWindowsContainer#refreshTabs()

+	 * @see org.eclipse.papyrus.infra.core.sasheditor.editor.ISashWindowsContainer#refreshTabs()

 	 * 

 	 */

 	public void refreshTabs() {

@@ -422,7 +422,7 @@ public class SashWindowsContainer implements ISashWindowsContainer {
 	/**

 	 * Real implementation of refreshTab.

 	 * 

-	 * @see org.eclipse.papyrus.sasheditor.editor.ISashWindowsContainer#refreshTabs()

+	 * @see org.eclipse.papyrus.infra.core.sasheditor.editor.ISashWindowsContainer#refreshTabs()

 	 * 

 	 */

 	private void refreshTabsInternal() {

@@ -840,7 +840,7 @@ public class SashWindowsContainer implements ISashWindowsContainer {
 	 * Add a listener on pageChanged event. This implementation delegates to the

 	 * internal PageTracker.

 	 * 

-	 * @see org.eclipse.papyrus.sasheditor.editor.ISashWindowsContainer#addPageChangedListener(org.eclipse.papyrus.sasheditor.editor.IPageChangedListener)

+	 * @see org.eclipse.papyrus.infra.core.sasheditor.editor.ISashWindowsContainer#addPageChangedListener(org.eclipse.papyrus.infra.core.sasheditor.editor.IPageChangedListener)

 	 * @param pageChangedListener

 	 * 

 	 */

@@ -851,7 +851,7 @@ public class SashWindowsContainer implements ISashWindowsContainer {
 	/**

 	 * Remove a listener on pageChanged event.

 	 * 

-	 * @see org.eclipse.papyrus.sasheditor.editor.ISashWindowsContainer#removePageChangedListener(org.eclipse.papyrus.sasheditor.editor.IPageChangedListener)

+	 * @see org.eclipse.papyrus.infra.core.sasheditor.editor.ISashWindowsContainer#removePageChangedListener(org.eclipse.papyrus.infra.core.sasheditor.editor.IPageChangedListener)

 	 * @param pageChangedListener

 	 * 

 	 */

@@ -863,7 +863,7 @@ public class SashWindowsContainer implements ISashWindowsContainer {
 	 * Add a listener on Page LifeCycle events. This implementation delegates to

 	 * the internal PageTracker.

 	 * 

-	 * @see org.eclipse.papyrus.sasheditor.editor.ISashWindowsContainer#addPageChangedListener(org.eclipse.papyrus.sasheditor.editor.IPageChangedListener)

+	 * @see org.eclipse.papyrus.infra.core.sasheditor.editor.ISashWindowsContainer#addPageChangedListener(org.eclipse.papyrus.infra.core.sasheditor.editor.IPageChangedListener)

 	 * @param listener

 	 * 

 	 */

@@ -874,7 +874,7 @@ public class SashWindowsContainer implements ISashWindowsContainer {
 	/**

 	 * Remove a listener on Page LifeCycle events.

 	 * 

-	 * @see org.eclipse.papyrus.sasheditor.editor.ISashWindowsContainer#removePageChangedListener(org.eclipse.papyrus.sasheditor.editor.IPageChangedListener)

+	 * @see org.eclipse.papyrus.infra.core.sasheditor.editor.ISashWindowsContainer#removePageChangedListener(org.eclipse.papyrus.infra.core.sasheditor.editor.IPageChangedListener)

 	 * @param listener

 	 * 

 	 */

diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/sasheditor/editor/SashWindowsEventsProvider.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/editor/SashWindowsEventsProvider.java
index e2c392d6601..537a2c5656e 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/sasheditor/editor/SashWindowsEventsProvider.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/editor/SashWindowsEventsProvider.java
@@ -1,7 +1,7 @@
 /**

  * 

  */

-package org.eclipse.papyrus.sasheditor.editor;

+package org.eclipse.papyrus.infra.core.sasheditor.editor;

 

 import java.util.ArrayList;

 import java.util.List;

@@ -384,7 +384,7 @@ public class SashWindowsEventsProvider {
 		/**

 		 * Call the appropriate method on the listener.

 		 * 

-		 * @see org.eclipse.papyrus.sasheditor.editor.SashWindowsEventsProvider.ListenersList#propertyChanged(java.lang.Object, java.lang.Object)

+		 * @see org.eclipse.papyrus.infra.core.sasheditor.editor.SashWindowsEventsProvider.ListenersList#propertyChanged(java.lang.Object, java.lang.Object)

 		 * @param listener

 		 * @param newPage

 		 * 

@@ -416,7 +416,7 @@ public class SashWindowsEventsProvider {
 		/**

 		 * Call the appropriate method on the listener.

 		 * 

-		 * @see org.eclipse.papyrus.sasheditor.editor.SashWindowsEventsProvider.ListenersList#propertyChanged(java.lang.Object, java.lang.Object)

+		 * @see org.eclipse.papyrus.infra.core.sasheditor.editor.SashWindowsEventsProvider.ListenersList#propertyChanged(java.lang.Object, java.lang.Object)

 		 * @param listener

 		 * @param newPage

 		 * 

diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/sasheditor/editor/actionbarcontributor/ComposedActionBarContributor.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/editor/actionbarcontributor/ComposedActionBarContributor.java
index 2637e6bafe3..a5c7626003e 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/sasheditor/editor/actionbarcontributor/ComposedActionBarContributor.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/editor/actionbarcontributor/ComposedActionBarContributor.java
@@ -1,7 +1,7 @@
 /**

  * 

  */

-package org.eclipse.papyrus.sasheditor.editor.actionbarcontributor;

+package org.eclipse.papyrus.infra.core.sasheditor.editor.actionbarcontributor;

 

 import java.util.logging.Level;

 

diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/sasheditor/editor/actionbarcontributor/IMultiPageEditorActionBarContributor.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/editor/actionbarcontributor/IMultiPageEditorActionBarContributor.java
index cd4a4f5b045..51d294c99a0 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/sasheditor/editor/actionbarcontributor/IMultiPageEditorActionBarContributor.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/editor/actionbarcontributor/IMultiPageEditorActionBarContributor.java
@@ -11,7 +11,7 @@
  *  Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Initial API and implementation

  *

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

-package org.eclipse.papyrus.sasheditor.editor.actionbarcontributor;

+package org.eclipse.papyrus.infra.core.sasheditor.editor.actionbarcontributor;

 

 import org.eclipse.ui.IEditorPart;

 

diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/sasheditor/editor/actionbarcontributor/MultiPageEditorActionBarContributor.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/editor/actionbarcontributor/MultiPageEditorActionBarContributor.java
index 21a1f34c092..ef6e754d645 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/sasheditor/editor/actionbarcontributor/MultiPageEditorActionBarContributor.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/editor/actionbarcontributor/MultiPageEditorActionBarContributor.java
@@ -8,11 +8,11 @@
  * Contributors:

  *     IBM Corporation - initial API and implementation

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

-package org.eclipse.papyrus.sasheditor.editor.actionbarcontributor;

+package org.eclipse.papyrus.infra.core.sasheditor.editor.actionbarcontributor;

 

 import java.util.logging.Logger;

 

-import org.eclipse.papyrus.sasheditor.editor.IMultiPageEditorPart;

+import org.eclipse.papyrus.infra.core.sasheditor.editor.IMultiPageEditorPart;

 import org.eclipse.ui.IEditorPart;

 import org.eclipse.ui.part.EditorActionBarContributor;

 

diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/sasheditor/editor/gef/MultiDiagramEditorGefDelegate.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/editor/gef/MultiDiagramEditorGefDelegate.java
index ec2a1d58c30..4d044f510ae 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/sasheditor/editor/gef/MultiDiagramEditorGefDelegate.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/editor/gef/MultiDiagramEditorGefDelegate.java
@@ -11,7 +11,7 @@
  *  Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Initial API and implementation

  *

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

-package org.eclipse.papyrus.sasheditor.editor.gef;

+package org.eclipse.papyrus.infra.core.sasheditor.editor.gef;

 

 import java.util.ArrayList;

 import java.util.List;

diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/sasheditor/internal/AbstractPanelPart.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/AbstractPanelPart.java
index 8900e34dc64..1e9ef702e0c 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/sasheditor/internal/AbstractPanelPart.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/AbstractPanelPart.java
@@ -12,7 +12,7 @@
  *

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

 

-package org.eclipse.papyrus.sasheditor.internal;

+package org.eclipse.papyrus.infra.core.sasheditor.internal;

 

 import org.eclipse.swt.graphics.Point;

 import org.eclipse.swt.widgets.Composite;

diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/sasheditor/internal/AbstractPart.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/AbstractPart.java
index d2c77276629..a7d8ba2f5bf 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/sasheditor/internal/AbstractPart.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/AbstractPart.java
@@ -11,10 +11,10 @@
  *  Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Initial API and implementation

  *

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

-package org.eclipse.papyrus.sasheditor.internal;

+package org.eclipse.papyrus.infra.core.sasheditor.internal;

 

-import org.eclipse.papyrus.sasheditor.contentprovider.ISashWindowsContentProvider;

-import org.eclipse.papyrus.sasheditor.editor.SashWindowsContainer;

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

+import org.eclipse.papyrus.infra.core.sasheditor.editor.SashWindowsContainer;

 

 /**

  * Base class of the Part hierarchy. This class provides common methods for

diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/sasheditor/internal/ActiveEditorServicesSwitcher.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/ActiveEditorServicesSwitcher.java
index bc2bc2af923..1c994ac127b 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/sasheditor/internal/ActiveEditorServicesSwitcher.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/ActiveEditorServicesSwitcher.java
@@ -11,17 +11,17 @@
  *  Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Initial API and implementation

  *

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

-package org.eclipse.papyrus.sasheditor.internal;

+package org.eclipse.papyrus.infra.core.sasheditor.internal;

 

 import java.util.logging.Level;

 import java.util.logging.Logger;

 

 import org.eclipse.jface.viewers.ISelectionProvider;

 import org.eclipse.jface.viewers.SelectionChangedEvent;

-import org.eclipse.papyrus.sasheditor.editor.SashWindowsContainer;

-import org.eclipse.papyrus.sasheditor.editor.actionbarcontributor.IMultiPageEditorActionBarContributor;

-import org.eclipse.papyrus.sasheditor.internal.ActivePageTracker.IActiveEditorChangedListener;

-import org.eclipse.papyrus.sasheditor.internal.eclipsecopy.MultiPageSelectionProvider;

+import org.eclipse.papyrus.infra.core.sasheditor.editor.SashWindowsContainer;

+import org.eclipse.papyrus.infra.core.sasheditor.editor.actionbarcontributor.IMultiPageEditorActionBarContributor;

+import org.eclipse.papyrus.infra.core.sasheditor.internal.ActivePageTracker.IActiveEditorChangedListener;

+import org.eclipse.papyrus.infra.core.sasheditor.internal.eclipsecopy.MultiPageSelectionProvider;

 import org.eclipse.ui.IEditorActionBarContributor;

 import org.eclipse.ui.IEditorPart;

 import org.eclipse.ui.IEditorSite;

diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/sasheditor/internal/ActivePageTracker.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/ActivePageTracker.java
index b8b11a93ae8..78c6304a481 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/sasheditor/internal/ActivePageTracker.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/ActivePageTracker.java
@@ -11,14 +11,14 @@
  *  Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Initial API and implementation

  *

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

-package org.eclipse.papyrus.sasheditor.internal;

+package org.eclipse.papyrus.infra.core.sasheditor.internal;

 

 import java.util.ArrayList;

 import java.util.List;

 import java.util.logging.Logger;

 

-import org.eclipse.papyrus.sasheditor.editor.IPageChangedListener;

-import org.eclipse.papyrus.sasheditor.internal.ActivePageTracker.IActiveEditorChangedListener;

+import org.eclipse.papyrus.infra.core.sasheditor.editor.IPageChangedListener;

+import org.eclipse.papyrus.infra.core.sasheditor.internal.ActivePageTracker.IActiveEditorChangedListener;

 

 /**

  * Instance of this class track the active Page. When the active Page change,

diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/sasheditor/internal/ComponentPart.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/ComponentPart.java
index 95ecc23a805..7bf799422fc 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/sasheditor/internal/ComponentPart.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/ComponentPart.java
@@ -11,13 +11,13 @@
  *  Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Initial API and implementation

  *

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

-package org.eclipse.papyrus.sasheditor.internal;

+package org.eclipse.papyrus.infra.core.sasheditor.internal;

 

 import org.eclipse.core.runtime.IStatus;

 import org.eclipse.core.runtime.Status;

-import org.eclipse.papyrus.sasheditor.Activator;

-import org.eclipse.papyrus.sasheditor.contentprovider.IComponentModel;

-import org.eclipse.papyrus.sasheditor.editor.IComponentPage;

+import org.eclipse.papyrus.infra.core.sasheditor.Activator;

+import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IComponentModel;

+import org.eclipse.papyrus.infra.core.sasheditor.editor.IComponentPage;

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.graphics.Image;

 import org.eclipse.swt.graphics.Point;

diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/sasheditor/internal/Copyright.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/Copyright.java
index dad56534512..bf356d466f1 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/sasheditor/internal/Copyright.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/Copyright.java
@@ -12,7 +12,7 @@
  *

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

 

-package org.eclipse.papyrus.sasheditor.internal;

+package org.eclipse.papyrus.infra.core.sasheditor.internal;

 

 /**

  * @author dumoulin

diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/sasheditor/internal/EditorPart.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/EditorPart.java
index 918ad9c921b..5cb1d6d9afc 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/sasheditor/internal/EditorPart.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/EditorPart.java
@@ -11,7 +11,7 @@
  *  Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Initial API and implementation

  *

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

-package org.eclipse.papyrus.sasheditor.internal;

+package org.eclipse.papyrus.infra.core.sasheditor.internal;

 

 import java.io.PrintWriter;

 import java.io.StringWriter;

@@ -19,12 +19,12 @@ import java.io.StringWriter;
 import org.eclipse.core.runtime.IStatus;

 import org.eclipse.core.runtime.Status;

 import org.eclipse.jface.window.Window;

-import org.eclipse.papyrus.sasheditor.Activator;

-import org.eclipse.papyrus.sasheditor.contentprovider.IEditorModel;

-import org.eclipse.papyrus.sasheditor.editor.IEditorPage;

-import org.eclipse.papyrus.sasheditor.editor.IMultiEditorManager;

-import org.eclipse.papyrus.sasheditor.editor.SashWindowsContainer;

-import org.eclipse.papyrus.sasheditor.internal.eclipsecopy.MultiPageEditorSite;

+import org.eclipse.papyrus.infra.core.sasheditor.Activator;

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

+import org.eclipse.papyrus.infra.core.sasheditor.editor.IEditorPage;

+import org.eclipse.papyrus.infra.core.sasheditor.editor.IMultiEditorManager;

+import org.eclipse.papyrus.infra.core.sasheditor.editor.SashWindowsContainer;

+import org.eclipse.papyrus.infra.core.sasheditor.internal.eclipsecopy.MultiPageEditorSite;

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.graphics.Image;

 import org.eclipse.swt.graphics.Point;

diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/sasheditor/internal/IPanelParent.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/IPanelParent.java
index d3c02a1f8d6..0df25da7607 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/sasheditor/internal/IPanelParent.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/IPanelParent.java
@@ -11,9 +11,9 @@
  *  Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Initial API and implementation

  *

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

-package org.eclipse.papyrus.sasheditor.internal;

+package org.eclipse.papyrus.infra.core.sasheditor.internal;

 

-import org.eclipse.papyrus.sasheditor.editor.SashWindowsContainer;

+import org.eclipse.papyrus.infra.core.sasheditor.editor.SashWindowsContainer;

 import org.eclipse.swt.widgets.Composite;

 

 /**

diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/sasheditor/internal/IPartVisitor.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/IPartVisitor.java
index 538851f11ea..fa8a2cd3075 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/sasheditor/internal/IPartVisitor.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/IPartVisitor.java
@@ -11,7 +11,7 @@
  *  Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Initial API and implementation

  *

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

-package org.eclipse.papyrus.sasheditor.internal;

+package org.eclipse.papyrus.infra.core.sasheditor.internal;

 

 /**

  * Visitor used to visit the hierarchy of Parts. Visit can be stopped by

diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/sasheditor/internal/ImageToolTipManager.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/ImageToolTipManager.java
index 3e9a0fdd147..bff6c86abb3 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/sasheditor/internal/ImageToolTipManager.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/ImageToolTipManager.java
@@ -11,13 +11,13 @@
  *  Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Initial API and implementation

  *

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

-package org.eclipse.papyrus.sasheditor.internal;

+package org.eclipse.papyrus.infra.core.sasheditor.internal;

 

 import java.util.logging.Logger;

 

-import org.eclipse.papyrus.sasheditor.editor.IPageImageUtils;

-import org.eclipse.papyrus.sasheditor.internal.preferences.ITabTooltipPreferences;

-import org.eclipse.papyrus.sasheditor.internal.preferences.TabTooltipPreferences;

+import org.eclipse.papyrus.infra.core.sasheditor.editor.IPageImageUtils;

+import org.eclipse.papyrus.infra.core.sasheditor.internal.preferences.ITabTooltipPreferences;

+import org.eclipse.papyrus.infra.core.sasheditor.internal.preferences.TabTooltipPreferences;

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.graphics.Device;

 import org.eclipse.swt.graphics.GC;

diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/sasheditor/internal/LookupFolderPartByRawModelVisitor.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/LookupFolderPartByRawModelVisitor.java
index 4f2a6960c69..2cff40eeee8 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/sasheditor/internal/LookupFolderPartByRawModelVisitor.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/LookupFolderPartByRawModelVisitor.java
@@ -1,7 +1,7 @@
 /**

  * 

  */

-package org.eclipse.papyrus.sasheditor.internal;

+package org.eclipse.papyrus.infra.core.sasheditor.internal;

 

 /**

  * A visitor used to lookup a {@link TabFolderPart} by its raw model.

diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/sasheditor/internal/LookupIPageByIEditorPartVisitor.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/LookupIPageByIEditorPartVisitor.java
index a5f2e1171bf..705e888abd1 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/sasheditor/internal/LookupIPageByIEditorPartVisitor.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/LookupIPageByIEditorPartVisitor.java
@@ -1,9 +1,9 @@
 /**

  * 

  */

-package org.eclipse.papyrus.sasheditor.internal;

+package org.eclipse.papyrus.infra.core.sasheditor.internal;

 

-import org.eclipse.papyrus.sasheditor.editor.IPage;

+import org.eclipse.papyrus.infra.core.sasheditor.editor.IPage;

 import org.eclipse.ui.IEditorPart;

 

 /**

diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/sasheditor/internal/LookupModelPageVisitor.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/LookupModelPageVisitor.java
index f78a8456981..a6d64983758 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/sasheditor/internal/LookupModelPageVisitor.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/LookupModelPageVisitor.java
@@ -1,9 +1,9 @@
 /**

  * 

  */

-package org.eclipse.papyrus.sasheditor.internal;

+package org.eclipse.papyrus.infra.core.sasheditor.internal;

 

-import org.eclipse.papyrus.sasheditor.editor.IPage;

+import org.eclipse.papyrus.infra.core.sasheditor.editor.IPage;

 

 /**

  * A visitor used to lookup a PagePart from its raw model.

diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/sasheditor/internal/NotFoundException.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/NotFoundException.java
index e24e901069d..8fd684b6554 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/sasheditor/internal/NotFoundException.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/NotFoundException.java
@@ -11,7 +11,7 @@
  *  Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Initial API and implementation

  *

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

-package org.eclipse.papyrus.sasheditor.internal;

+package org.eclipse.papyrus.infra.core.sasheditor.internal;

 

 /**

  * Exception thrown when a search or lookup fails.

diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/sasheditor/internal/PTabFolder.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/PTabFolder.java
index 1c28a352ad6..3cb5eb3cd66 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/sasheditor/internal/PTabFolder.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/PTabFolder.java
@@ -11,7 +11,7 @@
  *  Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Initial API and implementation

  *

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

-package org.eclipse.papyrus.sasheditor.internal;

+package org.eclipse.papyrus.infra.core.sasheditor.internal;

 

 import java.util.HashSet;

 import java.util.Set;

diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/sasheditor/internal/PagePart.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/PagePart.java
index 9de1c0941e6..ffef343925b 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/sasheditor/internal/PagePart.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/PagePart.java
@@ -11,9 +11,9 @@
  *  Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Initial API and implementation

  *

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

-package org.eclipse.papyrus.sasheditor.internal;

+package org.eclipse.papyrus.infra.core.sasheditor.internal;

 

-import org.eclipse.papyrus.sasheditor.editor.IPage;

+import org.eclipse.papyrus.infra.core.sasheditor.editor.IPage;

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.graphics.GC;

 import org.eclipse.swt.graphics.Image;

diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/sasheditor/internal/PageVisitorWrapper.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/PageVisitorWrapper.java
index 0a900678b5d..69aed4c2c5c 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/sasheditor/internal/PageVisitorWrapper.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/PageVisitorWrapper.java
@@ -1,10 +1,10 @@
 /**

  * 

  */

-package org.eclipse.papyrus.sasheditor.internal;

+package org.eclipse.papyrus.infra.core.sasheditor.internal;

 

-import org.eclipse.papyrus.sasheditor.editor.IEditorPage;

-import org.eclipse.papyrus.sasheditor.editor.IPageVisitor;

+import org.eclipse.papyrus.infra.core.sasheditor.editor.IEditorPage;

+import org.eclipse.papyrus.infra.core.sasheditor.editor.IPageVisitor;

 

 /**

  * A wrapper used to let the provided public visitor use the internal visitor to

diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/sasheditor/internal/PartLists.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/PartLists.java
index 0c33340a245..8c19ef3719e 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/sasheditor/internal/PartLists.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/PartLists.java
@@ -11,7 +11,7 @@
  *  Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Initial API and implementation

  *

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

-package org.eclipse.papyrus.sasheditor.internal;

+package org.eclipse.papyrus.infra.core.sasheditor.internal;

 

 import java.util.ArrayList;

 import java.util.List;

diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/sasheditor/internal/PartVisitor.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/PartVisitor.java
index 968520e4264..74851810727 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/sasheditor/internal/PartVisitor.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/PartVisitor.java
@@ -11,7 +11,7 @@
  *  Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Initial API and implementation

  *

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

-package org.eclipse.papyrus.sasheditor.internal;

+package org.eclipse.papyrus.infra.core.sasheditor.internal;

 

 /**

  * Visitor implementation allowing to visit the hierarchy of Parts.

diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/sasheditor/internal/ReplaceableSashForm.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/ReplaceableSashForm.java
index 2318f0920c4..fa7dbfcddac 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/sasheditor/internal/ReplaceableSashForm.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/ReplaceableSashForm.java
@@ -11,7 +11,7 @@
  *  Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Initial API and implementation

  *

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

-package org.eclipse.papyrus.sasheditor.internal;

+package org.eclipse.papyrus.infra.core.sasheditor.internal;

 

 import org.eclipse.swt.custom.SashForm;

 import org.eclipse.swt.layout.FillLayout;

diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/sasheditor/internal/RootPart.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/RootPart.java
index b984cbf5c71..ec0437d6bed 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/sasheditor/internal/RootPart.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/RootPart.java
@@ -11,13 +11,13 @@
  *  Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Initial API and implementation

  *

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

-package org.eclipse.papyrus.sasheditor.internal;

+package org.eclipse.papyrus.infra.core.sasheditor.internal;

 

-import org.eclipse.papyrus.sasheditor.contentprovider.IAbstractPanelModel;

-import org.eclipse.papyrus.sasheditor.contentprovider.ISashPanelModel;

-import org.eclipse.papyrus.sasheditor.contentprovider.ISashWindowsContentProvider;

-import org.eclipse.papyrus.sasheditor.contentprovider.ITabFolderModel;

-import org.eclipse.papyrus.sasheditor.editor.SashWindowsContainer;

+import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IAbstractPanelModel;

+import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ISashPanelModel;

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

+import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ITabFolderModel;

+import org.eclipse.papyrus.infra.core.sasheditor.editor.SashWindowsContainer;

 import org.eclipse.swt.graphics.Point;

 import org.eclipse.swt.widgets.Composite;

 

@@ -251,8 +251,8 @@ public class RootPart extends AbstractPart implements IPanelParent {
 

 	// /**

 	// * @see

-	// org.eclipse.papyrus.sasheditor.sash.ITilePart#getDropTarget(java.lang.Object,

-	// org.eclipse.papyrus.sasheditor.sash.TabFolderPart,

+	// org.eclipse.papyrus.infra.core.sasheditor.sash.ITilePart#getDropTarget(java.lang.Object,

+	// org.eclipse.papyrus.infra.core.sasheditor.sash.TabFolderPart,

 	// org.eclipse.swt.graphics.Point)

 	// */

 	// public IDropTarget getDropTarget(Object draggedObject, TabFolderPart

@@ -271,7 +271,7 @@ public class RootPart extends AbstractPart implements IPanelParent {
 	/**

 	 * Always return false. This Part can't be orphaned.

 	 * 

-	 * @see org.eclipse.papyrus.sasheditor.internal.AbstractPart#isOrphaned()

+	 * @see org.eclipse.papyrus.infra.core.sasheditor.internal.AbstractPart#isOrphaned()

 	 * 

 	 * @return

 	 */

@@ -282,7 +282,7 @@ public class RootPart extends AbstractPart implements IPanelParent {
 	/**

 	 * Get the Garbage state.

 	 * 

-	 * @see org.eclipse.papyrus.sasheditor.internal.AbstractPart#getGarbageState()

+	 * @see org.eclipse.papyrus.infra.core.sasheditor.internal.AbstractPart#getGarbageState()

 	 * 

 	 * @return

 	 */

@@ -318,7 +318,7 @@ public class RootPart extends AbstractPart implements IPanelParent {
 	 * Show tile status.

 	 */

 	protected void showStatus() {

-		org.eclipse.papyrus.sasheditor.Activator.log.debug("rootPart (1)" + ", disposed=" + container.isDisposed() + ", visible=" + container.isVisible() + ", " + this);

+		org.eclipse.papyrus.infra.core.sasheditor.Activator.log.debug("rootPart (1)" + ", disposed=" + container.isDisposed() + ", visible=" + container.isVisible() + ", " + this);

 	}

 

 }

diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/sasheditor/internal/SashContainerEventsProvider.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/SashContainerEventsProvider.java
index e93c1c92085..c26e5279504 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/sasheditor/internal/SashContainerEventsProvider.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/SashContainerEventsProvider.java
@@ -1,13 +1,13 @@
 /**

  * 

  */

-package org.eclipse.papyrus.sasheditor.internal;

+package org.eclipse.papyrus.infra.core.sasheditor.internal;

 

 import java.util.ArrayList;

 import java.util.List;

 

-import org.eclipse.papyrus.sasheditor.editor.SashContainerEventsListener;

-import org.eclipse.papyrus.sasheditor.editor.SashWindowsContainer;

+import org.eclipse.papyrus.infra.core.sasheditor.editor.SashContainerEventsListener;

+import org.eclipse.papyrus.infra.core.sasheditor.editor.SashWindowsContainer;

 

 /**

  * A class managing events of the {@link SashWindowsContainer}. This class

diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/sasheditor/internal/SashPanelPart.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/SashPanelPart.java
index de1cce38a7b..314c08d19e0 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/sasheditor/internal/SashPanelPart.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/SashPanelPart.java
@@ -11,13 +11,13 @@
  *  Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Initial API and implementation

  *

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

-package org.eclipse.papyrus.sasheditor.internal;

+package org.eclipse.papyrus.infra.core.sasheditor.internal;

 

 import java.util.logging.Logger;

 

-import org.eclipse.papyrus.sasheditor.contentprovider.IAbstractPanelModel;

-import org.eclipse.papyrus.sasheditor.contentprovider.ISashPanelModel;

-import org.eclipse.papyrus.sasheditor.contentprovider.ITabFolderModel;

+import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IAbstractPanelModel;

+import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ISashPanelModel;

+import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ITabFolderModel;

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.graphics.Point;

 import org.eclipse.swt.graphics.Rectangle;

@@ -174,7 +174,7 @@ public class SashPanelPart extends AbstractPanelPart implements IPanelParent {
 	/**

 	 * Get the sash container.

 	 * 

-	 * @see org.eclipse.papyrus.sasheditor.internal.AbstractPanelPart#getControl()

+	 * @see org.eclipse.papyrus.infra.core.sasheditor.internal.AbstractPanelPart#getControl()

 	 * 

 	 * @return

 	 */

@@ -296,7 +296,7 @@ public class SashPanelPart extends AbstractPanelPart implements IPanelParent {
 	/**

 	 * Find the part associated to the provided control.

 	 * 

-	 * @see org.eclipse.papyrus.sasheditor.sash.ITilePart#findPart(org.eclipse.swt.widgets.Control)

+	 * @see org.eclipse.papyrus.infra.core.sasheditor.sash.ITilePart#findPart(org.eclipse.swt.widgets.Control)

 	 */

 	@Override

 	public AbstractPart findPart(Object control) {

@@ -347,7 +347,7 @@ public class SashPanelPart extends AbstractPanelPart implements IPanelParent {
 	/**

 	 * Synchronize the sash.

 	 * 

-	 * @see org.eclipse.papyrus.sasheditor.internal.AbstractPanelPart#synchronize2(org.eclipse.papyrus.sasheditor.internal.PartLists)

+	 * @see org.eclipse.papyrus.infra.core.sasheditor.internal.AbstractPanelPart#synchronize2(org.eclipse.papyrus.infra.core.sasheditor.internal.PartLists)

 	 * 

 	 * @param partMap

 	 */

@@ -474,7 +474,7 @@ public class SashPanelPart extends AbstractPanelPart implements IPanelParent {
 	 * Show tile status. Used for debug purpose

 	 */

 	protected void showStatus() {

-		org.eclipse.papyrus.sasheditor.Activator.log.debug("sash[" + currentChildParts.length + "]:" + ", disposed=" + container.isDisposed() + ", visible=" + container.isVisible() + ", garbState=" + garbageState + ", " + this);

+		org.eclipse.papyrus.infra.core.sasheditor.Activator.log.debug("sash[" + currentChildParts.length + "]:" + ", disposed=" + container.isDisposed() + ", visible=" + container.isVisible() + ", garbState=" + garbageState + ", " + this);

 	}

 

 }

diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/sasheditor/internal/SashWindowsException.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/SashWindowsException.java
index 947b04bcbc9..0f259d58e67 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/sasheditor/internal/SashWindowsException.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/SashWindowsException.java
@@ -11,7 +11,7 @@
  *  Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Initial API and implementation

  *

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

-package org.eclipse.papyrus.sasheditor.internal;

+package org.eclipse.papyrus.infra.core.sasheditor.internal;

 

 /**

  * Main Exception from the SashWindowsSystem.

diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/sasheditor/internal/ShowPartStatusVisitor.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/ShowPartStatusVisitor.java
index bac2c993d3e..0297ddf1637 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/sasheditor/internal/ShowPartStatusVisitor.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/ShowPartStatusVisitor.java
@@ -11,7 +11,7 @@
  *  Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Initial API and implementation

  *

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

-package org.eclipse.papyrus.sasheditor.internal;

+package org.eclipse.papyrus.infra.core.sasheditor.internal;

 

 /**

  * Visitor used to show the status of the different Tiles composing the sash

diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/sasheditor/internal/TabFolderPart.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/TabFolderPart.java
index 208ff40f692..7636c55d0b3 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/sasheditor/internal/TabFolderPart.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/TabFolderPart.java
@@ -11,7 +11,7 @@
  *  Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Initial API and implementation

  *

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

-package org.eclipse.papyrus.sasheditor.internal;

+package org.eclipse.papyrus.infra.core.sasheditor.internal;

 

 import java.util.ArrayList;

 import java.util.List;

@@ -19,10 +19,10 @@ import java.util.logging.Logger;
 

 import org.eclipse.jface.action.MenuManager;

 import org.eclipse.jface.util.Geometry;

-import org.eclipse.papyrus.sasheditor.contentprovider.IPageModel;

-import org.eclipse.papyrus.sasheditor.contentprovider.ITabFolderModel;

-import org.eclipse.papyrus.sasheditor.editor.SashWindowsContainer;

-import org.eclipse.papyrus.sasheditor.internal.eclipsecopy.AbstractTabFolderPart;

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

+import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ITabFolderModel;

+import org.eclipse.papyrus.infra.core.sasheditor.editor.SashWindowsContainer;

+import org.eclipse.papyrus.infra.core.sasheditor.internal.eclipsecopy.AbstractTabFolderPart;

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.custom.CTabFolder;

 import org.eclipse.swt.custom.CTabFolderEvent;

@@ -311,7 +311,7 @@ public class TabFolderPart extends AbstractTabFolderPart {
 	/**

 	 * Dispose the TilePart and its controls.

 	 * 

-	 * @see org.eclipse.papyrus.sasheditor.eclipsecopy.MultiPageEditorTile#dispose()

+	 * @see org.eclipse.papyrus.infra.core.sasheditor.eclipsecopy.MultiPageEditorTile#dispose()

 	 */

 	public void dispose() {

 		// detach menu as it is shared between folders.

@@ -480,8 +480,8 @@ public class TabFolderPart extends AbstractTabFolderPart {
 

 	/**

 	 * 

-	 * @see org.eclipse.papyrus.sasheditor.internal.AbstractPanelPart#getDropTarget(java.lang.Object,

-	 *      org.eclipse.papyrus.sasheditor.internal.TabFolderPart, org.eclipse.swt.graphics.Point)

+	 * @see org.eclipse.papyrus.infra.core.sasheditor.internal.AbstractPanelPart#getDropTarget(java.lang.Object,

+	 *      org.eclipse.papyrus.infra.core.sasheditor.internal.TabFolderPart, org.eclipse.swt.graphics.Point)

 	 * 

 	 * @param draggedObject

 	 * @param sourcePart

@@ -681,7 +681,7 @@ public class TabFolderPart extends AbstractTabFolderPart {
 

 	/**

 	 * 

-	 * @see org.eclipse.papyrus.sasheditor.internal.AbstractPart#getGarbageState()

+	 * @see org.eclipse.papyrus.infra.core.sasheditor.internal.AbstractPart#getGarbageState()

 	 * 

 	 * @return

 	 */

@@ -692,7 +692,7 @@ public class TabFolderPart extends AbstractTabFolderPart {
 	/**

 	 * Change the parent of this method.

 	 * 

-	 * @see org.eclipse.papyrus.sasheditor.sash.ITilePart#reparent(org.eclipse.papyrus.sasheditor.sash.ITilePart)

+	 * @see org.eclipse.papyrus.infra.core.sasheditor.sash.ITilePart#reparent(org.eclipse.papyrus.infra.core.sasheditor.sash.ITilePart)

 	 */

 	public void reparent(IPanelParent newParent, Composite swtParent) {

 		parent = newParent;

diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/sasheditor/internal/TabItemPart.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/TabItemPart.java
index cca4c7c1220..89dc1543ff1 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/sasheditor/internal/TabItemPart.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/TabItemPart.java
@@ -11,9 +11,9 @@
  *  Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Initial API and implementation

  *

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

-package org.eclipse.papyrus.sasheditor.internal;

+package org.eclipse.papyrus.infra.core.sasheditor.internal;

 

-import org.eclipse.papyrus.sasheditor.internal.AbstractPart.GarbageState;

+import org.eclipse.papyrus.infra.core.sasheditor.internal.AbstractPart.GarbageState;

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.custom.CTabFolder;

 import org.eclipse.swt.custom.CTabItem;

diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/sasheditor/internal/eclipsecopy/AbstractTabFolderPart.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/eclipsecopy/AbstractTabFolderPart.java
index bd1a2a0d57b..293021bd59a 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/sasheditor/internal/eclipsecopy/AbstractTabFolderPart.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/eclipsecopy/AbstractTabFolderPart.java
@@ -8,10 +8,10 @@
  * Contributors:

  *     IBM Corporation - initial API and implementation

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

-package org.eclipse.papyrus.sasheditor.internal.eclipsecopy;

+package org.eclipse.papyrus.infra.core.sasheditor.internal.eclipsecopy;

 

-import org.eclipse.papyrus.sasheditor.internal.AbstractPanelPart;

-import org.eclipse.papyrus.sasheditor.internal.IPanelParent;

+import org.eclipse.papyrus.infra.core.sasheditor.internal.AbstractPanelPart;

+import org.eclipse.papyrus.infra.core.sasheditor.internal.IPanelParent;

 import org.eclipse.swt.custom.CTabFolder;

 import org.eclipse.swt.custom.CTabItem;

 import org.eclipse.swt.widgets.Composite;

diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/sasheditor/internal/eclipsecopy/MultiPageEditorSite.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/eclipsecopy/MultiPageEditorSite.java
index 81b3712533f..e951ee899a5 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/sasheditor/internal/eclipsecopy/MultiPageEditorSite.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/eclipsecopy/MultiPageEditorSite.java
@@ -8,7 +8,7 @@
  * Contributors:

  *     IBM Corporation - initial API and implementation

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

-package org.eclipse.papyrus.sasheditor.internal.eclipsecopy;

+package org.eclipse.papyrus.infra.core.sasheditor.internal.eclipsecopy;

 

 import java.util.ArrayList;

 

diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/sasheditor/internal/eclipsecopy/MultiPageSelectionProvider.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/eclipsecopy/MultiPageSelectionProvider.java
index 3b6c9bed10c..8030ae5cea4 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/sasheditor/internal/eclipsecopy/MultiPageSelectionProvider.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/eclipsecopy/MultiPageSelectionProvider.java
@@ -8,7 +8,7 @@
  * Contributors:

  *     IBM Corporation - initial API and implementation

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

-package org.eclipse.papyrus.sasheditor.internal.eclipsecopy;

+package org.eclipse.papyrus.infra.core.sasheditor.internal.eclipsecopy;

 

 import org.eclipse.core.runtime.Assert;

 import org.eclipse.core.runtime.ListenerList;

@@ -20,7 +20,7 @@ import org.eclipse.jface.viewers.ISelectionChangedListener;
 import org.eclipse.jface.viewers.ISelectionProvider;

 import org.eclipse.jface.viewers.SelectionChangedEvent;

 import org.eclipse.jface.viewers.StructuredSelection;

-import org.eclipse.papyrus.sasheditor.editor.IMultiPageEditorPart;

+import org.eclipse.papyrus.infra.core.sasheditor.editor.IMultiPageEditorPart;

 import org.eclipse.ui.IEditorPart;

 

 /**

diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/sasheditor/internal/preferences/ITabTooltipPreferences.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/preferences/ITabTooltipPreferences.java
index b05d96fc1f4..38e7705a7be 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/sasheditor/internal/preferences/ITabTooltipPreferences.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/preferences/ITabTooltipPreferences.java
@@ -1,4 +1,4 @@
-package org.eclipse.papyrus.sasheditor.internal.preferences;

+package org.eclipse.papyrus.infra.core.sasheditor.internal.preferences;

 

 

 

diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/sasheditor/internal/preferences/ShowPreferencesHandler.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/preferences/ShowPreferencesHandler.java
index be0954dca67..f24cccc6c6c 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/sasheditor/internal/preferences/ShowPreferencesHandler.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/preferences/ShowPreferencesHandler.java
@@ -1,7 +1,7 @@
 /**

  * 

  */

-package org.eclipse.papyrus.sasheditor.internal.preferences;

+package org.eclipse.papyrus.infra.core.sasheditor.internal.preferences;

 

 import org.eclipse.core.commands.AbstractHandler;

 import org.eclipse.core.commands.ExecutionEvent;

diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/sasheditor/internal/preferences/TabTooltipPreferenceInitializer.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/preferences/TabTooltipPreferenceInitializer.java
index 1c235922b82..f4756122585 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/sasheditor/internal/preferences/TabTooltipPreferenceInitializer.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/preferences/TabTooltipPreferenceInitializer.java
@@ -1,9 +1,9 @@
-package org.eclipse.papyrus.sasheditor.internal.preferences;
+package org.eclipse.papyrus.infra.core.sasheditor.internal.preferences;
 
 import org.eclipse.core.runtime.preferences.AbstractPreferenceInitializer;
 import org.eclipse.core.runtime.preferences.DefaultScope;
 import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.sasheditor.Activator;
+import org.eclipse.papyrus.infra.core.sasheditor.Activator;
 import org.eclipse.ui.preferences.ScopedPreferenceStore;
 
 /**
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/sasheditor/internal/preferences/TabTooltipPreferencePage.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/preferences/TabTooltipPreferencePage.java
index 575ddf5bfea..fb4c6447916 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/sasheditor/internal/preferences/TabTooltipPreferencePage.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/preferences/TabTooltipPreferencePage.java
@@ -1,4 +1,4 @@
-package org.eclipse.papyrus.sasheditor.internal.preferences;
+package org.eclipse.papyrus.infra.core.sasheditor.internal.preferences;
 
 import org.eclipse.core.runtime.preferences.InstanceScope;
 import org.eclipse.jface.preference.BooleanFieldEditor;
@@ -6,7 +6,7 @@ import org.eclipse.jface.preference.FieldEditorPreferencePage;
 import org.eclipse.jface.preference.IPreferenceStore;
 import org.eclipse.jface.preference.IntegerFieldEditor;
 import org.eclipse.jface.preference.ScaleFieldEditor;
-import org.eclipse.papyrus.sasheditor.Activator;
+import org.eclipse.papyrus.infra.core.sasheditor.Activator;
 import org.eclipse.ui.IWorkbench;
 import org.eclipse.ui.IWorkbenchPreferencePage;
 import org.eclipse.ui.preferences.ScopedPreferenceStore;
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/sasheditor/internal/preferences/TabTooltipPreferences.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/preferences/TabTooltipPreferences.java
index 4d059e9b886..cbf2a93726b 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/sasheditor/internal/preferences/TabTooltipPreferences.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/preferences/TabTooltipPreferences.java
@@ -1,11 +1,11 @@
 /**

  * 

  */

-package org.eclipse.papyrus.sasheditor.internal.preferences;

+package org.eclipse.papyrus.infra.core.sasheditor.internal.preferences;

 

 import org.eclipse.core.runtime.preferences.InstanceScope;

 import org.eclipse.jface.preference.IPreferenceStore;

-import org.eclipse.papyrus.sasheditor.Activator;

+import org.eclipse.papyrus.infra.core.sasheditor.Activator;

 import org.eclipse.ui.preferences.ScopedPreferenceStore;

 

 

diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/sasheditor/multipage/editor/MultiPageEditor.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/multipage/editor/MultiPageEditor.java
index f4eea220a4b..ad06108309f 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/sasheditor/multipage/editor/MultiPageEditor.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/multipage/editor/MultiPageEditor.java
@@ -11,7 +11,7 @@
  *  Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Initial API and implementation

  *

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

-package org.eclipse.papyrus.sasheditor.multipage.editor;

+package org.eclipse.papyrus.infra.core.sasheditor.multipage.editor;

 

 import java.util.ArrayList;

 import java.util.Iterator;

@@ -20,13 +20,13 @@ import java.util.logging.Level;
 import java.util.logging.Logger;

 

 import org.eclipse.jface.dialogs.ErrorDialog;

-import org.eclipse.papyrus.sasheditor.contentprovider.IAbstractPanelModel;

-import org.eclipse.papyrus.sasheditor.contentprovider.IComponentModel;

-import org.eclipse.papyrus.sasheditor.contentprovider.IEditorModel;

-import org.eclipse.papyrus.sasheditor.contentprovider.IPageModel;

-import org.eclipse.papyrus.sasheditor.contentprovider.ISashPanelModel;

-import org.eclipse.papyrus.sasheditor.contentprovider.ISashWindowsContentProvider;

-import org.eclipse.papyrus.sasheditor.contentprovider.ITabFolderModel;

+import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IAbstractPanelModel;

+import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IComponentModel;

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

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

+import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ISashPanelModel;

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

+import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ITabFolderModel;

 import org.eclipse.swt.graphics.Image;

 import org.eclipse.swt.widgets.Composite;

 import org.eclipse.ui.IEditorPart;

diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core/.options b/plugins/infra/core/org.eclipse.papyrus.infra.core/.options
index e98ce7bb88b..7b6d533158e 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core/.options
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core/.options
@@ -1,6 +1,6 @@
 # master switch  

-org.eclipse.papyrus.core/debug=true  

+org.eclipse.papyrus.infra.core/debug=true  

 #  switch for tracing papyrus core 

-org.eclipse.papyrus.core/debug/core=true 

+org.eclipse.papyrus.infra.core/debug/core=true 

 #  switch for tracing papyrus extension point loading

-org.eclipse.papyrus.core/debug/extensionpoint=true
\ No newline at end of file
+org.eclipse.papyrus.infra.core/debug/extensionpoint=true
\ No newline at end of file
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core/META-INF/MANIFEST.MF b/plugins/infra/core/org.eclipse.papyrus.infra.core/META-INF/MANIFEST.MF
index f119db8a1f4..0523b8ad727 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core/META-INF/MANIFEST.MF
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core/META-INF/MANIFEST.MF
@@ -1,36 +1,36 @@
 Manifest-Version: 1.0

-Require-Bundle: org.eclipse.papyrus.infra.sasheditor;bundle-version="0.9.0";visibility:=reexport,

- org.eclipse.papyrus.infra.sasheditor.di;bundle-version="0.9.0";visibility:=reexport,

+Require-Bundle: org.eclipse.papyrus.infra.core.sasheditor;bundle-version="0.9.0";visibility:=reexport,

+ org.eclipse.papyrus.infra.core.sasheditor.di;bundle-version="0.9.0";visibility:=reexport,

  org.eclipse.ui.ide;bundle-version="3.4.0";visibility:=reexport,

  org.eclipse.gmf.runtime.diagram.ui;bundle-version="1.1.0";visibility:=reexport,

  org.eclipse.emf.edit.ui;bundle-version="2.6.0";visibility:=reexport,

  org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="0.9.0";visibility:=reexport

-Export-Package: org.eclipse.papyrus.core,

- org.eclipse.papyrus.core.contentoutline,

- org.eclipse.papyrus.core.editor,

- org.eclipse.papyrus.core.editorsfactory,

- org.eclipse.papyrus.core.extension,

- org.eclipse.papyrus.core.extension.commands,

- org.eclipse.papyrus.core.extension.diagrameditor,

- org.eclipse.papyrus.core.lifecycleevents,

- org.eclipse.papyrus.core.listenerservice,

- org.eclipse.papyrus.core.modelsetquery,

- org.eclipse.papyrus.core.modelsetquery.impl;x-friends:="org.eclipse.papyrus.uml.resourceloading.profile",

- org.eclipse.papyrus.core.multidiagram.actionbarcontributor,

- org.eclipse.papyrus.core.services,

- org.eclipse.papyrus.core.ui,

- org.eclipse.papyrus.core.utils,

- org.eclipse.papyrus.resource,

- org.eclipse.papyrus.resource.notation,

- org.eclipse.papyrus.resource.sasheditor,

- org.eclipse.papyrus.resource.uml

+Export-Package: org.eclipse.papyrus.infra.core,

+ org.eclipse.papyrus.infra.core.contentoutline,

+ org.eclipse.papyrus.infra.core.editor,

+ org.eclipse.papyrus.infra.core.editorsfactory,

+ org.eclipse.papyrus.infra.core.extension,

+ org.eclipse.papyrus.infra.core.extension.commands,

+ org.eclipse.papyrus.infra.core.extension.diagrameditor,

+ org.eclipse.papyrus.infra.core.lifecycleevents,

+ org.eclipse.papyrus.infra.core.listenerservice,

+ org.eclipse.papyrus.infra.core.modelsetquery,

+ org.eclipse.papyrus.infra.core.modelsetquery.impl;x-friends:="org.eclipse.papyrus.uml.resourceloading.profile",

+ org.eclipse.papyrus.infra.core.multidiagram.actionbarcontributor,

+ org.eclipse.papyrus.infra.core.resource,

+ org.eclipse.papyrus.infra.core.resource.notation,

+ org.eclipse.papyrus.infra.core.resource.sasheditor,

+ org.eclipse.papyrus.infra.core.resource.uml,

+ org.eclipse.papyrus.infra.core.services,

+ org.eclipse.papyrus.infra.core.ui,

+ org.eclipse.papyrus.infra.core.utils

 Bundle-Vendor: %providerName

 Bundle-ActivationPolicy: lazy

 Bundle-Version: 0.9.0.qualifier

 Bundle-Localization: plugin

 Bundle-Name: %pluginName

 Bundle-ManifestVersion: 2

-Bundle-Activator: org.eclipse.papyrus.core.Activator

+Bundle-Activator: org.eclipse.papyrus.infra.core.Activator

 Bundle-SymbolicName: org.eclipse.papyrus.infra.core;singleton:=true

 Bundle-RequiredExecutionEnvironment: J2SE-1.5

 

diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core/plugin.xml b/plugins/infra/core/org.eclipse.papyrus.infra.core/plugin.xml
index 756b31fe0c5..719e8a1b3c0 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core/plugin.xml
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core/plugin.xml
@@ -12,9 +12,9 @@
       <menuContribution

             locationURI="toolbar:org.eclipse.ui.main.toolbar">

          <toolbar

-               id="org.eclipse.papyrus.diagram.ui.toolbar">

+               id="org.eclipse.papyrus.uml.diagram.ui.toolbar">

             <command

-                  commandId="org.eclipse.papyrus.core.commands.dropdowncommand"

+                  commandId="org.eclipse.papyrus.infra.core.commands.dropdowncommand"

                   icon="icons/papyrus/Papyrus_16x16.gif"

                   label="Close Diagrams"

                   style="pulldown"

@@ -23,7 +23,7 @@
                   <with

                         variable="activeEditorId">

                      <equals

-                           value="org.eclipse.papyrus.core.papyrusEditor">

+                           value="org.eclipse.papyrus.infra.core.papyrusEditor">

                      </equals>

                   </with>

                </visibleWhen>

@@ -31,12 +31,12 @@
          </toolbar>

       </menuContribution>

       <menuContribution

-            locationURI="toolbar:org.eclipse.papyrus.diagram.ui.toolbar">

+            locationURI="toolbar:org.eclipse.papyrus.uml.diagram.ui.toolbar">

       </menuContribution>

       <menuContribution

-            locationURI="popup:org.eclipse.papyrus.core.editor.ui.tabmenu?endof=tabcommands">

+            locationURI="popup:org.eclipse.papyrus.infra.core.editor.ui.tabmenu?endof=tabcommands">

          <command

-               commandId="org.eclipse.papyrus.core.commands.closediagram"

+               commandId="org.eclipse.papyrus.infra.core.commands.closediagram"

                label="Close Diagram"

                style="push"

                tooltip="Close Currently Selected Diagram">

@@ -44,13 +44,13 @@
                <with

                      variable="activeEditorId">

                   <equals

-                        value="org.eclipse.papyrus.core.papyrusEditor">

+                        value="org.eclipse.papyrus.infra.core.papyrusEditor">

                   </equals>

                </with>

             </visibleWhen>

          </command>

          <command

-               commandId="org.eclipse.papyrus.core.commands.closealldiagram"

+               commandId="org.eclipse.papyrus.infra.core.commands.closealldiagram"

                label="Close All Diagrams"

                style="push"

                tooltip="Close All Opened Diagrams">

@@ -58,13 +58,13 @@
                <with

                      variable="activeEditorId">

                   <equals

-                        value="org.eclipse.papyrus.core.papyrusEditor">

+                        value="org.eclipse.papyrus.infra.core.papyrusEditor">

                   </equals>

                </with>

             </visibleWhen>

          </command>

          <command

-               commandId="org.eclipse.papyrus.core.commands.closeothersdiagrams"

+               commandId="org.eclipse.papyrus.infra.core.commands.closeothersdiagrams"

                label="Close Others Diagrams"

                style="push"

                tooltip="Close All Diagrams except the selected one">

@@ -72,7 +72,7 @@
                <with

                      variable="activeEditorId">

                   <equals

-                        value="org.eclipse.papyrus.core.papyrusEditor">

+                        value="org.eclipse.papyrus.infra.core.papyrusEditor">

                   </equals>

                </with>

             </visibleWhen>

@@ -80,22 +80,22 @@
       </menuContribution>

       <menuContribution

             allPopups="false"

-            locationURI="menu:org.eclipse.papyrus.core.commands.dropdowncommand">

+            locationURI="menu:org.eclipse.papyrus.infra.core.commands.dropdowncommand">

          <command

-               commandId="org.eclipse.papyrus.core.commands.closediagram"

+               commandId="org.eclipse.papyrus.infra.core.commands.closediagram"

                style="push"

                tooltip="Close Currently Selected Diagram">

             <visibleWhen>

                <with

                      variable="activeEditorId">

                   <equals

-                        value="org.eclipse.papyrus.core.papyrusEditor">

+                        value="org.eclipse.papyrus.infra.core.papyrusEditor">

                   </equals>

                </with>

             </visibleWhen>

          </command>

          <command

-               commandId="org.eclipse.papyrus.core.commands.closealldiagram"

+               commandId="org.eclipse.papyrus.infra.core.commands.closealldiagram"

                label="Close All Diagrams"

                style="push"

                tooltip="Close All Opened Diagrams">

@@ -103,13 +103,13 @@
                <with

                      variable="activeEditorId">

                   <equals

-                        value="org.eclipse.papyrus.core.papyrusEditor">

+                        value="org.eclipse.papyrus.infra.core.papyrusEditor">

                   </equals>

                </with>

             </visibleWhen>

          </command>

          <command

-               commandId="org.eclipse.papyrus.core.commands.closeothersdiagrams"

+               commandId="org.eclipse.papyrus.infra.core.commands.closeothersdiagrams"

                label="Close Others Diagrams"

                style="push"

                tooltip="Close All Diagrams except the selected one">

@@ -117,7 +117,7 @@
                <with

                      variable="activeEditorId">

                   <equals

-                        value="org.eclipse.papyrus.core.papyrusEditor">

+                        value="org.eclipse.papyrus.infra.core.papyrusEditor">

                   </equals>

                </with>

             </visibleWhen>

@@ -127,74 +127,74 @@
    <extension

          point="org.eclipse.ui.commands">

       <command

-            id="org.eclipse.papyrus.core.commands.closealldiagram"

+            id="org.eclipse.papyrus.infra.core.commands.closealldiagram"

             name="Close All Diagrams">

       </command>

       <command

-            id="org.eclipse.papyrus.core.commands.closediagram"

+            id="org.eclipse.papyrus.infra.core.commands.closediagram"

             name="Close Diagram">

       </command>

       <command

-            id="org.eclipse.papyrus.core.commands.closeothersdiagrams"

+            id="org.eclipse.papyrus.infra.core.commands.closeothersdiagrams"

             name="Close Others Diagrams">

       </command>

       <command

-            defaultHandler="org.eclipse.papyrus.sasheditor.contentprovider.di.commands.CloseDiagramCommand"

-            id="org.eclipse.papyrus.core.commands.dropdowncommand"

+            defaultHandler="org.eclipse.papyrus.infra.core.sasheditor.di.contentprovider.commands.CloseDiagramCommand"

+            id="org.eclipse.papyrus.infra.core.commands.dropdowncommand"

             name="dropdown tool">

       </command>

    </extension>

    <extension

          point="org.eclipse.ui.handlers">

       <handler

-            class="org.eclipse.papyrus.sasheditor.contentprovider.di.commands.CloseDiagramCommand"

-            commandId="org.eclipse.papyrus.core.commands.closediagram">

+            class="org.eclipse.papyrus.infra.core.sasheditor.di.contentprovider.commands.CloseDiagramCommand"

+            commandId="org.eclipse.papyrus.infra.core.commands.closediagram">

       </handler>

       <handler

-            class="org.eclipse.papyrus.sasheditor.contentprovider.di.commands.CloseAllDiagramsCommand"

-            commandId="org.eclipse.papyrus.core.commands.closealldiagram">

+            class="org.eclipse.papyrus.infra.core.sasheditor.di.contentprovider.commands.CloseAllDiagramsCommand"

+            commandId="org.eclipse.papyrus.infra.core.commands.closealldiagram">

       </handler>

       <handler

-            class="org.eclipse.papyrus.sasheditor.contentprovider.di.commands.CloseOtherDiagramsCommand"

-            commandId="org.eclipse.papyrus.core.commands.closeothersdiagrams">

+            class="org.eclipse.papyrus.infra.core.sasheditor.di.contentprovider.commands.CloseOtherDiagramsCommand"

+            commandId="org.eclipse.papyrus.infra.core.commands.closeothersdiagrams">

       </handler>

    </extension>

    <extension

-         point="org.eclipse.papyrus.core.model">

+         point="org.eclipse.papyrus.infra.core.model">

       <model

-            classname="org.eclipse.papyrus.resource.uml.ExtendedUmlModel"

+            classname="org.eclipse.papyrus.infra.core.resource.uml.ExtendedUmlModel"

             description="Model for UML">

          <modelSnippet

-               classname="org.eclipse.papyrus.resource.uml.UmlSnippet"

+               classname="org.eclipse.papyrus.infra.core.resource.uml.UmlSnippet"

                description="Complete the UML model.">

          </modelSnippet>

       </model>

       <model

-            classname="org.eclipse.papyrus.resource.notation.NotationModel"

+            classname="org.eclipse.papyrus.infra.core.resource.notation.NotationModel"

             description="Model for natation">

       </model>

       <model

-            classname="org.eclipse.papyrus.resource.sasheditor.SashModel"

+            classname="org.eclipse.papyrus.infra.core.resource.sasheditor.SashModel"

             description="Model for sash system">

       </model>

       <modelSetSnippet

-            classname="org.eclipse.papyrus.core.modelsetquery.impl.ModelSetQueryInitializer"

+            classname="org.eclipse.papyrus.infra.core.modelsetquery.impl.ModelSetQueryInitializer"

             description="Adapter attached to the ModelSet (aka ResourceSet)">

       </modelSetSnippet>

    </extension>

    <extension

-         point="org.eclipse.papyrus.core.service">

+         point="org.eclipse.papyrus.infra.core.service">

       <serviceFactory

-            classname="org.eclipse.papyrus.core.editor.ModelSetServiceFactory"

+            classname="org.eclipse.papyrus.infra.core.editor.ModelSetServiceFactory"

             description="The service loading Models"

             id="org.eclipse.papyrus.resource.ModelSet"

             priority="1"

             startKind="startup">

       </serviceFactory>

       <serviceFactory

-            classname="org.eclipse.papyrus.core.editor.DiResourceSetServiceFactory"

+            classname="org.eclipse.papyrus.infra.core.editor.DiResourceSetServiceFactory"

             description="An alias to ModelSet"

-            id="org.eclipse.papyrus.core.utils.DiResourceSet"

+            id="org.eclipse.papyrus.infra.core.utils.DiResourceSet"

             priority="1"

             startKind="startup">

          <dependsOn

@@ -202,7 +202,7 @@
          </dependsOn>

       </serviceFactory>

       <serviceFactory

-            classname="org.eclipse.papyrus.resource.EditingDomainServiceFactory"

+            classname="org.eclipse.papyrus.infra.core.resource.EditingDomainServiceFactory"

             description="TransactionalEditing Domain"

             id="org.eclipse.emf.transaction.TransactionalEditingDomain"

             priority="1"

@@ -212,15 +212,15 @@
          </dependsOn>

       </serviceFactory>

       <serviceFactory

-            classname="org.eclipse.papyrus.core.editor.PageIconRegistryServiceFactory"

-            id="org.eclipse.papyrus.core.editorsfactory.IPageIconsRegistry"

+            classname="org.eclipse.papyrus.infra.core.editor.PageIconRegistryServiceFactory"

+            id="org.eclipse.papyrus.infra.core.editorsfactory.IPageIconsRegistry"

             priority="1"

             startKind="startup">

       </serviceFactory>

       <serviceFactory

-            classname="org.eclipse.papyrus.core.editor.DiSashModelMngrServiceFactory"

+            classname="org.eclipse.papyrus.infra.core.editor.DiSashModelMngrServiceFactory"

             description="The concrete implementation of SashContentProviderr and IPageMngr"

-            id="org.eclipse.papyrus.sasheditor.contentprovider.di.DiSashModelMngr"

+            id="org.eclipse.papyrus.infra.core.sasheditor.di.contentprovider.DiSashModelMngr"

             priority="1"

             startKind="startup">

          <dependsOn

@@ -231,29 +231,29 @@
          </dependsOn>

       </serviceFactory>

       <serviceFactory

-            classname="org.eclipse.papyrus.core.editor.PageMngrServiceFactory"

+            classname="org.eclipse.papyrus.infra.core.editor.PageMngrServiceFactory"

             description="IPageMngr allows to add and remove pages to the editor."

-            id="org.eclipse.papyrus.sasheditor.contentprovider.IPageMngr"

+            id="org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IPageMngr"

             priority="1"

             startKind="startup">

          <dependsOn

-               serviceKeyRef="org.eclipse.papyrus.sasheditor.contentprovider.di.DiSashModelMngr">

+               serviceKeyRef="org.eclipse.papyrus.infra.core.sasheditor.di.contentprovider.DiSashModelMngr">

          </dependsOn>

       </serviceFactory>

       <serviceFactory

-            classname="org.eclipse.papyrus.core.editor.ContentProviderServiceFactory"

+            classname="org.eclipse.papyrus.infra.core.editor.ContentProviderServiceFactory"

             description="The SashContentProvider maintain the structure of pages of the editor."

-            id="org.eclipse.papyrus.sasheditor.contentprovider.ISashWindowsContentProvider"

+            id="org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ISashWindowsContentProvider"

             priority="1"

             startKind="startup">

          <dependsOn

-               serviceKeyRef="org.eclipse.papyrus.sasheditor.contentprovider.di.DiSashModelMngr">

+               serviceKeyRef="org.eclipse.papyrus.infra.core.sasheditor.di.contentprovider.DiSashModelMngr">

          </dependsOn>

       </serviceFactory>

       <service

-            classname="org.eclipse.papyrus.core.lifecycleevents.SaveAndDirtyService"

+            classname="org.eclipse.papyrus.infra.core.lifecycleevents.SaveAndDirtyService"

             description="Service used to maintain the dirty state, and to perform save and saveAs"

-            id="org.eclipse.papyrus.core.lifecycleevents.ISaveAndDirtyService"

+            id="org.eclipse.papyrus.infra.core.lifecycleevents.ISaveAndDirtyService"

             priority="1"

             startKind="startup">

          <dependsOn

@@ -264,20 +264,20 @@
          </dependsOn>

       </service>

       <serviceFactory

-            classname="org.eclipse.papyrus.core.lifecycleevents.LifeCycleEventsProviderServiceFactory"

+            classname="org.eclipse.papyrus.infra.core.lifecycleevents.LifeCycleEventsProviderServiceFactory"

             description="Service allowing to listen on save events."

-            id="org.eclipse.papyrus.core.lifecycleevents.ILifeCycleEventsProvider"

+            id="org.eclipse.papyrus.infra.core.lifecycleevents.ILifeCycleEventsProvider"

             priority="1"

             startKind="startup">

          <dependsOn

-               serviceKeyRef=" org.eclipse.papyrus.core.lifecycleevents.ISaveAndDirtyService">

+               serviceKeyRef=" org.eclipse.papyrus.infra.core.lifecycleevents.ISaveAndDirtyService">

          </dependsOn>

       </serviceFactory>

    </extension>

    <extension

          point="org.eclipse.ui.exportWizards">

       <category

-            id="org.eclipse.papyrus.core.exportcategory"

+            id="org.eclipse.papyrus.infra.core.exportcategory"

             name="Papyrus">

       </category>

    </extension>

diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core/schema/contentOutline.exsd b/plugins/infra/core/org.eclipse.papyrus.infra.core/schema/contentOutline.exsd
index 18d72546961..2d9c56c7a7f 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core/schema/contentOutline.exsd
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core/schema/contentOutline.exsd
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>

 <!-- Schema file written by PDE -->

-<schema targetNamespace="org.eclipse.papyrus.core" xmlns="http://www.w3.org/2001/XMLSchema">

+<schema targetNamespace="org.eclipse.papyrus.infra.core" xmlns="http://www.w3.org/2001/XMLSchema">

 <annotation>

       <appinfo>

-         <meta.schema plugin="org.eclipse.papyrus.core" id="org.eclipse.papyrus.core.contentoutline" name="contentoutline"/>

+         <meta.schema plugin="org.eclipse.papyrus.infra.core" id="org.eclipse.papyrus.infra.core.contentoutline" name="contentoutline"/>

       </appinfo>

       <documentation>

          Specify the content outline to be used by the Papyrus backbone.

@@ -60,10 +60,10 @@
             <annotation>

                <documentation>

                   The class implementing the contentOutline.

-Class must extends org.eclipse.papyrus.core.contentoutline.IPapyrusContentOutlinePage.

+Class must extends org.eclipse.papyrus.infra.core.contentoutline.IPapyrusContentOutlinePage.

                </documentation>

                <appinfo>

-                  <meta.attribute kind="java" basedOn=":org.eclipse.papyrus.core.contentoutline.IPapyrusContentOutlinePage"/>

+                  <meta.attribute kind="java" basedOn=":org.eclipse.papyrus.infra.core.contentoutline.IPapyrusContentOutlinePage"/>

                </appinfo>

             </annotation>

          </attribute>

diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core/schema/model.exsd b/plugins/infra/core/org.eclipse.papyrus.infra.core/schema/model.exsd
index 76acdba8c94..4d1277ff396 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core/schema/model.exsd
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core/schema/model.exsd
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>

 <!-- Schema file written by PDE -->

-<schema targetNamespace="org.eclipse.papyrus.core" xmlns="http://www.w3.org/2001/XMLSchema">

+<schema targetNamespace="org.eclipse.papyrus.infra.core" xmlns="http://www.w3.org/2001/XMLSchema">

 <annotation>

       <appInfo>

-         <meta.schema plugin="org.eclipse.papyrus.core" id="org.eclipse.papyrus.core.model" name="model"/>

+         <meta.schema plugin="org.eclipse.papyrus.infra.core" id="org.eclipse.papyrus.infra.core.model" name="model"/>

       </appInfo>

       <documentation>

          A model represent a unit containing model elements.

@@ -76,7 +76,7 @@ This is the class that wil be registered in the ModelSet.
 The class will be registered using the key set in the Model.

                </documentation>

                <appInfo>

-                  <meta.attribute kind="java" basedOn=":org.eclipse.papyrus.resource.IModel"/>

+                  <meta.attribute kind="java" basedOn=":org.eclipse.papyrus.infra.core.resource.IModel"/>

                </appInfo>

             </annotation>

          </attribute>

@@ -107,7 +107,7 @@ For example, it is possible to add listeners to the model.
 The code is executed right after the model is loaded.

                </documentation>

                <appInfo>

-                  <meta.attribute kind="java" basedOn=":org.eclipse.papyrus.resource.IModelSnippet"/>

+                  <meta.attribute kind="java" basedOn=":org.eclipse.papyrus.infra.core.resource.IModelSnippet"/>

                </appInfo>

             </annotation>

          </attribute>

@@ -136,7 +136,7 @@ A snippet allows to do post operations after ModelSet is loaded.
 The code is executed right after the modelSet is loaded.

                </documentation>

                <appInfo>

-                  <meta.attribute kind="java" basedOn=":org.eclipse.papyrus.resource.IModelSetSnippet"/>

+                  <meta.attribute kind="java" basedOn=":org.eclipse.papyrus.infra.core.resource.IModelSetSnippet"/>

                </appInfo>

             </annotation>

          </attribute>

diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core/schema/modelListener.exsd b/plugins/infra/core/org.eclipse.papyrus.infra.core/schema/modelListener.exsd
index 5cc3436db8e..bcfa22b3e41 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core/schema/modelListener.exsd
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core/schema/modelListener.exsd
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>

 <!-- Schema file written by PDE -->

-<schema targetNamespace="org.eclipse.papyrus.core" xmlns="http://www.w3.org/2001/XMLSchema">

+<schema targetNamespace="org.eclipse.papyrus.infra.core" xmlns="http://www.w3.org/2001/XMLSchema">

 <annotation>

       <appinfo>

-         <meta.schema plugin="org.eclipse.papyrus.core" id="papyrus.backbone.modellistener" name="modelListener"/>

+         <meta.schema plugin="org.eclipse.papyrus.infra.core" id="papyrus.backbone.modellistener" name="modelListener"/>

       </appinfo>

       <documentation>

          This extension is used to plug a listener that will know all event in uml model di2 or notation.

@@ -69,7 +69,7 @@
                   Class that is realizes this listener

                </documentation>

                <appinfo>

-                  <meta.attribute kind="java" basedOn=":org.eclipse.papyrus.core.listenerservice.IPapyrusListener"/>

+                  <meta.attribute kind="java" basedOn=":org.eclipse.papyrus.infra.core.listenerservice.IPapyrusListener"/>

                </appinfo>

             </annotation>

          </attribute>

diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core/schema/papyrusDiagram.exsd b/plugins/infra/core/org.eclipse.papyrus.infra.core/schema/papyrusDiagram.exsd
index 943ab4f7da2..f6263ab3e65 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core/schema/papyrusDiagram.exsd
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core/schema/papyrusDiagram.exsd
@@ -1,13 +1,13 @@
 <?xml version='1.0' encoding='UTF-8'?>

 <!-- Schema file written by PDE -->

-<schema targetNamespace="org.eclipse.papyrus.core" xmlns="http://www.w3.org/2001/XMLSchema">

+<schema targetNamespace="org.eclipse.papyrus.infra.core" xmlns="http://www.w3.org/2001/XMLSchema">

 <annotation>

       <appInfo>

-         <meta.schema plugin="org.eclipse.papyrus.core" id="papyrusDiagram" name="Papyrus Diagram Editor"/>

+         <meta.schema plugin="org.eclipse.papyrus.infra.core" id="papyrusDiagram" name="Papyrus Diagram Editor"/>

       </appInfo>

       <documentation>

          &lt;p&gt;

-The &lt;code&gt;org.eclipse.papyrus.core.papyrusDiagram&lt;/code&gt; extension point is used to register a new diagram editor within Papyrus. Once diagram editor is registered it can be used in the Papyrus multi-page diagram editor. The editor can have its own icon, label, a button for the creation action in the toolbar, and the possibility to be created using new Papyrus Model wizard.

+The &lt;code&gt;org.eclipse.papyrus.infra.core.papyrusDiagram&lt;/code&gt; extension point is used to register a new diagram editor within Papyrus. Once diagram editor is registered it can be used in the Papyrus multi-page diagram editor. The editor can have its own icon, label, a button for the creation action in the toolbar, and the possibility to be created using new Papyrus Model wizard.

 &lt;/p&gt;

 

 &lt;p&gt;Papyrus uses the term &quot;&lt;b&gt;Diagram Category&lt;/b&gt;&quot; to categorize domain models and the term &quot;&lt;b&gt;Diagram Kind&lt;/b&gt;&quot; to specialize a diagram editor for a domain model. Each Diagram Kind belongs to exactly one Diagram Category, Diagram Category can contains many Diagram Kinds. Papyrus supports &lt;b&gt;UML&lt;/b&gt;, &lt;b&gt;Profile&lt;/b&gt; and &lt;b&gt;SysML&lt;/b&gt; diagram categories. 

@@ -71,10 +71,10 @@ The &lt;code&gt;org.eclipse.papyrus.core.papyrusDiagram&lt;/code&gt; extension p
          <attribute name="factoryClass" type="string" use="required">

             <annotation>

                <documentation>

-                  a name of the fully qualified class that implements &lt;samp&gt; org.eclipse.papyrus.sasheditor.extension.IEditorFactory&lt;/samp&gt;. It is used to create an instance of the editor.

+                  a name of the fully qualified class that implements &lt;samp&gt; org.eclipse.papyrus.infra.core.sasheditor.extension.IEditorFactory&lt;/samp&gt;. It is used to create an instance of the editor.

                </documentation>

                <appInfo>

-                  <meta.attribute kind="java" basedOn=":org.eclipse.papyrus.core.extension.diagrameditor.IPluggableEditorFactory"/>

+                  <meta.attribute kind="java" basedOn=":org.eclipse.papyrus.infra.core.extension.diagrameditor.IPluggableEditorFactory"/>

                </appInfo>

             </annotation>

          </attribute>

@@ -152,10 +152,10 @@ The &lt;code&gt;org.eclipse.papyrus.core.papyrusDiagram&lt;/code&gt; extension p
          <attribute name="creationCommandClass" type="string" use="required">

             <annotation>

                <documentation>

-                  a name of the fully qualified class that implements &lt;samp&gt;org.eclipse.papyrus.core.extension.commands.ICreationCommand&lt;/samp&gt;.

+                  a name of the fully qualified class that implements &lt;samp&gt;org.eclipse.papyrus.infra.core.extension.commands.ICreationCommand&lt;/samp&gt;.

                </documentation>

                <appInfo>

-                  <meta.attribute kind="java" basedOn=":org.eclipse.papyrus.core.extension.commands.ICreationCommand"/>

+                  <meta.attribute kind="java" basedOn=":org.eclipse.papyrus.infra.core.extension.commands.ICreationCommand"/>

                </appInfo>

             </annotation>

          </attribute>

@@ -175,7 +175,7 @@ The &lt;code&gt;org.eclipse.papyrus.core.papyrusDiagram&lt;/code&gt; extension p
                   the action in the diagram creation menu is disabled if this condition is evaluated to false.

                </documentation>

                <appInfo>

-                  <meta.attribute kind="java" basedOn=":org.eclipse.papyrus.core.extension.commands.ICreationCondition"/>

+                  <meta.attribute kind="java" basedOn=":org.eclipse.papyrus.infra.core.extension.commands.ICreationCondition"/>

                </appInfo>

             </annotation>

          </attribute>

@@ -185,7 +185,7 @@ The &lt;code&gt;org.eclipse.papyrus.core.papyrusDiagram&lt;/code&gt; extension p
                   the id of a diagramCategory the creation command belongs to.

                </documentation>

                <appInfo>

-                  <meta.attribute kind="identifier" basedOn="org.eclipse.papyrus.core.papyrusDiagram/@id"/>

+                  <meta.attribute kind="identifier" basedOn="org.eclipse.papyrus.infra.core.papyrusDiagram/@id"/>

                </appInfo>

             </annotation>

          </attribute>

@@ -209,10 +209,10 @@ The &lt;code&gt;org.eclipse.papyrus.core.papyrusDiagram&lt;/code&gt; extension p
          <attribute name="class" type="string" use="required">

             <annotation>

                <documentation>

-                  a name of the fully qualified class that implements &lt;samp&gt;org.eclipse.papyrus.core.extension.commands.IModelCreationCommand&lt;/samp&gt;.

+                  a name of the fully qualified class that implements &lt;samp&gt;org.eclipse.papyrus.infra.core.extension.commands.IModelCreationCommand&lt;/samp&gt;.

                </documentation>

                <appInfo>

-                  <meta.attribute kind="java" basedOn=":org.eclipse.papyrus.core.extension.commands.IModelCreationCommand"/>

+                  <meta.attribute kind="java" basedOn=":org.eclipse.papyrus.infra.core.extension.commands.IModelCreationCommand"/>

                </appInfo>

             </annotation>

          </attribute>

@@ -265,7 +265,7 @@ The &lt;code&gt;org.eclipse.papyrus.core.papyrusDiagram&lt;/code&gt; extension p
       </appInfo>

       <documentation>

          &lt;pre&gt;

-&lt;extension point=&quot;org.eclipse.papyrus.core.papyrusDiagram&quot;&gt;

+&lt;extension point=&quot;org.eclipse.papyrus.infra.core.papyrusDiagram&quot;&gt;

  &lt;diagramCategory

         id=&quot;sysml&quot;

      class=&quot;org.eclipse.papyrus.sysml.diagram.common.commands.CreateSysMLModelCommand&quot;

@@ -275,7 +275,7 @@ The &lt;code&gt;org.eclipse.papyrus.core.papyrusDiagram&lt;/code&gt; extension p
  &lt;/diagramCategory&gt; 

 

  &lt;editorDiagram

-     actionBarContributorId=&quot;org.eclipse.papyrus.diagram.common.part.UMLDiagramActionBarContributor&quot;

+     actionBarContributorId=&quot;org.eclipse.papyrus.uml.diagram.common.part.UMLDiagramActionBarContributor&quot;

         factoryClass=&quot;org.eclipse.papyrus.sysml.diagram.requirement.RequirementDiagramEditorFactory&quot;

         icon=&quot;icons/obj16/Diagram_Requirement.gif&quot;&gt;

  &lt;/editorDiagram&gt;

@@ -300,19 +300,19 @@ As Requirement diagram belongs to SysML category it will be created with a SysML
          <meta.section type="apiInfo"/>

       </appInfo>

       <documentation>

-         &lt;p&gt;The value of the &lt;code&gt;class&lt;/code&gt; attribute of &lt;code&gt;diagramCategory&lt;/code&gt; must represent a class that implements the &lt;code&gt;org.eclipse.papyrus.core.extension.commands.IModelCreationCommand&lt;/code&gt; interface. There are a few default implementations of &lt;code&gt;IModelCreationCommand&lt;/code&gt; that may be useful to users of this extension point: 

+         &lt;p&gt;The value of the &lt;code&gt;class&lt;/code&gt; attribute of &lt;code&gt;diagramCategory&lt;/code&gt; must represent a class that implements the &lt;code&gt;org.eclipse.papyrus.infra.core.extension.commands.IModelCreationCommand&lt;/code&gt; interface. There are a few default implementations of &lt;code&gt;IModelCreationCommand&lt;/code&gt; that may be useful to users of this extension point: 

 &lt;ul&gt;

-&lt;li&gt;&lt;code&gt;org.eclipse.papyrus.core.extension.commands.ModelCreationCommandBase&lt;/code&gt; - an abstract implementation of a basic &lt;code&gt;IModelCreationCommand&lt;/code&gt;.&lt;/li&gt;

-&lt;li&gt;&lt;code&gt;org.eclipse.papyrus.diagram.common.commands.CreateUMLModelCommand&lt;/code&gt;&lt;/li&gt; - implementation of IModelCreationCommand that creates a UML model.

-&lt;li&gt;&lt;code&gt;org.eclipse.papyrus.diagram.profile.CreateProfileModelCommand&lt;/code&gt; - a subclass of CreateUMLModelCommand which creates Profile as a root element&lt;/li&gt;

+&lt;li&gt;&lt;code&gt;org.eclipse.papyrus.infra.core.extension.commands.ModelCreationCommandBase&lt;/code&gt; - an abstract implementation of a basic &lt;code&gt;IModelCreationCommand&lt;/code&gt;.&lt;/li&gt;

+&lt;li&gt;&lt;code&gt;org.eclipse.papyrus.uml.diagram.common.commands.CreateUMLModelCommand&lt;/code&gt;&lt;/li&gt; - implementation of IModelCreationCommand that creates a UML model.

+&lt;li&gt;&lt;code&gt;org.eclipse.papyrus.uml.diagram.profile.CreateProfileModelCommand&lt;/code&gt; - a subclass of CreateUMLModelCommand which creates Profile as a root element&lt;/li&gt;

 &lt;li&gt;&lt;code&gt;org.eclipse.papyrus.sysml.diagram.common.commands.CreateSysMLModelCommand&lt;/code&gt; - a subclass of CreateUMLModelCommand which applies SysML profile to the root element&lt;/li&gt;

 &lt;/ul&gt;

 &lt;/p&gt;

 

 &lt;p&gt;The value of the &lt;code&gt;creationCommandClass&lt;/code&gt; attribute of &lt;code&gt;creationCommand&lt;/code&gt;

- must represent a class that implements the &lt;code&gt;org.eclipse.papyrus.core.extension.commands.ICreationCommand&lt;/code&gt; interface.

+ must represent a class that implements the &lt;code&gt;org.eclipse.papyrus.infra.core.extension.commands.ICreationCommand&lt;/code&gt; interface.

 &lt;ul&gt;

-&lt;li&gt;&lt;code&gt;org.eclipse.papyrus.core.adaptor.gmf.AbstractPapyrusGmfCreateDiagramCommandHandler&lt;/code&gt; - an abstract implementation of a basic &lt;code&gt;ICreationCommand&lt;/code&gt; for GMF diagrams. All CreationCommands for Papyrus diagrams extend this class.&lt;/li&gt;

+&lt;li&gt;&lt;code&gt;org.eclipse.papyrus.infra.core.adaptor.gmf.AbstractPapyrusGmfCreateDiagramCommandHandler&lt;/code&gt; - an abstract implementation of a basic &lt;code&gt;ICreationCommand&lt;/code&gt; for GMF diagrams. All CreationCommands for Papyrus diagrams extend this class.&lt;/li&gt;

 &lt;/ul&gt;

 &lt;/p&gt;

       </documentation>

diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core/schema/service.exsd b/plugins/infra/core/org.eclipse.papyrus.infra.core/schema/service.exsd
index 42f57a97f2e..bede2f658b0 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core/schema/service.exsd
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core/schema/service.exsd
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>

 <!-- Schema file written by PDE -->

-<schema targetNamespace="org.eclipse.papyrus.core" xmlns="http://www.w3.org/2001/XMLSchema">

+<schema targetNamespace="org.eclipse.papyrus.infra.core" xmlns="http://www.w3.org/2001/XMLSchema">

 <annotation>

       <appInfo>

-         <meta.schema plugin="org.eclipse.papyrus.core" id="service" name="Service"/>

+         <meta.schema plugin="org.eclipse.papyrus.infra.core" id="service" name="Service"/>

       </appInfo>

       <documentation>

          Define a Service used by Papyrus Editors. 

@@ -74,7 +74,7 @@ If not set (default), the classname is used as key.
                   Name of the class implementing the service.

                </documentation>

                <appInfo>

-                  <meta.attribute kind="java" basedOn=":org.eclipse.papyrus.core.services.IService"/>

+                  <meta.attribute kind="java" basedOn=":org.eclipse.papyrus.infra.core.services.IService"/>

                </appInfo>

             </annotation>

          </attribute>

@@ -137,7 +137,7 @@ If not set (default), the classname is used as key.
                   Name of the class implementing the service.

                </documentation>

                <appInfo>

-                  <meta.attribute kind="java" basedOn=":org.eclipse.papyrus.core.services.IServiceFactory"/>

+                  <meta.attribute kind="java" basedOn=":org.eclipse.papyrus.infra.core.services.IServiceFactory"/>

                </appInfo>

             </annotation>

          </attribute>

diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core/schema/transactionalEditingDomainProvider.exsd b/plugins/infra/core/org.eclipse.papyrus.infra.core/schema/transactionalEditingDomainProvider.exsd
index 9d5935ae8fa..41c5715300f 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core/schema/transactionalEditingDomainProvider.exsd
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core/schema/transactionalEditingDomainProvider.exsd
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>

 <!-- Schema file written by PDE -->

-<schema targetNamespace="org.eclipse.papyrus.core" xmlns="http://www.w3.org/2001/XMLSchema">

+<schema targetNamespace="org.eclipse.papyrus.infra.core" xmlns="http://www.w3.org/2001/XMLSchema">

 <annotation>

       <appInfo>

-         <meta.schema plugin="org.eclipse.papyrus.core" id="transactionalEditingDomainProvider" name="transactionalEditingDomainProvider"/>

+         <meta.schema plugin="org.eclipse.papyrus.infra.core" id="transactionalEditingDomainProvider" name="transactionalEditingDomainProvider"/>

       </appInfo>

       <documentation>

          [Enter description of this extension point.]

@@ -55,7 +55,7 @@
                   

                </documentation>

                <appInfo>

-                  <meta.attribute kind="java" basedOn=":org.eclipse.papyrus.resource.ITransactionalEditingDomainProvider"/>

+                  <meta.attribute kind="java" basedOn=":org.eclipse.papyrus.infra.core.resource.ITransactionalEditingDomainProvider"/>

                </appInfo>

             </annotation>

          </attribute>

diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/core/Activator.java b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/Activator.java
index d09a7a69e83..e315ad22cad 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/core/Activator.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/Activator.java
@@ -11,9 +11,9 @@
  *  Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Initial API and implementation

  *

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

-package org.eclipse.papyrus.core;

+package org.eclipse.papyrus.infra.core;

 

-import org.eclipse.papyrus.log.LogHelper;

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

 import org.eclipse.ui.plugin.AbstractUIPlugin;

 import org.osgi.framework.BundleContext;

 

diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/core/IElementWithSemantic.java b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/IElementWithSemantic.java
index ee725bc4b86..a3972b79f98 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/core/IElementWithSemantic.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/IElementWithSemantic.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.core;

+package org.eclipse.papyrus.infra.core;

 

 /**

  * 

diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/core/contentoutline/ContentOutlineRegistry.java b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/contentoutline/ContentOutlineRegistry.java
index 009c923aff8..bce9ed01a88 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/core/contentoutline/ContentOutlineRegistry.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/contentoutline/ContentOutlineRegistry.java
@@ -11,15 +11,15 @@
  *  Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Initial API and implementation

  *

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

-package org.eclipse.papyrus.core.contentoutline;

+package org.eclipse.papyrus.infra.core.contentoutline;

 

 import org.eclipse.core.runtime.IConfigurationElement;

 import org.eclipse.core.runtime.Platform;

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

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

-import org.eclipse.papyrus.core.extension.BadClassNameException;

-import org.eclipse.papyrus.core.extension.NotFoundException;

-import org.eclipse.papyrus.core.extension.diagrameditor.EditorDescriptorExtensionFactory;

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

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

+import org.eclipse.papyrus.infra.core.extension.BadClassNameException;

+import org.eclipse.papyrus.infra.core.extension.NotFoundException;

+import org.eclipse.papyrus.infra.core.extension.diagrameditor.EditorDescriptorExtensionFactory;

 import org.osgi.framework.Bundle;

 

 public class ContentOutlineRegistry {

diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/core/contentoutline/IPapyrusContentOutlinePage.java b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/contentoutline/IPapyrusContentOutlinePage.java
index 44a74b7bb33..b868f66ae9d 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/core/contentoutline/IPapyrusContentOutlinePage.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/contentoutline/IPapyrusContentOutlinePage.java
@@ -11,10 +11,10 @@
  *  Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Initial API and implementation

  *

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

-package org.eclipse.papyrus.core.contentoutline;

+package org.eclipse.papyrus.infra.core.contentoutline;

 

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

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

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

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

 

 /**

  * Extends the original interface to add the init method.

diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/core/editor/BackboneException.java b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/editor/BackboneException.java
index 4dcffc19e5f..3dca09296a1 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/core/editor/BackboneException.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/editor/BackboneException.java
@@ -11,7 +11,7 @@
  *  Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Initial API and implementation

  *

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

-package org.eclipse.papyrus.core.editor;

+package org.eclipse.papyrus.infra.core.editor;

 

 /**

  * Root of Backbone Exception

diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/core/editor/ContentProviderServiceFactory.java b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/editor/ContentProviderServiceFactory.java
index 350258c73ef..55c11650fa5 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/core/editor/ContentProviderServiceFactory.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/editor/ContentProviderServiceFactory.java
@@ -1,13 +1,13 @@
 /**

  * 

  */

-package org.eclipse.papyrus.core.editor;

+package org.eclipse.papyrus.infra.core.editor;

 

-import org.eclipse.papyrus.core.services.IServiceFactory;

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

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

-import org.eclipse.papyrus.sasheditor.contentprovider.ISashWindowsContentProvider;

-import org.eclipse.papyrus.sasheditor.contentprovider.di.DiSashModelMngr;

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

+import org.eclipse.papyrus.infra.core.sasheditor.di.contentprovider.DiSashModelMngr;

+import org.eclipse.papyrus.infra.core.services.IServiceFactory;

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

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

 

 /**

  * A service factory to create the {@link ISashWindowsContentProvider} service.

@@ -24,7 +24,7 @@ public class ContentProviderServiceFactory implements IServiceFactory {
 	private DiSashModelMngr sashModelMngr;

 

 	/**

-	 * @see org.eclipse.papyrus.core.services.IService#init(org.eclipse.papyrus.core.services.ServicesRegistry)

+	 * @see org.eclipse.papyrus.infra.core.services.IService#init(org.eclipse.papyrus.infra.core.services.ServicesRegistry)

 	 * 

 	 * @param servicesRegistry

 	 * @throws ServiceException

@@ -36,7 +36,7 @@ public class ContentProviderServiceFactory implements IServiceFactory {
 	}

 

 	/**

-	 * @see org.eclipse.papyrus.core.services.IService#startService()

+	 * @see org.eclipse.papyrus.infra.core.services.IService#startService()

 	 * 

 	 * @throws ServiceException

 	 */

@@ -44,7 +44,7 @@ public class ContentProviderServiceFactory implements IServiceFactory {
 	}

 

 	/**

-	 * @see org.eclipse.papyrus.core.services.IService#disposeService()

+	 * @see org.eclipse.papyrus.infra.core.services.IService#disposeService()

 	 * 

 	 * @throws ServiceException

 	 */

@@ -52,7 +52,7 @@ public class ContentProviderServiceFactory implements IServiceFactory {
 	}

 

 	/**

-	 * @see org.eclipse.papyrus.core.services.IServiceFactory#createServiceInstance()

+	 * @see org.eclipse.papyrus.infra.core.services.IServiceFactory#createServiceInstance()

 	 * 

 	 * @return

 	 * @throws ServiceException

diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/core/editor/CoreMultiDiagramEditor.java b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/editor/CoreMultiDiagramEditor.java
index 1d7064266f1..7f9e319b187 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/core/editor/CoreMultiDiagramEditor.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/editor/CoreMultiDiagramEditor.java
@@ -12,9 +12,9 @@
  *

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

 

-package org.eclipse.papyrus.core.editor;

+package org.eclipse.papyrus.infra.core.editor;

 

-import static org.eclipse.papyrus.core.Activator.log;

+import static org.eclipse.papyrus.infra.core.Activator.log;

 

 import java.util.ArrayList;

 import java.util.List;

@@ -42,29 +42,29 @@ import org.eclipse.gmf.runtime.emf.commands.core.command.EditingDomainUndoContex
 import org.eclipse.jface.action.MenuManager;

 import org.eclipse.jface.action.Separator;

 import org.eclipse.jface.viewers.ILabelProvider;

-import org.eclipse.papyrus.core.Activator;

-import org.eclipse.papyrus.core.contentoutline.ContentOutlineRegistry;

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

-import org.eclipse.papyrus.core.lifecycleevents.IEditorInputChangedListener;

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

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

-import org.eclipse.papyrus.core.multidiagram.actionbarcontributor.CoreComposedActionBarContributor;

-import org.eclipse.papyrus.core.services.ExtensionServicesRegistry;

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

-import org.eclipse.papyrus.core.services.ServiceMultiException;

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

-import org.eclipse.papyrus.core.utils.BusinessModelResolver;

-import org.eclipse.papyrus.resource.ModelMultiException;

-import org.eclipse.papyrus.resource.ModelSet;

-import org.eclipse.papyrus.sasheditor.contentprovider.IContentChangedListener;

-import org.eclipse.papyrus.sasheditor.contentprovider.IPageMngr;

-import org.eclipse.papyrus.sasheditor.contentprovider.ISashWindowsContentProvider;

-import org.eclipse.papyrus.sasheditor.contentprovider.di.DiSashModelMngr;

-import org.eclipse.papyrus.sasheditor.contentprovider.di.IPageModelFactory;

-import org.eclipse.papyrus.sasheditor.contentprovider.di.TransactionalDiSashModelMngr;

-import org.eclipse.papyrus.sasheditor.editor.AbstractMultiPageSashEditor;

-import org.eclipse.papyrus.sasheditor.editor.ISashWindowsContainer;

-import org.eclipse.papyrus.sasheditor.editor.gef.MultiDiagramEditorGefDelegate;

+import org.eclipse.papyrus.infra.core.Activator;

+import org.eclipse.papyrus.infra.core.contentoutline.ContentOutlineRegistry;

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

+import org.eclipse.papyrus.infra.core.lifecycleevents.IEditorInputChangedListener;

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

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

+import org.eclipse.papyrus.infra.core.multidiagram.actionbarcontributor.CoreComposedActionBarContributor;

+import org.eclipse.papyrus.infra.core.resource.ModelMultiException;

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

+import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IContentChangedListener;

+import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IPageMngr;

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

+import org.eclipse.papyrus.infra.core.sasheditor.di.contentprovider.DiSashModelMngr;

+import org.eclipse.papyrus.infra.core.sasheditor.di.contentprovider.IPageModelFactory;

+import org.eclipse.papyrus.infra.core.sasheditor.di.contentprovider.TransactionalDiSashModelMngr;

+import org.eclipse.papyrus.infra.core.sasheditor.editor.AbstractMultiPageSashEditor;

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

+import org.eclipse.papyrus.infra.core.sasheditor.editor.gef.MultiDiagramEditorGefDelegate;

+import org.eclipse.papyrus.infra.core.services.ExtensionServicesRegistry;

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

+import org.eclipse.papyrus.infra.core.services.ServiceMultiException;

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

+import org.eclipse.papyrus.infra.core.utils.BusinessModelResolver;

 import org.eclipse.ui.IEditorActionBarContributor;

 import org.eclipse.ui.IEditorInput;

 import org.eclipse.ui.IEditorPart;

@@ -130,7 +130,7 @@ public class CoreMultiDiagramEditor extends AbstractMultiPageSashEditor implemen
 		/**

 		 * This method is called when the editor input is changed from the ISaveAndDirtyService.

 		 * 

-		 * @see org.eclipse.papyrus.core.lifecycleevents.IEditorInputChangedListener#editorInputChanged(org.eclipse.ui.part.FileEditorInput)

+		 * @see org.eclipse.papyrus.infra.core.lifecycleevents.IEditorInputChangedListener#editorInputChanged(org.eclipse.ui.part.FileEditorInput)

 		 * 

 		 * @param fileEditorInput

 		 */

@@ -143,7 +143,7 @@ public class CoreMultiDiagramEditor extends AbstractMultiPageSashEditor implemen
 		/**

 		 * The isDirty flag has changed, reflect its new value

 		 * 

-		 * @see org.eclipse.papyrus.core.lifecycleevents.IEditorInputChangedListener#isDirtyChanged()

+		 * @see org.eclipse.papyrus.infra.core.lifecycleevents.IEditorInputChangedListener#isDirtyChanged()

 		 * 

 		 */

 		public void isDirtyChanged() {

@@ -259,7 +259,7 @@ public class CoreMultiDiagramEditor extends AbstractMultiPageSashEditor implemen
 	 * Do nothing as we create the provider before any calls to this method.

 	 * Should not be called by subclasses.

 	 * 

-	 * @see org.eclipse.papyrus.sasheditor.editor.AbstractMultiPageSashEditor#createPageProvider()

+	 * @see org.eclipse.papyrus.infra.core.sasheditor.editor.AbstractMultiPageSashEditor#createPageProvider()

 	 */

 	@Override

 	protected ISashWindowsContentProvider createPageProvider() {

@@ -593,7 +593,7 @@ public class CoreMultiDiagramEditor extends AbstractMultiPageSashEditor implemen
 		container.setFolderTabMenuManager(menuManager);

 

 		// TODO : use a constant

-		getSite().registerContextMenu("org.eclipse.papyrus.core.editor.ui.tabmenu", menuManager, getSite().getSelectionProvider());

+		getSite().registerContextMenu("org.eclipse.papyrus.infra.core.editor.ui.tabmenu", menuManager, getSite().getSelectionProvider());

 

 	}

 

@@ -602,7 +602,7 @@ public class CoreMultiDiagramEditor extends AbstractMultiPageSashEditor implemen
 	 * 

 	 * {@inheritDoc}

 	 * 

-	 * @see org.eclipse.papyrus.core.editor.IMultiDiagramEditor#getPropertySheetPage()

+	 * @see org.eclipse.papyrus.infra.core.editor.IMultiDiagramEditor#getPropertySheetPage()

 	 */

 	public IPropertySheetPage getPropertySheetPage() {

 		if(this.tabbedPropertySheetPage == null) {

@@ -612,7 +612,7 @@ public class CoreMultiDiagramEditor extends AbstractMultiPageSashEditor implemen
 	}

 

 	/**

-	 * @see org.eclipse.papyrus.sasheditor.editor.AbstractMultiPageSashEditor#dispose()

+	 * @see org.eclipse.papyrus.infra.core.sasheditor.editor.AbstractMultiPageSashEditor#dispose()

 	 * 

 	 */

 	@Override

@@ -769,7 +769,7 @@ public class CoreMultiDiagramEditor extends AbstractMultiPageSashEditor implemen
 	/**

 	 * Throws an UnsupportedOperationException.

 	 * 

-	 * @see org.eclipse.papyrus.core.editor.IMultiDiagramEditor#getDiagramEditDomain()

+	 * @see org.eclipse.papyrus.infra.core.editor.IMultiDiagramEditor#getDiagramEditDomain()

 	 */

 	public DiagramEditDomain getDiagramEditDomain() {

 		throw new UnsupportedOperationException("Not implemented. Should not be called.");

@@ -780,7 +780,7 @@ public class CoreMultiDiagramEditor extends AbstractMultiPageSashEditor implemen
 	 * Change the editor input.<BR>

 	 * <U>Note</U>: that method should be called within the UI-Thread.

 	 * 

-	 * @see org.eclipse.papyrus.core.editor.IMultiDiagramEditor#setEditorInput(org.eclipse.ui.IEditorInput)

+	 * @see org.eclipse.papyrus.infra.core.editor.IMultiDiagramEditor#setEditorInput(org.eclipse.ui.IEditorInput)

 	 * 

 	 * @param newInput

 	 *        The new input

@@ -797,7 +797,7 @@ public class CoreMultiDiagramEditor extends AbstractMultiPageSashEditor implemen
 		IWorkbench wb = PlatformUI.getWorkbench();

 		IWorkbenchPage page = wb.getActiveWorkbenchWindow().getActivePage();

 		for(IViewReference view : page.getViewReferences()) {

-			if(view.getId().equals("org.eclipse.papyrus.modelexplorer.modelexplorer")) {

+			if(view.getId().equals("org.eclipse.papyrus.views.modelexplorer.modelexplorer")) {

 				page.activate(view.getPart(false));

 				IWorkbenchPart part = view.getPart(false);

 				if(part instanceof IGotoMarker) {

diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/core/editor/DiResourceSetServiceFactory.java b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/editor/DiResourceSetServiceFactory.java
index 6cebfe199fd..de316a87c6a 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/core/editor/DiResourceSetServiceFactory.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/editor/DiResourceSetServiceFactory.java
@@ -1,12 +1,12 @@
 /**

  * 

  */

-package org.eclipse.papyrus.core.editor;

+package org.eclipse.papyrus.infra.core.editor;

 

-import org.eclipse.papyrus.core.services.IServiceFactory;

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

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

-import org.eclipse.papyrus.resource.ModelSet;

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

+import org.eclipse.papyrus.infra.core.services.IServiceFactory;

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

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

 

 /**

  * A service factory to create the {@link ModelSet} service. This provide a

@@ -23,7 +23,7 @@ public class DiResourceSetServiceFactory implements IServiceFactory {
 	private ModelSet modelSet;

 

 	/**

-	 * @see org.eclipse.papyrus.core.services.IService#init(org.eclipse.papyrus.core.services.ServicesRegistry)

+	 * @see org.eclipse.papyrus.infra.core.services.IService#init(org.eclipse.papyrus.infra.core.services.ServicesRegistry)

 	 * 

 	 * @param servicesRegistry

 	 * @throws ServiceException

@@ -35,7 +35,7 @@ public class DiResourceSetServiceFactory implements IServiceFactory {
 	}

 

 	/**

-	 * @see org.eclipse.papyrus.core.services.IService#startService()

+	 * @see org.eclipse.papyrus.infra.core.services.IService#startService()

 	 * 

 	 * @throws ServiceException

 	 */

@@ -43,7 +43,7 @@ public class DiResourceSetServiceFactory implements IServiceFactory {
 	}

 

 	/**

-	 * @see org.eclipse.papyrus.core.services.IService#disposeService()

+	 * @see org.eclipse.papyrus.infra.core.services.IService#disposeService()

 	 * 

 	 * @throws ServiceException

 	 */

@@ -51,7 +51,7 @@ public class DiResourceSetServiceFactory implements IServiceFactory {
 	}

 

 	/**

-	 * @see org.eclipse.papyrus.core.services.IServiceFactory#createServiceInstance()

+	 * @see org.eclipse.papyrus.infra.core.services.IServiceFactory#createServiceInstance()

 	 * 

 	 * @return

 	 * @throws ServiceException

diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/core/editor/DiSashModelMngrServiceFactory.java b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/editor/DiSashModelMngrServiceFactory.java
index bcb82f3b806..ce4eca6eda3 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/core/editor/DiSashModelMngrServiceFactory.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/editor/DiSashModelMngrServiceFactory.java
@@ -1,19 +1,19 @@
 /**

  * 

  */

-package org.eclipse.papyrus.core.editor;

+package org.eclipse.papyrus.infra.core.editor;

 

 import org.eclipse.emf.transaction.TransactionalEditingDomain;

-import org.eclipse.papyrus.core.Activator;

-import org.eclipse.papyrus.core.editorsfactory.PageModelFactoryRegistry;

-import org.eclipse.papyrus.core.extension.diagrameditor.PluggableEditorFactoryReader;

-import org.eclipse.papyrus.core.services.IServiceFactory;

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

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

-import org.eclipse.papyrus.resource.sasheditor.SashModel;

-import org.eclipse.papyrus.resource.sasheditor.SashModelUtils;

-import org.eclipse.papyrus.sasheditor.contentprovider.di.DiSashModelMngr;

-import org.eclipse.papyrus.sasheditor.contentprovider.di.TransactionalDiSashModelMngr;

+import org.eclipse.papyrus.infra.core.Activator;

+import org.eclipse.papyrus.infra.core.editorsfactory.PageModelFactoryRegistry;

+import org.eclipse.papyrus.infra.core.extension.diagrameditor.PluggableEditorFactoryReader;

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

+import org.eclipse.papyrus.infra.core.resource.sasheditor.SashModelUtils;

+import org.eclipse.papyrus.infra.core.sasheditor.di.contentprovider.DiSashModelMngr;

+import org.eclipse.papyrus.infra.core.sasheditor.di.contentprovider.TransactionalDiSashModelMngr;

+import org.eclipse.papyrus.infra.core.services.IServiceFactory;

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

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

 

 /**

  * Service Factory to create the {@link DiSashModelMngr} service.

@@ -32,7 +32,7 @@ public class DiSashModelMngrServiceFactory implements IServiceFactory {
 	private ServicesRegistry servicesRegistry;

 

 	/**

-	 * @see org.eclipse.papyrus.core.services.IService#init(org.eclipse.papyrus.core.services.ServicesRegistry)

+	 * @see org.eclipse.papyrus.infra.core.services.IService#init(org.eclipse.papyrus.infra.core.services.ServicesRegistry)

 	 * 

 	 * @param servicesRegistry

 	 * @throws ServiceException

@@ -49,7 +49,7 @@ public class DiSashModelMngrServiceFactory implements IServiceFactory {
 	}

 

 	/**

-	 * @see org.eclipse.papyrus.core.services.IService#startService()

+	 * @see org.eclipse.papyrus.infra.core.services.IService#startService()

 	 * 

 	 * @throws ServiceException

 	 */

@@ -69,7 +69,7 @@ public class DiSashModelMngrServiceFactory implements IServiceFactory {
 	}

 

 	/**

-	 * @see org.eclipse.papyrus.core.services.IService#disposeService()

+	 * @see org.eclipse.papyrus.infra.core.services.IService#disposeService()

 	 * 

 	 * @throws ServiceException

 	 */

@@ -77,7 +77,7 @@ public class DiSashModelMngrServiceFactory implements IServiceFactory {
 	}

 

 	/**

-	 * @see org.eclipse.papyrus.core.services.IServiceFactory#createServiceInstance()

+	 * @see org.eclipse.papyrus.infra.core.services.IServiceFactory#createServiceInstance()

 	 * 

 	 * @return

 	 * @throws ServiceException

diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/core/editor/IMultiDiagramEditor.java b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/editor/IMultiDiagramEditor.java
index f8b60085263..680f442df14 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/core/editor/IMultiDiagramEditor.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/editor/IMultiDiagramEditor.java
@@ -11,10 +11,10 @@
  *  Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Initial API and implementation

  *

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

-package org.eclipse.papyrus.core.editor;

+package org.eclipse.papyrus.infra.core.editor;

 

 import org.eclipse.gmf.runtime.diagram.ui.parts.DiagramEditDomain;

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

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

 import org.eclipse.ui.IEditorInput;

 import org.eclipse.ui.IEditorPart;

 import org.eclipse.ui.IEditorSite;

diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/core/editor/ModelSetServiceFactory.java b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/editor/ModelSetServiceFactory.java
index c852ea81440..5da0ca92d53 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/core/editor/ModelSetServiceFactory.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/editor/ModelSetServiceFactory.java
@@ -1,13 +1,13 @@
 /**

  * 

  */

-package org.eclipse.papyrus.core.editor;

+package org.eclipse.papyrus.infra.core.editor;

 

-import org.eclipse.papyrus.core.services.IServiceFactory;

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

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

-import org.eclipse.papyrus.core.utils.DiResourceSet;

-import org.eclipse.papyrus.resource.ModelSet;

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

+import org.eclipse.papyrus.infra.core.services.IServiceFactory;

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

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

+import org.eclipse.papyrus.infra.core.utils.DiResourceSet;

 

 /**

  * A service starting the ModelSet

@@ -22,7 +22,7 @@ public class ModelSetServiceFactory implements IServiceFactory {
 

 	/**

 	 * 

-	 * @see org.eclipse.papyrus.core.services.IService#init(org.eclipse.papyrus.core.services.ServicesRegistry)

+	 * @see org.eclipse.papyrus.infra.core.services.IService#init(org.eclipse.papyrus.infra.core.services.ServicesRegistry)

 	 * 

 	 * @param servicesRegistry

 	 * @throws ServiceException

@@ -33,7 +33,7 @@ public class ModelSetServiceFactory implements IServiceFactory {
 

 	/**

 	 * 

-	 * @see org.eclipse.papyrus.core.services.IService#startService()

+	 * @see org.eclipse.papyrus.infra.core.services.IService#startService()

 	 * 

 	 * @throws ServiceException

 	 */

@@ -42,7 +42,7 @@ public class ModelSetServiceFactory implements IServiceFactory {
 

 	/**

 	 * 

-	 * @see org.eclipse.papyrus.core.services.IService#disposeService()

+	 * @see org.eclipse.papyrus.infra.core.services.IService#disposeService()

 	 * 

 	 * @throws ServiceException

 	 */

diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/core/editor/PageIconRegistryServiceFactory.java b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/editor/PageIconRegistryServiceFactory.java
index c3c44177607..c1ea2425977 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/core/editor/PageIconRegistryServiceFactory.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/editor/PageIconRegistryServiceFactory.java
@@ -1,15 +1,15 @@
 /**

  * 

  */

-package org.eclipse.papyrus.core.editor;

+package org.eclipse.papyrus.infra.core.editor;

 

-import org.eclipse.papyrus.core.Activator;

-import org.eclipse.papyrus.core.editorsfactory.IPageIconsRegistry;

-import org.eclipse.papyrus.core.editorsfactory.PageIconsRegistry;

-import org.eclipse.papyrus.core.extension.diagrameditor.PluggableEditorFactoryReader;

-import org.eclipse.papyrus.core.services.IServiceFactory;

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

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

+import org.eclipse.papyrus.infra.core.Activator;

+import org.eclipse.papyrus.infra.core.editorsfactory.IPageIconsRegistry;

+import org.eclipse.papyrus.infra.core.editorsfactory.PageIconsRegistry;

+import org.eclipse.papyrus.infra.core.extension.diagrameditor.PluggableEditorFactoryReader;

+import org.eclipse.papyrus.infra.core.services.IServiceFactory;

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

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

 

 /**

  * Service Factory to register {@link IPageIconsRegistry}.

@@ -22,7 +22,7 @@ public class PageIconRegistryServiceFactory implements IServiceFactory {
 	private PageIconsRegistry pageIconsRegistry;

 

 	/**

-	 * @see org.eclipse.papyrus.core.services.IService#init(org.eclipse.papyrus.core.services.ServicesRegistry)

+	 * @see org.eclipse.papyrus.infra.core.services.IService#init(org.eclipse.papyrus.infra.core.services.ServicesRegistry)

 	 * 

 	 * @param servicesRegistry

 	 * @throws ServiceException

@@ -31,7 +31,7 @@ public class PageIconRegistryServiceFactory implements IServiceFactory {
 	}

 

 	/**

-	 * @see org.eclipse.papyrus.core.services.IService#startService()

+	 * @see org.eclipse.papyrus.infra.core.services.IService#startService()

 	 * 

 	 * @throws ServiceException

 	 */

@@ -39,7 +39,7 @@ public class PageIconRegistryServiceFactory implements IServiceFactory {
 	}

 

 	/**

-	 * @see org.eclipse.papyrus.core.services.IService#disposeService()

+	 * @see org.eclipse.papyrus.infra.core.services.IService#disposeService()

 	 * 

 	 * @throws ServiceException

 	 */

diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/core/editor/PageMngrServiceFactory.java b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/editor/PageMngrServiceFactory.java
index ad73218ee28..5e9873d34b6 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/core/editor/PageMngrServiceFactory.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/editor/PageMngrServiceFactory.java
@@ -1,14 +1,14 @@
 /**

  * 

  */

-package org.eclipse.papyrus.core.editor;

+package org.eclipse.papyrus.infra.core.editor;

 

-import org.eclipse.papyrus.core.services.IServiceFactory;

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

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

-import org.eclipse.papyrus.sasheditor.contentprovider.IPageMngr;

-import org.eclipse.papyrus.sasheditor.contentprovider.ISashWindowsContentProvider;

-import org.eclipse.papyrus.sasheditor.contentprovider.di.DiSashModelMngr;

+import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IPageMngr;

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

+import org.eclipse.papyrus.infra.core.sasheditor.di.contentprovider.DiSashModelMngr;

+import org.eclipse.papyrus.infra.core.services.IServiceFactory;

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

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

 

 /**

  * A service factory to create the {@link IPageMngr} service. This

@@ -25,7 +25,7 @@ public class PageMngrServiceFactory implements IServiceFactory {
 	private DiSashModelMngr sashModelMngr;

 

 	/**

-	 * @see org.eclipse.papyrus.core.services.IService#init(org.eclipse.papyrus.core.services.ServicesRegistry)

+	 * @see org.eclipse.papyrus.infra.core.services.IService#init(org.eclipse.papyrus.infra.core.services.ServicesRegistry)

 	 * 

 	 * @param servicesRegistry

 	 * @throws ServiceException

@@ -37,7 +37,7 @@ public class PageMngrServiceFactory implements IServiceFactory {
 	}

 

 	/**

-	 * @see org.eclipse.papyrus.core.services.IService#startService()

+	 * @see org.eclipse.papyrus.infra.core.services.IService#startService()

 	 * 

 	 * @throws ServiceException

 	 */

@@ -45,7 +45,7 @@ public class PageMngrServiceFactory implements IServiceFactory {
 	}

 

 	/**

-	 * @see org.eclipse.papyrus.core.services.IService#disposeService()

+	 * @see org.eclipse.papyrus.infra.core.services.IService#disposeService()

 	 * 

 	 * @throws ServiceException

 	 */

@@ -53,7 +53,7 @@ public class PageMngrServiceFactory implements IServiceFactory {
 	}

 

 	/**

-	 * @see org.eclipse.papyrus.core.services.IServiceFactory#createServiceInstance()

+	 * @see org.eclipse.papyrus.infra.core.services.IServiceFactory#createServiceInstance()

 	 * 

 	 * @return

 	 * @throws ServiceException

diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/core/editorsfactory/IEditorFactory.java b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/editorsfactory/IEditorFactory.java
index 0dccf498ecc..dac3a481c3a 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/core/editorsfactory/IEditorFactory.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/editorsfactory/IEditorFactory.java
@@ -1,9 +1,9 @@
 /**

  * 

  */

-package org.eclipse.papyrus.core.editorsfactory;

+package org.eclipse.papyrus.infra.core.editorsfactory;

 

-import org.eclipse.papyrus.sasheditor.contentprovider.IPageModel;

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

 

 /**

  * Factory used to get the Icon associated to the editor used to render the

diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/core/editorsfactory/IEditorIconFactory.java b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/editorsfactory/IEditorIconFactory.java
index ead2f932358..924eb87e744 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/core/editorsfactory/IEditorIconFactory.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/editorsfactory/IEditorIconFactory.java
@@ -1,12 +1,12 @@
 /**

  * 

  */

-package org.eclipse.papyrus.core.editorsfactory;

+package org.eclipse.papyrus.infra.core.editorsfactory;

 

-import org.eclipse.papyrus.sasheditor.contentprovider.IPageModel;

-import org.eclipse.papyrus.sasheditor.contentprovider.ISashWindowsContentProvider;

-import org.eclipse.papyrus.sasheditor.contentprovider.di.DiSashModelMngr;

-import org.eclipse.papyrus.sasheditor.editor.ISashWindowsContainer;

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

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

+import org.eclipse.papyrus.infra.core.sasheditor.di.contentprovider.DiSashModelMngr;

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

 import org.eclipse.swt.graphics.Image;

 

 /**

diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/core/editorsfactory/IEditorIconFactoryExtended.java b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/editorsfactory/IEditorIconFactoryExtended.java
index 877bd0ff2f9..33055f5f15e 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/core/editorsfactory/IEditorIconFactoryExtended.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/editorsfactory/IEditorIconFactoryExtended.java
@@ -10,7 +10,7 @@
  *  Atos - Initial API and implementation

  * 

  */

-package org.eclipse.papyrus.core.editorsfactory;

+package org.eclipse.papyrus.infra.core.editorsfactory;

 

 /**

  * 

diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/core/editorsfactory/IPageIconsRegistry.java b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/editorsfactory/IPageIconsRegistry.java
index 2987676aad8..6ecbb0b0c78 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/core/editorsfactory/IPageIconsRegistry.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/editorsfactory/IPageIconsRegistry.java
@@ -11,7 +11,7 @@
  *  Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Initial API and implementation

  *

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

-package org.eclipse.papyrus.core.editorsfactory;

+package org.eclipse.papyrus.infra.core.editorsfactory;

 

 import org.eclipse.swt.graphics.Image;

 

diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/core/editorsfactory/IPageIconsRegistryExtended.java b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/editorsfactory/IPageIconsRegistryExtended.java
index 20c275910d5..fadf389f752 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/core/editorsfactory/IPageIconsRegistryExtended.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/editorsfactory/IPageIconsRegistryExtended.java
@@ -10,7 +10,7 @@
  *  Atos Origin - Initial API and implementation

  * 

  */

-package org.eclipse.papyrus.core.editorsfactory;

+package org.eclipse.papyrus.infra.core.editorsfactory;

 

 /**

  * Extends IPageIconsRegistry in order to offer a second methods which will give back the URL of the requested Icon

diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/core/editorsfactory/PageIconsRegistry.java b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/editorsfactory/PageIconsRegistry.java
index 9da98e6a83e..85a107f965e 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/core/editorsfactory/PageIconsRegistry.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/editorsfactory/PageIconsRegistry.java
@@ -1,7 +1,7 @@
 /**

  * 

  */

-package org.eclipse.papyrus.core.editorsfactory;

+package org.eclipse.papyrus.infra.core.editorsfactory;

 

 import java.util.ArrayList;

 import java.util.List;

@@ -37,7 +37,7 @@ public class PageIconsRegistry implements IPageIconsRegistryExtended {
 	 * 

 	 * TODO Throw an exception to report errors.

 	 * 

-	 * @see org.eclipse.papyrus.sasheditor.contentprovider.di.IPageModelFactory#createIPageModel(java.lang.Object)

+	 * @see org.eclipse.papyrus.infra.core.sasheditor.di.contentprovider.IPageModelFactory#createIPageModel(java.lang.Object)

 	 */

 	public Image getEditorIcon(Object pageIdentifier) {

 

@@ -88,7 +88,7 @@ public class PageIconsRegistry implements IPageIconsRegistryExtended {
 	/**

 	 * Return the path to the icon ressource.

 	 * 

-	 * @see org.eclipse.papyrus.core.editorsfactory.IPageIconsRegistryExtended#getEditorURLIcon(java.lang.Object)

+	 * @see org.eclipse.papyrus.infra.core.editorsfactory.IPageIconsRegistryExtended#getEditorURLIcon(java.lang.Object)

 	 * 

 	 * @param model

 	 * @return

diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/core/editorsfactory/PageModelFactoryRegistry.java b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/editorsfactory/PageModelFactoryRegistry.java
index 4d59a68284c..80316506272 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/core/editorsfactory/PageModelFactoryRegistry.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/editorsfactory/PageModelFactoryRegistry.java
@@ -1,14 +1,14 @@
 /**

  * 

  */

-package org.eclipse.papyrus.core.editorsfactory;

+package org.eclipse.papyrus.infra.core.editorsfactory;

 

 import java.util.ArrayList;

 import java.util.List;

 

-import org.eclipse.papyrus.sasheditor.contentprovider.IPageModel;

-import org.eclipse.papyrus.sasheditor.contentprovider.ISashWindowsContentProvider;

-import org.eclipse.papyrus.sasheditor.contentprovider.di.IPageModelFactory;

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

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

+import org.eclipse.papyrus.infra.core.sasheditor.di.contentprovider.IPageModelFactory;

 

 /**

  * Concrete implementation of the {@link IPageModelFactory} required by the di

@@ -40,7 +40,7 @@ public class PageModelFactoryRegistry implements IPageModelFactory {
 	 * 

 	 * TODO Throw an exception to report errors.

 	 * 

-	 * @see org.eclipse.papyrus.sasheditor.contentprovider.di.IPageModelFactory#createIPageModel(java.lang.Object)

+	 * @see org.eclipse.papyrus.infra.core.sasheditor.di.contentprovider.IPageModelFactory#createIPageModel(java.lang.Object)

 	 */

 	public IPageModel createIPageModel(Object pageIdentifier) {

 

diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/core/extension/BadClassNameException.java b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/extension/BadClassNameException.java
index 24fbf0346d8..4edf1dd041f 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/core/extension/BadClassNameException.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/extension/BadClassNameException.java
@@ -11,7 +11,7 @@
  *  Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Initial API and implementation

  *

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

-package org.eclipse.papyrus.core.extension;

+package org.eclipse.papyrus.infra.core.extension;

 

 import org.eclipse.core.runtime.IConfigurationElement;

 

diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/core/extension/BadNameExtensionException.java b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/extension/BadNameExtensionException.java
index 50e27b8b5d2..fc7003dfb04 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/core/extension/BadNameExtensionException.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/extension/BadNameExtensionException.java
@@ -11,7 +11,7 @@
  *  Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Initial API and implementation

  *

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

-package org.eclipse.papyrus.core.extension;

+package org.eclipse.papyrus.infra.core.extension;

 

 /**

  * Exception thrown when a bad name is encountered in extension processing.

diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/core/extension/ExtensionException.java b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/extension/ExtensionException.java
index 3a3e157cb03..98e425642c8 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/core/extension/ExtensionException.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/extension/ExtensionException.java
@@ -11,10 +11,10 @@
  *  Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Initial API and implementation

  *

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

-package org.eclipse.papyrus.core.extension;

+package org.eclipse.papyrus.infra.core.extension;

 

 import org.eclipse.core.runtime.IConfigurationElement;

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

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

 

 /**

  * Base class for extension exceptions

diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/core/extension/ExtensionUtils.java b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/extension/ExtensionUtils.java
index 25004e9bc43..36abff9c502 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/core/extension/ExtensionUtils.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/extension/ExtensionUtils.java
@@ -11,7 +11,7 @@
  *  Patrick Tessier (CEA LIST)  patrick.tessier@cea.fr - Initial API and implementation

  *

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

-package org.eclipse.papyrus.core.extension;

+package org.eclipse.papyrus.infra.core.extension;

 

 import org.eclipse.core.runtime.IConfigurationElement;

 import org.eclipse.core.runtime.InvalidRegistryObjectException;

diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/core/extension/NotFoundException.java b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/extension/NotFoundException.java
index d058795ce34..7f339dbf10f 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/core/extension/NotFoundException.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/extension/NotFoundException.java
@@ -11,7 +11,7 @@
  *  Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Initial API and implementation

  *

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

-package org.eclipse.papyrus.core.extension;

+package org.eclipse.papyrus.infra.core.extension;

 

 /**

  * Exception thrown when something is not found when parsing a configuration

diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/core/extension/commands/CreationCommandDescriptor.java b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/extension/commands/CreationCommandDescriptor.java
index c8b1c4e0de8..7b855753e49 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/core/extension/commands/CreationCommandDescriptor.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/extension/commands/CreationCommandDescriptor.java
@@ -9,10 +9,10 @@
  *     Jerome Benois (Obeo) jerome.benois@obeo.fr - initial API and implementation

  *     Tristan Faure (Atos Origin) tristan.faure@atosorigin.com - add condition to the create command (task #296902)

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

-package org.eclipse.papyrus.core.extension.commands;

+package org.eclipse.papyrus.infra.core.extension.commands;

 

 import org.eclipse.jface.resource.ImageDescriptor;

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

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

 

 /**

  * Creation Command Descriptor used to create a new diagram

diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/core/extension/commands/CreationCommandExtensionFactory.java b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/extension/commands/CreationCommandExtensionFactory.java
index 998b101fece..4a1dda77365 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/core/extension/commands/CreationCommandExtensionFactory.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/extension/commands/CreationCommandExtensionFactory.java
@@ -9,14 +9,14 @@
  *     Jerome Benois (Obeo) jerome.benois@obeo.fr - initial API and implementation

  *     Tristan Faure (Atos Origin) tristan.faure@atosorigin.com - add condition to the create command (task #296902)

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

-package org.eclipse.papyrus.core.extension.commands;

+package org.eclipse.papyrus.infra.core.extension.commands;

 

 import org.eclipse.core.runtime.IConfigurationElement;

-import org.eclipse.papyrus.core.extension.BadNameExtensionException;

-import org.eclipse.papyrus.core.extension.ExtensionUtils;

-import org.eclipse.papyrus.core.extension.ExtensionException;

-import org.eclipse.papyrus.core.utils.IDebugChannel;

-import org.eclipse.papyrus.core.utils.PapyrusTrace;

+import org.eclipse.papyrus.infra.core.extension.BadNameExtensionException;

+import org.eclipse.papyrus.infra.core.extension.ExtensionException;

+import org.eclipse.papyrus.infra.core.extension.ExtensionUtils;

+import org.eclipse.papyrus.infra.core.utils.IDebugChannel;

+import org.eclipse.papyrus.infra.core.utils.PapyrusTrace;

 import org.eclipse.ui.plugin.AbstractUIPlugin;

 

 /**

diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/core/extension/commands/CreationCommandRegistry.java b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/extension/commands/CreationCommandRegistry.java
index c6c10786bcf..66f4e66069e 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/core/extension/commands/CreationCommandRegistry.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/extension/commands/CreationCommandRegistry.java
@@ -8,7 +8,7 @@
  * Contributors:

  *     Jerome Benois (Obeo) jerome.benois@obeo.fr - initial API and implementation

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

-package org.eclipse.papyrus.core.extension.commands;

+package org.eclipse.papyrus.infra.core.extension.commands;

 

 import java.util.Collection;

 import java.util.HashMap;

@@ -18,11 +18,11 @@ import org.eclipse.core.runtime.IConfigurationElement;
 import org.eclipse.core.runtime.IStatus;

 import org.eclipse.core.runtime.Platform;

 import org.eclipse.core.runtime.Status;

-import org.eclipse.papyrus.core.Activator;

-import org.eclipse.papyrus.core.extension.ExtensionException;

-import org.eclipse.papyrus.core.extension.NotFoundException;

-import org.eclipse.papyrus.core.utils.IDebugChannel;

-import org.eclipse.papyrus.core.utils.PapyrusTrace;

+import org.eclipse.papyrus.infra.core.Activator;

+import org.eclipse.papyrus.infra.core.extension.ExtensionException;

+import org.eclipse.papyrus.infra.core.extension.NotFoundException;

+import org.eclipse.papyrus.infra.core.utils.IDebugChannel;

+import org.eclipse.papyrus.infra.core.utils.PapyrusTrace;

 

 /**

  * {@inheritDoc}

diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/core/extension/commands/ICreationCommand.java b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/extension/commands/ICreationCommand.java
index d593e676cec..0491a3243f4 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/core/extension/commands/ICreationCommand.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/extension/commands/ICreationCommand.java
@@ -8,11 +8,11 @@
  * Contributors:
  *     Jerome Benois (Obeo) jerome.benois@obeo.fr - initial API and implementation
  *******************************************************************************/
-package org.eclipse.papyrus.core.extension.commands;
+package org.eclipse.papyrus.infra.core.extension.commands;
 
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.papyrus.core.utils.DiResourceSet;
+import org.eclipse.papyrus.infra.core.utils.DiResourceSet;
 
 /**
  * Define a command use to create new diagram. It use to provide Eclipse
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/core/extension/commands/ICreationCommandRegistry.java b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/extension/commands/ICreationCommandRegistry.java
index 2fe0420d7f6..066285bcec5 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/core/extension/commands/ICreationCommandRegistry.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/extension/commands/ICreationCommandRegistry.java
@@ -8,11 +8,11 @@
  * Contributors:

  *     Jerome Benois (Obeo) jerome.benois@obeo.fr - initial API and implementation

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

-package org.eclipse.papyrus.core.extension.commands;

+package org.eclipse.papyrus.infra.core.extension.commands;

 

 import java.util.Collection;

 

-import org.eclipse.papyrus.core.extension.NotFoundException;

+import org.eclipse.papyrus.infra.core.extension.NotFoundException;

 

 /**

  * Registry containing CreationCommand registered by Eclipse extension.

diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/core/extension/commands/ICreationCondition.java b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/extension/commands/ICreationCondition.java
index c98120f4cfc..7f8288c631f 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/core/extension/commands/ICreationCondition.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/extension/commands/ICreationCondition.java
@@ -10,7 +10,7 @@
  *  Tristan Faure (ATOS ORIGIN) tristan.faure@atosorigin.com - Initial API and implementation

  *

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

-package org.eclipse.papyrus.core.extension.commands;

+package org.eclipse.papyrus.infra.core.extension.commands;

 

 import org.eclipse.emf.ecore.EObject;

 

diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/core/extension/commands/IModelCreationCommand.java b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/extension/commands/IModelCreationCommand.java
index b38f6324bca..87451d77221 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/core/extension/commands/IModelCreationCommand.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/extension/commands/IModelCreationCommand.java
@@ -11,9 +11,9 @@
  *  Tatiana Fesenko (CEA LIST) - Initial API and implementation

  *

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

-package org.eclipse.papyrus.core.extension.commands;

+package org.eclipse.papyrus.infra.core.extension.commands;

 

-import org.eclipse.papyrus.core.utils.DiResourceSet;

+import org.eclipse.papyrus.infra.core.utils.DiResourceSet;

 

 /**

  * The Interface IModelCreationCommand.

diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/core/extension/commands/ModelCreationCommandBase.java b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/extension/commands/ModelCreationCommandBase.java
index 4f3774846a2..bdcdc4c22be 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/core/extension/commands/ModelCreationCommandBase.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/extension/commands/ModelCreationCommandBase.java
@@ -11,7 +11,7 @@
  *  Tatiana Fesenko (CEA LIST) - Initial API and implementation

  *

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

-package org.eclipse.papyrus.core.extension.commands;

+package org.eclipse.papyrus.infra.core.extension.commands;

 

 import java.util.Collections;

 

@@ -25,7 +25,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.commands.wrappers.GMFtoEMFCommandWrapper;

-import org.eclipse.papyrus.core.utils.DiResourceSet;

+import org.eclipse.papyrus.infra.core.utils.DiResourceSet;

 

 /**

  * The Class ModelCreationCommandBase.

@@ -33,7 +33,7 @@ import org.eclipse.papyrus.core.utils.DiResourceSet;
 public abstract class ModelCreationCommandBase implements IModelCreationCommand {

 

 	/**

-	 * @see org.eclipse.papyrus.core.extension.commands.IModelCreationCommand#createModel(org.eclipse.papyrus.core.utils.DiResourceSet)

+	 * @see org.eclipse.papyrus.infra.core.extension.commands.IModelCreationCommand#createModel(org.eclipse.papyrus.infra.core.utils.DiResourceSet)

 	 * 

 	 * @param diResourceSet

 	 */

diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/core/extension/commands/PerspectiveContextDependence.java b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/extension/commands/PerspectiveContextDependence.java
index 14054198ecd..0e3666bc94e 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/core/extension/commands/PerspectiveContextDependence.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/extension/commands/PerspectiveContextDependence.java
@@ -11,10 +11,10 @@
  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  *

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

-package org.eclipse.papyrus.core.extension.commands;

+package org.eclipse.papyrus.infra.core.extension.commands;

 

 import org.eclipse.emf.ecore.EObject;

-import org.eclipse.papyrus.core.extension.commands.ICreationCondition;

+import org.eclipse.papyrus.infra.core.extension.commands.ICreationCondition;

 import org.eclipse.ui.PlatformUI;

 import org.eclipse.ui.internal.Perspective;

 import org.eclipse.ui.internal.WorkbenchPage;

diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/core/extension/diagrameditor/AbstractEditorFactory.java b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/extension/diagrameditor/AbstractEditorFactory.java
index 1356ae82168..cf9a53c85aa 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/core/extension/diagrameditor/AbstractEditorFactory.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/extension/diagrameditor/AbstractEditorFactory.java
@@ -11,11 +11,11 @@
  *  Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Initial API and implementation

  *

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

-package org.eclipse.papyrus.core.extension.diagrameditor;

+package org.eclipse.papyrus.infra.core.extension.diagrameditor;

 

 import org.eclipse.gmf.runtime.notation.Diagram;

-import org.eclipse.papyrus.core.editorsfactory.IEditorFactory;

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

+import org.eclipse.papyrus.infra.core.editorsfactory.IEditorFactory;

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

 

 /**

  * Abstract base class for Factory of editors. See {@link IEditorFactory}.

diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/core/extension/diagrameditor/EditorDescriptor.java b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/extension/diagrameditor/EditorDescriptor.java
index cab8b412872..3ed2fac57a7 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/core/extension/diagrameditor/EditorDescriptor.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/extension/diagrameditor/EditorDescriptor.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Initial API and implementation

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

-package org.eclipse.papyrus.core.extension.diagrameditor;

+package org.eclipse.papyrus.infra.core.extension.diagrameditor;

 

 import org.eclipse.core.runtime.IConfigurationElement;

 import org.eclipse.jface.resource.ImageDescriptor;

@@ -62,7 +62,7 @@ public class EditorDescriptor {
 	}

 

 	/**

-	 * @see org.eclipse.papyrus.core.extension.diagrameditor.IEditorDescriptor#getActionBarContributorId()

+	 * @see org.eclipse.papyrus.infra.core.extension.diagrameditor.IEditorDescriptor#getActionBarContributorId()

 	 * @return

 	 * 

 	 */

diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/core/extension/diagrameditor/EditorDescriptorExtensionFactory.java b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/extension/diagrameditor/EditorDescriptorExtensionFactory.java
index 92e77abedf4..c94ae59b3b9 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/core/extension/diagrameditor/EditorDescriptorExtensionFactory.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/extension/diagrameditor/EditorDescriptorExtensionFactory.java
@@ -11,14 +11,14 @@
  *  Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Initial API and implementation

  *

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

-package org.eclipse.papyrus.core.extension.diagrameditor;

+package org.eclipse.papyrus.infra.core.extension.diagrameditor;

 

-import static org.eclipse.papyrus.core.Activator.log;

+import static org.eclipse.papyrus.infra.core.Activator.log;

 

 import org.eclipse.core.runtime.IConfigurationElement;

-import org.eclipse.papyrus.core.extension.BadNameExtensionException;

-import org.eclipse.papyrus.core.extension.ExtensionException;

-import org.eclipse.papyrus.core.extension.ExtensionUtils;

+import org.eclipse.papyrus.infra.core.extension.BadNameExtensionException;

+import org.eclipse.papyrus.infra.core.extension.ExtensionException;

+import org.eclipse.papyrus.infra.core.extension.ExtensionUtils;

 

 /**

  * A factory used to create editor descriptor object from Eclipse extensions points elements.

@@ -70,7 +70,7 @@ public class EditorDescriptorExtensionFactory extends ExtensionUtils {
 		String iconPath = element.getAttribute(ICON_ATTRIBUTE);

 		if(iconPath != null) {

 			/** Implementation which set the icon and register the complete URL of the icon : Bug eclipse 358732*/

-			res.setIcon(element, iconPath, org.eclipse.papyrus.core.Activator.PLUGIN_ID);

+			res.setIcon(element, iconPath, org.eclipse.papyrus.infra.core.Activator.PLUGIN_ID);

 

 		}

 

diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/core/extension/diagrameditor/EditorFactoryProxy.java b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/extension/diagrameditor/EditorFactoryProxy.java
index 9cd7b1bd4ef..9c9c91cb6a2 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/core/extension/diagrameditor/EditorFactoryProxy.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/extension/diagrameditor/EditorFactoryProxy.java
@@ -1,11 +1,11 @@
 /**

  * 

  */

-package org.eclipse.papyrus.core.extension.diagrameditor;

+package org.eclipse.papyrus.infra.core.extension.diagrameditor;

 

-import org.eclipse.papyrus.core.editorsfactory.IEditorFactory;

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

-import org.eclipse.papyrus.sasheditor.contentprovider.IPageModel;

+import org.eclipse.papyrus.infra.core.editorsfactory.IEditorFactory;

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

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

 

 /**

  * A proxy implementation of {@link IEditorFactory} used to do lazy

@@ -44,7 +44,7 @@ public class EditorFactoryProxy implements IEditorFactory {
 	}

 

 	/**

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

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

 	 * 

 	 * @param pageIdentifier

 	 * @return

@@ -54,7 +54,7 @@ public class EditorFactoryProxy implements IEditorFactory {
 	}

 

 	/**

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

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

 	 * 

 	 * @param pageIdentifier

 	 * @return

diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/core/extension/diagrameditor/EditorIconFactory.java b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/extension/diagrameditor/EditorIconFactory.java
index 8f516f91f7e..f1cdcb9592a 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/core/extension/diagrameditor/EditorIconFactory.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/extension/diagrameditor/EditorIconFactory.java
@@ -1,11 +1,11 @@
 /**

  * 

  */

-package org.eclipse.papyrus.core.extension.diagrameditor;

+package org.eclipse.papyrus.infra.core.extension.diagrameditor;

 

 import org.eclipse.jface.resource.ImageDescriptor;

-import org.eclipse.papyrus.core.editorsfactory.IEditorIconFactory;

-import org.eclipse.papyrus.core.editorsfactory.IEditorIconFactoryExtended;

+import org.eclipse.papyrus.infra.core.editorsfactory.IEditorIconFactory;

+import org.eclipse.papyrus.infra.core.editorsfactory.IEditorIconFactoryExtended;

 import org.eclipse.swt.graphics.Image;

 

 /**

@@ -43,7 +43,7 @@ public class EditorIconFactory implements IEditorIconFactoryExtended {
 	}

 

 	/**

-	 * @see org.eclipse.papyrus.core.editorsfactory.IEditorIconFactory#getEditorIcon(java.lang.Object)

+	 * @see org.eclipse.papyrus.infra.core.editorsfactory.IEditorIconFactory#getEditorIcon(java.lang.Object)

 	 * 

 	 * @param pageIdentifier

 	 * @return

@@ -72,7 +72,7 @@ public class EditorIconFactory implements IEditorIconFactoryExtended {
 	}

 

 	/**

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

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

 	 * 

 	 * @param pageIdentifier

 	 * @return

@@ -123,7 +123,7 @@ public class EditorIconFactory implements IEditorIconFactoryExtended {
 	/**

 	 * Return the URL of the main icon used to create this icon

 	 * 

-	 * @see org.eclipse.papyrus.core.editorsfactory.IEditorIconFactory#getURLMainIcon(java.lang.Object)

+	 * @see org.eclipse.papyrus.infra.core.editorsfactory.IEditorIconFactory#getURLMainIcon(java.lang.Object)

 	 * 

 	 * @param pageIdentifier

 	 * @return

diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/core/extension/diagrameditor/EditorNotFoundException.java b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/extension/diagrameditor/EditorNotFoundException.java
index a717ebdf00e..30bdc483b58 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/core/extension/diagrameditor/EditorNotFoundException.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/extension/diagrameditor/EditorNotFoundException.java
@@ -11,7 +11,7 @@
  *  Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Initial API and implementation

  *

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

-package org.eclipse.papyrus.core.extension.diagrameditor;

+package org.eclipse.papyrus.infra.core.extension.diagrameditor;

 

 /**

  * Editor was not found.

diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/core/extension/diagrameditor/IPluggableEditorFactory.java b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/extension/diagrameditor/IPluggableEditorFactory.java
index 1c56d08599d..a857de05485 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/core/extension/diagrameditor/IPluggableEditorFactory.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/extension/diagrameditor/IPluggableEditorFactory.java
@@ -11,10 +11,10 @@
  *  Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Initial API and implementation

  *

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

-package org.eclipse.papyrus.core.extension.diagrameditor;

+package org.eclipse.papyrus.infra.core.extension.diagrameditor;

 

-import org.eclipse.papyrus.core.editorsfactory.IEditorFactory;

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

+import org.eclipse.papyrus.infra.core.editorsfactory.IEditorFactory;

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

 

 /**

  * This interface should be implemented by Editor Factories that can be declared

diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/core/extension/diagrameditor/MultiDiagramException.java b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/extension/diagrameditor/MultiDiagramException.java
index a5ad7af98d4..141711080ce 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/core/extension/diagrameditor/MultiDiagramException.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/extension/diagrameditor/MultiDiagramException.java
@@ -11,7 +11,7 @@
  *  Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Initial API and implementation

  *

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

-package org.eclipse.papyrus.core.extension.diagrameditor;

+package org.eclipse.papyrus.infra.core.extension.diagrameditor;

 

 /**

  * Root Exception of MultiDiagram exception

diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/core/extension/diagrameditor/PluggableEditorFactoryReader.java b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/extension/diagrameditor/PluggableEditorFactoryReader.java
index 9de43a2944e..f92ac0763e2 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/core/extension/diagrameditor/PluggableEditorFactoryReader.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/extension/diagrameditor/PluggableEditorFactoryReader.java
@@ -11,19 +11,19 @@
  *  Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Initial API and implementation

  *

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

-package org.eclipse.papyrus.core.extension.diagrameditor;

+package org.eclipse.papyrus.infra.core.extension.diagrameditor;

 

-import static org.eclipse.papyrus.core.Activator.log;

+import static org.eclipse.papyrus.infra.core.Activator.log;

 

 import java.util.ArrayList;

 import java.util.List;

 

 import org.eclipse.core.runtime.IConfigurationElement;

 import org.eclipse.core.runtime.Platform;

-import org.eclipse.papyrus.core.editorsfactory.PageIconsRegistry;

-import org.eclipse.papyrus.core.editorsfactory.PageModelFactoryRegistry;

-import org.eclipse.papyrus.core.extension.ExtensionException;

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

+import org.eclipse.papyrus.infra.core.editorsfactory.PageIconsRegistry;

+import org.eclipse.papyrus.infra.core.editorsfactory.PageModelFactoryRegistry;

+import org.eclipse.papyrus.infra.core.extension.ExtensionException;

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

 

 /**

  * This reader is used to read PluggableEditorFactory from the Eclipse extension

diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/core/lifecycleevents/DoSaveEvent.java b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/lifecycleevents/DoSaveEvent.java
index dc27d32e104..b4975145830 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/core/lifecycleevents/DoSaveEvent.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/lifecycleevents/DoSaveEvent.java
@@ -1,10 +1,10 @@
 /**

  * 

  */

-package org.eclipse.papyrus.core.lifecycleevents;

+package org.eclipse.papyrus.infra.core.lifecycleevents;

 

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

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

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

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

 

 /**

  * Event sent whith a Save or SaveAs.

diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/core/lifecycleevents/IEditorInputChangedListener.java b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/lifecycleevents/IEditorInputChangedListener.java
index a5e317408be..8a1ef3a8c8b 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/core/lifecycleevents/IEditorInputChangedListener.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/lifecycleevents/IEditorInputChangedListener.java
@@ -12,7 +12,7 @@
  *

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

 

-package org.eclipse.papyrus.core.lifecycleevents;

+package org.eclipse.papyrus.infra.core.lifecycleevents;

 

 import org.eclipse.ui.IEditorPart;

 import org.eclipse.ui.part.FileEditorInput;

diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/core/lifecycleevents/ILifeCycleEventsProvider.java b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/lifecycleevents/ILifeCycleEventsProvider.java
index d27c2c31b27..387b9c6c828 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/core/lifecycleevents/ILifeCycleEventsProvider.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/lifecycleevents/ILifeCycleEventsProvider.java
@@ -1,7 +1,7 @@
 /**

  * 

  */

-package org.eclipse.papyrus.core.lifecycleevents;

+package org.eclipse.papyrus.infra.core.lifecycleevents;

 

 /**

  * Concrete implementation of this interface allows to listen on various

diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/core/lifecycleevents/ISaveAndDirtyService.java b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/lifecycleevents/ISaveAndDirtyService.java
index abda177667a..520cd741437 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/core/lifecycleevents/ISaveAndDirtyService.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/lifecycleevents/ISaveAndDirtyService.java
@@ -12,7 +12,7 @@
  *

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

 

-package org.eclipse.papyrus.core.lifecycleevents;

+package org.eclipse.papyrus.infra.core.lifecycleevents;

 

 import org.eclipse.core.runtime.IProgressMonitor;

 import org.eclipse.ui.ISaveablePart;

diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/core/lifecycleevents/ISaveEventListener.java b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/lifecycleevents/ISaveEventListener.java
index a1171b487e4..6263e804700 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/core/lifecycleevents/ISaveEventListener.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/lifecycleevents/ISaveEventListener.java
@@ -1,7 +1,7 @@
 /**

  * 

  */

-package org.eclipse.papyrus.core.lifecycleevents;

+package org.eclipse.papyrus.infra.core.lifecycleevents;

 

 /**

  * Interface used to listen on open, save and saveAs events.

diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/core/lifecycleevents/LifeCycleEventsProvider.java b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/lifecycleevents/LifeCycleEventsProvider.java
index 6da95116a3f..efca7f9d6f4 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/core/lifecycleevents/LifeCycleEventsProvider.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/lifecycleevents/LifeCycleEventsProvider.java
@@ -1,7 +1,7 @@
 /**

  * 

  */

-package org.eclipse.papyrus.core.lifecycleevents;

+package org.eclipse.papyrus.infra.core.lifecycleevents;

 

 import java.util.ArrayList;

 import java.util.List;

diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/core/lifecycleevents/LifeCycleEventsProviderServiceFactory.java b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/lifecycleevents/LifeCycleEventsProviderServiceFactory.java
index 44d0cc56bab..3af757207b7 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/core/lifecycleevents/LifeCycleEventsProviderServiceFactory.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/lifecycleevents/LifeCycleEventsProviderServiceFactory.java
@@ -12,12 +12,12 @@
  *

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

 

-package org.eclipse.papyrus.core.lifecycleevents;

+package org.eclipse.papyrus.infra.core.lifecycleevents;

 

-import org.eclipse.papyrus.core.services.IServiceFactory;

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

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

-import org.eclipse.papyrus.resource.ModelSet;

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

+import org.eclipse.papyrus.infra.core.services.IServiceFactory;

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

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

 

 /**

  * A service factory to create the {@link ILifeCycleEventsProvider} service.

@@ -35,7 +35,7 @@ public class LifeCycleEventsProviderServiceFactory implements IServiceFactory {
 	private SaveAndDirtyService saveAndDirtyService;

 

 	/**

-	 * @see org.eclipse.papyrus.core.services.IService#init(org.eclipse.papyrus.core.services.ServicesRegistry)

+	 * @see org.eclipse.papyrus.infra.core.services.IService#init(org.eclipse.papyrus.infra.core.services.ServicesRegistry)

 	 * 

 	 * @param servicesRegistry

 	 * @throws ServiceException

@@ -48,7 +48,7 @@ public class LifeCycleEventsProviderServiceFactory implements IServiceFactory {
 	}

 

 	/**

-	 * @see org.eclipse.papyrus.core.services.IService#startService()

+	 * @see org.eclipse.papyrus.infra.core.services.IService#startService()

 	 * 

 	 * @throws ServiceException

 	 */

@@ -56,7 +56,7 @@ public class LifeCycleEventsProviderServiceFactory implements IServiceFactory {
 	}

 

 	/**

-	 * @see org.eclipse.papyrus.core.services.IService#disposeService()

+	 * @see org.eclipse.papyrus.infra.core.services.IService#disposeService()

 	 * 

 	 * @throws ServiceException

 	 */

@@ -64,7 +64,7 @@ public class LifeCycleEventsProviderServiceFactory implements IServiceFactory {
 	}

 

 	/**

-	 * @see org.eclipse.papyrus.core.services.IServiceFactory#createServiceInstance()

+	 * @see org.eclipse.papyrus.infra.core.services.IServiceFactory#createServiceInstance()

 	 * 

 	 * @return

 	 * @throws ServiceException

diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/core/lifecycleevents/SaveAndDirtyService.java b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/lifecycleevents/SaveAndDirtyService.java
index 71898cbe651..0baf6e32d93 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/core/lifecycleevents/SaveAndDirtyService.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/lifecycleevents/SaveAndDirtyService.java
@@ -12,9 +12,9 @@
  *

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

 

-package org.eclipse.papyrus.core.lifecycleevents;

+package org.eclipse.papyrus.infra.core.lifecycleevents;

 

-import static org.eclipse.papyrus.core.Activator.log;

+import static org.eclipse.papyrus.infra.core.Activator.log;

 

 import java.io.IOException;

 import java.lang.reflect.InvocationTargetException;

@@ -35,12 +35,12 @@ import org.eclipse.emf.transaction.ResourceSetListener;
 import org.eclipse.emf.transaction.RollbackException;

 import org.eclipse.emf.transaction.TransactionalEditingDomain;

 import org.eclipse.jface.dialogs.ProgressMonitorDialog;

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

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

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

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

-import org.eclipse.papyrus.core.utils.ServiceUtils;

-import org.eclipse.papyrus.resource.ModelSet;

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

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

+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.swt.widgets.Shell;

 import org.eclipse.ui.IFileEditorInput;

 import org.eclipse.ui.ISaveablePart;

@@ -170,7 +170,7 @@ public class SaveAndDirtyService extends LifeCycleEventsProvider implements ISav
 	 * Initialize the service. Retrieve other required services (ModelSet,

 	 * CoreEditor).

 	 * 

-	 * @see org.eclipse.papyrus.core.services.IService#init(org.eclipse.papyrus.core.services.ServicesRegistry)

+	 * @see org.eclipse.papyrus.infra.core.services.IService#init(org.eclipse.papyrus.infra.core.services.ServicesRegistry)

 	 * 

 	 * @param servicesRegistry

 	 * @throws ServiceException

@@ -197,7 +197,7 @@ public class SaveAndDirtyService extends LifeCycleEventsProvider implements ISav
 	/**

 	 * Do nothing.

 	 * 

-	 * @see org.eclipse.papyrus.core.services.IService#startService()

+	 * @see org.eclipse.papyrus.infra.core.services.IService#startService()

 	 * 

 	 * @throws ServiceException

 	 */

@@ -211,7 +211,7 @@ public class SaveAndDirtyService extends LifeCycleEventsProvider implements ISav
 	}

 

 	/**

-	 * @see org.eclipse.papyrus.core.services.IService#disposeService()

+	 * @see org.eclipse.papyrus.infra.core.services.IService#disposeService()

 	 * 

 	 * @throws ServiceException

 	 */

diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/core/listenerservice/IPapyrusListener.java b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/listenerservice/IPapyrusListener.java
index b88c6cdaf58..70fdda8f588 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/core/listenerservice/IPapyrusListener.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/listenerservice/IPapyrusListener.java
@@ -8,7 +8,7 @@
  * Contributors:

  *     Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

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

-package org.eclipse.papyrus.core.listenerservice;

+package org.eclipse.papyrus.infra.core.listenerservice;

 

 import org.eclipse.emf.common.notify.Notification;

 

diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/core/listenerservice/ModelListenerManager.java b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/listenerservice/ModelListenerManager.java
index b8b56781a2f..412c1b7e402 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/core/listenerservice/ModelListenerManager.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/listenerservice/ModelListenerManager.java
@@ -8,7 +8,7 @@
  * Contributors:

  *     Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

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

-package org.eclipse.papyrus.core.listenerservice;

+package org.eclipse.papyrus.infra.core.listenerservice;

 

 import java.util.Enumeration;

 import java.util.Hashtable;

@@ -17,7 +17,7 @@ import org.eclipse.core.runtime.IConfigurationElement;
 import org.eclipse.core.runtime.Platform;

 import org.eclipse.emf.common.notify.Notification;

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

-import org.eclipse.papyrus.core.Activator;

+import org.eclipse.papyrus.infra.core.Activator;

 import org.osgi.framework.Bundle;

 

 /**

@@ -31,7 +31,7 @@ public class ModelListenerManager extends EContentAdapter {
 	private Hashtable<String, IPapyrusListener> listenerRegistry;

 

 	// extension point ID

-	private String MODELLISTENERID_EXTENSION_ID = "org.eclipse.papyrus.core.modelListener";

+	private String MODELLISTENERID_EXTENSION_ID = "org.eclipse.papyrus.infra.core.modelListener";

 

 	private String NAME_ID = "name";

 

diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/core/modelsetquery/ModelSetQuery.java b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/modelsetquery/ModelSetQuery.java
index c77e9b33c3f..777a3ba48e4 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/core/modelsetquery/ModelSetQuery.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/modelsetquery/ModelSetQuery.java
@@ -11,15 +11,15 @@
  *  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation

  *

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

-package org.eclipse.papyrus.core.modelsetquery;

+package org.eclipse.papyrus.infra.core.modelsetquery;

 

-import static org.eclipse.papyrus.core.modelsetquery.impl.ModelSetQueryAdapter.getExistingTypeCacheAdapter;

+import static org.eclipse.papyrus.infra.core.modelsetquery.impl.ModelSetQueryAdapter.getExistingTypeCacheAdapter;

 

 import java.util.Collection;

 

 import org.eclipse.emf.ecore.EClassifier;

 import org.eclipse.emf.ecore.EObject;

-import org.eclipse.papyrus.core.modelsetquery.impl.IModelSetQueryAdapter;

+import org.eclipse.papyrus.infra.core.modelsetquery.impl.IModelSetQueryAdapter;

 

 /**

  * The Class ModelSetQuery provides service to get objects of specified type

diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/core/modelsetquery/impl/IModelSetQueryAdapter.java b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/modelsetquery/impl/IModelSetQueryAdapter.java
index ad33da41c46..62da5c1859e 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/core/modelsetquery/impl/IModelSetQueryAdapter.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/modelsetquery/impl/IModelSetQueryAdapter.java
@@ -11,7 +11,7 @@
  *  Tristan FAURE tristan.faure@atosorigin.com - Initial API and implementation

  *

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

-package org.eclipse.papyrus.core.modelsetquery.impl;

+package org.eclipse.papyrus.infra.core.modelsetquery.impl;

 

 import java.util.Collection;

 

diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/core/modelsetquery/impl/ModelSetQueryAdapter.java b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/modelsetquery/impl/ModelSetQueryAdapter.java
index 7402f4f0911..a5144350a7d 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/core/modelsetquery/impl/ModelSetQueryAdapter.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/modelsetquery/impl/ModelSetQueryAdapter.java
@@ -11,7 +11,7 @@
  *  Tristan FAURE tristan.faure@atosorigin.com - Initial API and implementation

  *

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

-package org.eclipse.papyrus.core.modelsetquery.impl;

+package org.eclipse.papyrus.infra.core.modelsetquery.impl;

 

 import java.util.Collection;

 import java.util.Collections;

diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/core/modelsetquery/impl/ModelSetQueryInitializer.java b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/modelsetquery/impl/ModelSetQueryInitializer.java
index d231156293f..3a07a78f9d6 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/core/modelsetquery/impl/ModelSetQueryInitializer.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/modelsetquery/impl/ModelSetQueryInitializer.java
@@ -8,12 +8,12 @@
  * http://www.eclipse.org/legal/epl-v10.html

  *

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

-package org.eclipse.papyrus.core.modelsetquery.impl;

+package org.eclipse.papyrus.infra.core.modelsetquery.impl;

 

 import org.eclipse.emf.common.notify.Adapter;

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

-import org.eclipse.papyrus.resource.IModelSetSnippet;

-import org.eclipse.papyrus.resource.ModelSet;

+import org.eclipse.papyrus.infra.core.resource.IModelSetSnippet;

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

 

 /**

  * This snippet take in charge the initialization of the TypeCache. The snippet

@@ -31,7 +31,7 @@ public class ModelSetQueryInitializer implements IModelSetSnippet {
 	private ModelSetQueryAdapter modelQueryAdapter;

 

 	/**

-	 * @see org.eclipse.papyrus.resource.IModelSetSnippet#start(org.eclipse.papyrus.resource.ModelSet)

+	 * @see org.eclipse.papyrus.infra.core.resource.IModelSetSnippet#start(org.eclipse.papyrus.infra.core.resource.ModelSet)

 	 * 

 	 * @param modelsManager

 	 */

@@ -52,7 +52,7 @@ public class ModelSetQueryInitializer implements IModelSetSnippet {
 	}

 

 	/**

-	 * @see org.eclipse.papyrus.resource.IModelSetSnippet#dispose(org.eclipse.papyrus.resource.ModelSet)

+	 * @see org.eclipse.papyrus.infra.core.resource.IModelSetSnippet#dispose(org.eclipse.papyrus.infra.core.resource.ModelSet)

 	 * 

 	 * @param modelsManager

 	 */

diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/core/multidiagram/actionbarcontributor/ActionBarContributorDescriptor.java b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/multidiagram/actionbarcontributor/ActionBarContributorDescriptor.java
index fdc48612671..46dfe14b299 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/core/multidiagram/actionbarcontributor/ActionBarContributorDescriptor.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/multidiagram/actionbarcontributor/ActionBarContributorDescriptor.java
@@ -11,9 +11,9 @@
  *  Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Initial API and implementation

  *

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

-package org.eclipse.papyrus.core.multidiagram.actionbarcontributor;

+package org.eclipse.papyrus.infra.core.multidiagram.actionbarcontributor;

 

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

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

 import org.eclipse.ui.part.EditorActionBarContributor;

 

 /**

diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/core/multidiagram/actionbarcontributor/ActionBarContributorExtensionFactory.java b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/multidiagram/actionbarcontributor/ActionBarContributorExtensionFactory.java
index e9dd491a273..3b79fec085b 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/core/multidiagram/actionbarcontributor/ActionBarContributorExtensionFactory.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/multidiagram/actionbarcontributor/ActionBarContributorExtensionFactory.java
@@ -11,12 +11,12 @@
  *  Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Initial API and implementation

  *

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

-package org.eclipse.papyrus.core.multidiagram.actionbarcontributor;

+package org.eclipse.papyrus.infra.core.multidiagram.actionbarcontributor;

 

 import org.eclipse.core.runtime.IConfigurationElement;

-import org.eclipse.papyrus.core.extension.BadNameExtensionException;

-import org.eclipse.papyrus.core.extension.ExtensionUtils;

-import org.eclipse.papyrus.core.extension.ExtensionException;

+import org.eclipse.papyrus.infra.core.extension.BadNameExtensionException;

+import org.eclipse.papyrus.infra.core.extension.ExtensionException;

+import org.eclipse.papyrus.infra.core.extension.ExtensionUtils;

 import org.eclipse.ui.part.EditorActionBarContributor;

 

 /**

diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/core/multidiagram/actionbarcontributor/ActionBarContributorRegistry.java b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/multidiagram/actionbarcontributor/ActionBarContributorRegistry.java
index d9248e879fe..3a430daf027 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/core/multidiagram/actionbarcontributor/ActionBarContributorRegistry.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/multidiagram/actionbarcontributor/ActionBarContributorRegistry.java
@@ -11,9 +11,9 @@
  *  Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Initial API and implementation

  *

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

-package org.eclipse.papyrus.core.multidiagram.actionbarcontributor;

+package org.eclipse.papyrus.infra.core.multidiagram.actionbarcontributor;

 

-import static org.eclipse.papyrus.core.Activator.log;

+import static org.eclipse.papyrus.infra.core.Activator.log;

 

 import java.util.ArrayList;

 import java.util.HashMap;

@@ -22,11 +22,11 @@ import java.util.Map;
 

 import org.eclipse.core.runtime.IConfigurationElement;

 import org.eclipse.core.runtime.Platform;

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

-import org.eclipse.papyrus.core.extension.ExtensionException;

-import org.eclipse.papyrus.core.extension.NotFoundException;

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

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

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

+import org.eclipse.papyrus.infra.core.extension.ExtensionException;

+import org.eclipse.papyrus.infra.core.extension.NotFoundException;

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

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

 import org.eclipse.ui.part.EditorActionBarContributor;

 

 /**

@@ -147,7 +147,7 @@ public class ActionBarContributorRegistry implements IActionBarContributorFactor
 	/**

 	 * Initialize the service. Do nothing here.

 	 * 

-	 * @see org.eclipse.papyrus.core.services.IService#init(org.eclipse.papyrus.core.services.ServicesRegistry)

+	 * @see org.eclipse.papyrus.infra.core.services.IService#init(org.eclipse.papyrus.infra.core.services.ServicesRegistry)

 	 * 

 	 * @param servicesRegistry

 	 */

@@ -158,7 +158,7 @@ public class ActionBarContributorRegistry implements IActionBarContributorFactor
 	/**

 	 * Do nothing in this implementation. {@inheritDoc}

 	 * 

-	 * @see org.eclipse.papyrus.core.services.IService#startService()

+	 * @see org.eclipse.papyrus.infra.core.services.IService#startService()

 	 */

 	public void startService() {

 	}

diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/core/multidiagram/actionbarcontributor/CoreComposedActionBarContributor.java b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/multidiagram/actionbarcontributor/CoreComposedActionBarContributor.java
index d01e583265d..c2bdad24a28 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/core/multidiagram/actionbarcontributor/CoreComposedActionBarContributor.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/multidiagram/actionbarcontributor/CoreComposedActionBarContributor.java
@@ -11,14 +11,14 @@
  *  Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Initial API and implementation

  *

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

-package org.eclipse.papyrus.core.multidiagram.actionbarcontributor;

+package org.eclipse.papyrus.infra.core.multidiagram.actionbarcontributor;

 

 import java.util.List;

 

-import org.eclipse.papyrus.core.Activator;

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

-import org.eclipse.papyrus.sasheditor.editor.actionbarcontributor.ComposedActionBarContributor;

-import org.eclipse.papyrus.sasheditor.editor.actionbarcontributor.IMultiPageEditorActionBarContributor;

+import org.eclipse.papyrus.infra.core.Activator;

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

+import org.eclipse.papyrus.infra.core.sasheditor.editor.actionbarcontributor.ComposedActionBarContributor;

+import org.eclipse.papyrus.infra.core.sasheditor.editor.actionbarcontributor.IMultiPageEditorActionBarContributor;

 import org.eclipse.ui.IActionBars;

 import org.eclipse.ui.IEditorPart;

 import org.eclipse.ui.IWorkbenchPage;

diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/core/multidiagram/actionbarcontributor/IActionBarContributorFactory.java b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/multidiagram/actionbarcontributor/IActionBarContributorFactory.java
index 128224f75fc..5b25e708b65 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/core/multidiagram/actionbarcontributor/IActionBarContributorFactory.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/multidiagram/actionbarcontributor/IActionBarContributorFactory.java
@@ -1,9 +1,9 @@
 /**

  * 

  */

-package org.eclipse.papyrus.core.multidiagram.actionbarcontributor;

+package org.eclipse.papyrus.infra.core.multidiagram.actionbarcontributor;

 

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

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

 import org.eclipse.ui.part.EditorActionBarContributor;

 

 /**

diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/resource/AbstractBaseModel.java b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/resource/AbstractBaseModel.java
index 84a694e9c0c..acd978a5fe1 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/resource/AbstractBaseModel.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/resource/AbstractBaseModel.java
@@ -1,7 +1,7 @@
 /**

  * 

  */

-package org.eclipse.papyrus.resource;

+package org.eclipse.papyrus.infra.core.resource;

 

 import java.io.IOException;

 

@@ -41,7 +41,7 @@ public abstract class AbstractBaseModel implements IModel {
 	protected URI resourceURI;

 

 	/**

-	 * @see org.eclipse.papyrus.resource.IModel#init(org.eclipse.papyrus.resource.ModelSet)

+	 * @see org.eclipse.papyrus.infra.core.resource.IModel#init(org.eclipse.papyrus.infra.core.resource.ModelSet)

 	 * 

 	 * @param modelManager

 	 */

@@ -105,7 +105,7 @@ public abstract class AbstractBaseModel implements IModel {
 	}

 

 	/**

-	 * @see org.eclipse.papyrus.resource.IModel#createModel(org.eclipse.core.runtime.IPath)

+	 * @see org.eclipse.papyrus.infra.core.resource.IModel#createModel(org.eclipse.core.runtime.IPath)

 	 * 

 	 * @param fullPath

 	 */

@@ -172,7 +172,7 @@ public abstract class AbstractBaseModel implements IModel {
 

 	/**

 	 * @throws IOException

-	 * @see org.eclipse.papyrus.resource.IModel#saveModel()

+	 * @see org.eclipse.papyrus.infra.core.resource.IModel#saveModel()

 	 * 

 	 */

 	public void saveModel() throws IOException {

@@ -180,7 +180,7 @@ public abstract class AbstractBaseModel implements IModel {
 	}

 

 	/**

-	 * @see org.eclipse.papyrus.resource.IModel#changeModelPath(org.eclipse.core.runtime.IPath)

+	 * @see org.eclipse.papyrus.infra.core.resource.IModel#changeModelPath(org.eclipse.core.runtime.IPath)

 	 * 

 	 * @param nameWithoutExt

 	 */

@@ -192,7 +192,7 @@ public abstract class AbstractBaseModel implements IModel {
 	}

 

 	/**

-	 * @see org.eclipse.papyrus.resource.IModel#dispose()

+	 * @see org.eclipse.papyrus.infra.core.resource.IModel#dispose()

 	 * 

 	 */

 	public void unload() {

diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/resource/AbstractModelWithSharedResource.java b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/resource/AbstractModelWithSharedResource.java
index 984adb22a84..281c63ece7d 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/resource/AbstractModelWithSharedResource.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/resource/AbstractModelWithSharedResource.java
@@ -1,7 +1,7 @@
 /**

  * 

  */

-package org.eclipse.papyrus.resource;

+package org.eclipse.papyrus.infra.core.resource;

 

 import java.io.IOException;

 import java.util.ArrayList;

@@ -57,7 +57,7 @@ public abstract class AbstractModelWithSharedResource<T extends EObject> extends
 	/**

 	 * Attach the model to its resource if this is not already done.

 	 * 

-	 * @see org.eclipse.papyrus.resource.AbstractBaseModel#loadModel(org.eclipse.core.runtime.IPath)

+	 * @see org.eclipse.papyrus.infra.core.resource.AbstractBaseModel#loadModel(org.eclipse.core.runtime.IPath)

 	 * 

 	 * @param fullPathWithoutExtension

 	 */

@@ -76,7 +76,7 @@ public abstract class AbstractModelWithSharedResource<T extends EObject> extends
 	/**

 	 * Create the model if this is not already done.

 	 * 

-	 * @see org.eclipse.papyrus.resource.AbstractBaseModel#createModel(org.eclipse.core.runtime.IPath)

+	 * @see org.eclipse.papyrus.infra.core.resource.AbstractBaseModel#createModel(org.eclipse.core.runtime.IPath)

 	 * 

 	 * @param fullPath

 	 */

@@ -110,7 +110,7 @@ public abstract class AbstractModelWithSharedResource<T extends EObject> extends
 	/**

 	 * Do nothing as we are slave. The Resource is save by the master model.

 	 * 

-	 * @see org.eclipse.papyrus.resource.AbstractBaseModel#saveModel()

+	 * @see org.eclipse.papyrus.infra.core.resource.AbstractBaseModel#saveModel()

 	 * 

 	 * @throws IOException

 	 */

diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/resource/BadStateException.java b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/resource/BadStateException.java
index 6f921e10950..be31c2ecbd1 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/resource/BadStateException.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/resource/BadStateException.java
@@ -1,7 +1,7 @@
 /**

  * 

  */

-package org.eclipse.papyrus.resource;

+package org.eclipse.papyrus.infra.core.resource;

 

 /**

  * Exception thrown when a method is called while the object state is not ready

diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/resource/EditingDomainServiceFactory.java b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/resource/EditingDomainServiceFactory.java
index eff67437600..97eb39bdfd5 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/resource/EditingDomainServiceFactory.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/resource/EditingDomainServiceFactory.java
@@ -1,11 +1,11 @@
 /**

  * 

  */

-package org.eclipse.papyrus.resource;

+package org.eclipse.papyrus.infra.core.resource;

 

-import org.eclipse.papyrus.core.services.IServiceFactory;

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

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

+import org.eclipse.papyrus.infra.core.services.IServiceFactory;

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

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

 

 /**

  * A service factory starting the EditingDomain service.

@@ -22,7 +22,7 @@ public class EditingDomainServiceFactory implements IServiceFactory {
 	private ModelSet modelSet;

 

 	/**

-	 * @see org.eclipse.papyrus.core.services.IService#init(org.eclipse.papyrus.core.services.ServicesRegistry)

+	 * @see org.eclipse.papyrus.infra.core.services.IService#init(org.eclipse.papyrus.infra.core.services.ServicesRegistry)

 	 * 

 	 * @param servicesRegistry

 	 * @throws ServiceException

@@ -32,7 +32,7 @@ public class EditingDomainServiceFactory implements IServiceFactory {
 	}

 

 	/**

-	 * @see org.eclipse.papyrus.core.services.IService#startService()

+	 * @see org.eclipse.papyrus.infra.core.services.IService#startService()

 	 * 

 	 * @throws ServiceException

 	 */

@@ -40,7 +40,7 @@ public class EditingDomainServiceFactory implements IServiceFactory {
 	}

 

 	/**

-	 * @see org.eclipse.papyrus.core.services.IService#disposeService()

+	 * @see org.eclipse.papyrus.infra.core.services.IService#disposeService()

 	 * 

 	 * @throws ServiceException

 	 */

@@ -48,7 +48,7 @@ public class EditingDomainServiceFactory implements IServiceFactory {
 	}

 

 	/**

-	 * @see org.eclipse.papyrus.core.services.IServiceFactory#createServiceInstance()

+	 * @see org.eclipse.papyrus.infra.core.services.IServiceFactory#createServiceInstance()

 	 * 

 	 * @return

 	 */

diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/resource/IModel.java b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/resource/IModel.java
index a4b37b8b633..2a95ec0903d 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/resource/IModel.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/resource/IModel.java
@@ -1,7 +1,7 @@
 /**

  * 

  */

-package org.eclipse.papyrus.resource;

+package org.eclipse.papyrus.infra.core.resource;

 

 import java.io.IOException;

 

diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/resource/IModelSetSnippet.java b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/resource/IModelSetSnippet.java
index f805063e2da..1fdbde2f0f0 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/resource/IModelSetSnippet.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/resource/IModelSetSnippet.java
@@ -1,7 +1,7 @@
 /**

  * 

  */

-package org.eclipse.papyrus.resource;

+package org.eclipse.papyrus.infra.core.resource;

 

 /**

  * A model snippet can be used to add code that should do some stuff on a

diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/resource/IModelSnippet.java b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/resource/IModelSnippet.java
index 1a445db2387..496ce18ef75 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/resource/IModelSnippet.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/resource/IModelSnippet.java
@@ -1,7 +1,7 @@
 /**

  * 

  */

-package org.eclipse.papyrus.resource;

+package org.eclipse.papyrus.infra.core.resource;

 

 /**

  * A model snippet can be used to add code that should do some stuff on a model.

diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/resource/ITransactionalEditingDomainProvider.java b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/resource/ITransactionalEditingDomainProvider.java
index a5a0df6f45e..86eaa6c8be1 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/resource/ITransactionalEditingDomainProvider.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/resource/ITransactionalEditingDomainProvider.java
@@ -1,4 +1,4 @@
-package org.eclipse.papyrus.resource;

+package org.eclipse.papyrus.infra.core.resource;

 

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

 import org.eclipse.emf.transaction.TransactionalEditingDomain;

diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/resource/ModelException.java b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/resource/ModelException.java
index 4180d8ee00d..a2c4336f1ee 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/resource/ModelException.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/resource/ModelException.java
@@ -1,7 +1,7 @@
 /**

  * 

  */

-package org.eclipse.papyrus.resource;

+package org.eclipse.papyrus.infra.core.resource;

 

 /**

  * Root exception for this package.

diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/resource/ModelIdentifiers.java b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/resource/ModelIdentifiers.java
index 5670facbf0c..7a363c54a56 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/resource/ModelIdentifiers.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/resource/ModelIdentifiers.java
@@ -1,7 +1,7 @@
 /**

  * 

  */

-package org.eclipse.papyrus.resource;

+package org.eclipse.papyrus.infra.core.resource;

 

 import java.util.ArrayList;

 

diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/resource/ModelMultiException.java b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/resource/ModelMultiException.java
index 1e4b0ca0ee5..74edb6e3925 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/resource/ModelMultiException.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/resource/ModelMultiException.java
@@ -1,7 +1,7 @@
 /**

  * 

  */

-package org.eclipse.papyrus.resource;

+package org.eclipse.papyrus.infra.core.resource;

 

 import java.util.ArrayList;

 import java.util.List;

diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/resource/ModelSet.java b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/resource/ModelSet.java
index 0c9cfc4befc..646fb5df22e 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/resource/ModelSet.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/resource/ModelSet.java
@@ -12,7 +12,7 @@
  *  Emilien Perico emilien.perico@atosorigin.com - manage loading strategies

  *

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

-package org.eclipse.papyrus.resource;

+package org.eclipse.papyrus.infra.core.resource;

 

 import java.io.IOException;

 import java.util.ArrayList;

@@ -33,7 +33,7 @@ import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
 import org.eclipse.emf.ecore.xmi.XMLResource;

 import org.eclipse.emf.transaction.TransactionalEditingDomain;

 import org.eclipse.emf.workspace.WorkspaceEditingDomainFactory;

-import org.eclipse.papyrus.resource.additional.AdditionalResourcesModel;

+import org.eclipse.papyrus.infra.core.resource.additional.AdditionalResourcesModel;

 

 /**

  * This class is used to manage a set of {@link IModel}.

diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/resource/ModelSnippetList.java b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/resource/ModelSnippetList.java
index 794a11457c9..bd6aaa53f54 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/resource/ModelSnippetList.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/resource/ModelSnippetList.java
@@ -1,7 +1,7 @@
 /**

  * 

  */

-package org.eclipse.papyrus.resource;

+package org.eclipse.papyrus.infra.core.resource;

 

 import java.util.ArrayList;

 

diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/resource/ModelUtils.java b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/resource/ModelUtils.java
index 8d93a8e4a08..533e67e5717 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/resource/ModelUtils.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/resource/ModelUtils.java
@@ -1,11 +1,11 @@
 /**

  * 

  */

-package org.eclipse.papyrus.resource;

+package org.eclipse.papyrus.infra.core.resource;

 

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

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

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

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

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

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

 

 /**

  * Set of utility methods to get the current {@link ModelSet}.

diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/resource/ModelsReader.java b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/resource/ModelsReader.java
index 719523df90b..18c3ee3bbf8 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/resource/ModelsReader.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/resource/ModelsReader.java
@@ -1,15 +1,15 @@
 /**

  * 

  */

-package org.eclipse.papyrus.resource;

+package org.eclipse.papyrus.infra.core.resource;

 

-import static org.eclipse.papyrus.core.Activator.log;

+import static org.eclipse.papyrus.infra.core.Activator.log;

 

 import org.eclipse.core.runtime.IConfigurationElement;

 import org.eclipse.core.runtime.Platform;

-import org.eclipse.papyrus.core.Activator;

-import org.eclipse.papyrus.core.extension.ExtensionException;

-import org.eclipse.papyrus.core.extension.ExtensionUtils;

+import org.eclipse.papyrus.infra.core.Activator;

+import org.eclipse.papyrus.infra.core.extension.ExtensionException;

+import org.eclipse.papyrus.infra.core.extension.ExtensionUtils;

 

 /**

  * A reader to read model from Eclipse extension and register them to the

diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/resource/NotFoundException.java b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/resource/NotFoundException.java
index 24033a65f18..54bb3e62874 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/resource/NotFoundException.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/resource/NotFoundException.java
@@ -1,7 +1,7 @@
 /**

  * 

  */

-package org.eclipse.papyrus.resource;

+package org.eclipse.papyrus.infra.core.resource;

 

 /**

  * Exception indicating that something is not found.

diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/resource/TransactionalEditingDomainManager.java b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/resource/TransactionalEditingDomainManager.java
index 0fc48fd0899..93d2dba5ded 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/resource/TransactionalEditingDomainManager.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/resource/TransactionalEditingDomainManager.java
@@ -1,4 +1,4 @@
-package org.eclipse.papyrus.resource;

+package org.eclipse.papyrus.infra.core.resource;

 

 import java.util.Collections;

 import java.util.LinkedList;

@@ -35,7 +35,7 @@ public class TransactionalEditingDomainManager {
 	}

 

 	static {

-		IConfigurationElement[] configElements = Platform.getExtensionRegistry().getConfigurationElementsFor("org.eclipse.papyrus.core", "transactionalEditingDomainProvider");

+		IConfigurationElement[] configElements = Platform.getExtensionRegistry().getConfigurationElementsFor("org.eclipse.papyrus.infra.core", "transactionalEditingDomainProvider");

 

 		LinkedList<ProviderPriorityPair> providerPriorityPairs = new LinkedList<ProviderPriorityPair>();

 

diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/resource/additional/AdditionalResourcesModel.java b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/resource/additional/AdditionalResourcesModel.java
index 754cce1a079..0e99c828a27 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/resource/additional/AdditionalResourcesModel.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/resource/additional/AdditionalResourcesModel.java
@@ -11,7 +11,7 @@
  *  Emilien Perico emilien.perico@atosorigin.com - manage loading strategies

  *

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

-package org.eclipse.papyrus.resource.additional;

+package org.eclipse.papyrus.infra.core.resource.additional;

 

 import java.io.IOException;

 import java.util.Collections;

@@ -20,10 +20,10 @@ import java.util.Iterator;
 import org.eclipse.core.runtime.IPath;

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

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

-import org.eclipse.papyrus.resource.IModel;

-import org.eclipse.papyrus.resource.IModelSnippet;

-import org.eclipse.papyrus.resource.ModelSet;

-import org.eclipse.papyrus.resource.ModelSnippetList;

+import org.eclipse.papyrus.infra.core.resource.IModel;

+import org.eclipse.papyrus.infra.core.resource.IModelSnippet;

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

+import org.eclipse.papyrus.infra.core.resource.ModelSnippetList;

 

 public class AdditionalResourcesModel implements IModel {

 

@@ -40,7 +40,7 @@ public class AdditionalResourcesModel implements IModel {
 	/**

 	 * Model ID.

 	 */

-	public static String MODEL_ID = "org.eclipse.papyrus.resource.additional";

+	public static String MODEL_ID = "org.eclipse.papyrus.infra.core.resource.additional";

 

 	public void init(ModelSet modelManager) {

 		this.modelSet = modelManager;

diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/resource/notation/NotationModel.java b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/resource/notation/NotationModel.java
index cddc86f598d..cb2925607bf 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/resource/notation/NotationModel.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/resource/notation/NotationModel.java
@@ -1,13 +1,13 @@
 /**

  * 

  */

-package org.eclipse.papyrus.resource.notation;

+package org.eclipse.papyrus.infra.core.resource.notation;

 

 import org.eclipse.gmf.runtime.emf.core.resources.GMFResourceFactory;

 import org.eclipse.gmf.runtime.notation.Diagram;

-import org.eclipse.papyrus.resource.AbstractBaseModel;

-import org.eclipse.papyrus.resource.IModel;

-import org.eclipse.papyrus.resource.ModelSet;

+import org.eclipse.papyrus.infra.core.resource.AbstractBaseModel;

+import org.eclipse.papyrus.infra.core.resource.IModel;

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

 

 /**

  * @author dumoulin

@@ -23,7 +23,7 @@ public class NotationModel extends AbstractBaseModel implements IModel {
 	/**

 	 * Model ID.

 	 */

-	public static final String MODEL_ID = "org.eclipse.papyrus.resource.notation.NotationModel"; //$NON-NLS-1$

+	public static final String MODEL_ID = "org.eclipse.papyrus.infra.core.resource.notation.NotationModel"; //$NON-NLS-1$

 

 	/**

 	 * 

@@ -47,7 +47,7 @@ public class NotationModel extends AbstractBaseModel implements IModel {
 	/**

 	 * Get the file extension used for this model.

 	 * 

-	 * @see org.eclipse.papyrus.resource.AbstractBaseModel#getModelFileExtension()

+	 * @see org.eclipse.papyrus.infra.core.resource.AbstractBaseModel#getModelFileExtension()

 	 * 

 	 * @return

 	 */

@@ -59,7 +59,7 @@ public class NotationModel extends AbstractBaseModel implements IModel {
 	/**

 	 * Get the identifier used to register this model.

 	 * 

-	 * @see org.eclipse.papyrus.resource.AbstractBaseModel#getIdentifier()

+	 * @see org.eclipse.papyrus.infra.core.resource.AbstractBaseModel#getIdentifier()

 	 * 

 	 * @return

 	 */

diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/resource/notation/NotationUtils.java b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/resource/notation/NotationUtils.java
index 9cb46002479..2c8465944b7 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/resource/notation/NotationUtils.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/resource/notation/NotationUtils.java
@@ -11,7 +11,7 @@
  *  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation

  *

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

-package org.eclipse.papyrus.resource.notation;

+package org.eclipse.papyrus.infra.core.resource.notation;

 

 import java.util.LinkedList;

 import java.util.List;

@@ -20,9 +20,9 @@ import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.resource.Resource;

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

 import org.eclipse.gmf.runtime.notation.Diagram;

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

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

-import org.eclipse.papyrus.resource.ModelSet;

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

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

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

 

 /**

  * Utilities method to manage notation models. Should be moved in a more

diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/resource/sasheditor/DiModel.java b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/resource/sasheditor/DiModel.java
index 4ddd5c73837..572648401bf 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/resource/sasheditor/DiModel.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/resource/sasheditor/DiModel.java
@@ -1,10 +1,10 @@
 /**

  * 

  */

-package org.eclipse.papyrus.resource.sasheditor;

+package org.eclipse.papyrus.infra.core.resource.sasheditor;

 

-import org.eclipse.papyrus.resource.AbstractBaseModel;

-import org.eclipse.papyrus.resource.IModel;

+import org.eclipse.papyrus.infra.core.resource.AbstractBaseModel;

+import org.eclipse.papyrus.infra.core.resource.IModel;

 

 /**

  * @author dumoulin

@@ -25,12 +25,12 @@ public class DiModel extends AbstractBaseModel implements IModel {
 	/**

 	 * Model ID.

 	 */

-	public static final String MODEL_ID = "org.eclipse.papyrus.resource.sasheditor.SashModel"; //$NON-NLS-1$

+	public static final String MODEL_ID = "org.eclipse.papyrus.infra.core.resource.sasheditor.SashModel"; //$NON-NLS-1$

 

 	/**

 	 * Get the file extension used for this model.

 	 * 

-	 * @see org.eclipse.papyrus.resource.AbstractBaseModel#getModelFileExtension()

+	 * @see org.eclipse.papyrus.infra.core.resource.AbstractBaseModel#getModelFileExtension()

 	 * 

 	 * @return

 	 */

@@ -42,7 +42,7 @@ public class DiModel extends AbstractBaseModel implements IModel {
 	/**

 	 * Get the identifier used to register this model.

 	 * 

-	 * @see org.eclipse.papyrus.resource.AbstractBaseModel#getIdentifier()

+	 * @see org.eclipse.papyrus.infra.core.resource.AbstractBaseModel#getIdentifier()

 	 * 

 	 * @return

 	 */

diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/resource/sasheditor/DiModelUtils.java b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/resource/sasheditor/DiModelUtils.java
index dd20a104e14..a4e968c5307 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/resource/sasheditor/DiModelUtils.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/resource/sasheditor/DiModelUtils.java
@@ -1,7 +1,7 @@
 /**

  * 

  */

-package org.eclipse.papyrus.resource.sasheditor;

+package org.eclipse.papyrus.infra.core.resource.sasheditor;

 

 import org.eclipse.core.resources.IFile;

 import org.eclipse.core.runtime.IPath;

diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/resource/sasheditor/SashModel.java b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/resource/sasheditor/SashModel.java
index b828ed37f61..8a999d98f93 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/resource/sasheditor/SashModel.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/resource/sasheditor/SashModel.java
@@ -1,12 +1,12 @@
 /**

  * 

  */

-package org.eclipse.papyrus.resource.sasheditor;

+package org.eclipse.papyrus.infra.core.resource.sasheditor;

 

 import org.eclipse.emf.ecore.EObject;

-import org.eclipse.papyrus.resource.AbstractModelWithSharedResource;

-import org.eclipse.papyrus.resource.AbstractModelWithSharedResource.ModelKind;

-import org.eclipse.papyrus.resource.IModel;

+import org.eclipse.papyrus.infra.core.resource.AbstractModelWithSharedResource;

+import org.eclipse.papyrus.infra.core.resource.IModel;

+import org.eclipse.papyrus.infra.core.resource.AbstractModelWithSharedResource.ModelKind;

 

 /**

  * Model for the sash system. <br>

@@ -18,7 +18,7 @@ import org.eclipse.papyrus.resource.IModel;
  * @author cedric dumoulin

  * 

  */

-public class SashModel extends AbstractModelWithSharedResource<org.eclipse.papyrus.sashwindows.di.SashModel> implements IModel {

+public class SashModel extends AbstractModelWithSharedResource<org.eclipse.papyrus.infra.core.sashwindows.di.SashModel> implements IModel {

 

 	/**

 	 * File extension used for notation.

@@ -28,7 +28,7 @@ public class SashModel extends AbstractModelWithSharedResource<org.eclipse.papyr
 	/**

 	 * Model ID.

 	 */

-	public static final String MODEL_ID = "org.eclipse.papyrus.resource.sasheditor.SashModel"; //$NON-NLS-1$

+	public static final String MODEL_ID = "org.eclipse.papyrus.infra.core.resource.sasheditor.SashModel"; //$NON-NLS-1$

 

 	/**

 	 * 

@@ -42,7 +42,7 @@ public class SashModel extends AbstractModelWithSharedResource<org.eclipse.papyr
 	/**

 	 * Get the file extension used for this model.

 	 * 

-	 * @see org.eclipse.papyrus.resource.AbstractBaseModel#getModelFileExtension()

+	 * @see org.eclipse.papyrus.infra.core.resource.AbstractBaseModel#getModelFileExtension()

 	 * 

 	 * @return

 	 */

@@ -54,7 +54,7 @@ public class SashModel extends AbstractModelWithSharedResource<org.eclipse.papyr
 	/**

 	 * Get the identifier used to register this model.

 	 * 

-	 * @see org.eclipse.papyrus.resource.AbstractBaseModel#getIdentifier()

+	 * @see org.eclipse.papyrus.infra.core.resource.AbstractBaseModel#getIdentifier()

 	 * 

 	 * @return

 	 */

@@ -65,7 +65,7 @@ public class SashModel extends AbstractModelWithSharedResource<org.eclipse.papyr
 

 	@Override

 	protected boolean isModelRoot(EObject object) {

-		return object instanceof org.eclipse.papyrus.sashwindows.di.SashModel;

+		return object instanceof org.eclipse.papyrus.infra.core.sashwindows.di.SashModel;

 	}

 

 }

diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/resource/sasheditor/SashModelUtils.java b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/resource/sasheditor/SashModelUtils.java
index 77961f82751..47e8445b93c 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/resource/sasheditor/SashModelUtils.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/resource/sasheditor/SashModelUtils.java
@@ -1,15 +1,15 @@
 /**

  * 

  */

-package org.eclipse.papyrus.resource.sasheditor;

+package org.eclipse.papyrus.infra.core.resource.sasheditor;

 

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

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

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

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

-import org.eclipse.papyrus.resource.ModelSet;

-import org.eclipse.papyrus.resource.ModelUtils;

-import org.eclipse.papyrus.resource.uml.UmlUtils;

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

+import org.eclipse.papyrus.infra.core.resource.ModelUtils;

+import org.eclipse.papyrus.infra.core.resource.uml.UmlUtils;

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

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

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

 

 /**

  * Set of utility methods linked to Trace for ControlMode

diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/resource/uml/ExtendedUmlModel.java b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/resource/uml/ExtendedUmlModel.java
index f9fd72bdac2..5385ea27085 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/resource/uml/ExtendedUmlModel.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/resource/uml/ExtendedUmlModel.java
@@ -1,7 +1,7 @@
 /**

  * 

  */

-package org.eclipse.papyrus.resource.uml;

+package org.eclipse.papyrus.infra.core.resource.uml;

 

 import org.eclipse.core.resources.IContainer;

 import org.eclipse.core.resources.IFile;

@@ -22,7 +22,7 @@ public class ExtendedUmlModel extends UmlModel {
 	 * Load the first resource with a supported extension TODO: (question from

 	 * Cedric) fix what is a supported extension ?

 	 * 

-	 * @see org.eclipse.papyrus.resource.AbstractBaseModel#loadModel(org.eclipse.core.runtime.IPath)

+	 * @see org.eclipse.papyrus.infra.core.resource.AbstractBaseModel#loadModel(org.eclipse.core.runtime.IPath)

 	 * 

 	 * @param fullPath

 	 */

diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/resource/uml/UmlModel.java b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/resource/uml/UmlModel.java
index a6767c83df0..32b2f763d82 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/resource/uml/UmlModel.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/resource/uml/UmlModel.java
@@ -1,13 +1,13 @@
 /**

  * 

  */

-package org.eclipse.papyrus.resource.uml;

+package org.eclipse.papyrus.infra.core.resource.uml;

 

 import org.eclipse.core.runtime.IPath;

 import org.eclipse.emf.ecore.EObject;

-import org.eclipse.papyrus.resource.AbstractBaseModel;

-import org.eclipse.papyrus.resource.IModel;

-import org.eclipse.papyrus.resource.NotFoundException;

+import org.eclipse.papyrus.infra.core.resource.AbstractBaseModel;

+import org.eclipse.papyrus.infra.core.resource.IModel;

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

 

 /**

  * A UML model.

@@ -25,10 +25,10 @@ public class UmlModel extends AbstractBaseModel implements IModel {
 	/**

 	 * Model ID.

 	 */

-	public static final String MODEL_ID = "org.eclipse.papyrus.resource.uml.UmlModel"; //$NON-NLS-1$

+	public static final String MODEL_ID = "org.eclipse.papyrus.infra.core.resource.uml.UmlModel"; //$NON-NLS-1$

 

 	/**

-	 * @see org.eclipse.papyrus.resource.IModel#createModel(org.eclipse.core.runtime.IPath)

+	 * @see org.eclipse.papyrus.infra.core.resource.IModel#createModel(org.eclipse.core.runtime.IPath)

 	 * 

 	 * @param fullPath

 	 */

@@ -54,7 +54,7 @@ public class UmlModel extends AbstractBaseModel implements IModel {
 	/**

 	 * Get the file extension used for this model.

 	 * 

-	 * @see org.eclipse.papyrus.resource.AbstractBaseModel#getModelFileExtension()

+	 * @see org.eclipse.papyrus.infra.core.resource.AbstractBaseModel#getModelFileExtension()

 	 * 

 	 * @return

 	 */

@@ -66,7 +66,7 @@ public class UmlModel extends AbstractBaseModel implements IModel {
 	/**

 	 * Get the identifier used to register this model.

 	 * 

-	 * @see org.eclipse.papyrus.resource.AbstractBaseModel#getIdentifier()

+	 * @see org.eclipse.papyrus.infra.core.resource.AbstractBaseModel#getIdentifier()

 	 * 

 	 * @return

 	 */

diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/resource/uml/UmlSnippet.java b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/resource/uml/UmlSnippet.java
index 0eec8a19d9c..62a459f5dbf 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/resource/uml/UmlSnippet.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/resource/uml/UmlSnippet.java
@@ -1,11 +1,11 @@
 /**

  * 

  */

-package org.eclipse.papyrus.resource.uml;

+package org.eclipse.papyrus.infra.core.resource.uml;

 

-import org.eclipse.papyrus.core.listenerservice.ModelListenerManager;

-import org.eclipse.papyrus.resource.IModel;

-import org.eclipse.papyrus.resource.IModelSnippet;

+import org.eclipse.papyrus.infra.core.listenerservice.ModelListenerManager;

+import org.eclipse.papyrus.infra.core.resource.IModel;

+import org.eclipse.papyrus.infra.core.resource.IModelSnippet;

 

 /**

  * A snippet registering adapters to the UML model.

@@ -20,7 +20,7 @@ public class UmlSnippet implements IModelSnippet {
 	/**

 	 * Register the UML adapters

 	 * 

-	 * @see org.eclipse.papyrus.resource.IModelSnippet#start(org.eclipse.papyrus.resource.IModel)

+	 * @see org.eclipse.papyrus.infra.core.resource.IModelSnippet#start(org.eclipse.papyrus.infra.core.resource.IModel)

 	 * 

 	 * @param startingModel

 	 */

diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/resource/uml/UmlUtils.java b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/resource/uml/UmlUtils.java
index d8a18560300..d413a9583fc 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/resource/uml/UmlUtils.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/resource/uml/UmlUtils.java
@@ -1,16 +1,16 @@
 /**

  * 

  */

-package org.eclipse.papyrus.resource.uml;

+package org.eclipse.papyrus.infra.core.resource.uml;

 

 import javax.imageio.spi.ServiceRegistry;

 

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

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

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

-import org.eclipse.papyrus.resource.ModelUtils;

-import org.eclipse.papyrus.resource.ModelSet;

-import org.eclipse.papyrus.resource.sasheditor.SashModel;

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

+import org.eclipse.papyrus.infra.core.resource.ModelUtils;

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

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

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

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

 

 /**

  * Set of utility methods linked to Trace for ControlMode

diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/core/services/BadStateException.java b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/services/BadStateException.java
index 6ff06b1724e..d3bccad8c92 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/core/services/BadStateException.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/services/BadStateException.java
@@ -1,7 +1,7 @@
 /**

  * 

  */

-package org.eclipse.papyrus.core.services;

+package org.eclipse.papyrus.infra.core.services;

 

 /**

  * @author cedric dumoulin

diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/core/services/ComposedService.java b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/services/ComposedService.java
index 9ee20a77f22..22198fda810 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/core/services/ComposedService.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/services/ComposedService.java
@@ -1,7 +1,7 @@
 /**

  * 

  */

-package org.eclipse.papyrus.core.services;

+package org.eclipse.papyrus.infra.core.services;

 

 import java.util.ArrayList;

 import java.util.List;

@@ -53,7 +53,7 @@ public abstract class ComposedService<T> implements IService {
 	/**

 	 * Do nothing here.

 	 * 

-	 * @see org.eclipse.papyrus.core.services.IService#init(org.eclipse.papyrus.core.services.ServicesRegistry)

+	 * @see org.eclipse.papyrus.infra.core.services.IService#init(org.eclipse.papyrus.infra.core.services.ServicesRegistry)

 	 * 

 	 * @param servicesRegistry

 	 * @throws ServiceException

@@ -64,7 +64,7 @@ public abstract class ComposedService<T> implements IService {
 	/**

 	 * Do nothing here.

 	 * 

-	 * @see org.eclipse.papyrus.core.services.IService#startService()

+	 * @see org.eclipse.papyrus.infra.core.services.IService#startService()

 	 * 

 	 * @throws ServiceException

 	 */

@@ -74,7 +74,7 @@ public abstract class ComposedService<T> implements IService {
 	/**

 	 * Do nothing here.

 	 * 

-	 * @see org.eclipse.papyrus.core.services.IService#disposeService()

+	 * @see org.eclipse.papyrus.infra.core.services.IService#disposeService()

 	 * 

 	 * @throws ServiceException

 	 */

diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/core/services/ComposedServicePart.java b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/services/ComposedServicePart.java
index 03ac1ec5a81..ad10f748ba7 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/core/services/ComposedServicePart.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/services/ComposedServicePart.java
@@ -1,7 +1,7 @@
 /**

  * 

  */

-package org.eclipse.papyrus.core.services;

+package org.eclipse.papyrus.infra.core.services;

 

 /**

  * A service that register itself to its associated {@link ComposedService}.

@@ -40,7 +40,7 @@ public abstract class ComposedServicePart<T extends ComposedService> implements
 	/**

 	 * Initialize the service. Attach itself to the ComposedService

 	 * 

-	 * @see org.eclipse.papyrus.core.services.IService#init(org.eclipse.papyrus.core.services.ServicesRegistry)

+	 * @see org.eclipse.papyrus.infra.core.services.IService#init(org.eclipse.papyrus.infra.core.services.ServicesRegistry)

 	 * 

 	 * @param servicesRegistry

 	 * @throws ServiceException

@@ -55,7 +55,7 @@ public abstract class ComposedServicePart<T extends ComposedService> implements
 	/**

 	 * Start the service.

 	 * 

-	 * @see org.eclipse.papyrus.core.services.IService#startService()

+	 * @see org.eclipse.papyrus.infra.core.services.IService#startService()

 	 * 

 	 */

 	public void startService() throws ServiceException {

@@ -64,7 +64,7 @@ public abstract class ComposedServicePart<T extends ComposedService> implements
 

 	/**

 	 * 

-	 * @see org.eclipse.papyrus.core.services.IService#disposeService()

+	 * @see org.eclipse.papyrus.infra.core.services.IService#disposeService()

 	 * 

 	 */

 	@SuppressWarnings("unchecked")

diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/core/services/ExtensionServicesRegistry.java b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/services/ExtensionServicesRegistry.java
index c318d9f0609..28daa5bfe30 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/core/services/ExtensionServicesRegistry.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/services/ExtensionServicesRegistry.java
@@ -1,7 +1,7 @@
 /**

  * 

  */

-package org.eclipse.papyrus.core.services;

+package org.eclipse.papyrus.infra.core.services;

 

 import java.util.ArrayList;

 import java.util.Collections;

@@ -9,7 +9,7 @@ import java.util.List;
 

 import org.eclipse.core.runtime.IConfigurationElement;

 import org.eclipse.core.runtime.Platform;

-import org.eclipse.papyrus.core.services.ServiceDescriptor.ServiceTypeKind;

+import org.eclipse.papyrus.infra.core.services.ServiceDescriptor.ServiceTypeKind;

 

 /**

  * ServiceRegistry reading and registering services declared in Eclipse

diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/core/services/IService.java b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/services/IService.java
index 0961af556cf..0e898476007 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/core/services/IService.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/services/IService.java
@@ -1,7 +1,7 @@
 /**

  * 

  */

-package org.eclipse.papyrus.core.services;

+package org.eclipse.papyrus.infra.core.services;

 

 /**

  * An Service that can be registered in the {@link ServicesRegistry}. A service

diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/core/services/IServiceFactory.java b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/services/IServiceFactory.java
index df6aeb7211e..5688f928f7b 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/core/services/IServiceFactory.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/services/IServiceFactory.java
@@ -1,7 +1,7 @@
 /**

  * 

  */

-package org.eclipse.papyrus.core.services;

+package org.eclipse.papyrus.infra.core.services;

 

 /**

  * A factory creating a Service that can be registered in the {@link ServicesRegistry}.

diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/core/services/ServiceDescriptor.java b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/services/ServiceDescriptor.java
index 8073b61123d..31de15c216e 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/core/services/ServiceDescriptor.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/services/ServiceDescriptor.java
@@ -1,7 +1,7 @@
 /**

  * 

  */

-package org.eclipse.papyrus.core.services;

+package org.eclipse.papyrus.infra.core.services;

 

 import java.util.Collections;

 import java.util.List;

diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/core/services/ServiceException.java b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/services/ServiceException.java
index 458d8d379a1..0724c14467b 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/core/services/ServiceException.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/services/ServiceException.java
@@ -1,7 +1,7 @@
 /**

  * 

  */

-package org.eclipse.papyrus.core.services;

+package org.eclipse.papyrus.infra.core.services;

 

 /**

  * Root Exception of Services Exception.

diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/core/services/ServiceMultiException.java b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/services/ServiceMultiException.java
index cf51be1a527..e2d91609dbc 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/core/services/ServiceMultiException.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/services/ServiceMultiException.java
@@ -1,7 +1,7 @@
 /**

  * 

  */

-package org.eclipse.papyrus.core.services;

+package org.eclipse.papyrus.infra.core.services;

 

 import java.util.ArrayList;

 import java.util.List;

diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/core/services/ServiceNotFoundException.java b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/services/ServiceNotFoundException.java
index 2981042819a..5c0c8c79664 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/core/services/ServiceNotFoundException.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/services/ServiceNotFoundException.java
@@ -1,4 +1,4 @@
-package org.eclipse.papyrus.core.services;

+package org.eclipse.papyrus.infra.core.services;

 

 /**

  * Service is not found.

diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/core/services/ServiceStartKind.java b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/services/ServiceStartKind.java
index 316e3d6ebe0..daedcf0dcc8 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/core/services/ServiceStartKind.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/services/ServiceStartKind.java
@@ -1,7 +1,7 @@
 /**

  * 

  */

-package org.eclipse.papyrus.core.services;

+package org.eclipse.papyrus.infra.core.services;

 

 /**

  * Kind of possible start method for a service. LAZY - The service start when it

diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/core/services/ServiceState.java b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/services/ServiceState.java
index ef562806824..dfe07d18757 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/core/services/ServiceState.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/services/ServiceState.java
@@ -1,7 +1,7 @@
 /**

  * 

  */

-package org.eclipse.papyrus.core.services;

+package org.eclipse.papyrus.infra.core.services;

 

 /**

  * The different states that a service can have.

diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/core/services/ServicesRegistry.java b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/services/ServicesRegistry.java
index 7298820738b..c95c9c5fceb 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/core/services/ServicesRegistry.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/services/ServicesRegistry.java
@@ -1,7 +1,7 @@
 /**

  * 

  */

-package org.eclipse.papyrus.core.services;

+package org.eclipse.papyrus.infra.core.services;

 

 import java.util.ArrayList;

 import java.util.Arrays;

@@ -12,15 +12,15 @@ import java.util.Map;
 import java.util.logging.Level;

 import java.util.logging.Logger;

 

-import org.eclipse.papyrus.core.Activator;

-import org.eclipse.papyrus.core.services.ServiceDescriptor.ServiceTypeKind;

-import org.eclipse.papyrus.core.services.internal.LazyStartupEntry;

-import org.eclipse.papyrus.core.services.internal.PojoServiceEntry;

-import org.eclipse.papyrus.core.services.internal.ServiceEntry;

-import org.eclipse.papyrus.core.services.internal.ServiceFactoryEntry;

-import org.eclipse.papyrus.core.services.internal.ServiceStartupEntry;

-import org.eclipse.papyrus.core.services.internal.ServiceTypeEntry;

-import org.eclipse.papyrus.core.services.internal.StartStartupEntry;

+import org.eclipse.papyrus.infra.core.Activator;

+import org.eclipse.papyrus.infra.core.services.ServiceDescriptor.ServiceTypeKind;

+import org.eclipse.papyrus.infra.core.services.internal.LazyStartupEntry;

+import org.eclipse.papyrus.infra.core.services.internal.PojoServiceEntry;

+import org.eclipse.papyrus.infra.core.services.internal.ServiceEntry;

+import org.eclipse.papyrus.infra.core.services.internal.ServiceFactoryEntry;

+import org.eclipse.papyrus.infra.core.services.internal.ServiceStartupEntry;

+import org.eclipse.papyrus.infra.core.services.internal.ServiceTypeEntry;

+import org.eclipse.papyrus.infra.core.services.internal.StartStartupEntry;

 

 /**

  * A registry of services. This registry allows to get a service by its

diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/core/services/internal/ErrorServiceTypeEntry.java b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/services/internal/ErrorServiceTypeEntry.java
index 2be4cf905ee..6f94954eda0 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/core/services/internal/ErrorServiceTypeEntry.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/services/internal/ErrorServiceTypeEntry.java
@@ -1,13 +1,13 @@
 /**

  * 

  */

-package org.eclipse.papyrus.core.services.internal;

+package org.eclipse.papyrus.infra.core.services.internal;

 

-import org.eclipse.papyrus.core.services.BadStateException;

-import org.eclipse.papyrus.core.services.ServiceDescriptor;

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

-import org.eclipse.papyrus.core.services.ServiceState;

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

+import org.eclipse.papyrus.infra.core.services.BadStateException;

+import org.eclipse.papyrus.infra.core.services.ServiceDescriptor;

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

+import org.eclipse.papyrus.infra.core.services.ServiceState;

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

 

 /**

  * A service entry used for faulty services. In this implementation, methods do

@@ -36,7 +36,7 @@ public class ErrorServiceTypeEntry extends ServiceTypeEntry {
 

 	/**

 	 * 

-	 * @see org.eclipse.papyrus.core.services.internal.ServiceTypeEntry#getServiceInstance()

+	 * @see org.eclipse.papyrus.infra.core.services.internal.ServiceTypeEntry#getServiceInstance()

 	 * 

 	 * @return

 	 * @throws ServiceException

@@ -48,7 +48,7 @@ public class ErrorServiceTypeEntry extends ServiceTypeEntry {
 

 	/**

 	 * 

-	 * @see org.eclipse.papyrus.core.services.internal.ServiceTypeEntry#createService()

+	 * @see org.eclipse.papyrus.infra.core.services.internal.ServiceTypeEntry#createService()

 	 * 

 	 * @throws ServiceException

 	 */

@@ -60,7 +60,7 @@ public class ErrorServiceTypeEntry extends ServiceTypeEntry {
 

 	/**

 	 * 

-	 * @see org.eclipse.papyrus.core.services.internal.ServiceTypeEntry#initService(ServicesRegistry)

+	 * @see org.eclipse.papyrus.infra.core.services.internal.ServiceTypeEntry#initService(ServicesRegistry)

 	 * 

 	 * @param servicesRegistry

 	 * @throws ServiceException

@@ -73,7 +73,7 @@ public class ErrorServiceTypeEntry extends ServiceTypeEntry {
 

 	/**

 	 * 

-	 * @see org.eclipse.papyrus.core.services.internal.ServiceTypeEntry#startService()

+	 * @see org.eclipse.papyrus.infra.core.services.internal.ServiceTypeEntry#startService()

 	 * 

 	 * @throws ServiceException

 	 */

@@ -85,7 +85,7 @@ public class ErrorServiceTypeEntry extends ServiceTypeEntry {
 

 	/**

 	 * 

-	 * @see org.eclipse.papyrus.core.services.internal.ServiceTypeEntry#disposeService()

+	 * @see org.eclipse.papyrus.infra.core.services.internal.ServiceTypeEntry#disposeService()

 	 * 

 	 * @throws ServiceException

 	 */

diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/core/services/internal/LazyStartupEntry.java b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/services/internal/LazyStartupEntry.java
index c16c7f9ee6c..35fe0e641f2 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/core/services/internal/LazyStartupEntry.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/services/internal/LazyStartupEntry.java
@@ -1,12 +1,12 @@
 /**

  * 

  */

-package org.eclipse.papyrus.core.services.internal;

+package org.eclipse.papyrus.infra.core.services.internal;

 

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

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

-import org.eclipse.papyrus.core.services.ServiceState;

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

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

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

+import org.eclipse.papyrus.infra.core.services.ServiceState;

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

 

 /**

  * An ServiceEntry managing {@link IService} registered as lazy start.

@@ -32,7 +32,7 @@ public class LazyStartupEntry extends ServiceStartupEntry {
 

 	/**

 	 * 

-	 * @see org.eclipse.papyrus.core.services.internal.ServiceStartupEntry#getServiceInstance()

+	 * @see org.eclipse.papyrus.infra.core.services.internal.ServiceStartupEntry#getServiceInstance()

 	 * 

 	 * @return

 	 * @throws ServiceException

@@ -84,7 +84,7 @@ public class LazyStartupEntry extends ServiceStartupEntry {
 	}

 

 	/**

-	 * @see org.eclipse.papyrus.core.services.AbstractServiceEntry#disposeService()

+	 * @see org.eclipse.papyrus.infra.core.services.AbstractServiceEntry#disposeService()

 	 * 

 	 * @throws ServiceException

 	 */

diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/core/services/internal/PojoServiceEntry.java b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/services/internal/PojoServiceEntry.java
index 1b6746150eb..d0723ca4977 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/core/services/internal/PojoServiceEntry.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/services/internal/PojoServiceEntry.java
@@ -1,13 +1,13 @@
 /**

  * 

  */

-package org.eclipse.papyrus.core.services.internal;

+package org.eclipse.papyrus.infra.core.services.internal;

 

-import org.eclipse.papyrus.core.services.BadStateException;

-import org.eclipse.papyrus.core.services.ServiceDescriptor;

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

-import org.eclipse.papyrus.core.services.ServiceState;

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

+import org.eclipse.papyrus.infra.core.services.BadStateException;

+import org.eclipse.papyrus.infra.core.services.ServiceDescriptor;

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

+import org.eclipse.papyrus.infra.core.services.ServiceState;

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

 

 /**

  * Entry for a service provided as POJO.

diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/core/services/internal/ServiceEntry.java b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/services/internal/ServiceEntry.java
index 5e9f547fdb2..763915adf3b 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/core/services/internal/ServiceEntry.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/services/internal/ServiceEntry.java
@@ -1,14 +1,14 @@
 /**

  * 

  */

-package org.eclipse.papyrus.core.services.internal;

-

-import org.eclipse.papyrus.core.services.BadStateException;

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

-import org.eclipse.papyrus.core.services.ServiceDescriptor;

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

-import org.eclipse.papyrus.core.services.ServiceState;

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

+package org.eclipse.papyrus.infra.core.services.internal;

+

+import org.eclipse.papyrus.infra.core.services.BadStateException;

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

+import org.eclipse.papyrus.infra.core.services.ServiceDescriptor;

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

+import org.eclipse.papyrus.infra.core.services.ServiceState;

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

 

 /**

  * Entry of a Service implementing {@link IService}. This class provide methods

diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/core/services/internal/ServiceFactoryEntry.java b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/services/internal/ServiceFactoryEntry.java
index ecf1b3b5de5..5ea5b53d73d 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/core/services/internal/ServiceFactoryEntry.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/services/internal/ServiceFactoryEntry.java
@@ -1,14 +1,14 @@
 /**

  * 

  */

-package org.eclipse.papyrus.core.services.internal;

-

-import org.eclipse.papyrus.core.services.BadStateException;

-import org.eclipse.papyrus.core.services.IServiceFactory;

-import org.eclipse.papyrus.core.services.ServiceDescriptor;

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

-import org.eclipse.papyrus.core.services.ServiceState;

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

+package org.eclipse.papyrus.infra.core.services.internal;

+

+import org.eclipse.papyrus.infra.core.services.BadStateException;

+import org.eclipse.papyrus.infra.core.services.IServiceFactory;

+import org.eclipse.papyrus.infra.core.services.ServiceDescriptor;

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

+import org.eclipse.papyrus.infra.core.services.ServiceState;

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

 

 /**

  * Entry of a Service implementing {@link IServiceFactory}. This class provide

diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/core/services/internal/ServiceStartupEntry.java b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/services/internal/ServiceStartupEntry.java
index d88d1f6a861..285a5d5ea4c 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/core/services/internal/ServiceStartupEntry.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/services/internal/ServiceStartupEntry.java
@@ -1,15 +1,15 @@
 /**

  * 

  */

-package org.eclipse.papyrus.core.services.internal;

+package org.eclipse.papyrus.infra.core.services.internal;

 

 import java.util.Collection;

 import java.util.List;

 

-import org.eclipse.papyrus.core.services.ServiceDescriptor;

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

-import org.eclipse.papyrus.core.services.ServiceState;

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

+import org.eclipse.papyrus.infra.core.services.ServiceDescriptor;

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

+import org.eclipse.papyrus.infra.core.services.ServiceState;

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

 

 /**

  * Base class for the different types of service startups (lazy, synchronized).

diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/core/services/internal/ServiceTypeEntry.java b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/services/internal/ServiceTypeEntry.java
index f00ea5de29f..a5dbc205147 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/core/services/internal/ServiceTypeEntry.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/services/internal/ServiceTypeEntry.java
@@ -1,14 +1,14 @@
 /**

  * 

  */

-package org.eclipse.papyrus.core.services.internal;

+package org.eclipse.papyrus.infra.core.services.internal;

 

 import org.eclipse.core.runtime.Platform;

-import org.eclipse.papyrus.core.services.BadStateException;

-import org.eclipse.papyrus.core.services.ServiceDescriptor;

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

-import org.eclipse.papyrus.core.services.ServiceState;

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

+import org.eclipse.papyrus.infra.core.services.BadStateException;

+import org.eclipse.papyrus.infra.core.services.ServiceDescriptor;

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

+import org.eclipse.papyrus.infra.core.services.ServiceState;

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

 import org.osgi.framework.Bundle;

 

 /**

diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/core/services/internal/StartStartupEntry.java b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/services/internal/StartStartupEntry.java
index e35764aa16f..be5f39451dd 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/core/services/internal/StartStartupEntry.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/services/internal/StartStartupEntry.java
@@ -1,11 +1,11 @@
 /**

  * 

  */

-package org.eclipse.papyrus.core.services.internal;

+package org.eclipse.papyrus.infra.core.services.internal;

 

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

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

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

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

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

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

 

 /**

  * An ServiceEntry managing {@link IService} that should be started when the

@@ -29,7 +29,7 @@ public class StartStartupEntry extends ServiceStartupEntry {
 

 	/**

 	 * 

-	 * @see org.eclipse.papyrus.core.services.internal.ServiceStartupEntry#getServiceInstance()

+	 * @see org.eclipse.papyrus.infra.core.services.internal.ServiceStartupEntry#getServiceInstance()

 	 * 

 	 * @return

 	 * @throws ServiceException

@@ -72,7 +72,7 @@ public class StartStartupEntry extends ServiceStartupEntry {
 	}

 

 	/**

-	 * @see org.eclipse.papyrus.core.services.AbstractServiceEntry#disposeService()

+	 * @see org.eclipse.papyrus.infra.core.services.AbstractServiceEntry#disposeService()

 	 * 

 	 * @throws ServiceException

 	 */

diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/core/ui/IRevealSemanticElement.java b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/ui/IRevealSemanticElement.java
index 64f98801eff..953abd73024 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/core/ui/IRevealSemanticElement.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/ui/IRevealSemanticElement.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.core.ui;

+package org.eclipse.papyrus.infra.core.ui;

 

 import java.util.List;

 

diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/core/utils/AbstractServiceUtils.java b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/utils/AbstractServiceUtils.java
index b72dac2cc68..43cfbe47c22 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/core/utils/AbstractServiceUtils.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/utils/AbstractServiceUtils.java
@@ -12,15 +12,15 @@
  *

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

 

-package org.eclipse.papyrus.core.utils;

+package org.eclipse.papyrus.infra.core.utils;

 

 import org.eclipse.emf.transaction.TransactionalEditingDomain;

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

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

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

-import org.eclipse.papyrus.resource.ModelSet;

-import org.eclipse.papyrus.sasheditor.contentprovider.IPageMngr;

-import org.eclipse.papyrus.sasheditor.editor.ISashWindowsContainer;

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

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

+import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IPageMngr;

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

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

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

 import org.eclipse.ui.IEditorPart;

 

 /**

diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/core/utils/BusinessModelResolver.java b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/utils/BusinessModelResolver.java
index f76b3d9772c..ffde6f1f31b 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/core/utils/BusinessModelResolver.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/utils/BusinessModelResolver.java
@@ -12,7 +12,7 @@
  *

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

 

-package org.eclipse.papyrus.core.utils;

+package org.eclipse.papyrus.infra.core.utils;

 

 import org.eclipse.core.runtime.IAdaptable;

 import org.eclipse.emf.ecore.EObject;

diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/core/utils/DiResourceSet.java b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/utils/DiResourceSet.java
index 9cb27814a8e..e129e918505 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/core/utils/DiResourceSet.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/utils/DiResourceSet.java
@@ -11,7 +11,7 @@
  *  Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Initial API and implementation

  *

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

-package org.eclipse.papyrus.core.utils;

+package org.eclipse.papyrus.infra.core.utils;

 

 import java.util.ArrayList;

 import java.util.List;

@@ -22,16 +22,16 @@ 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.resource.ResourceSet;

-import org.eclipse.papyrus.resource.ModelException;

-import org.eclipse.papyrus.resource.ModelMultiException;

-import org.eclipse.papyrus.resource.ModelSet;

-import org.eclipse.papyrus.resource.ModelsReader;

-import org.eclipse.papyrus.resource.notation.NotationModel;

-import org.eclipse.papyrus.resource.notation.NotationUtils;

-import org.eclipse.papyrus.resource.sasheditor.DiModelUtils;

-import org.eclipse.papyrus.resource.sasheditor.SashModelUtils;

-import org.eclipse.papyrus.resource.uml.UmlModel;

-import org.eclipse.papyrus.resource.uml.UmlUtils;

+import org.eclipse.papyrus.infra.core.resource.ModelException;

+import org.eclipse.papyrus.infra.core.resource.ModelMultiException;

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

+import org.eclipse.papyrus.infra.core.resource.ModelsReader;

+import org.eclipse.papyrus.infra.core.resource.notation.NotationModel;

+import org.eclipse.papyrus.infra.core.resource.notation.NotationUtils;

+import org.eclipse.papyrus.infra.core.resource.sasheditor.DiModelUtils;

+import org.eclipse.papyrus.infra.core.resource.sasheditor.SashModelUtils;

+import org.eclipse.papyrus.infra.core.resource.uml.UmlModel;

+import org.eclipse.papyrus.infra.core.resource.uml.UmlUtils;

 

 /**

  * ResourceSet Manager for UML and DI files, and also other loaded models.

diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/core/utils/DisplayUtils.java b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/utils/DisplayUtils.java
index 8a8bc452052..44c43a293e4 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/core/utils/DisplayUtils.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/utils/DisplayUtils.java
@@ -9,13 +9,13 @@
  * Contributors:

  *  Remi Schnekenburger (CEA LIST) remi.schnekenburger@cea.fr - Initial API and implementation

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

-package org.eclipse.papyrus.core.utils;

+package org.eclipse.papyrus.infra.core.utils;

 

-import static org.eclipse.papyrus.core.Activator.log;

+import static org.eclipse.papyrus.infra.core.Activator.log;

 

 import org.eclipse.jface.viewers.ILabelProvider;

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

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

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

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

 

 /**

  * Util class for display in Papyrus (label providers, etc...)

diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/core/utils/EditorUtils.java b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/utils/EditorUtils.java
index 50424fdab52..e686abf8c54 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/core/utils/EditorUtils.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/utils/EditorUtils.java
@@ -13,9 +13,9 @@
  *         management.

  *

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

-package org.eclipse.papyrus.core.utils;

+package org.eclipse.papyrus.infra.core.utils;

 

-import static org.eclipse.papyrus.core.Activator.log;

+import static org.eclipse.papyrus.infra.core.Activator.log;

 

 import java.util.ArrayList;

 import java.util.List;

@@ -25,19 +25,19 @@ import org.eclipse.emf.ecore.resource.Resource;
 import org.eclipse.emf.transaction.TransactionalEditingDomain;

 import org.eclipse.gmf.runtime.diagram.ui.parts.DiagramEditor;

 import org.eclipse.gmf.runtime.notation.Diagram;

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

-import org.eclipse.papyrus.core.editor.CoreMultiDiagramEditor;

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

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

-import org.eclipse.papyrus.core.services.ServiceNotFoundException;

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

-import org.eclipse.papyrus.resource.sasheditor.DiModelUtils;

-import org.eclipse.papyrus.sasheditor.contentprovider.IPageMngr;

-import org.eclipse.papyrus.sasheditor.contentprovider.ISashWindowsContentProvider;

-import org.eclipse.papyrus.sasheditor.contentprovider.di.DiSashModelMngr;

-import org.eclipse.papyrus.sasheditor.contentprovider.di.TransactionalDiSashModelMngr;

-import org.eclipse.papyrus.sasheditor.editor.IPage;

-import org.eclipse.papyrus.sasheditor.editor.ISashWindowsContainer;

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

+import org.eclipse.papyrus.infra.core.editor.CoreMultiDiagramEditor;

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

+import org.eclipse.papyrus.infra.core.resource.sasheditor.DiModelUtils;

+import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IPageMngr;

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

+import org.eclipse.papyrus.infra.core.sasheditor.di.contentprovider.DiSashModelMngr;

+import org.eclipse.papyrus.infra.core.sasheditor.di.contentprovider.TransactionalDiSashModelMngr;

+import org.eclipse.papyrus.infra.core.sasheditor.editor.IPage;

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

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

+import org.eclipse.papyrus.infra.core.services.ServiceNotFoundException;

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

 import org.eclipse.ui.IEditorPart;

 import org.eclipse.ui.IEditorReference;

 import org.eclipse.ui.IFileEditorInput;

@@ -194,7 +194,7 @@ public class EditorUtils {
 	 * it is possible. <br>

 	 * In GMF EditParts or EditPolicies, the ServiceRegistry can be retrieved

 	 * with methods from

-	 * org.eclipse.papyrus.diagram.common.util.ServiceUtilsForGMF

+	 * org.eclipse.papyrus.uml.diagram.common.util.ServiceUtilsForGMF

 	 * 

 	 * <br>

 	 * WARNING: This method can return null if there is no Active Editor. This

@@ -206,11 +206,11 @@ public class EditorUtils {
 	 *             modeling/org.eclipse.mdt.papyrus/trunk/doc/DevelopperDocuments

 	 *             /cookbook/PapyrusCookBook.odt and use one of the replacement:

 	 *             <ul>

-	 *             <li>org.eclipse.papyrus.core.utils.ServiceUtils</li>

+	 *             <li>org.eclipse.papyrus.infra.core.utils.ServiceUtils</li>

 	 *             <li>

-	 *             org.eclipse.papyrus.diagram.common.util.ServiceUtilsForGMF</li>

+	 *             org.eclipse.papyrus.uml.diagram.common.util.ServiceUtilsForGMF</li>

 	 *             <li>

-	 *             org.eclipse.papyrus.core.utils.ServiceUtilsForActionHandlers (to be used with care !)</li>

+	 *             org.eclipse.papyrus.infra.core.utils.ServiceUtilsForActionHandlers (to be used with care !)</li>

 	 *             </ul>

 	 */

 	static public ServicesRegistry getServiceRegistry() {

@@ -231,11 +231,11 @@ public class EditorUtils {
 	 *             modeling/org.eclipse.mdt.papyrus/trunk/doc/DevelopperDocuments

 	 *             /cookbook/PapyrusCookBook.odt and use one of the replacement:

 	 *             <ul>

-	 *             <li>org.eclipse.papyrus.core.utils.ServiceUtils</li>

+	 *             <li>org.eclipse.papyrus.infra.core.utils.ServiceUtils</li>

 	 *             <li>

-	 *             org.eclipse.papyrus.diagram.common.util.ServiceUtilsForGMF</li>

+	 *             org.eclipse.papyrus.uml.diagram.common.util.ServiceUtilsForGMF</li>

 	 *             <li>

-	 *             org.eclipse.papyrus.core.utils.ServiceUtilsForActionHandlers (to be used with care !)</li>

+	 *             org.eclipse.papyrus.infra.core.utils.ServiceUtilsForActionHandlers (to be used with care !)</li>

 	 *             </ul>

 	 */

 	static public ServicesRegistry getServiceRegistryChecked() throws ServiceException {

@@ -265,11 +265,11 @@ public class EditorUtils {
 	 *             modeling/org.eclipse.mdt.papyrus/trunk/doc/DevelopperDocuments

 	 *             /cookbook/PapyrusCookBook.odt and use one of the replacement:

 	 *             <ul>

-	 *             <li>org.eclipse.papyrus.core.utils.ServiceUtils</li>

+	 *             <li>org.eclipse.papyrus.infra.core.utils.ServiceUtils</li>

 	 *             <li>

-	 *             org.eclipse.papyrus.diagram.common.util.ServiceUtilsForGMF</li>

+	 *             org.eclipse.papyrus.uml.diagram.common.util.ServiceUtilsForGMF</li>

 	 *             <li>

-	 *             org.eclipse.papyrus.core.utils.ServiceUtilsForActionHandlers (to be used with care !)</li>

+	 *             org.eclipse.papyrus.infra.core.utils.ServiceUtilsForActionHandlers (to be used with care !)</li>

 	 *             </ul>

 	 */

 	static public ISashWindowsContentProvider getISashWindowsContentProvider() {

@@ -299,11 +299,11 @@ public class EditorUtils {
 	 *             modeling/org.eclipse.mdt.papyrus/trunk/doc/DevelopperDocuments

 	 *             /cookbook/PapyrusCookBook.odt and use one of the replacement:

 	 *             <ul>

-	 *             <li>org.eclipse.papyrus.core.utils.ServiceUtils</li>

+	 *             <li>org.eclipse.papyrus.infra.core.utils.ServiceUtils</li>

 	 *             <li>

-	 *             org.eclipse.papyrus.diagram.common.util.ServiceUtilsForGMF</li>

+	 *             org.eclipse.papyrus.uml.diagram.common.util.ServiceUtilsForGMF</li>

 	 *             <li>

-	 *             org.eclipse.papyrus.core.utils.ServiceUtilsForActionHandlers (to be used with care !)</li>

+	 *             org.eclipse.papyrus.infra.core.utils.ServiceUtilsForActionHandlers (to be used with care !)</li>

 	 *             </ul>

 	 */

 	public static IPageMngr getIPageMngr() {

@@ -426,11 +426,11 @@ public class EditorUtils {
 	 *             modeling/org.eclipse.mdt.papyrus/trunk/doc/DevelopperDocuments

 	 *             /cookbook/PapyrusCookBook.odt and use one of the replacement:

 	 *             <ul>

-	 *             <li>org.eclipse.papyrus.core.utils.ServiceUtils</li>

+	 *             <li>org.eclipse.papyrus.infra.core.utils.ServiceUtils</li>

 	 *             <li>

-	 *             org.eclipse.papyrus.diagram.common.util.ServiceUtilsForGMF</li>

+	 *             org.eclipse.papyrus.uml.diagram.common.util.ServiceUtilsForGMF</li>

 	 *             <li>

-	 *             org.eclipse.papyrus.core.utils.ServiceUtilsForActionHandlers (to be used with care !)</li>

+	 *             org.eclipse.papyrus.infra.core.utils.ServiceUtilsForActionHandlers (to be used with care !)</li>

 	 *             </ul>

 	 */

 	public static IEditorPart lookupActiveNestedIEditor() {

@@ -463,11 +463,11 @@ public class EditorUtils {
 	 *             modeling/org.eclipse.mdt.papyrus/trunk/doc/DevelopperDocuments

 	 *             /cookbook/PapyrusCookBook.odt and use one of the replacement:

 	 *             <ul>

-	 *             <li>org.eclipse.papyrus.core.utils.ServiceUtils</li>

+	 *             <li>org.eclipse.papyrus.infra.core.utils.ServiceUtils</li>

 	 *             <li>

-	 *             org.eclipse.papyrus.diagram.common.util.ServiceUtilsForGMF</li>

+	 *             org.eclipse.papyrus.uml.diagram.common.util.ServiceUtilsForGMF</li>

 	 *             <li>

-	 *             org.eclipse.papyrus.core.utils.ServiceUtilsForActionHandlers (to be used with care !)</li>

+	 *             org.eclipse.papyrus.infra.core.utils.ServiceUtilsForActionHandlers (to be used with care !)</li>

 	 *             </ul>

 	 */

 	public static IPage lookupActiveNestedPage() {

@@ -500,11 +500,11 @@ public class EditorUtils {
 	 *             modeling/org.eclipse.mdt.papyrus/trunk/doc/DevelopperDocuments

 	 *             /cookbook/PapyrusCookBook.odt and use one of the replacement:

 	 *             <ul>

-	 *             <li>org.eclipse.papyrus.core.utils.ServiceUtils</li>

+	 *             <li>org.eclipse.papyrus.infra.core.utils.ServiceUtils</li>

 	 *             <li>

-	 *             org.eclipse.papyrus.diagram.common.util.ServiceUtilsForGMF</li>

+	 *             org.eclipse.papyrus.uml.diagram.common.util.ServiceUtilsForGMF</li>

 	 *             <li>

-	 *             org.eclipse.papyrus.core.utils.ServiceUtilsForActionHandlers (to be used with care !)</li>

+	 *             org.eclipse.papyrus.infra.core.utils.ServiceUtilsForActionHandlers (to be used with care !)</li>

 	 *             </ul>

 	 */

 	public static DiResourceSet getDiResourceSet() {

@@ -533,7 +533,7 @@ public class EditorUtils {
 	 * possible. <br>

 	 * In GMF EditParts or EditPolicies, the ServiceRegistry can be retrieved

 	 * with methods from

-	 * org.eclipse.papyrus.diagram.common.util.DiagramCoreServiceUtils <br>

+	 * org.eclipse.papyrus.uml.diagram.common.util.DiagramCoreServiceUtils <br>

 	 * WARNING: This method can return null if there is no Active Editor. This

 	 * happen during the editor initialization, especially when there is no

 	 * other editor opened.

@@ -544,11 +544,11 @@ public class EditorUtils {
 	 *             modeling/org.eclipse.mdt.papyrus/trunk/doc/DevelopperDocuments

 	 *             /cookbook/PapyrusCookBook.odt and use one of the replacement:

 	 *             <ul>

-	 *             <li>org.eclipse.papyrus.core.utils.ServiceUtils</li>

+	 *             <li>org.eclipse.papyrus.infra.core.utils.ServiceUtils</li>

 	 *             <li>

-	 *             org.eclipse.papyrus.diagram.common.util.ServiceUtilsForGMF</li>

+	 *             org.eclipse.papyrus.uml.diagram.common.util.ServiceUtilsForGMF</li>

 	 *             <li>

-	 *             org.eclipse.papyrus.core.utils.ServiceUtilsForActionHandlers (to be used with care !)</li>

+	 *             org.eclipse.papyrus.infra.core.utils.ServiceUtilsForActionHandlers (to be used with care !)</li>

 	 *             </ul>

 	 */

 	public static TransactionalEditingDomain getTransactionalEditingDomain() {

@@ -576,7 +576,7 @@ public class EditorUtils {
 	 * TransactionalEditingDomain can not be found. <br>

 	 * In GMF EditParts or EditPolicies, the ServiceRegistry can be retrieved

 	 * with methods from

-	 * org.eclipse.papyrus.diagram.common.util.DiagramCoreServiceUtils

+	 * org.eclipse.papyrus.uml.diagram.common.util.DiagramCoreServiceUtils

 	 * 

 	 * 

 	 * WARNING: This method throws an exception when no Active Editor is found.

@@ -590,11 +590,11 @@ public class EditorUtils {
 	 *             modeling/org.eclipse.mdt.papyrus/trunk/doc/DevelopperDocuments

 	 *             /cookbook/PapyrusCookBook.odt and use one of the replacement:

 	 *             <ul>

-	 *             <li>org.eclipse.papyrus.core.utils.ServiceUtils</li>

+	 *             <li>org.eclipse.papyrus.infra.core.utils.ServiceUtils</li>

 	 *             <li>

-	 *             org.eclipse.papyrus.diagram.common.util.ServiceUtilsForGMF</li>

+	 *             org.eclipse.papyrus.uml.diagram.common.util.ServiceUtilsForGMF</li>

 	 *             <li>

-	 *             org.eclipse.papyrus.core.utils.ServiceUtilsForActionHandlers (to be used with care !)</li>

+	 *             org.eclipse.papyrus.infra.core.utils.ServiceUtilsForActionHandlers (to be used with care !)</li>

 	 *             </ul>

 	 */

 	public static TransactionalEditingDomain getTransactionalEditingDomainChecked() throws ServiceException {

@@ -617,7 +617,7 @@ public class EditorUtils {
 	 *             modeling/org.eclipse.mdt.papyrus/trunk/doc/DevelopperDocuments

 	 *             /cookbook/PapyrusCookBook.odt and use one of the replacement:

 	 *             <ul>

-	 *             <li>org.eclipse.papyrus.core.utils.ServiceUtils</li>

+	 *             <li>org.eclipse.papyrus.infra.core.utils.ServiceUtils</li>

 	 *             </ul>

 	 */

 	public static TransactionalEditingDomain getTransactionalEditingDomain(ServicesRegistry registry) {

@@ -642,7 +642,7 @@ public class EditorUtils {
 	 *             modeling/org.eclipse.mdt.papyrus/trunk/doc/DevelopperDocuments

 	 *             /cookbook/PapyrusCookBook.odt and use one of the replacement:

 	 *             <ul>

-	 *             <li>org.eclipse.papyrus.core.utils.ServiceUtils</li>

+	 *             <li>org.eclipse.papyrus.infra.core.utils.ServiceUtils</li>

 	 *             </ul>

 	 */

 	public static TransactionalEditingDomain getTransactionalEditingDomainChecked(ServicesRegistry registry) throws ServiceException {

diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/core/utils/FilteredCollectionView.java b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/utils/FilteredCollectionView.java
index aeb26e4f9e6..437d639c109 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/core/utils/FilteredCollectionView.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/utils/FilteredCollectionView.java
@@ -11,7 +11,7 @@
  *  Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Initial API and implementation

  *

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

-package org.eclipse.papyrus.core.utils;

+package org.eclipse.papyrus.infra.core.utils;

 

 import java.util.AbstractCollection;

 import java.util.Collection;

diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/core/utils/FilteredCollectionViewFromIterator.java b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/utils/FilteredCollectionViewFromIterator.java
index 84cf91ac4fe..4734b4e95bc 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/core/utils/FilteredCollectionViewFromIterator.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/utils/FilteredCollectionViewFromIterator.java
@@ -12,7 +12,7 @@
  *

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

 //Source file: H:\\temp\\generated\\modTransf\\util\\FilteredListView.java

-package org.eclipse.papyrus.core.utils;

+package org.eclipse.papyrus.infra.core.utils;

 

 import java.util.AbstractCollection;

 import java.util.Collection;

diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/core/utils/FilteredListView.java b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/utils/FilteredListView.java
index fde7d99cf3b..92a42a3092a 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/core/utils/FilteredListView.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/utils/FilteredListView.java
@@ -11,7 +11,7 @@
  *  Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Initial API and implementation

  *

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

-package org.eclipse.papyrus.core.utils;

+package org.eclipse.papyrus.infra.core.utils;

 

 import java.util.AbstractSequentialList;

 import java.util.Iterator;

diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/core/utils/GMFtoEMFCommandWrapper.java b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/utils/GMFtoEMFCommandWrapper.java
index 1ce3e95ea4f..54c953a34b2 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/core/utils/GMFtoEMFCommandWrapper.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/utils/GMFtoEMFCommandWrapper.java
@@ -8,7 +8,7 @@
  * Contributors: Mario Cervera Ubeda (Prodevelop)

  * 

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

-package org.eclipse.papyrus.core.utils;

+package org.eclipse.papyrus.infra.core.utils;

 

 import org.eclipse.gmf.runtime.common.core.command.ICommand;

 

diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/core/utils/IDebugChannel.java b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/utils/IDebugChannel.java
index 79b9f462618..a73c14051d6 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/core/utils/IDebugChannel.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/utils/IDebugChannel.java
@@ -8,7 +8,7 @@
  * Contributors:

  *     Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

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

-package org.eclipse.papyrus.core.utils;

+package org.eclipse.papyrus.infra.core.utils;

 

 /**

  * This interface contains all channels to trace papyrus

@@ -20,11 +20,11 @@ public interface IDebugChannel {
 	/**

 	 * constant used to trace the core running

 	 */

-	public static final String PAPYRUS_CORE = "org.eclipse.papyrus.core/debug/core";

+	public static final String PAPYRUS_CORE = "org.eclipse.papyrus.infra.core/debug/core";

 

 	/**

 	 * constant used to trace the loading of extension point

 	 */

-	public static final String PAPYRUS_EXTENSIONPOINT_LOADING = "org.eclipse.papyrus.core/debug/extensionpoint";

+	public static final String PAPYRUS_EXTENSIONPOINT_LOADING = "org.eclipse.papyrus.infra.core/debug/extensionpoint";

 

 }

diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/core/utils/IFilter.java b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/utils/IFilter.java
index 8621796e0a1..a1f39f4ad7b 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/core/utils/IFilter.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/utils/IFilter.java
@@ -11,7 +11,7 @@
  *  Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Initial API and implementation

  *

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

-package org.eclipse.papyrus.core.utils;

+package org.eclipse.papyrus.infra.core.utils;

 

 /**

  * A filter.

diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/core/utils/OpenDiagramCommand.java b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/utils/OpenDiagramCommand.java
index 36cfae74d81..22e49fe6c09 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/core/utils/OpenDiagramCommand.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/utils/OpenDiagramCommand.java
@@ -11,7 +11,7 @@
  *  Mathieu Velten (Atos Origin) mathieu.velten@atosorigin.com - Initial API and implementation

  *

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

-package org.eclipse.papyrus.core.utils;

+package org.eclipse.papyrus.infra.core.utils;

 

 import org.eclipse.core.commands.ExecutionException;

 import org.eclipse.core.runtime.IAdaptable;

@@ -21,8 +21,8 @@ import org.eclipse.emf.transaction.TransactionalEditingDomain;
 import org.eclipse.gmf.runtime.common.core.command.CommandResult;

 import org.eclipse.gmf.runtime.common.core.command.ICommand;

 import org.eclipse.gmf.runtime.emf.commands.core.command.AbstractTransactionalCommand;

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

-import org.eclipse.papyrus.sasheditor.contentprovider.IPageMngr;

+import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IPageMngr;

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

 

 /**

  * The Class OpenDiagramCommand.

diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/core/utils/PapyrusEcoreUtils.java b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/utils/PapyrusEcoreUtils.java
index 4d56f002909..e50c13db005 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/core/utils/PapyrusEcoreUtils.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/utils/PapyrusEcoreUtils.java
@@ -11,7 +11,7 @@
  *   Mathieu Velten (Atos Origin) mathieu.velten@atosorigin.com - Initial API and implementation

  *

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

-package org.eclipse.papyrus.core.utils;

+package org.eclipse.papyrus.infra.core.utils;

 

 import java.util.Collection;

 import java.util.HashSet;

diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/core/utils/PapyrusImageUtils.java b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/utils/PapyrusImageUtils.java
index 703c7a64a42..1e5b0e6701c 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/core/utils/PapyrusImageUtils.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/utils/PapyrusImageUtils.java
@@ -9,13 +9,13 @@
  * Contributors:

  *  Tristan Faure (ATOS ORIGIN INTEGRATION) tristan.faure@atosorigin.com - Initial API and implementation

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

-package org.eclipse.papyrus.core.utils;

+package org.eclipse.papyrus.infra.core.utils;

 

 import java.io.IOException;

 import java.net.URL;

 

 import org.eclipse.jface.resource.JFaceResources;

-import org.eclipse.papyrus.core.Activator;

+import org.eclipse.papyrus.infra.core.Activator;

 import org.eclipse.swt.graphics.Image;

 import org.eclipse.swt.widgets.Display;

 

diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/core/utils/PapyrusTrace.java b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/utils/PapyrusTrace.java
index 2fbf9a1d3d9..429dffc54bb 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/core/utils/PapyrusTrace.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/utils/PapyrusTrace.java
@@ -8,13 +8,13 @@
  * Contributors:

  *     Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

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

-package org.eclipse.papyrus.core.utils;

+package org.eclipse.papyrus.infra.core.utils;

 

 import org.eclipse.core.runtime.IStatus;

 import org.eclipse.core.runtime.Platform;

 import org.eclipse.core.runtime.Status;

-import org.eclipse.papyrus.core.Activator;

-import org.eclipse.papyrus.log.LogHelper;

+import org.eclipse.papyrus.infra.core.Activator;

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

 

 /**

  * Utility class to log errors or debug information either in the plugin'log or

@@ -27,7 +27,7 @@ import org.eclipse.papyrus.log.LogHelper;
 @Deprecated

 public class PapyrusTrace implements IDebugChannel {

 

-	public static final String PAPYRUS_CORE = "org.eclipse.papyrus.core/debug";

+	public static final String PAPYRUS_CORE = "org.eclipse.papyrus.infra.core/debug";

 

 	/**

 	 * Display a debug trace.

diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/core/utils/ServiceUtils.java b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/utils/ServiceUtils.java
index bb9645aae12..c88d6d3a43c 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/core/utils/ServiceUtils.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/utils/ServiceUtils.java
@@ -12,10 +12,10 @@
  *

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

 

-package org.eclipse.papyrus.core.utils;

+package org.eclipse.papyrus.infra.core.utils;

 

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

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

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

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

 

 /**

  * @author cedric dumoulin

@@ -35,7 +35,7 @@ public class ServiceUtils extends AbstractServiceUtils<ServicesRegistry> {
 	}

 

 	/**

-	 * @see org.eclipse.papyrus.core.utils.AbstractServiceUtils#getServiceRegistry(java.lang.Object)

+	 * @see org.eclipse.papyrus.infra.core.utils.AbstractServiceUtils#getServiceRegistry(java.lang.Object)

 	 * 

 	 * @param from

 	 * @return

diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/core/utils/ServiceUtilsForActionHandlers.java b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/utils/ServiceUtilsForActionHandlers.java
index 77cbb33567e..75632a82237 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/core/utils/ServiceUtilsForActionHandlers.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/utils/ServiceUtilsForActionHandlers.java
@@ -12,17 +12,17 @@
  *

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

 

-package org.eclipse.papyrus.core.utils;

+package org.eclipse.papyrus.infra.core.utils;

 

 import org.eclipse.emf.transaction.TransactionalEditingDomain;

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

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

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

-import org.eclipse.papyrus.core.services.ServiceNotFoundException;

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

-import org.eclipse.papyrus.resource.ModelSet;

-import org.eclipse.papyrus.sasheditor.contentprovider.IPageMngr;

-import org.eclipse.papyrus.sasheditor.editor.ISashWindowsContainer;

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

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

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

+import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IPageMngr;

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

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

+import org.eclipse.papyrus.infra.core.services.ServiceNotFoundException;

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

 import org.eclipse.ui.IEditorPart;

 import org.eclipse.ui.PlatformUI;

 

diff --git a/plugins/infra/org.eclipse.papyrus.infra.export/META-INF/MANIFEST.MF b/plugins/infra/org.eclipse.papyrus.infra.export/META-INF/MANIFEST.MF
index d9570b0f97d..82986f783d8 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.export/META-INF/MANIFEST.MF
+++ b/plugins/infra/org.eclipse.papyrus.infra.export/META-INF/MANIFEST.MF
@@ -7,13 +7,13 @@ Require-Bundle: org.eclipse.ui.ide;bundle-version="3.7.0",
  org.eclipse.emf.common.ui;bundle-version="2.7.0",

  org.eclipse.papyrus.views.modelexplorer;bundle-version="0.9.0",

  org.eclipse.papyrus.infra.onefile;bundle-version="0.9.0"

-Export-Package: org.eclipse.papyrus.export

+Export-Package: org.eclipse.papyrus.infra.export

 Bundle-Vendor: %providerName

 Bundle-ActivationPolicy: lazy

 Bundle-Version: 0.9.0.qualifier

 Bundle-Name: %pluginName

 Bundle-ManifestVersion: 2

-Bundle-Activator: org.eclipse.papyrus.export.internal.Activator

+Bundle-Activator: org.eclipse.papyrus.infra.export.internal.Activator

 Bundle-SymbolicName: org.eclipse.papyrus.infra.export;singleton:=true

 Bundle-RequiredExecutionEnvironment: J2SE-1.5

 

diff --git a/plugins/infra/org.eclipse.papyrus.infra.export/plugin.xml b/plugins/infra/org.eclipse.papyrus.infra.export/plugin.xml
index b770d529512..47929f46cbb 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.export/plugin.xml
+++ b/plugins/infra/org.eclipse.papyrus.infra.export/plugin.xml
@@ -49,21 +49,21 @@
    <extension

          point="org.eclipse.ui.handlers">

       <handler

-            class="org.eclipse.papyrus.export.actions.ExportAllDiagramsAction"

+            class="org.eclipse.papyrus.infra.export.actions.ExportAllDiagramsAction"

             commandId="org.eclipse.papyrus.export.exportAllDiagrams">

       </handler>

    </extension>

    <extension

          point="org.eclipse.core.expressions.propertyTesters">

       <propertyTester

-            class="org.eclipse.papyrus.export.PropertyTester"

+            class="org.eclipse.papyrus.infra.export.PropertyTester"

             id="org.eclipse.papyrus.export.propertyTester"

             namespace="org.eclipse.papyrus.export"

             properties="isFileExportable"

             type="org.eclipse.core.resources.IFile">

       </propertyTester>

       <propertyTester

-            class="org.eclipse.papyrus.export.PropertyTester"

+            class="org.eclipse.papyrus.infra.export.PropertyTester"

             id="org.eclipse.papyrus.export.propertyTester"

             namespace="org.eclipse.papyrus.export"

             properties="isCollectionExportable"

@@ -73,8 +73,8 @@
    <extension

          point="org.eclipse.ui.exportWizards">

       <wizard

-            category="org.eclipse.papyrus.core.exportcategory"

-            class="org.eclipse.papyrus.export.wizard.ExportAllWizard"

+            category="org.eclipse.papyrus.infra.core.exportcategory"

+            class="org.eclipse.papyrus.infra.export.wizard.ExportAllWizard"

             icon="icons/exportAll.png"

             id="org.eclipse.papyrus.export.diagrams.wizard"

             name="Export All Diagrams">

@@ -83,7 +83,7 @@
                name="*.di">

          </selection>

          <selection

-               class="org.eclipse.papyrus.onefile.model.IPapyrusFile">

+               class="org.eclipse.papyrus.infra.onefile.model.IPapyrusFile">

          </selection>

       </wizard>

    </extension>

diff --git a/plugins/infra/org.eclipse.papyrus.infra.export/src/org/eclipse/papyrus/export/ExportAllDiagrams.java b/plugins/infra/org.eclipse.papyrus.infra.export/src/org/eclipse/papyrus/infra/export/ExportAllDiagrams.java
index 0190432bf7f..ccd8fcddb60 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.export/src/org/eclipse/papyrus/export/ExportAllDiagrams.java
+++ b/plugins/infra/org.eclipse.papyrus.infra.export/src/org/eclipse/papyrus/infra/export/ExportAllDiagrams.java
@@ -11,7 +11,7 @@
  * Anass Radouani (AtoS) - add use GMF exporting tool and remove manual extraction

  * 

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

-package org.eclipse.papyrus.export;

+package org.eclipse.papyrus.infra.export;

 

 import java.io.File;

 import java.lang.reflect.InvocationTargetException;

@@ -61,7 +61,7 @@ import org.eclipse.emf.common.ui.dialogs.DiagnosticDialog;
 import org.eclipse.jface.dialogs.MessageDialog;

 import org.eclipse.jface.operation.IRunnableWithProgress;

 import org.eclipse.papyrus.commands.wrappers.GMFtoEMFCommandWrapper;

-import org.eclipse.papyrus.export.internal.Activator;

+import org.eclipse.papyrus.infra.export.internal.Activator;

 import org.eclipse.swt.SWTError;

 import org.eclipse.swt.widgets.Display;

 import org.eclipse.ui.IWorkbenchWindow;

diff --git a/plugins/infra/org.eclipse.papyrus.infra.export/src/org/eclipse/papyrus/export/ExportException.java b/plugins/infra/org.eclipse.papyrus.infra.export/src/org/eclipse/papyrus/infra/export/ExportException.java
index d679c96a831..d61d51ef6f7 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.export/src/org/eclipse/papyrus/export/ExportException.java
+++ b/plugins/infra/org.eclipse.papyrus.infra.export/src/org/eclipse/papyrus/infra/export/ExportException.java
@@ -9,7 +9,7 @@
  *    David Sciamma (Anyware Technologies) - initial API and implementation

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

 

-package org.eclipse.papyrus.export;

+package org.eclipse.papyrus.infra.export;

 

 /**

  * Exception raised during an image export

diff --git a/plugins/infra/org.eclipse.papyrus.infra.export/src/org/eclipse/papyrus/export/Messages.java b/plugins/infra/org.eclipse.papyrus.infra.export/src/org/eclipse/papyrus/infra/export/Messages.java
index 4206fb1f613..b6d0f1eeb8a 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.export/src/org/eclipse/papyrus/export/Messages.java
+++ b/plugins/infra/org.eclipse.papyrus.infra.export/src/org/eclipse/papyrus/infra/export/Messages.java
@@ -8,13 +8,13 @@
  * Contributors:

  *    Anass RADOUANI (AtoS)

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

-package org.eclipse.papyrus.export;

+package org.eclipse.papyrus.infra.export;

 

 import org.eclipse.osgi.util.NLS;

 

 public class Messages extends NLS {

 

-	private static final String BUNDLE_NAME = "org.eclipse.papyrus.export.messages"; //$NON-NLS-1$

+	private static final String BUNDLE_NAME = "org.eclipse.papyrus.infra.export.messages"; //$NON-NLS-1$

 

 	public static String ExportAllDiagrams_0;

 

diff --git a/plugins/infra/org.eclipse.papyrus.infra.export/src/org/eclipse/papyrus/export/PropertyTester.java b/plugins/infra/org.eclipse.papyrus.infra.export/src/org/eclipse/papyrus/infra/export/PropertyTester.java
index 5cbe271fc26..da6e700a53b 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.export/src/org/eclipse/papyrus/export/PropertyTester.java
+++ b/plugins/infra/org.eclipse.papyrus.infra.export/src/org/eclipse/papyrus/infra/export/PropertyTester.java
@@ -9,9 +9,9 @@
  *    Anass RADOUANI (AtoS) - test property to enable or disable Export All menu item

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

 

-package org.eclipse.papyrus.export;

+package org.eclipse.papyrus.infra.export;

 

-import org.eclipse.papyrus.export.actions.ExportAllDiagramsAction;

+import org.eclipse.papyrus.infra.export.actions.ExportAllDiagramsAction;

 

 public class PropertyTester extends org.eclipse.core.expressions.PropertyTester {

 

diff --git a/plugins/infra/org.eclipse.papyrus.infra.export/src/org/eclipse/papyrus/export/actions/ExportAllDiagramsAction.java b/plugins/infra/org.eclipse.papyrus.infra.export/src/org/eclipse/papyrus/infra/export/actions/ExportAllDiagramsAction.java
index 8b256223386..5b864bb6795 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.export/src/org/eclipse/papyrus/export/actions/ExportAllDiagramsAction.java
+++ b/plugins/infra/org.eclipse.papyrus.infra.export/src/org/eclipse/papyrus/infra/export/actions/ExportAllDiagramsAction.java
@@ -9,7 +9,7 @@
  * Anass RADOUANI (AtoS) - add verification of the selection if it is 
  * a papyrus file or not
  ******************************************************************************/
-package org.eclipse.papyrus.export.actions;
+package org.eclipse.papyrus.infra.export.actions;
 
 import java.util.Collection;
 
@@ -22,8 +22,8 @@ import org.eclipse.core.runtime.Platform;
 import org.eclipse.jface.viewers.ISelection;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.window.Window;
-import org.eclipse.papyrus.export.ExportAllDiagrams;
-import org.eclipse.papyrus.export.internal.Activator;
+import org.eclipse.papyrus.infra.export.ExportAllDiagrams;
+import org.eclipse.papyrus.infra.export.internal.Activator;
 import org.eclipse.ui.handlers.HandlerUtil;
 
 public class ExportAllDiagramsAction extends AbstractHandler {
diff --git a/plugins/infra/org.eclipse.papyrus.infra.export/src/org/eclipse/papyrus/export/actions/ExportAllDiagramsDialog.java b/plugins/infra/org.eclipse.papyrus.infra.export/src/org/eclipse/papyrus/infra/export/actions/ExportAllDiagramsDialog.java
index b3785fffec4..20c8960f7a0 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.export/src/org/eclipse/papyrus/export/actions/ExportAllDiagramsDialog.java
+++ b/plugins/infra/org.eclipse.papyrus.infra.export/src/org/eclipse/papyrus/infra/export/actions/ExportAllDiagramsDialog.java
@@ -8,7 +8,7 @@
  * implementation

  * Anass Radouani (AtoS) - use of ExporterManager removed

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

-package org.eclipse.papyrus.export.actions;

+package org.eclipse.papyrus.infra.export.actions;

 

 import org.eclipse.core.resources.IFile;

 import org.eclipse.core.resources.IResource;

diff --git a/plugins/infra/org.eclipse.papyrus.infra.export/src/org/eclipse/papyrus/export/actions/ExportComposite.java b/plugins/infra/org.eclipse.papyrus.infra.export/src/org/eclipse/papyrus/infra/export/actions/ExportComposite.java
index 104ab1f4abb..ee3eafb5d29 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.export/src/org/eclipse/papyrus/export/actions/ExportComposite.java
+++ b/plugins/infra/org.eclipse.papyrus.infra.export/src/org/eclipse/papyrus/infra/export/actions/ExportComposite.java
@@ -9,7 +9,7 @@
  *    Anass RADOUANI (AtoS) 

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

 

-package org.eclipse.papyrus.export.actions;

+package org.eclipse.papyrus.infra.export.actions;

 

 import org.eclipse.core.resources.IFile;

 import org.eclipse.core.resources.IResource;

@@ -19,7 +19,7 @@ import org.eclipse.core.runtime.Path;
 import org.eclipse.emf.common.util.URI;

 import org.eclipse.gmf.runtime.diagram.ui.image.ImageFileFormat;

 import org.eclipse.jface.window.Window;

-import org.eclipse.papyrus.export.internal.Activator;

+import org.eclipse.papyrus.infra.export.internal.Activator;

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.events.SelectionAdapter;

 import org.eclipse.swt.events.SelectionEvent;

diff --git a/plugins/infra/org.eclipse.papyrus.infra.export/src/org/eclipse/papyrus/export/actions/Messages.java b/plugins/infra/org.eclipse.papyrus.infra.export/src/org/eclipse/papyrus/infra/export/actions/Messages.java
index 084baec31b4..5f143b02aa6 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.export/src/org/eclipse/papyrus/export/actions/Messages.java
+++ b/plugins/infra/org.eclipse.papyrus.infra.export/src/org/eclipse/papyrus/infra/export/actions/Messages.java
@@ -8,13 +8,13 @@
  * Contributors:

  *    Anass RADOUANI (AtoS)

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

-package org.eclipse.papyrus.export.actions;

+package org.eclipse.papyrus.infra.export.actions;

 

 import org.eclipse.osgi.util.NLS;

 

 public class Messages extends NLS {

 

-	private static final String BUNDLE_NAME = "org.eclipse.papyrus.export.actions.messages"; //$NON-NLS-1$

+	private static final String BUNDLE_NAME = "org.eclipse.papyrus.infra.export.actions.messages"; //$NON-NLS-1$

 

 	public static String ExportAllDiagramsDialog_0;

 

diff --git a/plugins/infra/org.eclipse.papyrus.infra.export/src/org/eclipse/papyrus/export/actions/messages.properties b/plugins/infra/org.eclipse.papyrus.infra.export/src/org/eclipse/papyrus/infra/export/actions/messages.properties
index f289fe21a82..f289fe21a82 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.export/src/org/eclipse/papyrus/export/actions/messages.properties
+++ b/plugins/infra/org.eclipse.papyrus.infra.export/src/org/eclipse/papyrus/infra/export/actions/messages.properties
diff --git a/plugins/infra/org.eclipse.papyrus.infra.export/src/org/eclipse/papyrus/export/internal/Activator.java b/plugins/infra/org.eclipse.papyrus.infra.export/src/org/eclipse/papyrus/infra/export/internal/Activator.java
index babf17faf19..0931cbbf080 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.export/src/org/eclipse/papyrus/export/internal/Activator.java
+++ b/plugins/infra/org.eclipse.papyrus.infra.export/src/org/eclipse/papyrus/infra/export/internal/Activator.java
@@ -9,7 +9,7 @@
  *    David Sciamma (Anyware Technologies) - initial API and implementation

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

 

-package org.eclipse.papyrus.export.internal;

+package org.eclipse.papyrus.infra.export.internal;

 

 import java.lang.reflect.InvocationTargetException;

 

@@ -31,7 +31,7 @@ import org.osgi.framework.BundleContext;
 public class Activator extends AbstractUIPlugin {

 

 	// The plug-in ID

-	public static final String PLUGIN_ID = "org.eclipse.papyrus.export"; //$NON-NLS-1$

+	public static final String PLUGIN_ID = "org.eclipse.papyrus.infra.export"; //$NON-NLS-1$

 

 	// The shared instance

 	private static Activator plugin;

diff --git a/plugins/infra/org.eclipse.papyrus.infra.export/src/org/eclipse/papyrus/export/messages.properties b/plugins/infra/org.eclipse.papyrus.infra.export/src/org/eclipse/papyrus/infra/export/messages.properties
index 814adafda6f..814adafda6f 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.export/src/org/eclipse/papyrus/export/messages.properties
+++ b/plugins/infra/org.eclipse.papyrus.infra.export/src/org/eclipse/papyrus/infra/export/messages.properties
diff --git a/plugins/infra/org.eclipse.papyrus.infra.export/src/org/eclipse/papyrus/export/wizard/ExportAllWizard.java b/plugins/infra/org.eclipse.papyrus.infra.export/src/org/eclipse/papyrus/infra/export/wizard/ExportAllWizard.java
index 07233ddc719..72e0e46060b 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.export/src/org/eclipse/papyrus/export/wizard/ExportAllWizard.java
+++ b/plugins/infra/org.eclipse.papyrus.infra.export/src/org/eclipse/papyrus/infra/export/wizard/ExportAllWizard.java
@@ -9,7 +9,7 @@
  *    Anass RADOUANI (AtoS) 

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

 

-package org.eclipse.papyrus.export.wizard;

+package org.eclipse.papyrus.infra.export.wizard;

 

 import java.util.Collection;

 

@@ -19,7 +19,7 @@ import org.eclipse.core.runtime.Platform;
 import org.eclipse.jface.viewers.ISelection;

 import org.eclipse.jface.viewers.IStructuredSelection;

 import org.eclipse.jface.wizard.Wizard;

-import org.eclipse.papyrus.export.ExportAllDiagrams;

+import org.eclipse.papyrus.infra.export.ExportAllDiagrams;

 import org.eclipse.ui.IExportWizard;

 import org.eclipse.ui.IWorkbench;

 

diff --git a/plugins/infra/org.eclipse.papyrus.infra.export/src/org/eclipse/papyrus/export/wizard/ExportDiagramsErrorPage.java b/plugins/infra/org.eclipse.papyrus.infra.export/src/org/eclipse/papyrus/infra/export/wizard/ExportDiagramsErrorPage.java
index 5d46fa56f1a..65e8096edab 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.export/src/org/eclipse/papyrus/export/wizard/ExportDiagramsErrorPage.java
+++ b/plugins/infra/org.eclipse.papyrus.infra.export/src/org/eclipse/papyrus/infra/export/wizard/ExportDiagramsErrorPage.java
@@ -9,7 +9,7 @@
  *    Anass RADOUANI (AtoS)

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

 

-package org.eclipse.papyrus.export.wizard;

+package org.eclipse.papyrus.infra.export.wizard;

 

 import org.eclipse.jface.wizard.WizardPage;

 import org.eclipse.swt.SWT;

diff --git a/plugins/infra/org.eclipse.papyrus.infra.export/src/org/eclipse/papyrus/export/wizard/ExportDiagramsPage.java b/plugins/infra/org.eclipse.papyrus.infra.export/src/org/eclipse/papyrus/infra/export/wizard/ExportDiagramsPage.java
index e96e397e947..42b7fbeca5b 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.export/src/org/eclipse/papyrus/export/wizard/ExportDiagramsPage.java
+++ b/plugins/infra/org.eclipse.papyrus.infra.export/src/org/eclipse/papyrus/infra/export/wizard/ExportDiagramsPage.java
@@ -9,13 +9,13 @@
  *    Anass RADOUANI (AtoS) 

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

 

-package org.eclipse.papyrus.export.wizard;

+package org.eclipse.papyrus.infra.export.wizard;

 

 import org.eclipse.core.resources.IFile;

 import org.eclipse.jface.wizard.WizardPage;

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.widgets.Composite;

-import org.eclipse.papyrus.export.actions.ExportComposite;

+import org.eclipse.papyrus.infra.export.actions.ExportComposite;

 

 /**

  * wizard page to export all diagram from a Papyrus model

diff --git a/plugins/infra/org.eclipse.papyrus.infra.export/src/org/eclipse/papyrus/export/wizard/Messages.java b/plugins/infra/org.eclipse.papyrus.infra.export/src/org/eclipse/papyrus/infra/export/wizard/Messages.java
index a5f4a6326ba..058f14a2e38 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.export/src/org/eclipse/papyrus/export/wizard/Messages.java
+++ b/plugins/infra/org.eclipse.papyrus.infra.export/src/org/eclipse/papyrus/infra/export/wizard/Messages.java
@@ -9,13 +9,13 @@
  *    Anass RADOUANI (AtoS) 

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

 

-package org.eclipse.papyrus.export.wizard;

+package org.eclipse.papyrus.infra.export.wizard;

 

 import org.eclipse.osgi.util.NLS;

 

 public class Messages extends NLS {

 

-	private static final String BUNDLE_NAME = "org.eclipse.papyrus.export.wizard.messages"; //$NON-NLS-1$

+	private static final String BUNDLE_NAME = "org.eclipse.papyrus.infra.export.wizard.messages"; //$NON-NLS-1$

 

 	public static String ExportAllWizard_0;

 

diff --git a/plugins/infra/org.eclipse.papyrus.infra.export/src/org/eclipse/papyrus/export/wizard/messages.properties b/plugins/infra/org.eclipse.papyrus.infra.export/src/org/eclipse/papyrus/infra/export/wizard/messages.properties
index 67798f4c499..67798f4c499 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.export/src/org/eclipse/papyrus/export/wizard/messages.properties
+++ b/plugins/infra/org.eclipse.papyrus.infra.export/src/org/eclipse/papyrus/infra/export/wizard/messages.properties
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/META-INF/MANIFEST.MF b/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/META-INF/MANIFEST.MF
index 648610eb39f..431ee881724 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/META-INF/MANIFEST.MF
+++ b/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/META-INF/MANIFEST.MF
@@ -1,9 +1,9 @@
 Manifest-Version: 1.0

-Export-Package: org.eclipse.papyrus.extendedtypes.emf,

- org.eclipse.papyrus.extendedtypes.emf.modifysemanticvaluesactionconfiguration,

- org.eclipse.papyrus.extendedtypes.emf.modifysemanticvaluesactionconfiguration.impl,

- org.eclipse.papyrus.extendedtypes.emf.modifysemanticvaluesactionconfiguration.util,

- org.eclipse.papyrus.extendedtypes.emf.providers

+Export-Package: org.eclipse.papyrus.infra.extendedtypes.emf,

+ org.eclipse.papyrus.infra.extendedtypes.emf.modifysemanticvaluesactionconfiguration,

+ org.eclipse.papyrus.infra.extendedtypes.emf.modifysemanticvaluesactionconfiguration.impl,

+ org.eclipse.papyrus.infra.extendedtypes.emf.modifysemanticvaluesactionconfiguration.util,

+ org.eclipse.papyrus.infra.extendedtypes.emf.providers

 Bundle-ActivationPolicy: lazy

 Bundle-ClassPath: .

 Bundle-Name: %pluginName

@@ -23,6 +23,6 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="3.7.0",
 Bundle-Vendor: %providerName

 Bundle-Version: 0.9.0.qualifier

 Bundle-ManifestVersion: 2

-Bundle-Activator: org.eclipse.papyrus.extendedtypes.emf.Activator

+Bundle-Activator: org.eclipse.papyrus.infra.extendedtypes.emf.Activator

 Bundle-SymbolicName: org.eclipse.papyrus.infra.extendedtypes.emf;singleton:=true

 

diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/model/ModifySemanticValuesActionConfiguration.ecore b/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/model/ModifySemanticValuesActionConfiguration.ecore
index 2b897e91347..4333d095e5d 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/model/ModifySemanticValuesActionConfiguration.ecore
+++ b/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/model/ModifySemanticValuesActionConfiguration.ecore
@@ -5,7 +5,7 @@
     nsURI="http://www.eclipse.org/papyrus/diagram/types/modifysemanticvaluesactionconfiguration/0.8"

     nsPrefix="modifysemanticvaluesactionconfiguration">

   <eClassifiers xsi:type="ecore:EClass" name="ModifySemanticValuesActionConfiguration"

-      eSuperTypes="platform:/plugin/org.eclipse.papyrus.extendedtypes/model/ExtendedTypes.ecore#//PostActionConfiguration">

+      eSuperTypes="platform:/plugin/org.eclipse.papyrus.infra.extendedtypes/model/ExtendedTypes.ecore#//PostActionConfiguration">

     <eStructuralFeatures xsi:type="ecore:EReference" name="featuresToSet" upperBound="-1"

         eType="#//FeatureToSet" containment="true"/>

   </eClassifiers>

@@ -26,6 +26,6 @@
         eType="#//FeatureValue"/>

   </eClassifiers>

   <eClassifiers xsi:type="ecore:EClass" name="QueryExecutionValue" eSuperTypes="#//FeatureValue">

-    <eStructuralFeatures xsi:type="ecore:EReference" name="configuration" eType="ecore:EClass platform:/plugin/org.eclipse.papyrus.core.queries.configuration/model/Configuration.ecore#//QueryConfiguration"/>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="configuration" eType="ecore:EClass platform:/plugin/org.eclipse.papyrus.infra.queries.core.configuration/model/Configuration.ecore#//QueryConfiguration"/>

   </eClassifiers>

 </ecore:EPackage>

diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/model/ModifySemanticValuesActionConfiguration.ecorediag b/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/model/ModifySemanticValuesActionConfiguration.ecorediag
index 3b0060d96d1..52c54db4738 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/model/ModifySemanticValuesActionConfiguration.ecorediag
+++ b/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/model/ModifySemanticValuesActionConfiguration.ecorediag
@@ -16,7 +16,7 @@
       <styles xmi:type="notation:FilteringStyle" xmi:id="_mWK7iFSgEeC-0syXieMmHA"/>

     </children>

     <styles xmi:type="notation:ShapeStyle" xmi:id="_mVuPkVSgEeC-0syXieMmHA" fontColor="4210752" fontHeight="10" fillColor="12560536" lineColor="8421504"/>

-    <element xmi:type="ecore:EClass" href="platform:/plugin/org.eclipse.papyrus.extendedtypes/model/ExtendedTypes.ecore#//PostActionConfiguration"/>

+    <element xmi:type="ecore:EClass" href="platform:/plugin/org.eclipse.papyrus.infra.extendedtypes/model/ExtendedTypes.ecore#//PostActionConfiguration"/>

     <layoutConstraint xmi:type="notation:Bounds" xmi:id="_mVuPklSgEeC-0syXieMmHA" x="110" y="200" width="193"/>

   </children>

   <children xmi:type="notation:Node" xmi:id="_omszsFSgEeC-0syXieMmHA" type="1001">

@@ -151,7 +151,7 @@
       <styles xmi:type="notation:FilteringStyle" xmi:id="_5j_FGFVtEeCZTbk4eXVjvg"/>

     </children>

     <styles xmi:type="notation:ShapeStyle" xmi:id="_5jsKIVVtEeCZTbk4eXVjvg" fontColor="4210752" fontHeight="10" fillColor="12560536" lineColor="8421504"/>

-    <element xmi:type="ecore:EClass" href="platform:/plugin/org.eclipse.papyrus.core.queries.configuration/model/Configuration.ecore#//QueryConfiguration"/>

+    <element xmi:type="ecore:EClass" href="platform:/plugin/org.eclipse.papyrus.infra.queries.core.configuration/model/Configuration.ecore#//QueryConfiguration"/>

     <layoutConstraint xmi:type="notation:Bounds" xmi:id="_5jsKIlVtEeCZTbk4eXVjvg" x="665" y="610" width="183" height="73"/>

   </children>

   <children xmi:type="notation:Node" xmi:id="_CjJ_gFVuEeCZTbk4eXVjvg" type="1001">

diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/model/ModifySemanticValuesActionConfiguration.genmodel b/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/model/ModifySemanticValuesActionConfiguration.genmodel
index 75b2475d2e7..53f0c6613a7 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/model/ModifySemanticValuesActionConfiguration.genmodel
+++ b/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/model/ModifySemanticValuesActionConfiguration.genmodel
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <genmodel:GenModel xmi:version="2.0"

     xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"

-    xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" modelDirectory="/org.eclipse.papyrus.extendedtypes.emf/src-gen"

-    editDirectory="/org.eclipse.papyrus.extendedtypes.emf.edit/src-gen" editorDirectory="/org.eclipse.papyrus.extendedtypes.emf.editor/src-gen"

-    modelPluginID="org.eclipse.papyrus.extendedtypes.emf" modelName="ModifySemanticValuesActionConfiguration"

-    testsDirectory="/org.eclipse.papyrus.extendedtypes.emf.tests/src-gen"

+    xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" modelDirectory="/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen"

+    editDirectory="/org.eclipse.papyrus.infra.extendedtypes.emf.edit/src-gen" editorDirectory="/org.eclipse.papyrus.infra.extendedtypes.emf.editor/src-gen"

+    modelPluginID="org.eclipse.papyrus.infra.extendedtypes.emf" modelName="ModifySemanticValuesActionConfiguration"

+    testsDirectory="/org.eclipse.papyrus.infra.extendedtypes.emf.tests/src-gen"

     importerID="org.eclipse.emf.importer.ecore" complianceLevel="5.0" copyrightFields="false"

-    usedGenPackages="platform:/plugin/org.eclipse.papyrus.core.queries.configuration/model/Configuration.genmodel#//configuration platform:/plugin/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore platform:/plugin/org.eclipse.papyrus.extendedtypes/model/ExtendedTypes.genmodel#//extendedtypes platform:/plugin/org.eclipse.emf.facet.infra.query/model/query.genmodel#//query platform:/plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml">

+    usedGenPackages="platform:/plugin/org.eclipse.papyrus.infra.queries.core.configuration/model/Configuration.genmodel#//configuration platform:/plugin/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore platform:/plugin/org.eclipse.papyrus.infra.extendedtypes/model/ExtendedTypes.genmodel#//extendedtypes platform:/plugin/org.eclipse.emf.facet.infra.query/model/query.genmodel#//query platform:/plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml">

   <foreignModel>ModifySemanticValuesActionConfiguration.ecore</foreignModel>

-  <genPackages prefix="ModifySemanticValuesActionConfiguration" basePackage="org.eclipse.papyrus.extendedtypes.emf"

+  <genPackages prefix="ModifySemanticValuesActionConfiguration" basePackage="org.eclipse.papyrus.infra.extendedtypes.emf"

       resource="XML" disposableProviderFactory="true" ecorePackage="ModifySemanticValuesActionConfiguration.ecore#/">

     <genClasses ecoreClass="ModifySemanticValuesActionConfiguration.ecore#//ModifySemanticValuesActionConfiguration">

       <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference ModifySemanticValuesActionConfiguration.ecore#//ModifySemanticValuesActionConfiguration/featuresToSet"/>

diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/plugin.xml b/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/plugin.xml
index f5f358abc11..9d8c9c3ff06 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/plugin.xml
+++ b/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/plugin.xml
@@ -13,24 +13,24 @@
    <extension point="org.eclipse.emf.ecore.generated_package">

       <package

             uri="http://www.eclipse.org/papyrus/diagram/types/modifysemanticvaluesactionconfiguration/0.8"

-            class="org.eclipse.papyrus.extendedtypes.emf.modifysemanticvaluesactionconfiguration.ModifySemanticValuesActionConfigurationPackage"

+            class="org.eclipse.papyrus.infra.extendedtypes.emf.modifysemanticvaluesactionconfiguration.ModifySemanticValuesActionConfigurationPackage"

             genModel="model/ModifySemanticValuesActionConfiguration.genmodel"/>

    </extension>

 

    <extension point="org.eclipse.emf.ecore.extension_parser">

       <parser

             type="modifysemanticvaluesactionconfiguration"

-            class="org.eclipse.papyrus.extendedtypes.emf.modifysemanticvaluesactionconfiguration.util.ModifySemanticValuesActionConfigurationResourceFactoryImpl"/>

+            class="org.eclipse.papyrus.infra.extendedtypes.emf.modifysemanticvaluesactionconfiguration.util.ModifySemanticValuesActionConfigurationResourceFactoryImpl"/>

    </extension>

 

 	<extension

-         point="org.eclipse.papyrus.extendedtypes.extendedElementTypeActionProvider">

+         point="org.eclipse.papyrus.infra.extendedtypes.extendedElementTypeActionProvider">

       <extendedElementTypeActionProvider

-            class="org.eclipse.papyrus.extendedtypes.emf.providers.ModifySemanticValuesActionProvider"

-            configurationClass="org.eclipse.papyrus.extendedtypes.emf.modifysemanticvaluesactionconfiguration.ModifySemanticValuesActionConfiguration"

+            class="org.eclipse.papyrus.infra.extendedtypes.emf.providers.ModifySemanticValuesActionProvider"

+            configurationClass="org.eclipse.papyrus.infra.extendedtypes.emf.modifysemanticvaluesactionconfiguration.ModifySemanticValuesActionConfiguration"

             description="Post action to set semantic values on created element"

             icon="icons/Values.gif"

-            id="org.eclipse.papyrus.extendedtypes.emf.modifysemanticvaluesactionconfiguration"

+            id="org.eclipse.papyrus.infra.extendedtypes.emf.modifysemanticvaluesactionconfiguration"

             name="Extended Element Type Modify Semantic Values Post Action">

          <Priority

                name="Lowest">

diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/extendedtypes/emf/modifysemanticvaluesactionconfiguration/ConstantValue.java b/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/infra/extendedtypes/emf/modifysemanticvaluesactionconfiguration/ConstantValue.java
index 11decf35ab8..fd3845d569d 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/extendedtypes/emf/modifysemanticvaluesactionconfiguration/ConstantValue.java
+++ b/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/infra/extendedtypes/emf/modifysemanticvaluesactionconfiguration/ConstantValue.java
@@ -4,7 +4,7 @@
  *

  * $Id$

  */

-package org.eclipse.papyrus.extendedtypes.emf.modifysemanticvaluesactionconfiguration;

+package org.eclipse.papyrus.infra.extendedtypes.emf.modifysemanticvaluesactionconfiguration;

 

 import org.eclipse.uml2.uml.ValueSpecification;

 

@@ -16,11 +16,11 @@ import org.eclipse.uml2.uml.ValueSpecification;
  * <p>

  * The following features are supported:

  * <ul>

- *   <li>{@link org.eclipse.papyrus.extendedtypes.emf.modifysemanticvaluesactionconfiguration.ConstantValue#getValueInstance <em>Value Instance</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.infra.extendedtypes.emf.modifysemanticvaluesactionconfiguration.ConstantValue#getValueInstance <em>Value Instance</em>}</li>

  * </ul>

  * </p>

  *

- * @see org.eclipse.papyrus.extendedtypes.emf.modifysemanticvaluesactionconfiguration.ModifySemanticValuesActionConfigurationPackage#getConstantValue()

+ * @see org.eclipse.papyrus.infra.extendedtypes.emf.modifysemanticvaluesactionconfiguration.ModifySemanticValuesActionConfigurationPackage#getConstantValue()

  * @model

  * @generated

  */

@@ -35,14 +35,14 @@ public interface ConstantValue extends FeatureValue {
 	 * <!-- end-user-doc -->

 	 * @return the value of the '<em>Value Instance</em>' containment reference.

 	 * @see #setValueInstance(ValueSpecification)

-	 * @see org.eclipse.papyrus.extendedtypes.emf.modifysemanticvaluesactionconfiguration.ModifySemanticValuesActionConfigurationPackage#getConstantValue_ValueInstance()

+	 * @see org.eclipse.papyrus.infra.extendedtypes.emf.modifysemanticvaluesactionconfiguration.ModifySemanticValuesActionConfigurationPackage#getConstantValue_ValueInstance()

 	 * @model containment="true"

 	 * @generated

 	 */

 	ValueSpecification getValueInstance();

 

 	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.extendedtypes.emf.modifysemanticvaluesactionconfiguration.ConstantValue#getValueInstance <em>Value Instance</em>}' containment reference.

+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.extendedtypes.emf.modifysemanticvaluesactionconfiguration.ConstantValue#getValueInstance <em>Value Instance</em>}' containment reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

 	 * @param value the new value of the '<em>Value Instance</em>' containment reference.

diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/extendedtypes/emf/modifysemanticvaluesactionconfiguration/DynamicValue.java b/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/infra/extendedtypes/emf/modifysemanticvaluesactionconfiguration/DynamicValue.java
index ffa2bde7d1f..ab1de224cf8 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/extendedtypes/emf/modifysemanticvaluesactionconfiguration/DynamicValue.java
+++ b/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/infra/extendedtypes/emf/modifysemanticvaluesactionconfiguration/DynamicValue.java
@@ -4,7 +4,7 @@
  *

  * $Id$

  */

-package org.eclipse.papyrus.extendedtypes.emf.modifysemanticvaluesactionconfiguration;

+package org.eclipse.papyrus.infra.extendedtypes.emf.modifysemanticvaluesactionconfiguration;

 

 

 /**

@@ -13,7 +13,7 @@ package org.eclipse.papyrus.extendedtypes.emf.modifysemanticvaluesactionconfigur
  * <!-- end-user-doc -->

  *

  *

- * @see org.eclipse.papyrus.extendedtypes.emf.modifysemanticvaluesactionconfiguration.ModifySemanticValuesActionConfigurationPackage#getDynamicValue()

+ * @see org.eclipse.papyrus.infra.extendedtypes.emf.modifysemanticvaluesactionconfiguration.ModifySemanticValuesActionConfigurationPackage#getDynamicValue()

  * @model

  * @generated

  */

diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/extendedtypes/emf/modifysemanticvaluesactionconfiguration/FeatureToSet.java b/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/infra/extendedtypes/emf/modifysemanticvaluesactionconfiguration/FeatureToSet.java
index 16a179c8bf8..1beda453abd 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/extendedtypes/emf/modifysemanticvaluesactionconfiguration/FeatureToSet.java
+++ b/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/infra/extendedtypes/emf/modifysemanticvaluesactionconfiguration/FeatureToSet.java
@@ -4,7 +4,7 @@
  *

  * $Id$

  */

-package org.eclipse.papyrus.extendedtypes.emf.modifysemanticvaluesactionconfiguration;

+package org.eclipse.papyrus.infra.extendedtypes.emf.modifysemanticvaluesactionconfiguration;

 

 import org.eclipse.emf.ecore.EObject;

 

@@ -16,12 +16,12 @@ import org.eclipse.emf.ecore.EObject;
  * <p>

  * The following features are supported:

  * <ul>

- *   <li>{@link org.eclipse.papyrus.extendedtypes.emf.modifysemanticvaluesactionconfiguration.FeatureToSet#getFeatureName <em>Feature Name</em>}</li>

- *   <li>{@link org.eclipse.papyrus.extendedtypes.emf.modifysemanticvaluesactionconfiguration.FeatureToSet#getValue <em>Value</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.infra.extendedtypes.emf.modifysemanticvaluesactionconfiguration.FeatureToSet#getFeatureName <em>Feature Name</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.infra.extendedtypes.emf.modifysemanticvaluesactionconfiguration.FeatureToSet#getValue <em>Value</em>}</li>

  * </ul>

  * </p>

  *

- * @see org.eclipse.papyrus.extendedtypes.emf.modifysemanticvaluesactionconfiguration.ModifySemanticValuesActionConfigurationPackage#getFeatureToSet()

+ * @see org.eclipse.papyrus.infra.extendedtypes.emf.modifysemanticvaluesactionconfiguration.ModifySemanticValuesActionConfigurationPackage#getFeatureToSet()

  * @model

  * @generated

  */

@@ -36,14 +36,14 @@ public interface FeatureToSet extends EObject {
 	 * <!-- end-user-doc -->

 	 * @return the value of the '<em>Feature Name</em>' attribute.

 	 * @see #setFeatureName(String)

-	 * @see org.eclipse.papyrus.extendedtypes.emf.modifysemanticvaluesactionconfiguration.ModifySemanticValuesActionConfigurationPackage#getFeatureToSet_FeatureName()

+	 * @see org.eclipse.papyrus.infra.extendedtypes.emf.modifysemanticvaluesactionconfiguration.ModifySemanticValuesActionConfigurationPackage#getFeatureToSet_FeatureName()

 	 * @model required="true"

 	 * @generated

 	 */

 	String getFeatureName();

 

 	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.extendedtypes.emf.modifysemanticvaluesactionconfiguration.FeatureToSet#getFeatureName <em>Feature Name</em>}' attribute.

+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.extendedtypes.emf.modifysemanticvaluesactionconfiguration.FeatureToSet#getFeatureName <em>Feature Name</em>}' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

 	 * @param value the new value of the '<em>Feature Name</em>' attribute.

@@ -62,14 +62,14 @@ public interface FeatureToSet extends EObject {
 	 * <!-- end-user-doc -->

 	 * @return the value of the '<em>Value</em>' containment reference.

 	 * @see #setValue(FeatureValue)

-	 * @see org.eclipse.papyrus.extendedtypes.emf.modifysemanticvaluesactionconfiguration.ModifySemanticValuesActionConfigurationPackage#getFeatureToSet_Value()

+	 * @see org.eclipse.papyrus.infra.extendedtypes.emf.modifysemanticvaluesactionconfiguration.ModifySemanticValuesActionConfigurationPackage#getFeatureToSet_Value()

 	 * @model containment="true" required="true"

 	 * @generated

 	 */

 	FeatureValue getValue();

 

 	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.extendedtypes.emf.modifysemanticvaluesactionconfiguration.FeatureToSet#getValue <em>Value</em>}' containment reference.

+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.extendedtypes.emf.modifysemanticvaluesactionconfiguration.FeatureToSet#getValue <em>Value</em>}' containment reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

 	 * @param value the new value of the '<em>Value</em>' containment reference.

diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/extendedtypes/emf/modifysemanticvaluesactionconfiguration/FeatureValue.java b/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/infra/extendedtypes/emf/modifysemanticvaluesactionconfiguration/FeatureValue.java
index 115b6621243..f48176278bc 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/extendedtypes/emf/modifysemanticvaluesactionconfiguration/FeatureValue.java
+++ b/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/infra/extendedtypes/emf/modifysemanticvaluesactionconfiguration/FeatureValue.java
@@ -4,7 +4,7 @@
  *

  * $Id$

  */

-package org.eclipse.papyrus.extendedtypes.emf.modifysemanticvaluesactionconfiguration;

+package org.eclipse.papyrus.infra.extendedtypes.emf.modifysemanticvaluesactionconfiguration;

 

 import org.eclipse.emf.ecore.EObject;

 

@@ -14,7 +14,7 @@ import org.eclipse.emf.ecore.EObject;
  * <!-- end-user-doc -->

  *

  *

- * @see org.eclipse.papyrus.extendedtypes.emf.modifysemanticvaluesactionconfiguration.ModifySemanticValuesActionConfigurationPackage#getFeatureValue()

+ * @see org.eclipse.papyrus.infra.extendedtypes.emf.modifysemanticvaluesactionconfiguration.ModifySemanticValuesActionConfigurationPackage#getFeatureValue()

  * @model abstract="true"

  * @generated

  */

diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/extendedtypes/emf/modifysemanticvaluesactionconfiguration/ListValue.java b/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/infra/extendedtypes/emf/modifysemanticvaluesactionconfiguration/ListValue.java
index b505d6f544d..fb889826620 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/extendedtypes/emf/modifysemanticvaluesactionconfiguration/ListValue.java
+++ b/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/infra/extendedtypes/emf/modifysemanticvaluesactionconfiguration/ListValue.java
@@ -4,7 +4,7 @@
  *

  * $Id$

  */

-package org.eclipse.papyrus.extendedtypes.emf.modifysemanticvaluesactionconfiguration;

+package org.eclipse.papyrus.infra.extendedtypes.emf.modifysemanticvaluesactionconfiguration;

 

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

 

@@ -16,18 +16,18 @@ import org.eclipse.emf.common.util.EList;
  * <p>

  * The following features are supported:

  * <ul>

- *   <li>{@link org.eclipse.papyrus.extendedtypes.emf.modifysemanticvaluesactionconfiguration.ListValue#getValues <em>Values</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.infra.extendedtypes.emf.modifysemanticvaluesactionconfiguration.ListValue#getValues <em>Values</em>}</li>

  * </ul>

  * </p>

  *

- * @see org.eclipse.papyrus.extendedtypes.emf.modifysemanticvaluesactionconfiguration.ModifySemanticValuesActionConfigurationPackage#getListValue()

+ * @see org.eclipse.papyrus.infra.extendedtypes.emf.modifysemanticvaluesactionconfiguration.ModifySemanticValuesActionConfigurationPackage#getListValue()

  * @model

  * @generated

  */

 public interface ListValue extends FeatureValue {

 	/**

 	 * Returns the value of the '<em><b>Values</b></em>' reference list.

-	 * The list contents are of type {@link org.eclipse.papyrus.extendedtypes.emf.modifysemanticvaluesactionconfiguration.FeatureValue}.

+	 * The list contents are of type {@link org.eclipse.papyrus.infra.extendedtypes.emf.modifysemanticvaluesactionconfiguration.FeatureValue}.

 	 * <!-- begin-user-doc -->

 	 * <p>

 	 * If the meaning of the '<em>Values</em>' reference list isn't clear,

@@ -35,7 +35,7 @@ public interface ListValue extends FeatureValue {
 	 * </p>

 	 * <!-- end-user-doc -->

 	 * @return the value of the '<em>Values</em>' reference list.

-	 * @see org.eclipse.papyrus.extendedtypes.emf.modifysemanticvaluesactionconfiguration.ModifySemanticValuesActionConfigurationPackage#getListValue_Values()

+	 * @see org.eclipse.papyrus.infra.extendedtypes.emf.modifysemanticvaluesactionconfiguration.ModifySemanticValuesActionConfigurationPackage#getListValue_Values()

 	 * @model

 	 * @generated

 	 */

diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/extendedtypes/emf/modifysemanticvaluesactionconfiguration/ModifySemanticValuesActionConfiguration.java b/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/infra/extendedtypes/emf/modifysemanticvaluesactionconfiguration/ModifySemanticValuesActionConfiguration.java
index 6297f184cb8..f87a0fa77fc 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/extendedtypes/emf/modifysemanticvaluesactionconfiguration/ModifySemanticValuesActionConfiguration.java
+++ b/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/infra/extendedtypes/emf/modifysemanticvaluesactionconfiguration/ModifySemanticValuesActionConfiguration.java
@@ -4,11 +4,11 @@
  *

  * $Id$

  */

-package org.eclipse.papyrus.extendedtypes.emf.modifysemanticvaluesactionconfiguration;

+package org.eclipse.papyrus.infra.extendedtypes.emf.modifysemanticvaluesactionconfiguration;

 

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

 

-import org.eclipse.papyrus.extendedtypes.PostActionConfiguration;

+import org.eclipse.papyrus.infra.extendedtypes.PostActionConfiguration;

 

 /**

  * <!-- begin-user-doc -->

@@ -18,18 +18,18 @@ import org.eclipse.papyrus.extendedtypes.PostActionConfiguration;
  * <p>

  * The following features are supported:

  * <ul>

- *   <li>{@link org.eclipse.papyrus.extendedtypes.emf.modifysemanticvaluesactionconfiguration.ModifySemanticValuesActionConfiguration#getFeaturesToSet <em>Features To Set</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.infra.extendedtypes.emf.modifysemanticvaluesactionconfiguration.ModifySemanticValuesActionConfiguration#getFeaturesToSet <em>Features To Set</em>}</li>

  * </ul>

  * </p>

  *

- * @see org.eclipse.papyrus.extendedtypes.emf.modifysemanticvaluesactionconfiguration.ModifySemanticValuesActionConfigurationPackage#getModifySemanticValuesActionConfiguration()

+ * @see org.eclipse.papyrus.infra.extendedtypes.emf.modifysemanticvaluesactionconfiguration.ModifySemanticValuesActionConfigurationPackage#getModifySemanticValuesActionConfiguration()

  * @model

  * @generated

  */

 public interface ModifySemanticValuesActionConfiguration extends PostActionConfiguration {

 	/**

 	 * Returns the value of the '<em><b>Features To Set</b></em>' containment reference list.

-	 * The list contents are of type {@link org.eclipse.papyrus.extendedtypes.emf.modifysemanticvaluesactionconfiguration.FeatureToSet}.

+	 * The list contents are of type {@link org.eclipse.papyrus.infra.extendedtypes.emf.modifysemanticvaluesactionconfiguration.FeatureToSet}.

 	 * <!-- begin-user-doc -->

 	 * <p>

 	 * If the meaning of the '<em>Features To Set</em>' containment reference list isn't clear,

@@ -37,7 +37,7 @@ public interface ModifySemanticValuesActionConfiguration extends PostActionConfi
 	 * </p>

 	 * <!-- end-user-doc -->

 	 * @return the value of the '<em>Features To Set</em>' containment reference list.

-	 * @see org.eclipse.papyrus.extendedtypes.emf.modifysemanticvaluesactionconfiguration.ModifySemanticValuesActionConfigurationPackage#getModifySemanticValuesActionConfiguration_FeaturesToSet()

+	 * @see org.eclipse.papyrus.infra.extendedtypes.emf.modifysemanticvaluesactionconfiguration.ModifySemanticValuesActionConfigurationPackage#getModifySemanticValuesActionConfiguration_FeaturesToSet()

 	 * @model containment="true"

 	 * @generated

 	 */

diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/extendedtypes/emf/modifysemanticvaluesactionconfiguration/ModifySemanticValuesActionConfigurationFactory.java b/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/infra/extendedtypes/emf/modifysemanticvaluesactionconfiguration/ModifySemanticValuesActionConfigurationFactory.java
index beacaa6d3ef..e38f1f1692f 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/extendedtypes/emf/modifysemanticvaluesactionconfiguration/ModifySemanticValuesActionConfigurationFactory.java
+++ b/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/infra/extendedtypes/emf/modifysemanticvaluesactionconfiguration/ModifySemanticValuesActionConfigurationFactory.java
@@ -4,7 +4,7 @@
  *

  * $Id$

  */

-package org.eclipse.papyrus.extendedtypes.emf.modifysemanticvaluesactionconfiguration;

+package org.eclipse.papyrus.infra.extendedtypes.emf.modifysemanticvaluesactionconfiguration;

 

 import org.eclipse.emf.ecore.EFactory;

 

@@ -13,7 +13,7 @@ import org.eclipse.emf.ecore.EFactory;
  * The <b>Factory</b> for the model.

  * It provides a create method for each non-abstract class of the model.

  * <!-- end-user-doc -->

- * @see org.eclipse.papyrus.extendedtypes.emf.modifysemanticvaluesactionconfiguration.ModifySemanticValuesActionConfigurationPackage

+ * @see org.eclipse.papyrus.infra.extendedtypes.emf.modifysemanticvaluesactionconfiguration.ModifySemanticValuesActionConfigurationPackage

  * @generated

  */

 public interface ModifySemanticValuesActionConfigurationFactory extends EFactory {

@@ -23,7 +23,7 @@ public interface ModifySemanticValuesActionConfigurationFactory extends EFactory
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

-	ModifySemanticValuesActionConfigurationFactory eINSTANCE = org.eclipse.papyrus.extendedtypes.emf.modifysemanticvaluesactionconfiguration.impl.ModifySemanticValuesActionConfigurationFactoryImpl.init();

+	ModifySemanticValuesActionConfigurationFactory eINSTANCE = org.eclipse.papyrus.infra.extendedtypes.emf.modifysemanticvaluesactionconfiguration.impl.ModifySemanticValuesActionConfigurationFactoryImpl.init();

 

 	/**

 	 * Returns a new object of class '<em>Modify Semantic Values Action Configuration</em>'.

diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/extendedtypes/emf/modifysemanticvaluesactionconfiguration/ModifySemanticValuesActionConfigurationPackage.java b/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/infra/extendedtypes/emf/modifysemanticvaluesactionconfiguration/ModifySemanticValuesActionConfigurationPackage.java
index e8e13811079..e69f4a020b0 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/extendedtypes/emf/modifysemanticvaluesactionconfiguration/ModifySemanticValuesActionConfigurationPackage.java
+++ b/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/infra/extendedtypes/emf/modifysemanticvaluesactionconfiguration/ModifySemanticValuesActionConfigurationPackage.java
@@ -4,14 +4,14 @@
  *

  * $Id$

  */

-package org.eclipse.papyrus.extendedtypes.emf.modifysemanticvaluesactionconfiguration;

+package org.eclipse.papyrus.infra.extendedtypes.emf.modifysemanticvaluesactionconfiguration;

 

 import org.eclipse.emf.ecore.EAttribute;

 import org.eclipse.emf.ecore.EClass;

 import org.eclipse.emf.ecore.EPackage;

 import org.eclipse.emf.ecore.EReference;

 

-import org.eclipse.papyrus.extendedtypes.ExtendedtypesPackage;

+import org.eclipse.papyrus.infra.extendedtypes.ExtendedtypesPackage;

 

 /**

  * <!-- begin-user-doc -->

@@ -24,7 +24,7 @@ import org.eclipse.papyrus.extendedtypes.ExtendedtypesPackage;
  *   <li>and each data type</li>

  * </ul>

  * <!-- end-user-doc -->

- * @see org.eclipse.papyrus.extendedtypes.emf.modifysemanticvaluesactionconfiguration.ModifySemanticValuesActionConfigurationFactory

+ * @see org.eclipse.papyrus.infra.extendedtypes.emf.modifysemanticvaluesactionconfiguration.ModifySemanticValuesActionConfigurationFactory

  * @model kind="package"

  * @generated

  */

@@ -59,14 +59,14 @@ public interface ModifySemanticValuesActionConfigurationPackage extends EPackage
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

-	ModifySemanticValuesActionConfigurationPackage eINSTANCE = org.eclipse.papyrus.extendedtypes.emf.modifysemanticvaluesactionconfiguration.impl.ModifySemanticValuesActionConfigurationPackageImpl.init();

+	ModifySemanticValuesActionConfigurationPackage eINSTANCE = org.eclipse.papyrus.infra.extendedtypes.emf.modifysemanticvaluesactionconfiguration.impl.ModifySemanticValuesActionConfigurationPackageImpl.init();

 

 	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.extendedtypes.emf.modifysemanticvaluesactionconfiguration.impl.ModifySemanticValuesActionConfigurationImpl <em>Modify Semantic Values Action Configuration</em>}' class.

+	 * The meta object id for the '{@link org.eclipse.papyrus.infra.extendedtypes.emf.modifysemanticvaluesactionconfiguration.impl.ModifySemanticValuesActionConfigurationImpl <em>Modify Semantic Values Action Configuration</em>}' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * @see org.eclipse.papyrus.extendedtypes.emf.modifysemanticvaluesactionconfiguration.impl.ModifySemanticValuesActionConfigurationImpl

-	 * @see org.eclipse.papyrus.extendedtypes.emf.modifysemanticvaluesactionconfiguration.impl.ModifySemanticValuesActionConfigurationPackageImpl#getModifySemanticValuesActionConfiguration()

+	 * @see org.eclipse.papyrus.infra.extendedtypes.emf.modifysemanticvaluesactionconfiguration.impl.ModifySemanticValuesActionConfigurationImpl

+	 * @see org.eclipse.papyrus.infra.extendedtypes.emf.modifysemanticvaluesactionconfiguration.impl.ModifySemanticValuesActionConfigurationPackageImpl#getModifySemanticValuesActionConfiguration()

 	 * @generated

 	 */

 	int MODIFY_SEMANTIC_VALUES_ACTION_CONFIGURATION = 0;

@@ -108,11 +108,11 @@ public interface ModifySemanticValuesActionConfigurationPackage extends EPackage
 	int MODIFY_SEMANTIC_VALUES_ACTION_CONFIGURATION_FEATURE_COUNT = ExtendedtypesPackage.POST_ACTION_CONFIGURATION_FEATURE_COUNT + 1;

 

 	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.extendedtypes.emf.modifysemanticvaluesactionconfiguration.impl.FeatureToSetImpl <em>Feature To Set</em>}' class.

+	 * The meta object id for the '{@link org.eclipse.papyrus.infra.extendedtypes.emf.modifysemanticvaluesactionconfiguration.impl.FeatureToSetImpl <em>Feature To Set</em>}' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * @see org.eclipse.papyrus.extendedtypes.emf.modifysemanticvaluesactionconfiguration.impl.FeatureToSetImpl

-	 * @see org.eclipse.papyrus.extendedtypes.emf.modifysemanticvaluesactionconfiguration.impl.ModifySemanticValuesActionConfigurationPackageImpl#getFeatureToSet()

+	 * @see org.eclipse.papyrus.infra.extendedtypes.emf.modifysemanticvaluesactionconfiguration.impl.FeatureToSetImpl

+	 * @see org.eclipse.papyrus.infra.extendedtypes.emf.modifysemanticvaluesactionconfiguration.impl.ModifySemanticValuesActionConfigurationPackageImpl#getFeatureToSet()

 	 * @generated

 	 */

 	int FEATURE_TO_SET = 1;

@@ -145,11 +145,11 @@ public interface ModifySemanticValuesActionConfigurationPackage extends EPackage
 	int FEATURE_TO_SET_FEATURE_COUNT = 2;

 

 	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.extendedtypes.emf.modifysemanticvaluesactionconfiguration.impl.FeatureValueImpl <em>Feature Value</em>}' class.

+	 * The meta object id for the '{@link org.eclipse.papyrus.infra.extendedtypes.emf.modifysemanticvaluesactionconfiguration.impl.FeatureValueImpl <em>Feature Value</em>}' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * @see org.eclipse.papyrus.extendedtypes.emf.modifysemanticvaluesactionconfiguration.impl.FeatureValueImpl

-	 * @see org.eclipse.papyrus.extendedtypes.emf.modifysemanticvaluesactionconfiguration.impl.ModifySemanticValuesActionConfigurationPackageImpl#getFeatureValue()

+	 * @see org.eclipse.papyrus.infra.extendedtypes.emf.modifysemanticvaluesactionconfiguration.impl.FeatureValueImpl

+	 * @see org.eclipse.papyrus.infra.extendedtypes.emf.modifysemanticvaluesactionconfiguration.impl.ModifySemanticValuesActionConfigurationPackageImpl#getFeatureValue()

 	 * @generated

 	 */

 	int FEATURE_VALUE = 2;

@@ -164,11 +164,11 @@ public interface ModifySemanticValuesActionConfigurationPackage extends EPackage
 	int FEATURE_VALUE_FEATURE_COUNT = 0;

 

 	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.extendedtypes.emf.modifysemanticvaluesactionconfiguration.impl.DynamicValueImpl <em>Dynamic Value</em>}' class.

+	 * The meta object id for the '{@link org.eclipse.papyrus.infra.extendedtypes.emf.modifysemanticvaluesactionconfiguration.impl.DynamicValueImpl <em>Dynamic Value</em>}' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * @see org.eclipse.papyrus.extendedtypes.emf.modifysemanticvaluesactionconfiguration.impl.DynamicValueImpl

-	 * @see org.eclipse.papyrus.extendedtypes.emf.modifysemanticvaluesactionconfiguration.impl.ModifySemanticValuesActionConfigurationPackageImpl#getDynamicValue()

+	 * @see org.eclipse.papyrus.infra.extendedtypes.emf.modifysemanticvaluesactionconfiguration.impl.DynamicValueImpl

+	 * @see org.eclipse.papyrus.infra.extendedtypes.emf.modifysemanticvaluesactionconfiguration.impl.ModifySemanticValuesActionConfigurationPackageImpl#getDynamicValue()

 	 * @generated

 	 */

 	int DYNAMIC_VALUE = 3;

@@ -183,11 +183,11 @@ public interface ModifySemanticValuesActionConfigurationPackage extends EPackage
 	int DYNAMIC_VALUE_FEATURE_COUNT = FEATURE_VALUE_FEATURE_COUNT + 0;

 

 	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.extendedtypes.emf.modifysemanticvaluesactionconfiguration.impl.ConstantValueImpl <em>Constant Value</em>}' class.

+	 * The meta object id for the '{@link org.eclipse.papyrus.infra.extendedtypes.emf.modifysemanticvaluesactionconfiguration.impl.ConstantValueImpl <em>Constant Value</em>}' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * @see org.eclipse.papyrus.extendedtypes.emf.modifysemanticvaluesactionconfiguration.impl.ConstantValueImpl

-	 * @see org.eclipse.papyrus.extendedtypes.emf.modifysemanticvaluesactionconfiguration.impl.ModifySemanticValuesActionConfigurationPackageImpl#getConstantValue()

+	 * @see org.eclipse.papyrus.infra.extendedtypes.emf.modifysemanticvaluesactionconfiguration.impl.ConstantValueImpl

+	 * @see org.eclipse.papyrus.infra.extendedtypes.emf.modifysemanticvaluesactionconfiguration.impl.ModifySemanticValuesActionConfigurationPackageImpl#getConstantValue()

 	 * @generated

 	 */

 	int CONSTANT_VALUE = 4;

@@ -211,11 +211,11 @@ public interface ModifySemanticValuesActionConfigurationPackage extends EPackage
 	int CONSTANT_VALUE_FEATURE_COUNT = FEATURE_VALUE_FEATURE_COUNT + 1;

 

 	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.extendedtypes.emf.modifysemanticvaluesactionconfiguration.impl.ListValueImpl <em>List Value</em>}' class.

+	 * The meta object id for the '{@link org.eclipse.papyrus.infra.extendedtypes.emf.modifysemanticvaluesactionconfiguration.impl.ListValueImpl <em>List Value</em>}' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * @see org.eclipse.papyrus.extendedtypes.emf.modifysemanticvaluesactionconfiguration.impl.ListValueImpl

-	 * @see org.eclipse.papyrus.extendedtypes.emf.modifysemanticvaluesactionconfiguration.impl.ModifySemanticValuesActionConfigurationPackageImpl#getListValue()

+	 * @see org.eclipse.papyrus.infra.extendedtypes.emf.modifysemanticvaluesactionconfiguration.impl.ListValueImpl

+	 * @see org.eclipse.papyrus.infra.extendedtypes.emf.modifysemanticvaluesactionconfiguration.impl.ModifySemanticValuesActionConfigurationPackageImpl#getListValue()

 	 * @generated

 	 */

 	int LIST_VALUE = 5;

@@ -239,11 +239,11 @@ public interface ModifySemanticValuesActionConfigurationPackage extends EPackage
 	int LIST_VALUE_FEATURE_COUNT = FEATURE_VALUE_FEATURE_COUNT + 1;

 

 	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.extendedtypes.emf.modifysemanticvaluesactionconfiguration.impl.QueryExecutionValueImpl <em>Query Execution Value</em>}' class.

+	 * The meta object id for the '{@link org.eclipse.papyrus.infra.extendedtypes.emf.modifysemanticvaluesactionconfiguration.impl.QueryExecutionValueImpl <em>Query Execution Value</em>}' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * @see org.eclipse.papyrus.extendedtypes.emf.modifysemanticvaluesactionconfiguration.impl.QueryExecutionValueImpl

-	 * @see org.eclipse.papyrus.extendedtypes.emf.modifysemanticvaluesactionconfiguration.impl.ModifySemanticValuesActionConfigurationPackageImpl#getQueryExecutionValue()

+	 * @see org.eclipse.papyrus.infra.extendedtypes.emf.modifysemanticvaluesactionconfiguration.impl.QueryExecutionValueImpl

+	 * @see org.eclipse.papyrus.infra.extendedtypes.emf.modifysemanticvaluesactionconfiguration.impl.ModifySemanticValuesActionConfigurationPackageImpl#getQueryExecutionValue()

 	 * @generated

 	 */

 	int QUERY_EXECUTION_VALUE = 6;

@@ -268,136 +268,136 @@ public interface ModifySemanticValuesActionConfigurationPackage extends EPackage
 

 

 	/**

-	 * Returns the meta object for class '{@link org.eclipse.papyrus.extendedtypes.emf.modifysemanticvaluesactionconfiguration.ModifySemanticValuesActionConfiguration <em>Modify Semantic Values Action Configuration</em>}'.

+	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.extendedtypes.emf.modifysemanticvaluesactionconfiguration.ModifySemanticValuesActionConfiguration <em>Modify Semantic Values Action Configuration</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

 	 * @return the meta object for class '<em>Modify Semantic Values Action Configuration</em>'.

-	 * @see org.eclipse.papyrus.extendedtypes.emf.modifysemanticvaluesactionconfiguration.ModifySemanticValuesActionConfiguration

+	 * @see org.eclipse.papyrus.infra.extendedtypes.emf.modifysemanticvaluesactionconfiguration.ModifySemanticValuesActionConfiguration

 	 * @generated

 	 */

 	EClass getModifySemanticValuesActionConfiguration();

 

 	/**

-	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.extendedtypes.emf.modifysemanticvaluesactionconfiguration.ModifySemanticValuesActionConfiguration#getFeaturesToSet <em>Features To Set</em>}'.

+	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.infra.extendedtypes.emf.modifysemanticvaluesactionconfiguration.ModifySemanticValuesActionConfiguration#getFeaturesToSet <em>Features To Set</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

 	 * @return the meta object for the containment reference list '<em>Features To Set</em>'.

-	 * @see org.eclipse.papyrus.extendedtypes.emf.modifysemanticvaluesactionconfiguration.ModifySemanticValuesActionConfiguration#getFeaturesToSet()

+	 * @see org.eclipse.papyrus.infra.extendedtypes.emf.modifysemanticvaluesactionconfiguration.ModifySemanticValuesActionConfiguration#getFeaturesToSet()

 	 * @see #getModifySemanticValuesActionConfiguration()

 	 * @generated

 	 */

 	EReference getModifySemanticValuesActionConfiguration_FeaturesToSet();

 

 	/**

-	 * Returns the meta object for class '{@link org.eclipse.papyrus.extendedtypes.emf.modifysemanticvaluesactionconfiguration.FeatureToSet <em>Feature To Set</em>}'.

+	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.extendedtypes.emf.modifysemanticvaluesactionconfiguration.FeatureToSet <em>Feature To Set</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

 	 * @return the meta object for class '<em>Feature To Set</em>'.

-	 * @see org.eclipse.papyrus.extendedtypes.emf.modifysemanticvaluesactionconfiguration.FeatureToSet

+	 * @see org.eclipse.papyrus.infra.extendedtypes.emf.modifysemanticvaluesactionconfiguration.FeatureToSet

 	 * @generated

 	 */

 	EClass getFeatureToSet();

 

 	/**

-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.extendedtypes.emf.modifysemanticvaluesactionconfiguration.FeatureToSet#getFeatureName <em>Feature Name</em>}'.

+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.extendedtypes.emf.modifysemanticvaluesactionconfiguration.FeatureToSet#getFeatureName <em>Feature Name</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

 	 * @return the meta object for the attribute '<em>Feature Name</em>'.

-	 * @see org.eclipse.papyrus.extendedtypes.emf.modifysemanticvaluesactionconfiguration.FeatureToSet#getFeatureName()

+	 * @see org.eclipse.papyrus.infra.extendedtypes.emf.modifysemanticvaluesactionconfiguration.FeatureToSet#getFeatureName()

 	 * @see #getFeatureToSet()

 	 * @generated

 	 */

 	EAttribute getFeatureToSet_FeatureName();

 

 	/**

-	 * Returns the meta object for the containment reference '{@link org.eclipse.papyrus.extendedtypes.emf.modifysemanticvaluesactionconfiguration.FeatureToSet#getValue <em>Value</em>}'.

+	 * Returns the meta object for the containment reference '{@link org.eclipse.papyrus.infra.extendedtypes.emf.modifysemanticvaluesactionconfiguration.FeatureToSet#getValue <em>Value</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

 	 * @return the meta object for the containment reference '<em>Value</em>'.

-	 * @see org.eclipse.papyrus.extendedtypes.emf.modifysemanticvaluesactionconfiguration.FeatureToSet#getValue()

+	 * @see org.eclipse.papyrus.infra.extendedtypes.emf.modifysemanticvaluesactionconfiguration.FeatureToSet#getValue()

 	 * @see #getFeatureToSet()

 	 * @generated

 	 */

 	EReference getFeatureToSet_Value();

 

 	/**

-	 * Returns the meta object for class '{@link org.eclipse.papyrus.extendedtypes.emf.modifysemanticvaluesactionconfiguration.FeatureValue <em>Feature Value</em>}'.

+	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.extendedtypes.emf.modifysemanticvaluesactionconfiguration.FeatureValue <em>Feature Value</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

 	 * @return the meta object for class '<em>Feature Value</em>'.

-	 * @see org.eclipse.papyrus.extendedtypes.emf.modifysemanticvaluesactionconfiguration.FeatureValue

+	 * @see org.eclipse.papyrus.infra.extendedtypes.emf.modifysemanticvaluesactionconfiguration.FeatureValue

 	 * @generated

 	 */

 	EClass getFeatureValue();

 

 	/**

-	 * Returns the meta object for class '{@link org.eclipse.papyrus.extendedtypes.emf.modifysemanticvaluesactionconfiguration.DynamicValue <em>Dynamic Value</em>}'.

+	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.extendedtypes.emf.modifysemanticvaluesactionconfiguration.DynamicValue <em>Dynamic Value</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

 	 * @return the meta object for class '<em>Dynamic Value</em>'.

-	 * @see org.eclipse.papyrus.extendedtypes.emf.modifysemanticvaluesactionconfiguration.DynamicValue

+	 * @see org.eclipse.papyrus.infra.extendedtypes.emf.modifysemanticvaluesactionconfiguration.DynamicValue

 	 * @generated

 	 */

 	EClass getDynamicValue();

 

 	/**

-	 * Returns the meta object for class '{@link org.eclipse.papyrus.extendedtypes.emf.modifysemanticvaluesactionconfiguration.ConstantValue <em>Constant Value</em>}'.

+	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.extendedtypes.emf.modifysemanticvaluesactionconfiguration.ConstantValue <em>Constant Value</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

 	 * @return the meta object for class '<em>Constant Value</em>'.

-	 * @see org.eclipse.papyrus.extendedtypes.emf.modifysemanticvaluesactionconfiguration.ConstantValue

+	 * @see org.eclipse.papyrus.infra.extendedtypes.emf.modifysemanticvaluesactionconfiguration.ConstantValue

 	 * @generated

 	 */

 	EClass getConstantValue();

 

 	/**

-	 * Returns the meta object for the containment reference '{@link org.eclipse.papyrus.extendedtypes.emf.modifysemanticvaluesactionconfiguration.ConstantValue#getValueInstance <em>Value Instance</em>}'.

+	 * Returns the meta object for the containment reference '{@link org.eclipse.papyrus.infra.extendedtypes.emf.modifysemanticvaluesactionconfiguration.ConstantValue#getValueInstance <em>Value Instance</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

 	 * @return the meta object for the containment reference '<em>Value Instance</em>'.

-	 * @see org.eclipse.papyrus.extendedtypes.emf.modifysemanticvaluesactionconfiguration.ConstantValue#getValueInstance()

+	 * @see org.eclipse.papyrus.infra.extendedtypes.emf.modifysemanticvaluesactionconfiguration.ConstantValue#getValueInstance()

 	 * @see #getConstantValue()

 	 * @generated

 	 */

 	EReference getConstantValue_ValueInstance();

 

 	/**

-	 * Returns the meta object for class '{@link org.eclipse.papyrus.extendedtypes.emf.modifysemanticvaluesactionconfiguration.ListValue <em>List Value</em>}'.

+	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.extendedtypes.emf.modifysemanticvaluesactionconfiguration.ListValue <em>List Value</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

 	 * @return the meta object for class '<em>List Value</em>'.

-	 * @see org.eclipse.papyrus.extendedtypes.emf.modifysemanticvaluesactionconfiguration.ListValue

+	 * @see org.eclipse.papyrus.infra.extendedtypes.emf.modifysemanticvaluesactionconfiguration.ListValue

 	 * @generated

 	 */

 	EClass getListValue();

 

 	/**

-	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.extendedtypes.emf.modifysemanticvaluesactionconfiguration.ListValue#getValues <em>Values</em>}'.

+	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.infra.extendedtypes.emf.modifysemanticvaluesactionconfiguration.ListValue#getValues <em>Values</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

 	 * @return the meta object for the reference list '<em>Values</em>'.

-	 * @see org.eclipse.papyrus.extendedtypes.emf.modifysemanticvaluesactionconfiguration.ListValue#getValues()

+	 * @see org.eclipse.papyrus.infra.extendedtypes.emf.modifysemanticvaluesactionconfiguration.ListValue#getValues()

 	 * @see #getListValue()

 	 * @generated

 	 */

 	EReference getListValue_Values();

 

 	/**

-	 * Returns the meta object for class '{@link org.eclipse.papyrus.extendedtypes.emf.modifysemanticvaluesactionconfiguration.QueryExecutionValue <em>Query Execution Value</em>}'.

+	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.extendedtypes.emf.modifysemanticvaluesactionconfiguration.QueryExecutionValue <em>Query Execution Value</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

 	 * @return the meta object for class '<em>Query Execution Value</em>'.

-	 * @see org.eclipse.papyrus.extendedtypes.emf.modifysemanticvaluesactionconfiguration.QueryExecutionValue

+	 * @see org.eclipse.papyrus.infra.extendedtypes.emf.modifysemanticvaluesactionconfiguration.QueryExecutionValue

 	 * @generated

 	 */

 	EClass getQueryExecutionValue();

 

 	/**

-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.extendedtypes.emf.modifysemanticvaluesactionconfiguration.QueryExecutionValue#getConfiguration <em>Configuration</em>}'.

+	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.infra.extendedtypes.emf.modifysemanticvaluesactionconfiguration.QueryExecutionValue#getConfiguration <em>Configuration</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

 	 * @return the meta object for the reference '<em>Configuration</em>'.

-	 * @see org.eclipse.papyrus.extendedtypes.emf.modifysemanticvaluesactionconfiguration.QueryExecutionValue#getConfiguration()

+	 * @see org.eclipse.papyrus.infra.extendedtypes.emf.modifysemanticvaluesactionconfiguration.QueryExecutionValue#getConfiguration()

 	 * @see #getQueryExecutionValue()

 	 * @generated

 	 */

@@ -426,11 +426,11 @@ public interface ModifySemanticValuesActionConfigurationPackage extends EPackage
 	 */

 	interface Literals {

 		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.extendedtypes.emf.modifysemanticvaluesactionconfiguration.impl.ModifySemanticValuesActionConfigurationImpl <em>Modify Semantic Values Action Configuration</em>}' class.

+		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.extendedtypes.emf.modifysemanticvaluesactionconfiguration.impl.ModifySemanticValuesActionConfigurationImpl <em>Modify Semantic Values Action Configuration</em>}' class.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 * @see org.eclipse.papyrus.extendedtypes.emf.modifysemanticvaluesactionconfiguration.impl.ModifySemanticValuesActionConfigurationImpl

-		 * @see org.eclipse.papyrus.extendedtypes.emf.modifysemanticvaluesactionconfiguration.impl.ModifySemanticValuesActionConfigurationPackageImpl#getModifySemanticValuesActionConfiguration()

+		 * @see org.eclipse.papyrus.infra.extendedtypes.emf.modifysemanticvaluesactionconfiguration.impl.ModifySemanticValuesActionConfigurationImpl

+		 * @see org.eclipse.papyrus.infra.extendedtypes.emf.modifysemanticvaluesactionconfiguration.impl.ModifySemanticValuesActionConfigurationPackageImpl#getModifySemanticValuesActionConfiguration()

 		 * @generated

 		 */

 		EClass MODIFY_SEMANTIC_VALUES_ACTION_CONFIGURATION = eINSTANCE.getModifySemanticValuesActionConfiguration();

@@ -444,11 +444,11 @@ public interface ModifySemanticValuesActionConfigurationPackage extends EPackage
 		EReference MODIFY_SEMANTIC_VALUES_ACTION_CONFIGURATION__FEATURES_TO_SET = eINSTANCE.getModifySemanticValuesActionConfiguration_FeaturesToSet();

 

 		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.extendedtypes.emf.modifysemanticvaluesactionconfiguration.impl.FeatureToSetImpl <em>Feature To Set</em>}' class.

+		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.extendedtypes.emf.modifysemanticvaluesactionconfiguration.impl.FeatureToSetImpl <em>Feature To Set</em>}' class.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 * @see org.eclipse.papyrus.extendedtypes.emf.modifysemanticvaluesactionconfiguration.impl.FeatureToSetImpl

-		 * @see org.eclipse.papyrus.extendedtypes.emf.modifysemanticvaluesactionconfiguration.impl.ModifySemanticValuesActionConfigurationPackageImpl#getFeatureToSet()

+		 * @see org.eclipse.papyrus.infra.extendedtypes.emf.modifysemanticvaluesactionconfiguration.impl.FeatureToSetImpl

+		 * @see org.eclipse.papyrus.infra.extendedtypes.emf.modifysemanticvaluesactionconfiguration.impl.ModifySemanticValuesActionConfigurationPackageImpl#getFeatureToSet()

 		 * @generated

 		 */

 		EClass FEATURE_TO_SET = eINSTANCE.getFeatureToSet();

@@ -470,31 +470,31 @@ public interface ModifySemanticValuesActionConfigurationPackage extends EPackage
 		EReference FEATURE_TO_SET__VALUE = eINSTANCE.getFeatureToSet_Value();

 

 		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.extendedtypes.emf.modifysemanticvaluesactionconfiguration.impl.FeatureValueImpl <em>Feature Value</em>}' class.

+		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.extendedtypes.emf.modifysemanticvaluesactionconfiguration.impl.FeatureValueImpl <em>Feature Value</em>}' class.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 * @see org.eclipse.papyrus.extendedtypes.emf.modifysemanticvaluesactionconfiguration.impl.FeatureValueImpl

-		 * @see org.eclipse.papyrus.extendedtypes.emf.modifysemanticvaluesactionconfiguration.impl.ModifySemanticValuesActionConfigurationPackageImpl#getFeatureValue()

+		 * @see org.eclipse.papyrus.infra.extendedtypes.emf.modifysemanticvaluesactionconfiguration.impl.FeatureValueImpl

+		 * @see org.eclipse.papyrus.infra.extendedtypes.emf.modifysemanticvaluesactionconfiguration.impl.ModifySemanticValuesActionConfigurationPackageImpl#getFeatureValue()

 		 * @generated

 		 */

 		EClass FEATURE_VALUE = eINSTANCE.getFeatureValue();

 

 		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.extendedtypes.emf.modifysemanticvaluesactionconfiguration.impl.DynamicValueImpl <em>Dynamic Value</em>}' class.

+		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.extendedtypes.emf.modifysemanticvaluesactionconfiguration.impl.DynamicValueImpl <em>Dynamic Value</em>}' class.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 * @see org.eclipse.papyrus.extendedtypes.emf.modifysemanticvaluesactionconfiguration.impl.DynamicValueImpl

-		 * @see org.eclipse.papyrus.extendedtypes.emf.modifysemanticvaluesactionconfiguration.impl.ModifySemanticValuesActionConfigurationPackageImpl#getDynamicValue()

+		 * @see org.eclipse.papyrus.infra.extendedtypes.emf.modifysemanticvaluesactionconfiguration.impl.DynamicValueImpl

+		 * @see org.eclipse.papyrus.infra.extendedtypes.emf.modifysemanticvaluesactionconfiguration.impl.ModifySemanticValuesActionConfigurationPackageImpl#getDynamicValue()

 		 * @generated

 		 */

 		EClass DYNAMIC_VALUE = eINSTANCE.getDynamicValue();

 

 		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.extendedtypes.emf.modifysemanticvaluesactionconfiguration.impl.ConstantValueImpl <em>Constant Value</em>}' class.

+		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.extendedtypes.emf.modifysemanticvaluesactionconfiguration.impl.ConstantValueImpl <em>Constant Value</em>}' class.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 * @see org.eclipse.papyrus.extendedtypes.emf.modifysemanticvaluesactionconfiguration.impl.ConstantValueImpl

-		 * @see org.eclipse.papyrus.extendedtypes.emf.modifysemanticvaluesactionconfiguration.impl.ModifySemanticValuesActionConfigurationPackageImpl#getConstantValue()

+		 * @see org.eclipse.papyrus.infra.extendedtypes.emf.modifysemanticvaluesactionconfiguration.impl.ConstantValueImpl

+		 * @see org.eclipse.papyrus.infra.extendedtypes.emf.modifysemanticvaluesactionconfiguration.impl.ModifySemanticValuesActionConfigurationPackageImpl#getConstantValue()

 		 * @generated

 		 */

 		EClass CONSTANT_VALUE = eINSTANCE.getConstantValue();

@@ -508,11 +508,11 @@ public interface ModifySemanticValuesActionConfigurationPackage extends EPackage
 		EReference CONSTANT_VALUE__VALUE_INSTANCE = eINSTANCE.getConstantValue_ValueInstance();

 

 		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.extendedtypes.emf.modifysemanticvaluesactionconfiguration.impl.ListValueImpl <em>List Value</em>}' class.

+		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.extendedtypes.emf.modifysemanticvaluesactionconfiguration.impl.ListValueImpl <em>List Value</em>}' class.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 * @see org.eclipse.papyrus.extendedtypes.emf.modifysemanticvaluesactionconfiguration.impl.ListValueImpl

-		 * @see org.eclipse.papyrus.extendedtypes.emf.modifysemanticvaluesactionconfiguration.impl.ModifySemanticValuesActionConfigurationPackageImpl#getListValue()

+		 * @see org.eclipse.papyrus.infra.extendedtypes.emf.modifysemanticvaluesactionconfiguration.impl.ListValueImpl

+		 * @see org.eclipse.papyrus.infra.extendedtypes.emf.modifysemanticvaluesactionconfiguration.impl.ModifySemanticValuesActionConfigurationPackageImpl#getListValue()

 		 * @generated

 		 */

 		EClass LIST_VALUE = eINSTANCE.getListValue();

@@ -526,11 +526,11 @@ public interface ModifySemanticValuesActionConfigurationPackage extends EPackage
 		EReference LIST_VALUE__VALUES = eINSTANCE.getListValue_Values();

 

 		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.extendedtypes.emf.modifysemanticvaluesactionconfiguration.impl.QueryExecutionValueImpl <em>Query Execution Value</em>}' class.

+		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.extendedtypes.emf.modifysemanticvaluesactionconfiguration.impl.QueryExecutionValueImpl <em>Query Execution Value</em>}' class.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 * @see org.eclipse.papyrus.extendedtypes.emf.modifysemanticvaluesactionconfiguration.impl.QueryExecutionValueImpl

-		 * @see org.eclipse.papyrus.extendedtypes.emf.modifysemanticvaluesactionconfiguration.impl.ModifySemanticValuesActionConfigurationPackageImpl#getQueryExecutionValue()

+		 * @see org.eclipse.papyrus.infra.extendedtypes.emf.modifysemanticvaluesactionconfiguration.impl.QueryExecutionValueImpl

+		 * @see org.eclipse.papyrus.infra.extendedtypes.emf.modifysemanticvaluesactionconfiguration.impl.ModifySemanticValuesActionConfigurationPackageImpl#getQueryExecutionValue()

 		 * @generated

 		 */

 		EClass QUERY_EXECUTION_VALUE = eINSTANCE.getQueryExecutionValue();

diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/extendedtypes/emf/modifysemanticvaluesactionconfiguration/QueryExecutionValue.java b/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/infra/extendedtypes/emf/modifysemanticvaluesactionconfiguration/QueryExecutionValue.java
index e6932cd3bde..60c3ee93a61 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/extendedtypes/emf/modifysemanticvaluesactionconfiguration/QueryExecutionValue.java
+++ b/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/infra/extendedtypes/emf/modifysemanticvaluesactionconfiguration/QueryExecutionValue.java
@@ -4,9 +4,9 @@
  *

  * $Id$

  */

-package org.eclipse.papyrus.extendedtypes.emf.modifysemanticvaluesactionconfiguration;

+package org.eclipse.papyrus.infra.extendedtypes.emf.modifysemanticvaluesactionconfiguration;

 

-import org.eclipse.papyrus.core.queries.configuration.QueryConfiguration;

+import org.eclipse.papyrus.infra.queries.core.configuration.QueryConfiguration;

 

 /**

  * <!-- begin-user-doc -->

@@ -16,11 +16,11 @@ import org.eclipse.papyrus.core.queries.configuration.QueryConfiguration;
  * <p>

  * The following features are supported:

  * <ul>

- *   <li>{@link org.eclipse.papyrus.extendedtypes.emf.modifysemanticvaluesactionconfiguration.QueryExecutionValue#getConfiguration <em>Configuration</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.infra.extendedtypes.emf.modifysemanticvaluesactionconfiguration.QueryExecutionValue#getConfiguration <em>Configuration</em>}</li>

  * </ul>

  * </p>

  *

- * @see org.eclipse.papyrus.extendedtypes.emf.modifysemanticvaluesactionconfiguration.ModifySemanticValuesActionConfigurationPackage#getQueryExecutionValue()

+ * @see org.eclipse.papyrus.infra.extendedtypes.emf.modifysemanticvaluesactionconfiguration.ModifySemanticValuesActionConfigurationPackage#getQueryExecutionValue()

  * @model

  * @generated

  */

@@ -35,14 +35,14 @@ public interface QueryExecutionValue extends FeatureValue {
 	 * <!-- end-user-doc -->

 	 * @return the value of the '<em>Configuration</em>' reference.

 	 * @see #setConfiguration(QueryConfiguration)

-	 * @see org.eclipse.papyrus.extendedtypes.emf.modifysemanticvaluesactionconfiguration.ModifySemanticValuesActionConfigurationPackage#getQueryExecutionValue_Configuration()

+	 * @see org.eclipse.papyrus.infra.extendedtypes.emf.modifysemanticvaluesactionconfiguration.ModifySemanticValuesActionConfigurationPackage#getQueryExecutionValue_Configuration()

 	 * @model

 	 * @generated

 	 */

 	QueryConfiguration getConfiguration();

 

 	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.extendedtypes.emf.modifysemanticvaluesactionconfiguration.QueryExecutionValue#getConfiguration <em>Configuration</em>}' reference.

+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.extendedtypes.emf.modifysemanticvaluesactionconfiguration.QueryExecutionValue#getConfiguration <em>Configuration</em>}' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

 	 * @param value the new value of the '<em>Configuration</em>' reference.

diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/extendedtypes/emf/modifysemanticvaluesactionconfiguration/impl/ConstantValueImpl.java b/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/infra/extendedtypes/emf/modifysemanticvaluesactionconfiguration/impl/ConstantValueImpl.java
index f2e1fab1bc2..b6c6683c8fc 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/extendedtypes/emf/modifysemanticvaluesactionconfiguration/impl/ConstantValueImpl.java
+++ b/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/infra/extendedtypes/emf/modifysemanticvaluesactionconfiguration/impl/ConstantValueImpl.java
@@ -4,7 +4,7 @@
  *

  * $Id$

  */

-package org.eclipse.papyrus.extendedtypes.emf.modifysemanticvaluesactionconfiguration.impl;

+package org.eclipse.papyrus.infra.extendedtypes.emf.modifysemanticvaluesactionconfiguration.impl;

 

 import org.eclipse.emf.common.notify.Notification;

 import org.eclipse.emf.common.notify.NotificationChain;

@@ -14,8 +14,8 @@ import org.eclipse.emf.ecore.InternalEObject;
 

 import org.eclipse.emf.ecore.impl.ENotificationImpl;

 

-import org.eclipse.papyrus.extendedtypes.emf.modifysemanticvaluesactionconfiguration.ConstantValue;

-import org.eclipse.papyrus.extendedtypes.emf.modifysemanticvaluesactionconfiguration.ModifySemanticValuesActionConfigurationPackage;

+import org.eclipse.papyrus.infra.extendedtypes.emf.modifysemanticvaluesactionconfiguration.ConstantValue;

+import org.eclipse.papyrus.infra.extendedtypes.emf.modifysemanticvaluesactionconfiguration.ModifySemanticValuesActionConfigurationPackage;

 

 import org.eclipse.uml2.uml.ValueSpecification;

 

@@ -26,7 +26,7 @@ import org.eclipse.uml2.uml.ValueSpecification;
  * <p>

  * The following features are implemented:

  * <ul>

- *   <li>{@link org.eclipse.papyrus.extendedtypes.emf.modifysemanticvaluesactionconfiguration.impl.ConstantValueImpl#getValueInstance <em>Value Instance</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.infra.extendedtypes.emf.modifysemanticvaluesactionconfiguration.impl.ConstantValueImpl#getValueInstance <em>Value Instance</em>}</li>

  * </ul>

  * </p>

  *

diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/extendedtypes/emf/modifysemanticvaluesactionconfiguration/impl/DynamicValueImpl.java b/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/infra/extendedtypes/emf/modifysemanticvaluesactionconfiguration/impl/DynamicValueImpl.java
index e6f23f25d7f..947f33547e8 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/extendedtypes/emf/modifysemanticvaluesactionconfiguration/impl/DynamicValueImpl.java
+++ b/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/infra/extendedtypes/emf/modifysemanticvaluesactionconfiguration/impl/DynamicValueImpl.java
@@ -4,12 +4,12 @@
  *

  * $Id$

  */

-package org.eclipse.papyrus.extendedtypes.emf.modifysemanticvaluesactionconfiguration.impl;

+package org.eclipse.papyrus.infra.extendedtypes.emf.modifysemanticvaluesactionconfiguration.impl;

 

 import org.eclipse.emf.ecore.EClass;

 

-import org.eclipse.papyrus.extendedtypes.emf.modifysemanticvaluesactionconfiguration.DynamicValue;

-import org.eclipse.papyrus.extendedtypes.emf.modifysemanticvaluesactionconfiguration.ModifySemanticValuesActionConfigurationPackage;

+import org.eclipse.papyrus.infra.extendedtypes.emf.modifysemanticvaluesactionconfiguration.DynamicValue;

+import org.eclipse.papyrus.infra.extendedtypes.emf.modifysemanticvaluesactionconfiguration.ModifySemanticValuesActionConfigurationPackage;

 

 /**

  * <!-- begin-user-doc -->

diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/extendedtypes/emf/modifysemanticvaluesactionconfiguration/impl/FeatureToSetImpl.java b/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/infra/extendedtypes/emf/modifysemanticvaluesactionconfiguration/impl/FeatureToSetImpl.java
index 54382a784c9..5a91323c5b6 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/extendedtypes/emf/modifysemanticvaluesactionconfiguration/impl/FeatureToSetImpl.java
+++ b/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/infra/extendedtypes/emf/modifysemanticvaluesactionconfiguration/impl/FeatureToSetImpl.java
@@ -4,7 +4,7 @@
  *

  * $Id$

  */

-package org.eclipse.papyrus.extendedtypes.emf.modifysemanticvaluesactionconfiguration.impl;

+package org.eclipse.papyrus.infra.extendedtypes.emf.modifysemanticvaluesactionconfiguration.impl;

 

 import org.eclipse.emf.common.notify.Notification;

 import org.eclipse.emf.common.notify.NotificationChain;

@@ -15,9 +15,9 @@ import org.eclipse.emf.ecore.InternalEObject;
 import org.eclipse.emf.ecore.impl.ENotificationImpl;

 import org.eclipse.emf.ecore.impl.EObjectImpl;

 

-import org.eclipse.papyrus.extendedtypes.emf.modifysemanticvaluesactionconfiguration.FeatureToSet;

-import org.eclipse.papyrus.extendedtypes.emf.modifysemanticvaluesactionconfiguration.FeatureValue;

-import org.eclipse.papyrus.extendedtypes.emf.modifysemanticvaluesactionconfiguration.ModifySemanticValuesActionConfigurationPackage;

+import org.eclipse.papyrus.infra.extendedtypes.emf.modifysemanticvaluesactionconfiguration.FeatureToSet;

+import org.eclipse.papyrus.infra.extendedtypes.emf.modifysemanticvaluesactionconfiguration.FeatureValue;

+import org.eclipse.papyrus.infra.extendedtypes.emf.modifysemanticvaluesactionconfiguration.ModifySemanticValuesActionConfigurationPackage;

 

 /**

  * <!-- begin-user-doc -->

@@ -26,8 +26,8 @@ import org.eclipse.papyrus.extendedtypes.emf.modifysemanticvaluesactionconfigura
  * <p>

  * The following features are implemented:

  * <ul>

- *   <li>{@link org.eclipse.papyrus.extendedtypes.emf.modifysemanticvaluesactionconfiguration.impl.FeatureToSetImpl#getFeatureName <em>Feature Name</em>}</li>

- *   <li>{@link org.eclipse.papyrus.extendedtypes.emf.modifysemanticvaluesactionconfiguration.impl.FeatureToSetImpl#getValue <em>Value</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.infra.extendedtypes.emf.modifysemanticvaluesactionconfiguration.impl.FeatureToSetImpl#getFeatureName <em>Feature Name</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.infra.extendedtypes.emf.modifysemanticvaluesactionconfiguration.impl.FeatureToSetImpl#getValue <em>Value</em>}</li>

  * </ul>

  * </p>

  *

diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/extendedtypes/emf/modifysemanticvaluesactionconfiguration/impl/FeatureValueImpl.java b/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/infra/extendedtypes/emf/modifysemanticvaluesactionconfiguration/impl/FeatureValueImpl.java
index 759fabeffea..14f25be6e05 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/extendedtypes/emf/modifysemanticvaluesactionconfiguration/impl/FeatureValueImpl.java
+++ b/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/infra/extendedtypes/emf/modifysemanticvaluesactionconfiguration/impl/FeatureValueImpl.java
@@ -4,14 +4,14 @@
  *

  * $Id$

  */

-package org.eclipse.papyrus.extendedtypes.emf.modifysemanticvaluesactionconfiguration.impl;

+package org.eclipse.papyrus.infra.extendedtypes.emf.modifysemanticvaluesactionconfiguration.impl;

 

 import org.eclipse.emf.ecore.EClass;

 

 import org.eclipse.emf.ecore.impl.EObjectImpl;

 

-import org.eclipse.papyrus.extendedtypes.emf.modifysemanticvaluesactionconfiguration.FeatureValue;

-import org.eclipse.papyrus.extendedtypes.emf.modifysemanticvaluesactionconfiguration.ModifySemanticValuesActionConfigurationPackage;

+import org.eclipse.papyrus.infra.extendedtypes.emf.modifysemanticvaluesactionconfiguration.FeatureValue;

+import org.eclipse.papyrus.infra.extendedtypes.emf.modifysemanticvaluesactionconfiguration.ModifySemanticValuesActionConfigurationPackage;

 

 /**

  * <!-- begin-user-doc -->

diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/extendedtypes/emf/modifysemanticvaluesactionconfiguration/impl/ListValueImpl.java b/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/infra/extendedtypes/emf/modifysemanticvaluesactionconfiguration/impl/ListValueImpl.java
index 4700b924396..87d157f600b 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/extendedtypes/emf/modifysemanticvaluesactionconfiguration/impl/ListValueImpl.java
+++ b/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/infra/extendedtypes/emf/modifysemanticvaluesactionconfiguration/impl/ListValueImpl.java
@@ -4,7 +4,7 @@
  *

  * $Id$

  */

-package org.eclipse.papyrus.extendedtypes.emf.modifysemanticvaluesactionconfiguration.impl;

+package org.eclipse.papyrus.infra.extendedtypes.emf.modifysemanticvaluesactionconfiguration.impl;

 

 import java.util.Collection;

 

@@ -14,9 +14,9 @@ import org.eclipse.emf.ecore.EClass;
 

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

 

-import org.eclipse.papyrus.extendedtypes.emf.modifysemanticvaluesactionconfiguration.FeatureValue;

-import org.eclipse.papyrus.extendedtypes.emf.modifysemanticvaluesactionconfiguration.ListValue;

-import org.eclipse.papyrus.extendedtypes.emf.modifysemanticvaluesactionconfiguration.ModifySemanticValuesActionConfigurationPackage;

+import org.eclipse.papyrus.infra.extendedtypes.emf.modifysemanticvaluesactionconfiguration.FeatureValue;

+import org.eclipse.papyrus.infra.extendedtypes.emf.modifysemanticvaluesactionconfiguration.ListValue;

+import org.eclipse.papyrus.infra.extendedtypes.emf.modifysemanticvaluesactionconfiguration.ModifySemanticValuesActionConfigurationPackage;

 

 /**

  * <!-- begin-user-doc -->

@@ -25,7 +25,7 @@ import org.eclipse.papyrus.extendedtypes.emf.modifysemanticvaluesactionconfigura
  * <p>

  * The following features are implemented:

  * <ul>

- *   <li>{@link org.eclipse.papyrus.extendedtypes.emf.modifysemanticvaluesactionconfiguration.impl.ListValueImpl#getValues <em>Values</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.infra.extendedtypes.emf.modifysemanticvaluesactionconfiguration.impl.ListValueImpl#getValues <em>Values</em>}</li>

  * </ul>

  * </p>

  *

diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/extendedtypes/emf/modifysemanticvaluesactionconfiguration/impl/ModifySemanticValuesActionConfigurationFactoryImpl.java b/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/infra/extendedtypes/emf/modifysemanticvaluesactionconfiguration/impl/ModifySemanticValuesActionConfigurationFactoryImpl.java
index 995fa344da8..0428ac0a226 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/extendedtypes/emf/modifysemanticvaluesactionconfiguration/impl/ModifySemanticValuesActionConfigurationFactoryImpl.java
+++ b/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/infra/extendedtypes/emf/modifysemanticvaluesactionconfiguration/impl/ModifySemanticValuesActionConfigurationFactoryImpl.java
@@ -4,7 +4,7 @@
  *

  * $Id$

  */

-package org.eclipse.papyrus.extendedtypes.emf.modifysemanticvaluesactionconfiguration.impl;

+package org.eclipse.papyrus.infra.extendedtypes.emf.modifysemanticvaluesactionconfiguration.impl;

 

 import org.eclipse.emf.ecore.EClass;

 import org.eclipse.emf.ecore.EObject;

@@ -14,7 +14,7 @@ import org.eclipse.emf.ecore.impl.EFactoryImpl;
 

 import org.eclipse.emf.ecore.plugin.EcorePlugin;

 

-import org.eclipse.papyrus.extendedtypes.emf.modifysemanticvaluesactionconfiguration.*;

+import org.eclipse.papyrus.infra.extendedtypes.emf.modifysemanticvaluesactionconfiguration.*;

 

 /**

  * <!-- begin-user-doc -->

diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/extendedtypes/emf/modifysemanticvaluesactionconfiguration/impl/ModifySemanticValuesActionConfigurationImpl.java b/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/infra/extendedtypes/emf/modifysemanticvaluesactionconfiguration/impl/ModifySemanticValuesActionConfigurationImpl.java
index 57a1504de91..0fca96c3f37 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/extendedtypes/emf/modifysemanticvaluesactionconfiguration/impl/ModifySemanticValuesActionConfigurationImpl.java
+++ b/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/infra/extendedtypes/emf/modifysemanticvaluesactionconfiguration/impl/ModifySemanticValuesActionConfigurationImpl.java
@@ -4,7 +4,7 @@
  *

  * $Id$

  */

-package org.eclipse.papyrus.extendedtypes.emf.modifysemanticvaluesactionconfiguration.impl;

+package org.eclipse.papyrus.infra.extendedtypes.emf.modifysemanticvaluesactionconfiguration.impl;

 

 import java.util.Collection;

 

@@ -18,11 +18,11 @@ import org.eclipse.emf.ecore.InternalEObject;
 import org.eclipse.emf.ecore.util.EObjectContainmentEList;

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

 

-import org.eclipse.papyrus.extendedtypes.emf.modifysemanticvaluesactionconfiguration.FeatureToSet;

-import org.eclipse.papyrus.extendedtypes.emf.modifysemanticvaluesactionconfiguration.ModifySemanticValuesActionConfiguration;

-import org.eclipse.papyrus.extendedtypes.emf.modifysemanticvaluesactionconfiguration.ModifySemanticValuesActionConfigurationPackage;

 

-import org.eclipse.papyrus.extendedtypes.impl.PostActionConfigurationImpl;

+import org.eclipse.papyrus.infra.extendedtypes.emf.modifysemanticvaluesactionconfiguration.FeatureToSet;

+import org.eclipse.papyrus.infra.extendedtypes.emf.modifysemanticvaluesactionconfiguration.ModifySemanticValuesActionConfiguration;

+import org.eclipse.papyrus.infra.extendedtypes.emf.modifysemanticvaluesactionconfiguration.ModifySemanticValuesActionConfigurationPackage;

+import org.eclipse.papyrus.infra.extendedtypes.impl.PostActionConfigurationImpl;

 

 /**

  * <!-- begin-user-doc -->

@@ -31,7 +31,7 @@ import org.eclipse.papyrus.extendedtypes.impl.PostActionConfigurationImpl;
  * <p>

  * The following features are implemented:

  * <ul>

- *   <li>{@link org.eclipse.papyrus.extendedtypes.emf.modifysemanticvaluesactionconfiguration.impl.ModifySemanticValuesActionConfigurationImpl#getFeaturesToSet <em>Features To Set</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.infra.extendedtypes.emf.modifysemanticvaluesactionconfiguration.impl.ModifySemanticValuesActionConfigurationImpl#getFeaturesToSet <em>Features To Set</em>}</li>

  * </ul>

  * </p>

  *

diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/extendedtypes/emf/modifysemanticvaluesactionconfiguration/impl/ModifySemanticValuesActionConfigurationPackageImpl.java b/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/infra/extendedtypes/emf/modifysemanticvaluesactionconfiguration/impl/ModifySemanticValuesActionConfigurationPackageImpl.java
index 7b19a41c6ab..ebb557aab5b 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/extendedtypes/emf/modifysemanticvaluesactionconfiguration/impl/ModifySemanticValuesActionConfigurationPackageImpl.java
+++ b/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/infra/extendedtypes/emf/modifysemanticvaluesactionconfiguration/impl/ModifySemanticValuesActionConfigurationPackageImpl.java
@@ -4,7 +4,7 @@
  *

  * $Id$

  */

-package org.eclipse.papyrus.extendedtypes.emf.modifysemanticvaluesactionconfiguration.impl;

+package org.eclipse.papyrus.infra.extendedtypes.emf.modifysemanticvaluesactionconfiguration.impl;

 

 import org.eclipse.emf.ecore.EAttribute;

 import org.eclipse.emf.ecore.EClass;

@@ -14,19 +14,19 @@ import org.eclipse.emf.ecore.EcorePackage;
 

 import org.eclipse.emf.ecore.impl.EPackageImpl;

 

-import org.eclipse.papyrus.core.queries.configuration.ConfigurationPackage;

 

-import org.eclipse.papyrus.extendedtypes.ExtendedtypesPackage;

 

-import org.eclipse.papyrus.extendedtypes.emf.modifysemanticvaluesactionconfiguration.ConstantValue;

-import org.eclipse.papyrus.extendedtypes.emf.modifysemanticvaluesactionconfiguration.DynamicValue;

-import org.eclipse.papyrus.extendedtypes.emf.modifysemanticvaluesactionconfiguration.FeatureToSet;

-import org.eclipse.papyrus.extendedtypes.emf.modifysemanticvaluesactionconfiguration.FeatureValue;

-import org.eclipse.papyrus.extendedtypes.emf.modifysemanticvaluesactionconfiguration.ListValue;

-import org.eclipse.papyrus.extendedtypes.emf.modifysemanticvaluesactionconfiguration.ModifySemanticValuesActionConfiguration;

-import org.eclipse.papyrus.extendedtypes.emf.modifysemanticvaluesactionconfiguration.ModifySemanticValuesActionConfigurationFactory;

-import org.eclipse.papyrus.extendedtypes.emf.modifysemanticvaluesactionconfiguration.ModifySemanticValuesActionConfigurationPackage;

-import org.eclipse.papyrus.extendedtypes.emf.modifysemanticvaluesactionconfiguration.QueryExecutionValue;

+import org.eclipse.papyrus.infra.extendedtypes.ExtendedtypesPackage;

+import org.eclipse.papyrus.infra.extendedtypes.emf.modifysemanticvaluesactionconfiguration.ConstantValue;

+import org.eclipse.papyrus.infra.extendedtypes.emf.modifysemanticvaluesactionconfiguration.DynamicValue;

+import org.eclipse.papyrus.infra.extendedtypes.emf.modifysemanticvaluesactionconfiguration.FeatureToSet;

+import org.eclipse.papyrus.infra.extendedtypes.emf.modifysemanticvaluesactionconfiguration.FeatureValue;

+import org.eclipse.papyrus.infra.extendedtypes.emf.modifysemanticvaluesactionconfiguration.ListValue;

+import org.eclipse.papyrus.infra.extendedtypes.emf.modifysemanticvaluesactionconfiguration.ModifySemanticValuesActionConfiguration;

+import org.eclipse.papyrus.infra.extendedtypes.emf.modifysemanticvaluesactionconfiguration.ModifySemanticValuesActionConfigurationFactory;

+import org.eclipse.papyrus.infra.extendedtypes.emf.modifysemanticvaluesactionconfiguration.ModifySemanticValuesActionConfigurationPackage;

+import org.eclipse.papyrus.infra.extendedtypes.emf.modifysemanticvaluesactionconfiguration.QueryExecutionValue;

+import org.eclipse.papyrus.infra.queries.core.configuration.ConfigurationPackage;

 

 import org.eclipse.uml2.uml.UMLPackage;

 

@@ -97,7 +97,7 @@ public class ModifySemanticValuesActionConfigurationPackageImpl extends EPackage
 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

 	 * @see org.eclipse.emf.ecore.EPackage.Registry

-	 * @see org.eclipse.papyrus.extendedtypes.emf.modifysemanticvaluesactionconfiguration.ModifySemanticValuesActionConfigurationPackage#eNS_URI

+	 * @see org.eclipse.papyrus.infra.extendedtypes.emf.modifysemanticvaluesactionconfiguration.ModifySemanticValuesActionConfigurationPackage#eNS_URI

 	 * @see #init()

 	 * @generated

 	 */

diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/extendedtypes/emf/modifysemanticvaluesactionconfiguration/impl/QueryExecutionValueImpl.java b/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/infra/extendedtypes/emf/modifysemanticvaluesactionconfiguration/impl/QueryExecutionValueImpl.java
index 5002629cd9e..483568aa46e 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/extendedtypes/emf/modifysemanticvaluesactionconfiguration/impl/QueryExecutionValueImpl.java
+++ b/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/infra/extendedtypes/emf/modifysemanticvaluesactionconfiguration/impl/QueryExecutionValueImpl.java
@@ -4,7 +4,7 @@
  *

  * $Id$

  */

-package org.eclipse.papyrus.extendedtypes.emf.modifysemanticvaluesactionconfiguration.impl;

+package org.eclipse.papyrus.infra.extendedtypes.emf.modifysemanticvaluesactionconfiguration.impl;

 

 import org.eclipse.emf.common.notify.Notification;

 

@@ -13,10 +13,10 @@ import org.eclipse.emf.ecore.InternalEObject;
 

 import org.eclipse.emf.ecore.impl.ENotificationImpl;

 

-import org.eclipse.papyrus.core.queries.configuration.QueryConfiguration;

 

-import org.eclipse.papyrus.extendedtypes.emf.modifysemanticvaluesactionconfiguration.ModifySemanticValuesActionConfigurationPackage;

-import org.eclipse.papyrus.extendedtypes.emf.modifysemanticvaluesactionconfiguration.QueryExecutionValue;

+import org.eclipse.papyrus.infra.extendedtypes.emf.modifysemanticvaluesactionconfiguration.ModifySemanticValuesActionConfigurationPackage;

+import org.eclipse.papyrus.infra.extendedtypes.emf.modifysemanticvaluesactionconfiguration.QueryExecutionValue;

+import org.eclipse.papyrus.infra.queries.core.configuration.QueryConfiguration;

 

 /**

  * <!-- begin-user-doc -->

@@ -25,7 +25,7 @@ import org.eclipse.papyrus.extendedtypes.emf.modifysemanticvaluesactionconfigura
  * <p>

  * The following features are implemented:

  * <ul>

- *   <li>{@link org.eclipse.papyrus.extendedtypes.emf.modifysemanticvaluesactionconfiguration.impl.QueryExecutionValueImpl#getConfiguration <em>Configuration</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.infra.extendedtypes.emf.modifysemanticvaluesactionconfiguration.impl.QueryExecutionValueImpl#getConfiguration <em>Configuration</em>}</li>

  * </ul>

  * </p>

  *

diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/extendedtypes/emf/modifysemanticvaluesactionconfiguration/util/ModifySemanticValuesActionConfigurationAdapterFactory.java b/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/infra/extendedtypes/emf/modifysemanticvaluesactionconfiguration/util/ModifySemanticValuesActionConfigurationAdapterFactory.java
index 0a0ef68c1a9..3ae79b3d992 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/extendedtypes/emf/modifysemanticvaluesactionconfiguration/util/ModifySemanticValuesActionConfigurationAdapterFactory.java
+++ b/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/infra/extendedtypes/emf/modifysemanticvaluesactionconfiguration/util/ModifySemanticValuesActionConfigurationAdapterFactory.java
@@ -4,7 +4,7 @@
  *

  * $Id$

  */

-package org.eclipse.papyrus.extendedtypes.emf.modifysemanticvaluesactionconfiguration.util;

+package org.eclipse.papyrus.infra.extendedtypes.emf.modifysemanticvaluesactionconfiguration.util;

 

 import org.eclipse.emf.common.notify.Adapter;

 import org.eclipse.emf.common.notify.Notifier;

@@ -13,17 +13,17 @@ import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
 

 import org.eclipse.emf.ecore.EObject;

 

-import org.eclipse.papyrus.extendedtypes.ActionConfiguration;

-import org.eclipse.papyrus.extendedtypes.PostActionConfiguration;

 

-import org.eclipse.papyrus.extendedtypes.emf.modifysemanticvaluesactionconfiguration.*;

+import org.eclipse.papyrus.infra.extendedtypes.ActionConfiguration;

+import org.eclipse.papyrus.infra.extendedtypes.PostActionConfiguration;

+import org.eclipse.papyrus.infra.extendedtypes.emf.modifysemanticvaluesactionconfiguration.*;

 

 /**

  * <!-- begin-user-doc -->

  * The <b>Adapter Factory</b> for the model.

  * It provides an adapter <code>createXXX</code> method for each class of the model.

  * <!-- end-user-doc -->

- * @see org.eclipse.papyrus.extendedtypes.emf.modifysemanticvaluesactionconfiguration.ModifySemanticValuesActionConfigurationPackage

+ * @see org.eclipse.papyrus.infra.extendedtypes.emf.modifysemanticvaluesactionconfiguration.ModifySemanticValuesActionConfigurationPackage

  * @generated

  */

 public class ModifySemanticValuesActionConfigurationAdapterFactory extends AdapterFactoryImpl {

@@ -131,13 +131,13 @@ public class ModifySemanticValuesActionConfigurationAdapterFactory extends Adapt
 

 

 	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.extendedtypes.emf.modifysemanticvaluesactionconfiguration.ModifySemanticValuesActionConfiguration <em>Modify Semantic Values Action Configuration</em>}'.

+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.extendedtypes.emf.modifysemanticvaluesactionconfiguration.ModifySemanticValuesActionConfiguration <em>Modify Semantic Values Action Configuration</em>}'.

 	 * <!-- begin-user-doc -->

 	 * This default implementation returns null so that we can easily ignore cases;

 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

 	 * <!-- end-user-doc -->

 	 * @return the new adapter.

-	 * @see org.eclipse.papyrus.extendedtypes.emf.modifysemanticvaluesactionconfiguration.ModifySemanticValuesActionConfiguration

+	 * @see org.eclipse.papyrus.infra.extendedtypes.emf.modifysemanticvaluesactionconfiguration.ModifySemanticValuesActionConfiguration

 	 * @generated

 	 */

 	public Adapter createModifySemanticValuesActionConfigurationAdapter() {

@@ -145,13 +145,13 @@ public class ModifySemanticValuesActionConfigurationAdapterFactory extends Adapt
 	}

 

 	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.extendedtypes.emf.modifysemanticvaluesactionconfiguration.FeatureToSet <em>Feature To Set</em>}'.

+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.extendedtypes.emf.modifysemanticvaluesactionconfiguration.FeatureToSet <em>Feature To Set</em>}'.

 	 * <!-- begin-user-doc -->

 	 * This default implementation returns null so that we can easily ignore cases;

 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

 	 * <!-- end-user-doc -->

 	 * @return the new adapter.

-	 * @see org.eclipse.papyrus.extendedtypes.emf.modifysemanticvaluesactionconfiguration.FeatureToSet

+	 * @see org.eclipse.papyrus.infra.extendedtypes.emf.modifysemanticvaluesactionconfiguration.FeatureToSet

 	 * @generated

 	 */

 	public Adapter createFeatureToSetAdapter() {

@@ -159,13 +159,13 @@ public class ModifySemanticValuesActionConfigurationAdapterFactory extends Adapt
 	}

 

 	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.extendedtypes.emf.modifysemanticvaluesactionconfiguration.FeatureValue <em>Feature Value</em>}'.

+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.extendedtypes.emf.modifysemanticvaluesactionconfiguration.FeatureValue <em>Feature Value</em>}'.

 	 * <!-- begin-user-doc -->

 	 * This default implementation returns null so that we can easily ignore cases;

 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

 	 * <!-- end-user-doc -->

 	 * @return the new adapter.

-	 * @see org.eclipse.papyrus.extendedtypes.emf.modifysemanticvaluesactionconfiguration.FeatureValue

+	 * @see org.eclipse.papyrus.infra.extendedtypes.emf.modifysemanticvaluesactionconfiguration.FeatureValue

 	 * @generated

 	 */

 	public Adapter createFeatureValueAdapter() {

@@ -173,13 +173,13 @@ public class ModifySemanticValuesActionConfigurationAdapterFactory extends Adapt
 	}

 

 	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.extendedtypes.emf.modifysemanticvaluesactionconfiguration.DynamicValue <em>Dynamic Value</em>}'.

+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.extendedtypes.emf.modifysemanticvaluesactionconfiguration.DynamicValue <em>Dynamic Value</em>}'.

 	 * <!-- begin-user-doc -->

 	 * This default implementation returns null so that we can easily ignore cases;

 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

 	 * <!-- end-user-doc -->

 	 * @return the new adapter.

-	 * @see org.eclipse.papyrus.extendedtypes.emf.modifysemanticvaluesactionconfiguration.DynamicValue

+	 * @see org.eclipse.papyrus.infra.extendedtypes.emf.modifysemanticvaluesactionconfiguration.DynamicValue

 	 * @generated

 	 */

 	public Adapter createDynamicValueAdapter() {

@@ -187,13 +187,13 @@ public class ModifySemanticValuesActionConfigurationAdapterFactory extends Adapt
 	}

 

 	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.extendedtypes.emf.modifysemanticvaluesactionconfiguration.ConstantValue <em>Constant Value</em>}'.

+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.extendedtypes.emf.modifysemanticvaluesactionconfiguration.ConstantValue <em>Constant Value</em>}'.

 	 * <!-- begin-user-doc -->

 	 * This default implementation returns null so that we can easily ignore cases;

 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

 	 * <!-- end-user-doc -->

 	 * @return the new adapter.

-	 * @see org.eclipse.papyrus.extendedtypes.emf.modifysemanticvaluesactionconfiguration.ConstantValue

+	 * @see org.eclipse.papyrus.infra.extendedtypes.emf.modifysemanticvaluesactionconfiguration.ConstantValue

 	 * @generated

 	 */

 	public Adapter createConstantValueAdapter() {

@@ -201,13 +201,13 @@ public class ModifySemanticValuesActionConfigurationAdapterFactory extends Adapt
 	}

 

 	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.extendedtypes.emf.modifysemanticvaluesactionconfiguration.ListValue <em>List Value</em>}'.

+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.extendedtypes.emf.modifysemanticvaluesactionconfiguration.ListValue <em>List Value</em>}'.

 	 * <!-- begin-user-doc -->

 	 * This default implementation returns null so that we can easily ignore cases;

 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

 	 * <!-- end-user-doc -->

 	 * @return the new adapter.

-	 * @see org.eclipse.papyrus.extendedtypes.emf.modifysemanticvaluesactionconfiguration.ListValue

+	 * @see org.eclipse.papyrus.infra.extendedtypes.emf.modifysemanticvaluesactionconfiguration.ListValue

 	 * @generated

 	 */

 	public Adapter createListValueAdapter() {

@@ -215,13 +215,13 @@ public class ModifySemanticValuesActionConfigurationAdapterFactory extends Adapt
 	}

 

 	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.extendedtypes.emf.modifysemanticvaluesactionconfiguration.QueryExecutionValue <em>Query Execution Value</em>}'.

+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.extendedtypes.emf.modifysemanticvaluesactionconfiguration.QueryExecutionValue <em>Query Execution Value</em>}'.

 	 * <!-- begin-user-doc -->

 	 * This default implementation returns null so that we can easily ignore cases;

 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

 	 * <!-- end-user-doc -->

 	 * @return the new adapter.

-	 * @see org.eclipse.papyrus.extendedtypes.emf.modifysemanticvaluesactionconfiguration.QueryExecutionValue

+	 * @see org.eclipse.papyrus.infra.extendedtypes.emf.modifysemanticvaluesactionconfiguration.QueryExecutionValue

 	 * @generated

 	 */

 	public Adapter createQueryExecutionValueAdapter() {

@@ -229,13 +229,13 @@ public class ModifySemanticValuesActionConfigurationAdapterFactory extends Adapt
 	}

 

 	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.extendedtypes.ActionConfiguration <em>Action Configuration</em>}'.

+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.extendedtypes.ActionConfiguration <em>Action Configuration</em>}'.

 	 * <!-- begin-user-doc -->

 	 * This default implementation returns null so that we can easily ignore cases;

 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

 	 * <!-- end-user-doc -->

 	 * @return the new adapter.

-	 * @see org.eclipse.papyrus.extendedtypes.ActionConfiguration

+	 * @see org.eclipse.papyrus.infra.extendedtypes.ActionConfiguration

 	 * @generated

 	 */

 	public Adapter createActionConfigurationAdapter() {

@@ -243,13 +243,13 @@ public class ModifySemanticValuesActionConfigurationAdapterFactory extends Adapt
 	}

 

 	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.extendedtypes.PostActionConfiguration <em>Post Action Configuration</em>}'.

+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.extendedtypes.PostActionConfiguration <em>Post Action Configuration</em>}'.

 	 * <!-- begin-user-doc -->

 	 * This default implementation returns null so that we can easily ignore cases;

 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

 	 * <!-- end-user-doc -->

 	 * @return the new adapter.

-	 * @see org.eclipse.papyrus.extendedtypes.PostActionConfiguration

+	 * @see org.eclipse.papyrus.infra.extendedtypes.PostActionConfiguration

 	 * @generated

 	 */

 	public Adapter createPostActionConfigurationAdapter() {

diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/extendedtypes/emf/modifysemanticvaluesactionconfiguration/util/ModifySemanticValuesActionConfigurationResourceFactoryImpl.java b/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/infra/extendedtypes/emf/modifysemanticvaluesactionconfiguration/util/ModifySemanticValuesActionConfigurationResourceFactoryImpl.java
index 1d00406f1b0..91222121e14 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/extendedtypes/emf/modifysemanticvaluesactionconfiguration/util/ModifySemanticValuesActionConfigurationResourceFactoryImpl.java
+++ b/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/infra/extendedtypes/emf/modifysemanticvaluesactionconfiguration/util/ModifySemanticValuesActionConfigurationResourceFactoryImpl.java
@@ -4,7 +4,7 @@
  *

  * $Id$

  */

-package org.eclipse.papyrus.extendedtypes.emf.modifysemanticvaluesactionconfiguration.util;

+package org.eclipse.papyrus.infra.extendedtypes.emf.modifysemanticvaluesactionconfiguration.util;

 

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

 

@@ -18,7 +18,7 @@ import org.eclipse.emf.ecore.xmi.XMLResource;
  * <!-- begin-user-doc -->

  * The <b>Resource Factory</b> associated with the package.

  * <!-- end-user-doc -->

- * @see org.eclipse.papyrus.extendedtypes.emf.modifysemanticvaluesactionconfiguration.util.ModifySemanticValuesActionConfigurationResourceImpl

+ * @see org.eclipse.papyrus.infra.extendedtypes.emf.modifysemanticvaluesactionconfiguration.util.ModifySemanticValuesActionConfigurationResourceImpl

  * @generated

  */

 public class ModifySemanticValuesActionConfigurationResourceFactoryImpl extends ResourceFactoryImpl {

diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/extendedtypes/emf/modifysemanticvaluesactionconfiguration/util/ModifySemanticValuesActionConfigurationResourceImpl.java b/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/infra/extendedtypes/emf/modifysemanticvaluesactionconfiguration/util/ModifySemanticValuesActionConfigurationResourceImpl.java
index 184e297c8ed..1e8ff788b37 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/extendedtypes/emf/modifysemanticvaluesactionconfiguration/util/ModifySemanticValuesActionConfigurationResourceImpl.java
+++ b/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/infra/extendedtypes/emf/modifysemanticvaluesactionconfiguration/util/ModifySemanticValuesActionConfigurationResourceImpl.java
@@ -4,7 +4,7 @@
  *

  * $Id$

  */

-package org.eclipse.papyrus.extendedtypes.emf.modifysemanticvaluesactionconfiguration.util;

+package org.eclipse.papyrus.infra.extendedtypes.emf.modifysemanticvaluesactionconfiguration.util;

 

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

 

@@ -14,7 +14,7 @@ import org.eclipse.emf.ecore.xmi.impl.XMLResourceImpl;
  * <!-- begin-user-doc -->

  * The <b>Resource </b> associated with the package.

  * <!-- end-user-doc -->

- * @see org.eclipse.papyrus.extendedtypes.emf.modifysemanticvaluesactionconfiguration.util.ModifySemanticValuesActionConfigurationResourceFactoryImpl

+ * @see org.eclipse.papyrus.infra.extendedtypes.emf.modifysemanticvaluesactionconfiguration.util.ModifySemanticValuesActionConfigurationResourceFactoryImpl

  * @generated

  */

 public class ModifySemanticValuesActionConfigurationResourceImpl extends XMLResourceImpl {

diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/extendedtypes/emf/modifysemanticvaluesactionconfiguration/util/ModifySemanticValuesActionConfigurationSwitch.java b/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/infra/extendedtypes/emf/modifysemanticvaluesactionconfiguration/util/ModifySemanticValuesActionConfigurationSwitch.java
index eab57c7a53c..ccc9aa955f5 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/extendedtypes/emf/modifysemanticvaluesactionconfiguration/util/ModifySemanticValuesActionConfigurationSwitch.java
+++ b/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/infra/extendedtypes/emf/modifysemanticvaluesactionconfiguration/util/ModifySemanticValuesActionConfigurationSwitch.java
@@ -4,17 +4,17 @@
  *

  * $Id$

  */

-package org.eclipse.papyrus.extendedtypes.emf.modifysemanticvaluesactionconfiguration.util;

+package org.eclipse.papyrus.infra.extendedtypes.emf.modifysemanticvaluesactionconfiguration.util;

 

 import org.eclipse.emf.ecore.EObject;

 import org.eclipse.emf.ecore.EPackage;

 

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

 

-import org.eclipse.papyrus.extendedtypes.ActionConfiguration;

-import org.eclipse.papyrus.extendedtypes.PostActionConfiguration;

 

-import org.eclipse.papyrus.extendedtypes.emf.modifysemanticvaluesactionconfiguration.*;

+import org.eclipse.papyrus.infra.extendedtypes.ActionConfiguration;

+import org.eclipse.papyrus.infra.extendedtypes.PostActionConfiguration;

+import org.eclipse.papyrus.infra.extendedtypes.emf.modifysemanticvaluesactionconfiguration.*;

 

 /**

  * <!-- begin-user-doc -->

@@ -26,7 +26,7 @@ import org.eclipse.papyrus.extendedtypes.emf.modifysemanticvaluesactionconfigura
  * until a non-null result is returned,

  * which is the result of the switch.

  * <!-- end-user-doc -->

- * @see org.eclipse.papyrus.extendedtypes.emf.modifysemanticvaluesactionconfiguration.ModifySemanticValuesActionConfigurationPackage

+ * @see org.eclipse.papyrus.infra.extendedtypes.emf.modifysemanticvaluesactionconfiguration.ModifySemanticValuesActionConfigurationPackage

  * @generated

  */

 public class ModifySemanticValuesActionConfigurationSwitch<T> extends Switch<T> {

diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/extendedtypes/emf/modifysemanticvaluesactionconfiguration/util/ModifySemanticValuesActionConfigurationXMLProcessor.java b/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/infra/extendedtypes/emf/modifysemanticvaluesactionconfiguration/util/ModifySemanticValuesActionConfigurationXMLProcessor.java
index 75f9ec3549e..75cf9df4e82 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/extendedtypes/emf/modifysemanticvaluesactionconfiguration/util/ModifySemanticValuesActionConfigurationXMLProcessor.java
+++ b/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/infra/extendedtypes/emf/modifysemanticvaluesactionconfiguration/util/ModifySemanticValuesActionConfigurationXMLProcessor.java
@@ -4,7 +4,7 @@
  *

  * $Id$

  */

-package org.eclipse.papyrus.extendedtypes.emf.modifysemanticvaluesactionconfiguration.util;

+package org.eclipse.papyrus.infra.extendedtypes.emf.modifysemanticvaluesactionconfiguration.util;

 

 import java.util.Map;

 

@@ -14,7 +14,7 @@ import org.eclipse.emf.ecore.resource.Resource;
 

 import org.eclipse.emf.ecore.xmi.util.XMLProcessor;

 

-import org.eclipse.papyrus.extendedtypes.emf.modifysemanticvaluesactionconfiguration.ModifySemanticValuesActionConfigurationPackage;

+import org.eclipse.papyrus.infra.extendedtypes.emf.modifysemanticvaluesactionconfiguration.ModifySemanticValuesActionConfigurationPackage;

 

 /**

  * This class contains helper methods to serialize and deserialize XML documents

diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/src/org/eclipse/papyrus/extendedtypes/emf/Activator.java b/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/src/org/eclipse/papyrus/infra/extendedtypes/emf/Activator.java
index a540803106b..8692f17824c 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/src/org/eclipse/papyrus/extendedtypes/emf/Activator.java
+++ b/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/src/org/eclipse/papyrus/infra/extendedtypes/emf/Activator.java
@@ -1,6 +1,6 @@
-package org.eclipse.papyrus.extendedtypes.emf;

+package org.eclipse.papyrus.infra.extendedtypes.emf;

 

-import org.eclipse.papyrus.log.LogHelper;

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

 import org.eclipse.ui.plugin.AbstractUIPlugin;

 import org.osgi.framework.BundleContext;

 

diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/src/org/eclipse/papyrus/extendedtypes/emf/providers/ModifySemanticValuesActionProvider.java b/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/src/org/eclipse/papyrus/infra/extendedtypes/emf/providers/ModifySemanticValuesActionProvider.java
index cc17212a490..5ecc4b638bd 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/src/org/eclipse/papyrus/extendedtypes/emf/providers/ModifySemanticValuesActionProvider.java
+++ b/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/src/org/eclipse/papyrus/infra/extendedtypes/emf/providers/ModifySemanticValuesActionProvider.java
@@ -9,7 +9,7 @@
  * Contributors:

  *  Remi Schnekenburger (CEA LIST) remi.schnekenburger@cea.fr - Initial API and implementation

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

-package org.eclipse.papyrus.extendedtypes.emf.providers;

+package org.eclipse.papyrus.infra.extendedtypes.emf.providers;

 

 import java.util.ArrayList;

 import java.util.List;

@@ -23,24 +23,24 @@ import org.eclipse.gmf.runtime.common.core.command.UnexecutableCommand;
 import org.eclipse.gmf.runtime.common.core.service.AbstractProvider;

 import org.eclipse.gmf.runtime.common.core.service.IOperation;

 import org.eclipse.gmf.runtime.emf.type.core.requests.SetRequest;

-import org.eclipse.papyrus.core.queries.configuration.QueryConfiguration;

-import org.eclipse.papyrus.core.queries.converter.ConverterNotfoundException;

-import org.eclipse.papyrus.core.queries.converter.ConverterRegistry;

-import org.eclipse.papyrus.core.queries.modisco.QueryUtil;

-import org.eclipse.papyrus.extendedtypes.ActionConfiguration;

-import org.eclipse.papyrus.extendedtypes.emf.Activator;

-import org.eclipse.papyrus.extendedtypes.emf.modifysemanticvaluesactionconfiguration.ConstantValue;

-import org.eclipse.papyrus.extendedtypes.emf.modifysemanticvaluesactionconfiguration.FeatureToSet;

-import org.eclipse.papyrus.extendedtypes.emf.modifysemanticvaluesactionconfiguration.FeatureValue;

-import org.eclipse.papyrus.extendedtypes.emf.modifysemanticvaluesactionconfiguration.ListValue;

-import org.eclipse.papyrus.extendedtypes.emf.modifysemanticvaluesactionconfiguration.ModifySemanticValuesActionConfiguration;

-import org.eclipse.papyrus.extendedtypes.emf.modifysemanticvaluesactionconfiguration.QueryExecutionValue;

-import org.eclipse.papyrus.extendedtypes.emf.modifysemanticvaluesactionconfiguration.util.ModifySemanticValuesActionConfigurationSwitch;

-import org.eclipse.papyrus.extendedtypes.providers.GetAllExtendedElementTypeActionProvidersOperation;

-import org.eclipse.papyrus.extendedtypes.providers.GetExtendedElementTypeActionProviderOperation;

-import org.eclipse.papyrus.extendedtypes.providers.IExtendedElementTypeActionProvider;

-import org.eclipse.papyrus.service.edit.service.ElementEditServiceUtils;

-import org.eclipse.papyrus.service.edit.service.IElementEditService;

+import org.eclipse.papyrus.infra.extendedtypes.ActionConfiguration;

+import org.eclipse.papyrus.infra.extendedtypes.emf.Activator;

+import org.eclipse.papyrus.infra.extendedtypes.emf.modifysemanticvaluesactionconfiguration.ConstantValue;

+import org.eclipse.papyrus.infra.extendedtypes.emf.modifysemanticvaluesactionconfiguration.FeatureToSet;

+import org.eclipse.papyrus.infra.extendedtypes.emf.modifysemanticvaluesactionconfiguration.FeatureValue;

+import org.eclipse.papyrus.infra.extendedtypes.emf.modifysemanticvaluesactionconfiguration.ListValue;

+import org.eclipse.papyrus.infra.extendedtypes.emf.modifysemanticvaluesactionconfiguration.ModifySemanticValuesActionConfiguration;

+import org.eclipse.papyrus.infra.extendedtypes.emf.modifysemanticvaluesactionconfiguration.QueryExecutionValue;

+import org.eclipse.papyrus.infra.extendedtypes.emf.modifysemanticvaluesactionconfiguration.util.ModifySemanticValuesActionConfigurationSwitch;

+import org.eclipse.papyrus.infra.extendedtypes.providers.GetAllExtendedElementTypeActionProvidersOperation;

+import org.eclipse.papyrus.infra.extendedtypes.providers.GetExtendedElementTypeActionProviderOperation;

+import org.eclipse.papyrus.infra.extendedtypes.providers.IExtendedElementTypeActionProvider;

+import org.eclipse.papyrus.infra.queries.core.configuration.QueryConfiguration;

+import org.eclipse.papyrus.infra.queries.core.converter.ConverterNotfoundException;

+import org.eclipse.papyrus.infra.queries.core.converter.ConverterRegistry;

+import org.eclipse.papyrus.infra.queries.core.modisco.QueryUtil;

+import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

+import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

 

 /**

  * Provider for Action that set semantic values to an element on creation

diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/META-INF/MANIFEST.MF b/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/META-INF/MANIFEST.MF
index e90007e5865..dd2695f757b 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/META-INF/MANIFEST.MF
+++ b/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/META-INF/MANIFEST.MF
@@ -1,11 +1,11 @@
 Manifest-Version: 1.0

-Export-Package: org.eclipse.papyrus.extendedtypes,

- org.eclipse.papyrus.extendedtypes.advices,

- org.eclipse.papyrus.extendedtypes.impl,

- org.eclipse.papyrus.extendedtypes.preferences,

- org.eclipse.papyrus.extendedtypes.providers,

- org.eclipse.papyrus.extendedtypes.types,

- org.eclipse.papyrus.extendedtypes.util

+Export-Package: org.eclipse.papyrus.infra.extendedtypes,

+ org.eclipse.papyrus.infra.extendedtypes.advices,

+ org.eclipse.papyrus.infra.extendedtypes.impl,

+ org.eclipse.papyrus.infra.extendedtypes.preferences,

+ org.eclipse.papyrus.infra.extendedtypes.providers,

+ org.eclipse.papyrus.infra.extendedtypes.types,

+ org.eclipse.papyrus.infra.extendedtypes.util

 Bundle-ActivationPolicy: lazy

 Bundle-ClassPath: .

 Bundle-Name: %pluginName

@@ -25,6 +25,6 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="3.7.0",
 Bundle-Vendor: %providerName

 Bundle-Version: 0.9.0.qualifier

 Bundle-ManifestVersion: 2

-Bundle-Activator: org.eclipse.papyrus.extendedtypes.Activator

+Bundle-Activator: org.eclipse.papyrus.infra.extendedtypes.Activator

 Bundle-SymbolicName: org.eclipse.papyrus.infra.extendedtypes;singleton:=true

 

diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/model/ExtendedTypes.ecore b/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/model/ExtendedTypes.ecore
index 0d378b102c4..d8480ae3cf4 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/model/ExtendedTypes.ecore
+++ b/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/model/ExtendedTypes.ecore
@@ -20,7 +20,7 @@
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="specializedTypesID" lowerBound="1"

         upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>

     <eStructuralFeatures xsi:type="ecore:EReference" name="preValidation" upperBound="-1"

-        eType="ecore:EClass ../../org.eclipse.papyrus.core.queries.configuration/model/Configuration.ecore#//QueryConfiguration"/>

+        eType="ecore:EClass ../../org.eclipse.papyrus.infra.queries.core.configuration/model/Configuration.ecore#//QueryConfiguration"/>

     <eStructuralFeatures xsi:type="ecore:EReference" name="preAction" upperBound="-1"

         eType="#//PreActionConfiguration" containment="true"/>

     <eStructuralFeatures xsi:type="ecore:EReference" name="postAction" upperBound="-1"

diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/model/ExtendedTypes.ecorediag b/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/model/ExtendedTypes.ecorediag
index 85362833dfc..29e61e15252 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/model/ExtendedTypes.ecorediag
+++ b/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/model/ExtendedTypes.ecorediag
@@ -96,7 +96,7 @@
       <styles xmi:type="notation:FilteringStyle" xmi:id="_W1kXi-A4Ed-0CYOJPs0ewQ"/>

     </children>

     <styles xmi:type="notation:ShapeStyle" xmi:id="_W1kXgeA4Ed-0CYOJPs0ewQ" fontColor="4210752" fontHeight="10" fillColor="13761016" lineColor="8421504"/>

-    <element xmi:type="ecore:EClass" href="platform:/plugin/org.eclipse.papyrus.core.queries.configuration/model/Configuration.ecore#//QueryConfiguration"/>

+    <element xmi:type="ecore:EClass" href="platform:/plugin/org.eclipse.papyrus.infra.queries.core.configuration/model/Configuration.ecore#//QueryConfiguration"/>

     <layoutConstraint xmi:type="notation:Bounds" xmi:id="_W1kXguA4Ed-0CYOJPs0ewQ" x="985" y="155" width="205"/>

   </children>

   <children xmi:type="notation:Node" xmi:id="_enajMOA4Ed-0CYOJPs0ewQ" type="1001">

diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/model/ExtendedTypes.genmodel b/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/model/ExtendedTypes.genmodel
index 46d050f55f9..5c09902e186 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/model/ExtendedTypes.genmodel
+++ b/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/model/ExtendedTypes.genmodel
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <genmodel:GenModel xmi:version="2.0"

     xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"

-    xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" modelDirectory="/org.eclipse.papyrus.extendedtypes/src-gen"

-    editDirectory="/org.eclipse.papyrus.extendedtypes.edit/src-gen" editorDirectory="/org.eclipse.papyrus.extendedtypes.editor/src-gen"

-    modelPluginID="org.eclipse.papyrus.extendedtypes" modelName="ExtendedTypes"

-    testsDirectory="/org.eclipse.papyrus.extendedtypes.tests/src-gen" importerID="org.eclipse.emf.importer.ecore"

-    complianceLevel="5.0" copyrightFields="false" usedGenPackages="platform:/plugin/org.eclipse.papyrus.core.queries.configuration/model/Configuration.genmodel#//configuration platform:/plugin/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore platform:/plugin/org.eclipse.emf.facet.infra.query/model/query.genmodel#//query platform:/plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml">

+    xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" modelDirectory="/org.eclipse.papyrus.infra.extendedtypes/src-gen"

+    editDirectory="/org.eclipse.papyrus.infra.extendedtypes.edit/src-gen" editorDirectory="/org.eclipse.papyrus.infra.extendedtypes.editor/src-gen"

+    modelPluginID="org.eclipse.papyrus.infra.extendedtypes" modelName="ExtendedTypes"

+    testsDirectory="/org.eclipse.papyrus.infra.extendedtypes.tests/src-gen" importerID="org.eclipse.emf.importer.ecore"

+    complianceLevel="5.0" copyrightFields="false" usedGenPackages="platform:/plugin/org.eclipse.papyrus.infra.queries.core.configuration/model/Configuration.genmodel#//configuration platform:/plugin/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore platform:/plugin/org.eclipse.emf.facet.infra.query/model/query.genmodel#//query platform:/plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml">

   <foreignModel>ExtendedTypes.ecore</foreignModel>

   <genPackages prefix="Extendedtypes" basePackage="org.eclipse.papyrus" resource="XML"

       disposableProviderFactory="true" ecorePackage="ExtendedTypes.ecore#/">

diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/plugin.xml b/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/plugin.xml
index b862ddec900..1a7444208b4 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/plugin.xml
+++ b/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/plugin.xml
@@ -15,21 +15,21 @@
    <extension point="org.eclipse.emf.ecore.generated_package">

       <package

             uri="http://www.eclipse.org/papyrus/diagram/types/extendedtypes/0.7"

-            class="org.eclipse.papyrus.extendedtypes.ExtendedtypesPackage"

+            class="org.eclipse.papyrus.infra.extendedtypes.ExtendedtypesPackage"

             genModel="model/ExtendedTypes.genmodel"/>

    </extension>

 

    <extension point="org.eclipse.emf.ecore.extension_parser">

       <parser

             type="extendedtypes"

-            class="org.eclipse.papyrus.extendedtypes.util.ExtendedtypesResourceFactoryImpl"/>

+            class="org.eclipse.papyrus.infra.extendedtypes.util.ExtendedtypesResourceFactoryImpl"/>

    </extension>

    <extension

          point="org.eclipse.gmf.runtime.emf.type.core.elementTypes">

       <metamodel

             nsURI="http://www.eclipse.org/uml2/3.0.0/UML">

          <adviceBinding

-               class="org.eclipse.papyrus.extendedtypes.advices.ExtendedTypesOwnerAdvice"

+               class="org.eclipse.papyrus.infra.extendedtypes.advices.ExtendedTypesOwnerAdvice"

                id="org.eclipse.papyrus.uml.advice.ExtendedTypesOwnerAdvice"

                inheritance="all"

                typeId="org.eclipse.papyrus.uml.Element">

@@ -39,7 +39,7 @@
    <extension

          point="org.eclipse.gmf.runtime.emf.type.core.elementTypeBindings">

       <binding

-            context="org.eclipse.papyrus.service.edit.TypeContext">

+            context="org.eclipse.papyrus.infra.services.edit.TypeContext">

          <elementType

                pattern="org\.eclipse\.papyrus\.uml\..*">

          </elementType>

diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/schema/extendedElementTypeActionProvider.exsd b/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/schema/extendedElementTypeActionProvider.exsd
index 9ffbc995646..5ddeeda67ac 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/schema/extendedElementTypeActionProvider.exsd
+++ b/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/schema/extendedElementTypeActionProvider.exsd
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>

 <!-- Schema file written by PDE -->

-<schema targetNamespace="org.eclipse.papyrus.extendedtypes" xmlns="http://www.w3.org/2001/XMLSchema">

+<schema targetNamespace="org.eclipse.papyrus.infra.extendedtypes" xmlns="http://www.w3.org/2001/XMLSchema">

 <annotation>

       <appInfo>

-         <meta.schema plugin="org.eclipse.papyrus.extendedtypes" id="extendedElementTypeActionProvider" name="Extended ElementType Action Provider"/>

+         <meta.schema plugin="org.eclipse.papyrus.infra.extendedtypes" id="extendedElementTypeActionProvider" name="Extended ElementType Action Provider"/>

       </appInfo>

       <documentation>

          This extension point provides the mechanism to add providers that create aspect actions on extended element types

@@ -89,7 +89,7 @@
                   This is the class that implements the provider.

                </documentation>

                <appInfo>

-                  <meta.attribute kind="java" basedOn=":org.eclipse.papyrus.extendedtypes.providers.IExtendedElementTypeActionProvider"/>

+                  <meta.attribute kind="java" basedOn=":org.eclipse.papyrus.infra.extendedtypes.providers.IExtendedElementTypeActionProvider"/>

                </appInfo>

             </annotation>

          </attribute>

@@ -99,7 +99,7 @@
                   Class that describes the action configuration

                </documentation>

                <appInfo>

-                  <meta.attribute kind="java" basedOn=":org.eclipse.papyrus.extendedtypes.ActionConfiguration"/>

+                  <meta.attribute kind="java" basedOn=":org.eclipse.papyrus.infra.extendedtypes.ActionConfiguration"/>

                </appInfo>

             </annotation>

          </attribute>

diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/schema/extendedTypesSetConfiguration.exsd b/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/schema/extendedTypesSetConfiguration.exsd
index 20c436cb1cf..ef2762d198a 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/schema/extendedTypesSetConfiguration.exsd
+++ b/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/schema/extendedTypesSetConfiguration.exsd
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>

 <!-- Schema file written by PDE -->

-<schema targetNamespace="org.eclipse.papyrus.extendedtypes" xmlns="http://www.w3.org/2001/XMLSchema">

+<schema targetNamespace="org.eclipse.papyrus.infra.extendedtypes" xmlns="http://www.w3.org/2001/XMLSchema">

 <annotation>

       <appInfo>

-         <meta.schema plugin="org.eclipse.papyrus.extendedtypes" id="extendedTypesSetConfiguration" name="extendedTypesSetConfiguration"/>

+         <meta.schema plugin="org.eclipse.papyrus.infra.extendedtypes" id="extendedTypesSetConfiguration" name="extendedTypesSetConfiguration"/>

       </appInfo>

       <documentation>

          This extension point is used to registered new extended element types for creation of semantic elements with specific post/pre actions and validation.

diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/extendedtypes/ActionConfiguration.java b/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/ActionConfiguration.java
index a3cc5cdee5f..df2cf89d490 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/extendedtypes/ActionConfiguration.java
+++ b/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/ActionConfiguration.java
@@ -4,7 +4,7 @@
  *

  * $Id$

  */

-package org.eclipse.papyrus.extendedtypes;

+package org.eclipse.papyrus.infra.extendedtypes;

 

 import org.eclipse.emf.ecore.EObject;

 

@@ -16,12 +16,12 @@ import org.eclipse.emf.ecore.EObject;
  * <p>

  * The following features are supported:

  * <ul>

- *   <li>{@link org.eclipse.papyrus.extendedtypes.ActionConfiguration#getLabel <em>Label</em>}</li>

- *   <li>{@link org.eclipse.papyrus.extendedtypes.ActionConfiguration#getId <em>Id</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.infra.extendedtypes.ActionConfiguration#getLabel <em>Label</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.infra.extendedtypes.ActionConfiguration#getId <em>Id</em>}</li>

  * </ul>

  * </p>

  *

- * @see org.eclipse.papyrus.extendedtypes.ExtendedtypesPackage#getActionConfiguration()

+ * @see org.eclipse.papyrus.infra.extendedtypes.ExtendedtypesPackage#getActionConfiguration()

  * @model abstract="true"

  * @generated

  */

@@ -36,14 +36,14 @@ public interface ActionConfiguration extends EObject {
 	 * <!-- end-user-doc -->

 	 * @return the value of the '<em>Label</em>' attribute.

 	 * @see #setLabel(String)

-	 * @see org.eclipse.papyrus.extendedtypes.ExtendedtypesPackage#getActionConfiguration_Label()

+	 * @see org.eclipse.papyrus.infra.extendedtypes.ExtendedtypesPackage#getActionConfiguration_Label()

 	 * @model

 	 * @generated

 	 */

 	String getLabel();

 

 	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.extendedtypes.ActionConfiguration#getLabel <em>Label</em>}' attribute.

+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.extendedtypes.ActionConfiguration#getLabel <em>Label</em>}' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

 	 * @param value the new value of the '<em>Label</em>' attribute.

@@ -62,14 +62,14 @@ public interface ActionConfiguration extends EObject {
 	 * <!-- end-user-doc -->

 	 * @return the value of the '<em>Id</em>' attribute.

 	 * @see #setId(String)

-	 * @see org.eclipse.papyrus.extendedtypes.ExtendedtypesPackage#getActionConfiguration_Id()

+	 * @see org.eclipse.papyrus.infra.extendedtypes.ExtendedtypesPackage#getActionConfiguration_Id()

 	 * @model required="true"

 	 * @generated

 	 */

 	String getId();

 

 	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.extendedtypes.ActionConfiguration#getId <em>Id</em>}' attribute.

+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.extendedtypes.ActionConfiguration#getId <em>Id</em>}' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

 	 * @param value the new value of the '<em>Id</em>' attribute.

diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/extendedtypes/ExtendedElementTypeConfiguration.java b/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/ExtendedElementTypeConfiguration.java
index 6766cca2710..204abfd1c85 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/extendedtypes/ExtendedElementTypeConfiguration.java
+++ b/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/ExtendedElementTypeConfiguration.java
@@ -4,13 +4,13 @@
  *

  * $Id$

  */

-package org.eclipse.papyrus.extendedtypes;

+package org.eclipse.papyrus.infra.extendedtypes;

 

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

 

 import org.eclipse.emf.ecore.EObject;

 

-import org.eclipse.papyrus.core.queries.configuration.QueryConfiguration;

+import org.eclipse.papyrus.infra.queries.core.configuration.QueryConfiguration;

 

 /**

  * <!-- begin-user-doc -->

@@ -20,19 +20,19 @@ import org.eclipse.papyrus.core.queries.configuration.QueryConfiguration;
  * <p>

  * The following features are supported:

  * <ul>

- *   <li>{@link org.eclipse.papyrus.extendedtypes.ExtendedElementTypeConfiguration#getName <em>Name</em>}</li>

- *   <li>{@link org.eclipse.papyrus.extendedtypes.ExtendedElementTypeConfiguration#getId <em>Id</em>}</li>

- *   <li>{@link org.eclipse.papyrus.extendedtypes.ExtendedElementTypeConfiguration#getIconEntry <em>Icon Entry</em>}</li>

- *   <li>{@link org.eclipse.papyrus.extendedtypes.ExtendedElementTypeConfiguration#getHint <em>Hint</em>}</li>

- *   <li>{@link org.eclipse.papyrus.extendedtypes.ExtendedElementTypeConfiguration#getKindName <em>Kind Name</em>}</li>

- *   <li>{@link org.eclipse.papyrus.extendedtypes.ExtendedElementTypeConfiguration#getSpecializedTypesID <em>Specialized Types ID</em>}</li>

- *   <li>{@link org.eclipse.papyrus.extendedtypes.ExtendedElementTypeConfiguration#getPreValidation <em>Pre Validation</em>}</li>

- *   <li>{@link org.eclipse.papyrus.extendedtypes.ExtendedElementTypeConfiguration#getPreAction <em>Pre Action</em>}</li>

- *   <li>{@link org.eclipse.papyrus.extendedtypes.ExtendedElementTypeConfiguration#getPostAction <em>Post Action</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.infra.extendedtypes.ExtendedElementTypeConfiguration#getName <em>Name</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.infra.extendedtypes.ExtendedElementTypeConfiguration#getId <em>Id</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.infra.extendedtypes.ExtendedElementTypeConfiguration#getIconEntry <em>Icon Entry</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.infra.extendedtypes.ExtendedElementTypeConfiguration#getHint <em>Hint</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.infra.extendedtypes.ExtendedElementTypeConfiguration#getKindName <em>Kind Name</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.infra.extendedtypes.ExtendedElementTypeConfiguration#getSpecializedTypesID <em>Specialized Types ID</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.infra.extendedtypes.ExtendedElementTypeConfiguration#getPreValidation <em>Pre Validation</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.infra.extendedtypes.ExtendedElementTypeConfiguration#getPreAction <em>Pre Action</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.infra.extendedtypes.ExtendedElementTypeConfiguration#getPostAction <em>Post Action</em>}</li>

  * </ul>

  * </p>

  *

- * @see org.eclipse.papyrus.extendedtypes.ExtendedtypesPackage#getExtendedElementTypeConfiguration()

+ * @see org.eclipse.papyrus.infra.extendedtypes.ExtendedtypesPackage#getExtendedElementTypeConfiguration()

  * @model

  * @generated

  */

@@ -47,14 +47,14 @@ public interface ExtendedElementTypeConfiguration extends EObject {
 	 * <!-- end-user-doc -->

 	 * @return the value of the '<em>Name</em>' attribute.

 	 * @see #setName(String)

-	 * @see org.eclipse.papyrus.extendedtypes.ExtendedtypesPackage#getExtendedElementTypeConfiguration_Name()

+	 * @see org.eclipse.papyrus.infra.extendedtypes.ExtendedtypesPackage#getExtendedElementTypeConfiguration_Name()

 	 * @model required="true"

 	 * @generated

 	 */

 	String getName();

 

 	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.extendedtypes.ExtendedElementTypeConfiguration#getName <em>Name</em>}' attribute.

+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.extendedtypes.ExtendedElementTypeConfiguration#getName <em>Name</em>}' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

 	 * @param value the new value of the '<em>Name</em>' attribute.

@@ -73,14 +73,14 @@ public interface ExtendedElementTypeConfiguration extends EObject {
 	 * <!-- end-user-doc -->

 	 * @return the value of the '<em>Id</em>' attribute.

 	 * @see #setId(String)

-	 * @see org.eclipse.papyrus.extendedtypes.ExtendedtypesPackage#getExtendedElementTypeConfiguration_Id()

+	 * @see org.eclipse.papyrus.infra.extendedtypes.ExtendedtypesPackage#getExtendedElementTypeConfiguration_Id()

 	 * @model required="true"

 	 * @generated

 	 */

 	String getId();

 

 	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.extendedtypes.ExtendedElementTypeConfiguration#getId <em>Id</em>}' attribute.

+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.extendedtypes.ExtendedElementTypeConfiguration#getId <em>Id</em>}' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

 	 * @param value the new value of the '<em>Id</em>' attribute.

@@ -99,14 +99,14 @@ public interface ExtendedElementTypeConfiguration extends EObject {
 	 * <!-- end-user-doc -->

 	 * @return the value of the '<em>Icon Entry</em>' containment reference.

 	 * @see #setIconEntry(IconEntry)

-	 * @see org.eclipse.papyrus.extendedtypes.ExtendedtypesPackage#getExtendedElementTypeConfiguration_IconEntry()

+	 * @see org.eclipse.papyrus.infra.extendedtypes.ExtendedtypesPackage#getExtendedElementTypeConfiguration_IconEntry()

 	 * @model containment="true"

 	 * @generated

 	 */

 	IconEntry getIconEntry();

 

 	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.extendedtypes.ExtendedElementTypeConfiguration#getIconEntry <em>Icon Entry</em>}' containment reference.

+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.extendedtypes.ExtendedElementTypeConfiguration#getIconEntry <em>Icon Entry</em>}' containment reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

 	 * @param value the new value of the '<em>Icon Entry</em>' containment reference.

@@ -126,14 +126,14 @@ public interface ExtendedElementTypeConfiguration extends EObject {
 	 * <!-- end-user-doc -->

 	 * @return the value of the '<em>Hint</em>' attribute.

 	 * @see #setHint(String)

-	 * @see org.eclipse.papyrus.extendedtypes.ExtendedtypesPackage#getExtendedElementTypeConfiguration_Hint()

+	 * @see org.eclipse.papyrus.infra.extendedtypes.ExtendedtypesPackage#getExtendedElementTypeConfiguration_Hint()

 	 * @model default="ExtendedElements"

 	 * @generated

 	 */

 	String getHint();

 

 	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.extendedtypes.ExtendedElementTypeConfiguration#getHint <em>Hint</em>}' attribute.

+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.extendedtypes.ExtendedElementTypeConfiguration#getHint <em>Hint</em>}' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

 	 * @param value the new value of the '<em>Hint</em>' attribute.

@@ -153,14 +153,14 @@ public interface ExtendedElementTypeConfiguration extends EObject {
 	 * <!-- end-user-doc -->

 	 * @return the value of the '<em>Kind Name</em>' attribute.

 	 * @see #setKindName(String)

-	 * @see org.eclipse.papyrus.extendedtypes.ExtendedtypesPackage#getExtendedElementTypeConfiguration_KindName()

+	 * @see org.eclipse.papyrus.infra.extendedtypes.ExtendedtypesPackage#getExtendedElementTypeConfiguration_KindName()

 	 * @model default="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

 	 * @generated

 	 */

 	String getKindName();

 

 	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.extendedtypes.ExtendedElementTypeConfiguration#getKindName <em>Kind Name</em>}' attribute.

+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.extendedtypes.ExtendedElementTypeConfiguration#getKindName <em>Kind Name</em>}' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

 	 * @param value the new value of the '<em>Kind Name</em>' attribute.

@@ -179,7 +179,7 @@ public interface ExtendedElementTypeConfiguration extends EObject {
 	 * </p>

 	 * <!-- end-user-doc -->

 	 * @return the value of the '<em>Specialized Types ID</em>' attribute list.

-	 * @see org.eclipse.papyrus.extendedtypes.ExtendedtypesPackage#getExtendedElementTypeConfiguration_SpecializedTypesID()

+	 * @see org.eclipse.papyrus.infra.extendedtypes.ExtendedtypesPackage#getExtendedElementTypeConfiguration_SpecializedTypesID()

 	 * @model required="true"

 	 * @generated

 	 */

@@ -187,7 +187,7 @@ public interface ExtendedElementTypeConfiguration extends EObject {
 

 	/**

 	 * Returns the value of the '<em><b>Pre Validation</b></em>' reference list.

-	 * The list contents are of type {@link org.eclipse.papyrus.core.queries.configuration.QueryConfiguration}.

+	 * The list contents are of type {@link org.eclipse.papyrus.infra.queries.core.configuration.QueryConfiguration}.

 	 * <!-- begin-user-doc -->

 	 * <p>

 	 * If the meaning of the '<em>Pre Validation</em>' reference list isn't clear,

@@ -195,7 +195,7 @@ public interface ExtendedElementTypeConfiguration extends EObject {
 	 * </p>

 	 * <!-- end-user-doc -->

 	 * @return the value of the '<em>Pre Validation</em>' reference list.

-	 * @see org.eclipse.papyrus.extendedtypes.ExtendedtypesPackage#getExtendedElementTypeConfiguration_PreValidation()

+	 * @see org.eclipse.papyrus.infra.extendedtypes.ExtendedtypesPackage#getExtendedElementTypeConfiguration_PreValidation()

 	 * @model

 	 * @generated

 	 */

@@ -203,7 +203,7 @@ public interface ExtendedElementTypeConfiguration extends EObject {
 

 	/**

 	 * Returns the value of the '<em><b>Pre Action</b></em>' containment reference list.

-	 * The list contents are of type {@link org.eclipse.papyrus.extendedtypes.PreActionConfiguration}.

+	 * The list contents are of type {@link org.eclipse.papyrus.infra.extendedtypes.PreActionConfiguration}.

 	 * <!-- begin-user-doc -->

 	 * <p>

 	 * If the meaning of the '<em>Pre Action</em>' containment reference list isn't clear,

@@ -211,7 +211,7 @@ public interface ExtendedElementTypeConfiguration extends EObject {
 	 * </p>

 	 * <!-- end-user-doc -->

 	 * @return the value of the '<em>Pre Action</em>' containment reference list.

-	 * @see org.eclipse.papyrus.extendedtypes.ExtendedtypesPackage#getExtendedElementTypeConfiguration_PreAction()

+	 * @see org.eclipse.papyrus.infra.extendedtypes.ExtendedtypesPackage#getExtendedElementTypeConfiguration_PreAction()

 	 * @model containment="true"

 	 * @generated

 	 */

@@ -219,7 +219,7 @@ public interface ExtendedElementTypeConfiguration extends EObject {
 

 	/**

 	 * Returns the value of the '<em><b>Post Action</b></em>' containment reference list.

-	 * The list contents are of type {@link org.eclipse.papyrus.extendedtypes.PostActionConfiguration}.

+	 * The list contents are of type {@link org.eclipse.papyrus.infra.extendedtypes.PostActionConfiguration}.

 	 * <!-- begin-user-doc -->

 	 * <p>

 	 * If the meaning of the '<em>Post Action</em>' containment reference list isn't clear,

@@ -227,7 +227,7 @@ public interface ExtendedElementTypeConfiguration extends EObject {
 	 * </p>

 	 * <!-- end-user-doc -->

 	 * @return the value of the '<em>Post Action</em>' containment reference list.

-	 * @see org.eclipse.papyrus.extendedtypes.ExtendedtypesPackage#getExtendedElementTypeConfiguration_PostAction()

+	 * @see org.eclipse.papyrus.infra.extendedtypes.ExtendedtypesPackage#getExtendedElementTypeConfiguration_PostAction()

 	 * @model containment="true"

 	 * @generated

 	 */

diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/extendedtypes/ExtendedElementTypeSet.java b/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/ExtendedElementTypeSet.java
index 3e813ca309e..25b13ec32e4 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/extendedtypes/ExtendedElementTypeSet.java
+++ b/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/ExtendedElementTypeSet.java
@@ -4,7 +4,7 @@
  *

  * $Id$

  */

-package org.eclipse.papyrus.extendedtypes;

+package org.eclipse.papyrus.infra.extendedtypes;

 

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

 

@@ -18,19 +18,19 @@ import org.eclipse.emf.ecore.EObject;
  * <p>

  * The following features are supported:

  * <ul>

- *   <li>{@link org.eclipse.papyrus.extendedtypes.ExtendedElementTypeSet#getElementType <em>Element Type</em>}</li>

- *   <li>{@link org.eclipse.papyrus.extendedtypes.ExtendedElementTypeSet#getId <em>Id</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.infra.extendedtypes.ExtendedElementTypeSet#getElementType <em>Element Type</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.infra.extendedtypes.ExtendedElementTypeSet#getId <em>Id</em>}</li>

  * </ul>

  * </p>

  *

- * @see org.eclipse.papyrus.extendedtypes.ExtendedtypesPackage#getExtendedElementTypeSet()

+ * @see org.eclipse.papyrus.infra.extendedtypes.ExtendedtypesPackage#getExtendedElementTypeSet()

  * @model

  * @generated

  */

 public interface ExtendedElementTypeSet extends EObject {

 	/**

 	 * Returns the value of the '<em><b>Element Type</b></em>' containment reference list.

-	 * The list contents are of type {@link org.eclipse.papyrus.extendedtypes.ExtendedElementTypeConfiguration}.

+	 * The list contents are of type {@link org.eclipse.papyrus.infra.extendedtypes.ExtendedElementTypeConfiguration}.

 	 * <!-- begin-user-doc -->

 	 * <p>

 	 * If the meaning of the '<em>Element Type</em>' containment reference list isn't clear,

@@ -38,7 +38,7 @@ public interface ExtendedElementTypeSet extends EObject {
 	 * </p>

 	 * <!-- end-user-doc -->

 	 * @return the value of the '<em>Element Type</em>' containment reference list.

-	 * @see org.eclipse.papyrus.extendedtypes.ExtendedtypesPackage#getExtendedElementTypeSet_ElementType()

+	 * @see org.eclipse.papyrus.infra.extendedtypes.ExtendedtypesPackage#getExtendedElementTypeSet_ElementType()

 	 * @model containment="true" required="true"

 	 * @generated

 	 */

@@ -54,14 +54,14 @@ public interface ExtendedElementTypeSet extends EObject {
 	 * <!-- end-user-doc -->

 	 * @return the value of the '<em>Id</em>' attribute.

 	 * @see #setId(String)

-	 * @see org.eclipse.papyrus.extendedtypes.ExtendedtypesPackage#getExtendedElementTypeSet_Id()

+	 * @see org.eclipse.papyrus.infra.extendedtypes.ExtendedtypesPackage#getExtendedElementTypeSet_Id()

 	 * @model required="true"

 	 * @generated

 	 */

 	String getId();

 

 	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.extendedtypes.ExtendedElementTypeSet#getId <em>Id</em>}' attribute.

+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.extendedtypes.ExtendedElementTypeSet#getId <em>Id</em>}' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

 	 * @param value the new value of the '<em>Id</em>' attribute.

diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/extendedtypes/ExtendedtypesFactory.java b/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/ExtendedtypesFactory.java
index 1b90617db96..f395b7b0c55 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/extendedtypes/ExtendedtypesFactory.java
+++ b/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/ExtendedtypesFactory.java
@@ -4,7 +4,7 @@
  *

  * $Id$

  */

-package org.eclipse.papyrus.extendedtypes;

+package org.eclipse.papyrus.infra.extendedtypes;

 

 import org.eclipse.emf.ecore.EFactory;

 

@@ -13,7 +13,7 @@ import org.eclipse.emf.ecore.EFactory;
  * The <b>Factory</b> for the model.

  * It provides a create method for each non-abstract class of the model.

  * <!-- end-user-doc -->

- * @see org.eclipse.papyrus.extendedtypes.ExtendedtypesPackage

+ * @see org.eclipse.papyrus.infra.extendedtypes.ExtendedtypesPackage

  * @generated

  */

 public interface ExtendedtypesFactory extends EFactory {

@@ -23,7 +23,7 @@ public interface ExtendedtypesFactory extends EFactory {
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

-	ExtendedtypesFactory eINSTANCE = org.eclipse.papyrus.extendedtypes.impl.ExtendedtypesFactoryImpl.init();

+	ExtendedtypesFactory eINSTANCE = org.eclipse.papyrus.infra.extendedtypes.impl.ExtendedtypesFactoryImpl.init();

 

 	/**

 	 * Returns a new object of class '<em>Extended Element Type Set</em>'.

diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/extendedtypes/ExtendedtypesPackage.java b/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/ExtendedtypesPackage.java
index ca11cef8a86..fc3457ac112 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/extendedtypes/ExtendedtypesPackage.java
+++ b/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/ExtendedtypesPackage.java
@@ -4,7 +4,7 @@
  *

  * $Id$

  */

-package org.eclipse.papyrus.extendedtypes;

+package org.eclipse.papyrus.infra.extendedtypes;

 

 import org.eclipse.emf.ecore.EAttribute;

 import org.eclipse.emf.ecore.EClass;

@@ -22,7 +22,7 @@ import org.eclipse.emf.ecore.EReference;
  *   <li>and each data type</li>

  * </ul>

  * <!-- end-user-doc -->

- * @see org.eclipse.papyrus.extendedtypes.ExtendedtypesFactory

+ * @see org.eclipse.papyrus.infra.extendedtypes.ExtendedtypesFactory

  * @model kind="package"

  * @generated

  */

@@ -57,14 +57,14 @@ public interface ExtendedtypesPackage extends EPackage {
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

-	ExtendedtypesPackage eINSTANCE = org.eclipse.papyrus.extendedtypes.impl.ExtendedtypesPackageImpl.init();

+	ExtendedtypesPackage eINSTANCE = org.eclipse.papyrus.infra.extendedtypes.impl.ExtendedtypesPackageImpl.init();

 

 	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.extendedtypes.impl.ExtendedElementTypeSetImpl <em>Extended Element Type Set</em>}' class.

+	 * The meta object id for the '{@link org.eclipse.papyrus.infra.extendedtypes.impl.ExtendedElementTypeSetImpl <em>Extended Element Type Set</em>}' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * @see org.eclipse.papyrus.extendedtypes.impl.ExtendedElementTypeSetImpl

-	 * @see org.eclipse.papyrus.extendedtypes.impl.ExtendedtypesPackageImpl#getExtendedElementTypeSet()

+	 * @see org.eclipse.papyrus.infra.extendedtypes.impl.ExtendedElementTypeSetImpl

+	 * @see org.eclipse.papyrus.infra.extendedtypes.impl.ExtendedtypesPackageImpl#getExtendedElementTypeSet()

 	 * @generated

 	 */

 	int EXTENDED_ELEMENT_TYPE_SET = 0;

@@ -97,11 +97,11 @@ public interface ExtendedtypesPackage extends EPackage {
 	int EXTENDED_ELEMENT_TYPE_SET_FEATURE_COUNT = 2;

 

 	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.extendedtypes.impl.ExtendedElementTypeConfigurationImpl <em>Extended Element Type Configuration</em>}' class.

+	 * The meta object id for the '{@link org.eclipse.papyrus.infra.extendedtypes.impl.ExtendedElementTypeConfigurationImpl <em>Extended Element Type Configuration</em>}' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * @see org.eclipse.papyrus.extendedtypes.impl.ExtendedElementTypeConfigurationImpl

-	 * @see org.eclipse.papyrus.extendedtypes.impl.ExtendedtypesPackageImpl#getExtendedElementTypeConfiguration()

+	 * @see org.eclipse.papyrus.infra.extendedtypes.impl.ExtendedElementTypeConfigurationImpl

+	 * @see org.eclipse.papyrus.infra.extendedtypes.impl.ExtendedtypesPackageImpl#getExtendedElementTypeConfiguration()

 	 * @generated

 	 */

 	int EXTENDED_ELEMENT_TYPE_CONFIGURATION = 1;

@@ -197,11 +197,11 @@ public interface ExtendedtypesPackage extends EPackage {
 	int EXTENDED_ELEMENT_TYPE_CONFIGURATION_FEATURE_COUNT = 9;

 

 	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.extendedtypes.impl.IconEntryImpl <em>Icon Entry</em>}' class.

+	 * The meta object id for the '{@link org.eclipse.papyrus.infra.extendedtypes.impl.IconEntryImpl <em>Icon Entry</em>}' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * @see org.eclipse.papyrus.extendedtypes.impl.IconEntryImpl

-	 * @see org.eclipse.papyrus.extendedtypes.impl.ExtendedtypesPackageImpl#getIconEntry()

+	 * @see org.eclipse.papyrus.infra.extendedtypes.impl.IconEntryImpl

+	 * @see org.eclipse.papyrus.infra.extendedtypes.impl.ExtendedtypesPackageImpl#getIconEntry()

 	 * @generated

 	 */

 	int ICON_ENTRY = 2;

@@ -234,11 +234,11 @@ public interface ExtendedtypesPackage extends EPackage {
 	int ICON_ENTRY_FEATURE_COUNT = 2;

 

 	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.extendedtypes.impl.ActionConfigurationImpl <em>Action Configuration</em>}' class.

+	 * The meta object id for the '{@link org.eclipse.papyrus.infra.extendedtypes.impl.ActionConfigurationImpl <em>Action Configuration</em>}' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * @see org.eclipse.papyrus.extendedtypes.impl.ActionConfigurationImpl

-	 * @see org.eclipse.papyrus.extendedtypes.impl.ExtendedtypesPackageImpl#getActionConfiguration()

+	 * @see org.eclipse.papyrus.infra.extendedtypes.impl.ActionConfigurationImpl

+	 * @see org.eclipse.papyrus.infra.extendedtypes.impl.ExtendedtypesPackageImpl#getActionConfiguration()

 	 * @generated

 	 */

 	int ACTION_CONFIGURATION = 3;

@@ -271,11 +271,11 @@ public interface ExtendedtypesPackage extends EPackage {
 	int ACTION_CONFIGURATION_FEATURE_COUNT = 2;

 

 	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.extendedtypes.impl.PreActionConfigurationImpl <em>Pre Action Configuration</em>}' class.

+	 * The meta object id for the '{@link org.eclipse.papyrus.infra.extendedtypes.impl.PreActionConfigurationImpl <em>Pre Action Configuration</em>}' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * @see org.eclipse.papyrus.extendedtypes.impl.PreActionConfigurationImpl

-	 * @see org.eclipse.papyrus.extendedtypes.impl.ExtendedtypesPackageImpl#getPreActionConfiguration()

+	 * @see org.eclipse.papyrus.infra.extendedtypes.impl.PreActionConfigurationImpl

+	 * @see org.eclipse.papyrus.infra.extendedtypes.impl.ExtendedtypesPackageImpl#getPreActionConfiguration()

 	 * @generated

 	 */

 	int PRE_ACTION_CONFIGURATION = 4;

@@ -308,11 +308,11 @@ public interface ExtendedtypesPackage extends EPackage {
 	int PRE_ACTION_CONFIGURATION_FEATURE_COUNT = ACTION_CONFIGURATION_FEATURE_COUNT + 0;

 

 	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.extendedtypes.impl.PostActionConfigurationImpl <em>Post Action Configuration</em>}' class.

+	 * The meta object id for the '{@link org.eclipse.papyrus.infra.extendedtypes.impl.PostActionConfigurationImpl <em>Post Action Configuration</em>}' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * @see org.eclipse.papyrus.extendedtypes.impl.PostActionConfigurationImpl

-	 * @see org.eclipse.papyrus.extendedtypes.impl.ExtendedtypesPackageImpl#getPostActionConfiguration()

+	 * @see org.eclipse.papyrus.infra.extendedtypes.impl.PostActionConfigurationImpl

+	 * @see org.eclipse.papyrus.infra.extendedtypes.impl.ExtendedtypesPackageImpl#getPostActionConfiguration()

 	 * @generated

 	 */

 	int POST_ACTION_CONFIGURATION = 5;

@@ -346,226 +346,226 @@ public interface ExtendedtypesPackage extends EPackage {
 

 

 	/**

-	 * Returns the meta object for class '{@link org.eclipse.papyrus.extendedtypes.ExtendedElementTypeSet <em>Extended Element Type Set</em>}'.

+	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.extendedtypes.ExtendedElementTypeSet <em>Extended Element Type Set</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

 	 * @return the meta object for class '<em>Extended Element Type Set</em>'.

-	 * @see org.eclipse.papyrus.extendedtypes.ExtendedElementTypeSet

+	 * @see org.eclipse.papyrus.infra.extendedtypes.ExtendedElementTypeSet

 	 * @generated

 	 */

 	EClass getExtendedElementTypeSet();

 

 	/**

-	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.extendedtypes.ExtendedElementTypeSet#getElementType <em>Element Type</em>}'.

+	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.infra.extendedtypes.ExtendedElementTypeSet#getElementType <em>Element Type</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

 	 * @return the meta object for the containment reference list '<em>Element Type</em>'.

-	 * @see org.eclipse.papyrus.extendedtypes.ExtendedElementTypeSet#getElementType()

+	 * @see org.eclipse.papyrus.infra.extendedtypes.ExtendedElementTypeSet#getElementType()

 	 * @see #getExtendedElementTypeSet()

 	 * @generated

 	 */

 	EReference getExtendedElementTypeSet_ElementType();

 

 	/**

-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.extendedtypes.ExtendedElementTypeSet#getId <em>Id</em>}'.

+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.extendedtypes.ExtendedElementTypeSet#getId <em>Id</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

 	 * @return the meta object for the attribute '<em>Id</em>'.

-	 * @see org.eclipse.papyrus.extendedtypes.ExtendedElementTypeSet#getId()

+	 * @see org.eclipse.papyrus.infra.extendedtypes.ExtendedElementTypeSet#getId()

 	 * @see #getExtendedElementTypeSet()

 	 * @generated

 	 */

 	EAttribute getExtendedElementTypeSet_Id();

 

 	/**

-	 * Returns the meta object for class '{@link org.eclipse.papyrus.extendedtypes.ExtendedElementTypeConfiguration <em>Extended Element Type Configuration</em>}'.

+	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.extendedtypes.ExtendedElementTypeConfiguration <em>Extended Element Type Configuration</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

 	 * @return the meta object for class '<em>Extended Element Type Configuration</em>'.

-	 * @see org.eclipse.papyrus.extendedtypes.ExtendedElementTypeConfiguration

+	 * @see org.eclipse.papyrus.infra.extendedtypes.ExtendedElementTypeConfiguration

 	 * @generated

 	 */

 	EClass getExtendedElementTypeConfiguration();

 

 	/**

-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.extendedtypes.ExtendedElementTypeConfiguration#getName <em>Name</em>}'.

+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.extendedtypes.ExtendedElementTypeConfiguration#getName <em>Name</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

 	 * @return the meta object for the attribute '<em>Name</em>'.

-	 * @see org.eclipse.papyrus.extendedtypes.ExtendedElementTypeConfiguration#getName()

+	 * @see org.eclipse.papyrus.infra.extendedtypes.ExtendedElementTypeConfiguration#getName()

 	 * @see #getExtendedElementTypeConfiguration()

 	 * @generated

 	 */

 	EAttribute getExtendedElementTypeConfiguration_Name();

 

 	/**

-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.extendedtypes.ExtendedElementTypeConfiguration#getId <em>Id</em>}'.

+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.extendedtypes.ExtendedElementTypeConfiguration#getId <em>Id</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

 	 * @return the meta object for the attribute '<em>Id</em>'.

-	 * @see org.eclipse.papyrus.extendedtypes.ExtendedElementTypeConfiguration#getId()

+	 * @see org.eclipse.papyrus.infra.extendedtypes.ExtendedElementTypeConfiguration#getId()

 	 * @see #getExtendedElementTypeConfiguration()

 	 * @generated

 	 */

 	EAttribute getExtendedElementTypeConfiguration_Id();

 

 	/**

-	 * Returns the meta object for the containment reference '{@link org.eclipse.papyrus.extendedtypes.ExtendedElementTypeConfiguration#getIconEntry <em>Icon Entry</em>}'.

+	 * Returns the meta object for the containment reference '{@link org.eclipse.papyrus.infra.extendedtypes.ExtendedElementTypeConfiguration#getIconEntry <em>Icon Entry</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

 	 * @return the meta object for the containment reference '<em>Icon Entry</em>'.

-	 * @see org.eclipse.papyrus.extendedtypes.ExtendedElementTypeConfiguration#getIconEntry()

+	 * @see org.eclipse.papyrus.infra.extendedtypes.ExtendedElementTypeConfiguration#getIconEntry()

 	 * @see #getExtendedElementTypeConfiguration()

 	 * @generated

 	 */

 	EReference getExtendedElementTypeConfiguration_IconEntry();

 

 	/**

-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.extendedtypes.ExtendedElementTypeConfiguration#getHint <em>Hint</em>}'.

+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.extendedtypes.ExtendedElementTypeConfiguration#getHint <em>Hint</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

 	 * @return the meta object for the attribute '<em>Hint</em>'.

-	 * @see org.eclipse.papyrus.extendedtypes.ExtendedElementTypeConfiguration#getHint()

+	 * @see org.eclipse.papyrus.infra.extendedtypes.ExtendedElementTypeConfiguration#getHint()

 	 * @see #getExtendedElementTypeConfiguration()

 	 * @generated

 	 */

 	EAttribute getExtendedElementTypeConfiguration_Hint();

 

 	/**

-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.extendedtypes.ExtendedElementTypeConfiguration#getKindName <em>Kind Name</em>}'.

+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.extendedtypes.ExtendedElementTypeConfiguration#getKindName <em>Kind Name</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

 	 * @return the meta object for the attribute '<em>Kind Name</em>'.

-	 * @see org.eclipse.papyrus.extendedtypes.ExtendedElementTypeConfiguration#getKindName()

+	 * @see org.eclipse.papyrus.infra.extendedtypes.ExtendedElementTypeConfiguration#getKindName()

 	 * @see #getExtendedElementTypeConfiguration()

 	 * @generated

 	 */

 	EAttribute getExtendedElementTypeConfiguration_KindName();

 

 	/**

-	 * Returns the meta object for the attribute list '{@link org.eclipse.papyrus.extendedtypes.ExtendedElementTypeConfiguration#getSpecializedTypesID <em>Specialized Types ID</em>}'.

+	 * Returns the meta object for the attribute list '{@link org.eclipse.papyrus.infra.extendedtypes.ExtendedElementTypeConfiguration#getSpecializedTypesID <em>Specialized Types ID</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

 	 * @return the meta object for the attribute list '<em>Specialized Types ID</em>'.

-	 * @see org.eclipse.papyrus.extendedtypes.ExtendedElementTypeConfiguration#getSpecializedTypesID()

+	 * @see org.eclipse.papyrus.infra.extendedtypes.ExtendedElementTypeConfiguration#getSpecializedTypesID()

 	 * @see #getExtendedElementTypeConfiguration()

 	 * @generated

 	 */

 	EAttribute getExtendedElementTypeConfiguration_SpecializedTypesID();

 

 	/**

-	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.extendedtypes.ExtendedElementTypeConfiguration#getPreValidation <em>Pre Validation</em>}'.

+	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.infra.extendedtypes.ExtendedElementTypeConfiguration#getPreValidation <em>Pre Validation</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

 	 * @return the meta object for the reference list '<em>Pre Validation</em>'.

-	 * @see org.eclipse.papyrus.extendedtypes.ExtendedElementTypeConfiguration#getPreValidation()

+	 * @see org.eclipse.papyrus.infra.extendedtypes.ExtendedElementTypeConfiguration#getPreValidation()

 	 * @see #getExtendedElementTypeConfiguration()

 	 * @generated

 	 */

 	EReference getExtendedElementTypeConfiguration_PreValidation();

 

 	/**

-	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.extendedtypes.ExtendedElementTypeConfiguration#getPreAction <em>Pre Action</em>}'.

+	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.infra.extendedtypes.ExtendedElementTypeConfiguration#getPreAction <em>Pre Action</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

 	 * @return the meta object for the containment reference list '<em>Pre Action</em>'.

-	 * @see org.eclipse.papyrus.extendedtypes.ExtendedElementTypeConfiguration#getPreAction()

+	 * @see org.eclipse.papyrus.infra.extendedtypes.ExtendedElementTypeConfiguration#getPreAction()

 	 * @see #getExtendedElementTypeConfiguration()

 	 * @generated

 	 */

 	EReference getExtendedElementTypeConfiguration_PreAction();

 

 	/**

-	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.extendedtypes.ExtendedElementTypeConfiguration#getPostAction <em>Post Action</em>}'.

+	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.infra.extendedtypes.ExtendedElementTypeConfiguration#getPostAction <em>Post Action</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

 	 * @return the meta object for the containment reference list '<em>Post Action</em>'.

-	 * @see org.eclipse.papyrus.extendedtypes.ExtendedElementTypeConfiguration#getPostAction()

+	 * @see org.eclipse.papyrus.infra.extendedtypes.ExtendedElementTypeConfiguration#getPostAction()

 	 * @see #getExtendedElementTypeConfiguration()

 	 * @generated

 	 */

 	EReference getExtendedElementTypeConfiguration_PostAction();

 

 	/**

-	 * Returns the meta object for class '{@link org.eclipse.papyrus.extendedtypes.IconEntry <em>Icon Entry</em>}'.

+	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.extendedtypes.IconEntry <em>Icon Entry</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

 	 * @return the meta object for class '<em>Icon Entry</em>'.

-	 * @see org.eclipse.papyrus.extendedtypes.IconEntry

+	 * @see org.eclipse.papyrus.infra.extendedtypes.IconEntry

 	 * @generated

 	 */

 	EClass getIconEntry();

 

 	/**

-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.extendedtypes.IconEntry#getIconPath <em>Icon Path</em>}'.

+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.extendedtypes.IconEntry#getIconPath <em>Icon Path</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

 	 * @return the meta object for the attribute '<em>Icon Path</em>'.

-	 * @see org.eclipse.papyrus.extendedtypes.IconEntry#getIconPath()

+	 * @see org.eclipse.papyrus.infra.extendedtypes.IconEntry#getIconPath()

 	 * @see #getIconEntry()

 	 * @generated

 	 */

 	EAttribute getIconEntry_IconPath();

 

 	/**

-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.extendedtypes.IconEntry#getBundleId <em>Bundle Id</em>}'.

+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.extendedtypes.IconEntry#getBundleId <em>Bundle Id</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

 	 * @return the meta object for the attribute '<em>Bundle Id</em>'.

-	 * @see org.eclipse.papyrus.extendedtypes.IconEntry#getBundleId()

+	 * @see org.eclipse.papyrus.infra.extendedtypes.IconEntry#getBundleId()

 	 * @see #getIconEntry()

 	 * @generated

 	 */

 	EAttribute getIconEntry_BundleId();

 

 	/**

-	 * Returns the meta object for class '{@link org.eclipse.papyrus.extendedtypes.ActionConfiguration <em>Action Configuration</em>}'.

+	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.extendedtypes.ActionConfiguration <em>Action Configuration</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

 	 * @return the meta object for class '<em>Action Configuration</em>'.

-	 * @see org.eclipse.papyrus.extendedtypes.ActionConfiguration

+	 * @see org.eclipse.papyrus.infra.extendedtypes.ActionConfiguration

 	 * @generated

 	 */

 	EClass getActionConfiguration();

 

 	/**

-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.extendedtypes.ActionConfiguration#getLabel <em>Label</em>}'.

+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.extendedtypes.ActionConfiguration#getLabel <em>Label</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

 	 * @return the meta object for the attribute '<em>Label</em>'.

-	 * @see org.eclipse.papyrus.extendedtypes.ActionConfiguration#getLabel()

+	 * @see org.eclipse.papyrus.infra.extendedtypes.ActionConfiguration#getLabel()

 	 * @see #getActionConfiguration()

 	 * @generated

 	 */

 	EAttribute getActionConfiguration_Label();

 

 	/**

-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.extendedtypes.ActionConfiguration#getId <em>Id</em>}'.

+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.extendedtypes.ActionConfiguration#getId <em>Id</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

 	 * @return the meta object for the attribute '<em>Id</em>'.

-	 * @see org.eclipse.papyrus.extendedtypes.ActionConfiguration#getId()

+	 * @see org.eclipse.papyrus.infra.extendedtypes.ActionConfiguration#getId()

 	 * @see #getActionConfiguration()

 	 * @generated

 	 */

 	EAttribute getActionConfiguration_Id();

 

 	/**

-	 * Returns the meta object for class '{@link org.eclipse.papyrus.extendedtypes.PreActionConfiguration <em>Pre Action Configuration</em>}'.

+	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.extendedtypes.PreActionConfiguration <em>Pre Action Configuration</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

 	 * @return the meta object for class '<em>Pre Action Configuration</em>'.

-	 * @see org.eclipse.papyrus.extendedtypes.PreActionConfiguration

+	 * @see org.eclipse.papyrus.infra.extendedtypes.PreActionConfiguration

 	 * @generated

 	 */

 	EClass getPreActionConfiguration();

 

 	/**

-	 * Returns the meta object for class '{@link org.eclipse.papyrus.extendedtypes.PostActionConfiguration <em>Post Action Configuration</em>}'.

+	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.extendedtypes.PostActionConfiguration <em>Post Action Configuration</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

 	 * @return the meta object for class '<em>Post Action Configuration</em>'.

-	 * @see org.eclipse.papyrus.extendedtypes.PostActionConfiguration

+	 * @see org.eclipse.papyrus.infra.extendedtypes.PostActionConfiguration

 	 * @generated

 	 */

 	EClass getPostActionConfiguration();

@@ -593,11 +593,11 @@ public interface ExtendedtypesPackage extends EPackage {
 	 */

 	interface Literals {

 		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.extendedtypes.impl.ExtendedElementTypeSetImpl <em>Extended Element Type Set</em>}' class.

+		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.extendedtypes.impl.ExtendedElementTypeSetImpl <em>Extended Element Type Set</em>}' class.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 * @see org.eclipse.papyrus.extendedtypes.impl.ExtendedElementTypeSetImpl

-		 * @see org.eclipse.papyrus.extendedtypes.impl.ExtendedtypesPackageImpl#getExtendedElementTypeSet()

+		 * @see org.eclipse.papyrus.infra.extendedtypes.impl.ExtendedElementTypeSetImpl

+		 * @see org.eclipse.papyrus.infra.extendedtypes.impl.ExtendedtypesPackageImpl#getExtendedElementTypeSet()

 		 * @generated

 		 */

 		EClass EXTENDED_ELEMENT_TYPE_SET = eINSTANCE.getExtendedElementTypeSet();

@@ -619,11 +619,11 @@ public interface ExtendedtypesPackage extends EPackage {
 		EAttribute EXTENDED_ELEMENT_TYPE_SET__ID = eINSTANCE.getExtendedElementTypeSet_Id();

 

 		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.extendedtypes.impl.ExtendedElementTypeConfigurationImpl <em>Extended Element Type Configuration</em>}' class.

+		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.extendedtypes.impl.ExtendedElementTypeConfigurationImpl <em>Extended Element Type Configuration</em>}' class.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 * @see org.eclipse.papyrus.extendedtypes.impl.ExtendedElementTypeConfigurationImpl

-		 * @see org.eclipse.papyrus.extendedtypes.impl.ExtendedtypesPackageImpl#getExtendedElementTypeConfiguration()

+		 * @see org.eclipse.papyrus.infra.extendedtypes.impl.ExtendedElementTypeConfigurationImpl

+		 * @see org.eclipse.papyrus.infra.extendedtypes.impl.ExtendedtypesPackageImpl#getExtendedElementTypeConfiguration()

 		 * @generated

 		 */

 		EClass EXTENDED_ELEMENT_TYPE_CONFIGURATION = eINSTANCE.getExtendedElementTypeConfiguration();

@@ -701,11 +701,11 @@ public interface ExtendedtypesPackage extends EPackage {
 		EReference EXTENDED_ELEMENT_TYPE_CONFIGURATION__POST_ACTION = eINSTANCE.getExtendedElementTypeConfiguration_PostAction();

 

 		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.extendedtypes.impl.IconEntryImpl <em>Icon Entry</em>}' class.

+		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.extendedtypes.impl.IconEntryImpl <em>Icon Entry</em>}' class.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 * @see org.eclipse.papyrus.extendedtypes.impl.IconEntryImpl

-		 * @see org.eclipse.papyrus.extendedtypes.impl.ExtendedtypesPackageImpl#getIconEntry()

+		 * @see org.eclipse.papyrus.infra.extendedtypes.impl.IconEntryImpl

+		 * @see org.eclipse.papyrus.infra.extendedtypes.impl.ExtendedtypesPackageImpl#getIconEntry()

 		 * @generated

 		 */

 		EClass ICON_ENTRY = eINSTANCE.getIconEntry();

@@ -727,11 +727,11 @@ public interface ExtendedtypesPackage extends EPackage {
 		EAttribute ICON_ENTRY__BUNDLE_ID = eINSTANCE.getIconEntry_BundleId();

 

 		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.extendedtypes.impl.ActionConfigurationImpl <em>Action Configuration</em>}' class.

+		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.extendedtypes.impl.ActionConfigurationImpl <em>Action Configuration</em>}' class.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 * @see org.eclipse.papyrus.extendedtypes.impl.ActionConfigurationImpl

-		 * @see org.eclipse.papyrus.extendedtypes.impl.ExtendedtypesPackageImpl#getActionConfiguration()

+		 * @see org.eclipse.papyrus.infra.extendedtypes.impl.ActionConfigurationImpl

+		 * @see org.eclipse.papyrus.infra.extendedtypes.impl.ExtendedtypesPackageImpl#getActionConfiguration()

 		 * @generated

 		 */

 		EClass ACTION_CONFIGURATION = eINSTANCE.getActionConfiguration();

@@ -753,21 +753,21 @@ public interface ExtendedtypesPackage extends EPackage {
 		EAttribute ACTION_CONFIGURATION__ID = eINSTANCE.getActionConfiguration_Id();

 

 		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.extendedtypes.impl.PreActionConfigurationImpl <em>Pre Action Configuration</em>}' class.

+		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.extendedtypes.impl.PreActionConfigurationImpl <em>Pre Action Configuration</em>}' class.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 * @see org.eclipse.papyrus.extendedtypes.impl.PreActionConfigurationImpl

-		 * @see org.eclipse.papyrus.extendedtypes.impl.ExtendedtypesPackageImpl#getPreActionConfiguration()

+		 * @see org.eclipse.papyrus.infra.extendedtypes.impl.PreActionConfigurationImpl

+		 * @see org.eclipse.papyrus.infra.extendedtypes.impl.ExtendedtypesPackageImpl#getPreActionConfiguration()

 		 * @generated

 		 */

 		EClass PRE_ACTION_CONFIGURATION = eINSTANCE.getPreActionConfiguration();

 

 		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.extendedtypes.impl.PostActionConfigurationImpl <em>Post Action Configuration</em>}' class.

+		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.extendedtypes.impl.PostActionConfigurationImpl <em>Post Action Configuration</em>}' class.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 * @see org.eclipse.papyrus.extendedtypes.impl.PostActionConfigurationImpl

-		 * @see org.eclipse.papyrus.extendedtypes.impl.ExtendedtypesPackageImpl#getPostActionConfiguration()

+		 * @see org.eclipse.papyrus.infra.extendedtypes.impl.PostActionConfigurationImpl

+		 * @see org.eclipse.papyrus.infra.extendedtypes.impl.ExtendedtypesPackageImpl#getPostActionConfiguration()

 		 * @generated

 		 */

 		EClass POST_ACTION_CONFIGURATION = eINSTANCE.getPostActionConfiguration();

diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/extendedtypes/IconEntry.java b/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/IconEntry.java
index a94d6bd87f0..821a7f03939 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/extendedtypes/IconEntry.java
+++ b/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/IconEntry.java
@@ -4,7 +4,7 @@
  *

  * $Id$

  */

-package org.eclipse.papyrus.extendedtypes;

+package org.eclipse.papyrus.infra.extendedtypes;

 

 import org.eclipse.emf.ecore.EObject;

 

@@ -16,12 +16,12 @@ import org.eclipse.emf.ecore.EObject;
  * <p>

  * The following features are supported:

  * <ul>

- *   <li>{@link org.eclipse.papyrus.extendedtypes.IconEntry#getIconPath <em>Icon Path</em>}</li>

- *   <li>{@link org.eclipse.papyrus.extendedtypes.IconEntry#getBundleId <em>Bundle Id</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.infra.extendedtypes.IconEntry#getIconPath <em>Icon Path</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.infra.extendedtypes.IconEntry#getBundleId <em>Bundle Id</em>}</li>

  * </ul>

  * </p>

  *

- * @see org.eclipse.papyrus.extendedtypes.ExtendedtypesPackage#getIconEntry()

+ * @see org.eclipse.papyrus.infra.extendedtypes.ExtendedtypesPackage#getIconEntry()

  * @model

  * @generated

  */

@@ -36,14 +36,14 @@ public interface IconEntry extends EObject {
 	 * <!-- end-user-doc -->

 	 * @return the value of the '<em>Icon Path</em>' attribute.

 	 * @see #setIconPath(String)

-	 * @see org.eclipse.papyrus.extendedtypes.ExtendedtypesPackage#getIconEntry_IconPath()

+	 * @see org.eclipse.papyrus.infra.extendedtypes.ExtendedtypesPackage#getIconEntry_IconPath()

 	 * @model

 	 * @generated

 	 */

 	String getIconPath();

 

 	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.extendedtypes.IconEntry#getIconPath <em>Icon Path</em>}' attribute.

+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.extendedtypes.IconEntry#getIconPath <em>Icon Path</em>}' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

 	 * @param value the new value of the '<em>Icon Path</em>' attribute.

@@ -62,14 +62,14 @@ public interface IconEntry extends EObject {
 	 * <!-- end-user-doc -->

 	 * @return the value of the '<em>Bundle Id</em>' attribute.

 	 * @see #setBundleId(String)

-	 * @see org.eclipse.papyrus.extendedtypes.ExtendedtypesPackage#getIconEntry_BundleId()

+	 * @see org.eclipse.papyrus.infra.extendedtypes.ExtendedtypesPackage#getIconEntry_BundleId()

 	 * @model

 	 * @generated

 	 */

 	String getBundleId();

 

 	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.extendedtypes.IconEntry#getBundleId <em>Bundle Id</em>}' attribute.

+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.extendedtypes.IconEntry#getBundleId <em>Bundle Id</em>}' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

 	 * @param value the new value of the '<em>Bundle Id</em>' attribute.

diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/extendedtypes/PostActionConfiguration.java b/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/PostActionConfiguration.java
index 75a34df8a6e..176d3995b88 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/extendedtypes/PostActionConfiguration.java
+++ b/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/PostActionConfiguration.java
@@ -4,7 +4,7 @@
  *

  * $Id$

  */

-package org.eclipse.papyrus.extendedtypes;

+package org.eclipse.papyrus.infra.extendedtypes;

 

 

 /**

@@ -13,7 +13,7 @@ package org.eclipse.papyrus.extendedtypes;
  * <!-- end-user-doc -->

  *

  *

- * @see org.eclipse.papyrus.extendedtypes.ExtendedtypesPackage#getPostActionConfiguration()

+ * @see org.eclipse.papyrus.infra.extendedtypes.ExtendedtypesPackage#getPostActionConfiguration()

  * @model abstract="true"

  * @generated

  */

diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/extendedtypes/PreActionConfiguration.java b/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/PreActionConfiguration.java
index 779575ff063..23ac073d44b 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/extendedtypes/PreActionConfiguration.java
+++ b/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/PreActionConfiguration.java
@@ -4,7 +4,7 @@
  *

  * $Id$

  */

-package org.eclipse.papyrus.extendedtypes;

+package org.eclipse.papyrus.infra.extendedtypes;

 

 

 /**

@@ -13,7 +13,7 @@ package org.eclipse.papyrus.extendedtypes;
  * <!-- end-user-doc -->

  *

  *

- * @see org.eclipse.papyrus.extendedtypes.ExtendedtypesPackage#getPreActionConfiguration()

+ * @see org.eclipse.papyrus.infra.extendedtypes.ExtendedtypesPackage#getPreActionConfiguration()

  * @model abstract="true"

  * @generated

  */

diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/extendedtypes/impl/ActionConfigurationImpl.java b/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/impl/ActionConfigurationImpl.java
index e1c9ec9e578..0a9a345c347 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/extendedtypes/impl/ActionConfigurationImpl.java
+++ b/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/impl/ActionConfigurationImpl.java
@@ -4,7 +4,7 @@
  *

  * $Id$

  */

-package org.eclipse.papyrus.extendedtypes.impl;

+package org.eclipse.papyrus.infra.extendedtypes.impl;

 

 import org.eclipse.emf.common.notify.Notification;

 

@@ -13,8 +13,8 @@ import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.impl.ENotificationImpl;

 import org.eclipse.emf.ecore.impl.EObjectImpl;

 

-import org.eclipse.papyrus.extendedtypes.ActionConfiguration;

-import org.eclipse.papyrus.extendedtypes.ExtendedtypesPackage;

+import org.eclipse.papyrus.infra.extendedtypes.ActionConfiguration;

+import org.eclipse.papyrus.infra.extendedtypes.ExtendedtypesPackage;

 

 /**

  * <!-- begin-user-doc -->

@@ -23,8 +23,8 @@ import org.eclipse.papyrus.extendedtypes.ExtendedtypesPackage;
  * <p>

  * The following features are implemented:

  * <ul>

- *   <li>{@link org.eclipse.papyrus.extendedtypes.impl.ActionConfigurationImpl#getLabel <em>Label</em>}</li>

- *   <li>{@link org.eclipse.papyrus.extendedtypes.impl.ActionConfigurationImpl#getId <em>Id</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.infra.extendedtypes.impl.ActionConfigurationImpl#getLabel <em>Label</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.infra.extendedtypes.impl.ActionConfigurationImpl#getId <em>Id</em>}</li>

  * </ul>

  * </p>

  *

diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/extendedtypes/impl/ExtendedElementTypeConfigurationImpl.java b/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/impl/ExtendedElementTypeConfigurationImpl.java
index 842f8093a35..665504c4c45 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/extendedtypes/impl/ExtendedElementTypeConfigurationImpl.java
+++ b/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/impl/ExtendedElementTypeConfigurationImpl.java
@@ -4,7 +4,7 @@
  *

  * $Id$

  */

-package org.eclipse.papyrus.extendedtypes.impl;

+package org.eclipse.papyrus.infra.extendedtypes.impl;

 

 import java.util.Collection;

 

@@ -24,13 +24,13 @@ import org.eclipse.emf.ecore.util.EObjectContainmentEList;
 import org.eclipse.emf.ecore.util.EObjectResolvingEList;

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

 

-import org.eclipse.papyrus.core.queries.configuration.QueryConfiguration;

 

-import org.eclipse.papyrus.extendedtypes.ExtendedElementTypeConfiguration;

-import org.eclipse.papyrus.extendedtypes.ExtendedtypesPackage;

-import org.eclipse.papyrus.extendedtypes.IconEntry;

-import org.eclipse.papyrus.extendedtypes.PostActionConfiguration;

-import org.eclipse.papyrus.extendedtypes.PreActionConfiguration;

+import org.eclipse.papyrus.infra.extendedtypes.ExtendedElementTypeConfiguration;

+import org.eclipse.papyrus.infra.extendedtypes.ExtendedtypesPackage;

+import org.eclipse.papyrus.infra.extendedtypes.IconEntry;

+import org.eclipse.papyrus.infra.extendedtypes.PostActionConfiguration;

+import org.eclipse.papyrus.infra.extendedtypes.PreActionConfiguration;

+import org.eclipse.papyrus.infra.queries.core.configuration.QueryConfiguration;

 

 /**

  * <!-- begin-user-doc -->

@@ -39,15 +39,15 @@ import org.eclipse.papyrus.extendedtypes.PreActionConfiguration;
  * <p>

  * The following features are implemented:

  * <ul>

- *   <li>{@link org.eclipse.papyrus.extendedtypes.impl.ExtendedElementTypeConfigurationImpl#getName <em>Name</em>}</li>

- *   <li>{@link org.eclipse.papyrus.extendedtypes.impl.ExtendedElementTypeConfigurationImpl#getId <em>Id</em>}</li>

- *   <li>{@link org.eclipse.papyrus.extendedtypes.impl.ExtendedElementTypeConfigurationImpl#getIconEntry <em>Icon Entry</em>}</li>

- *   <li>{@link org.eclipse.papyrus.extendedtypes.impl.ExtendedElementTypeConfigurationImpl#getHint <em>Hint</em>}</li>

- *   <li>{@link org.eclipse.papyrus.extendedtypes.impl.ExtendedElementTypeConfigurationImpl#getKindName <em>Kind Name</em>}</li>

- *   <li>{@link org.eclipse.papyrus.extendedtypes.impl.ExtendedElementTypeConfigurationImpl#getSpecializedTypesID <em>Specialized Types ID</em>}</li>

- *   <li>{@link org.eclipse.papyrus.extendedtypes.impl.ExtendedElementTypeConfigurationImpl#getPreValidation <em>Pre Validation</em>}</li>

- *   <li>{@link org.eclipse.papyrus.extendedtypes.impl.ExtendedElementTypeConfigurationImpl#getPreAction <em>Pre Action</em>}</li>

- *   <li>{@link org.eclipse.papyrus.extendedtypes.impl.ExtendedElementTypeConfigurationImpl#getPostAction <em>Post Action</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.infra.extendedtypes.impl.ExtendedElementTypeConfigurationImpl#getName <em>Name</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.infra.extendedtypes.impl.ExtendedElementTypeConfigurationImpl#getId <em>Id</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.infra.extendedtypes.impl.ExtendedElementTypeConfigurationImpl#getIconEntry <em>Icon Entry</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.infra.extendedtypes.impl.ExtendedElementTypeConfigurationImpl#getHint <em>Hint</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.infra.extendedtypes.impl.ExtendedElementTypeConfigurationImpl#getKindName <em>Kind Name</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.infra.extendedtypes.impl.ExtendedElementTypeConfigurationImpl#getSpecializedTypesID <em>Specialized Types ID</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.infra.extendedtypes.impl.ExtendedElementTypeConfigurationImpl#getPreValidation <em>Pre Validation</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.infra.extendedtypes.impl.ExtendedElementTypeConfigurationImpl#getPreAction <em>Pre Action</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.infra.extendedtypes.impl.ExtendedElementTypeConfigurationImpl#getPostAction <em>Post Action</em>}</li>

  * </ul>

  * </p>

  *

diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/extendedtypes/impl/ExtendedElementTypeSetImpl.java b/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/impl/ExtendedElementTypeSetImpl.java
index 59bf954607d..774ba9dc82c 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/extendedtypes/impl/ExtendedElementTypeSetImpl.java
+++ b/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/impl/ExtendedElementTypeSetImpl.java
@@ -4,7 +4,7 @@
  *

  * $Id$

  */

-package org.eclipse.papyrus.extendedtypes.impl;

+package org.eclipse.papyrus.infra.extendedtypes.impl;

 

 import java.util.Collection;

 

@@ -22,9 +22,9 @@ import org.eclipse.emf.ecore.impl.EObjectImpl;
 import org.eclipse.emf.ecore.util.EObjectContainmentEList;

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

 

-import org.eclipse.papyrus.extendedtypes.ExtendedElementTypeConfiguration;

-import org.eclipse.papyrus.extendedtypes.ExtendedElementTypeSet;

-import org.eclipse.papyrus.extendedtypes.ExtendedtypesPackage;

+import org.eclipse.papyrus.infra.extendedtypes.ExtendedElementTypeConfiguration;

+import org.eclipse.papyrus.infra.extendedtypes.ExtendedElementTypeSet;

+import org.eclipse.papyrus.infra.extendedtypes.ExtendedtypesPackage;

 

 /**

  * <!-- begin-user-doc -->

@@ -33,8 +33,8 @@ import org.eclipse.papyrus.extendedtypes.ExtendedtypesPackage;
  * <p>

  * The following features are implemented:

  * <ul>

- *   <li>{@link org.eclipse.papyrus.extendedtypes.impl.ExtendedElementTypeSetImpl#getElementType <em>Element Type</em>}</li>

- *   <li>{@link org.eclipse.papyrus.extendedtypes.impl.ExtendedElementTypeSetImpl#getId <em>Id</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.infra.extendedtypes.impl.ExtendedElementTypeSetImpl#getElementType <em>Element Type</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.infra.extendedtypes.impl.ExtendedElementTypeSetImpl#getId <em>Id</em>}</li>

  * </ul>

  * </p>

  *

diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/extendedtypes/impl/ExtendedtypesFactoryImpl.java b/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/impl/ExtendedtypesFactoryImpl.java
index d2617e6a23f..5dd87034cbf 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/extendedtypes/impl/ExtendedtypesFactoryImpl.java
+++ b/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/impl/ExtendedtypesFactoryImpl.java
@@ -4,7 +4,7 @@
  *

  * $Id$

  */

-package org.eclipse.papyrus.extendedtypes.impl;

+package org.eclipse.papyrus.infra.extendedtypes.impl;

 

 import org.eclipse.emf.ecore.EClass;

 import org.eclipse.emf.ecore.EObject;

@@ -14,7 +14,7 @@ import org.eclipse.emf.ecore.impl.EFactoryImpl;
 

 import org.eclipse.emf.ecore.plugin.EcorePlugin;

 

-import org.eclipse.papyrus.extendedtypes.*;

+import org.eclipse.papyrus.infra.extendedtypes.*;

 

 /**

  * <!-- begin-user-doc -->

diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/extendedtypes/impl/ExtendedtypesPackageImpl.java b/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/impl/ExtendedtypesPackageImpl.java
index 648c7bf8c39..6e9614951f9 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/extendedtypes/impl/ExtendedtypesPackageImpl.java
+++ b/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/impl/ExtendedtypesPackageImpl.java
@@ -4,7 +4,7 @@
  *

  * $Id$

  */

-package org.eclipse.papyrus.extendedtypes.impl;

+package org.eclipse.papyrus.infra.extendedtypes.impl;

 

 import org.eclipse.emf.ecore.EAttribute;

 import org.eclipse.emf.ecore.EClass;

@@ -14,16 +14,16 @@ import org.eclipse.emf.ecore.EcorePackage;
 

 import org.eclipse.emf.ecore.impl.EPackageImpl;

 

-import org.eclipse.papyrus.core.queries.configuration.ConfigurationPackage;

 

-import org.eclipse.papyrus.extendedtypes.ActionConfiguration;

-import org.eclipse.papyrus.extendedtypes.ExtendedElementTypeConfiguration;

-import org.eclipse.papyrus.extendedtypes.ExtendedElementTypeSet;

-import org.eclipse.papyrus.extendedtypes.ExtendedtypesFactory;

-import org.eclipse.papyrus.extendedtypes.ExtendedtypesPackage;

-import org.eclipse.papyrus.extendedtypes.IconEntry;

-import org.eclipse.papyrus.extendedtypes.PostActionConfiguration;

-import org.eclipse.papyrus.extendedtypes.PreActionConfiguration;

+import org.eclipse.papyrus.infra.extendedtypes.ActionConfiguration;

+import org.eclipse.papyrus.infra.extendedtypes.ExtendedElementTypeConfiguration;

+import org.eclipse.papyrus.infra.extendedtypes.ExtendedElementTypeSet;

+import org.eclipse.papyrus.infra.extendedtypes.ExtendedtypesFactory;

+import org.eclipse.papyrus.infra.extendedtypes.ExtendedtypesPackage;

+import org.eclipse.papyrus.infra.extendedtypes.IconEntry;

+import org.eclipse.papyrus.infra.extendedtypes.PostActionConfiguration;

+import org.eclipse.papyrus.infra.extendedtypes.PreActionConfiguration;

+import org.eclipse.papyrus.infra.queries.core.configuration.ConfigurationPackage;

 

 /**

  * <!-- begin-user-doc -->

@@ -85,7 +85,7 @@ public class ExtendedtypesPackageImpl extends EPackageImpl implements Extendedty
 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

 	 * @see org.eclipse.emf.ecore.EPackage.Registry

-	 * @see org.eclipse.papyrus.extendedtypes.ExtendedtypesPackage#eNS_URI

+	 * @see org.eclipse.papyrus.infra.extendedtypes.ExtendedtypesPackage#eNS_URI

 	 * @see #init()

 	 * @generated

 	 */

diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/extendedtypes/impl/IconEntryImpl.java b/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/impl/IconEntryImpl.java
index 266ff64040d..b08cf5ca164 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/extendedtypes/impl/IconEntryImpl.java
+++ b/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/impl/IconEntryImpl.java
@@ -4,7 +4,7 @@
  *

  * $Id$

  */

-package org.eclipse.papyrus.extendedtypes.impl;

+package org.eclipse.papyrus.infra.extendedtypes.impl;

 

 import org.eclipse.emf.common.notify.Notification;

 

@@ -13,8 +13,8 @@ import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.impl.ENotificationImpl;

 import org.eclipse.emf.ecore.impl.EObjectImpl;

 

-import org.eclipse.papyrus.extendedtypes.ExtendedtypesPackage;

-import org.eclipse.papyrus.extendedtypes.IconEntry;

+import org.eclipse.papyrus.infra.extendedtypes.ExtendedtypesPackage;

+import org.eclipse.papyrus.infra.extendedtypes.IconEntry;

 

 /**

  * <!-- begin-user-doc -->

@@ -23,8 +23,8 @@ import org.eclipse.papyrus.extendedtypes.IconEntry;
  * <p>

  * The following features are implemented:

  * <ul>

- *   <li>{@link org.eclipse.papyrus.extendedtypes.impl.IconEntryImpl#getIconPath <em>Icon Path</em>}</li>

- *   <li>{@link org.eclipse.papyrus.extendedtypes.impl.IconEntryImpl#getBundleId <em>Bundle Id</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.infra.extendedtypes.impl.IconEntryImpl#getIconPath <em>Icon Path</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.infra.extendedtypes.impl.IconEntryImpl#getBundleId <em>Bundle Id</em>}</li>

  * </ul>

  * </p>

  *

diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/extendedtypes/impl/PostActionConfigurationImpl.java b/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/impl/PostActionConfigurationImpl.java
index 6884c9e6878..0e88b37107a 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/extendedtypes/impl/PostActionConfigurationImpl.java
+++ b/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/impl/PostActionConfigurationImpl.java
@@ -4,12 +4,12 @@
  *

  * $Id$

  */

-package org.eclipse.papyrus.extendedtypes.impl;

+package org.eclipse.papyrus.infra.extendedtypes.impl;

 

 import org.eclipse.emf.ecore.EClass;

 

-import org.eclipse.papyrus.extendedtypes.ExtendedtypesPackage;

-import org.eclipse.papyrus.extendedtypes.PostActionConfiguration;

+import org.eclipse.papyrus.infra.extendedtypes.ExtendedtypesPackage;

+import org.eclipse.papyrus.infra.extendedtypes.PostActionConfiguration;

 

 /**

  * <!-- begin-user-doc -->

diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/extendedtypes/impl/PreActionConfigurationImpl.java b/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/impl/PreActionConfigurationImpl.java
index 3925064d19b..c8fdb274db0 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/extendedtypes/impl/PreActionConfigurationImpl.java
+++ b/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/impl/PreActionConfigurationImpl.java
@@ -4,12 +4,12 @@
  *

  * $Id$

  */

-package org.eclipse.papyrus.extendedtypes.impl;

+package org.eclipse.papyrus.infra.extendedtypes.impl;

 

 import org.eclipse.emf.ecore.EClass;

 

-import org.eclipse.papyrus.extendedtypes.ExtendedtypesPackage;

-import org.eclipse.papyrus.extendedtypes.PreActionConfiguration;

+import org.eclipse.papyrus.infra.extendedtypes.ExtendedtypesPackage;

+import org.eclipse.papyrus.infra.extendedtypes.PreActionConfiguration;

 

 /**

  * <!-- begin-user-doc -->

diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/extendedtypes/util/ExtendedtypesAdapterFactory.java b/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/util/ExtendedtypesAdapterFactory.java
index 30ea49f307e..e01cd3065cf 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/extendedtypes/util/ExtendedtypesAdapterFactory.java
+++ b/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/util/ExtendedtypesAdapterFactory.java
@@ -4,7 +4,7 @@
  *

  * $Id$

  */

-package org.eclipse.papyrus.extendedtypes.util;

+package org.eclipse.papyrus.infra.extendedtypes.util;

 

 import org.eclipse.emf.common.notify.Adapter;

 import org.eclipse.emf.common.notify.Notifier;

@@ -13,14 +13,14 @@ import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
 

 import org.eclipse.emf.ecore.EObject;

 

-import org.eclipse.papyrus.extendedtypes.*;

+import org.eclipse.papyrus.infra.extendedtypes.*;

 

 /**

  * <!-- begin-user-doc -->

  * The <b>Adapter Factory</b> for the model.

  * It provides an adapter <code>createXXX</code> method for each class of the model.

  * <!-- end-user-doc -->

- * @see org.eclipse.papyrus.extendedtypes.ExtendedtypesPackage

+ * @see org.eclipse.papyrus.infra.extendedtypes.ExtendedtypesPackage

  * @generated

  */

 public class ExtendedtypesAdapterFactory extends AdapterFactoryImpl {

@@ -116,13 +116,13 @@ public class ExtendedtypesAdapterFactory extends AdapterFactoryImpl {
 

 

 	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.extendedtypes.ExtendedElementTypeSet <em>Extended Element Type Set</em>}'.

+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.extendedtypes.ExtendedElementTypeSet <em>Extended Element Type Set</em>}'.

 	 * <!-- begin-user-doc -->

 	 * This default implementation returns null so that we can easily ignore cases;

 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

 	 * <!-- end-user-doc -->

 	 * @return the new adapter.

-	 * @see org.eclipse.papyrus.extendedtypes.ExtendedElementTypeSet

+	 * @see org.eclipse.papyrus.infra.extendedtypes.ExtendedElementTypeSet

 	 * @generated

 	 */

 	public Adapter createExtendedElementTypeSetAdapter() {

@@ -130,13 +130,13 @@ public class ExtendedtypesAdapterFactory extends AdapterFactoryImpl {
 	}

 

 	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.extendedtypes.ExtendedElementTypeConfiguration <em>Extended Element Type Configuration</em>}'.

+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.extendedtypes.ExtendedElementTypeConfiguration <em>Extended Element Type Configuration</em>}'.

 	 * <!-- begin-user-doc -->

 	 * This default implementation returns null so that we can easily ignore cases;

 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

 	 * <!-- end-user-doc -->

 	 * @return the new adapter.

-	 * @see org.eclipse.papyrus.extendedtypes.ExtendedElementTypeConfiguration

+	 * @see org.eclipse.papyrus.infra.extendedtypes.ExtendedElementTypeConfiguration

 	 * @generated

 	 */

 	public Adapter createExtendedElementTypeConfigurationAdapter() {

@@ -144,13 +144,13 @@ public class ExtendedtypesAdapterFactory extends AdapterFactoryImpl {
 	}

 

 	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.extendedtypes.IconEntry <em>Icon Entry</em>}'.

+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.extendedtypes.IconEntry <em>Icon Entry</em>}'.

 	 * <!-- begin-user-doc -->

 	 * This default implementation returns null so that we can easily ignore cases;

 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

 	 * <!-- end-user-doc -->

 	 * @return the new adapter.

-	 * @see org.eclipse.papyrus.extendedtypes.IconEntry

+	 * @see org.eclipse.papyrus.infra.extendedtypes.IconEntry

 	 * @generated

 	 */

 	public Adapter createIconEntryAdapter() {

@@ -158,13 +158,13 @@ public class ExtendedtypesAdapterFactory extends AdapterFactoryImpl {
 	}

 

 	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.extendedtypes.ActionConfiguration <em>Action Configuration</em>}'.

+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.extendedtypes.ActionConfiguration <em>Action Configuration</em>}'.

 	 * <!-- begin-user-doc -->

 	 * This default implementation returns null so that we can easily ignore cases;

 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

 	 * <!-- end-user-doc -->

 	 * @return the new adapter.

-	 * @see org.eclipse.papyrus.extendedtypes.ActionConfiguration

+	 * @see org.eclipse.papyrus.infra.extendedtypes.ActionConfiguration

 	 * @generated

 	 */

 	public Adapter createActionConfigurationAdapter() {

@@ -172,13 +172,13 @@ public class ExtendedtypesAdapterFactory extends AdapterFactoryImpl {
 	}

 

 	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.extendedtypes.PreActionConfiguration <em>Pre Action Configuration</em>}'.

+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.extendedtypes.PreActionConfiguration <em>Pre Action Configuration</em>}'.

 	 * <!-- begin-user-doc -->

 	 * This default implementation returns null so that we can easily ignore cases;

 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

 	 * <!-- end-user-doc -->

 	 * @return the new adapter.

-	 * @see org.eclipse.papyrus.extendedtypes.PreActionConfiguration

+	 * @see org.eclipse.papyrus.infra.extendedtypes.PreActionConfiguration

 	 * @generated

 	 */

 	public Adapter createPreActionConfigurationAdapter() {

@@ -186,13 +186,13 @@ public class ExtendedtypesAdapterFactory extends AdapterFactoryImpl {
 	}

 

 	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.extendedtypes.PostActionConfiguration <em>Post Action Configuration</em>}'.

+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.extendedtypes.PostActionConfiguration <em>Post Action Configuration</em>}'.

 	 * <!-- begin-user-doc -->

 	 * This default implementation returns null so that we can easily ignore cases;

 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

 	 * <!-- end-user-doc -->

 	 * @return the new adapter.

-	 * @see org.eclipse.papyrus.extendedtypes.PostActionConfiguration

+	 * @see org.eclipse.papyrus.infra.extendedtypes.PostActionConfiguration

 	 * @generated

 	 */

 	public Adapter createPostActionConfigurationAdapter() {

diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/extendedtypes/util/ExtendedtypesResourceFactoryImpl.java b/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/util/ExtendedtypesResourceFactoryImpl.java
index 38f2adfd709..e5bdffd726c 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/extendedtypes/util/ExtendedtypesResourceFactoryImpl.java
+++ b/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/util/ExtendedtypesResourceFactoryImpl.java
@@ -4,7 +4,7 @@
  *

  * $Id$

  */

-package org.eclipse.papyrus.extendedtypes.util;

+package org.eclipse.papyrus.infra.extendedtypes.util;

 

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

 

@@ -18,7 +18,7 @@ import org.eclipse.emf.ecore.xmi.XMLResource;
  * <!-- begin-user-doc -->

  * The <b>Resource Factory</b> associated with the package.

  * <!-- end-user-doc -->

- * @see org.eclipse.papyrus.extendedtypes.util.ExtendedtypesResourceImpl

+ * @see org.eclipse.papyrus.infra.extendedtypes.util.ExtendedtypesResourceImpl

  * @generated

  */

 public class ExtendedtypesResourceFactoryImpl extends ResourceFactoryImpl {

diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/extendedtypes/util/ExtendedtypesResourceImpl.java b/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/util/ExtendedtypesResourceImpl.java
index ab3b7d0e0b8..e4994a02137 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/extendedtypes/util/ExtendedtypesResourceImpl.java
+++ b/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/util/ExtendedtypesResourceImpl.java
@@ -4,7 +4,7 @@
  *

  * $Id$

  */

-package org.eclipse.papyrus.extendedtypes.util;

+package org.eclipse.papyrus.infra.extendedtypes.util;

 

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

 

@@ -14,7 +14,7 @@ import org.eclipse.emf.ecore.xmi.impl.XMLResourceImpl;
  * <!-- begin-user-doc -->

  * The <b>Resource </b> associated with the package.

  * <!-- end-user-doc -->

- * @see org.eclipse.papyrus.extendedtypes.util.ExtendedtypesResourceFactoryImpl

+ * @see org.eclipse.papyrus.infra.extendedtypes.util.ExtendedtypesResourceFactoryImpl

  * @generated

  */

 public class ExtendedtypesResourceImpl extends XMLResourceImpl {

diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/extendedtypes/util/ExtendedtypesSwitch.java b/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/util/ExtendedtypesSwitch.java
index 3dcf150839f..876800c46f2 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/extendedtypes/util/ExtendedtypesSwitch.java
+++ b/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/util/ExtendedtypesSwitch.java
@@ -4,14 +4,14 @@
  *

  * $Id$

  */

-package org.eclipse.papyrus.extendedtypes.util;

+package org.eclipse.papyrus.infra.extendedtypes.util;

 

 import java.util.List;

 

 import org.eclipse.emf.ecore.EClass;

 import org.eclipse.emf.ecore.EObject;

 

-import org.eclipse.papyrus.extendedtypes.*;

+import org.eclipse.papyrus.infra.extendedtypes.*;

 

 /**

  * <!-- begin-user-doc -->

@@ -23,7 +23,7 @@ import org.eclipse.papyrus.extendedtypes.*;
  * until a non-null result is returned,

  * which is the result of the switch.

  * <!-- end-user-doc -->

- * @see org.eclipse.papyrus.extendedtypes.ExtendedtypesPackage

+ * @see org.eclipse.papyrus.infra.extendedtypes.ExtendedtypesPackage

  * @generated

  */

 public class ExtendedtypesSwitch<T> {

diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/extendedtypes/util/ExtendedtypesXMLProcessor.java b/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/util/ExtendedtypesXMLProcessor.java
index 4c6a74ae81a..039118406b3 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/extendedtypes/util/ExtendedtypesXMLProcessor.java
+++ b/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/util/ExtendedtypesXMLProcessor.java
@@ -4,7 +4,7 @@
  *

  * $Id$

  */

-package org.eclipse.papyrus.extendedtypes.util;

+package org.eclipse.papyrus.infra.extendedtypes.util;

 

 import java.util.Map;

 

@@ -14,7 +14,7 @@ import org.eclipse.emf.ecore.resource.Resource;
 

 import org.eclipse.emf.ecore.xmi.util.XMLProcessor;

 

-import org.eclipse.papyrus.extendedtypes.ExtendedtypesPackage;

+import org.eclipse.papyrus.infra.extendedtypes.ExtendedtypesPackage;

 

 /**

  * This class contains helper methods to serialize and deserialize XML documents

diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/extendedtypes/Activator.java b/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/Activator.java
index b82465c8e8d..6a325c5357d 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/extendedtypes/Activator.java
+++ b/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/Activator.java
@@ -1,6 +1,6 @@
-package org.eclipse.papyrus.extendedtypes;

+package org.eclipse.papyrus.infra.extendedtypes;

 

-import org.eclipse.papyrus.log.LogHelper;

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

 import org.eclipse.ui.plugin.AbstractUIPlugin;

 import org.osgi.framework.BundleContext;

 

diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/extendedtypes/ExtendedEditHelperAdvice.java b/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/ExtendedEditHelperAdvice.java
index 48f60917e4b..f2745d790c4 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/extendedtypes/ExtendedEditHelperAdvice.java
+++ b/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/ExtendedEditHelperAdvice.java
@@ -9,7 +9,7 @@
  * Contributors:

  *  Remi Schnekenburger (CEA LIST) remi.schnekenburger@cea.fr - Initial API and implementation

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

-package org.eclipse.papyrus.extendedtypes;

+package org.eclipse.papyrus.infra.extendedtypes;

 

 import org.eclipse.gmf.runtime.common.core.command.CompositeCommand;

 import org.eclipse.gmf.runtime.common.core.command.ICommand;

@@ -19,11 +19,11 @@ import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;
 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.GetEditContextRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest;

-import org.eclipse.papyrus.extendedtypes.ExtendedElementTypeConfiguration;

-import org.eclipse.papyrus.extendedtypes.PostActionConfiguration;

-import org.eclipse.papyrus.extendedtypes.providers.ExtendedElementTypeActionService;

-import org.eclipse.papyrus.extendedtypes.providers.ProviderNotFoundException;

-import org.eclipse.papyrus.extendedtypes.types.IExtendedHintedElementType;

+import org.eclipse.papyrus.infra.extendedtypes.ExtendedElementTypeConfiguration;

+import org.eclipse.papyrus.infra.extendedtypes.PostActionConfiguration;

+import org.eclipse.papyrus.infra.extendedtypes.providers.ExtendedElementTypeActionService;

+import org.eclipse.papyrus.infra.extendedtypes.providers.ProviderNotFoundException;

+import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;

 

 /**

  * Edit helper Advice for extended element types. This allows modification of the configure request executed right after the creation of the element

diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/extendedtypes/ExtendedSemanticTypeDescriptor.java b/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/ExtendedSemanticTypeDescriptor.java
index 9f46c37ee84..7338284fa7f 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/extendedtypes/ExtendedSemanticTypeDescriptor.java
+++ b/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/ExtendedSemanticTypeDescriptor.java
@@ -1,4 +1,4 @@
-package org.eclipse.papyrus.extendedtypes;

+package org.eclipse.papyrus.infra.extendedtypes;

 

 import java.net.URL;

 import java.util.ArrayList;

@@ -11,9 +11,9 @@ import org.eclipse.gmf.runtime.emf.type.core.IElementMatcher;
 import org.eclipse.gmf.runtime.emf.type.core.IElementType;

 import org.eclipse.gmf.runtime.emf.type.core.ISpecializationTypeDescriptor;

 import org.eclipse.gmf.runtime.emf.type.core.edithelper.IEditHelperAdvice;

-import org.eclipse.papyrus.extendedtypes.ExtendedElementTypeConfiguration;

-import org.eclipse.papyrus.extendedtypes.IconEntry;

-import org.eclipse.papyrus.extendedtypes.types.ExtendedHintedTypeFactory;

+import org.eclipse.papyrus.infra.extendedtypes.ExtendedElementTypeConfiguration;

+import org.eclipse.papyrus.infra.extendedtypes.IconEntry;

+import org.eclipse.papyrus.infra.extendedtypes.types.ExtendedHintedTypeFactory;

 import org.osgi.framework.Bundle;

 

 

diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/extendedtypes/ExtendedTypesRegistry.java b/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/ExtendedTypesRegistry.java
index 8f3b9fe13cb..ed59661baf1 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/extendedtypes/ExtendedTypesRegistry.java
+++ b/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/ExtendedTypesRegistry.java
@@ -9,7 +9,7 @@
  * Contributors:

  *  Remi Schnekenburger (CEA LIST) remi.schnekenburger@cea.fr - Initial API and implementation

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

-package org.eclipse.papyrus.extendedtypes;

+package org.eclipse.papyrus.infra.extendedtypes;

 

 import java.io.IOException;

 import java.util.ArrayList;

@@ -27,8 +27,10 @@ import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
 import org.eclipse.gmf.runtime.emf.type.core.ElementTypeRegistry;

 import org.eclipse.gmf.runtime.emf.type.core.IElementType;

 import org.eclipse.gmf.runtime.emf.type.core.ISpecializationType;

-import org.eclipse.papyrus.extendedtypes.preferences.ExtendedTypesPreferences;

-import org.eclipse.papyrus.extendedtypes.types.ExtendedHintedTypeFactory;

+import org.eclipse.papyrus.infra.extendedtypes.ExtendedElementTypeConfiguration;

+import org.eclipse.papyrus.infra.extendedtypes.ExtendedElementTypeSet;

+import org.eclipse.papyrus.infra.extendedtypes.preferences.ExtendedTypesPreferences;

+import org.eclipse.papyrus.infra.extendedtypes.types.ExtendedHintedTypeFactory;

 import org.osgi.framework.Bundle;

 

 

diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/extendedtypes/IExtendedTypeExtensionPoint.java b/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/IExtendedTypeExtensionPoint.java
index 25928dcd59d..515f92c97c2 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/extendedtypes/IExtendedTypeExtensionPoint.java
+++ b/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/IExtendedTypeExtensionPoint.java
@@ -9,7 +9,7 @@
  * Contributors:

  *  Remi Schnekenburger (CEA LIST) remi.schnekenburger@cea.fr - Initial API and implementation

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

-package org.eclipse.papyrus.extendedtypes;

+package org.eclipse.papyrus.infra.extendedtypes;

 

 

 /**

diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/extendedtypes/advices/ExtendedTypesOwnerAdvice.java b/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/advices/ExtendedTypesOwnerAdvice.java
index 1096a4a58a8..a55bfc2bb41 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/extendedtypes/advices/ExtendedTypesOwnerAdvice.java
+++ b/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/advices/ExtendedTypesOwnerAdvice.java
@@ -11,7 +11,7 @@
  *  Remi Schnekenburger (CEA LIST) remi.schnekenburger@cea.fr - Initial API and implementation

  *

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

-package org.eclipse.papyrus.extendedtypes.advices;

+package org.eclipse.papyrus.infra.extendedtypes.advices;

 

 import java.util.List;

 

@@ -22,14 +22,14 @@ import org.eclipse.gmf.runtime.common.core.command.UnexecutableCommand;
 import org.eclipse.gmf.runtime.emf.type.core.IElementType;

 import org.eclipse.gmf.runtime.emf.type.core.edithelper.AbstractEditHelperAdvice;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

-import org.eclipse.papyrus.core.queries.configuration.QueryConfiguration;

-import org.eclipse.papyrus.core.queries.modisco.QueryUtil;

-import org.eclipse.papyrus.extendedtypes.Activator;

-import org.eclipse.papyrus.extendedtypes.ExtendedElementTypeConfiguration;

-import org.eclipse.papyrus.extendedtypes.PostActionConfiguration;

-import org.eclipse.papyrus.extendedtypes.providers.ExtendedElementTypeActionService;

-import org.eclipse.papyrus.extendedtypes.providers.ProviderNotFoundException;

-import org.eclipse.papyrus.extendedtypes.types.IExtendedHintedElementType;

+import org.eclipse.papyrus.infra.extendedtypes.Activator;

+import org.eclipse.papyrus.infra.extendedtypes.ExtendedElementTypeConfiguration;

+import org.eclipse.papyrus.infra.extendedtypes.PostActionConfiguration;

+import org.eclipse.papyrus.infra.extendedtypes.providers.ExtendedElementTypeActionService;

+import org.eclipse.papyrus.infra.extendedtypes.providers.ProviderNotFoundException;

+import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;

+import org.eclipse.papyrus.infra.queries.core.configuration.QueryConfiguration;

+import org.eclipse.papyrus.infra.queries.core.modisco.QueryUtil;

 

 

 /**

diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/extendedtypes/preferences/ExtendedTypesPreferences.java b/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/preferences/ExtendedTypesPreferences.java
index 6ab78615117..caccc00c2bf 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/extendedtypes/preferences/ExtendedTypesPreferences.java
+++ b/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/preferences/ExtendedTypesPreferences.java
@@ -11,14 +11,14 @@
  *  Remi Schnekenburger (CEA LIST) remi.schnekenburger@cea.fr - Initial API and implementation

  *

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

-package org.eclipse.papyrus.extendedtypes.preferences;

+package org.eclipse.papyrus.infra.extendedtypes.preferences;

 

 import java.io.IOException;

 import java.io.StringReader;

 import java.io.StringWriter;

 

 import org.eclipse.jface.preference.IPreferenceStore;

-import org.eclipse.papyrus.extendedtypes.Activator;

+import org.eclipse.papyrus.infra.extendedtypes.Activator;

 import org.eclipse.ui.IMemento;

 import org.eclipse.ui.WorkbenchException;

 import org.eclipse.ui.XMLMemento;

diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/extendedtypes/providers/ExtendedElementTypeActionService.java b/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/providers/ExtendedElementTypeActionService.java
index 41962878914..bb3e3d7c957 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/extendedtypes/providers/ExtendedElementTypeActionService.java
+++ b/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/providers/ExtendedElementTypeActionService.java
@@ -9,7 +9,7 @@
  * Contributors:

  *  Remi Schnekenburger (CEA LIST) remi.schnekenburger@cea.fr - Initial API and implementation

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

-package org.eclipse.papyrus.extendedtypes.providers;

+package org.eclipse.papyrus.infra.extendedtypes.providers;

 

 import java.util.ArrayList;

 import java.util.Iterator;

@@ -23,8 +23,8 @@ import org.eclipse.gmf.runtime.common.core.service.IOperation;
 import org.eclipse.gmf.runtime.common.core.service.IProvider;

 import org.eclipse.gmf.runtime.common.core.service.Service;

 import org.eclipse.gmf.runtime.common.ui.services.util.ActivityFilterProviderDescriptor;

-import org.eclipse.papyrus.extendedtypes.ActionConfiguration;

-import org.eclipse.papyrus.extendedtypes.Activator;

+import org.eclipse.papyrus.infra.extendedtypes.ActionConfiguration;

+import org.eclipse.papyrus.infra.extendedtypes.Activator;

 

 

 /**

diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/extendedtypes/providers/ExtentedElementTypeActionProviderConfiguration.java b/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/providers/ExtentedElementTypeActionProviderConfiguration.java
index 441e715d477..f83bf684864 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/extendedtypes/providers/ExtentedElementTypeActionProviderConfiguration.java
+++ b/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/providers/ExtentedElementTypeActionProviderConfiguration.java
@@ -9,7 +9,7 @@
  * Contributors:

  *  Remi Schnekenburger (CEA LIST) remi.schnekenburger@cea.fr - Initial API and implementation

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

-package org.eclipse.papyrus.extendedtypes.providers;

+package org.eclipse.papyrus.infra.extendedtypes.providers;

 

 import org.eclipse.core.runtime.Assert;

 import org.eclipse.core.runtime.IConfigurationElement;

diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/extendedtypes/providers/GetAllExtendedElementTypeActionProvidersOperation.java b/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/providers/GetAllExtendedElementTypeActionProvidersOperation.java
index 311ad2211e1..d74978422f7 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/extendedtypes/providers/GetAllExtendedElementTypeActionProvidersOperation.java
+++ b/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/providers/GetAllExtendedElementTypeActionProvidersOperation.java
@@ -9,7 +9,7 @@
  * Contributors:

  *  Remi Schnekenburger (CEA LIST) remi.schnekenburger@cea.fr - Initial API and implementation

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

-package org.eclipse.papyrus.extendedtypes.providers;

+package org.eclipse.papyrus.infra.extendedtypes.providers;

 

 import java.util.List;

 

diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/extendedtypes/providers/GetExtendedElementTypeActionProviderOperation.java b/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/providers/GetExtendedElementTypeActionProviderOperation.java
index 972ff5817c2..259036144d5 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/extendedtypes/providers/GetExtendedElementTypeActionProviderOperation.java
+++ b/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/providers/GetExtendedElementTypeActionProviderOperation.java
@@ -9,11 +9,11 @@
  * Contributors:

  *  Remi Schnekenburger (CEA LIST) remi.schnekenburger@cea.fr - Initial API and implementation

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

-package org.eclipse.papyrus.extendedtypes.providers;

+package org.eclipse.papyrus.infra.extendedtypes.providers;

 

 import org.eclipse.gmf.runtime.common.core.service.IOperation;

 import org.eclipse.gmf.runtime.common.core.service.IProvider;

-import org.eclipse.papyrus.extendedtypes.ActionConfiguration;

+import org.eclipse.papyrus.infra.extendedtypes.ActionConfiguration;

 

 

 /**

diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/extendedtypes/providers/IExtendedElementTypeActionProvider.java b/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/providers/IExtendedElementTypeActionProvider.java
index 01cc38df3f0..d383700eb3c 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/extendedtypes/providers/IExtendedElementTypeActionProvider.java
+++ b/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/providers/IExtendedElementTypeActionProvider.java
@@ -9,14 +9,14 @@
  * Contributors:

  *  Remi Schnekenburger (CEA LIST) remi.schnekenburger@cea.fr - Initial API and implementation

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

-package org.eclipse.papyrus.extendedtypes.providers;

+package org.eclipse.papyrus.infra.extendedtypes.providers;

 

 import java.util.List;

 

 import org.eclipse.core.runtime.IConfigurationElement;

 import org.eclipse.gmf.runtime.common.core.command.ICommand;

 import org.eclipse.gmf.runtime.common.core.service.IProvider;

-import org.eclipse.papyrus.extendedtypes.ActionConfiguration;

+import org.eclipse.papyrus.infra.extendedtypes.ActionConfiguration;

 

 

 /**

diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/extendedtypes/providers/ProviderNotFoundException.java b/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/providers/ProviderNotFoundException.java
index c02c70f5725..6bf6503f25a 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/extendedtypes/providers/ProviderNotFoundException.java
+++ b/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/providers/ProviderNotFoundException.java
@@ -9,9 +9,9 @@
  * Contributors:

  *  Remi Schnekenburger (CEA LIST) remi.schnekenburger@cea.fr - Initial API and implementation

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

-package org.eclipse.papyrus.extendedtypes.providers;

+package org.eclipse.papyrus.infra.extendedtypes.providers;

 

-import org.eclipse.papyrus.extendedtypes.ActionConfiguration;

+import org.eclipse.papyrus.infra.extendedtypes.ActionConfiguration;

 

 

 /**

diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/extendedtypes/types/ExtendedHintedTypeFactory.java b/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/types/ExtendedHintedTypeFactory.java
index 905e84a3377..8c20fdcb626 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/extendedtypes/types/ExtendedHintedTypeFactory.java
+++ b/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/types/ExtendedHintedTypeFactory.java
@@ -11,16 +11,16 @@
  *  Remi Schnekenburger (CEA LIST) remi.schnekenburger@cea.fr - Initial API and implementation

  *

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

-package org.eclipse.papyrus.extendedtypes.types;

+package org.eclipse.papyrus.infra.extendedtypes.types;

 

 import org.eclipse.gmf.runtime.emf.type.core.AbstractElementTypeFactory;

 import org.eclipse.gmf.runtime.emf.type.core.ISpecializationType;

 import org.eclipse.gmf.runtime.emf.type.core.ISpecializationTypeDescriptor;

 import org.eclipse.gmf.runtime.emf.type.core.SpecializationType;

 import org.eclipse.gmf.runtime.emf.type.core.internal.impl.HintedTypeFactory;

-import org.eclipse.papyrus.extendedtypes.Activator;

-import org.eclipse.papyrus.extendedtypes.ExtendedElementTypeConfiguration;

-import org.eclipse.papyrus.extendedtypes.ExtendedSemanticTypeDescriptor;

+import org.eclipse.papyrus.infra.extendedtypes.Activator;

+import org.eclipse.papyrus.infra.extendedtypes.ExtendedElementTypeConfiguration;

+import org.eclipse.papyrus.infra.extendedtypes.ExtendedSemanticTypeDescriptor;

 

 

 /**

diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/extendedtypes/types/IExtendedHintedElementType.java b/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/types/IExtendedHintedElementType.java
index 2d7e884dd34..39afa41a5bc 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/extendedtypes/types/IExtendedHintedElementType.java
+++ b/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/types/IExtendedHintedElementType.java
@@ -11,11 +11,11 @@
  *  Remi Schnekenburger (CEA LIST) remi.schnekenburger@cea.fr - Initial API and implementation

  *

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

-package org.eclipse.papyrus.extendedtypes.types;

+package org.eclipse.papyrus.infra.extendedtypes.types;

 

 import org.eclipse.gmf.runtime.emf.type.core.IHintedType;

 import org.eclipse.gmf.runtime.emf.type.core.ISpecializationType;

-import org.eclipse.papyrus.extendedtypes.ExtendedElementTypeConfiguration;

+import org.eclipse.papyrus.infra.extendedtypes.ExtendedElementTypeConfiguration;

 

 

 /**

diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/extendedtypes/util/ElementTypeUtils.java b/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/util/ElementTypeUtils.java
index 9cd9f1d0203..d9338692cfe 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/extendedtypes/util/ElementTypeUtils.java
+++ b/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/util/ElementTypeUtils.java
@@ -11,7 +11,7 @@
  *  Remi Schnekenburger (CEA LIST) remi.schnekenburger@cea.fr - Initial API and implementation

  *

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

-package org.eclipse.papyrus.extendedtypes.util;

+package org.eclipse.papyrus.infra.extendedtypes.util;

 

 import java.util.List;

 

@@ -20,11 +20,11 @@ import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.util.EcoreUtil;

 import org.eclipse.gmf.runtime.emf.type.core.IElementType;

 import org.eclipse.gmf.runtime.emf.type.core.IMetamodelType;

-import org.eclipse.papyrus.core.queries.configuration.QueryConfiguration;

-import org.eclipse.papyrus.extendedtypes.ExtendedElementTypeConfiguration;

-import org.eclipse.papyrus.extendedtypes.PostActionConfiguration;

-import org.eclipse.papyrus.extendedtypes.PreActionConfiguration;

-import org.eclipse.papyrus.extendedtypes.types.IExtendedHintedElementType;

+import org.eclipse.papyrus.infra.extendedtypes.ExtendedElementTypeConfiguration;

+import org.eclipse.papyrus.infra.extendedtypes.PostActionConfiguration;

+import org.eclipse.papyrus.infra.extendedtypes.PreActionConfiguration;

+import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;

+import org.eclipse.papyrus.infra.queries.core.configuration.QueryConfiguration;

 

 

 /**

diff --git a/plugins/infra/org.eclipse.papyrus.infra.onefile/META-INF/MANIFEST.MF b/plugins/infra/org.eclipse.papyrus.infra.onefile/META-INF/MANIFEST.MF
index d5fbd68f1cd..1485427a07c 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.onefile/META-INF/MANIFEST.MF
+++ b/plugins/infra/org.eclipse.papyrus.infra.onefile/META-INF/MANIFEST.MF
@@ -4,14 +4,14 @@ Require-Bundle: org.eclipse.papyrus.infra.core;bundle-version="0.9.0",
  org.eclipse.team.ui,

  org.eclipse.ui.navigator.resources,

  org.eclipse.papyrus.infra.ui.resources;bundle-version="0.9.0"

-Export-Package: org.eclipse.papyrus.onefile.model,

- org.eclipse.papyrus.onefile.utils

+Export-Package: org.eclipse.papyrus.infra.onefile.model,

+ org.eclipse.papyrus.infra.onefile.utils

 Bundle-Vendor: %providerName

 Bundle-ActivationPolicy: lazy

 Bundle-Version: 0.9.0.qualifier

 Bundle-Name: %pluginName

 Bundle-ManifestVersion: 2

-Bundle-Activator: org.eclipse.papyrus.onefile.Activator

+Bundle-Activator: org.eclipse.papyrus.infra.onefile.Activator

 Bundle-SymbolicName: org.eclipse.papyrus.infra.onefile;singleton:=true

 Bundle-RequiredExecutionEnvironment: J2SE-1.5

 

diff --git a/plugins/infra/org.eclipse.papyrus.infra.onefile/plugin.xml b/plugins/infra/org.eclipse.papyrus.infra.onefile/plugin.xml
index c6b00c436b8..b7dc00eb415 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.onefile/plugin.xml
+++ b/plugins/infra/org.eclipse.papyrus.infra.onefile/plugin.xml
@@ -5,8 +5,8 @@
    <extension

          point="org.eclipse.core.runtime.adapters">

       <factory

-            adaptableType="org.eclipse.papyrus.onefile.model.IPapyrusFile"

-           	 class="org.eclipse.papyrus.onefile.model.adapters.ModelAdapterFactory">

+            adaptableType="org.eclipse.papyrus.infra.onefile.model.IPapyrusFile"

+           	 class="org.eclipse.papyrus.infra.onefile.model.adapters.ModelAdapterFactory">

 	        <adapter type="org.eclipse.core.resources.mapping.ResourceMapping" />

 	        <adapter type="java.util.Collection" />

          <adapter

@@ -14,8 +14,8 @@
          </adapter>

       </factory>

       <factory

-            adaptableType="org.eclipse.papyrus.onefile.model.ISubResourceFile"

-            class="org.eclipse.papyrus.onefile.model.adapters.SubResourceAdapterFactory">

+            adaptableType="org.eclipse.papyrus.infra.onefile.model.ISubResourceFile"

+            class="org.eclipse.papyrus.infra.onefile.model.adapters.SubResourceAdapterFactory">

          <adapter

                type="org.eclipse.core.resources.mapping.ResourceMapping">

          </adapter>

@@ -38,33 +38,33 @@
          name="One File Model Provider"

          point="org.eclipse.core.resources.modelProviders">

       <modelProvider

-            class="org.eclipse.papyrus.onefile.providers.OneFileModelProvider"/>

+            class="org.eclipse.papyrus.infra.onefile.providers.OneFileModelProvider"/>

       <extends-model id="org.eclipse.core.resources.modelProvider"/>

    </extension>

    <extension

          point="org.eclipse.ui.navigator.navigatorContent">

       <commonFilter

             activeByDefault="true"

-            class="org.eclipse.papyrus.onefile.matcher.OnlyDiFilter"

+            class="org.eclipse.papyrus.infra.onefile.matcher.OnlyDiFilter"

             description="All the files related to di files are agregated bellow a common parent"

-            id="org.eclipse.papyrus.onefile.onlyDiFilter"

+            id="org.eclipse.papyrus.infra.onefile.onlyDiFilter"

             name="Di view"

             visibleInUI="true">

       </commonFilter>

       <navigatorContent

             activeByDefault="true"

-            contentProvider="org.eclipse.papyrus.onefile.providers.PapyrusContentProvider"

-            id="org.eclipse.papyrus.onefile.DiContent"

-            labelProvider="org.eclipse.papyrus.onefile.providers.PapyrusLabelProvider"

+            contentProvider="org.eclipse.papyrus.infra.onefile.providers.PapyrusContentProvider"

+            id="org.eclipse.papyrus.infra.onefile.DiContent"

+            labelProvider="org.eclipse.papyrus.infra.onefile.providers.PapyrusLabelProvider"

             name="Papyrus Content"

             priority="high">

          <enablement>

             <or>

                <instanceof

-                     value="org.eclipse.papyrus.onefile.model.IPapyrusFile">

+                     value="org.eclipse.papyrus.infra.onefile.model.IPapyrusFile">

                </instanceof>

                <instanceof

-                     value="org.eclipse.papyrus.onefile.providers.OneFileModelProvider">

+                     value="org.eclipse.papyrus.infra.onefile.providers.OneFileModelProvider">

                </instanceof>

                <instanceof

                      value="org.eclipse.core.resources.IResource">

@@ -81,26 +81,26 @@
             </or>

          </enablement>

          <actionProvider

-		         class="org.eclipse.papyrus.onefile.providers.PapyrusModelActionProvider"

-		         id="org.eclipse.papyrus.onefile.DiContent.OpenActions"

+		         class="org.eclipse.papyrus.infra.onefile.providers.PapyrusModelActionProvider"

+		         id="org.eclipse.papyrus.infra.onefile.DiContent.OpenActions"

 		         overrides="org.eclipse.ui.navigator.resources.OpenActions">

             <enablement>

                <instanceof

-                     value="org.eclipse.papyrus.onefile.model.IPapyrusFile">

+                     value="org.eclipse.papyrus.infra.onefile.model.IPapyrusFile">

                </instanceof>

             </enablement> 

          </actionProvider>

          <dropAssistant

-               class="org.eclipse.papyrus.onefile.model.adapters.PapyrusCommonDropAdapterAssistant"

-               id="org.eclipse.papyrus.onefile.PapyrusDropAssistant">

+               class="org.eclipse.papyrus.infra.onefile.model.adapters.PapyrusCommonDropAdapterAssistant"

+               id="org.eclipse.papyrus.infra.onefile.PapyrusDropAssistant">

             <possibleDropTargets>

                <instanceof

                      value="org.eclipse.core.resources.IContainer">

                </instanceof></possibleDropTargets>

          </dropAssistant>

          <commonSorter

-               class="org.eclipse.papyrus.onefile.providers.PapyrusViewerSorter"

-               id="org.eclipse.papyrus.onefile.sorter">

+               class="org.eclipse.papyrus.infra.onefile.providers.PapyrusViewerSorter"

+               id="org.eclipse.papyrus.infra.onefile.sorter">

          </commonSorter>

          <triggerPoints>

             <or>

@@ -108,19 +108,19 @@
                   value="org.eclipse.core.resources.IResource">

             	</instanceof>

              <instanceof

-                   value="org.eclipse.papyrus.onefile.model.IPapyrusFile">

+                   value="org.eclipse.papyrus.infra.onefile.model.IPapyrusFile">

              </instanceof>

              <instanceof

-                   value="org.eclipse.papyrus.onefile.model.ISubResourceFile">

+                   value="org.eclipse.papyrus.infra.onefile.model.ISubResourceFile">

              </instanceof>

             </or>

          </triggerPoints>

          <actionProvider

-               class="org.eclipse.papyrus.onefile.providers.ISubresourceFileActionProvider"

-               id="org.eclipse.papyrus.onefile.DiContent.EditActions">

+               class="org.eclipse.papyrus.infra.onefile.providers.ISubresourceFileActionProvider"

+               id="org.eclipse.papyrus.infra.onefile.DiContent.EditActions">

             <enablement>

                <instanceof

-                     value="org.eclipse.papyrus.onefile.model.ISubResourceFile">

+                     value="org.eclipse.papyrus.infra.onefile.model.ISubResourceFile">

                </instanceof>

             </enablement>

          </actionProvider>

@@ -130,20 +130,20 @@
       <viewerContentBinding viewerId="org.eclipse.team.ui.navigatorViewer">

          <includes>

             <contentExtension

-                  pattern="org.eclipse.papyrus.onefile.DiContent"/>

+                  pattern="org.eclipse.papyrus.infra.onefile.DiContent"/>

          </includes>

       </viewerContentBinding>

       <viewerContentBinding

             viewerId="org.eclipse.jdt.ui.PackageExplorer">

          <includes>

             <contentExtension 

-                  pattern="org.eclipse.papyrus.onefile.onlyDiFilter">

+                  pattern="org.eclipse.papyrus.infra.onefile.onlyDiFilter">

             </contentExtension>

             <contentExtension 

-                  pattern="org.eclipse.papyrus.onefile.DiContent">

+                  pattern="org.eclipse.papyrus.infra.onefile.DiContent">

             </contentExtension>

             <contentExtension

-                  pattern="org.eclipse.papyrus.onefile.oneFileLinkHelper">

+                  pattern="org.eclipse.papyrus.infra.onefile.oneFileLinkHelper">

             </contentExtension>

             <contentExtension 

 			    pattern="org.eclipse.ui.navigator.resourceContent" />                     

@@ -155,13 +155,13 @@
             viewerId="org.eclipse.ui.navigator.ProjectExplorer">

          <includes>

             <contentExtension 

-                  pattern="org.eclipse.papyrus.onefile.onlyDiFilter">

+                  pattern="org.eclipse.papyrus.infra.onefile.onlyDiFilter">

             </contentExtension>

             <contentExtension 

-                  pattern="org.eclipse.papyrus.onefile.DiContent">

+                  pattern="org.eclipse.papyrus.infra.onefile.DiContent">

             </contentExtension>

             <contentExtension

-                  pattern="org.eclipse.papyrus.onefile.oneFileLinkHelper">

+                  pattern="org.eclipse.papyrus.infra.onefile.oneFileLinkHelper">

             </contentExtension>

             <contentExtension 

 			    pattern="org.eclipse.ui.navigator.resourceContent" />                     

@@ -173,10 +173,10 @@
             viewerId="org.eclipse.team.ui.navigatorViewer">

          <includes>

             <contentExtension 

-                  pattern="org.eclipse.papyrus.onefile.onlyDiFilter">

+                  pattern="org.eclipse.papyrus.infra.onefile.onlyDiFilter">

             </contentExtension>

             <contentExtension 

-                  pattern="org.eclipse.papyrus.onefile.DiContent">

+                  pattern="org.eclipse.papyrus.infra.onefile.DiContent">

             </contentExtension>

          </includes>

       </viewerContentBinding>

@@ -184,10 +184,10 @@
 	            viewerId="org.eclipse.team.svn.ui.workspaceSynchronization">

 	         <includes>

 	            <contentExtension 

-	                  pattern="org.eclipse.papyrus.onefile.onlyDiFilter">

+	                  pattern="org.eclipse.papyrus.infra.onefile.onlyDiFilter">

 	            </contentExtension>

 	            <contentExtension 

-	                  pattern="org.eclipse.papyrus.onefile.DiContent">

+	                  pattern="org.eclipse.papyrus.infra.onefile.DiContent">

 	            </contentExtension>

 	         </includes>

 	      </viewerContentBinding>

@@ -195,15 +195,15 @@
 	            viewerId="org.eclipse.team.cvs.ui.workspaceSynchronization">

 	         <includes>

 	            <contentExtension 

-	                  pattern="org.eclipse.papyrus.onefile.onlyDiFilter">

+	                  pattern="org.eclipse.papyrus.infra.onefile.onlyDiFilter">

 	            </contentExtension>

 	            <contentExtension 

-	                  pattern="org.eclipse.papyrus.onefile.DiContent">

+	                  pattern="org.eclipse.papyrus.infra.onefile.DiContent">

 	            </contentExtension>

 	         </includes>

 	      </viewerContentBinding>

         <viewerContentBinding

-              viewerId="org.eclipse.papyrus.onefile.DiContent">

+              viewerId="org.eclipse.papyrus.infra.onefile.DiContent">

            <includes>

               <contentExtension

                     pattern="org.eclipse.jdt.java.ui.javaContent">

@@ -215,8 +215,8 @@
    <extension

          point="org.eclipse.ui.navigator.linkHelper">

       <linkHelper

-            class="org.eclipse.papyrus.onefile.model.adapters.PapyrusLinkHelper"

-            id="org.eclipse.papyrus.onefile.oneFileLinkHelper">

+            class="org.eclipse.papyrus.infra.onefile.model.adapters.PapyrusLinkHelper"

+            id="org.eclipse.papyrus.infra.onefile.oneFileLinkHelper">

          <editorInputEnablement>

             <and>

                <instanceof

@@ -234,7 +234,7 @@
          <selectionEnablement>

             <or>

                <instanceof

-                     value="org.eclipse.papyrus.onefile.model.IPapyrusFile">

+                     value="org.eclipse.papyrus.infra.onefile.model.IPapyrusFile">

                </instanceof>

                <and>

                   <instanceof

@@ -251,9 +251,9 @@
       </linkHelper>

    </extension>

    <extension

-         point="org.eclipse.papyrus.onefile.modelFactory">

+         point="org.eclipse.papyrus.infra.onefile.modelFactory">

       <factory

-            instance="org.eclipse.papyrus.onefile.model.impl.PapyrusModelFactory"

+            instance="org.eclipse.papyrus.infra.onefile.model.impl.PapyrusModelFactory"

             priority="1">

       </factory>

    </extension>

@@ -261,14 +261,14 @@
          point="org.eclipse.ui.decorators">

       <decorator

             adaptable="true"

-            class="org.eclipse.papyrus.onefile.providers.OneFileDecorator"

-            id="org.eclipse.papyrus.onefile.onefiledecorator"

+            class="org.eclipse.papyrus.infra.onefile.providers.OneFileDecorator"

+            id="org.eclipse.papyrus.infra.onefile.onefiledecorator"

             label="One File Decorator"

             lightweight="true"

             state="true">

          <enablement>

             <objectClass

-                  name="org.eclipse.papyrus.onefile.model.IPapyrusFile">

+                  name="org.eclipse.papyrus.infra.onefile.model.IPapyrusFile">

             </objectClass>

          </enablement>

       </decorator>

diff --git a/plugins/infra/org.eclipse.papyrus.infra.onefile/schema/modelFactory.exsd b/plugins/infra/org.eclipse.papyrus.infra.onefile/schema/modelFactory.exsd
index 1c6e4e0eccb..fc5fb322311 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.onefile/schema/modelFactory.exsd
+++ b/plugins/infra/org.eclipse.papyrus.infra.onefile/schema/modelFactory.exsd
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>

 <!-- Schema file written by PDE -->

-<schema targetNamespace="org.eclipse.papyrus.onefile" xmlns="http://www.w3.org/2001/XMLSchema">

+<schema targetNamespace="org.eclipse.papyrus.infra.onefile" xmlns="http://www.w3.org/2001/XMLSchema">

 <annotation>

       <appinfo>

-         <meta.schema plugin="org.eclipse.papyrus.onefile" id="modelFactory" name="Model Factory"/>

+         <meta.schema plugin="org.eclipse.papyrus.infra.onefile" id="modelFactory" name="Model Factory"/>

       </appinfo>

       <documentation>

          This extension point allows developer to change implementation of logical navigator model.

@@ -55,7 +55,7 @@
                   the instance of the factory

                </documentation>

                <appinfo>

-                  <meta.attribute kind="java" basedOn=":org.eclipse.papyrus.onefile.model.IPapyrusModelFactory"/>

+                  <meta.attribute kind="java" basedOn=":org.eclipse.papyrus.infra.onefile.model.IPapyrusModelFactory"/>

                </appinfo>

             </annotation>

          </attribute>

diff --git a/plugins/infra/org.eclipse.papyrus.infra.onefile/src/org/eclipse/papyrus/onefile/Activator.java b/plugins/infra/org.eclipse.papyrus.infra.onefile/src/org/eclipse/papyrus/infra/onefile/Activator.java
index 8794e7bf4ec..9fe35decad7 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.onefile/src/org/eclipse/papyrus/onefile/Activator.java
+++ b/plugins/infra/org.eclipse.papyrus.infra.onefile/src/org/eclipse/papyrus/infra/onefile/Activator.java
@@ -9,7 +9,7 @@
  * Contributors:

  *  Tristan Faure (Atos Origin Integration) tristan.faure@atosorigin.com - Initial API and implementation

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

-package org.eclipse.papyrus.onefile;

+package org.eclipse.papyrus.infra.onefile;

 

 import org.eclipse.ui.plugin.AbstractUIPlugin;

 import org.osgi.framework.BundleContext;

diff --git a/plugins/infra/org.eclipse.papyrus.infra.onefile/src/org/eclipse/papyrus/onefile/matcher/OnlyDiFilter.java b/plugins/infra/org.eclipse.papyrus.infra.onefile/src/org/eclipse/papyrus/infra/onefile/matcher/OnlyDiFilter.java
index a645022d0b7..ef0a6282e26 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.onefile/src/org/eclipse/papyrus/onefile/matcher/OnlyDiFilter.java
+++ b/plugins/infra/org.eclipse.papyrus.infra.onefile/src/org/eclipse/papyrus/infra/onefile/matcher/OnlyDiFilter.java
@@ -9,11 +9,11 @@
  * Contributors:

  *  Tristan Faure (Atos Origin Integration) tristan.faure@atosorigin.com - Initial API and implementation

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

-package org.eclipse.papyrus.onefile.matcher;

+package org.eclipse.papyrus.infra.onefile.matcher;

 

 import org.eclipse.jface.viewers.Viewer;

 import org.eclipse.jface.viewers.ViewerFilter;

-import org.eclipse.papyrus.onefile.utils.OneFileUtils;

+import org.eclipse.papyrus.infra.onefile.utils.OneFileUtils;

 

 /**

  * Filter hiding di files and associated. the filter enables the content

@@ -24,7 +24,7 @@ import org.eclipse.papyrus.onefile.utils.OneFileUtils;
  */

 public class OnlyDiFilter extends ViewerFilter {

 

-	public static final String FILTER_ID = "org.eclipse.papyrus.onefile.onlyDiFilter";

+	public static final String FILTER_ID = "org.eclipse.papyrus.infra.onefile.onlyDiFilter";

 

 	/*

 	 * (non-Javadoc)

diff --git a/plugins/infra/org.eclipse.papyrus.infra.onefile/src/org/eclipse/papyrus/onefile/model/IPapyrusElement.java b/plugins/infra/org.eclipse.papyrus.infra.onefile/src/org/eclipse/papyrus/infra/onefile/model/IPapyrusElement.java
index 66534e04029..05278754782 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.onefile/src/org/eclipse/papyrus/onefile/model/IPapyrusElement.java
+++ b/plugins/infra/org.eclipse.papyrus.infra.onefile/src/org/eclipse/papyrus/infra/onefile/model/IPapyrusElement.java
@@ -1,4 +1,4 @@
-package org.eclipse.papyrus.onefile.model;

+package org.eclipse.papyrus.infra.onefile.model;

 

 import org.eclipse.core.resources.IProject;

 import org.eclipse.swt.graphics.Image;

diff --git a/plugins/infra/org.eclipse.papyrus.infra.onefile/src/org/eclipse/papyrus/onefile/model/IPapyrusFile.java b/plugins/infra/org.eclipse.papyrus.infra.onefile/src/org/eclipse/papyrus/infra/onefile/model/IPapyrusFile.java
index bceee7730dd..ec3c15c72f0 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.onefile/src/org/eclipse/papyrus/onefile/model/IPapyrusFile.java
+++ b/plugins/infra/org.eclipse.papyrus.infra.onefile/src/org/eclipse/papyrus/infra/onefile/model/IPapyrusFile.java
@@ -9,7 +9,7 @@
  * Contributors:

  *  Tristan Faure (Atos Origin Integration) tristan.faure@atosorigin.com - Initial API and implementation

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

-package org.eclipse.papyrus.onefile.model;

+package org.eclipse.papyrus.infra.onefile.model;

 

 import org.eclipse.core.resources.IContainer;

 import org.eclipse.core.resources.IFile;

diff --git a/plugins/infra/org.eclipse.papyrus.infra.onefile/src/org/eclipse/papyrus/onefile/model/IPapyrusModelFactory.java b/plugins/infra/org.eclipse.papyrus.infra.onefile/src/org/eclipse/papyrus/infra/onefile/model/IPapyrusModelFactory.java
index f1b1dd7e27d..4bab65b8de2 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.onefile/src/org/eclipse/papyrus/onefile/model/IPapyrusModelFactory.java
+++ b/plugins/infra/org.eclipse.papyrus.infra.onefile/src/org/eclipse/papyrus/infra/onefile/model/IPapyrusModelFactory.java
@@ -9,7 +9,7 @@
  * Contributors:

  *  Tristan Faure (Atos Origin Integration) tristan.faure@atosorigin.com - Initial API and implementation

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

-package org.eclipse.papyrus.onefile.model;

+package org.eclipse.papyrus.infra.onefile.model;

 

 import org.eclipse.core.resources.IFile;

 import org.eclipse.core.resources.IResource;

diff --git a/plugins/infra/org.eclipse.papyrus.infra.onefile/src/org/eclipse/papyrus/onefile/model/ISubResourceFile.java b/plugins/infra/org.eclipse.papyrus.infra.onefile/src/org/eclipse/papyrus/infra/onefile/model/ISubResourceFile.java
index 27a14d68728..5fa95fdeca6 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.onefile/src/org/eclipse/papyrus/onefile/model/ISubResourceFile.java
+++ b/plugins/infra/org.eclipse.papyrus.infra.onefile/src/org/eclipse/papyrus/infra/onefile/model/ISubResourceFile.java
@@ -9,7 +9,7 @@
  * Contributors:

  *  Tristan Faure (Atos Origin Integration) tristan.faure@atosorigin.com - Initial API and implementation

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

-package org.eclipse.papyrus.onefile.model;

+package org.eclipse.papyrus.infra.onefile.model;

 

 import org.eclipse.core.resources.IFile;

 import org.eclipse.core.runtime.IAdaptable;

diff --git a/plugins/infra/org.eclipse.papyrus.infra.onefile/src/org/eclipse/papyrus/onefile/model/PapyrusModelHelper.java b/plugins/infra/org.eclipse.papyrus.infra.onefile/src/org/eclipse/papyrus/infra/onefile/model/PapyrusModelHelper.java
index 10fc49aa819..8bb7e02f83a 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.onefile/src/org/eclipse/papyrus/onefile/model/PapyrusModelHelper.java
+++ b/plugins/infra/org.eclipse.papyrus.infra.onefile/src/org/eclipse/papyrus/infra/onefile/model/PapyrusModelHelper.java
@@ -9,7 +9,7 @@
  * Contributors:

  *  Tristan Faure (Atos Origin Integration) tristan.faure@atosorigin.com - Initial API and implementation

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

-package org.eclipse.papyrus.onefile.model;

+package org.eclipse.papyrus.infra.onefile.model;

 

 import java.util.ArrayList;

 import java.util.Collections;

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

 import org.eclipse.core.runtime.IConfigurationElement;

 import org.eclipse.core.runtime.Platform;

-import org.eclipse.papyrus.onefile.Activator;

+import org.eclipse.papyrus.infra.onefile.Activator;

 import org.osgi.framework.Bundle;

 

 /**

diff --git a/plugins/infra/org.eclipse.papyrus.infra.onefile/src/org/eclipse/papyrus/onefile/model/adapters/ModelAdapterFactory.java b/plugins/infra/org.eclipse.papyrus.infra.onefile/src/org/eclipse/papyrus/infra/onefile/model/adapters/ModelAdapterFactory.java
index cb1c37f834a..da1a6bb6d2c 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.onefile/src/org/eclipse/papyrus/onefile/model/adapters/ModelAdapterFactory.java
+++ b/plugins/infra/org.eclipse.papyrus.infra.onefile/src/org/eclipse/papyrus/infra/onefile/model/adapters/ModelAdapterFactory.java
@@ -9,15 +9,15 @@
  * Contributors:

  *  Tristan Faure (Atos Origin Integration) tristan.faure@atosorigin.com - Initial API and implementation

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

-package org.eclipse.papyrus.onefile.model.adapters;

+package org.eclipse.papyrus.infra.onefile.model.adapters;

 

 import java.util.Arrays;

 import java.util.Collection;

 

 import org.eclipse.core.resources.mapping.ResourceMapping;

 import org.eclipse.core.runtime.IAdapterFactory;

-import org.eclipse.papyrus.onefile.model.IPapyrusFile;

-import org.eclipse.papyrus.onefile.model.mapping.PapyrusResourceMapping;

+import org.eclipse.papyrus.infra.onefile.model.IPapyrusFile;

+import org.eclipse.papyrus.infra.onefile.model.mapping.PapyrusResourceMapping;

 import org.eclipse.ui.IContributorResourceAdapter;

 import org.eclipse.ui.ide.IContributorResourceAdapter2;

 

diff --git a/plugins/infra/org.eclipse.papyrus.infra.onefile/src/org/eclipse/papyrus/onefile/model/adapters/PapyrusCommonDropAdapterAssistant.java b/plugins/infra/org.eclipse.papyrus.infra.onefile/src/org/eclipse/papyrus/infra/onefile/model/adapters/PapyrusCommonDropAdapterAssistant.java
index 76cfb8f4a97..658c791413d 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.onefile/src/org/eclipse/papyrus/onefile/model/adapters/PapyrusCommonDropAdapterAssistant.java
+++ b/plugins/infra/org.eclipse.papyrus.infra.onefile/src/org/eclipse/papyrus/infra/onefile/model/adapters/PapyrusCommonDropAdapterAssistant.java
@@ -9,7 +9,7 @@
  * Contributors:

  *  Tristan Faure (Atos Origin Integration) tristan.faure@atosorigin.com - Initial API and implementation

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

-package org.eclipse.papyrus.onefile.model.adapters;

+package org.eclipse.papyrus.infra.onefile.model.adapters;

 

 import java.util.ArrayList;

 import java.util.Arrays;

@@ -22,7 +22,7 @@ import org.eclipse.jface.util.LocalSelectionTransfer;
 import org.eclipse.jface.viewers.ISelection;

 import org.eclipse.jface.viewers.IStructuredSelection;

 import org.eclipse.jface.viewers.StructuredSelection;

-import org.eclipse.papyrus.onefile.model.IPapyrusFile;

+import org.eclipse.papyrus.infra.onefile.model.IPapyrusFile;

 import org.eclipse.swt.dnd.DropTargetEvent;

 import org.eclipse.swt.dnd.TransferData;

 import org.eclipse.ui.navigator.CommonDropAdapter;

diff --git a/plugins/infra/org.eclipse.papyrus.infra.onefile/src/org/eclipse/papyrus/onefile/model/adapters/PapyrusLinkHelper.java b/plugins/infra/org.eclipse.papyrus.infra.onefile/src/org/eclipse/papyrus/infra/onefile/model/adapters/PapyrusLinkHelper.java
index cb7ccf737ff..22dff1ebe5f 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.onefile/src/org/eclipse/papyrus/onefile/model/adapters/PapyrusLinkHelper.java
+++ b/plugins/infra/org.eclipse.papyrus.infra.onefile/src/org/eclipse/papyrus/infra/onefile/model/adapters/PapyrusLinkHelper.java
@@ -9,7 +9,7 @@
  * Contributors:

  *  Tristan Faure (Atos Origin Integration) tristan.faure@atosorigin.com - Initial API and implementation

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

-package org.eclipse.papyrus.onefile.model.adapters;

+package org.eclipse.papyrus.infra.onefile.model.adapters;

 

 import java.util.ArrayList;

 import java.util.List;

@@ -17,9 +17,9 @@ import java.util.List;
 import org.eclipse.core.resources.IResource;

 import org.eclipse.jface.viewers.IStructuredSelection;

 import org.eclipse.jface.viewers.StructuredSelection;

-import org.eclipse.papyrus.onefile.model.IPapyrusFile;

-import org.eclipse.papyrus.onefile.model.PapyrusModelHelper;

-import org.eclipse.papyrus.onefile.utils.OneFileUtils;

+import org.eclipse.papyrus.infra.onefile.model.IPapyrusFile;

+import org.eclipse.papyrus.infra.onefile.model.PapyrusModelHelper;

+import org.eclipse.papyrus.infra.onefile.utils.OneFileUtils;

 import org.eclipse.ui.IEditorInput;

 import org.eclipse.ui.IEditorPart;

 import org.eclipse.ui.IFileEditorInput;

diff --git a/plugins/infra/org.eclipse.papyrus.infra.onefile/src/org/eclipse/papyrus/onefile/model/adapters/PapyrusModelContributorResourceAdapter.java b/plugins/infra/org.eclipse.papyrus.infra.onefile/src/org/eclipse/papyrus/infra/onefile/model/adapters/PapyrusModelContributorResourceAdapter.java
index c8af4790309..4a99e2764c4 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.onefile/src/org/eclipse/papyrus/onefile/model/adapters/PapyrusModelContributorResourceAdapter.java
+++ b/plugins/infra/org.eclipse.papyrus.infra.onefile/src/org/eclipse/papyrus/infra/onefile/model/adapters/PapyrusModelContributorResourceAdapter.java
@@ -9,7 +9,7 @@
  * Contributors:

  *  Tristan Faure (Atos Origin Integration) tristan.faure@atos.net - Initial API and implementation

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

-package org.eclipse.papyrus.onefile.model.adapters;

+package org.eclipse.papyrus.infra.onefile.model.adapters;

 

 import org.eclipse.core.resources.IResource;

 import org.eclipse.core.resources.mapping.ResourceMapping;

diff --git a/plugins/infra/org.eclipse.papyrus.infra.onefile/src/org/eclipse/papyrus/onefile/model/adapters/SubResourceAdapterFactory.java b/plugins/infra/org.eclipse.papyrus.infra.onefile/src/org/eclipse/papyrus/infra/onefile/model/adapters/SubResourceAdapterFactory.java
index 28d75ecf35c..3db270726c5 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.onefile/src/org/eclipse/papyrus/onefile/model/adapters/SubResourceAdapterFactory.java
+++ b/plugins/infra/org.eclipse.papyrus.infra.onefile/src/org/eclipse/papyrus/infra/onefile/model/adapters/SubResourceAdapterFactory.java
@@ -9,15 +9,15 @@
  * Contributors:

  *  Tristan Faure (Atos Origin Integration) tristan.faure@atosorigin.com - Initial API and implementation

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

-package org.eclipse.papyrus.onefile.model.adapters;

+package org.eclipse.papyrus.infra.onefile.model.adapters;

 

 import org.eclipse.core.resources.IFile;

 import org.eclipse.core.resources.IResource;

 import org.eclipse.core.resources.mapping.ResourceMapping;

 import org.eclipse.core.runtime.IAdapterFactory;

-import org.eclipse.papyrus.onefile.model.ISubResourceFile;

-import org.eclipse.papyrus.onefile.model.impl.SubResourceFile;

-import org.eclipse.papyrus.onefile.model.mapping.SubResourceMapping;

+import org.eclipse.papyrus.infra.onefile.model.ISubResourceFile;

+import org.eclipse.papyrus.infra.onefile.model.impl.SubResourceFile;

+import org.eclipse.papyrus.infra.onefile.model.mapping.SubResourceMapping;

 import org.eclipse.ui.IContributorResourceAdapter;

 

 /**

diff --git a/plugins/infra/org.eclipse.papyrus.infra.onefile/src/org/eclipse/papyrus/onefile/model/impl/PapyrusFile.java b/plugins/infra/org.eclipse.papyrus.infra.onefile/src/org/eclipse/papyrus/infra/onefile/model/impl/PapyrusFile.java
index 9a2b59d37c6..249450434ed 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.onefile/src/org/eclipse/papyrus/onefile/model/impl/PapyrusFile.java
+++ b/plugins/infra/org.eclipse.papyrus.infra.onefile/src/org/eclipse/papyrus/infra/onefile/model/impl/PapyrusFile.java
@@ -9,7 +9,7 @@
  * Contributors:

  *  Tristan Faure (Atos Origin Integration) tristan.faure@atosorigin.com - Initial API and implementation

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

-package org.eclipse.papyrus.onefile.model.impl;

+package org.eclipse.papyrus.infra.onefile.model.impl;

 

 import java.util.ArrayList;

 

@@ -19,9 +19,9 @@ import org.eclipse.core.resources.IProject;
 import org.eclipse.core.resources.IResource;

 import org.eclipse.core.runtime.CoreException;

 import org.eclipse.core.runtime.Platform;

-import org.eclipse.papyrus.core.utils.PapyrusImageUtils;

-import org.eclipse.papyrus.onefile.model.IPapyrusFile;

-import org.eclipse.papyrus.onefile.utils.OneFileUtils;

+import org.eclipse.papyrus.infra.core.utils.PapyrusImageUtils;

+import org.eclipse.papyrus.infra.onefile.model.IPapyrusFile;

+import org.eclipse.papyrus.infra.onefile.utils.OneFileUtils;

 import org.eclipse.swt.graphics.Image;

 

 /**

diff --git a/plugins/infra/org.eclipse.papyrus.infra.onefile/src/org/eclipse/papyrus/onefile/model/impl/PapyrusModelFactory.java b/plugins/infra/org.eclipse.papyrus.infra.onefile/src/org/eclipse/papyrus/infra/onefile/model/impl/PapyrusModelFactory.java
index cb0dea4719f..654916c3e5a 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.onefile/src/org/eclipse/papyrus/onefile/model/impl/PapyrusModelFactory.java
+++ b/plugins/infra/org.eclipse.papyrus.infra.onefile/src/org/eclipse/papyrus/infra/onefile/model/impl/PapyrusModelFactory.java
@@ -9,14 +9,14 @@
  * Contributors:

  *  Tristan Faure (Atos Origin Integration) tristan.faure@atosorigin.com - Initial API and implementation

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

-package org.eclipse.papyrus.onefile.model.impl;

+package org.eclipse.papyrus.infra.onefile.model.impl;

 

 import org.eclipse.core.resources.IFile;

 import org.eclipse.core.resources.IResource;

-import org.eclipse.papyrus.onefile.model.IPapyrusFile;

-import org.eclipse.papyrus.onefile.model.IPapyrusModelFactory;

-import org.eclipse.papyrus.onefile.model.ISubResourceFile;

-import org.eclipse.papyrus.resource.sasheditor.DiModel;

+import org.eclipse.papyrus.infra.core.resource.sasheditor.DiModel;

+import org.eclipse.papyrus.infra.onefile.model.IPapyrusFile;

+import org.eclipse.papyrus.infra.onefile.model.IPapyrusModelFactory;

+import org.eclipse.papyrus.infra.onefile.model.ISubResourceFile;

 

 public class PapyrusModelFactory implements IPapyrusModelFactory {

 

diff --git a/plugins/infra/org.eclipse.papyrus.infra.onefile/src/org/eclipse/papyrus/onefile/model/impl/SubResourceFile.java b/plugins/infra/org.eclipse.papyrus.infra.onefile/src/org/eclipse/papyrus/infra/onefile/model/impl/SubResourceFile.java
index 0f7c0006311..d15d6a5c12e 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.onefile/src/org/eclipse/papyrus/onefile/model/impl/SubResourceFile.java
+++ b/plugins/infra/org.eclipse.papyrus.infra.onefile/src/org/eclipse/papyrus/infra/onefile/model/impl/SubResourceFile.java
@@ -9,15 +9,15 @@
  * Contributors:

  *  Tristan Faure (Atos Origin Integration) tristan.faure@atosorigin.com - Initial API and implementation

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

-package org.eclipse.papyrus.onefile.model.impl;

+package org.eclipse.papyrus.infra.onefile.model.impl;

 

 import org.eclipse.core.resources.IFile;

 import org.eclipse.core.resources.IProject;

 import org.eclipse.core.runtime.Platform;

 import org.eclipse.jface.resource.ImageDescriptor;

 import org.eclipse.jface.resource.JFaceResources;

-import org.eclipse.papyrus.onefile.model.IPapyrusFile;

-import org.eclipse.papyrus.onefile.model.ISubResourceFile;

+import org.eclipse.papyrus.infra.onefile.model.IPapyrusFile;

+import org.eclipse.papyrus.infra.onefile.model.ISubResourceFile;

 import org.eclipse.swt.graphics.Image;

 import org.eclipse.ui.PlatformUI;

 

diff --git a/plugins/infra/org.eclipse.papyrus.infra.onefile/src/org/eclipse/papyrus/onefile/model/mapping/PapyrusResourceMapping.java b/plugins/infra/org.eclipse.papyrus.infra.onefile/src/org/eclipse/papyrus/infra/onefile/model/mapping/PapyrusResourceMapping.java
index dffb6761d53..d3cd48ef868 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.onefile/src/org/eclipse/papyrus/onefile/model/mapping/PapyrusResourceMapping.java
+++ b/plugins/infra/org.eclipse.papyrus.infra.onefile/src/org/eclipse/papyrus/infra/onefile/model/mapping/PapyrusResourceMapping.java
@@ -9,7 +9,7 @@
  * Contributors:

  *  Tristan Faure (Atos Origin Integration) tristan.faure@atosorigin.com - Initial API and implementation

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

-package org.eclipse.papyrus.onefile.model.mapping;

+package org.eclipse.papyrus.infra.onefile.model.mapping;

 

 import org.eclipse.core.resources.IFile;

 import org.eclipse.core.resources.IProject;

@@ -20,9 +20,9 @@ import org.eclipse.core.resources.mapping.ResourceMappingContext;
 import org.eclipse.core.resources.mapping.ResourceTraversal;

 import org.eclipse.core.runtime.CoreException;

 import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.papyrus.onefile.model.IPapyrusFile;

-import org.eclipse.papyrus.onefile.model.PapyrusModelHelper;

-import org.eclipse.papyrus.onefile.providers.OneFileModelProvider;

+import org.eclipse.papyrus.infra.onefile.model.IPapyrusFile;

+import org.eclipse.papyrus.infra.onefile.model.PapyrusModelHelper;

+import org.eclipse.papyrus.infra.onefile.providers.OneFileModelProvider;

 

 /**

  * Resource Mapping for Papyrus File

diff --git a/plugins/infra/org.eclipse.papyrus.infra.onefile/src/org/eclipse/papyrus/onefile/model/mapping/SubResourceMapping.java b/plugins/infra/org.eclipse.papyrus.infra.onefile/src/org/eclipse/papyrus/infra/onefile/model/mapping/SubResourceMapping.java
index 5eb0ae7de8a..0d2d33ae43b 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.onefile/src/org/eclipse/papyrus/onefile/model/mapping/SubResourceMapping.java
+++ b/plugins/infra/org.eclipse.papyrus.infra.onefile/src/org/eclipse/papyrus/infra/onefile/model/mapping/SubResourceMapping.java
@@ -9,7 +9,7 @@
  * Contributors:

  *  Tristan Faure (Atos Origin Integration) tristan.faure@atosorigin.com - Initial API and implementation

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

-package org.eclipse.papyrus.onefile.model.mapping;

+package org.eclipse.papyrus.infra.onefile.model.mapping;

 

 import org.eclipse.core.resources.IProject;

 import org.eclipse.core.resources.IResource;

@@ -19,8 +19,8 @@ import org.eclipse.core.resources.mapping.ResourceMappingContext;
 import org.eclipse.core.resources.mapping.ResourceTraversal;

 import org.eclipse.core.runtime.CoreException;

 import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.papyrus.onefile.model.ISubResourceFile;

-import org.eclipse.papyrus.onefile.providers.OneFileModelProvider;

+import org.eclipse.papyrus.infra.onefile.model.ISubResourceFile;

+import org.eclipse.papyrus.infra.onefile.providers.OneFileModelProvider;

 

 public class SubResourceMapping extends ResourceMapping {

 	private final ISubResourceFile file;

diff --git a/plugins/infra/org.eclipse.papyrus.infra.onefile/src/org/eclipse/papyrus/onefile/providers/ISubresourceFileActionProvider.java b/plugins/infra/org.eclipse.papyrus.infra.onefile/src/org/eclipse/papyrus/infra/onefile/providers/ISubresourceFileActionProvider.java
index 572f3fd52b3..4150e690090 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.onefile/src/org/eclipse/papyrus/onefile/providers/ISubresourceFileActionProvider.java
+++ b/plugins/infra/org.eclipse.papyrus.infra.onefile/src/org/eclipse/papyrus/infra/onefile/providers/ISubresourceFileActionProvider.java
@@ -9,7 +9,7 @@
  * Contributors:

  *  Tristan Faure (Atos Origin) tristan.faure@ato.net - Initial API and implementation

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

-package org.eclipse.papyrus.onefile.providers;

+package org.eclipse.papyrus.infra.onefile.providers;

 

 import java.util.Iterator;

 import java.util.LinkedList;

diff --git a/plugins/infra/org.eclipse.papyrus.infra.onefile/src/org/eclipse/papyrus/onefile/providers/OneFileDecorator.java b/plugins/infra/org.eclipse.papyrus.infra.onefile/src/org/eclipse/papyrus/infra/onefile/providers/OneFileDecorator.java
index f1520787574..07192e3e340 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.onefile/src/org/eclipse/papyrus/onefile/providers/OneFileDecorator.java
+++ b/plugins/infra/org.eclipse.papyrus.infra.onefile/src/org/eclipse/papyrus/infra/onefile/providers/OneFileDecorator.java
@@ -9,7 +9,7 @@
  * Contributors:

  *  Tristan FAURE (Atos) tristan.faure@atos.net - Initial API and implementation

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

-package org.eclipse.papyrus.onefile.providers;

+package org.eclipse.papyrus.infra.onefile.providers;

 

 import java.util.HashMap;

 import java.util.Map;

@@ -20,7 +20,7 @@ import org.eclipse.jface.viewers.IDecoration;
 import org.eclipse.jface.viewers.IDecorationContext;

 import org.eclipse.jface.viewers.ILightweightLabelDecorator;

 import org.eclipse.jface.viewers.LabelProvider;

-import org.eclipse.papyrus.onefile.model.IPapyrusFile;

+import org.eclipse.papyrus.infra.onefile.model.IPapyrusFile;

 import org.eclipse.swt.graphics.Color;

 import org.eclipse.swt.graphics.Font;

 import org.eclipse.ui.internal.WorkbenchPlugin;

diff --git a/plugins/infra/org.eclipse.papyrus.infra.onefile/src/org/eclipse/papyrus/onefile/providers/OneFileModelProvider.java b/plugins/infra/org.eclipse.papyrus.infra.onefile/src/org/eclipse/papyrus/infra/onefile/providers/OneFileModelProvider.java
index 128f1f46f97..d5be4b85394 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.onefile/src/org/eclipse/papyrus/onefile/providers/OneFileModelProvider.java
+++ b/plugins/infra/org.eclipse.papyrus.infra.onefile/src/org/eclipse/papyrus/infra/onefile/providers/OneFileModelProvider.java
@@ -9,7 +9,7 @@
  * Contributors:

  *  Tristan Faure (Atos Origin Integration) tristan.faure@atosorigin.com - Initial API and implementation

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

-package org.eclipse.papyrus.onefile.providers;

+package org.eclipse.papyrus.infra.onefile.providers;

 

 import org.eclipse.core.internal.resources.mapping.SimpleResourceMapping;

 import org.eclipse.core.resources.IFile;

@@ -20,13 +20,13 @@ import org.eclipse.core.resources.mapping.ResourceMappingContext;
 import org.eclipse.core.resources.mapping.ResourceTraversal;

 import org.eclipse.core.runtime.CoreException;

 import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.papyrus.onefile.model.mapping.PapyrusResourceMapping;

-import org.eclipse.papyrus.onefile.utils.OneFileUtils;

+import org.eclipse.papyrus.infra.onefile.model.mapping.PapyrusResourceMapping;

+import org.eclipse.papyrus.infra.onefile.utils.OneFileUtils;

 

 @SuppressWarnings("restriction")

 public class OneFileModelProvider extends ModelProvider {

 

-	public static String MODEL_PROVIDER_ID = "org.eclipse.papyrus.onefile.modelProvider";

+	public static String MODEL_PROVIDER_ID = "org.eclipse.papyrus.infra.onefile.modelProvider";

 

 	public OneFileModelProvider() {

 	}

diff --git a/plugins/infra/org.eclipse.papyrus.infra.onefile/src/org/eclipse/papyrus/onefile/providers/PapyrusContentProvider.java b/plugins/infra/org.eclipse.papyrus.infra.onefile/src/org/eclipse/papyrus/infra/onefile/providers/PapyrusContentProvider.java
index 49e24dba2e2..ff36d321448 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.onefile/src/org/eclipse/papyrus/onefile/providers/PapyrusContentProvider.java
+++ b/plugins/infra/org.eclipse.papyrus.infra.onefile/src/org/eclipse/papyrus/infra/onefile/providers/PapyrusContentProvider.java
@@ -9,7 +9,7 @@
  * Contributors:

  *  Tristan Faure (Atos Origin Integration) tristan.faure@atosorigin.com - Initial API and implementation

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

-package org.eclipse.papyrus.onefile.providers;

+package org.eclipse.papyrus.infra.onefile.providers;

 

 import java.util.ArrayList;

 import java.util.Collection;

@@ -26,10 +26,10 @@ import org.eclipse.core.resources.IWorkspaceRoot;
 import org.eclipse.core.runtime.CoreException;

 import org.eclipse.jface.viewers.AbstractTreeViewer;

 import org.eclipse.jface.viewers.Viewer;

-import org.eclipse.papyrus.onefile.matcher.OnlyDiFilter;

-import org.eclipse.papyrus.onefile.model.IPapyrusFile;

-import org.eclipse.papyrus.onefile.model.PapyrusModelHelper;

-import org.eclipse.papyrus.onefile.utils.OneFileUtils;

+import org.eclipse.papyrus.infra.onefile.matcher.OnlyDiFilter;

+import org.eclipse.papyrus.infra.onefile.model.IPapyrusFile;

+import org.eclipse.papyrus.infra.onefile.model.PapyrusModelHelper;

+import org.eclipse.papyrus.infra.onefile.utils.OneFileUtils;

 import org.eclipse.swt.widgets.Control;

 import org.eclipse.ui.model.WorkbenchContentProvider;

 import org.eclipse.ui.navigator.CommonViewer;

diff --git a/plugins/infra/org.eclipse.papyrus.infra.onefile/src/org/eclipse/papyrus/onefile/providers/PapyrusLabelProvider.java b/plugins/infra/org.eclipse.papyrus.infra.onefile/src/org/eclipse/papyrus/infra/onefile/providers/PapyrusLabelProvider.java
index d874589462b..b1b4a45581f 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.onefile/src/org/eclipse/papyrus/onefile/providers/PapyrusLabelProvider.java
+++ b/plugins/infra/org.eclipse.papyrus.infra.onefile/src/org/eclipse/papyrus/infra/onefile/providers/PapyrusLabelProvider.java
@@ -9,13 +9,13 @@
  * Contributors:

  *  Tristan Faure (Atos Origin Integration) tristan.faure@atosorigin.com - Initial API and implementation

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

-package org.eclipse.papyrus.onefile.providers;

+package org.eclipse.papyrus.infra.onefile.providers;

 

 import org.eclipse.core.resources.IResource;

 import org.eclipse.jface.viewers.ILabelProvider;

 import org.eclipse.jface.viewers.ILabelProviderListener;

-import org.eclipse.papyrus.onefile.model.IPapyrusFile;

-import org.eclipse.papyrus.onefile.model.ISubResourceFile;

+import org.eclipse.papyrus.infra.onefile.model.IPapyrusFile;

+import org.eclipse.papyrus.infra.onefile.model.ISubResourceFile;

 import org.eclipse.swt.graphics.Image;

 

 /**

diff --git a/plugins/infra/org.eclipse.papyrus.infra.onefile/src/org/eclipse/papyrus/onefile/providers/PapyrusModelActionProvider.java b/plugins/infra/org.eclipse.papyrus.infra.onefile/src/org/eclipse/papyrus/infra/onefile/providers/PapyrusModelActionProvider.java
index c0f27be3527..82654f67490 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.onefile/src/org/eclipse/papyrus/onefile/providers/PapyrusModelActionProvider.java
+++ b/plugins/infra/org.eclipse.papyrus.infra.onefile/src/org/eclipse/papyrus/infra/onefile/providers/PapyrusModelActionProvider.java
@@ -9,7 +9,7 @@
  * Contributors:

  *  Tristan Faure (Atos Origin Integration) tristan.faure@atosorigin.com - Initial API and implementation

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

-package org.eclipse.papyrus.onefile.providers;

+package org.eclipse.papyrus.infra.onefile.providers;

 

 import java.util.ArrayList;

 import java.util.Arrays;

@@ -25,8 +25,8 @@ import org.eclipse.jface.action.IMenuManager;
 import org.eclipse.jface.viewers.ISelection;

 import org.eclipse.jface.viewers.IStructuredSelection;

 import org.eclipse.jface.viewers.StructuredSelection;

-import org.eclipse.papyrus.onefile.model.IPapyrusFile;

-import org.eclipse.papyrus.onefile.utils.OneFileUtils;

+import org.eclipse.papyrus.infra.onefile.model.IPapyrusFile;

+import org.eclipse.papyrus.infra.onefile.utils.OneFileUtils;

 import org.eclipse.ui.IActionBars;

 import org.eclipse.ui.ISharedImages;

 import org.eclipse.ui.IViewPart;

diff --git a/plugins/infra/org.eclipse.papyrus.infra.onefile/src/org/eclipse/papyrus/onefile/providers/PapyrusViewerSorter.java b/plugins/infra/org.eclipse.papyrus.infra.onefile/src/org/eclipse/papyrus/infra/onefile/providers/PapyrusViewerSorter.java
index 685a6e41802..d23d9d1acb5 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.onefile/src/org/eclipse/papyrus/onefile/providers/PapyrusViewerSorter.java
+++ b/plugins/infra/org.eclipse.papyrus.infra.onefile/src/org/eclipse/papyrus/infra/onefile/providers/PapyrusViewerSorter.java
@@ -9,13 +9,13 @@
  * Contributors:

  *  Tristan Faure (Atos Origin Integration) tristan.faure@atosorigin.com - Initial API and implementation

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

-package org.eclipse.papyrus.onefile.providers;

+package org.eclipse.papyrus.infra.onefile.providers;

 

 import java.text.Collator;

 

 import org.eclipse.jface.viewers.Viewer;

 import org.eclipse.jface.viewers.ViewerSorter;

-import org.eclipse.papyrus.onefile.model.IPapyrusFile;

+import org.eclipse.papyrus.infra.onefile.model.IPapyrusFile;

 import org.eclipse.ui.views.navigator.ResourceComparator;

 

 /**

diff --git a/plugins/infra/org.eclipse.papyrus.infra.onefile/src/org/eclipse/papyrus/onefile/utils/OneFileUtils.java b/plugins/infra/org.eclipse.papyrus.infra.onefile/src/org/eclipse/papyrus/infra/onefile/utils/OneFileUtils.java
index fa339d63a5e..5362eab6a69 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.onefile/src/org/eclipse/papyrus/onefile/utils/OneFileUtils.java
+++ b/plugins/infra/org.eclipse.papyrus.infra.onefile/src/org/eclipse/papyrus/infra/onefile/utils/OneFileUtils.java
@@ -9,7 +9,7 @@
  * Contributors:

  *  Tristan Faure (Atos Origin Integration) tristan.faure@atosorigin.com - Initial API and implementation

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

-package org.eclipse.papyrus.onefile.utils;

+package org.eclipse.papyrus.infra.onefile.utils;

 

 import java.util.ArrayList;

 

@@ -22,11 +22,11 @@ import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IStatus;

 import org.eclipse.core.runtime.Path;

 import org.eclipse.core.runtime.Status;

-import org.eclipse.papyrus.onefile.Activator;

-import org.eclipse.papyrus.onefile.model.IPapyrusFile;

-import org.eclipse.papyrus.onefile.model.ISubResourceFile;

-import org.eclipse.papyrus.onefile.model.PapyrusModelHelper;

-import org.eclipse.papyrus.resource.sasheditor.DiModel;

+import org.eclipse.papyrus.infra.core.resource.sasheditor.DiModel;

+import org.eclipse.papyrus.infra.onefile.Activator;

+import org.eclipse.papyrus.infra.onefile.model.IPapyrusFile;

+import org.eclipse.papyrus.infra.onefile.model.ISubResourceFile;

+import org.eclipse.papyrus.infra.onefile.model.PapyrusModelHelper;

 import org.eclipse.ui.IEditorDescriptor;

 import org.eclipse.ui.IEditorInput;

 import org.eclipse.ui.IEditorPart;

diff --git a/plugins/infra/org.eclipse.papyrus.infra.ui.resources/META-INF/MANIFEST.MF b/plugins/infra/org.eclipse.papyrus.infra.ui.resources/META-INF/MANIFEST.MF
index 01e7c79878c..4d586056d56 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.ui.resources/META-INF/MANIFEST.MF
+++ b/plugins/infra/org.eclipse.papyrus.infra.ui.resources/META-INF/MANIFEST.MF
@@ -10,7 +10,7 @@ Bundle-ActivationPolicy: lazy
 Bundle-Version: 0.9.0.qualifier

 Bundle-Name: %pluginName

 Bundle-ManifestVersion: 2

-Bundle-Activator: org.eclipse.papyrus.ui.resources.Activator

+Bundle-Activator: org.eclipse.papyrus.infra.ui.resources.Activator

 Bundle-SymbolicName: org.eclipse.papyrus.infra.ui.resources;singleton:=true

 Bundle-RequiredExecutionEnvironment: J2SE-1.5

 

diff --git a/plugins/infra/org.eclipse.papyrus.infra.ui.resources/OSGI-INF/l10n/bundle.properties b/plugins/infra/org.eclipse.papyrus.infra.ui.resources/OSGI-INF/l10n/bundle.properties
index b7cbe34891d..6863156a733 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.ui.resources/OSGI-INF/l10n/bundle.properties
+++ b/plugins/infra/org.eclipse.papyrus.infra.ui.resources/OSGI-INF/l10n/bundle.properties
@@ -1,4 +1,4 @@
-#Properties file for org.eclipse.papyrus.ui.resources

+#Properties file for org.eclipse.papyrus.infra.ui.resources

 renameParticipant.name = Papyrus Model Renaming

 deleteParticipant.name = Papyrus Model deleting

 moveParticipant.name = Papyrus Model Moving
\ No newline at end of file
diff --git a/plugins/infra/org.eclipse.papyrus.infra.ui.resources/build.properties b/plugins/infra/org.eclipse.papyrus.infra.ui.resources/build.properties
index b677da13122..78a75fbd49a 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.ui.resources/build.properties
+++ b/plugins/infra/org.eclipse.papyrus.infra.ui.resources/build.properties
@@ -1,7 +1,23 @@
 #

 #Mon Sep 12 09:30:21 CEST 2011

-bin.includes=META-INF/,.,plugin.properties,plugin.xml,about.html,OSGI-INF/,OSGI-INF/l10n/,OSGI-INF/l10n/bundle.properties,src/org/eclipse/papyrus/ui/resources/refactoring/messages.properties

+bin.includes = META-INF/,\

+               .,\

+               plugin.properties,\

+               plugin.xml,\

+               about.html,\

+               OSGI-INF/,\

+               OSGI-INF/l10n/,\

+               OSGI-INF/l10n/bundle.properties,\

+               src/org/eclipse/papyrus/infra/ui/resources/refactoring/messages.properties

 output..=bin/

-src.includes=about.html,META-INF/,.,plugin.properties,plugin.xml,OSGI-INF/,OSGI-INF/l10n/,OSGI-INF/l10n/bundle.properties,src/org/eclipse/papyrus/ui/resources/refactoring/messages.properties

+src.includes = about.html,\

+               META-INF/,\

+               .,\

+               plugin.properties,\

+               plugin.xml,\

+               OSGI-INF/,\

+               OSGI-INF/l10n/,\

+               OSGI-INF/l10n/bundle.properties,\

+               src/org/eclipse/papyrus/infra/ui/resources/refactoring/messages.properties

 source..=src/

 bin..=bin/

diff --git a/plugins/infra/org.eclipse.papyrus.infra.ui.resources/plugin.xml b/plugins/infra/org.eclipse.papyrus.infra.ui.resources/plugin.xml
index f8a0401f551..6fa1c6ef824 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.ui.resources/plugin.xml
+++ b/plugins/infra/org.eclipse.papyrus.infra.ui.resources/plugin.xml
@@ -4,7 +4,7 @@
    <extension

          point="org.eclipse.ltk.core.refactoring.renameParticipants">

       <renameParticipant

-            class="org.eclipse.papyrus.ui.resources.refactoring.RenameModelParticipant"

+            class="org.eclipse.papyrus.infra.ui.resources.refactoring.RenameModelParticipant"

             id="org.eclipse.papyrus.ui.resources.renameParticipant"

             name="%renameParticipant.name">

          <enablement>

@@ -20,7 +20,7 @@
    <extension

          point="org.eclipse.ltk.core.refactoring.deleteParticipants">

       <deleteParticipant

-            class="org.eclipse.papyrus.ui.resources.refactoring.DeleteModelParticipant"

+            class="org.eclipse.papyrus.infra.ui.resources.refactoring.DeleteModelParticipant"

             id="org.eclipse.papyrus.ui.resources.deleteParticipant"

             name="%deleteParticipant.name">

          <enablement>

@@ -35,7 +35,7 @@
    <extension

          point="org.eclipse.ltk.core.refactoring.moveParticipants">

       <moveParticipant

-            class="org.eclipse.papyrus.ui.resources.refactoring.MoveModelParticipant"

+            class="org.eclipse.papyrus.infra.ui.resources.refactoring.MoveModelParticipant"

             id="org.eclipse.papyrus.ui.resources.moveParticipant"

             name="%moveParticipant.name">

          <enablement>

diff --git a/plugins/infra/org.eclipse.papyrus.infra.ui.resources/src/org/eclipse/papyrus/ui/resources/Activator.java b/plugins/infra/org.eclipse.papyrus.infra.ui.resources/src/org/eclipse/papyrus/infra/ui/resources/Activator.java
index f153c3ee1ce..04e8e7c20aa 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.ui.resources/src/org/eclipse/papyrus/ui/resources/Activator.java
+++ b/plugins/infra/org.eclipse.papyrus.infra.ui.resources/src/org/eclipse/papyrus/infra/ui/resources/Activator.java
@@ -11,9 +11,9 @@
  *   Atos Origin - Initial API and implementation

  *

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

-package org.eclipse.papyrus.ui.resources;

+package org.eclipse.papyrus.infra.ui.resources;

 

-import org.eclipse.papyrus.log.LogHelper;

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

 import org.eclipse.ui.plugin.AbstractUIPlugin;

 import org.osgi.framework.BundleContext;

 

diff --git a/plugins/infra/org.eclipse.papyrus.infra.ui.resources/src/org/eclipse/papyrus/ui/resources/refactoring/DeleteModelParticipant.java b/plugins/infra/org.eclipse.papyrus.infra.ui.resources/src/org/eclipse/papyrus/infra/ui/resources/refactoring/DeleteModelParticipant.java
index b06dffd851e..768162c1aef 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.ui.resources/src/org/eclipse/papyrus/ui/resources/refactoring/DeleteModelParticipant.java
+++ b/plugins/infra/org.eclipse.papyrus.infra.ui.resources/src/org/eclipse/papyrus/infra/ui/resources/refactoring/DeleteModelParticipant.java
@@ -11,7 +11,7 @@
  *  <a href="mailto:thomas.szadel@atosorigin.com">Thomas Szadel</a> - Initial API and implementation

  *

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

-package org.eclipse.papyrus.ui.resources.refactoring;

+package org.eclipse.papyrus.infra.ui.resources.refactoring;

 

 import java.util.ArrayList;

 import java.util.List;

diff --git a/plugins/infra/org.eclipse.papyrus.infra.ui.resources/src/org/eclipse/papyrus/ui/resources/refactoring/DirtyEditorChange.java b/plugins/infra/org.eclipse.papyrus.infra.ui.resources/src/org/eclipse/papyrus/infra/ui/resources/refactoring/DirtyEditorChange.java
index ecab933cb95..7375b3b7be9 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.ui.resources/src/org/eclipse/papyrus/ui/resources/refactoring/DirtyEditorChange.java
+++ b/plugins/infra/org.eclipse.papyrus.infra.ui.resources/src/org/eclipse/papyrus/infra/ui/resources/refactoring/DirtyEditorChange.java
@@ -11,7 +11,7 @@
  *  <a href="mailto:thomas.szadel@atosorigin.com">Thomas Szadel</a> - Initial API and implementation

  *

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

-package org.eclipse.papyrus.ui.resources.refactoring;

+package org.eclipse.papyrus.infra.ui.resources.refactoring;

 

 import org.eclipse.core.resources.IFile;

 import org.eclipse.core.runtime.CoreException;

@@ -20,8 +20,8 @@ import org.eclipse.core.runtime.OperationCanceledException;
 import org.eclipse.jface.dialogs.MessageDialog;

 import org.eclipse.ltk.core.refactoring.Change;

 import org.eclipse.ltk.core.refactoring.RefactoringStatus;

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

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

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

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

 import org.eclipse.swt.widgets.Display;

 

 

diff --git a/plugins/infra/org.eclipse.papyrus.infra.ui.resources/src/org/eclipse/papyrus/ui/resources/refactoring/Messages.java b/plugins/infra/org.eclipse.papyrus.infra.ui.resources/src/org/eclipse/papyrus/infra/ui/resources/refactoring/Messages.java
index 82a9a40f31f..e42902e67ce 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.ui.resources/src/org/eclipse/papyrus/ui/resources/refactoring/Messages.java
+++ b/plugins/infra/org.eclipse.papyrus.infra.ui.resources/src/org/eclipse/papyrus/infra/ui/resources/refactoring/Messages.java
@@ -11,13 +11,13 @@
  *  Arthur Daussy - Initial API and implementation

  *

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

-package org.eclipse.papyrus.ui.resources.refactoring;

+package org.eclipse.papyrus.infra.ui.resources.refactoring;

 

 import org.eclipse.osgi.util.NLS;

 

 public class Messages extends NLS {

 

-	private static final String BUNDLE_NAME = "org.eclipse.papyrus.ui.resources.refactoring.messages"; //$NON-NLS-1$

+	private static final String BUNDLE_NAME = "org.eclipse.papyrus.infra.ui.resources.refactoring.messages"; //$NON-NLS-1$

 

 	public static String DirtyEditorChange_0;

 

diff --git a/plugins/infra/org.eclipse.papyrus.infra.ui.resources/src/org/eclipse/papyrus/ui/resources/refactoring/ModelParticipantHelpers.java b/plugins/infra/org.eclipse.papyrus.infra.ui.resources/src/org/eclipse/papyrus/infra/ui/resources/refactoring/ModelParticipantHelpers.java
index 3be266874d4..4acaf3f2d5f 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.ui.resources/src/org/eclipse/papyrus/ui/resources/refactoring/ModelParticipantHelpers.java
+++ b/plugins/infra/org.eclipse.papyrus.infra.ui.resources/src/org/eclipse/papyrus/infra/ui/resources/refactoring/ModelParticipantHelpers.java
@@ -11,7 +11,7 @@
  *  <a href="mailto:thomas.szadel@atosorigin.com">Thomas Szadel</a> - Initial API and implementation

  *

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

-package org.eclipse.papyrus.ui.resources.refactoring;

+package org.eclipse.papyrus.infra.ui.resources.refactoring;

 

 import java.util.ArrayList;

 import java.util.Collection;

@@ -31,8 +31,8 @@ import org.eclipse.emf.ecore.InternalEObject;
 import org.eclipse.emf.ecore.resource.Resource;

 import org.eclipse.gmf.runtime.notation.Diagram;

 import org.eclipse.gmf.runtime.notation.NotationPackage;

-import org.eclipse.papyrus.resource.sasheditor.DiModel;

-import org.eclipse.papyrus.ui.resources.refactoring.ui.RenameParticipantsDialog;

+import org.eclipse.papyrus.infra.core.resource.sasheditor.DiModel;

+import org.eclipse.papyrus.infra.ui.resources.refactoring.ui.RenameParticipantsDialog;

 import org.eclipse.swt.widgets.Display;

 

 public class ModelParticipantHelpers {

diff --git a/plugins/infra/org.eclipse.papyrus.infra.ui.resources/src/org/eclipse/papyrus/ui/resources/refactoring/MoveModelParticipant.java b/plugins/infra/org.eclipse.papyrus.infra.ui.resources/src/org/eclipse/papyrus/infra/ui/resources/refactoring/MoveModelParticipant.java
index 503f8fbef19..034462bf004 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.ui.resources/src/org/eclipse/papyrus/ui/resources/refactoring/MoveModelParticipant.java
+++ b/plugins/infra/org.eclipse.papyrus.infra.ui.resources/src/org/eclipse/papyrus/infra/ui/resources/refactoring/MoveModelParticipant.java
@@ -11,7 +11,7 @@
  *  <a href="mailto:thomas.szadel@atosorigin.com">Thomas Szadel</a> - Initial API and implementation

  *	<a href="mailto:arthur.daussy@atosorigin.com">Arthur Daussy</a> - Correction of the move ( set the destination attribute)

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

-package org.eclipse.papyrus.ui.resources.refactoring;

+package org.eclipse.papyrus.infra.ui.resources.refactoring;

 

 import java.util.ArrayList;

 import java.util.HashSet;

diff --git a/plugins/infra/org.eclipse.papyrus.infra.ui.resources/src/org/eclipse/papyrus/ui/resources/refactoring/RenameModelChange.java b/plugins/infra/org.eclipse.papyrus.infra.ui.resources/src/org/eclipse/papyrus/infra/ui/resources/refactoring/RenameModelChange.java
index e51ac222ef8..643cb35767f 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.ui.resources/src/org/eclipse/papyrus/ui/resources/refactoring/RenameModelChange.java
+++ b/plugins/infra/org.eclipse.papyrus.infra.ui.resources/src/org/eclipse/papyrus/infra/ui/resources/refactoring/RenameModelChange.java
@@ -11,9 +11,9 @@
  *  <a href="mailto:thomas.szadel@atosorigin.com">Thomas Szadel</a> - Initial API and implementation

  *

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

-package org.eclipse.papyrus.ui.resources.refactoring;

+package org.eclipse.papyrus.infra.ui.resources.refactoring;

 

-import static org.eclipse.papyrus.ui.resources.Activator.log;

+import static org.eclipse.papyrus.infra.ui.resources.Activator.log;

 

 import java.io.IOException;

 import java.util.ArrayList;

@@ -49,18 +49,18 @@ import org.eclipse.emf.transaction.TransactionalEditingDomain;
 import org.eclipse.ltk.core.refactoring.Change;

 import org.eclipse.ltk.core.refactoring.RefactoringStatus;

 import org.eclipse.ltk.core.refactoring.resource.RenameResourceChange;

-import org.eclipse.papyrus.controlmode.mm.history.ControledResource;

-import org.eclipse.papyrus.controlmode.mm.history.historyPackage;

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

-import org.eclipse.papyrus.core.modelsetquery.impl.IModelSetQueryAdapter;

-import org.eclipse.papyrus.core.modelsetquery.impl.ModelSetQueryAdapter;

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

-import org.eclipse.papyrus.core.utils.DiResourceSet;

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

-import org.eclipse.papyrus.resource.ModelSet;

-import org.eclipse.papyrus.resource.ModelsReader;

-import org.eclipse.papyrus.resource.sasheditor.DiModelUtils;

-import org.eclipse.papyrus.ui.resources.Activator;

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

+import org.eclipse.papyrus.infra.core.modelsetquery.impl.IModelSetQueryAdapter;

+import org.eclipse.papyrus.infra.core.modelsetquery.impl.ModelSetQueryAdapter;

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

+import org.eclipse.papyrus.infra.core.resource.ModelsReader;

+import org.eclipse.papyrus.infra.core.resource.sasheditor.DiModelUtils;

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

+import org.eclipse.papyrus.infra.core.utils.DiResourceSet;

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

+import org.eclipse.papyrus.infra.services.controlmode.mm.history.ControledResource;

+import org.eclipse.papyrus.infra.services.controlmode.mm.history.historyPackage;

+import org.eclipse.papyrus.infra.ui.resources.Activator;

 import org.eclipse.swt.widgets.Display;

 import org.eclipse.ui.part.FileEditorInput;

 

diff --git a/plugins/infra/org.eclipse.papyrus.infra.ui.resources/src/org/eclipse/papyrus/ui/resources/refactoring/RenameModelParticipant.java b/plugins/infra/org.eclipse.papyrus.infra.ui.resources/src/org/eclipse/papyrus/infra/ui/resources/refactoring/RenameModelParticipant.java
index 0df5f401156..c1e6b839da0 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.ui.resources/src/org/eclipse/papyrus/ui/resources/refactoring/RenameModelParticipant.java
+++ b/plugins/infra/org.eclipse.papyrus.infra.ui.resources/src/org/eclipse/papyrus/infra/ui/resources/refactoring/RenameModelParticipant.java
@@ -11,7 +11,7 @@
  *  <a href="mailto:thomas.szadel@atosorigin.com">Thomas Szadel</a> - Initial API and implementation

  *

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

-package org.eclipse.papyrus.ui.resources.refactoring;

+package org.eclipse.papyrus.infra.ui.resources.refactoring;

 

 import java.util.Collection;

 

diff --git a/plugins/infra/org.eclipse.papyrus.infra.ui.resources/src/org/eclipse/papyrus/ui/resources/refactoring/messages.properties b/plugins/infra/org.eclipse.papyrus.infra.ui.resources/src/org/eclipse/papyrus/infra/ui/resources/refactoring/messages.properties
index 3b38d28d433..3b38d28d433 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.ui.resources/src/org/eclipse/papyrus/ui/resources/refactoring/messages.properties
+++ b/plugins/infra/org.eclipse.papyrus.infra.ui.resources/src/org/eclipse/papyrus/infra/ui/resources/refactoring/messages.properties
diff --git a/plugins/infra/org.eclipse.papyrus.infra.ui.resources/src/org/eclipse/papyrus/ui/resources/refactoring/ui/IScopeChooser.java b/plugins/infra/org.eclipse.papyrus.infra.ui.resources/src/org/eclipse/papyrus/infra/ui/resources/refactoring/ui/IScopeChooser.java
index db486f7bbba..0b9d02b59b8 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.ui.resources/src/org/eclipse/papyrus/ui/resources/refactoring/ui/IScopeChooser.java
+++ b/plugins/infra/org.eclipse.papyrus.infra.ui.resources/src/org/eclipse/papyrus/infra/ui/resources/refactoring/ui/IScopeChooser.java
@@ -11,7 +11,7 @@
  *  <a href="mailto:tristan.faure@atos.net">Tristan FAURE</a> - Initial API and implementation

  *

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

-package org.eclipse.papyrus.ui.resources.refactoring.ui;

+package org.eclipse.papyrus.infra.ui.resources.refactoring.ui;

 

 import java.util.List;

 

diff --git a/plugins/infra/org.eclipse.papyrus.infra.ui.resources/src/org/eclipse/papyrus/ui/resources/refactoring/ui/Messages.java b/plugins/infra/org.eclipse.papyrus.infra.ui.resources/src/org/eclipse/papyrus/infra/ui/resources/refactoring/ui/Messages.java
index 63c55abcf6e..52b99539b80 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.ui.resources/src/org/eclipse/papyrus/ui/resources/refactoring/ui/Messages.java
+++ b/plugins/infra/org.eclipse.papyrus.infra.ui.resources/src/org/eclipse/papyrus/infra/ui/resources/refactoring/ui/Messages.java
@@ -1,10 +1,10 @@
-package org.eclipse.papyrus.ui.resources.refactoring.ui;

+package org.eclipse.papyrus.infra.ui.resources.refactoring.ui;

 

 import org.eclipse.osgi.util.NLS;

 

 public class Messages extends NLS {

 

-	private static final String BUNDLE_NAME = "org.eclipse.papyrus.ui.resources.refactoring.ui.messages"; //$NON-NLS-1$

+	private static final String BUNDLE_NAME = "org.eclipse.papyrus.infra.ui.resources.refactoring.ui.messages"; //$NON-NLS-1$

 

 	public static String RenameParticipantsDialog_DESCRIPTION;

 

diff --git a/plugins/infra/org.eclipse.papyrus.infra.ui.resources/src/org/eclipse/papyrus/ui/resources/refactoring/ui/RenameParticipantsDialog.java b/plugins/infra/org.eclipse.papyrus.infra.ui.resources/src/org/eclipse/papyrus/infra/ui/resources/refactoring/ui/RenameParticipantsDialog.java
index 3f16b7d3c6a..869ee16813b 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.ui.resources/src/org/eclipse/papyrus/ui/resources/refactoring/ui/RenameParticipantsDialog.java
+++ b/plugins/infra/org.eclipse.papyrus.infra.ui.resources/src/org/eclipse/papyrus/infra/ui/resources/refactoring/ui/RenameParticipantsDialog.java
@@ -11,7 +11,7 @@
  *  <a href="mailto:tristan.faure@atos.net">Tristan FAURE</a> - Initial API and implementation

  *

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

-package org.eclipse.papyrus.ui.resources.refactoring.ui;

+package org.eclipse.papyrus.infra.ui.resources.refactoring.ui;

 

 import java.util.Arrays;

 import java.util.Collection;

@@ -34,7 +34,7 @@ import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.viewers.SelectionChangedEvent;

 import org.eclipse.jface.viewers.StructuredSelection;

 import org.eclipse.jface.viewers.Viewer;

-import org.eclipse.papyrus.ui.resources.refactoring.ui.ScopeChooser.ScopeChooserVisitor;

+import org.eclipse.papyrus.infra.ui.resources.refactoring.ui.ScopeChooser.ScopeChooserVisitor;

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.graphics.Image;

 import org.eclipse.swt.graphics.Point;

diff --git a/plugins/infra/org.eclipse.papyrus.infra.ui.resources/src/org/eclipse/papyrus/ui/resources/refactoring/ui/ScopeChooser.java b/plugins/infra/org.eclipse.papyrus.infra.ui.resources/src/org/eclipse/papyrus/infra/ui/resources/refactoring/ui/ScopeChooser.java
index a9004dd8e99..635ab48cff0 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.ui.resources/src/org/eclipse/papyrus/ui/resources/refactoring/ui/ScopeChooser.java
+++ b/plugins/infra/org.eclipse.papyrus.infra.ui.resources/src/org/eclipse/papyrus/infra/ui/resources/refactoring/ui/ScopeChooser.java
@@ -11,7 +11,7 @@
  *  <a href="mailto:tristan.faure@atos.net">Tristan FAURE</a> - Initial API and implementation

  *

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

-package org.eclipse.papyrus.ui.resources.refactoring.ui;

+package org.eclipse.papyrus.infra.ui.resources.refactoring.ui;

 

 import java.util.LinkedList;

 import java.util.List;

diff --git a/plugins/infra/org.eclipse.papyrus.infra.ui.resources/src/org/eclipse/papyrus/ui/resources/refactoring/ui/messages.properties b/plugins/infra/org.eclipse.papyrus.infra.ui.resources/src/org/eclipse/papyrus/infra/ui/resources/refactoring/ui/messages.properties
index eff43c17e63..eff43c17e63 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.ui.resources/src/org/eclipse/papyrus/ui/resources/refactoring/ui/messages.properties
+++ b/plugins/infra/org.eclipse.papyrus.infra.ui.resources/src/org/eclipse/papyrus/infra/ui/resources/refactoring/ui/messages.properties