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

12 files changed, 19 insertions, 19 deletions

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.navigation/META-INF/MANIFEST.MF b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.navigation/META-INF/MANIFEST.MF
index 99e01cc1ee5..31144d753a0 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.navigation/META-INF/MANIFEST.MF
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.navigation/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Require-Bundle: org.eclipse.papyrus.infra.gmfdiag.navigation;bundle-version="0.9.0",

  org.eclipse.uml2.uml,

  org.eclipse.papyrus.uml.tools.utils;bundle-version="0.9.0"

-Export-Package: org.eclipse.papyrus.navigation.uml

+Export-Package: org.eclipse.papyrus.uml.diagram.navigation

 Bundle-Vendor: %providerName

 Bundle-Version: 0.9.0.qualifier

 Bundle-Name: %pluginName

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.navigation/plugin.xml b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.navigation/plugin.xml
index 182f17eda5d..c9a863914b3 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.navigation/plugin.xml
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.navigation/plugin.xml
@@ -4,21 +4,21 @@
    <extension

          point="org.eclipse.papyrus.navigation.navigationRules">

       <navigationRule

-            rule="org.eclipse.papyrus.navigation.uml.BehavioredClassifierRule"></navigationRule>

+            rule="org.eclipse.papyrus.uml.diagram.navigation.BehavioredClassifierRule"></navigationRule>

       <navigationRule

-            rule="org.eclipse.papyrus.navigation.uml.CBARule">

+            rule="org.eclipse.papyrus.uml.diagram.navigation.CBARule">

       </navigationRule>

       <navigationRule

-            rule="org.eclipse.papyrus.navigation.uml.OperationRule">

+            rule="org.eclipse.papyrus.uml.diagram.navigation.OperationRule">

       </navigationRule>

       <navigationRule

-            rule="org.eclipse.papyrus.navigation.uml.PackageRule">

+            rule="org.eclipse.papyrus.uml.diagram.navigation.PackageRule">

       </navigationRule>

       <navigationRule

-            rule="org.eclipse.papyrus.navigation.uml.StateRule">

+            rule="org.eclipse.papyrus.uml.diagram.navigation.StateRule">

       </navigationRule>

       <navigationRule

-            rule="org.eclipse.papyrus.navigation.uml.TransitionRule"></navigationRule>

+            rule="org.eclipse.papyrus.uml.diagram.navigation.TransitionRule"></navigationRule>

    </extension>

    <extension

          point="org.eclipse.papyrus.navigation.navigationDecoratorRules">

@@ -38,7 +38,7 @@
    <extension

          point="org.eclipse.papyrus.navigation.navigationColorProviders">

       <navigationColorProvider

-            provider="org.eclipse.papyrus.navigation.uml.UMLNavigationColorProvider">

+            provider="org.eclipse.papyrus.uml.diagram.navigation.UMLNavigationColorProvider">

       </navigationColorProvider>

    </extension>

 

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.navigation/src/org/eclipse/papyrus/navigation/uml/BehavioredClassifierRule.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.navigation/src/org/eclipse/papyrus/uml/diagram/navigation/BehavioredClassifierRule.java
index 5a40fed1993..35a6fa5c9ca 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.navigation/src/org/eclipse/papyrus/navigation/uml/BehavioredClassifierRule.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.navigation/src/org/eclipse/papyrus/uml/diagram/navigation/BehavioredClassifierRule.java
@@ -11,7 +11,7 @@
  *  Mathieu Velten (Atos Origin) mathieu.velten@atosorigin.com - Initial API and implementation

  *

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

-package org.eclipse.papyrus.navigation.uml;

+package org.eclipse.papyrus.uml.diagram.navigation;

 

 import java.util.LinkedList;

 import java.util.List;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.navigation/src/org/eclipse/papyrus/navigation/uml/CBARule.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.navigation/src/org/eclipse/papyrus/uml/diagram/navigation/CBARule.java
index a6838487134..850bacb1ac4 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.navigation/src/org/eclipse/papyrus/navigation/uml/CBARule.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.navigation/src/org/eclipse/papyrus/uml/diagram/navigation/CBARule.java
@@ -11,7 +11,7 @@
  *  Mathieu Velten (Atos Origin) mathieu.velten@atosorigin.com - Initial API and implementation

  *

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

-package org.eclipse.papyrus.navigation.uml;

+package org.eclipse.papyrus.uml.diagram.navigation;

 

 import java.util.LinkedList;

 import java.util.List;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.navigation/src/org/eclipse/papyrus/navigation/uml/OperationRule.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.navigation/src/org/eclipse/papyrus/uml/diagram/navigation/OperationRule.java
index 069e8198e82..4e7d34be845 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.navigation/src/org/eclipse/papyrus/navigation/uml/OperationRule.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.navigation/src/org/eclipse/papyrus/uml/diagram/navigation/OperationRule.java
@@ -11,7 +11,7 @@
  *  Mathieu Velten (Atos Origin) mathieu.velten@atosorigin.com - Initial API and implementation

  *

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

-package org.eclipse.papyrus.navigation.uml;

+package org.eclipse.papyrus.uml.diagram.navigation;

 

 import java.util.LinkedList;

 import java.util.List;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.navigation/src/org/eclipse/papyrus/navigation/uml/PackageRule.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.navigation/src/org/eclipse/papyrus/uml/diagram/navigation/PackageRule.java
index 618b3cf73aa..4b2c6370b33 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.navigation/src/org/eclipse/papyrus/navigation/uml/PackageRule.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.navigation/src/org/eclipse/papyrus/uml/diagram/navigation/PackageRule.java
@@ -11,7 +11,7 @@
  *  Mathieu Velten (Atos Origin) mathieu.velten@atosorigin.com - Initial API and implementation

  *

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

-package org.eclipse.papyrus.navigation.uml;

+package org.eclipse.papyrus.uml.diagram.navigation;

 

 import java.util.LinkedList;

 import java.util.List;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.navigation/src/org/eclipse/papyrus/navigation/uml/StateRule.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.navigation/src/org/eclipse/papyrus/uml/diagram/navigation/StateRule.java
index 725a87a5358..140d50a1b34 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.navigation/src/org/eclipse/papyrus/navigation/uml/StateRule.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.navigation/src/org/eclipse/papyrus/uml/diagram/navigation/StateRule.java
@@ -11,7 +11,7 @@
  *  Mathieu Velten (Atos Origin) mathieu.velten@atosorigin.com - Initial API and implementation

  *

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

-package org.eclipse.papyrus.navigation.uml;

+package org.eclipse.papyrus.uml.diagram.navigation;

 

 import java.util.LinkedList;

 import java.util.List;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.navigation/src/org/eclipse/papyrus/navigation/uml/TransitionRule.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.navigation/src/org/eclipse/papyrus/uml/diagram/navigation/TransitionRule.java
index bec17905289..14388246954 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.navigation/src/org/eclipse/papyrus/navigation/uml/TransitionRule.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.navigation/src/org/eclipse/papyrus/uml/diagram/navigation/TransitionRule.java
@@ -11,7 +11,7 @@
  *  Mathieu Velten (Atos Origin) mathieu.velten@atosorigin.com - Initial API and implementation

  *

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

-package org.eclipse.papyrus.navigation.uml;

+package org.eclipse.papyrus.uml.diagram.navigation;

 

 import java.util.LinkedList;

 import java.util.List;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.navigation/src/org/eclipse/papyrus/navigation/uml/UMLBaseNameSetter.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.navigation/src/org/eclipse/papyrus/uml/diagram/navigation/UMLBaseNameSetter.java
index 909ef8dcb60..f6bf4e97494 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.navigation/src/org/eclipse/papyrus/navigation/uml/UMLBaseNameSetter.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.navigation/src/org/eclipse/papyrus/uml/diagram/navigation/UMLBaseNameSetter.java
@@ -11,14 +11,14 @@
  *  Mathieu Velten (Atos Origin) mathieu.velten@atosorigin.com - Initial API and implementation

  *

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

-package org.eclipse.papyrus.navigation.uml;

+package org.eclipse.papyrus.uml.diagram.navigation;

 

 import java.util.Collections;

 import java.util.List;

 

 import org.eclipse.emf.ecore.EObject;

 import org.eclipse.papyrus.navigation.IBaseNameSetter;

-import org.eclipse.papyrus.umlutils.NamedElementUtil;

+import org.eclipse.papyrus.uml.tools.utils.NamedElementUtil;

 import org.eclipse.uml2.uml.NamedElement;

 

 

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.navigation/src/org/eclipse/papyrus/navigation/uml/UMLNavigationColorProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.navigation/src/org/eclipse/papyrus/uml/diagram/navigation/UMLNavigationColorProvider.java
index 6b8d9d93bf0..b035a3222c4 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.navigation/src/org/eclipse/papyrus/navigation/uml/UMLNavigationColorProvider.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.navigation/src/org/eclipse/papyrus/uml/diagram/navigation/UMLNavigationColorProvider.java
@@ -11,7 +11,7 @@
  *  Mathieu Velten (Atos Origin) mathieu.velten@atosorigin.com - Initial API and implementation

  *

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

-package org.eclipse.papyrus.navigation.uml;

+package org.eclipse.papyrus.uml.diagram.navigation;

 

 import org.eclipse.draw2d.ColorConstants;

 import org.eclipse.jface.viewers.IColorProvider;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.navigation/src/org/eclipse/papyrus/navigation/uml/UMLNavigationHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.navigation/src/org/eclipse/papyrus/uml/diagram/navigation/UMLNavigationHelper.java
index 68a72b94746..ab3b8f43e3e 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.navigation/src/org/eclipse/papyrus/navigation/uml/UMLNavigationHelper.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.navigation/src/org/eclipse/papyrus/uml/diagram/navigation/UMLNavigationHelper.java
@@ -11,7 +11,7 @@
  *  Mathieu Velten (Atos Origin) mathieu.velten@atosorigin.com - Initial API and implementation

  *

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

-package org.eclipse.papyrus.navigation.uml;

+package org.eclipse.papyrus.uml.diagram.navigation;

 

 import java.util.HashMap;

 

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.navigation/src/org/eclipse/papyrus/navigation/uml/UMLRuleHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.navigation/src/org/eclipse/papyrus/uml/diagram/navigation/UMLRuleHelper.java
index 9255b329e32..7f23e338eeb 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.navigation/src/org/eclipse/papyrus/navigation/uml/UMLRuleHelper.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.navigation/src/org/eclipse/papyrus/uml/diagram/navigation/UMLRuleHelper.java
@@ -11,7 +11,7 @@
  *  Mathieu Velten (Atos Origin) mathieu.velten@atosorigin.com - Initial API and implementation

  *

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

-package org.eclipse.papyrus.navigation.uml;

+package org.eclipse.papyrus.uml.diagram.navigation;

 

 import java.util.List;