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
author: cletavernie 2011-11-09 15:23:42 +0000
committer: cletavernie 2011-11-09 15:23:42 +0000
commit: 26006becb3f00a33d80f9cc8391f71e9574ccf4b (patch)
tree: e101d674a656798d7ae9f2a2266e2410ecdba046 /org.eclipse.papyrus.infra.core.sasheditor/src/org
parent: ee47c01093421a6693fd5798869a49777822d345 (diff)
download: org.eclipse.papyrus-26006becb3f00a33d80f9cc8391f71e9574ccf4b.tar.gz
org.eclipse.papyrus-26006becb3f00a33d80f9cc8391f71e9574ccf4b.tar.xz
org.eclipse.papyrus-26006becb3f00a33d80f9cc8391f71e9574ccf4b.zip
74 files changed, 221 insertions, 221 deletions
diff --git a/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/sasheditor/Activator.java b/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/Activator.java
index 5ef671afa0a..8ccf67d7458 100644
--- a/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/sasheditor/Activator.java
+++ b/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/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/sasheditor/contentprovider/IAbstractPanelModel.java b/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/contentprovider/IAbstractPanelModel.java
index b356dd43ed6..09e99acb271 100644
--- a/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/sasheditor/contentprovider/IAbstractPanelModel.java
+++ b/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/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/sasheditor/contentprovider/IComponentModel.java b/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/contentprovider/IComponentModel.java
index 6078b7d2228..cee689ab34d 100644
--- a/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/sasheditor/contentprovider/IComponentModel.java
+++ b/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/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/sasheditor/contentprovider/IContentChangedListener.java b/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/contentprovider/IContentChangedListener.java
index 3339af725be..aa94ebacea2 100644
--- a/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/sasheditor/contentprovider/IContentChangedListener.java
+++ b/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/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/sasheditor/contentprovider/IContentChangedProvider.java b/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/contentprovider/IContentChangedProvider.java
index 718420b124a..f286b3afc54 100644
--- a/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/sasheditor/contentprovider/IContentChangedProvider.java
+++ b/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/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/sasheditor/contentprovider/IEditorModel.java b/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/contentprovider/IEditorModel.java
index 804174b4367..d0af56907a0 100644
--- a/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/sasheditor/contentprovider/IEditorModel.java
+++ b/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/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/sasheditor/contentprovider/IPageMngr.java b/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/contentprovider/IPageMngr.java
index 8b3bd6a1f53..0ff2e2607b5 100644
--- a/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/sasheditor/contentprovider/IPageMngr.java
+++ b/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/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/sasheditor/contentprovider/IPageModel.java b/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/contentprovider/IPageModel.java
index b692ab3f457..98739beaf17 100644
--- a/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/sasheditor/contentprovider/IPageModel.java
+++ b/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/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/sasheditor/contentprovider/ISashPanelModel.java b/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/contentprovider/ISashPanelModel.java
index d2bb3a4d716..af353c760b8 100644
--- a/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/sasheditor/contentprovider/ISashPanelModel.java
+++ b/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/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/sasheditor/contentprovider/ISashWindowsContentProvider.java b/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/contentprovider/ISashWindowsContentProvider.java
index 85a4b334684..eb8c17206b6 100644
--- a/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/sasheditor/contentprovider/ISashWindowsContentProvider.java
+++ b/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/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/sasheditor/contentprovider/ITabFolderModel.java b/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/contentprovider/ITabFolderModel.java
index ead64a94024..c1238b958f1 100644
--- a/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/sasheditor/contentprovider/ITabFolderModel.java
+++ b/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/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/sasheditor/contentprovider/simple/AbstractModel.java b/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/contentprovider/simple/AbstractModel.java
index 8cf1745019e..ce6f2fcda62 100644
--- a/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/sasheditor/contentprovider/simple/AbstractModel.java
+++ b/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/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/sasheditor/contentprovider/simple/AbstractPanelModel.java b/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/contentprovider/simple/AbstractPanelModel.java
index 10409b68d83..c9cb164e529 100644
--- a/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/sasheditor/contentprovider/simple/AbstractPanelModel.java
+++ b/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/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/sasheditor/contentprovider/simple/RootModel.java b/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/contentprovider/simple/RootModel.java
index 37b173a81da..4fe1d8e97e4 100644
--- a/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/sasheditor/contentprovider/simple/RootModel.java
+++ b/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/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/sasheditor/contentprovider/simple/SashPanelModel.java b/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/contentprovider/simple/SashPanelModel.java
index fd378209b8d..e36ae91c710 100644
--- a/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/sasheditor/contentprovider/simple/SashPanelModel.java
+++ b/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/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/sasheditor/contentprovider/simple/SimpleSashWindowsContentProvider.java b/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/contentprovider/simple/SimpleSashWindowsContentProvider.java
index 97eb83f42f6..d87ee839e65 100644
--- a/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/sasheditor/contentprovider/simple/SimpleSashWindowsContentProvider.java
+++ b/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/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/sasheditor/contentprovider/simple/TabFolderModel.java b/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/contentprovider/simple/TabFolderModel.java
index 2d69cc3cc2d..67ce0bff0ed 100644
--- a/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/sasheditor/contentprovider/simple/TabFolderModel.java
+++ b/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/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/sasheditor/contentprovider/singlefolder/SingleFolderContentProvider.java b/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/contentprovider/singlefolder/SingleFolderContentProvider.java
index a2a6ca51a3a..6ac26058385 100644
--- a/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/sasheditor/contentprovider/singlefolder/SingleFolderContentProvider.java
+++ b/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/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/sasheditor/contentprovider/singlefolder/SingleFolderModel.java b/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/contentprovider/singlefolder/SingleFolderModel.java
index caf77cddc3b..482b7391783 100644
--- a/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/sasheditor/contentprovider/singlefolder/SingleFolderModel.java
+++ b/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/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/sasheditor/editor/AbstractMultiPageSashEditor.java b/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/editor/AbstractMultiPageSashEditor.java
index 57152130a33..d36c81f83b9 100644
--- a/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/sasheditor/editor/AbstractMultiPageSashEditor.java
+++ b/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/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/sasheditor/editor/IComponentPage.java b/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/editor/IComponentPage.java
index d8d8ee812d8..f7a49058ead 100644
--- a/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/sasheditor/editor/IComponentPage.java
+++ b/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/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/sasheditor/editor/IEditorPage.java b/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/editor/IEditorPage.java
index 2b37cab9260..5254420bdc9 100644
--- a/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/sasheditor/editor/IEditorPage.java
+++ b/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/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/sasheditor/editor/IMultiEditorManager.java b/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/editor/IMultiEditorManager.java
index 4417541b6e4..b85e8f00fc8 100644
--- a/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/sasheditor/editor/IMultiEditorManager.java
+++ b/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/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/sasheditor/editor/IMultiPageEditorPart.java b/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/editor/IMultiPageEditorPart.java
index 3111bf2ee07..d6bbcabdbe8 100644
--- a/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/sasheditor/editor/IMultiPageEditorPart.java
+++ b/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/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/sasheditor/editor/IPage.java b/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/editor/IPage.java
index 243c2038507..d2a683905fe 100644
--- a/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/sasheditor/editor/IPage.java
+++ b/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/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/sasheditor/editor/IPageChangedListener.java b/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/editor/IPageChangedListener.java
index 036f9efe3d4..0037bc7be0b 100644
--- a/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/sasheditor/editor/IPageChangedListener.java
+++ b/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/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/sasheditor/editor/IPageImageUtils.java b/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/editor/IPageImageUtils.java
index 8caf041ec09..e83f22af035 100644
--- a/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/sasheditor/editor/IPageImageUtils.java
+++ b/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/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/sasheditor/editor/IPageVisitor.java b/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/editor/IPageVisitor.java
index 1aab9135b8d..e2e41c10eeb 100644
--- a/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/sasheditor/editor/IPageVisitor.java
+++ b/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/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/sasheditor/editor/ISashWindowsContainer.java b/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/editor/ISashWindowsContainer.java
index 07e8cc87812..8f75f476643 100644
--- a/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/sasheditor/editor/ISashWindowsContainer.java
+++ b/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/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/sasheditor/editor/ISashWindowsContainerChangedListener.java b/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/editor/ISashWindowsContainerChangedListener.java
index fc51c1cff83..4b9e0f5c99d 100644
--- a/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/sasheditor/editor/ISashWindowsContainerChangedListener.java
+++ b/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/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/sasheditor/editor/SashContainerEventsListener.java b/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/editor/SashContainerEventsListener.java
index ab61acb4b19..f1ddd4e4524 100644
--- a/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/sasheditor/editor/SashContainerEventsListener.java
+++ b/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/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/sasheditor/editor/SashTabDecorationSynchronizer.java b/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/editor/SashTabDecorationSynchronizer.java
index ec33c3a008a..5e480d5f43e 100644
--- a/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/sasheditor/editor/SashTabDecorationSynchronizer.java
+++ b/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/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/sasheditor/editor/SashWindowsContainer.java b/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/editor/SashWindowsContainer.java
index 740d01436ee..09c0f835087 100644
--- a/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/sasheditor/editor/SashWindowsContainer.java
+++ b/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/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/sasheditor/editor/SashWindowsEventsProvider.java b/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/editor/SashWindowsEventsProvider.java
index e2c392d6601..537a2c5656e 100644
--- a/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/sasheditor/editor/SashWindowsEventsProvider.java
+++ b/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/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/sasheditor/editor/actionbarcontributor/ComposedActionBarContributor.java b/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/editor/actionbarcontributor/ComposedActionBarContributor.java
index 2637e6bafe3..a5c7626003e 100644
--- a/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/sasheditor/editor/actionbarcontributor/ComposedActionBarContributor.java
+++ b/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/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/sasheditor/editor/actionbarcontributor/IMultiPageEditorActionBarContributor.java b/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/editor/actionbarcontributor/IMultiPageEditorActionBarContributor.java
index cd4a4f5b045..51d294c99a0 100644
--- a/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/sasheditor/editor/actionbarcontributor/IMultiPageEditorActionBarContributor.java
+++ b/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/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/sasheditor/editor/actionbarcontributor/MultiPageEditorActionBarContributor.java b/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/editor/actionbarcontributor/MultiPageEditorActionBarContributor.java
index 21a1f34c092..ef6e754d645 100644
--- a/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/sasheditor/editor/actionbarcontributor/MultiPageEditorActionBarContributor.java
+++ b/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/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/sasheditor/editor/gef/MultiDiagramEditorGefDelegate.java b/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/editor/gef/MultiDiagramEditorGefDelegate.java
index ec2a1d58c30..4d044f510ae 100644
--- a/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/sasheditor/editor/gef/MultiDiagramEditorGefDelegate.java
+++ b/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/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/sasheditor/internal/AbstractPanelPart.java b/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/AbstractPanelPart.java
index 8900e34dc64..1e9ef702e0c 100644
--- a/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/sasheditor/internal/AbstractPanelPart.java
+++ b/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/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/sasheditor/internal/AbstractPart.java b/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/AbstractPart.java
index d2c77276629..a7d8ba2f5bf 100644
--- a/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/sasheditor/internal/AbstractPart.java
+++ b/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/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/sasheditor/internal/ActiveEditorServicesSwitcher.java b/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/ActiveEditorServicesSwitcher.java
index bc2bc2af923..1c994ac127b 100644
--- a/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/sasheditor/internal/ActiveEditorServicesSwitcher.java
+++ b/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/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/sasheditor/internal/ActivePageTracker.java b/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/ActivePageTracker.java
index b8b11a93ae8..78c6304a481 100644
--- a/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/sasheditor/internal/ActivePageTracker.java
+++ b/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/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/sasheditor/internal/ComponentPart.java b/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/ComponentPart.java
index 95ecc23a805..7bf799422fc 100644
--- a/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/sasheditor/internal/ComponentPart.java
+++ b/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/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/sasheditor/internal/Copyright.java b/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/Copyright.java
index dad56534512..bf356d466f1 100644
--- a/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/sasheditor/internal/Copyright.java
+++ b/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/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/sasheditor/internal/EditorPart.java b/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/EditorPart.java
index 918ad9c921b..5cb1d6d9afc 100644
--- a/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/sasheditor/internal/EditorPart.java
+++ b/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/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/sasheditor/internal/IPanelParent.java b/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/IPanelParent.java
index d3c02a1f8d6..0df25da7607 100644
--- a/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/sasheditor/internal/IPanelParent.java
+++ b/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/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/sasheditor/internal/IPartVisitor.java b/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/IPartVisitor.java
index 538851f11ea..fa8a2cd3075 100644
--- a/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/sasheditor/internal/IPartVisitor.java
+++ b/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/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/sasheditor/internal/ImageToolTipManager.java b/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/ImageToolTipManager.java
index 3e9a0fdd147..bff6c86abb3 100644
--- a/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/sasheditor/internal/ImageToolTipManager.java
+++ b/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/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/sasheditor/internal/LookupFolderPartByRawModelVisitor.java b/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/LookupFolderPartByRawModelVisitor.java
index 4f2a6960c69..2cff40eeee8 100644
--- a/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/sasheditor/internal/LookupFolderPartByRawModelVisitor.java
+++ b/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/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/sasheditor/internal/LookupIPageByIEditorPartVisitor.java b/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/LookupIPageByIEditorPartVisitor.java
index a5f2e1171bf..705e888abd1 100644
--- a/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/sasheditor/internal/LookupIPageByIEditorPartVisitor.java
+++ b/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/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/sasheditor/internal/LookupModelPageVisitor.java b/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/LookupModelPageVisitor.java
index f78a8456981..a6d64983758 100644
--- a/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/sasheditor/internal/LookupModelPageVisitor.java
+++ b/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/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/sasheditor/internal/NotFoundException.java b/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/NotFoundException.java
index e24e901069d..8fd684b6554 100644
--- a/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/sasheditor/internal/NotFoundException.java
+++ b/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/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/sasheditor/internal/PTabFolder.java b/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/PTabFolder.java
index 1c28a352ad6..3cb5eb3cd66 100644
--- a/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/sasheditor/internal/PTabFolder.java
+++ b/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/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/sasheditor/internal/PagePart.java b/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/PagePart.java
index 9de1c0941e6..ffef343925b 100644
--- a/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/sasheditor/internal/PagePart.java
+++ b/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/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/sasheditor/internal/PageVisitorWrapper.java b/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/PageVisitorWrapper.java
index 0a900678b5d..69aed4c2c5c 100644
--- a/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/sasheditor/internal/PageVisitorWrapper.java
+++ b/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/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/sasheditor/internal/PartLists.java b/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/PartLists.java
index 0c33340a245..8c19ef3719e 100644
--- a/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/sasheditor/internal/PartLists.java
+++ b/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/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/sasheditor/internal/PartVisitor.java b/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/PartVisitor.java
index 968520e4264..74851810727 100644
--- a/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/sasheditor/internal/PartVisitor.java
+++ b/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/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/sasheditor/internal/ReplaceableSashForm.java b/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/ReplaceableSashForm.java
index 2318f0920c4..fa7dbfcddac 100644
--- a/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/sasheditor/internal/ReplaceableSashForm.java
+++ b/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/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/sasheditor/internal/RootPart.java b/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/RootPart.java
index b984cbf5c71..ec0437d6bed 100644
--- a/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/sasheditor/internal/RootPart.java
+++ b/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/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/sasheditor/internal/SashContainerEventsProvider.java b/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/SashContainerEventsProvider.java
index e93c1c92085..c26e5279504 100644
--- a/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/sasheditor/internal/SashContainerEventsProvider.java
+++ b/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/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/sasheditor/internal/SashPanelPart.java b/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/SashPanelPart.java
index de1cce38a7b..314c08d19e0 100644
--- a/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/sasheditor/internal/SashPanelPart.java
+++ b/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/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/sasheditor/internal/SashWindowsException.java b/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/SashWindowsException.java
index 947b04bcbc9..0f259d58e67 100644
--- a/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/sasheditor/internal/SashWindowsException.java
+++ b/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/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/sasheditor/internal/ShowPartStatusVisitor.java b/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/ShowPartStatusVisitor.java
index bac2c993d3e..0297ddf1637 100644
--- a/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/sasheditor/internal/ShowPartStatusVisitor.java
+++ b/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/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/sasheditor/internal/TabFolderPart.java b/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/TabFolderPart.java
index 208ff40f692..7636c55d0b3 100644
--- a/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/sasheditor/internal/TabFolderPart.java
+++ b/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/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/sasheditor/internal/TabItemPart.java b/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/TabItemPart.java
index cca4c7c1220..89dc1543ff1 100644
--- a/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/sasheditor/internal/TabItemPart.java
+++ b/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/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/sasheditor/internal/eclipsecopy/AbstractTabFolderPart.java b/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/eclipsecopy/AbstractTabFolderPart.java
index bd1a2a0d57b..293021bd59a 100644
--- a/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/sasheditor/internal/eclipsecopy/AbstractTabFolderPart.java
+++ b/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/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/sasheditor/internal/eclipsecopy/MultiPageEditorSite.java b/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/eclipsecopy/MultiPageEditorSite.java
index 81b3712533f..e951ee899a5 100644
--- a/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/sasheditor/internal/eclipsecopy/MultiPageEditorSite.java
+++ b/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/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/sasheditor/internal/eclipsecopy/MultiPageSelectionProvider.java b/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/eclipsecopy/MultiPageSelectionProvider.java
index 3b6c9bed10c..8030ae5cea4 100644
--- a/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/sasheditor/internal/eclipsecopy/MultiPageSelectionProvider.java
+++ b/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/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/sasheditor/internal/preferences/ITabTooltipPreferences.java b/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/preferences/ITabTooltipPreferences.java
index b05d96fc1f4..38e7705a7be 100644
--- a/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/sasheditor/internal/preferences/ITabTooltipPreferences.java
+++ b/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/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/sasheditor/internal/preferences/ShowPreferencesHandler.java b/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/preferences/ShowPreferencesHandler.java
index be0954dca67..f24cccc6c6c 100644
--- a/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/sasheditor/internal/preferences/ShowPreferencesHandler.java
+++ b/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/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/sasheditor/internal/preferences/TabTooltipPreferenceInitializer.java b/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/preferences/TabTooltipPreferenceInitializer.java
index 1c235922b82..f4756122585 100644
--- a/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/sasheditor/internal/preferences/TabTooltipPreferenceInitializer.java
+++ b/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/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/sasheditor/internal/preferences/TabTooltipPreferencePage.java b/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/preferences/TabTooltipPreferencePage.java
index 575ddf5bfea..fb4c6447916 100644
--- a/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/sasheditor/internal/preferences/TabTooltipPreferencePage.java
+++ b/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/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/sasheditor/internal/preferences/TabTooltipPreferences.java b/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/preferences/TabTooltipPreferences.java
index 4d059e9b886..cbf2a93726b 100644
--- a/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/sasheditor/internal/preferences/TabTooltipPreferences.java
+++ b/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/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/sasheditor/multipage/editor/MultiPageEditor.java b/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/multipage/editor/MultiPageEditor.java
index f4eea220a4b..ad06108309f 100644
--- a/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/sasheditor/multipage/editor/MultiPageEditor.java
+++ b/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;
author	cletavernie	2011-11-09 15:23:42 +0000
committer	cletavernie	2011-11-09 15:23:42 +0000
commit	26006becb3f00a33d80f9cc8391f71e9574ccf4b (patch)
tree	e101d674a656798d7ae9f2a2266e2410ecdba046 /org.eclipse.papyrus.infra.core.sasheditor/src/org
parent	ee47c01093421a6693fd5798869a49777822d345 (diff)
download	org.eclipse.papyrus-26006becb3f00a33d80f9cc8391f71e9574ccf4b.tar.gz org.eclipse.papyrus-26006becb3f00a33d80f9cc8391f71e9574ccf4b.tar.xz org.eclipse.papyrus-26006becb3f00a33d80f9cc8391f71e9574ccf4b.zip