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, 23 insertions, 24 deletions

diff --git a/plugins/editor/org.eclipse.papyrus.editor.perspectiveconfiguration/META-INF/MANIFEST.MF b/plugins/editor/org.eclipse.papyrus.editor.perspectiveconfiguration/META-INF/MANIFEST.MF
index 97b5ab9538e..cad713c0eae 100644
--- a/plugins/editor/org.eclipse.papyrus.editor.perspectiveconfiguration/META-INF/MANIFEST.MF
+++ b/plugins/editor/org.eclipse.papyrus.editor.perspectiveconfiguration/META-INF/MANIFEST.MF
@@ -8,8 +8,7 @@ Bundle-Version: 0.9.0.qualifier
 Bundle-Name: %pluginName

 Bundle-Localization: plugin

 Bundle-ManifestVersion: 2

-Bundle-Activator: org.eclipse.papyrus.ui.perspectiveconfiguration.Acti

- vator

+Bundle-Activator: org.eclipse.papyrus.editor.perspectiveconfiguration.Activator

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

 Bundle-RequiredExecutionEnvironment: J2SE-1.5

 

diff --git a/plugins/editor/org.eclipse.papyrus.editor.perspectiveconfiguration/plugin.xml b/plugins/editor/org.eclipse.papyrus.editor.perspectiveconfiguration/plugin.xml
index df4c9f12d28..1cb93c47ee8 100644
--- a/plugins/editor/org.eclipse.papyrus.editor.perspectiveconfiguration/plugin.xml
+++ b/plugins/editor/org.eclipse.papyrus.editor.perspectiveconfiguration/plugin.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <?eclipse version="3.4"?>

 <plugin>

-   <extension-point id="org.eclipse.papyrus.ui.perspectiveconfiguration" name="org.eclipse.papyrus.ui.perspectiveconfiguration" schema="schema/org.eclipse.papyrus.ui.perspectiveconfiguration.exsd"/>

+   <extension-point id="org.eclipse.papyrus.editor.perspectiveconfiguration" name="org.eclipse.papyrus.editor.perspectiveconfiguration" schema="schema/org.eclipse.papyrus.ui.perspectiveconfiguration.exsd"/>

    <extension

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

       <startup

-            class="org.eclipse.papyrus.ui.perspectiveconfiguration.PerspectiveConfigurator"></startup>

+            class="org.eclipse.papyrus.editor.perspectiveconfiguration.PerspectiveConfigurator"></startup>

    </extension>

 

 </plugin>

diff --git a/plugins/editor/org.eclipse.papyrus.editor.perspectiveconfiguration/schema/org.eclipse.papyrus.ui.perspectiveconfiguration.exsd b/plugins/editor/org.eclipse.papyrus.editor.perspectiveconfiguration/schema/org.eclipse.papyrus.editor.perspectiveconfiguration.exsd
index 4ba61db09a0..1948179b2b8 100644
--- a/plugins/editor/org.eclipse.papyrus.editor.perspectiveconfiguration/schema/org.eclipse.papyrus.ui.perspectiveconfiguration.exsd
+++ b/plugins/editor/org.eclipse.papyrus.editor.perspectiveconfiguration/schema/org.eclipse.papyrus.editor.perspectiveconfiguration.exsd
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>

 <!-- Schema file written by PDE -->

-<schema targetNamespace="org.eclipse.papyrus.ui.perspectiveconfiguration" xmlns="http://www.w3.org/2001/XMLSchema">

+<schema targetNamespace="org.eclipse.papyrus.editor.perspectiveconfiguration" xmlns="http://www.w3.org/2001/XMLSchema">

 <annotation>

       <appinfo>

-         <meta.schema plugin="org.eclipse.papyrus.ui.perspectiveconfiguration" id="org.eclipse.papyrus.ui.perspectiveconfiguration" name="org.eclipse.papyrus.ui.perspectiveconfiguration"/>

+         <meta.schema plugin="org.eclipse.papyrus.editor.perspectiveconfiguration" id="org.eclipse.papyrus.editor.perspectiveconfiguration" name="org.eclipse.papyrus.editor.perspectiveconfiguration"/>

       </appinfo>

       <documentation>

          This extension point is used to configure a set of perpsectives.

diff --git a/plugins/editor/org.eclipse.papyrus.editor.perspectiveconfiguration/src/org/eclipse/papyrus/ui/perspectiveconfiguration/Activator.java b/plugins/editor/org.eclipse.papyrus.editor.perspectiveconfiguration/src/org/eclipse/papyrus/editor/perspectiveconfiguration/Activator.java
index c46282bfcbe..4511fa27aab 100644
--- a/plugins/editor/org.eclipse.papyrus.editor.perspectiveconfiguration/src/org/eclipse/papyrus/ui/perspectiveconfiguration/Activator.java
+++ b/plugins/editor/org.eclipse.papyrus.editor.perspectiveconfiguration/src/org/eclipse/papyrus/editor/perspectiveconfiguration/Activator.java
@@ -11,9 +11,9 @@
  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  *

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

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

+package org.eclipse.papyrus.editor.perspectiveconfiguration;

 

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

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

 import org.eclipse.ui.plugin.AbstractUIPlugin;

 import org.osgi.framework.BundleContext;

 

diff --git a/plugins/editor/org.eclipse.papyrus.editor.perspectiveconfiguration/src/org/eclipse/papyrus/ui/perspectiveconfiguration/Configuration.java b/plugins/editor/org.eclipse.papyrus.editor.perspectiveconfiguration/src/org/eclipse/papyrus/editor/perspectiveconfiguration/Configuration.java
index eda2b88e057..ebb17bcc304 100644
--- a/plugins/editor/org.eclipse.papyrus.editor.perspectiveconfiguration/src/org/eclipse/papyrus/ui/perspectiveconfiguration/Configuration.java
+++ b/plugins/editor/org.eclipse.papyrus.editor.perspectiveconfiguration/src/org/eclipse/papyrus/editor/perspectiveconfiguration/Configuration.java
@@ -11,7 +11,7 @@
  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  *

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

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

+package org.eclipse.papyrus.editor.perspectiveconfiguration;

 

 import java.util.ArrayList;

 

diff --git a/plugins/editor/org.eclipse.papyrus.editor.perspectiveconfiguration/src/org/eclipse/papyrus/ui/perspectiveconfiguration/ConfigurationService.java b/plugins/editor/org.eclipse.papyrus.editor.perspectiveconfiguration/src/org/eclipse/papyrus/editor/perspectiveconfiguration/ConfigurationService.java
index aa9d5b20e78..753a00cfe1f 100644
--- a/plugins/editor/org.eclipse.papyrus.editor.perspectiveconfiguration/src/org/eclipse/papyrus/ui/perspectiveconfiguration/ConfigurationService.java
+++ b/plugins/editor/org.eclipse.papyrus.editor.perspectiveconfiguration/src/org/eclipse/papyrus/editor/perspectiveconfiguration/ConfigurationService.java
@@ -12,7 +12,7 @@
  *

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

 

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

+package org.eclipse.papyrus.editor.perspectiveconfiguration;

 

 import java.util.HashMap;

 import java.util.Set;

@@ -25,7 +25,7 @@ import org.eclipse.core.runtime.Platform;
  */

 public class ConfigurationService {

 

-	public static String PERSPECTIVE_CONFIGURATION_EXTENSION_POINT_ID = "org.eclipse.papyrus.ui.perspectiveconfiguration";

+	public static String PERSPECTIVE_CONFIGURATION_EXTENSION_POINT_ID = "org.eclipse.papyrus.editor.perspectiveconfiguration";

 

 	public static String PERPSECTIVE_ID = "perspectiveID";

 

diff --git a/plugins/editor/org.eclipse.papyrus.editor.perspectiveconfiguration/src/org/eclipse/papyrus/ui/perspectiveconfiguration/CustomizeActionBars.java b/plugins/editor/org.eclipse.papyrus.editor.perspectiveconfiguration/src/org/eclipse/papyrus/editor/perspectiveconfiguration/CustomizeActionBars.java
index ca12176ce63..a4ec4050da0 100644
--- a/plugins/editor/org.eclipse.papyrus.editor.perspectiveconfiguration/src/org/eclipse/papyrus/ui/perspectiveconfiguration/CustomizeActionBars.java
+++ b/plugins/editor/org.eclipse.papyrus.editor.perspectiveconfiguration/src/org/eclipse/papyrus/editor/perspectiveconfiguration/CustomizeActionBars.java
@@ -11,7 +11,7 @@
  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  *

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

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

+package org.eclipse.papyrus.editor.perspectiveconfiguration;

 

 import java.util.List;

 

diff --git a/plugins/editor/org.eclipse.papyrus.editor.perspectiveconfiguration/src/org/eclipse/papyrus/ui/perspectiveconfiguration/PapyrusPerspectiveListener.java b/plugins/editor/org.eclipse.papyrus.editor.perspectiveconfiguration/src/org/eclipse/papyrus/editor/perspectiveconfiguration/PapyrusPerspectiveListener.java
index d2b07159eec..56fcf4bddff 100644
--- a/plugins/editor/org.eclipse.papyrus.editor.perspectiveconfiguration/src/org/eclipse/papyrus/ui/perspectiveconfiguration/PapyrusPerspectiveListener.java
+++ b/plugins/editor/org.eclipse.papyrus.editor.perspectiveconfiguration/src/org/eclipse/papyrus/editor/perspectiveconfiguration/PapyrusPerspectiveListener.java
@@ -11,7 +11,7 @@
  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  *

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

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

+package org.eclipse.papyrus.editor.perspectiveconfiguration;

 

 import java.util.ArrayList;

 import java.util.Arrays;

diff --git a/plugins/editor/org.eclipse.papyrus.editor.perspectiveconfiguration/src/org/eclipse/papyrus/ui/perspectiveconfiguration/PerspectiveConfigurator.java b/plugins/editor/org.eclipse.papyrus.editor.perspectiveconfiguration/src/org/eclipse/papyrus/editor/perspectiveconfiguration/PerspectiveConfigurator.java
index 9aa5d1e5a60..f47aa37e685 100644
--- a/plugins/editor/org.eclipse.papyrus.editor.perspectiveconfiguration/src/org/eclipse/papyrus/ui/perspectiveconfiguration/PerspectiveConfigurator.java
+++ b/plugins/editor/org.eclipse.papyrus.editor.perspectiveconfiguration/src/org/eclipse/papyrus/editor/perspectiveconfiguration/PerspectiveConfigurator.java
@@ -11,7 +11,7 @@
  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  *

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

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

+package org.eclipse.papyrus.editor.perspectiveconfiguration;

 

 import org.eclipse.swt.widgets.Display;

 import org.eclipse.ui.IStartup;

diff --git a/plugins/editor/org.eclipse.papyrus.editor/plugin.xml b/plugins/editor/org.eclipse.papyrus.editor/plugin.xml
index 439a0f9d84b..7c29634428c 100644
--- a/plugins/editor/org.eclipse.papyrus.editor/plugin.xml
+++ b/plugins/editor/org.eclipse.papyrus.editor/plugin.xml
@@ -8,7 +8,7 @@
             default="true"

             extensions="di"

             icon="icons/papyrus/Papyrus_16x16.gif"

-            id="org.eclipse.papyrus.core.papyrusEditor"

+            id="org.eclipse.papyrus.infra.core.papyrusEditor"

             matchingStrategy="org.eclipse.papyrus.editor.PapyrusMatchingStrategy"

             name="Papyrus Editor Core">

       </editor>

@@ -25,7 +25,7 @@
                <with

                      variable="activeEditorId">

                   <equals

-                        value="org.eclipse.papyrus.core.papyrusEditor">

+                        value="org.eclipse.papyrus.infra.core.papyrusEditor">

                   </equals>

                </with>

             </visibleWhen>

diff --git a/plugins/editor/org.eclipse.papyrus.editor/src/org/eclipse/papyrus/editor/PapyrusActionBarContributor.java b/plugins/editor/org.eclipse.papyrus.editor/src/org/eclipse/papyrus/editor/PapyrusActionBarContributor.java
index c59de63d7b0..a5c9c48e702 100644
--- a/plugins/editor/org.eclipse.papyrus.editor/src/org/eclipse/papyrus/editor/PapyrusActionBarContributor.java
+++ b/plugins/editor/org.eclipse.papyrus.editor/src/org/eclipse/papyrus/editor/PapyrusActionBarContributor.java
@@ -16,8 +16,8 @@ package org.eclipse.papyrus.editor;
 

 import org.eclipse.jface.action.IMenuListener;

 import org.eclipse.jface.action.IMenuManager;

-import org.eclipse.papyrus.core.editor.BackboneException;

-import org.eclipse.papyrus.core.multidiagram.actionbarcontributor.CoreComposedActionBarContributor;

+import org.eclipse.papyrus.infra.core.editor.BackboneException;

+import org.eclipse.papyrus.infra.core.multidiagram.actionbarcontributor.CoreComposedActionBarContributor;

 import org.eclipse.ui.IEditorActionBarContributor;

 

 

diff --git a/plugins/editor/org.eclipse.papyrus.editor/src/org/eclipse/papyrus/editor/PapyrusMultiDiagramEditor.java b/plugins/editor/org.eclipse.papyrus.editor/src/org/eclipse/papyrus/editor/PapyrusMultiDiagramEditor.java
index 13a1d84cfd5..55efa092d01 100644
--- a/plugins/editor/org.eclipse.papyrus.editor/src/org/eclipse/papyrus/editor/PapyrusMultiDiagramEditor.java
+++ b/plugins/editor/org.eclipse.papyrus.editor/src/org/eclipse/papyrus/editor/PapyrusMultiDiagramEditor.java
@@ -14,7 +14,7 @@
 

 package org.eclipse.papyrus.editor;

 

-import org.eclipse.papyrus.core.editor.CoreMultiDiagramEditor;

+import org.eclipse.papyrus.infra.core.editor.CoreMultiDiagramEditor;

 

 

 /**

diff --git a/plugins/editor/org.eclipse.papyrus.editor/src/org/eclipse/papyrus/editor/commands/RenameNestedEditorCommand.java b/plugins/editor/org.eclipse.papyrus.editor/src/org/eclipse/papyrus/editor/commands/RenameNestedEditorCommand.java
index 1f614ee06c6..2371edf7dcd 100644
--- a/plugins/editor/org.eclipse.papyrus.editor/src/org/eclipse/papyrus/editor/commands/RenameNestedEditorCommand.java
+++ b/plugins/editor/org.eclipse.papyrus.editor/src/org/eclipse/papyrus/editor/commands/RenameNestedEditorCommand.java
@@ -12,11 +12,11 @@ import org.eclipse.emf.transaction.TransactionalEditingDomain;
 import org.eclipse.gmf.runtime.notation.Diagram;

 import org.eclipse.jface.dialogs.InputDialog;

 import org.eclipse.jface.window.Window;

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

-import org.eclipse.papyrus.sasheditor.contentprovider.IPageMngr;

-import org.eclipse.papyrus.sasheditor.editor.IEditorPage;

-import org.eclipse.papyrus.sasheditor.editor.IPage;

-import org.eclipse.papyrus.sasheditor.editor.ISashWindowsContainer;

+import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IPageMngr;

+import org.eclipse.papyrus.infra.core.sasheditor.editor.IEditorPage;

+import org.eclipse.papyrus.infra.core.sasheditor.editor.IPage;

+import org.eclipse.papyrus.infra.core.sasheditor.editor.ISashWindowsContainer;

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

 import org.eclipse.swt.widgets.Display;

 import org.eclipse.ui.IEditorPart;

 import org.eclipse.ui.handlers.HandlerUtil;