60 files changed, 235 insertions, 235 deletions

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/META-INF/MANIFEST.MF b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/META-INF/MANIFEST.MF
index f256caaa3c6..a9a3fd058ee 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/META-INF/MANIFEST.MF
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/META-INF/MANIFEST.MF
@@ -1,23 +1,23 @@
 Manifest-Version: 1.0

 Require-Bundle: org.eclipse.gmf.runtime.diagram.ui.properties,

  org.eclipse.papyrus.infra.core.log;bundle-version="0.9.0"

-Export-Package: org.eclipse.papyrus.preferences,

- org.eclipse.papyrus.preferences.initializer,

- org.eclipse.papyrus.preferences.jface.preference;x-internal:=true,

- org.eclipse.papyrus.preferences.jface.preference.dialogs,

- org.eclipse.papyrus.preferences.pages,

- org.eclipse.papyrus.preferences.pages.internal;x-internal:=true,

- org.eclipse.papyrus.preferences.ui,

- org.eclipse.papyrus.preferences.ui.diagram,

- org.eclipse.papyrus.preferences.ui.editor,

- org.eclipse.papyrus.preferences.utils

+Export-Package: org.eclipse.papyrus.infra.gmfdiag.preferences,

+ org.eclipse.papyrus.infra.gmfdiag.preferences.initializer,

+ org.eclipse.papyrus.infra.gmfdiag.preferences.jface.preference;x-internal:=true,

+ org.eclipse.papyrus.infra.gmfdiag.preferences.jface.preference.dialogs,

+ org.eclipse.papyrus.infra.gmfdiag.preferences.pages,

+ org.eclipse.papyrus.infra.gmfdiag.preferences.pages.internal;x-internal:=true,

+ org.eclipse.papyrus.infra.gmfdiag.preferences.ui,

+ org.eclipse.papyrus.infra.gmfdiag.preferences.ui.diagram,

+ org.eclipse.papyrus.infra.gmfdiag.preferences.ui.editor,

+ org.eclipse.papyrus.infra.gmfdiag.preferences.utils

 Bundle-Vendor: %providerName

 Bundle-ActivationPolicy: lazy

 Bundle-Version: 0.9.0.qualifier

 Bundle-Name: %pluginName

 Bundle-Localization: plugin

 Bundle-ManifestVersion: 2

-Bundle-Activator: org.eclipse.papyrus.preferences.Activator

+Bundle-Activator: org.eclipse.papyrus.infra.gmfdiag.preferences.Activator

 Bundle-SymbolicName: org.eclipse.papyrus.infra.gmfdiag.preferences;singleton:=true

 Bundle-RequiredExecutionEnvironment: J2SE-1.5

 

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/plugin.xml b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/plugin.xml
index e96c195d7da..0a46631c97d 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/plugin.xml
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/plugin.xml
@@ -4,40 +4,40 @@
    <extension

          point="org.eclipse.ui.preferencePages">

       <page

-            class="org.eclipse.papyrus.preferences.pages.internal.PapyrusUML2PreferencePage"

-            id="org.eclipse.papyrus.preferences.generalcategory"

+            class="org.eclipse.papyrus.infra.gmfdiag.preferences.pages.internal.PapyrusUML2PreferencePage"

+            id="org.eclipse.papyrus.infra.gmfdiag.preferences.generalcategory"

             name="Papyrus">

       </page>

       <page

-            category="org.eclipse.papyrus.preferences.generalcategory"

-            class="org.eclipse.papyrus.preferences.pages.PapyrusAllDiagramsPreferencePage"

-            id="org.eclipse.papyrus.preferences.diagrams"

+            category="org.eclipse.papyrus.infra.gmfdiag.preferences.generalcategory"

+            class="org.eclipse.papyrus.infra.gmfdiag.preferences.pages.PapyrusAllDiagramsPreferencePage"

+            id="org.eclipse.papyrus.infra.gmfdiag.preferences.diagrams"

             name="Diagrams">

       </page>

       <page

-            category="org.eclipse.papyrus.preferences.generalcategory"

-            class="org.eclipse.papyrus.preferences.pages.internal.PapyrusRulersAndGridPreferencePage"

-            id="org.eclipse.papyrus.preferences.rulersandgrid"

+            category="org.eclipse.papyrus.infra.gmfdiag.preferences.generalcategory"

+            class="org.eclipse.papyrus.infra.gmfdiag.preferences.pages.internal.PapyrusRulersAndGridPreferencePage"

+            id="org.eclipse.papyrus.infra.gmfdiag.preferences.rulersandgrid"

             name="Rulers And Grid">

       </page>

       <page

-            category="org.eclipse.papyrus.preferences.generalcategory"

-            class="org.eclipse.papyrus.preferences.pages.internal.PapyrusPrintingPreferencePage"

-            id="org.eclipse.papyrus.preferences.printing"

+            category="org.eclipse.papyrus.infra.gmfdiag.preferences.generalcategory"

+            class="org.eclipse.papyrus.infra.gmfdiag.preferences.pages.internal.PapyrusPrintingPreferencePage"

+            id="org.eclipse.papyrus.infra.gmfdiag.preferences.printing"

             name="Printing">

       </page>

       <page

-            category="org.eclipse.papyrus.preferences.generalcategory"

-            class="org.eclipse.papyrus.preferences.pages.internal.PapyrusPathmapsPreferencePage"

-            id="org.eclipse.papyrus.preferences.pathmaps"

+            category="org.eclipse.papyrus.infra.gmfdiag.preferences.generalcategory"

+            class="org.eclipse.papyrus.infra.gmfdiag.preferences.pages.internal.PapyrusPathmapsPreferencePage"

+            id="org.eclipse.papyrus.infra.gmfdiag.preferences.pathmaps"

             name="Pathmaps">

       </page>

    </extension>

    <extension

          point="org.eclipse.ui.propertyPages">

       <page

-            class="org.eclipse.papyrus.preferences.pages.internal.PapyrusUML2PreferencePage"

-            id="org.eclipse.papyrus.preferences.properties.generalcategory"

+            class="org.eclipse.papyrus.infra.gmfdiag.preferences.pages.internal.PapyrusUML2PreferencePage"

+            id="org.eclipse.papyrus.infra.gmfdiag.preferences.properties.generalcategory"

             name="Papyrus">

          <enabledWhen>

             <adapt

@@ -46,9 +46,9 @@
          </enabledWhen>

       </page>

       <page

-            category="org.eclipse.papyrus.preferences.properties.generalcategory"

-            class="org.eclipse.papyrus.preferences.pages.internal.PapyrusDiagramsPreferencePage"

-            id="org.eclipse.papyrus.preferences.pages.internal.PapyrusAllDiagramsPreferencePage"

+            category="org.eclipse.papyrus.infra.gmfdiag.preferences.properties.generalcategory"

+            class="org.eclipse.papyrus.infra.gmfdiag.preferences.pages.internal.PapyrusDiagramsPreferencePage"

+            id="org.eclipse.papyrus.infra.gmfdiag.preferences.pages.internal.PapyrusAllDiagramsPreferencePage"

             name="Diagrams">

          <enabledWhen>

             <adapt

@@ -57,9 +57,9 @@
          </enabledWhen>

       </page>

       <page

-            category="org.eclipse.papyrus.preferences.properties.generalcategory"

-            class="org.eclipse.papyrus.preferences.pages.internal.PapyrusRulersAndGridPreferencePage"

-            id="org.eclipse.papyrus.preferences.properties.rulersandgrid"

+            category="org.eclipse.papyrus.infra.gmfdiag.preferences.properties.generalcategory"

+            class="org.eclipse.papyrus.infra.gmfdiag.preferences.pages.internal.PapyrusRulersAndGridPreferencePage"

+            id="org.eclipse.papyrus.infra.gmfdiag.preferences.properties.rulersandgrid"

             name="Rulers And Grid">

          <enabledWhen>

             <adapt

@@ -68,9 +68,9 @@
          </enabledWhen>

       </page>

       <page

-            category="org.eclipse.papyrus.preferences.properties.generalcategory"

-            class="org.eclipse.papyrus.preferences.pages.internal.PapyrusPrintingPreferencePage"

-            id="org.eclipse.papyrus.preferences.properties.printing"

+            category="org.eclipse.papyrus.infra.gmfdiag.preferences.properties.generalcategory"

+            class="org.eclipse.papyrus.infra.gmfdiag.preferences.pages.internal.PapyrusPrintingPreferencePage"

+            id="org.eclipse.papyrus.infra.gmfdiag.preferences.properties.printing"

             name="Printing">

          <enabledWhen>

             <adapt

@@ -79,9 +79,9 @@
          </enabledWhen>

       </page>

       <page

-            category="org.eclipse.papyrus.preferences.properties.generalcategory"

-            class="org.eclipse.papyrus.preferences.pages.internal.PapyrusPathmapsPreferencePage"

-            id="org.eclipse.papyrus.preferences.properties.pathmaps"

+            category="org.eclipse.papyrus.infra.gmfdiag.preferences.properties.generalcategory"

+            class="org.eclipse.papyrus.infra.gmfdiag.preferences.pages.internal.PapyrusPathmapsPreferencePage"

+            id="org.eclipse.papyrus.infra.gmfdiag.preferences.properties.pathmaps"

             name="Pathmaps">

          <enabledWhen>

             <adapt

@@ -93,7 +93,7 @@
    <extension

          point="org.eclipse.core.runtime.preferences">

       <initializer

-            class="org.eclipse.papyrus.preferences.PapyrusPreferenceInitializer">

+            class="org.eclipse.papyrus.infra.gmfdiag.preferences.PapyrusPreferenceInitializer">

       </initializer>

    </extension>

 

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/preferences/Activator.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/Activator.java
index 7f1d11533bb..eb4b7f111d8 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/preferences/Activator.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/Activator.java
@@ -10,13 +10,13 @@
  *		Thibault Landre (Atos Origin) - Initial API and implementation

  *

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

-package org.eclipse.papyrus.preferences;

+package org.eclipse.papyrus.infra.gmfdiag.preferences;

 

 import org.eclipse.core.runtime.preferences.InstanceScope;

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.resource.ImageDescriptor;

 import org.eclipse.jface.resource.ImageRegistry;

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

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

 import org.eclipse.swt.graphics.Image;

 import org.eclipse.ui.plugin.AbstractUIPlugin;

 import org.osgi.framework.BundleContext;

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/preferences/Messages.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/Messages.java
index 50699a0678a..9076ebdb250 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/preferences/Messages.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/Messages.java
@@ -7,13 +7,13 @@
  * http://www.eclipse.org/legal/epl-v10.html

  *

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

-package org.eclipse.papyrus.preferences;

+package org.eclipse.papyrus.infra.gmfdiag.preferences;

 

 import org.eclipse.osgi.util.NLS;

 

 public class Messages extends NLS {

 

-	private static final String BUNDLE_NAME = "org.eclipse.papyrus.preferences.messages"; //$NON-NLS-1$

+	private static final String BUNDLE_NAME = "org.eclipse.papyrus.infra.gmfdiag.preferences.messages"; //$NON-NLS-1$

 

 

 

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/preferences/PapyrusPreferenceInitializer.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/PapyrusPreferenceInitializer.java
index f8321f53f9b..b55ecc29363 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/preferences/PapyrusPreferenceInitializer.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/PapyrusPreferenceInitializer.java
@@ -11,14 +11,14 @@
  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  *

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

-package org.eclipse.papyrus.preferences;

+package org.eclipse.papyrus.infra.gmfdiag.preferences;

 

 import org.eclipse.core.runtime.preferences.AbstractPreferenceInitializer;

 import org.eclipse.jface.preference.IPreferenceStore;

-import org.eclipse.papyrus.preferences.pages.PapyrusAllDiagramsPreferencePage;

-import org.eclipse.papyrus.preferences.pages.internal.PapyrusPrintingPreferencePage;

-import org.eclipse.papyrus.preferences.pages.internal.PapyrusRulersAndGridPreferencePage;

-import org.eclipse.papyrus.preferences.pages.internal.PapyrusUML2PreferencePage;

+import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.PapyrusAllDiagramsPreferencePage;

+import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.internal.PapyrusPrintingPreferencePage;

+import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.internal.PapyrusRulersAndGridPreferencePage;

+import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.internal.PapyrusUML2PreferencePage;

 

 /**

  * This class is use to initialize the preference at the level Papyrus editor

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/preferences/PapyrusPreferenceStore.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/PapyrusPreferenceStore.java
index c603ddc367f..eb8a48bf6a8 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/preferences/PapyrusPreferenceStore.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/PapyrusPreferenceStore.java
@@ -11,15 +11,15 @@
  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  *

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

-package org.eclipse.papyrus.preferences;

+package org.eclipse.papyrus.infra.gmfdiag.preferences;

 

 import java.util.ArrayList;

 import java.util.Iterator;

 

 import org.eclipse.core.runtime.Platform;

 import org.eclipse.core.runtime.preferences.IScopeContext;

-import org.eclipse.papyrus.preferences.ui.dialog.ApplyValueOnPreferenceKeyDialog;

-import org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.preferences.ui.dialog.ApplyValueOnPreferenceKeyDialog;

+import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

 

 /**

  * this class is a specific store that is used to look for value of element

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/preferences/PapyrusScopedPreferenceStore.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/PapyrusScopedPreferenceStore.java
index d77132dabe4..f64d6a84c30 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/preferences/PapyrusScopedPreferenceStore.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/PapyrusScopedPreferenceStore.java
@@ -11,7 +11,7 @@
  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  *

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

-package org.eclipse.papyrus.preferences;

+package org.eclipse.papyrus.infra.gmfdiag.preferences;

 

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

  Copyright (c) 2010 CEA LIST.

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/preferences/initializer/AbstractViewInitializer.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/initializer/AbstractViewInitializer.java
index c9e00ebafb9..26d9fe8cde0 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/preferences/initializer/AbstractViewInitializer.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/initializer/AbstractViewInitializer.java
@@ -10,7 +10,7 @@
  *		Thibault Landre (Atos Origin) - Initial API and implementation

  *

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

-package org.eclipse.papyrus.preferences.initializer;

+package org.eclipse.papyrus.infra.gmfdiag.preferences.initializer;

 

 import org.eclipse.gmf.runtime.draw2d.ui.figures.FigureUtilities;

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

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/preferences/initializer/LinkViewInitializer.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/initializer/LinkViewInitializer.java
index 36a0adae2cf..da48207887c 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/preferences/initializer/LinkViewInitializer.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/initializer/LinkViewInitializer.java
@@ -10,7 +10,7 @@
  *		Thibault Landre (Atos Origin) - Initial API and implementation

  *

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

-package org.eclipse.papyrus.preferences.initializer;

+package org.eclipse.papyrus.infra.gmfdiag.preferences.initializer;

 

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

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

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/preferences/initializer/NodeViewInitializer.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/initializer/NodeViewInitializer.java
index 402140e298b..38e9354b7e1 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/preferences/initializer/NodeViewInitializer.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/initializer/NodeViewInitializer.java
@@ -10,7 +10,7 @@
  *		Thibault Landre (Atos Origin) - Initial API and implementation

  *

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

-package org.eclipse.papyrus.preferences.initializer;

+package org.eclipse.papyrus.infra.gmfdiag.preferences.initializer;

 

 import org.eclipse.gmf.runtime.draw2d.ui.figures.FigureUtilities;

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

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/preferences/jface/preference/ColorFieldEditor.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/jface/preference/ColorFieldEditor.java
index d7497590835..82b6f449e48 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/preferences/jface/preference/ColorFieldEditor.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/jface/preference/ColorFieldEditor.java
@@ -10,7 +10,7 @@
  *		Thibault Landre (Atos Origin) - Initial API and implementation

  *

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

-package org.eclipse.papyrus.preferences.jface.preference;

+package org.eclipse.papyrus.infra.gmfdiag.preferences.jface.preference;

 

 import org.eclipse.gmf.runtime.diagram.ui.properties.sections.appearance.ColorPalettePopup;

 import org.eclipse.gmf.runtime.draw2d.ui.figures.FigureUtilities;

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/preferences/jface/preference/FontFieldEditor.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/jface/preference/FontFieldEditor.java
index d3042e0a222..fcbe653ecd5 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/preferences/jface/preference/FontFieldEditor.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/jface/preference/FontFieldEditor.java
@@ -11,14 +11,14 @@
  *

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

 

-package org.eclipse.papyrus.preferences.jface.preference;

+package org.eclipse.papyrus.infra.gmfdiag.preferences.jface.preference;

 

 import org.eclipse.gmf.runtime.common.core.util.StringStatics;

 import org.eclipse.gmf.runtime.diagram.ui.properties.internal.l10n.DiagramUIPropertiesImages;

 import org.eclipse.gmf.runtime.diagram.ui.properties.internal.l10n.DiagramUIPropertiesMessages;

 import org.eclipse.jface.preference.FieldEditor;

 import org.eclipse.jface.preference.PreferenceConverter;

-import org.eclipse.papyrus.preferences.utils.FontHelper;

+import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.FontHelper;

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.graphics.FontData;

 import org.eclipse.swt.layout.GridData;

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/preferences/jface/preference/GradientFieldEditor.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/jface/preference/GradientFieldEditor.java
index bfbc315f3e2..88d07676517 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/preferences/jface/preference/GradientFieldEditor.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/jface/preference/GradientFieldEditor.java
@@ -11,14 +11,14 @@
  *		Patrick Tessier (CEA LIST) modification

  *

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

-package org.eclipse.papyrus.preferences.jface.preference;

+package org.eclipse.papyrus.infra.gmfdiag.preferences.jface.preference;

 

 import org.eclipse.gmf.runtime.diagram.ui.properties.sections.appearance.ColorPalettePopup;

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

 import org.eclipse.jface.dialogs.IDialogConstants;

 import org.eclipse.jface.preference.FieldEditor;

-import org.eclipse.papyrus.preferences.Messages;

-import org.eclipse.papyrus.preferences.utils.GradientPreferenceConverter;

+import org.eclipse.papyrus.infra.gmfdiag.preferences.Messages;

+import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.events.ModifyEvent;

 import org.eclipse.swt.events.ModifyListener;

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/preferences/jface/preference/dialogs/GradientTransparencySelectionDialog.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/jface/preference/dialogs/GradientTransparencySelectionDialog.java
index e89e9dfd0c7..2cd6ff9684e 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/preferences/jface/preference/dialogs/GradientTransparencySelectionDialog.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/jface/preference/dialogs/GradientTransparencySelectionDialog.java
@@ -10,7 +10,7 @@
  *		Thibault Landre (Atos Origin) - Initial API and implementation

  *

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

-package org.eclipse.papyrus.preferences.jface.preference.dialogs;

+package org.eclipse.papyrus.infra.gmfdiag.preferences.jface.preference.dialogs;

 

 import org.eclipse.gmf.runtime.common.ui.dialogs.GradientSelectionDialog;

 import org.eclipse.swt.SWT;

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/preferences/messages.properties b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/messages.properties
index 5372bd6a1de..5372bd6a1de 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/preferences/messages.properties
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/messages.properties
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/preferences/messages/Messages.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/messages/Messages.java
index 6b162684e84..a405f7779b5 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/preferences/messages/Messages.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/messages/Messages.java
@@ -1,10 +1,10 @@
-package org.eclipse.papyrus.preferences.messages;

+package org.eclipse.papyrus.infra.gmfdiag.preferences.messages;

 

 import org.eclipse.osgi.util.NLS;

 

 public class Messages extends NLS {

 

-	private static final String BUNDLE_NAME = "org.eclipse.papyrus.preferences.messages.messages"; //$NON-NLS-1$

+	private static final String BUNDLE_NAME = "org.eclipse.papyrus.infra.gmfdiag.preferences.messages.messages"; //$NON-NLS-1$

 

 	public static String LabelGroup_Labels_To_Display;

 	static {

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/preferences/messages/messages.properties b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/messages/messages.properties
index bb2c968ed60..bb2c968ed60 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/preferences/messages/messages.properties
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/messages/messages.properties
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/preferences/pages/AbstractPapyrusElementPreferencePage.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/pages/AbstractPapyrusElementPreferencePage.java
index 51c1278ef77..377c04373b5 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/preferences/pages/AbstractPapyrusElementPreferencePage.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/pages/AbstractPapyrusElementPreferencePage.java
@@ -10,10 +10,10 @@
  *		Thibault Landre (Atos Origin) - Initial API and implementation

  *

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

-package org.eclipse.papyrus.preferences.pages;

+package org.eclipse.papyrus.infra.gmfdiag.preferences.pages;

 

-import org.eclipse.papyrus.preferences.ui.FontGroup;

-import org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.preferences.ui.FontGroup;

+import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.layout.GridLayout;

 import org.eclipse.swt.widgets.Composite;

@@ -27,8 +27,8 @@ import org.eclipse.swt.widgets.Layout;
  * </p>

  * <ul>

  * The following editor fields are initialized :

- * <li>{@link org.eclipse.papyrus.preferences.jface.preference.ColorFieldEditor} <em>ColorFieldEditor</em></li>

- * <li>{@link org.eclipse.papyrus.preferences.jface.preference.FontFieldEditor} <em>FontFieldEditor</em></li>

+ * <li>{@link org.eclipse.papyrus.infra.gmfdiag.preferences.jface.preference.ColorFieldEditor} <em>ColorFieldEditor</em></li>

+ * <li>{@link org.eclipse.papyrus.infra.gmfdiag.preferences.jface.preference.FontFieldEditor} <em>FontFieldEditor</em></li>

  * </ul>

  * 

  * @author tlandre

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/preferences/pages/AbstractPapyrusLinkPreferencePage.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/pages/AbstractPapyrusLinkPreferencePage.java
index 8fb5c8b00f3..263acb4ccc8 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/preferences/pages/AbstractPapyrusLinkPreferencePage.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/pages/AbstractPapyrusLinkPreferencePage.java
@@ -10,13 +10,13 @@
  *		Thibault Landre (Atos Origin) - Initial API and implementation

  *      Vincent Lorenzo (CEA-LIst) -  bug 335989: [Preferences] [Enhancement] Add a group for labels in each Connection Preference Page

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

-package org.eclipse.papyrus.preferences.pages;

+package org.eclipse.papyrus.infra.gmfdiag.preferences.pages;

 

 import java.util.TreeMap;

 

-import org.eclipse.papyrus.preferences.ui.ConnectionGroup;

-import org.eclipse.papyrus.preferences.ui.LabelGroup;

-import org.eclipse.papyrus.preferences.ui.LinkColorGroup;

+import org.eclipse.papyrus.infra.gmfdiag.preferences.ui.ConnectionGroup;

+import org.eclipse.papyrus.infra.gmfdiag.preferences.ui.LabelGroup;

+import org.eclipse.papyrus.infra.gmfdiag.preferences.ui.LinkColorGroup;

 import org.eclipse.swt.widgets.Composite;

 

 /**

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/preferences/pages/AbstractPapyrusNodePreferencePage.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/pages/AbstractPapyrusNodePreferencePage.java
index b5d41a491a1..9ce24b81b6d 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/preferences/pages/AbstractPapyrusNodePreferencePage.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/pages/AbstractPapyrusNodePreferencePage.java
@@ -11,17 +11,17 @@
  *		Vincent Lorenzo (CEA LIST) - Add a list for the compartment names

  *		Vincent Lorenzo (CEA-LIst) -  bug 335989: [Preferences] [Enhancement] Add a group for labels in each Connection Preference Page

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

-package org.eclipse.papyrus.preferences.pages;

+package org.eclipse.papyrus.infra.gmfdiag.preferences.pages;

 

 import java.util.ArrayList;

 import java.util.List;

 import java.util.TreeMap;

 

-import org.eclipse.papyrus.preferences.ui.BackgroundColor;

-import org.eclipse.papyrus.preferences.ui.DecorationGroup;

-import org.eclipse.papyrus.preferences.ui.LabelGroup;

-import org.eclipse.papyrus.preferences.ui.NodeColorGroup;

-import org.eclipse.papyrus.preferences.ui.NodeCompartmentGroup;

+import org.eclipse.papyrus.infra.gmfdiag.preferences.ui.BackgroundColor;

+import org.eclipse.papyrus.infra.gmfdiag.preferences.ui.DecorationGroup;

+import org.eclipse.papyrus.infra.gmfdiag.preferences.ui.LabelGroup;

+import org.eclipse.papyrus.infra.gmfdiag.preferences.ui.NodeColorGroup;

+import org.eclipse.papyrus.infra.gmfdiag.preferences.ui.NodeCompartmentGroup;

 import org.eclipse.swt.widgets.Composite;

 

 /**

@@ -49,7 +49,7 @@ public abstract class AbstractPapyrusNodePreferencePage extends AbstractPapyrusE
 

 	/**

 	 * 

-	 * @see org.eclipse.papyrus.preferences.pages.AbstractPapyrusElementPreferencePage#createPageContents(org.eclipse.swt.widgets.Composite)

+	 * @see org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusElementPreferencePage#createPageContents(org.eclipse.swt.widgets.Composite)

 	 * 

 	 * @param parent

 	 */

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/preferences/pages/AbstractPapyrusPreferencePage.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/pages/AbstractPapyrusPreferencePage.java
index 6f2805acce7..8f89b3315c3 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/preferences/pages/AbstractPapyrusPreferencePage.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/pages/AbstractPapyrusPreferencePage.java
@@ -10,7 +10,7 @@
  *		Thibault Landre (Atos Origin) - Initial API and implementation

  *

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

-package org.eclipse.papyrus.preferences.pages;

+package org.eclipse.papyrus.infra.gmfdiag.preferences.pages;

 

 import java.util.HashSet;

 import java.util.Set;

@@ -22,9 +22,9 @@ import org.eclipse.core.runtime.IAdaptable;
 import org.eclipse.core.runtime.preferences.InstanceScope;

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferencePage;

-import org.eclipse.papyrus.preferences.Activator;

-import org.eclipse.papyrus.preferences.pages.internal.VisiblePageSingleton;

-import org.eclipse.papyrus.preferences.ui.AbstractGroup;

+import org.eclipse.papyrus.infra.gmfdiag.preferences.Activator;

+import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.internal.VisiblePageSingleton;

+import org.eclipse.papyrus.infra.gmfdiag.preferences.ui.AbstractGroup;

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.layout.GridLayout;

 import org.eclipse.swt.widgets.Composite;

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/preferences/pages/DiagramPreferencePage.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/pages/DiagramPreferencePage.java
index edd35f217b2..1be6ca17808 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/preferences/pages/DiagramPreferencePage.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/pages/DiagramPreferencePage.java
@@ -11,26 +11,26 @@
  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  *

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

-package org.eclipse.papyrus.preferences.pages;

+package org.eclipse.papyrus.infra.gmfdiag.preferences.pages;

 

 import java.util.HashSet;

 import java.util.Set;

 

 import org.eclipse.gmf.runtime.diagram.ui.preferences.DiagramsPreferencePage;

-import org.eclipse.papyrus.preferences.PapyrusPreferenceStore;

-import org.eclipse.papyrus.preferences.pages.internal.VisiblePageSingleton;

-import org.eclipse.papyrus.preferences.ui.AbstractGroup;

-import org.eclipse.papyrus.preferences.ui.BackgroundColor;

-import org.eclipse.papyrus.preferences.ui.ConnectionGroup;

-import org.eclipse.papyrus.preferences.ui.DecorationGroup;

-import org.eclipse.papyrus.preferences.ui.FontGroup;

-import org.eclipse.papyrus.preferences.ui.NodeColorGroup;

-import org.eclipse.papyrus.preferences.ui.diagram.DiagramBackgroundColor;

-import org.eclipse.papyrus.preferences.ui.diagram.DiagramConnectionGroup;

-import org.eclipse.papyrus.preferences.ui.diagram.DiagramDecorationGroup;

-import org.eclipse.papyrus.preferences.ui.diagram.DiagramFontGroup;

-import org.eclipse.papyrus.preferences.ui.diagram.DiagramNodeColorGroup;

-import org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.preferences.PapyrusPreferenceStore;

+import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.internal.VisiblePageSingleton;

+import org.eclipse.papyrus.infra.gmfdiag.preferences.ui.AbstractGroup;

+import org.eclipse.papyrus.infra.gmfdiag.preferences.ui.BackgroundColor;

+import org.eclipse.papyrus.infra.gmfdiag.preferences.ui.ConnectionGroup;

+import org.eclipse.papyrus.infra.gmfdiag.preferences.ui.DecorationGroup;

+import org.eclipse.papyrus.infra.gmfdiag.preferences.ui.FontGroup;

+import org.eclipse.papyrus.infra.gmfdiag.preferences.ui.NodeColorGroup;

+import org.eclipse.papyrus.infra.gmfdiag.preferences.ui.diagram.DiagramBackgroundColor;

+import org.eclipse.papyrus.infra.gmfdiag.preferences.ui.diagram.DiagramConnectionGroup;

+import org.eclipse.papyrus.infra.gmfdiag.preferences.ui.diagram.DiagramDecorationGroup;

+import org.eclipse.papyrus.infra.gmfdiag.preferences.ui.diagram.DiagramFontGroup;

+import org.eclipse.papyrus.infra.gmfdiag.preferences.ui.diagram.DiagramNodeColorGroup;

+import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

 import org.eclipse.swt.layout.GridLayout;

 import org.eclipse.swt.widgets.Composite;

 import org.eclipse.swt.widgets.Control;

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/preferences/pages/PapyrusAllDiagramsPreferencePage.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/pages/PapyrusAllDiagramsPreferencePage.java
index ff74cdc6928..dc27266b937 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/preferences/pages/PapyrusAllDiagramsPreferencePage.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/pages/PapyrusAllDiagramsPreferencePage.java
@@ -11,29 +11,29 @@
  *		Patrick Tessier (CEA LIST)- modifications

  *

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

-package org.eclipse.papyrus.preferences.pages;

+package org.eclipse.papyrus.infra.gmfdiag.preferences.pages;

 

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

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

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

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

-import org.eclipse.papyrus.preferences.Activator;

-import org.eclipse.papyrus.preferences.PapyrusPreferenceStore;

-import org.eclipse.papyrus.preferences.ui.BackgroundColor;

-import org.eclipse.papyrus.preferences.ui.ConnectionGroup;

-import org.eclipse.papyrus.preferences.ui.DecorationGroup;

-import org.eclipse.papyrus.preferences.ui.DimensionGroup;

-import org.eclipse.papyrus.preferences.ui.FontGroup;

-import org.eclipse.papyrus.preferences.ui.NodeColorGroup;

-import org.eclipse.papyrus.preferences.ui.editor.EditorBackgroundColor;

-import org.eclipse.papyrus.preferences.ui.editor.EditorConnectionGroup;

-import org.eclipse.papyrus.preferences.ui.editor.EditorDecorationGroup;

-import org.eclipse.papyrus.preferences.ui.editor.EditorDimensionGroup;

-import org.eclipse.papyrus.preferences.ui.editor.EditorFontGroup;

-import org.eclipse.papyrus.preferences.ui.editor.EditorNodeColorGroup;

-import org.eclipse.papyrus.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.preferences.Activator;

+import org.eclipse.papyrus.infra.gmfdiag.preferences.PapyrusPreferenceStore;

+import org.eclipse.papyrus.infra.gmfdiag.preferences.ui.BackgroundColor;

+import org.eclipse.papyrus.infra.gmfdiag.preferences.ui.ConnectionGroup;

+import org.eclipse.papyrus.infra.gmfdiag.preferences.ui.DecorationGroup;

+import org.eclipse.papyrus.infra.gmfdiag.preferences.ui.DimensionGroup;

+import org.eclipse.papyrus.infra.gmfdiag.preferences.ui.FontGroup;

+import org.eclipse.papyrus.infra.gmfdiag.preferences.ui.NodeColorGroup;

+import org.eclipse.papyrus.infra.gmfdiag.preferences.ui.editor.EditorBackgroundColor;

+import org.eclipse.papyrus.infra.gmfdiag.preferences.ui.editor.EditorConnectionGroup;

+import org.eclipse.papyrus.infra.gmfdiag.preferences.ui.editor.EditorDecorationGroup;

+import org.eclipse.papyrus.infra.gmfdiag.preferences.ui.editor.EditorDimensionGroup;

+import org.eclipse.papyrus.infra.gmfdiag.preferences.ui.editor.EditorFontGroup;

+import org.eclipse.papyrus.infra.gmfdiag.preferences.ui.editor.EditorNodeColorGroup;

+import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

+import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

 import org.eclipse.swt.layout.GridLayout;

 import org.eclipse.swt.widgets.Composite;

 import org.eclipse.swt.widgets.Group;

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/preferences/pages/internal/PapyrusPathmapsPreferencePage.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/pages/internal/PapyrusPathmapsPreferencePage.java
index 65d6fd4649e..dda5b6b60f6 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/preferences/pages/internal/PapyrusPathmapsPreferencePage.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/pages/internal/PapyrusPathmapsPreferencePage.java
@@ -10,7 +10,7 @@
  *		Thibault Landre (Atos Origin) - Initial API and implementation

  *

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

-package org.eclipse.papyrus.preferences.pages.internal;

+package org.eclipse.papyrus.infra.gmfdiag.preferences.pages.internal;

 

 import org.eclipse.core.resources.IProject;

 import org.eclipse.core.resources.IResource;

@@ -19,7 +19,7 @@ import org.eclipse.core.runtime.IAdaptable;
 import org.eclipse.core.runtime.preferences.InstanceScope;

 import org.eclipse.gmf.runtime.emf.ui.preferences.PathmapsPreferencePage;

 import org.eclipse.jface.preference.IPreferenceStore;

-import org.eclipse.papyrus.preferences.Activator;

+import org.eclipse.papyrus.infra.gmfdiag.preferences.Activator;

 import org.eclipse.ui.IWorkbenchPropertyPage;

 import org.eclipse.ui.preferences.ScopedPreferenceStore;

 

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/preferences/pages/internal/PapyrusPrintingPreferencePage.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/pages/internal/PapyrusPrintingPreferencePage.java
index 788295b4c35..dea1eadd2ca 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/preferences/pages/internal/PapyrusPrintingPreferencePage.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/pages/internal/PapyrusPrintingPreferencePage.java
@@ -10,7 +10,7 @@
  *		Thibault Landre (Atos Origin) - Initial API and implementation

  *

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

-package org.eclipse.papyrus.preferences.pages.internal;

+package org.eclipse.papyrus.infra.gmfdiag.preferences.pages.internal;

 

 import org.eclipse.core.resources.IProject;

 import org.eclipse.core.resources.IResource;

@@ -19,7 +19,7 @@ import org.eclipse.core.runtime.IAdaptable;
 import org.eclipse.core.runtime.preferences.InstanceScope;

 import org.eclipse.gmf.runtime.diagram.ui.preferences.PrintingPreferencePage;

 import org.eclipse.jface.preference.IPreferenceStore;

-import org.eclipse.papyrus.preferences.Activator;

+import org.eclipse.papyrus.infra.gmfdiag.preferences.Activator;

 import org.eclipse.ui.IWorkbenchPropertyPage;

 import org.eclipse.ui.preferences.ScopedPreferenceStore;

 

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/preferences/pages/internal/PapyrusRulersAndGridPreferencePage.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/pages/internal/PapyrusRulersAndGridPreferencePage.java
index e006c1a1f17..9b60f04eb2f 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/preferences/pages/internal/PapyrusRulersAndGridPreferencePage.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/pages/internal/PapyrusRulersAndGridPreferencePage.java
@@ -10,7 +10,7 @@
  *		Thibault Landre (Atos Origin) - Initial API and implementation

  *

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

-package org.eclipse.papyrus.preferences.pages.internal;

+package org.eclipse.papyrus.infra.gmfdiag.preferences.pages.internal;

 

 import org.eclipse.core.resources.IProject;

 import org.eclipse.core.resources.IResource;

@@ -19,7 +19,7 @@ import org.eclipse.core.runtime.IAdaptable;
 import org.eclipse.core.runtime.preferences.InstanceScope;

 import org.eclipse.gmf.runtime.diagram.ui.preferences.RulerGridPreferencePage;

 import org.eclipse.jface.preference.IPreferenceStore;

-import org.eclipse.papyrus.preferences.Activator;

+import org.eclipse.papyrus.infra.gmfdiag.preferences.Activator;

 import org.eclipse.ui.IWorkbenchPropertyPage;

 import org.eclipse.ui.preferences.ScopedPreferenceStore;

 

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/preferences/pages/internal/PapyrusUML2PreferencePage.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/pages/internal/PapyrusUML2PreferencePage.java
index decb64e76d1..64aed575cb4 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/preferences/pages/internal/PapyrusUML2PreferencePage.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/pages/internal/PapyrusUML2PreferencePage.java
@@ -10,11 +10,11 @@
  *		Thibault Landre (Atos Origin) - Initial API and implementation

  *

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

-package org.eclipse.papyrus.preferences.pages.internal;

+package org.eclipse.papyrus.infra.gmfdiag.preferences.pages.internal;

 

 import org.eclipse.jface.preference.IPreferenceStore;

-import org.eclipse.papyrus.preferences.Activator;

-import org.eclipse.papyrus.preferences.pages.AbstractPapyrusPreferencePage;

+import org.eclipse.papyrus.infra.gmfdiag.preferences.Activator;

+import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusPreferencePage;

 import org.eclipse.swt.widgets.Composite;

 

 /**

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/preferences/pages/internal/VisiblePageSingleton.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/pages/internal/VisiblePageSingleton.java
index 5253a2fbe55..506843da6dc 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/preferences/pages/internal/VisiblePageSingleton.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/pages/internal/VisiblePageSingleton.java
@@ -11,11 +11,11 @@
  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  *

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

-package org.eclipse.papyrus.preferences.pages.internal;

+package org.eclipse.papyrus.infra.gmfdiag.preferences.pages.internal;

 

 import org.eclipse.jface.preference.IPreferencePage;

-import org.eclipse.papyrus.preferences.pages.AbstractPapyrusPreferencePage;

-import org.eclipse.papyrus.preferences.pages.DiagramPreferencePage;

+import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusPreferencePage;

+import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.DiagramPreferencePage;

 

 /**

  * This singleton has bee created to manage the button ok and apply of preference page.

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/preferences/ui/AbstractGroup.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/ui/AbstractGroup.java
index e2f50523842..0a6ac336c04 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/preferences/ui/AbstractGroup.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/ui/AbstractGroup.java
@@ -11,7 +11,7 @@
  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr 

  *  Thibault Landre (Atos Origin) 

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

-package org.eclipse.papyrus.preferences.ui;

+package org.eclipse.papyrus.infra.gmfdiag.preferences.ui;

 

 import java.util.HashSet;

 import java.util.Set;

@@ -19,7 +19,7 @@ import java.util.Set;
 import org.eclipse.jface.dialogs.DialogPage;

 import org.eclipse.jface.preference.FieldEditor;

 import org.eclipse.jface.preference.IPreferenceStore;

-import org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.layout.GridLayout;

 import org.eclipse.swt.widgets.Composite;

@@ -129,7 +129,7 @@ public abstract class AbstractGroup extends Composite {
 	/**

 	 * Load preferences of all registered fieldEditors.

 	 * 

-	 * @see org.eclipse.papyrus.preferences.ui.AbstractGroup#addFieldEditor(FieldEditor)

+	 * @see org.eclipse.papyrus.infra.gmfdiag.preferences.ui.AbstractGroup#addFieldEditor(FieldEditor)

 	 */

 	public void load() {

 		for(FieldEditor fe : fieldsEditor) {

@@ -140,7 +140,7 @@ public abstract class AbstractGroup extends Composite {
 	/**

 	 * Set the preference store of all registered fieldEditors.

 	 * 

-	 * @see org.eclipse.papyrus.preferences.ui.AbstractGroup#addFieldEditor(FieldEditor)

+	 * @see org.eclipse.papyrus.infra.gmfdiag.preferences.ui.AbstractGroup#addFieldEditor(FieldEditor)

 	 */

 	public final void setPreferenceStore(IPreferenceStore store) {

 		for(FieldEditor fe : fieldsEditor) {

@@ -151,7 +151,7 @@ public abstract class AbstractGroup extends Composite {
 	/**

 	 * Load default preferences of all registered fieldEditors.

 	 * 

-	 * @see org.eclipse.papyrus.preferences.ui.AbstractGroup#addFieldEditor(FieldEditor)

+	 * @see org.eclipse.papyrus.infra.gmfdiag.preferences.ui.AbstractGroup#addFieldEditor(FieldEditor)

 	 */

 	public final void loadDefault() {

 		for(FieldEditor fe : fieldsEditor) {

@@ -162,7 +162,7 @@ public abstract class AbstractGroup extends Composite {
 	/**

 	 * Store preferences of the registered fieldEditors.

 	 * 

-	 * @see org.eclipse.papyrus.preferences.ui.AbstractGroup#addFieldEditor(FieldEditor)

+	 * @see org.eclipse.papyrus.infra.gmfdiag.preferences.ui.AbstractGroup#addFieldEditor(FieldEditor)

 	 */

 	public final void storePreferences() {

 		for(FieldEditor fe : fieldsEditor) {

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/preferences/ui/BackgroundColor.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/ui/BackgroundColor.java
index d55cf58de67..5310a9612f1 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/preferences/ui/BackgroundColor.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/ui/BackgroundColor.java
@@ -12,15 +12,15 @@
  *  Thibault Landre (Atos Origin) 

  *

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

-package org.eclipse.papyrus.preferences.ui;

+package org.eclipse.papyrus.infra.gmfdiag.preferences.ui;

 

 import org.eclipse.jface.dialogs.DialogPage;

 import org.eclipse.jface.preference.BooleanFieldEditor;

 import org.eclipse.jface.util.IPropertyChangeListener;

 import org.eclipse.jface.util.PropertyChangeEvent;

-import org.eclipse.papyrus.preferences.Messages;

-import org.eclipse.papyrus.preferences.jface.preference.GradientFieldEditor;

-import org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.preferences.Messages;

+import org.eclipse.papyrus.infra.gmfdiag.preferences.jface.preference.GradientFieldEditor;

+import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.layout.GridLayout;

 import org.eclipse.swt.widgets.Composite;

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/preferences/ui/ConnectionGroup.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/ui/ConnectionGroup.java
index d710f9baa7f..24743f10387 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/preferences/ui/ConnectionGroup.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/ui/ConnectionGroup.java
@@ -11,7 +11,7 @@
  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr 

  *  Thibault Landre (Atos Origin) 

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

-package org.eclipse.papyrus.preferences.ui;

+package org.eclipse.papyrus.infra.gmfdiag.preferences.ui;

 

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

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

@@ -20,8 +20,8 @@ import org.eclipse.gmf.runtime.notation.Smoothness;
 import org.eclipse.jface.dialogs.DialogPage;

 import org.eclipse.jface.preference.BooleanFieldEditor;

 import org.eclipse.jface.preference.ComboFieldEditor;

-import org.eclipse.papyrus.preferences.Messages;

-import org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.preferences.Messages;

+import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

 import org.eclipse.swt.layout.GridLayout;

 import org.eclipse.swt.widgets.Composite;

 import org.eclipse.swt.widgets.Group;

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/preferences/ui/DecorationGroup.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/ui/DecorationGroup.java
index 84cad3c553a..d593ff9e865 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/preferences/ui/DecorationGroup.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/ui/DecorationGroup.java
@@ -11,12 +11,12 @@
  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  *

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

-package org.eclipse.papyrus.preferences.ui;

+package org.eclipse.papyrus.infra.gmfdiag.preferences.ui;

 

 import org.eclipse.jface.dialogs.DialogPage;

 import org.eclipse.jface.preference.BooleanFieldEditor;

-import org.eclipse.papyrus.preferences.Messages;

-import org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.preferences.Messages;

+import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

 import org.eclipse.swt.layout.GridLayout;

 import org.eclipse.swt.widgets.Composite;

 import org.eclipse.swt.widgets.Group;

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/preferences/ui/DimensionGroup.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/ui/DimensionGroup.java
index 16a04770231..022a0080167 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/preferences/ui/DimensionGroup.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/ui/DimensionGroup.java
@@ -11,12 +11,12 @@
  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  *

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

-package org.eclipse.papyrus.preferences.ui;

+package org.eclipse.papyrus.infra.gmfdiag.preferences.ui;

 

 import org.eclipse.jface.dialogs.DialogPage;

 import org.eclipse.jface.preference.IntegerFieldEditor;

-import org.eclipse.papyrus.preferences.Messages;

-import org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.preferences.Messages;

+import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

 import org.eclipse.swt.layout.GridLayout;

 import org.eclipse.swt.widgets.Composite;

 import org.eclipse.swt.widgets.Group;

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/preferences/ui/FontGroup.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/ui/FontGroup.java
index d7eddb40306..96d018ae320 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/preferences/ui/FontGroup.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/ui/FontGroup.java
@@ -11,12 +11,12 @@
  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr 

  *  Thibault Landre (Atos Origin) 

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

-package org.eclipse.papyrus.preferences.ui;

+package org.eclipse.papyrus.infra.gmfdiag.preferences.ui;

 

 import org.eclipse.jface.dialogs.DialogPage;

-import org.eclipse.papyrus.preferences.Messages;

-import org.eclipse.papyrus.preferences.jface.preference.FontFieldEditor;

-import org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.preferences.Messages;

+import org.eclipse.papyrus.infra.gmfdiag.preferences.jface.preference.FontFieldEditor;

+import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.layout.GridLayout;

 import org.eclipse.swt.widgets.Composite;

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/preferences/ui/LabelGroup.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/ui/LabelGroup.java
index b15ac2a91a0..815e3a76b9d 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/preferences/ui/LabelGroup.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/ui/LabelGroup.java
@@ -11,7 +11,7 @@
  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

  *

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

-package org.eclipse.papyrus.preferences.ui;

+package org.eclipse.papyrus.infra.gmfdiag.preferences.ui;

 

 import java.net.MalformedURLException;

 import java.net.URL;

@@ -19,10 +19,10 @@ import java.util.TreeMap;
 

 import org.eclipse.jface.dialogs.DialogPage;

 import org.eclipse.jface.resource.ImageDescriptor;

-import org.eclipse.papyrus.preferences.Activator;

-import org.eclipse.papyrus.preferences.messages.Messages;

-import org.eclipse.papyrus.preferences.ui.editor.CLabelBooleanFieldEditor;

-import org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.preferences.Activator;

+import org.eclipse.papyrus.infra.gmfdiag.preferences.messages.Messages;

+import org.eclipse.papyrus.infra.gmfdiag.preferences.ui.editor.CLabelBooleanFieldEditor;

+import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.graphics.Image;

 import org.eclipse.swt.layout.GridLayout;

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/preferences/ui/LinkColorGroup.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/ui/LinkColorGroup.java
index e4ff387a1ca..e862781d57e 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/preferences/ui/LinkColorGroup.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/ui/LinkColorGroup.java
@@ -11,13 +11,13 @@
  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr 

  *  Thibault Landre (Atos Origin) 

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

-package org.eclipse.papyrus.preferences.ui;

+package org.eclipse.papyrus.infra.gmfdiag.preferences.ui;

 

 import org.eclipse.gmf.runtime.diagram.ui.properties.internal.l10n.DiagramUIPropertiesImages;

 import org.eclipse.jface.dialogs.DialogPage;

-import org.eclipse.papyrus.preferences.Messages;

-import org.eclipse.papyrus.preferences.jface.preference.ColorFieldEditor;

-import org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.preferences.Messages;

+import org.eclipse.papyrus.infra.gmfdiag.preferences.jface.preference.ColorFieldEditor;

+import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.layout.GridLayout;

 import org.eclipse.swt.widgets.Composite;

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/preferences/ui/NodeColorGroup.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/ui/NodeColorGroup.java
index aa4f25a0d1e..757a57126f5 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/preferences/ui/NodeColorGroup.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/ui/NodeColorGroup.java
@@ -11,12 +11,12 @@
  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr 

  *  Thibault Landre (Atos Origin) 

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

-package org.eclipse.papyrus.preferences.ui;

+package org.eclipse.papyrus.infra.gmfdiag.preferences.ui;

 

 import org.eclipse.gmf.runtime.diagram.ui.properties.internal.l10n.DiagramUIPropertiesImages;

 import org.eclipse.jface.dialogs.DialogPage;

-import org.eclipse.papyrus.preferences.jface.preference.ColorFieldEditor;

-import org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.preferences.jface.preference.ColorFieldEditor;

+import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

 import org.eclipse.swt.widgets.Composite;

 

 /**

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/preferences/ui/NodeCompartmentGroup.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/ui/NodeCompartmentGroup.java
index 34aac7c61d1..b8c70f9fe09 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/preferences/ui/NodeCompartmentGroup.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/ui/NodeCompartmentGroup.java
@@ -13,7 +13,7 @@
  *

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

 

-package org.eclipse.papyrus.preferences.ui;

+package org.eclipse.papyrus.infra.gmfdiag.preferences.ui;

 

 import java.util.List;

 import java.util.Set;

@@ -21,7 +21,7 @@ import java.util.Set;
 import org.eclipse.gmf.runtime.common.ui.preferences.CheckBoxFieldEditor;

 import org.eclipse.jface.dialogs.DialogPage;

 import org.eclipse.jface.preference.IPreferenceStore;

-import org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.events.SelectionEvent;

 import org.eclipse.swt.events.SelectionListener;

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/preferences/ui/OrderedCompartmentGroup.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/ui/OrderedCompartmentGroup.java
index b79a977036e..c8027053a2d 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/preferences/ui/OrderedCompartmentGroup.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/ui/OrderedCompartmentGroup.java
@@ -13,14 +13,14 @@
  *

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

 

-package org.eclipse.papyrus.preferences.ui;

+package org.eclipse.papyrus.infra.gmfdiag.preferences.ui;

 

 import java.util.List;

 

 import org.eclipse.gmf.runtime.common.ui.preferences.CheckBoxFieldEditor;

 import org.eclipse.jface.dialogs.DialogPage;

 import org.eclipse.jface.preference.IPreferenceStore;

-import org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.events.SelectionEvent;

 import org.eclipse.swt.events.SelectionListener;

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/preferences/ui/OrderedLabelGroup.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/ui/OrderedLabelGroup.java
index 7037b306ff1..f5aefe03a64 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/preferences/ui/OrderedLabelGroup.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/ui/OrderedLabelGroup.java
@@ -11,7 +11,7 @@
  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

  *

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

-package org.eclipse.papyrus.preferences.ui;

+package org.eclipse.papyrus.infra.gmfdiag.preferences.ui;

 

 import java.net.MalformedURLException;

 import java.net.URL;

@@ -21,10 +21,10 @@ import java.util.Map;
 

 import org.eclipse.jface.dialogs.DialogPage;

 import org.eclipse.jface.resource.ImageDescriptor;

-import org.eclipse.papyrus.preferences.Activator;

-import org.eclipse.papyrus.preferences.messages.Messages;

-import org.eclipse.papyrus.preferences.ui.editor.CLabelBooleanFieldEditor;

-import org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.preferences.Activator;

+import org.eclipse.papyrus.infra.gmfdiag.preferences.messages.Messages;

+import org.eclipse.papyrus.infra.gmfdiag.preferences.ui.editor.CLabelBooleanFieldEditor;

+import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.graphics.Image;

 import org.eclipse.swt.layout.GridLayout;

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/preferences/ui/diagram/DiagramBackgroundColor.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/ui/diagram/DiagramBackgroundColor.java
index fbb6f89249b..b1d211866b6 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/preferences/ui/diagram/DiagramBackgroundColor.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/ui/diagram/DiagramBackgroundColor.java
@@ -11,11 +11,11 @@
  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  *

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

-package org.eclipse.papyrus.preferences.ui.diagram;

+package org.eclipse.papyrus.infra.gmfdiag.preferences.ui.diagram;

 

 import org.eclipse.jface.dialogs.DialogPage;

-import org.eclipse.papyrus.preferences.ui.BackgroundColor;

-import org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.preferences.ui.BackgroundColor;

+import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

 import org.eclipse.swt.widgets.Composite;

 

 /**

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/preferences/ui/diagram/DiagramConnectionGroup.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/ui/diagram/DiagramConnectionGroup.java
index 092e0ccf813..63ecd518ceb 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/preferences/ui/diagram/DiagramConnectionGroup.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/ui/diagram/DiagramConnectionGroup.java
@@ -11,11 +11,11 @@
  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  *

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

-package org.eclipse.papyrus.preferences.ui.diagram;

+package org.eclipse.papyrus.infra.gmfdiag.preferences.ui.diagram;

 

 import org.eclipse.jface.dialogs.DialogPage;

-import org.eclipse.papyrus.preferences.ui.ConnectionGroup;

-import org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.preferences.ui.ConnectionGroup;

+import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

 import org.eclipse.swt.widgets.Composite;

 

 /**

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/preferences/ui/diagram/DiagramDecorationGroup.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/ui/diagram/DiagramDecorationGroup.java
index bb9ae473b81..d936311bdeb 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/preferences/ui/diagram/DiagramDecorationGroup.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/ui/diagram/DiagramDecorationGroup.java
@@ -11,11 +11,11 @@
  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  *

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

-package org.eclipse.papyrus.preferences.ui.diagram;

+package org.eclipse.papyrus.infra.gmfdiag.preferences.ui.diagram;

 

 import org.eclipse.jface.dialogs.DialogPage;

-import org.eclipse.papyrus.preferences.ui.DecorationGroup;

-import org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.preferences.ui.DecorationGroup;

+import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

 import org.eclipse.swt.widgets.Composite;

 

 // TODO: Auto-generated Javadoc

@@ -41,7 +41,7 @@ public class DiagramDecorationGroup extends DecorationGroup {
 	/*

 	 * (non-Javadoc)

 	 * 

-	 * @see org.eclipse.papyrus.preferences.ui.AbstractGroup#getPreferenceConstant(int)

+	 * @see org.eclipse.papyrus.infra.gmfdiag.preferences.ui.AbstractGroup#getPreferenceConstant(int)

 	 */

 	protected String getPreferenceConstant(int preferenceType) {

 		return PreferenceConstantHelper.getDiagramConstant(getKey(), preferenceType);

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/preferences/ui/diagram/DiagramDimensionGroup.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/ui/diagram/DiagramDimensionGroup.java
index a1f9886ae1b..de502c5285a 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/preferences/ui/diagram/DiagramDimensionGroup.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/ui/diagram/DiagramDimensionGroup.java
@@ -11,11 +11,11 @@
  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  *

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

-package org.eclipse.papyrus.preferences.ui.diagram;

+package org.eclipse.papyrus.infra.gmfdiag.preferences.ui.diagram;

 

 import org.eclipse.jface.dialogs.DialogPage;

-import org.eclipse.papyrus.preferences.ui.DimensionGroup;

-import org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.preferences.ui.DimensionGroup;

+import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

 import org.eclipse.swt.widgets.Composite;

 

 /**

@@ -40,7 +40,7 @@ public class DiagramDimensionGroup extends DimensionGroup {
 	/*

 	 * (non-Javadoc)

 	 * 

-	 * @see org.eclipse.papyrus.preferences.ui.AbstractGroup#getPreferenceConstant(int)

+	 * @see org.eclipse.papyrus.infra.gmfdiag.preferences.ui.AbstractGroup#getPreferenceConstant(int)

 	 */

 	protected String getPreferenceConstant(int preferenceType) {

 		return PreferenceConstantHelper.getDiagramConstant(getKey(), preferenceType);

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/preferences/ui/diagram/DiagramFontGroup.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/ui/diagram/DiagramFontGroup.java
index 5fb1fa0998c..c1da2dadbd7 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/preferences/ui/diagram/DiagramFontGroup.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/ui/diagram/DiagramFontGroup.java
@@ -11,11 +11,11 @@
  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  *

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

-package org.eclipse.papyrus.preferences.ui.diagram;

+package org.eclipse.papyrus.infra.gmfdiag.preferences.ui.diagram;

 

 import org.eclipse.jface.dialogs.DialogPage;

-import org.eclipse.papyrus.preferences.ui.FontGroup;

-import org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.preferences.ui.FontGroup;

+import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

 import org.eclipse.swt.widgets.Composite;

 

 /**

@@ -40,7 +40,7 @@ public class DiagramFontGroup extends FontGroup {
 	/*

 	 * (non-Javadoc)

 	 * 

-	 * @see org.eclipse.papyrus.preferences.ui.AbstractGroup#getPreferenceConstant(int)

+	 * @see org.eclipse.papyrus.infra.gmfdiag.preferences.ui.AbstractGroup#getPreferenceConstant(int)

 	 */

 	protected String getPreferenceConstant(int preferenceType) {

 		return PreferenceConstantHelper.getDiagramConstant(getKey(), preferenceType);

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/preferences/ui/diagram/DiagramLinkColorGroup.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/ui/diagram/DiagramLinkColorGroup.java
index 2de215efe4c..aa8cc6fd78b 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/preferences/ui/diagram/DiagramLinkColorGroup.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/ui/diagram/DiagramLinkColorGroup.java
@@ -11,11 +11,11 @@
  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  *

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

-package org.eclipse.papyrus.preferences.ui.diagram;

+package org.eclipse.papyrus.infra.gmfdiag.preferences.ui.diagram;

 

 import org.eclipse.jface.dialogs.DialogPage;

-import org.eclipse.papyrus.preferences.ui.LinkColorGroup;

-import org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.preferences.ui.LinkColorGroup;

+import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

 import org.eclipse.swt.widgets.Composite;

 

 /**

@@ -40,7 +40,7 @@ public class DiagramLinkColorGroup extends LinkColorGroup {
 	/*

 	 * (non-Javadoc)

 	 * 

-	 * @see org.eclipse.papyrus.preferences.ui.AbstractGroup#getPreferenceConstant(int)

+	 * @see org.eclipse.papyrus.infra.gmfdiag.preferences.ui.AbstractGroup#getPreferenceConstant(int)

 	 */

 	protected String getPreferenceConstant(int preferenceType) {

 		return PreferenceConstantHelper.getDiagramConstant(getKey(), preferenceType);

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/preferences/ui/diagram/DiagramNodeColorGroup.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/ui/diagram/DiagramNodeColorGroup.java
index b7a95dad6df..f4440e4786d 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/preferences/ui/diagram/DiagramNodeColorGroup.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/ui/diagram/DiagramNodeColorGroup.java
@@ -11,11 +11,11 @@
  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  *

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

-package org.eclipse.papyrus.preferences.ui.diagram;

+package org.eclipse.papyrus.infra.gmfdiag.preferences.ui.diagram;

 

 import org.eclipse.jface.dialogs.DialogPage;

-import org.eclipse.papyrus.preferences.ui.NodeColorGroup;

-import org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.preferences.ui.NodeColorGroup;

+import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

 import org.eclipse.swt.widgets.Composite;

 

 /**

@@ -40,7 +40,7 @@ public class DiagramNodeColorGroup extends NodeColorGroup {
 	/*

 	 * (non-Javadoc)

 	 * 

-	 * @see org.eclipse.papyrus.preferences.ui.AbstractGroup#getPreferenceConstant(int)

+	 * @see org.eclipse.papyrus.infra.gmfdiag.preferences.ui.AbstractGroup#getPreferenceConstant(int)

 	 */

 	protected String getPreferenceConstant(int preferenceType) {

 		return PreferenceConstantHelper.getDiagramConstant(getKey(), preferenceType);

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/preferences/ui/dialog/AbstractPreferenceKeyDialog.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/ui/dialog/AbstractPreferenceKeyDialog.java
index fd6e49837c2..1aa79b9fd94 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/preferences/ui/dialog/AbstractPreferenceKeyDialog.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/ui/dialog/AbstractPreferenceKeyDialog.java
@@ -11,7 +11,7 @@
  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  *

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

-package org.eclipse.papyrus.preferences.ui.dialog;

+package org.eclipse.papyrus.infra.gmfdiag.preferences.ui.dialog;

 

 import java.util.ArrayList;

 

@@ -23,8 +23,8 @@ import org.eclipse.jface.viewers.ITableLabelProvider;
 import org.eclipse.jface.viewers.LabelProvider;

 import org.eclipse.jface.viewers.TableViewer;

 import org.eclipse.jface.viewers.Viewer;

-import org.eclipse.papyrus.preferences.Activator;

-import org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.preferences.Activator;

+import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.graphics.Color;

 import org.eclipse.swt.graphics.Image;

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/preferences/ui/dialog/ApplyValueOnPreferenceKeyDialog.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/ui/dialog/ApplyValueOnPreferenceKeyDialog.java
index 54a2a350a58..8587f0f91e5 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/preferences/ui/dialog/ApplyValueOnPreferenceKeyDialog.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/ui/dialog/ApplyValueOnPreferenceKeyDialog.java
@@ -11,7 +11,7 @@
  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  *

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

-package org.eclipse.papyrus.preferences.ui.dialog;

+package org.eclipse.papyrus.infra.gmfdiag.preferences.ui.dialog;

 

 import java.util.ArrayList;

 

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/preferences/ui/editor/CLabelBooleanFieldEditor.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/ui/editor/CLabelBooleanFieldEditor.java
index d0fd112c5fd..5c4572efbf2 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/preferences/ui/editor/CLabelBooleanFieldEditor.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/ui/editor/CLabelBooleanFieldEditor.java
@@ -11,7 +11,7 @@
  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

  *

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

-package org.eclipse.papyrus.preferences.ui.editor;

+package org.eclipse.papyrus.infra.gmfdiag.preferences.ui.editor;

 

 import org.eclipse.core.runtime.Assert;

 import org.eclipse.jface.preference.BooleanFieldEditor;

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/preferences/ui/editor/EditorBackgroundColor.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/ui/editor/EditorBackgroundColor.java
index 7904688260a..92ad3b765c5 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/preferences/ui/editor/EditorBackgroundColor.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/ui/editor/EditorBackgroundColor.java
@@ -11,11 +11,11 @@
  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  *

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

-package org.eclipse.papyrus.preferences.ui.editor;

+package org.eclipse.papyrus.infra.gmfdiag.preferences.ui.editor;

 

 import org.eclipse.jface.dialogs.DialogPage;

-import org.eclipse.papyrus.preferences.ui.BackgroundColor;

-import org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.preferences.ui.BackgroundColor;

+import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

 import org.eclipse.swt.widgets.Composite;

 

 /**

@@ -40,7 +40,7 @@ public class EditorBackgroundColor extends BackgroundColor {
 	/*

 	 * (non-Javadoc)

 	 * 

-	 * @see org.eclipse.papyrus.preferences.ui.AbstractGroup#getPreferenceConstant(int)

+	 * @see org.eclipse.papyrus.infra.gmfdiag.preferences.ui.AbstractGroup#getPreferenceConstant(int)

 	 */

 	protected String getPreferenceConstant(int preferenceType) {

 		return PreferenceConstantHelper.getPapyrusEditorConstant(preferenceType);

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/preferences/ui/editor/EditorConnectionGroup.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/ui/editor/EditorConnectionGroup.java
index ca0ebc1d30a..efbeed08d6b 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/preferences/ui/editor/EditorConnectionGroup.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/ui/editor/EditorConnectionGroup.java
@@ -11,11 +11,11 @@
  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  *

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

-package org.eclipse.papyrus.preferences.ui.editor;

+package org.eclipse.papyrus.infra.gmfdiag.preferences.ui.editor;

 

 import org.eclipse.jface.dialogs.DialogPage;

-import org.eclipse.papyrus.preferences.ui.ConnectionGroup;

-import org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.preferences.ui.ConnectionGroup;

+import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

 import org.eclipse.swt.widgets.Composite;

 

 /**

@@ -40,7 +40,7 @@ public class EditorConnectionGroup extends ConnectionGroup {
 	/*

 	 * (non-Javadoc)

 	 * 

-	 * @see org.eclipse.papyrus.preferences.ui.AbstractGroup#getPreferenceConstant(int)

+	 * @see org.eclipse.papyrus.infra.gmfdiag.preferences.ui.AbstractGroup#getPreferenceConstant(int)

 	 */

 	protected String getPreferenceConstant(int preferenceType) {

 		return PreferenceConstantHelper.getPapyrusEditorConstant(preferenceType);

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/preferences/ui/editor/EditorDecorationGroup.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/ui/editor/EditorDecorationGroup.java
index b8ea5aeafc0..1a2dc982b0a 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/preferences/ui/editor/EditorDecorationGroup.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/ui/editor/EditorDecorationGroup.java
@@ -11,11 +11,11 @@
  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  *

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

-package org.eclipse.papyrus.preferences.ui.editor;

+package org.eclipse.papyrus.infra.gmfdiag.preferences.ui.editor;

 

 import org.eclipse.jface.dialogs.DialogPage;

-import org.eclipse.papyrus.preferences.ui.DecorationGroup;

-import org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.preferences.ui.DecorationGroup;

+import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

 import org.eclipse.swt.widgets.Composite;

 

 /**

@@ -40,7 +40,7 @@ public class EditorDecorationGroup extends DecorationGroup {
 	/*

 	 * (non-Javadoc)

 	 * 

-	 * @see org.eclipse.papyrus.preferences.ui.AbstractGroup#getPreferenceConstant(int)

+	 * @see org.eclipse.papyrus.infra.gmfdiag.preferences.ui.AbstractGroup#getPreferenceConstant(int)

 	 */

 	protected String getPreferenceConstant(int preferenceType) {

 		return PreferenceConstantHelper.getPapyrusEditorConstant(preferenceType);

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/preferences/ui/editor/EditorDimensionGroup.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/ui/editor/EditorDimensionGroup.java
index 955c233276f..f8f2cf92ce7 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/preferences/ui/editor/EditorDimensionGroup.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/ui/editor/EditorDimensionGroup.java
@@ -11,11 +11,11 @@
  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  *

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

-package org.eclipse.papyrus.preferences.ui.editor;

+package org.eclipse.papyrus.infra.gmfdiag.preferences.ui.editor;

 

 import org.eclipse.jface.dialogs.DialogPage;

-import org.eclipse.papyrus.preferences.ui.DimensionGroup;

-import org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.preferences.ui.DimensionGroup;

+import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

 import org.eclipse.swt.widgets.Composite;

 

 /**

@@ -40,7 +40,7 @@ public class EditorDimensionGroup extends DimensionGroup {
 	/*

 	 * (non-Javadoc)

 	 * 

-	 * @see org.eclipse.papyrus.preferences.ui.AbstractGroup#getPreferenceConstant(int)

+	 * @see org.eclipse.papyrus.infra.gmfdiag.preferences.ui.AbstractGroup#getPreferenceConstant(int)

 	 */

 	protected String getPreferenceConstant(int preferenceType) {

 		return PreferenceConstantHelper.getPapyrusEditorConstant(preferenceType);

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/preferences/ui/editor/EditorFontGroup.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/ui/editor/EditorFontGroup.java
index 5ef7ff20f73..5fb9adf3920 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/preferences/ui/editor/EditorFontGroup.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/ui/editor/EditorFontGroup.java
@@ -11,11 +11,11 @@
  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  *

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

-package org.eclipse.papyrus.preferences.ui.editor;

+package org.eclipse.papyrus.infra.gmfdiag.preferences.ui.editor;

 

 import org.eclipse.jface.dialogs.DialogPage;

-import org.eclipse.papyrus.preferences.ui.FontGroup;

-import org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.preferences.ui.FontGroup;

+import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

 import org.eclipse.swt.widgets.Composite;

 

 /**

@@ -40,7 +40,7 @@ public class EditorFontGroup extends FontGroup {
 	/*

 	 * (non-Javadoc)

 	 * 

-	 * @see org.eclipse.papyrus.preferences.ui.AbstractGroup#getPreferenceConstant(int)

+	 * @see org.eclipse.papyrus.infra.gmfdiag.preferences.ui.AbstractGroup#getPreferenceConstant(int)

 	 */

 	protected String getPreferenceConstant(int preferenceType) {

 		return PreferenceConstantHelper.getPapyrusEditorConstant(preferenceType);

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/preferences/ui/editor/EditorLinkColorGroup.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/ui/editor/EditorLinkColorGroup.java
index 5988e5aea24..3066fde767a 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/preferences/ui/editor/EditorLinkColorGroup.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/ui/editor/EditorLinkColorGroup.java
@@ -11,11 +11,11 @@
  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  *

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

-package org.eclipse.papyrus.preferences.ui.editor;

+package org.eclipse.papyrus.infra.gmfdiag.preferences.ui.editor;

 

 import org.eclipse.jface.dialogs.DialogPage;

-import org.eclipse.papyrus.preferences.ui.LinkColorGroup;

-import org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.preferences.ui.LinkColorGroup;

+import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

 import org.eclipse.swt.widgets.Composite;

 

 /**

@@ -40,7 +40,7 @@ public class EditorLinkColorGroup extends LinkColorGroup {
 	/*

 	 * (non-Javadoc)

 	 * 

-	 * @see org.eclipse.papyrus.preferences.ui.AbstractGroup#getPreferenceConstant(int)

+	 * @see org.eclipse.papyrus.infra.gmfdiag.preferences.ui.AbstractGroup#getPreferenceConstant(int)

 	 */

 	protected String getPreferenceConstant(int preferenceType) {

 		return PreferenceConstantHelper.getPapyrusEditorConstant(preferenceType);

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/preferences/ui/editor/EditorNodeColorGroup.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/ui/editor/EditorNodeColorGroup.java
index 3250b3cbda8..c5b51a67abd 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/preferences/ui/editor/EditorNodeColorGroup.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/ui/editor/EditorNodeColorGroup.java
@@ -11,11 +11,11 @@
  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  *

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

-package org.eclipse.papyrus.preferences.ui.editor;

+package org.eclipse.papyrus.infra.gmfdiag.preferences.ui.editor;

 

 import org.eclipse.jface.dialogs.DialogPage;

-import org.eclipse.papyrus.preferences.ui.NodeColorGroup;

-import org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.preferences.ui.NodeColorGroup;

+import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

 import org.eclipse.swt.widgets.Composite;

 

 /**

@@ -40,7 +40,7 @@ public class EditorNodeColorGroup extends NodeColorGroup {
 	/*

 	 * (non-Javadoc)

 	 * 

-	 * @see org.eclipse.papyrus.preferences.ui.AbstractGroup#getPreferenceConstant(int)

+	 * @see org.eclipse.papyrus.infra.gmfdiag.preferences.ui.AbstractGroup#getPreferenceConstant(int)

 	 */

 	protected String getPreferenceConstant(int preferenceType) {

 		return PreferenceConstantHelper.getPapyrusEditorConstant(preferenceType);

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/preferences/utils/FontHelper.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/utils/FontHelper.java
index ae93efd44e2..a17e9806032 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/preferences/utils/FontHelper.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/utils/FontHelper.java
@@ -9,7 +9,7 @@
  *    IBM Corporation - initial API and implementation 

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

 

-package org.eclipse.papyrus.preferences.utils;

+package org.eclipse.papyrus.infra.gmfdiag.preferences.utils;

 

 import java.util.Arrays;

 import java.util.HashSet;

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/preferences/utils/GradientPreferenceConverter.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/utils/GradientPreferenceConverter.java
index b8d42ec1d7e..ee1ef8ab3a0 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/preferences/utils/GradientPreferenceConverter.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/utils/GradientPreferenceConverter.java
@@ -10,7 +10,7 @@
  *		Thibault Landre (Atos Origin) - Initial API and implementation

  *

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

-package org.eclipse.papyrus.preferences.utils;

+package org.eclipse.papyrus.infra.gmfdiag.preferences.utils;

 

 import java.util.StringTokenizer;

 

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/preferences/utils/PreferenceConstantHelper.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/utils/PreferenceConstantHelper.java
index c026abb5c74..5fe8a0106cf 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/preferences/utils/PreferenceConstantHelper.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/utils/PreferenceConstantHelper.java
@@ -11,7 +11,7 @@
  *      Lorenzo Vincent (CEA LIST) - Add Compartment Visibility

  *      Vincent Lorenzo (CEA-LIst) -  bug 335989: [Preferences] [Enhancement] Add a group for labels in each Connection Preference Page

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

-package org.eclipse.papyrus.preferences.utils;

+package org.eclipse.papyrus.infra.gmfdiag.preferences.utils;

 

 /**

  * <p>