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

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

18 files changed, 50 insertions, 41 deletions

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands/.project b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands/.project
index 8e03a7a93a8..7eaedb9bed9 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands/.project
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <projectDescription>

-	<name>org.eclipse.papyrus.commands</name>

+	<name>org.eclipse.papyrus.infra.gmfdiag.commands</name>

 	<comment></comment>

 	<projects>

 	</projects>

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands/META-INF/MANIFEST.MF b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands/META-INF/MANIFEST.MF
index 57a1db4368f..e68f0fc9381 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands/META-INF/MANIFEST.MF
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Export-Package: org.eclipse.papyrus.commands,

  org.eclipse.papyrus.commands.wrappers

 Require-Bundle: org.eclipse.ui.workbench,

- org.eclipse.papyrus.log;bundle-version:="0.9.0",

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

  org.eclipse.gmf.runtime.common.core,

  org.eclipse.emf.common,

  org.eclipse.gef,

@@ -13,6 +13,6 @@ Bundle-Version: 0.9.0.qualifier
 Bundle-Name: %pluginName

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

 Bundle-ManifestVersion: 2

-Bundle-SymbolicName: org.eclipse.papyrus.commands;singleton:=true

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

 Bundle-RequiredExecutionEnvironment: J2SE-1.5

 

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands/src/org/eclipse/papyrus/commands/Activator.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands/src/org/eclipse/papyrus/commands/Activator.java
index 89aac5d8c7a..1de726d6b83 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands/src/org/eclipse/papyrus/commands/Activator.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands/src/org/eclipse/papyrus/commands/Activator.java
@@ -1,7 +1,7 @@
 /*****************************************************************************

  * Copyright (c) 2011 Atos.

  *

- *    

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

@@ -23,7 +23,7 @@ import org.osgi.framework.BundleContext;
 public class Activator extends AbstractUIPlugin {

 

 	// The plug-in ID

-	public static final String PLUGIN_ID = "org.eclipse.papyrus.commands"; //$NON-NLS-1$

+	public static final String PLUGIN_ID = "org.eclipse.papyrus.infra.gmfdiag.commands"; //$NON-NLS-1$

 

 	// The shared instance

 	private static Activator plugin;

@@ -42,6 +42,7 @@ public class Activator extends AbstractUIPlugin {
 	 * 

 	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)

 	 */

+	@Override

 	public void start(BundleContext context) throws Exception {

 		super.start(context);

 		plugin = this;

@@ -54,6 +55,7 @@ public class Activator extends AbstractUIPlugin {
 	 * 

 	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)

 	 */

+	@Override

 	public void stop(BundleContext context) throws Exception {

 		plugin = null;

 		log = null;

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.navigation/.project b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.navigation/.project
index 9e5180418f0..ae030e4c71b 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.navigation/.project
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.navigation/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <projectDescription>

-	<name>org.eclipse.papyrus.navigation</name>

+	<name>org.eclipse.papyrus.infra.gmfdiag.navigation</name>

 	<comment></comment>

 	<projects>

 	</projects>

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.navigation/META-INF/MANIFEST.MF b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.navigation/META-INF/MANIFEST.MF
index 6ddf6acea67..ffc9452e9b4 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.navigation/META-INF/MANIFEST.MF
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.navigation/META-INF/MANIFEST.MF
@@ -2,16 +2,16 @@ Manifest-Version: 1.0
 Export-Package: org.eclipse.papyrus.navigation,

  org.eclipse.papyrus.navigation.decorator,

  org.eclipse.papyrus.navigation.preference

-Require-Bundle: org.eclipse.papyrus.core;bundle-version:="0.9.0";visibility:=reexport,

- org.eclipse.papyrus.commands;bundle-version="0.9.0",

- org.eclipse.papyrus.preferences;bundle-version="0.9.0",

- org.eclipse.papyrus.core.adaptor.gmf;bundle-version="0.9.0",

- org.eclipse.papyrus.ui.toolbox;bundle-version="0.9.0",

- org.eclipse.core.expressions;bundle-version:="3.4.300",

- org.eclipse.papyrus.views.modelexplorer;bundle-version:="0.9.0",

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

+ org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="0.9.0",

+ org.eclipse.papyrus.infra.gmfdiag.preferences;bundle-version="0.9.0",

+ org.eclipse.papyrus.infra.core.adaptor.gmf;bundle-version="0.9.0",

+ org.eclipse.papyrus.infra.widgets.toolbox;bundle-version="0.9.0",

+ org.eclipse.core.expressions;bundle-version="3.4.300",

+ org.eclipse.papyrus.views.modelexplorer;bundle-version="0.9.0",

  org.eclipse.ui.navigator;bundle-version="3.5.100",

  org.eclipse.emf.facet.infra.browser.uicore;bundle-version="0.1.0",

- org.eclipse.papyrus.ui.perspectiveconfiguration;bundle-version="0.9.0"

+ org.eclipse.papyrus.editor.perspectiveconfiguration;bundle-version="0.9.0"

 Bundle-Vendor: %providerName

 Bundle-ActivationPolicy: lazy

 Bundle-Version: 0.9.0.qualifier

@@ -19,6 +19,6 @@ Bundle-Localization: plugin
 Bundle-Name: %pluginName

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

 Bundle-ManifestVersion: 2

-Bundle-SymbolicName: org.eclipse.papyrus.navigation;singleton:=true

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

 Bundle-RequiredExecutionEnvironment: J2SE-1.5

 

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.navigation/src/org/eclipse/papyrus/navigation/Activator.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.navigation/src/org/eclipse/papyrus/navigation/Activator.java
index 08a476750a8..042ac1696d4 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.navigation/src/org/eclipse/papyrus/navigation/Activator.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.navigation/src/org/eclipse/papyrus/navigation/Activator.java
@@ -1,7 +1,7 @@
 /*****************************************************************************

  * Copyright (c) 2010 CEA LIST.

  *

- *    

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

@@ -22,7 +22,7 @@ import org.osgi.framework.BundleContext;
 public class Activator extends AbstractUIPlugin {

 

 	// The plug-in ID

-	public static final String PLUGIN_ID = "org.eclipse.papyrus.navigation"; //$NON-NLS-1$

+	public static final String PLUGIN_ID = "org.eclipse.papyrus.infra.gmfdiag.navigation"; //$NON-NLS-1$

 

 	// The shared instance

 	private static Activator plugin;

@@ -39,6 +39,7 @@ public class Activator extends AbstractUIPlugin {
 	 * @see

 	 * org.eclipse.core.runtime.Plugins#start(org.osgi.framework.BundleContext)

 	 */

+	@Override

 	public void start(BundleContext context) throws Exception {

 		super.start(context);

 		plugin = this;

@@ -52,6 +53,7 @@ public class Activator extends AbstractUIPlugin {
 	 * @see

 	 * org.eclipse.core.runtime.Plugin#stop(org.osgi.framework.BundleContext)

 	 */

+	@Override

 	public void stop(BundleContext context) throws Exception {

 		plugin = null;

 		super.stop(context);

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.outline/.project b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.outline/.project
index a96d0f5d7e8..f47f80c973c 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.outline/.project
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.outline/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <projectDescription>

-	<name>org.eclipse.papyrus.outline</name>

+	<name>org.eclipse.papyrus.infra.gmfdiag.outline</name>

 	<comment></comment>

 	<projects>

 	</projects>

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.outline/META-INF/MANIFEST.MF b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.outline/META-INF/MANIFEST.MF
index e0d801c0c5b..568bc25c009 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.outline/META-INF/MANIFEST.MF
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.outline/META-INF/MANIFEST.MF
@@ -1,5 +1,5 @@
 Manifest-Version: 1.0

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

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

  org.eclipse.uml2.uml.editor;bundle-version="2.2.0",

  org.eclipse.gmf.runtime.diagram.ui.render;bundle-version="1.2.0"

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

@@ -12,6 +12,6 @@ Bundle-Localization: plugin
 Bundle-Name: %pluginName

 Bundle-ManifestVersion: 2

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

-Bundle-SymbolicName: org.eclipse.papyrus.outline;singleton:=true

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

 Bundle-RequiredExecutionEnvironment: J2SE-1.5

 

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.outline/src/org/eclipse/papyrus/outline/internal/Activator.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.outline/src/org/eclipse/papyrus/outline/internal/Activator.java
index bc356cce566..420f2f9dcc6 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.outline/src/org/eclipse/papyrus/outline/internal/Activator.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.outline/src/org/eclipse/papyrus/outline/internal/Activator.java
@@ -27,7 +27,7 @@ import org.osgi.framework.BundleContext;
 public class Activator extends AbstractUIPlugin {

 

 	// The plug-in ID

-	public static final String PLUGIN_ID = "org.eclipse.papyrus.outline";

+	public static final String PLUGIN_ID = "org.eclipse.papyrus.infra.gmfdiag.outline";

 

 	// The shared instance

 	private static Activator plugin;

@@ -43,6 +43,7 @@ public class Activator extends AbstractUIPlugin {
 	 * 

 	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)

 	 */

+	@Override

 	public void start(BundleContext context) throws Exception {

 		super.start(context);

 		plugin = this;

@@ -53,6 +54,7 @@ public class Activator extends AbstractUIPlugin {
 	 * 

 	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)

 	 */

+	@Override

 	public void stop(BundleContext context) throws Exception {

 		plugin = null;

 		super.stop(context);

@@ -78,8 +80,9 @@ public class Activator extends AbstractUIPlugin {
 

 		IPath path = new Path(pathString);

 		URL uri = FileLocator.find(Activator.plugin.getBundle(), path, null);

-		if(uri == null)

+		if(uri == null) {

 			return null;

+		}

 		return ImageDescriptor.createFromURL(uri);

 	}

 }

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/.project b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/.project
index deb7f5cdffd..e5424473c0d 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/.project
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <projectDescription>

-	<name>org.eclipse.papyrus.preferences</name>

+	<name>org.eclipse.papyrus.infra.gmfdiag.preferences</name>

 	<comment></comment>

 	<projects>

 	</projects>

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 37a81ecc553..83314ae82f3 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,6 +1,6 @@
 Manifest-Version: 1.0

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

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

+ org.eclipse.papyrus.infra.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,

@@ -18,6 +18,6 @@ Bundle-Name: %pluginName
 Bundle-Localization: plugin

 Bundle-ManifestVersion: 2

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

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

+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/src/org/eclipse/papyrus/preferences/Activator.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/preferences/Activator.java
index e12333d90cf..7f1d11533bb 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/preferences/Activator.java
@@ -1,6 +1,6 @@
 /****************************************************************************

  * Copyright (c) 2008 Atos Origin.

- *  

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

@@ -27,7 +27,7 @@ import org.osgi.framework.BundleContext;
 public class Activator extends AbstractUIPlugin {

 

 	// The plug-in ID

-	public static final String PLUGIN_ID = "org.eclipse.papyrus.preferences"; //$NON-NLS-1$

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

 

 	// The shared instance

 	private static Activator plugin;

@@ -51,6 +51,7 @@ public class Activator extends AbstractUIPlugin {
 	 * 

 	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)

 	 */

+	@Override

 	public void start(BundleContext context) throws Exception {

 		super.start(context);

 		plugin = this;

@@ -58,6 +59,7 @@ public class Activator extends AbstractUIPlugin {
 		log = new LogHelper(plugin);

 	}

 

+	@Override

 	public IPreferenceStore getPreferenceStore() {

 		// Create the preference store lazily.

 		if(papyrusPreferenceStore == null) {

@@ -72,6 +74,7 @@ public class Activator extends AbstractUIPlugin {
 	 * 

 	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)

 	 */

+	@Override

 	public void stop(BundleContext context) throws Exception {

 		plugin = null;

 		log = null;

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/.project b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/.project
index f20aa0ea0e6..406b60555a6 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/.project
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <projectDescription>

-	<name>org.eclipse.papyrus.properties.notation</name>

+	<name>org.eclipse.papyrus.infra.gmfdiag.properties</name>

 	<comment></comment>

 	<projects>

 	</projects>

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/META-INF/MANIFEST.MF b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/META-INF/MANIFEST.MF
index 81b71e8a006..04f460e3f3b 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/META-INF/MANIFEST.MF
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/META-INF/MANIFEST.MF
@@ -3,25 +3,24 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,

  org.eclipse.papyrus.views.properties;bundle-version="0.9.0",

  org.eclipse.papyrus.views.properties.model;bundle-version="0.9.0",

- org.eclipse.gmf.runtime.notation;bundle-version:="1.4.1",

+ org.eclipse.gmf.runtime.notation;bundle-version="1.4.1",

  org.eclipse.gef;bundle-version="3.7.0",

  org.eclipse.emf.edit;bundle-version="2.7.0",

- org.eclipse.papyrus.widgets;bundle-version:="0.9.0",

+ org.eclipse.papyrus.infra.widgets;bundle-version="0.9.0",

  org.eclipse.core.databinding;bundle-version="1.4.0",

  org.eclipse.emf.databinding;bundle-version="1.2.0",

  org.eclipse.core.databinding.property;bundle-version="1.4.0",

  org.eclipse.core.databinding.beans;bundle-version="1.2.100",

  org.eclipse.papyrus.uml.properties;bundle-version="0.9.0",

- org.eclipse.papyrus.log;bundle-version:="0.9.0",

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

  org.eclipse.emf.edit.ui;bundle-version="2.7.0",

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

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

 Bundle-Vendor: %Bundle-Vendor

 Bundle-ActivationPolicy: lazy

 Bundle-Version: 0.9.0.qualifier

 Bundle-Name: %Bundle-Name

 Bundle-ManifestVersion: 2

 Bundle-Activator: org.eclipse.papyrus.properties.notation.Activator

-Bundle-SymbolicName: org.eclipse.papyrus.properties.notation;singleton

- :=true

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

 Bundle-RequiredExecutionEnvironment: J2SE-1.5

 

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/src/org/eclipse/papyrus/properties/notation/Activator.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/src/org/eclipse/papyrus/properties/notation/Activator.java
index 3d60e383d7a..d86a22e5a8e 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/src/org/eclipse/papyrus/properties/notation/Activator.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/src/org/eclipse/papyrus/properties/notation/Activator.java
@@ -23,7 +23,7 @@ public class Activator extends AbstractUIPlugin {
 	/**

 	 * The plug-in ID

 	 */

-	public static final String PLUGIN_ID = "org.eclipse.papyrus.properties.notation"; //$NON-NLS-1$

+	public static final String PLUGIN_ID = "org.eclipse.papyrus.infra.gmfdiag.properties"; //$NON-NLS-1$

 

 	// The shared instance

 	private static Activator plugin;

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.widgets/.project b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.widgets/.project
index 7fd416f0d38..37940b6f3ec 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.widgets/.project
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.widgets/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <projectDescription>

-	<name>org.eclipse.papyrus.widgets.gmf</name>

+	<name>org.eclipse.papyrus.infra.gmfdiag.widgets</name>

 	<comment></comment>

 	<projects>

 	</projects>

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.widgets/META-INF/MANIFEST.MF b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.widgets/META-INF/MANIFEST.MF
index 37d3fac289b..172060866d0 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.widgets/META-INF/MANIFEST.MF
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.widgets/META-INF/MANIFEST.MF
@@ -1,10 +1,10 @@
 Manifest-Version: 1.0

 Require-Bundle: org.eclipse.ui,

  org.eclipse.core.runtime,

- org.eclipse.papyrus.widgets;bundle-version="0.9.0",

+ org.eclipse.papyrus.infra.widgets;bundle-version="0.9.0",

  org.eclipse.gmf.runtime.diagram.ui;bundle-version="1.5.0",

  org.eclipse.gmf.runtime.diagram.ui.properties;bundle-version="1.4.2",

- org.eclipse.core.databinding;bundle-version:="1.4.0",

+ org.eclipse.core.databinding;bundle-version="1.4.0",

  org.eclipse.jface.databinding;bundle-version="1.5.0",

  org.eclipse.core.databinding.property;bundle-version="1.4.0",

  org.eclipse.papyrus.views.properties;bundle-version="0.9.0"

@@ -14,6 +14,6 @@ Bundle-Version: 0.9.0.qualifier
 Bundle-Name: %Bundle-Name

 Bundle-ManifestVersion: 2

 Bundle-Activator: org.eclipse.papyrus.widgets.gmf.Activator

-Bundle-SymbolicName: org.eclipse.papyrus.widgets.gmf;singleton:=true

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

 Bundle-RequiredExecutionEnvironment: J2SE-1.5

 

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.widgets/src/org/eclipse/papyrus/widgets/gmf/Activator.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.widgets/src/org/eclipse/papyrus/widgets/gmf/Activator.java
index 980e6955834..19db1a0f44b 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.widgets/src/org/eclipse/papyrus/widgets/gmf/Activator.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.widgets/src/org/eclipse/papyrus/widgets/gmf/Activator.java
@@ -1,6 +1,6 @@
 /*****************************************************************************

  * Copyright (c) 2011 CEA LIST.

- *    

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

@@ -22,7 +22,7 @@ import org.osgi.framework.BundleContext;
 public class Activator extends AbstractUIPlugin {

 

 	// The plug-in ID

-	public static final String PLUGIN_ID = "org.eclipse.papyrus.widgets.gmf"; //$NON-NLS-1$

+	public static final String PLUGIN_ID = "org.eclipse.papyrus.infra.gmfdiag.widgets"; //$NON-NLS-1$

 

 	// The shared instance

 	private static Activator plugin;