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

13 files changed, 49 insertions, 40 deletions

diff --git a/plugins/uml/org.eclipse.papyrus.uml.controlmode.profile/META-INF/MANIFEST.MF b/plugins/uml/org.eclipse.papyrus.uml.controlmode.profile/META-INF/MANIFEST.MF
index d21d3d6cfdc..a1db7366c3b 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.controlmode.profile/META-INF/MANIFEST.MF
+++ b/plugins/uml/org.eclipse.papyrus.uml.controlmode.profile/META-INF/MANIFEST.MF
@@ -12,8 +12,7 @@ Bundle-ActivationPolicy: lazy
 Bundle-Version: 0.9.0.qualifier

 Bundle-Name: %pluginName

 Bundle-ManifestVersion: 2

-Bundle-Activator: org.eclipse.papyrus.controlmode.umlprofiles.Activato

- r

+Bundle-Activator: org.eclipse.papyrus.uml.controlmode.profile.Activator

 Bundle-SymbolicName: org.eclipse.papyrus.uml.controlmode.profile;singleton:=true

 Bundle-RequiredExecutionEnvironment: J2SE-1.5

 

diff --git a/plugins/uml/org.eclipse.papyrus.uml.controlmode.profile/build.properties b/plugins/uml/org.eclipse.papyrus.uml.controlmode.profile/build.properties
index 597219c659b..3b131dbf756 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.controlmode.profile/build.properties
+++ b/plugins/uml/org.eclipse.papyrus.uml.controlmode.profile/build.properties
@@ -1,7 +1,17 @@
 #

 #Mon Sep 12 09:29:37 CEST 2011

-bin.includes=META-INF/,.,plugin.xml,about.html,plugin.properties,src/org/eclipse/papyrus/controlmode/umlprofiles/messages.properties

+bin.includes = META-INF/,\

+               .,\

+               plugin.xml,\

+               about.html,\

+               plugin.properties,\

+               src/org/eclipse/papyrus/uml/controlmode/profile/messages.properties

 output..=bin/

-src.includes=META-INF/,.,plugin.xml,about.html,plugin.properties,src/org/eclipse/papyrus/controlmode/umlprofiles/messages.properties

+src.includes = META-INF/,\

+               .,\

+               plugin.xml,\

+               about.html,\

+               plugin.properties,\

+               src/org/eclipse/papyrus/uml/controlmode/profile/messages.properties

 source..=src/

 bin..=bin/

diff --git a/plugins/uml/org.eclipse.papyrus.uml.controlmode.profile/plugin.xml b/plugins/uml/org.eclipse.papyrus.uml.controlmode.profile/plugin.xml
index ac023ae85c7..0d3b2788a04 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.controlmode.profile/plugin.xml
+++ b/plugins/uml/org.eclipse.papyrus.uml.controlmode.profile/plugin.xml
@@ -2,29 +2,29 @@
 <?eclipse version="3.4"?>

 <plugin>

    <extension

-         point="org.eclipse.papyrus.controlmode.customControlCommand">

+         point="org.eclipse.papyrus.infra.services.controlmode.customControlCommand">

       <customControlCommand

-            controlCommand="org.eclipse.papyrus.controlmode.umlprofiles.commands.UMLProfileControlCommand">

+            controlCommand="org.eclipse.papyrus.uml.controlmode.profile.commands.UMLProfileControlCommand">

       </customControlCommand>

       <customUncontrolCommand

-            uncontrolCommand="org.eclipse.papyrus.controlmode.umlprofiles.commands.UMLProfileUncontrolCommand">

+            uncontrolCommand="org.eclipse.papyrus.uml.controlmode.profile.commands.UMLProfileUncontrolCommand">

       </customUncontrolCommand>

       <enableControlCommand

-            controlCondition="org.eclipse.papyrus.controlmode.umlprofiles.commands.UMLProfileControlCondition">

+            controlCondition="org.eclipse.papyrus.uml.controlmode.profile.commands.UMLProfileControlCondition">

       </enableControlCommand>

    </extension>

    

    <extension point="org.eclipse.emf.validation.constraintProviders">

-      <category id="org.eclipse.papyrus.controlmode.umlprofiles/duplicateProfileApplication" mandatory="false" name="duplicateProfileApplication">

+      <category id="org.eclipse.papyrus.uml.controlmode.profile/duplicateProfileApplication" mandatory="false" name="duplicateProfileApplication">

          <![CDATA[Validate that Profile Application is correctly duplicated on controlled Packages]]>

       </category>

       <constraintProvider cache="true">

          <package namespaceUri="http://www.eclipse.org/uml2/3.0.0/UML"/>

-         <constraints categories="org.eclipse.papyrus.controlmode.umlprofiles/duplicateProfileApplication">

-         <constraint id="org.eclipse.papyrus.controlmode.umlprofiles.validation.ProfileApplicationDuplicationChecker"

+         <constraints categories="org.eclipse.papyrus.uml.controlmode.profile/duplicateProfileApplication">

+         <constraint id="org.eclipse.papyrus.uml.controlmode.profile.validation.ProfileApplicationDuplicationChecker"

             lang="Java"

             name="ProfileApplicationDuplicationChecker"

-            class="org.eclipse.papyrus.controlmode.umlprofiles.validation.ProfileApplicationDuplicationChecker"

+            class="org.eclipse.papyrus.uml.controlmode.profile.validation.ProfileApplicationDuplicationChecker"

             mode="Live"

             severity="ERROR" statusCode="200">

             <description><![CDATA[Profile Applications must be duplicated on controlled Packages]]></description>

@@ -38,10 +38,10 @@
 

    <extension point="org.eclipse.emf.validation.constraintBindings">

       <clientContext default="false" id="org.eclipse.papyrus.controlmodeDefaultCtx">

-         <selector class="org.eclipse.papyrus.controlmode.umlprofiles.providers.UMLValidationProvider$DefaultCtx"/>

+         <selector class="org.eclipse.papyrus.uml.controlmode.profile.providers.UMLValidationProvider$DefaultCtx"/>

       </clientContext>

       <binding context="org.eclipse.papyrus.controlmodeDefaultCtx">

-         <constraint ref="org.eclipse.papyrus.controlmode.umlprofiles.validation.ProfileApplicationDuplicationChecker"/>

+         <constraint ref="org.eclipse.papyrus.uml.controlmode.profile.validation.ProfileApplicationDuplicationChecker"/>

       </binding>

    </extension>

 

diff --git a/plugins/uml/org.eclipse.papyrus.uml.controlmode.profile/src/org/eclipse/papyrus/controlmode/umlprofiles/Activator.java b/plugins/uml/org.eclipse.papyrus.uml.controlmode.profile/src/org/eclipse/papyrus/uml/controlmode/profile/Activator.java
index 54a075ddaea..3c76b04620a 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.controlmode.profile/src/org/eclipse/papyrus/controlmode/umlprofiles/Activator.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.controlmode.profile/src/org/eclipse/papyrus/uml/controlmode/profile/Activator.java
@@ -1,4 +1,4 @@
-package org.eclipse.papyrus.controlmode.umlprofiles;

+package org.eclipse.papyrus.uml.controlmode.profile;

 

 import org.eclipse.core.runtime.Plugin;

 import org.osgi.framework.BundleContext;

diff --git a/plugins/uml/org.eclipse.papyrus.uml.controlmode.profile/src/org/eclipse/papyrus/controlmode/umlprofiles/Messages.java b/plugins/uml/org.eclipse.papyrus.uml.controlmode.profile/src/org/eclipse/papyrus/uml/controlmode/profile/Messages.java
index 98107ce3533..b45154e145b 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.controlmode.profile/src/org/eclipse/papyrus/controlmode/umlprofiles/Messages.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.controlmode.profile/src/org/eclipse/papyrus/uml/controlmode/profile/Messages.java
@@ -11,7 +11,7 @@
  *   Atos Origin - Initial API and implementation

  *

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

-package org.eclipse.papyrus.controlmode.umlprofiles;

+package org.eclipse.papyrus.uml.controlmode.profile;

 

 import org.eclipse.osgi.util.NLS;

 

@@ -22,7 +22,7 @@ import org.eclipse.osgi.util.NLS;
  */

 public class Messages extends NLS {

 

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

+	private static final String BUNDLE_NAME = "org.eclipse.papyrus.uml.controlmode.profile.messages"; //$NON-NLS-1$

 

 	/** Message for switching the loading strategy when controlled package is not loaded */

 	public static String switch_loading_strategy;

diff --git a/plugins/uml/org.eclipse.papyrus.uml.controlmode.profile/src/org/eclipse/papyrus/controlmode/umlprofiles/commands/UMLProfileControlCommand.java b/plugins/uml/org.eclipse.papyrus.uml.controlmode.profile/src/org/eclipse/papyrus/uml/controlmode/profile/commands/UMLProfileControlCommand.java
index 030fe89551c..3a819ef3491 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.controlmode.profile/src/org/eclipse/papyrus/controlmode/umlprofiles/commands/UMLProfileControlCommand.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.controlmode.profile/src/org/eclipse/papyrus/uml/controlmode/profile/commands/UMLProfileControlCommand.java
@@ -11,14 +11,14 @@
  *  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation

  *

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

-package org.eclipse.papyrus.controlmode.umlprofiles.commands;

+package org.eclipse.papyrus.uml.controlmode.profile.commands;

 

 import org.eclipse.emf.common.command.CompoundCommand;

 import org.eclipse.emf.ecore.EObject;

 import org.eclipse.emf.ecore.resource.Resource;

 import org.eclipse.emf.edit.domain.EditingDomain;

-import org.eclipse.papyrus.controlmode.commands.IControlCommand;

-import org.eclipse.papyrus.controlmode.umlprofiles.helpers.ProfileApplicationHelper;

+import org.eclipse.papyrus.infra.services.controlmode.commands.IControlCommand;

+import org.eclipse.papyrus.uml.controlmode.profile.helpers.ProfileApplicationHelper;

 import org.eclipse.uml2.common.edit.command.ChangeCommand;

 import org.eclipse.uml2.uml.Package;

 import org.eclipse.uml2.uml.Profile;

diff --git a/plugins/uml/org.eclipse.papyrus.uml.controlmode.profile/src/org/eclipse/papyrus/controlmode/umlprofiles/commands/UMLProfileControlCondition.java b/plugins/uml/org.eclipse.papyrus.uml.controlmode.profile/src/org/eclipse/papyrus/uml/controlmode/profile/commands/UMLProfileControlCondition.java
index 7b987b9414e..d9f0fda9370 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.controlmode.profile/src/org/eclipse/papyrus/controlmode/umlprofiles/commands/UMLProfileControlCondition.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.controlmode.profile/src/org/eclipse/papyrus/uml/controlmode/profile/commands/UMLProfileControlCondition.java
@@ -11,10 +11,10 @@
  *  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation

  *

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

-package org.eclipse.papyrus.controlmode.umlprofiles.commands;

+package org.eclipse.papyrus.uml.controlmode.profile.commands;

 

 import org.eclipse.emf.ecore.EObject;

-import org.eclipse.papyrus.controlmode.commands.IControlCondition;

+import org.eclipse.papyrus.infra.services.controlmode.commands.IControlCondition;

 import org.eclipse.uml2.uml.Package;

 

 

diff --git a/plugins/uml/org.eclipse.papyrus.uml.controlmode.profile/src/org/eclipse/papyrus/controlmode/umlprofiles/commands/UMLProfileUncontrolCommand.java b/plugins/uml/org.eclipse.papyrus.uml.controlmode.profile/src/org/eclipse/papyrus/uml/controlmode/profile/commands/UMLProfileUncontrolCommand.java
index 8536cabf9ce..212b251c1fd 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.controlmode.profile/src/org/eclipse/papyrus/controlmode/umlprofiles/commands/UMLProfileUncontrolCommand.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.controlmode.profile/src/org/eclipse/papyrus/uml/controlmode/profile/commands/UMLProfileUncontrolCommand.java
@@ -11,7 +11,7 @@
  *  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation

  *

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

-package org.eclipse.papyrus.controlmode.umlprofiles.commands;

+package org.eclipse.papyrus.uml.controlmode.profile.commands;

 

 import java.util.ArrayList;

 

@@ -20,8 +20,8 @@ import org.eclipse.emf.common.util.EList;
 import org.eclipse.emf.ecore.EObject;

 import org.eclipse.emf.ecore.resource.Resource;

 import org.eclipse.emf.edit.domain.EditingDomain;

-import org.eclipse.papyrus.controlmode.commands.IUncontrolCommand;

-import org.eclipse.papyrus.controlmode.umlprofiles.helpers.ProfileApplicationHelper;

+import org.eclipse.papyrus.infra.services.controlmode.commands.IUncontrolCommand;

+import org.eclipse.papyrus.uml.controlmode.profile.helpers.ProfileApplicationHelper;

 import org.eclipse.uml2.common.edit.command.ChangeCommand;

 import org.eclipse.uml2.uml.Package;

 import org.eclipse.uml2.uml.Profile;

diff --git a/plugins/uml/org.eclipse.papyrus.uml.controlmode.profile/src/org/eclipse/papyrus/controlmode/umlprofiles/helpers/ProfileApplicationHelper.java b/plugins/uml/org.eclipse.papyrus.uml.controlmode.profile/src/org/eclipse/papyrus/uml/controlmode/profile/helpers/ProfileApplicationHelper.java
index 068f7c15b9b..55e814524d4 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.controlmode.profile/src/org/eclipse/papyrus/controlmode/umlprofiles/helpers/ProfileApplicationHelper.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.controlmode.profile/src/org/eclipse/papyrus/uml/controlmode/profile/helpers/ProfileApplicationHelper.java
@@ -11,7 +11,7 @@
  *   Atos Origin - Initial API and implementation

  *

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

-package org.eclipse.papyrus.controlmode.umlprofiles.helpers;

+package org.eclipse.papyrus.uml.controlmode.profile.helpers;

 

 import java.util.Iterator;

 

diff --git a/plugins/uml/org.eclipse.papyrus.uml.controlmode.profile/src/org/eclipse/papyrus/controlmode/umlprofiles/helpers/SafeDialogOpenerDuringValidation.java b/plugins/uml/org.eclipse.papyrus.uml.controlmode.profile/src/org/eclipse/papyrus/uml/controlmode/profile/helpers/SafeDialogOpenerDuringValidation.java
index 99ca810e4f2..4a0aedbef54 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.controlmode.profile/src/org/eclipse/papyrus/controlmode/umlprofiles/helpers/SafeDialogOpenerDuringValidation.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.controlmode.profile/src/org/eclipse/papyrus/uml/controlmode/profile/helpers/SafeDialogOpenerDuringValidation.java
@@ -11,7 +11,7 @@
  *   Atos Origin - Initial API and implementation

  *

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

-package org.eclipse.papyrus.controlmode.umlprofiles.helpers;

+package org.eclipse.papyrus.uml.controlmode.profile.helpers;

 

 import org.eclipse.core.commands.operations.IOperationApprover2;

 import org.eclipse.core.commands.operations.IOperationHistory;

diff --git a/plugins/uml/org.eclipse.papyrus.uml.controlmode.profile/src/org/eclipse/papyrus/controlmode/umlprofiles/messages.properties b/plugins/uml/org.eclipse.papyrus.uml.controlmode.profile/src/org/eclipse/papyrus/uml/controlmode/profile/messages.properties
index be9e8936ff9..be9e8936ff9 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.controlmode.profile/src/org/eclipse/papyrus/controlmode/umlprofiles/messages.properties
+++ b/plugins/uml/org.eclipse.papyrus.uml.controlmode.profile/src/org/eclipse/papyrus/uml/controlmode/profile/messages.properties
diff --git a/plugins/uml/org.eclipse.papyrus.uml.controlmode.profile/src/org/eclipse/papyrus/controlmode/umlprofiles/providers/UMLValidationProvider.java b/plugins/uml/org.eclipse.papyrus.uml.controlmode.profile/src/org/eclipse/papyrus/uml/controlmode/profile/providers/UMLValidationProvider.java
index c53b1ba7930..550c7d673db 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.controlmode.profile/src/org/eclipse/papyrus/controlmode/umlprofiles/providers/UMLValidationProvider.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.controlmode.profile/src/org/eclipse/papyrus/uml/controlmode/profile/providers/UMLValidationProvider.java
@@ -11,7 +11,7 @@
  *   Atos Origin - Initial API and implementation

  *

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

-package org.eclipse.papyrus.controlmode.umlprofiles.providers;

+package org.eclipse.papyrus.uml.controlmode.profile.providers;

 

 import java.util.Arrays;

 import java.util.Collection;

@@ -30,10 +30,10 @@ import org.eclipse.emf.validation.service.IValidationListener;
 import org.eclipse.emf.validation.service.ModelValidationService;

 import org.eclipse.emf.validation.service.ValidationEvent;

 import org.eclipse.gmf.runtime.emf.core.util.EMFCoreUtil;

-import org.eclipse.papyrus.controlmode.umlprofiles.Activator;

-import org.eclipse.papyrus.controlmode.umlprofiles.helpers.SafeDialogOpenerDuringValidation;

-import org.eclipse.papyrus.resource.ModelSet;

-import org.eclipse.papyrus.ui.toolbox.notification.builders.NotificationBuilder;

+import org.eclipse.papyrus.infra.core.resource.ModelSet;

+import org.eclipse.papyrus.infra.widgets.toolbox.notification.builders.NotificationBuilder;

+import org.eclipse.papyrus.uml.controlmode.profile.Activator;

+import org.eclipse.papyrus.uml.controlmode.profile.helpers.SafeDialogOpenerDuringValidation;

 

 /**

  * Provides validation for UML models

@@ -48,7 +48,7 @@ public class UMLValidationProvider {
 	/**

 	 * Ids of constraints which report is already managed by themselves.

 	 */

-	protected static final Collection<String> SELF_MANAGING_CONSTRAINTS = Arrays.asList("org.eclipse.papyrus.controlmode.umlprofiles.validation.ProfileApplicationDuplicationChecker");

+	protected static final Collection<String> SELF_MANAGING_CONSTRAINTS = Arrays.asList("org.eclipse.papyrus.uml.controlmode.profile.validation.ProfileApplicationDuplicationChecker");

 

 	/**

 	 * Validation listener which reports problems to the user

diff --git a/plugins/uml/org.eclipse.papyrus.uml.controlmode.profile/src/org/eclipse/papyrus/controlmode/umlprofiles/validation/ProfileApplicationDuplicationChecker.java b/plugins/uml/org.eclipse.papyrus.uml.controlmode.profile/src/org/eclipse/papyrus/uml/controlmode/profile/validation/ProfileApplicationDuplicationChecker.java
index b521d7e48e5..2ddf8f6bb69 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.controlmode.profile/src/org/eclipse/papyrus/controlmode/umlprofiles/validation/ProfileApplicationDuplicationChecker.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.controlmode.profile/src/org/eclipse/papyrus/uml/controlmode/profile/validation/ProfileApplicationDuplicationChecker.java
@@ -11,7 +11,7 @@
  *   Atos Origin - Initial API and implementation

  *

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

-package org.eclipse.papyrus.controlmode.umlprofiles.validation;

+package org.eclipse.papyrus.uml.controlmode.profile.validation;

 

 import java.util.HashMap;

 import java.util.HashSet;

@@ -34,12 +34,12 @@ import org.eclipse.emf.validation.EMFEventType;
 import org.eclipse.emf.validation.IValidationContext;

 import org.eclipse.gmf.runtime.emf.core.util.EMFCoreUtil;

 import org.eclipse.osgi.util.NLS;

-import org.eclipse.papyrus.controlmode.umlprofiles.Activator;

-import org.eclipse.papyrus.controlmode.umlprofiles.Messages;

-import org.eclipse.papyrus.controlmode.umlprofiles.helpers.ProfileApplicationHelper;

-import org.eclipse.papyrus.core.resourceloading.preferences.StrategyChooser;

-import org.eclipse.papyrus.core.utils.EditorUtils;

-import org.eclipse.papyrus.ui.toolbox.notification.builders.NotificationBuilder;

+import org.eclipse.papyrus.infra.core.utils.EditorUtils;

+import org.eclipse.papyrus.infra.services.resourceloading.preferences.StrategyChooser;

+import org.eclipse.papyrus.infra.widgets.toolbox.notification.builders.NotificationBuilder;

+import org.eclipse.papyrus.uml.controlmode.profile.Activator;

+import org.eclipse.papyrus.uml.controlmode.profile.Messages;

+import org.eclipse.papyrus.uml.controlmode.profile.helpers.ProfileApplicationHelper;

 import org.eclipse.uml2.uml.Package;

 import org.eclipse.uml2.uml.Profile;

 import org.eclipse.uml2.uml.ProfileApplication;