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

9 files changed, 17 insertions, 19 deletions

diff --git a/plugins/customization/org.eclipse.papyrus.customization.paletteconfiguration/.project b/plugins/customization/org.eclipse.papyrus.customization.paletteconfiguration/.project
index 31a4c55ab3a..ade61aa1a4f 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.paletteconfiguration/.project
+++ b/plugins/customization/org.eclipse.papyrus.customization.paletteconfiguration/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <projectDescription>

-	<name>org.eclipse.papyrus.customization.paletteconfiguration</name>

+	<name>org.eclipse.papyrus.uml.diagram.customization.paletteconfiguration</name>

 	<comment></comment>

 	<projects>

 	</projects>

diff --git a/plugins/customization/org.eclipse.papyrus.customization.paletteconfiguration/META-INF/MANIFEST.MF b/plugins/customization/org.eclipse.papyrus.customization.paletteconfiguration/META-INF/MANIFEST.MF
index cc7c66d9dae..3392e6f5b2f 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.paletteconfiguration/META-INF/MANIFEST.MF
+++ b/plugins/customization/org.eclipse.papyrus.customization.paletteconfiguration/META-INF/MANIFEST.MF
@@ -4,18 +4,16 @@ Require-Bundle: org.eclipse.ui;bundle-version="3.7.0",
  org.eclipse.papyrus.uml.diagram.paletteconfiguration;bundle-version="0.9.0",

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

  org.eclipse.emf.facet.infra.query.core;bundle-version="0.1.0",

- org.eclipse.gmf.runtime.emf.type.core;bundle-version="1.4.0",

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

- org.eclipse.papyrus.uml.diagram.paletteconfiguration.edit;bundle-version="0.9.0"

-Export-Package: org.eclipse.papyrus.paletteconfiguration.customization,

- org.eclipse.papyrus.paletteconfiguration.customization.queries

+ org.eclipse.gmf.runtime.emf.type.core;bundle-version="1.4.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.paletteconfiguration.customizati

+Bundle-Activator: org.eclipse.papyrus.uml.diagram.paletteconfiguration.customizati

  on.Activator

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

+Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.customization.paletteconfiguration;singleton:=true

 Bundle-RequiredExecutionEnvironment: J2SE-1.5

+Export-Package: org.eclipse.papyrus.paletteconfiguration.customization,

+ org.eclipse.papyrus.paletteconfiguration.customization.queries

 

diff --git a/plugins/customization/org.eclipse.papyrus.customization.paletteconfiguration/facet/PaletteConfiguration.querySet b/plugins/customization/org.eclipse.papyrus.customization.paletteconfiguration/facet/PaletteConfiguration.querySet
index 4a2d68d2a3e..b22af87fcb6 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.paletteconfiguration/facet/PaletteConfiguration.querySet
+++ b/plugins/customization/org.eclipse.papyrus.customization.paletteconfiguration/facet/PaletteConfiguration.querySet
@@ -3,19 +3,19 @@
   <associatedMetamodels href="http://www.eclipse.org/papyrus/diagram/paletteconfiguration/0.7#/"/>

   <associatedMetamodels href="http://www.eclipse.org/emf/2002/Ecore#/"/>

   <associatedMetamodels href="http://www.eclipse.org/uml2/3.0.0/UML#/"/>

-  <queries xsi:type="query:JavaModelQuery" name="getIcon" description="Gets the icon for a configuration element in the palette configuration model" implementationClassName="org.eclipse.papyrus.paletteconfiguration.customization.queries.GetIconQuery">

+  <queries xsi:type="query:JavaModelQuery" name="getIcon" description="Gets the icon for a configuration element in the palette configuration model" implementationClassName="org.eclipse.papyrus.uml.diagram.paletteconfiguration.customization.queries.GetIconQuery">

     <returnType xsi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/3.0.0/UML#//String"/>

     <scope href="http://www.eclipse.org/papyrus/diagram/paletteconfiguration/0.7#//Configuration"/>

   </queries>

-  <queries xsi:type="query:JavaModelQuery" name="hasIcon" description="Returns &lt;code>true&lt;/code> if the element has a specific icon to display" implementationClassName="org.eclipse.papyrus.paletteconfiguration.customization.queries.HasIconQuery">

+  <queries xsi:type="query:JavaModelQuery" name="hasIcon" description="Returns &lt;code>true&lt;/code> if the element has a specific icon to display" implementationClassName="org.eclipse.papyrus.uml.diagram.paletteconfiguration.customization.queries.HasIconQuery">

     <returnType xsi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/3.0.0/UML#//Boolean"/>

     <scope href="http://www.eclipse.org/papyrus/diagram/paletteconfiguration/0.7#//Configuration"/>

   </queries>

-  <queries xsi:type="query:JavaModelQuery" name="getToolLabel" description="Returns the Label for a tool." implementationClassName="org.eclipse.papyrus.paletteconfiguration.customization.queries.GetToolLabelQuery">

+  <queries xsi:type="query:JavaModelQuery" name="getToolLabel" description="Returns the Label for a tool." implementationClassName="org.eclipse.papyrus.uml.diagram.paletteconfiguration.customization.queries.GetToolLabelQuery">

     <returnType xsi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/3.0.0/UML#//String"/>

     <scope href="http://www.eclipse.org/papyrus/diagram/paletteconfiguration/0.7#//ToolConfiguration"/>

   </queries>

-  <queries xsi:type="query:JavaModelQuery" name="getDrawerLabel" description="Returns the label for a drawer" implementationClassName="org.eclipse.papyrus.paletteconfiguration.customization.queries.GetDrawerLabelQuery">

+  <queries xsi:type="query:JavaModelQuery" name="getDrawerLabel" description="Returns the label for a drawer" implementationClassName="org.eclipse.papyrus.uml.diagram.paletteconfiguration.customization.queries.GetDrawerLabelQuery">

     <returnType xsi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/3.0.0/UML#//String"/>

     <scope href="http://www.eclipse.org/papyrus/diagram/paletteconfiguration/0.7#//DrawerConfiguration"/>

   </queries>

diff --git a/plugins/customization/org.eclipse.papyrus.customization.paletteconfiguration/plugin.properties b/plugins/customization/org.eclipse.papyrus.customization.paletteconfiguration/plugin.properties
index f2673046d9e..67fea175fdf 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.paletteconfiguration/plugin.properties
+++ b/plugins/customization/org.eclipse.papyrus.customization.paletteconfiguration/plugin.properties
@@ -1,3 +1,3 @@
-#Properties file for org.eclipse.papyrus.paletteconfiguration.customization

+#Properties file for org.eclipse.papyrus.uml.diagram.paletteconfiguration.customization

 Bundle-Vendor = Eclipse Modeling Project

 Bundle-Name = Customization

diff --git a/plugins/customization/org.eclipse.papyrus.customization.paletteconfiguration/src/org/eclipse/papyrus/paletteconfiguration/customization/Activator.java b/plugins/customization/org.eclipse.papyrus.customization.paletteconfiguration/src/org/eclipse/papyrus/paletteconfiguration/customization/Activator.java
index 947eea2ca17..ad748bc6821 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.paletteconfiguration/src/org/eclipse/papyrus/paletteconfiguration/customization/Activator.java
+++ b/plugins/customization/org.eclipse.papyrus.customization.paletteconfiguration/src/org/eclipse/papyrus/paletteconfiguration/customization/Activator.java
@@ -9,7 +9,7 @@ import org.osgi.framework.BundleContext;
 public class Activator extends AbstractUIPlugin {

 

 	// The plug-in ID

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

+	public static final String PLUGIN_ID = "org.eclipse.papyrus.uml.diagram.customization.paletteconfiguration"; //$NON-NLS-1$

 

 	// The shared instance

 	private static Activator plugin;

diff --git a/plugins/customization/org.eclipse.papyrus.customization.paletteconfiguration/src/org/eclipse/papyrus/paletteconfiguration/customization/queries/GetDrawerLabelQuery.java b/plugins/customization/org.eclipse.papyrus.customization.paletteconfiguration/src/org/eclipse/papyrus/paletteconfiguration/customization/queries/GetDrawerLabelQuery.java
index 317904282e5..08cdc54a663 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.paletteconfiguration/src/org/eclipse/papyrus/paletteconfiguration/customization/queries/GetDrawerLabelQuery.java
+++ b/plugins/customization/org.eclipse.papyrus.customization.paletteconfiguration/src/org/eclipse/papyrus/paletteconfiguration/customization/queries/GetDrawerLabelQuery.java
@@ -1,8 +1,8 @@
 package org.eclipse.papyrus.paletteconfiguration.customization.queries;
-import org.eclipse.papyrus.paletteconfiguration.DrawerConfiguration;
 import org.eclipse.emf.facet.infra.query.core.exception.ModelQueryExecutionException;
 import org.eclipse.emf.facet.infra.query.core.java.IJavaModelQuery;
 import org.eclipse.emf.facet.infra.query.core.java.ParameterValueList;
+import org.eclipse.papyrus.uml.diagram.paletteconfiguration.DrawerConfiguration;
 
 /** Returns the label for a drawer */
 public class GetDrawerLabelQuery implements IJavaModelQuery<DrawerConfiguration, String> {
diff --git a/plugins/customization/org.eclipse.papyrus.customization.paletteconfiguration/src/org/eclipse/papyrus/paletteconfiguration/customization/queries/GetIconQuery.java b/plugins/customization/org.eclipse.papyrus.customization.paletteconfiguration/src/org/eclipse/papyrus/paletteconfiguration/customization/queries/GetIconQuery.java
index bba794e869c..61429406ddf 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.paletteconfiguration/src/org/eclipse/papyrus/paletteconfiguration/customization/queries/GetIconQuery.java
+++ b/plugins/customization/org.eclipse.papyrus.customization.paletteconfiguration/src/org/eclipse/papyrus/paletteconfiguration/customization/queries/GetIconQuery.java
@@ -3,8 +3,8 @@ package org.eclipse.papyrus.paletteconfiguration.customization.queries;
 import org.eclipse.emf.facet.infra.query.core.exception.ModelQueryExecutionException;
 import org.eclipse.emf.facet.infra.query.core.java.IJavaModelQuery;
 import org.eclipse.emf.facet.infra.query.core.java.ParameterValueList;
-import org.eclipse.papyrus.paletteconfiguration.Configuration;
-import org.eclipse.papyrus.paletteconfiguration.IconDescriptor;
+import org.eclipse.papyrus.uml.diagram.paletteconfiguration.Configuration;
+import org.eclipse.papyrus.uml.diagram.paletteconfiguration.IconDescriptor;
 
 /** Gets the icon for a configuration element in the palette configuration model */
 public class GetIconQuery implements IJavaModelQuery<Configuration, String> {
diff --git a/plugins/customization/org.eclipse.papyrus.customization.paletteconfiguration/src/org/eclipse/papyrus/paletteconfiguration/customization/queries/GetToolLabelQuery.java b/plugins/customization/org.eclipse.papyrus.customization.paletteconfiguration/src/org/eclipse/papyrus/paletteconfiguration/customization/queries/GetToolLabelQuery.java
index 5d0e030ba8c..991711ddaa4 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.paletteconfiguration/src/org/eclipse/papyrus/paletteconfiguration/customization/queries/GetToolLabelQuery.java
+++ b/plugins/customization/org.eclipse.papyrus.customization.paletteconfiguration/src/org/eclipse/papyrus/paletteconfiguration/customization/queries/GetToolLabelQuery.java
@@ -16,7 +16,7 @@ package org.eclipse.papyrus.paletteconfiguration.customization.queries;
 import org.eclipse.emf.facet.infra.query.core.exception.ModelQueryExecutionException;
 import org.eclipse.emf.facet.infra.query.core.java.IJavaModelQuery;
 import org.eclipse.emf.facet.infra.query.core.java.ParameterValueList;
-import org.eclipse.papyrus.paletteconfiguration.ToolConfiguration;
+import org.eclipse.papyrus.uml.diagram.paletteconfiguration.ToolConfiguration;
 
 /** Returns the Label for a tool. */
 public class GetToolLabelQuery implements IJavaModelQuery<ToolConfiguration, String> {
diff --git a/plugins/customization/org.eclipse.papyrus.customization.paletteconfiguration/src/org/eclipse/papyrus/paletteconfiguration/customization/queries/HasIconQuery.java b/plugins/customization/org.eclipse.papyrus.customization.paletteconfiguration/src/org/eclipse/papyrus/paletteconfiguration/customization/queries/HasIconQuery.java
index 6861cd04a27..42320ab583a 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.paletteconfiguration/src/org/eclipse/papyrus/paletteconfiguration/customization/queries/HasIconQuery.java
+++ b/plugins/customization/org.eclipse.papyrus.customization.paletteconfiguration/src/org/eclipse/papyrus/paletteconfiguration/customization/queries/HasIconQuery.java
@@ -1,8 +1,8 @@
 package org.eclipse.papyrus.paletteconfiguration.customization.queries;
-import org.eclipse.papyrus.paletteconfiguration.Configuration;
 import org.eclipse.emf.facet.infra.query.core.exception.ModelQueryExecutionException;
 import org.eclipse.emf.facet.infra.query.core.java.IJavaModelQuery;
 import org.eclipse.emf.facet.infra.query.core.java.ParameterValueList;
+import org.eclipse.papyrus.uml.diagram.paletteconfiguration.Configuration;
 
 /** Returns <code>true</code> if the element has a specific icon to display */
 public class HasIconQuery implements IJavaModelQuery<Configuration, Boolean> {