17 files changed, 39 insertions, 39 deletions
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.common.ui/src/org/eclipse/papyrus/emf/facet/common/ui/internal/Activator.java b/plugins/facet/org.eclipse.papyrus.emf.facet.common.ui/src/org/eclipse/papyrus/emf/facet/common/ui/internal/Activator.java
index c5b166774cc..5a7dc2ec9d9 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.common.ui/src/org/eclipse/papyrus/emf/facet/common/ui/internal/Activator.java
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.common.ui/src/org/eclipse/papyrus/emf/facet/common/ui/internal/Activator.java
@@ -9,7 +9,7 @@
  * Contributors:
  * 	Nicolas Guyomar (Mia-Software) - Bug 333652 Extension point offering the possibility to declare an EPackage browser
  */
-package org.eclipse.emf.facet.common.ui.internal;
+package org.eclipse.papyrus.emf.facet.common.ui.internal;
 
 import org.eclipse.ui.plugin.AbstractUIPlugin;
 import org.osgi.framework.BundleContext;
@@ -19,7 +19,7 @@ import org.osgi.framework.BundleContext;
  */
 public class Activator extends AbstractUIPlugin {
 
-	public static final String PLUGIN_ID = "org.eclipse.emf.facet.common.ui"; //$NON-NLS-1$
+	public static final String PLUGIN_ID = "org.eclipse.papyrus.emf.facet.common.ui"; //$NON-NLS-1$
 
 	private static Activator plugin;
 
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.common.ui/src/org/eclipse/papyrus/emf/facet/common/ui/internal/Messages.java b/plugins/facet/org.eclipse.papyrus.emf.facet.common.ui/src/org/eclipse/papyrus/emf/facet/common/ui/internal/Messages.java
index e7cbdcb86fd..4cf3eb89dc8 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.common.ui/src/org/eclipse/papyrus/emf/facet/common/ui/internal/Messages.java
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.common.ui/src/org/eclipse/papyrus/emf/facet/common/ui/internal/Messages.java
@@ -8,12 +8,12 @@
  * Contributors:
  *    Nicolas Bros (Mia-Software) - Bug 372732 - [Facet] Rewrite the catalog views for 0.2
  *******************************************************************************/
-package org.eclipse.emf.facet.common.ui.internal;
+package org.eclipse.papyrus.emf.facet.common.ui.internal;
 
 import org.eclipse.osgi.util.NLS;
 
 public class Messages extends NLS {
-	private static final String BUNDLE_NAME = "org.eclipse.emf.facet.common.ui.internal.messages"; //$NON-NLS-1$
+	private static final String BUNDLE_NAME = "org.eclipse.papyrus.emf.facet.common.ui.internal.messages"; //$NON-NLS-1$
 	public static String ElementsView_refreshJobTitle;
 	static {
 		// initialize resource bundle
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.common.ui/src/org/eclipse/papyrus/emf/facet/common/ui/internal/controls/PersistableColumn.java b/plugins/facet/org.eclipse.papyrus.emf.facet.common.ui/src/org/eclipse/papyrus/emf/facet/common/ui/internal/controls/PersistableColumn.java
index 56a7b5875aa..42a59e307a7 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.common.ui/src/org/eclipse/papyrus/emf/facet/common/ui/internal/controls/PersistableColumn.java
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.common.ui/src/org/eclipse/papyrus/emf/facet/common/ui/internal/controls/PersistableColumn.java
@@ -9,18 +9,11 @@
  *    Nicolas Bros (Mia-Software) - initial API and implementation
  *    Nicolas Bros (Mia-Software) - Bug 334116 - common tree view with columns
  *******************************************************************************/
-package org.eclipse.emf.facet.common.ui.internal.controls;
+package org.eclipse.papyrus.emf.facet.common.ui.internal.controls;
 
 import java.util.HashMap;
 import java.util.Map;
 
-import org.eclipse.emf.facet.common.ui.internal.controls.wrappers.Column;
-import org.eclipse.emf.facet.common.ui.internal.controls.wrappers.SortableTable;
-import org.eclipse.emf.facet.common.ui.internal.controls.wrappers.SortableTree;
-import org.eclipse.emf.facet.common.ui.internal.controls.wrappers.SortableWidget;
-import org.eclipse.emf.facet.common.ui.internal.controls.wrappers.SortableWidgetFactory;
-import org.eclipse.emf.facet.common.ui.internal.controls.wrappers.TableColumn;
-import org.eclipse.emf.facet.common.ui.internal.controls.wrappers.TreeColumn;
 import org.eclipse.jface.viewers.ColumnLabelProvider;
 import org.eclipse.jface.viewers.TableViewer;
 import org.eclipse.jface.viewers.TableViewerColumn;
@@ -29,6 +22,13 @@ import org.eclipse.jface.viewers.TreeViewerColumn;
 import org.eclipse.jface.viewers.Viewer;
 import org.eclipse.jface.viewers.ViewerColumn;
 import org.eclipse.jface.viewers.ViewerSorter;
+import org.eclipse.papyrus.emf.facet.common.ui.internal.controls.wrappers.Column;
+import org.eclipse.papyrus.emf.facet.common.ui.internal.controls.wrappers.SortableTable;
+import org.eclipse.papyrus.emf.facet.common.ui.internal.controls.wrappers.SortableTree;
+import org.eclipse.papyrus.emf.facet.common.ui.internal.controls.wrappers.SortableWidget;
+import org.eclipse.papyrus.emf.facet.common.ui.internal.controls.wrappers.SortableWidgetFactory;
+import org.eclipse.papyrus.emf.facet.common.ui.internal.controls.wrappers.TableColumn;
+import org.eclipse.papyrus.emf.facet.common.ui.internal.controls.wrappers.TreeColumn;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.ControlAdapter;
 import org.eclipse.swt.events.ControlEvent;
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.common.ui/src/org/eclipse/papyrus/emf/facet/common/ui/internal/controls/wrappers/Column.java b/plugins/facet/org.eclipse.papyrus.emf.facet.common.ui/src/org/eclipse/papyrus/emf/facet/common/ui/internal/controls/wrappers/Column.java
index 74ceb3887e2..02a8d2aae95 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.common.ui/src/org/eclipse/papyrus/emf/facet/common/ui/internal/controls/wrappers/Column.java
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.common.ui/src/org/eclipse/papyrus/emf/facet/common/ui/internal/controls/wrappers/Column.java
@@ -9,7 +9,7 @@
  *    Nicolas Bros (Mia-Software) - initial API and implementation
  *    Nicolas Bros (Mia-Software) - Bug 334116 - common tree view with columns
  *******************************************************************************/
-package org.eclipse.emf.facet.common.ui.internal.controls.wrappers;
+package org.eclipse.papyrus.emf.facet.common.ui.internal.controls.wrappers;
 
 import org.eclipse.swt.events.ControlListener;
 import org.eclipse.swt.events.SelectionListener;
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.common.ui/src/org/eclipse/papyrus/emf/facet/common/ui/internal/controls/wrappers/SortableTable.java b/plugins/facet/org.eclipse.papyrus.emf.facet.common.ui/src/org/eclipse/papyrus/emf/facet/common/ui/internal/controls/wrappers/SortableTable.java
index ef0b7552551..88f5753d3f8 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.common.ui/src/org/eclipse/papyrus/emf/facet/common/ui/internal/controls/wrappers/SortableTable.java
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.common.ui/src/org/eclipse/papyrus/emf/facet/common/ui/internal/controls/wrappers/SortableTable.java
@@ -9,7 +9,7 @@
  *    Nicolas Bros (Mia-Software) - initial API and implementation
  *    Nicolas Bros (Mia-Software) - Bug 334116 - common tree view with columns
  *******************************************************************************/
-package org.eclipse.emf.facet.common.ui.internal.controls.wrappers;
+package org.eclipse.papyrus.emf.facet.common.ui.internal.controls.wrappers;
 
 import org.eclipse.jface.viewers.TableViewer;
 import org.eclipse.jface.viewers.ViewerSorter;
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.common.ui/src/org/eclipse/papyrus/emf/facet/common/ui/internal/controls/wrappers/SortableTree.java b/plugins/facet/org.eclipse.papyrus.emf.facet.common.ui/src/org/eclipse/papyrus/emf/facet/common/ui/internal/controls/wrappers/SortableTree.java
index 3f66f24fb0e..b031edab28f 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.common.ui/src/org/eclipse/papyrus/emf/facet/common/ui/internal/controls/wrappers/SortableTree.java
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.common.ui/src/org/eclipse/papyrus/emf/facet/common/ui/internal/controls/wrappers/SortableTree.java
@@ -9,7 +9,7 @@
  *    Nicolas Bros (Mia-Software) - initial API and implementation
  *    Nicolas Bros (Mia-Software) - Bug 334116 - common tree view with columns
  *******************************************************************************/
-package org.eclipse.emf.facet.common.ui.internal.controls.wrappers;
+package org.eclipse.papyrus.emf.facet.common.ui.internal.controls.wrappers;
 
 import org.eclipse.jface.viewers.TreeViewer;
 import org.eclipse.jface.viewers.ViewerSorter;
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.common.ui/src/org/eclipse/papyrus/emf/facet/common/ui/internal/controls/wrappers/SortableWidget.java b/plugins/facet/org.eclipse.papyrus.emf.facet.common.ui/src/org/eclipse/papyrus/emf/facet/common/ui/internal/controls/wrappers/SortableWidget.java
index ff9dfd9e921..d13cb9c8f2b 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.common.ui/src/org/eclipse/papyrus/emf/facet/common/ui/internal/controls/wrappers/SortableWidget.java
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.common.ui/src/org/eclipse/papyrus/emf/facet/common/ui/internal/controls/wrappers/SortableWidget.java
@@ -9,7 +9,7 @@
  *    Nicolas Bros (Mia-Software) - initial API and implementation
  *    Nicolas Bros (Mia-Software) - Bug 334116 - common tree view with columns
  *******************************************************************************/
-package org.eclipse.emf.facet.common.ui.internal.controls.wrappers;
+package org.eclipse.papyrus.emf.facet.common.ui.internal.controls.wrappers;
 
 import org.eclipse.jface.viewers.ViewerSorter;
 import org.eclipse.swt.widgets.Table;
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.common.ui/src/org/eclipse/papyrus/emf/facet/common/ui/internal/controls/wrappers/SortableWidgetFactory.java b/plugins/facet/org.eclipse.papyrus.emf.facet.common.ui/src/org/eclipse/papyrus/emf/facet/common/ui/internal/controls/wrappers/SortableWidgetFactory.java
index ea310f5ab6b..5f2704bde9e 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.common.ui/src/org/eclipse/papyrus/emf/facet/common/ui/internal/controls/wrappers/SortableWidgetFactory.java
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.common.ui/src/org/eclipse/papyrus/emf/facet/common/ui/internal/controls/wrappers/SortableWidgetFactory.java
@@ -9,7 +9,7 @@
  *    Nicolas Bros (Mia-Software) - initial API and implementation
  *    Nicolas Bros (Mia-Software) - Bug 334116 - common tree view with columns
  *******************************************************************************/
-package org.eclipse.emf.facet.common.ui.internal.controls.wrappers;
+package org.eclipse.papyrus.emf.facet.common.ui.internal.controls.wrappers;
 
 import org.eclipse.jface.viewers.TableViewer;
 import org.eclipse.jface.viewers.TreeViewer;
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.common.ui/src/org/eclipse/papyrus/emf/facet/common/ui/internal/controls/wrappers/TableColumn.java b/plugins/facet/org.eclipse.papyrus.emf.facet.common.ui/src/org/eclipse/papyrus/emf/facet/common/ui/internal/controls/wrappers/TableColumn.java
index 141a06fa1f9..ee83b33fb76 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.common.ui/src/org/eclipse/papyrus/emf/facet/common/ui/internal/controls/wrappers/TableColumn.java
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.common.ui/src/org/eclipse/papyrus/emf/facet/common/ui/internal/controls/wrappers/TableColumn.java
@@ -9,7 +9,7 @@
  *    Nicolas Bros (Mia-Software) - initial API and implementation
  *    Nicolas Bros (Mia-Software) - Bug 334116 - common tree view with columns
  *******************************************************************************/
-package org.eclipse.emf.facet.common.ui.internal.controls.wrappers;
+package org.eclipse.papyrus.emf.facet.common.ui.internal.controls.wrappers;
 
 import org.eclipse.swt.events.ControlListener;
 import org.eclipse.swt.events.SelectionListener;
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.common.ui/src/org/eclipse/papyrus/emf/facet/common/ui/internal/controls/wrappers/TreeColumn.java b/plugins/facet/org.eclipse.papyrus.emf.facet.common.ui/src/org/eclipse/papyrus/emf/facet/common/ui/internal/controls/wrappers/TreeColumn.java
index c30a1fb87c7..abf8f5d4d16 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.common.ui/src/org/eclipse/papyrus/emf/facet/common/ui/internal/controls/wrappers/TreeColumn.java
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.common.ui/src/org/eclipse/papyrus/emf/facet/common/ui/internal/controls/wrappers/TreeColumn.java
@@ -9,7 +9,7 @@
  *    Nicolas Bros (Mia-Software) - initial API and implementation
  *    Nicolas Bros (Mia-Software) - Bug 334116 - common tree view with columns
  *******************************************************************************/
-package org.eclipse.emf.facet.common.ui.internal.controls.wrappers;
+package org.eclipse.papyrus.emf.facet.common.ui.internal.controls.wrappers;
 
 import org.eclipse.swt.events.ControlListener;
 import org.eclipse.swt.events.SelectionListener;
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.common.ui/src/org/eclipse/papyrus/emf/facet/common/ui/internal/exported/views/IColumnDescription.java b/plugins/facet/org.eclipse.papyrus.emf.facet.common.ui/src/org/eclipse/papyrus/emf/facet/common/ui/internal/exported/views/IColumnDescription.java
index 6aa019910c6..073c8310c54 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.common.ui/src/org/eclipse/papyrus/emf/facet/common/ui/internal/exported/views/IColumnDescription.java
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.common.ui/src/org/eclipse/papyrus/emf/facet/common/ui/internal/exported/views/IColumnDescription.java
@@ -8,7 +8,7 @@
  * Contributors:
  *    Nicolas Bros (Mia-Software) - Bug 372732 - [Facet] Rewrite the catalog views for 0.2
  *******************************************************************************/
-package org.eclipse.emf.facet.common.ui.internal.exported.views;
+package org.eclipse.papyrus.emf.facet.common.ui.internal.exported.views;
 
 import org.eclipse.jface.viewers.ColumnLabelProvider;
 
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.common.ui/src/org/eclipse/papyrus/emf/facet/common/ui/internal/exported/views/IElementsViewFactory.java b/plugins/facet/org.eclipse.papyrus.emf.facet.common.ui/src/org/eclipse/papyrus/emf/facet/common/ui/internal/exported/views/IElementsViewFactory.java
index 271e4c969a0..9f4b83777f9 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.common.ui/src/org/eclipse/papyrus/emf/facet/common/ui/internal/exported/views/IElementsViewFactory.java
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.common.ui/src/org/eclipse/papyrus/emf/facet/common/ui/internal/exported/views/IElementsViewFactory.java
@@ -9,14 +9,14 @@
  *    Nicolas Bros (Mia-Software) - Bug 372732 - [Facet] Rewrite the catalog views for 0.2
  *******************************************************************************/
 
-package org.eclipse.emf.facet.common.ui.internal.exported.views;
+package org.eclipse.papyrus.emf.facet.common.ui.internal.exported.views;
 
 import java.util.Collection;
 
-import org.eclipse.emf.facet.common.ui.internal.views.ElementsViewFactory;
 import org.eclipse.jface.viewers.ColumnLabelProvider;
 import org.eclipse.jface.viewers.IOpenListener;
 import org.eclipse.jface.viewers.ITreeContentProvider;
+import org.eclipse.papyrus.emf.facet.common.ui.internal.views.ElementsViewFactory;
 import org.eclipse.swt.graphics.Image;
 import org.eclipse.ui.part.ViewPart;
 
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.common.ui/src/org/eclipse/papyrus/emf/facet/common/ui/internal/preference/pages/EmfFacetRootPreferencePage.java b/plugins/facet/org.eclipse.papyrus.emf.facet.common.ui/src/org/eclipse/papyrus/emf/facet/common/ui/internal/preference/pages/EmfFacetRootPreferencePage.java
index 28708ad05ef..cad26029c06 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.common.ui/src/org/eclipse/papyrus/emf/facet/common/ui/internal/preference/pages/EmfFacetRootPreferencePage.java
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.common.ui/src/org/eclipse/papyrus/emf/facet/common/ui/internal/preference/pages/EmfFacetRootPreferencePage.java
@@ -8,10 +8,10 @@
  * Contributors:
  *    Nicolas Guyomar (Mia-Software) - Bug 333652 Extension point offering the possibility to declare an EPackage browser
  ***********************************************************************************/
-package org.eclipse.emf.facet.common.ui.internal.preference.pages;
+package org.eclipse.papyrus.emf.facet.common.ui.internal.preference.pages;
 
-import org.eclipse.emf.facet.common.ui.internal.Activator;
 import org.eclipse.jface.preference.FieldEditorPreferencePage;
+import org.eclipse.papyrus.emf.facet.common.ui.internal.Activator;
 import org.eclipse.ui.IWorkbench;
 import org.eclipse.ui.IWorkbenchPreferencePage;
 
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.common.ui/src/org/eclipse/papyrus/emf/facet/common/ui/internal/views/AbstractTreeView.java b/plugins/facet/org.eclipse.papyrus.emf.facet.common.ui/src/org/eclipse/papyrus/emf/facet/common/ui/internal/views/AbstractTreeView.java
index 5b176128e26..5390a16587a 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.common.ui/src/org/eclipse/papyrus/emf/facet/common/ui/internal/views/AbstractTreeView.java
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.common.ui/src/org/eclipse/papyrus/emf/facet/common/ui/internal/views/AbstractTreeView.java
@@ -10,7 +10,7 @@
  *    Nicolas Bros (Mia-Software) - Bug 334116 - common tree view with columns
  *******************************************************************************/
 
-package org.eclipse.emf.facet.common.ui.internal.views;
+package org.eclipse.papyrus.emf.facet.common.ui.internal.views;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -21,9 +21,7 @@ import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Status;
 import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.emf.facet.common.ui.internal.Activator;
-import org.eclipse.emf.facet.common.ui.internal.controls.PersistableColumn;
-import org.eclipse.emf.facet.util.core.Logger;
+import org.eclipse.papyrus.emf.facet.util.core.Logger;
 import org.eclipse.jface.action.GroupMarker;
 import org.eclipse.jface.action.MenuManager;
 import org.eclipse.jface.viewers.ColumnLabelProvider;
@@ -32,6 +30,8 @@ import org.eclipse.jface.viewers.IOpenListener;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.viewers.OpenEvent;
 import org.eclipse.jface.viewers.TreeViewer;
+import org.eclipse.papyrus.emf.facet.common.ui.internal.Activator;
+import org.eclipse.papyrus.emf.facet.common.ui.internal.controls.PersistableColumn;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.layout.FillLayout;
 import org.eclipse.swt.widgets.Composite;
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.common.ui/src/org/eclipse/papyrus/emf/facet/common/ui/internal/views/ElementsView.java b/plugins/facet/org.eclipse.papyrus.emf.facet.common.ui/src/org/eclipse/papyrus/emf/facet/common/ui/internal/views/ElementsView.java
index 28d18adac5c..596eb1527d0 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.common.ui/src/org/eclipse/papyrus/emf/facet/common/ui/internal/views/ElementsView.java
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.common.ui/src/org/eclipse/papyrus/emf/facet/common/ui/internal/views/ElementsView.java
@@ -10,7 +10,7 @@
  *    Nicolas Bros (Mia-Software) - Bug 334116 - common tree view with columns
  *    Nicolas Bros (Mia-Software) - Bug 372732 - [Facet] Rewrite the catalog views for 0.2
  *******************************************************************************/
-package org.eclipse.emf.facet.common.ui.internal.views;
+package org.eclipse.papyrus.emf.facet.common.ui.internal.views;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -22,11 +22,7 @@ import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Status;
 import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.emf.facet.common.ui.internal.Activator;
-import org.eclipse.emf.facet.common.ui.internal.Messages;
-import org.eclipse.emf.facet.common.ui.internal.controls.PersistableColumn;
-import org.eclipse.emf.facet.common.ui.internal.exported.views.IColumnDescription;
-import org.eclipse.emf.facet.util.core.Logger;
+import org.eclipse.papyrus.emf.facet.util.core.Logger;
 import org.eclipse.jface.action.GroupMarker;
 import org.eclipse.jface.action.MenuManager;
 import org.eclipse.jface.viewers.ColumnLabelProvider;
@@ -36,6 +32,10 @@ import org.eclipse.jface.viewers.ITreeContentProvider;
 import org.eclipse.jface.viewers.OpenEvent;
 import org.eclipse.jface.viewers.TreeViewer;
 import org.eclipse.osgi.util.NLS;
+import org.eclipse.papyrus.emf.facet.common.ui.internal.Activator;
+import org.eclipse.papyrus.emf.facet.common.ui.internal.Messages;
+import org.eclipse.papyrus.emf.facet.common.ui.internal.controls.PersistableColumn;
+import org.eclipse.papyrus.emf.facet.common.ui.internal.exported.views.IColumnDescription;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.layout.FillLayout;
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.common.ui/src/org/eclipse/papyrus/emf/facet/common/ui/internal/views/ElementsViewFactory.java b/plugins/facet/org.eclipse.papyrus.emf.facet.common.ui/src/org/eclipse/papyrus/emf/facet/common/ui/internal/views/ElementsViewFactory.java
index ed4539ab2d4..2fa57ccc31f 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.common.ui/src/org/eclipse/papyrus/emf/facet/common/ui/internal/views/ElementsViewFactory.java
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.common.ui/src/org/eclipse/papyrus/emf/facet/common/ui/internal/views/ElementsViewFactory.java
@@ -9,15 +9,15 @@
  *    Nicolas Bros (Mia-Software) - Bug 372732 - [Facet] Rewrite the catalog views for 0.2
  *******************************************************************************/
 
-package org.eclipse.emf.facet.common.ui.internal.views;
+package org.eclipse.papyrus.emf.facet.common.ui.internal.views;
 
 import java.util.Collection;
 
-import org.eclipse.emf.facet.common.ui.internal.exported.views.IColumnDescription;
-import org.eclipse.emf.facet.common.ui.internal.exported.views.IElementsViewFactory;
 import org.eclipse.jface.viewers.ColumnLabelProvider;
 import org.eclipse.jface.viewers.IOpenListener;
 import org.eclipse.jface.viewers.ITreeContentProvider;
+import org.eclipse.papyrus.emf.facet.common.ui.internal.exported.views.IColumnDescription;
+import org.eclipse.papyrus.emf.facet.common.ui.internal.exported.views.IElementsViewFactory;
 import org.eclipse.swt.graphics.Image;
 import org.eclipse.ui.part.ViewPart;
 
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.common.ui/src/org/eclipse/papyrus/emf/facet/common/ui/internal/widgets/AnywhereFilterMatcher.java b/plugins/facet/org.eclipse.papyrus.emf.facet.common.ui/src/org/eclipse/papyrus/emf/facet/common/ui/internal/widgets/AnywhereFilterMatcher.java
index 393a2adc01b..0ea62c756f7 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.common.ui/src/org/eclipse/papyrus/emf/facet/common/ui/internal/widgets/AnywhereFilterMatcher.java
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.common.ui/src/org/eclipse/papyrus/emf/facet/common/ui/internal/widgets/AnywhereFilterMatcher.java
@@ -8,9 +8,9 @@
  * Contributors:
  *    Nicolas Bros (Mia-Software)
  *******************************************************************************/
-package org.eclipse.emf.facet.common.ui.internal.widgets;
+package org.eclipse.papyrus.emf.facet.common.ui.internal.widgets;
 
-import org.eclipse.emf.facet.common.core.internal.utils.StringMatcher;
+import org.eclipse.papyrus.emf.facet.common.core.internal.utils.StringMatcher;
 import org.eclipse.ui.dialogs.FilteredList.FilterMatcher;
 
 /** This is a matcher that matches anywhere, not just at the beginning. */