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

33 files changed, 129 insertions, 129 deletions

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.groups/META-INF/MANIFEST.MF b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.groups/META-INF/MANIFEST.MF
index 9f93e0b1dab..cc9f26869f9 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.groups/META-INF/MANIFEST.MF
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.groups/META-INF/MANIFEST.MF
@@ -5,20 +5,20 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.papyrus.uml.diagram.common;bundle-version="0.9.0",

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

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

-Export-Package: org.eclipse.papyrus.diagram.common.groups.commands,

- org.eclipse.papyrus.diagram.common.groups.core.utils,

- org.eclipse.papyrus.diagram.common.groups.edit.policies,

- org.eclipse.papyrus.diagram.common.groups.groupcontainment,

- org.eclipse.papyrus.diagram.common.groups.preferences,

- org.eclipse.papyrus.diagram.common.groups.tabbedproperties.appearance,

- org.eclipse.papyrus.diagram.common.groups.utils

+Export-Package: org.eclipse.papyrus.uml.diagram.common.groups.commands,

+ org.eclipse.papyrus.uml.diagram.common.groups.core.utils,

+ org.eclipse.papyrus.uml.diagram.common.groups.edit.policies,

+ org.eclipse.papyrus.uml.diagram.common.groups.groupcontainment,

+ org.eclipse.papyrus.uml.diagram.common.groups.preferences,

+ org.eclipse.papyrus.uml.diagram.common.groups.tabbedproperties.appearance,

+ org.eclipse.papyrus.uml.diagram.common.groups.utils

 Bundle-Vendor: %providerName

 Bundle-ActivationPolicy: lazy

 Bundle-Version: 0.9.0.qualifier

 Bundle-Name: %pluginName

 Bundle-Localization: plugin

 Bundle-ManifestVersion: 2

-Bundle-Activator: org.eclipse.papyrus.diagram.common.groups.Activator

+Bundle-Activator: org.eclipse.papyrus.uml.diagram.common.groups.Activator

 Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.common.groups;singleton:=true

 Bundle-RequiredExecutionEnvironment: J2SE-1.5

 

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.groups/plugin.xml b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.groups/plugin.xml
index 7e32c46ce8d..3f622a822e5 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.groups/plugin.xml
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.groups/plugin.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <?eclipse version="3.4"?>

 <plugin>

-   <extension-point id="org.eclipse.papyrus.diagram.common.groups.groupcontainment" name="group containment" schema="schema/org.eclipse.papyrus.diagram.common.groups.groupcontainment.exsd"/>

+   <extension-point id="org.eclipse.papyrus.uml.diagram.common.groups.groupcontainment" name="group containment" schema="schema/org.eclipse.papyrus.uml.diagram.common.groups.groupcontainment.exsd"/>

    <extension

          point="org.eclipse.ui.views.properties.tabbed.propertySections">

       <propertySections

             contributorId="TreeOutlinePage">

          <propertySection

-               class="org.eclipse.papyrus.diagram.common.groups.tabbedproperties.appearance.ChooseGraphicalParentSection"

-               filter="org.eclipse.papyrus.diagram.common.groups.tabbedproperties.appearance.ChooseGraphicalParentSectionFilter"

+               class="org.eclipse.papyrus.uml.diagram.common.groups.tabbedproperties.appearance.ChooseGraphicalParentSection"

+               filter="org.eclipse.papyrus.uml.diagram.common.groups.tabbedproperties.appearance.ChooseGraphicalParentSectionFilter"

                id="org.eclipse.papyrus.tabbedproperties.appearance.chooseGraphicalParentSection"

                tab="org.eclipse.papyrus.tabbedproperties.appearance.appearancetab">

          </propertySection>

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.groups/schema/org.eclipse.papyrus.diagram.common.groups.groupcontainment.exsd b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.groups/schema/org.eclipse.papyrus.diagram.common.groups.groupcontainment.exsd
index 6f6ec7fc5ad..9c609952365 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.groups/schema/org.eclipse.papyrus.diagram.common.groups.groupcontainment.exsd
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.groups/schema/org.eclipse.papyrus.diagram.common.groups.groupcontainment.exsd
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>

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

-<schema targetNamespace="org.eclipse.papyrus.diagram.common.groups" xmlns="http://www.w3.org/2001/XMLSchema">

+<schema targetNamespace="org.eclipse.papyrus.uml.diagram.common.groups" xmlns="http://www.w3.org/2001/XMLSchema">

 <annotation>

       <appinfo>

-         <meta.schema plugin="org.eclipse.papyrus.diagram.common.groups" id="org.eclipse.papyrus.diagram.common.groups.groupcontainment" name="group containment"/>

+         <meta.schema plugin="org.eclipse.papyrus.uml.diagram.common.groups" id="org.eclipse.papyrus.uml.diagram.common.groups.groupcontainment" name="group containment"/>

       </appinfo>

       <documentation>

          This extension point allows to register group types and their relationship with contained objects, in order to let the group framework handle the graphical parent reassignation.

@@ -13,7 +13,7 @@ This can be achieved calling the code :
 		//configure group framework

 		EditingDomainRegisteringService.addGroupFrameworkForEditingDomain(getEditingDomain(), getDiagramEditPart());

 at the end of the initializeGraphicalViewer() method,

-in the class org.eclipse.papyrus.diagram.***.Uml***DiagramForMultiEditor extending org.eclipse.papyrus.diagram.***.part.UMLDiagramEditor, which itself extends org.eclipse.papyrus.diagram.common.part.UmlGmfDiagramEditor.

+in the class org.eclipse.papyrus.diagram.***.Uml***DiagramForMultiEditor extending org.eclipse.papyrus.diagram.***.part.UMLDiagramEditor, which itself extends org.eclipse.papyrus.uml.diagram.common.part.UmlGmfDiagramEditor.

 

       </documentation>

    </annotation>

@@ -86,10 +86,10 @@ Declaring them in this extension will let the groups framework handle conflicts
             <annotation>

                <documentation>

                   The class describing the group type and how it is related to its contained children.

-This class must implement org.eclipse.papyrus.diagram.common.groups.groupcontainment.IContainerNodeDescriptor

+This class must implement org.eclipse.papyrus.uml.diagram.common.groups.groupcontainment.IContainerNodeDescriptor

                </documentation>

                <appinfo>

-                  <meta.attribute kind="java" basedOn=":org.eclipse.papyrus.diagram.common.groups.groupcontainment.IContainerNodeDescriptor"/>

+                  <meta.attribute kind="java" basedOn=":org.eclipse.papyrus.uml.diagram.common.groups.groupcontainment.IContainerNodeDescriptor"/>

                </appinfo>

             </annotation>

          </attribute>

@@ -117,10 +117,10 @@ This class must implement org.eclipse.papyrus.diagram.common.groups.groupcontain
             <annotation>

                <documentation>

                   The class describing the group type and how it is related to its contained children.

-This class must implement org.eclipse.papyrus.diagram.common.groups.groupcontainment.IContainerNodeDescriptor

+This class must implement org.eclipse.papyrus.uml.diagram.common.groups.groupcontainment.IContainerNodeDescriptor

                </documentation>

                <appinfo>

-                  <meta.attribute kind="java" basedOn=":org.eclipse.papyrus.diagram.common.groups.groupcontainment.IContainerNodeDescriptor"/>

+                  <meta.attribute kind="java" basedOn=":org.eclipse.papyrus.uml.diagram.common.groups.groupcontainment.IContainerNodeDescriptor"/>

                </appinfo>

             </annotation>

          </attribute>

@@ -142,7 +142,7 @@ This class must implement org.eclipse.papyrus.diagram.common.groups.groupcontain
       </appinfo>

       <documentation>

          &lt;extension

-    point=&quot;org.eclipse.papyrus.diagram.common.groups.groupcontainment&quot;

+    point=&quot;org.eclipse.papyrus.uml.diagram.common.groups.groupcontainment&quot;

     name=&quot;ActivityGroup&quot;

     id=&quot;org.eclipse.papyrus.diagram.activity.activitygroup&quot;&gt;

     &lt;modelContainer editPartType=&quot;org.eclipse.papyrus.diagram.activity.edit.parts.StructuredActivityNodeStructuredActivityNodeContentCompartmentEditPart&quot; descriptor=&quot;org.eclipse.papyrus.diagram.activity.groupcontainment.StructuredActivityNodeContainment&quot;/&gt;

@@ -165,7 +165,7 @@ This class must implement org.eclipse.papyrus.diagram.common.groups.groupcontain
          <meta.section type="apiinfo"/>

       </appinfo>

       <documentation>

-         The interface  org.eclipse.papyrus.diagram.common.groups.groupcontainment.IContainerNodeDescriptor must be implemented by classes used in the extensions.

+         The interface  org.eclipse.papyrus.uml.diagram.common.groups.groupcontainment.IContainerNodeDescriptor must be implemented by classes used in the extensions.

 The interface org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart is used as it is supposed to be implemented by all edit parts in Papyrus.

       </documentation>

    </annotation>

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.groups/src/org/eclipse/papyrus/diagram/common/groups/Activator.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.groups/src/org/eclipse/papyrus/uml/diagram/common/groups/Activator.java
index c5373818c66..b7670b12424 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.groups/src/org/eclipse/papyrus/diagram/common/groups/Activator.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.groups/src/org/eclipse/papyrus/uml/diagram/common/groups/Activator.java
@@ -11,7 +11,7 @@
  *   Atos Origin - Initial API and implementation

  *

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

-package org.eclipse.papyrus.diagram.common.groups;

+package org.eclipse.papyrus.uml.diagram.common.groups;

 

 import org.eclipse.ui.plugin.AbstractUIPlugin;

 import org.osgi.framework.BundleContext;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.groups/src/org/eclipse/papyrus/diagram/common/groups/Messages.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.groups/src/org/eclipse/papyrus/uml/diagram/common/groups/Messages.java
index 088164099d9..528b0ec8240 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.groups/src/org/eclipse/papyrus/diagram/common/groups/Messages.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.groups/src/org/eclipse/papyrus/uml/diagram/common/groups/Messages.java
@@ -11,7 +11,7 @@
  *   Atos Origin - Initial API and implementation

  *

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

-package org.eclipse.papyrus.diagram.common.groups;

+package org.eclipse.papyrus.uml.diagram.common.groups;

 

 import org.eclipse.osgi.util.NLS;

 

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.groups/src/org/eclipse/papyrus/diagram/common/groups/commands/ChangeGraphicalParentCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.groups/src/org/eclipse/papyrus/uml/diagram/common/groups/commands/ChangeGraphicalParentCommand.java
index c6f45bb8b44..b41f344a1c6 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.groups/src/org/eclipse/papyrus/diagram/common/groups/commands/ChangeGraphicalParentCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.groups/src/org/eclipse/papyrus/uml/diagram/common/groups/commands/ChangeGraphicalParentCommand.java
@@ -11,7 +11,7 @@
  *   Atos Origin - Initial API and implementation

  *

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

-package org.eclipse.papyrus.diagram.common.groups.commands;

+package org.eclipse.papyrus.uml.diagram.common.groups.commands;

 

 import java.util.Iterator;

 import java.util.Map;

@@ -39,9 +39,9 @@ import org.eclipse.gmf.runtime.notation.LayoutConstraint;
 import org.eclipse.gmf.runtime.notation.Location;

 import org.eclipse.gmf.runtime.notation.Node;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.diagram.common.groups.core.utils.Utils;

-import org.eclipse.papyrus.diagram.common.groups.edit.policies.XYLayoutEditGroupPolicy;

-import org.eclipse.papyrus.diagram.common.groups.utils.GroupRequestConstants;

+import org.eclipse.papyrus.uml.diagram.common.groups.core.utils.Utils;

+import org.eclipse.papyrus.uml.diagram.common.groups.edit.policies.XYLayoutEditGroupPolicy;

+import org.eclipse.papyrus.uml.diagram.common.groups.utils.GroupRequestConstants;

 

 /**

  * This command change the graphical parent of an edit part without changing the absolute position of the element

@@ -271,7 +271,7 @@ public class ChangeGraphicalParentCommand extends AbstractTransactionalCommand {
 			/*

 			 * Error in group framework usage

 			 */

-			return CommandResult.newErrorCommandResult("The new containing edit part should be compartment node. The extension point org.eclipse.papyrus.diagram.common.groups.groupcontainment may have been incorrectly used.");

+			return CommandResult.newErrorCommandResult("The new containing edit part should be compartment node. The extension point org.eclipse.papyrus.uml.diagram.common.groups.groupcontainment may have been incorrectly used.");

 		}

 		return null;

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.groups/src/org/eclipse/papyrus/diagram/common/groups/commands/ChangeModelParentCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.groups/src/org/eclipse/papyrus/uml/diagram/common/groups/commands/ChangeModelParentCommand.java
index 20096f93a25..570f1a8347b 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.groups/src/org/eclipse/papyrus/diagram/common/groups/commands/ChangeModelParentCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.groups/src/org/eclipse/papyrus/uml/diagram/common/groups/commands/ChangeModelParentCommand.java
@@ -11,7 +11,7 @@
  *   Atos Origin - Initial API and implementation

  *

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

-package org.eclipse.papyrus.diagram.common.groups.commands;

+package org.eclipse.papyrus.uml.diagram.common.groups.commands;

 

 import java.util.Collection;

 import java.util.Iterator;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.groups/src/org/eclipse/papyrus/diagram/common/groups/commands/ChooseChildrenNotificationCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.groups/src/org/eclipse/papyrus/uml/diagram/common/groups/commands/ChooseChildrenNotificationCommand.java
index dff860e6036..db4e8c6ce84 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.groups/src/org/eclipse/papyrus/diagram/common/groups/commands/ChooseChildrenNotificationCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.groups/src/org/eclipse/papyrus/uml/diagram/common/groups/commands/ChooseChildrenNotificationCommand.java
@@ -11,7 +11,7 @@
  *   Atos Origin - Initial API and implementation

  *

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

-package org.eclipse.papyrus.diagram.common.groups.commands;

+package org.eclipse.papyrus.uml.diagram.common.groups.commands;

 

 import java.util.ArrayList;

 import java.util.List;

@@ -29,10 +29,10 @@ import org.eclipse.gmf.runtime.diagram.ui.editparts.DiagramEditPart;
 import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

 import org.eclipse.gmf.runtime.emf.commands.core.command.AbstractTransactionalCommand;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.diagram.common.groups.core.PendingGroupNotificationsManager;

-import org.eclipse.papyrus.diagram.common.groups.core.ui.ChooseChildrenNotificationConfigurator;

-import org.eclipse.papyrus.diagram.common.groups.core.ui.NotificationConfigurator;

-import org.eclipse.papyrus.diagram.common.util.DiagramEditPartsUtil;

+import org.eclipse.papyrus.uml.diagram.common.groups.core.PendingGroupNotificationsManager;

+import org.eclipse.papyrus.uml.diagram.common.groups.core.ui.ChooseChildrenNotificationConfigurator;

+import org.eclipse.papyrus.uml.diagram.common.groups.core.ui.NotificationConfigurator;

+import org.eclipse.papyrus.uml.diagram.common.util.DiagramEditPartsUtil;

 

 /**

  * This command will create a notification to ask the user to choose the graphical children of an element

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.groups/src/org/eclipse/papyrus/diagram/common/groups/commands/ChooseParentNotificationCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.groups/src/org/eclipse/papyrus/uml/diagram/common/groups/commands/ChooseParentNotificationCommand.java
index d64ad9d2063..eebab7a19f3 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.groups/src/org/eclipse/papyrus/diagram/common/groups/commands/ChooseParentNotificationCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.groups/src/org/eclipse/papyrus/uml/diagram/common/groups/commands/ChooseParentNotificationCommand.java
@@ -11,7 +11,7 @@
  *   Atos Origin - Initial API and implementation

  *

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

-package org.eclipse.papyrus.diagram.common.groups.commands;

+package org.eclipse.papyrus.uml.diagram.common.groups.commands;

 

 import java.util.Iterator;

 import java.util.List;

@@ -30,12 +30,12 @@ import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewAndElementRequest;
 import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;

 import org.eclipse.gmf.runtime.emf.commands.core.command.AbstractTransactionalCommand;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.diagram.common.groups.Messages;

-import org.eclipse.papyrus.diagram.common.groups.core.PendingGroupNotificationsManager;

-import org.eclipse.papyrus.diagram.common.groups.core.ui.ChooseParentNotificationConfigurator;

-import org.eclipse.papyrus.diagram.common.groups.core.ui.NotificationConfigurator;

-import org.eclipse.papyrus.diagram.common.groups.utils.GroupRequestConstants;

-import org.eclipse.papyrus.diagram.common.util.DiagramEditPartsUtil;

+import org.eclipse.papyrus.uml.diagram.common.groups.Messages;

+import org.eclipse.papyrus.uml.diagram.common.groups.core.PendingGroupNotificationsManager;

+import org.eclipse.papyrus.uml.diagram.common.groups.core.ui.ChooseParentNotificationConfigurator;

+import org.eclipse.papyrus.uml.diagram.common.groups.core.ui.NotificationConfigurator;

+import org.eclipse.papyrus.uml.diagram.common.groups.utils.GroupRequestConstants;

+import org.eclipse.papyrus.uml.diagram.common.util.DiagramEditPartsUtil;

 

 /**

  * Command to display the notification for choosing parent.

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.groups/src/org/eclipse/papyrus/diagram/common/groups/commands/CommandResultMessagesError.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.groups/src/org/eclipse/papyrus/uml/diagram/common/groups/commands/CommandResultMessagesError.java
index 52f70d5b413..72793bdc572 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.groups/src/org/eclipse/papyrus/diagram/common/groups/commands/CommandResultMessagesError.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.groups/src/org/eclipse/papyrus/uml/diagram/common/groups/commands/CommandResultMessagesError.java
@@ -1,4 +1,4 @@
-package org.eclipse.papyrus.diagram.common.groups.commands;

+package org.eclipse.papyrus.uml.diagram.common.groups.commands;

 

 

 public class CommandResultMessagesError {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.groups/src/org/eclipse/papyrus/diagram/common/groups/commands/SetUpReferencesCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.groups/src/org/eclipse/papyrus/uml/diagram/common/groups/commands/SetUpReferencesCommand.java
index 8b855e90bad..aa73a7d31eb 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.groups/src/org/eclipse/papyrus/diagram/common/groups/commands/SetUpReferencesCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.groups/src/org/eclipse/papyrus/uml/diagram/common/groups/commands/SetUpReferencesCommand.java
@@ -11,7 +11,7 @@
  *   Atos Origin - Initial API and implementation

  *

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

-package org.eclipse.papyrus.diagram.common.groups.commands;

+package org.eclipse.papyrus.uml.diagram.common.groups.commands;

 

 import java.util.Collection;

 import java.util.List;

@@ -25,8 +25,8 @@ import org.eclipse.emf.transaction.TransactionalEditingDomain;
 import org.eclipse.gmf.runtime.common.core.command.CommandResult;

 import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

 import org.eclipse.gmf.runtime.emf.commands.core.command.AbstractTransactionalCommand;

-import org.eclipse.papyrus.diagram.common.groups.core.groupcontainment.GroupContainmentRegistry;

-import org.eclipse.papyrus.diagram.common.groups.groupcontainment.AbstractContainerNodeDescriptor;

+import org.eclipse.papyrus.uml.diagram.common.groups.core.groupcontainment.GroupContainmentRegistry;

+import org.eclipse.papyrus.uml.diagram.common.groups.groupcontainment.AbstractContainerNodeDescriptor;

 

 /**

  * Command to update referencing groups for a child element.

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.groups/src/org/eclipse/papyrus/diagram/common/groups/commands/UpdateReferencesCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.groups/src/org/eclipse/papyrus/uml/diagram/common/groups/commands/UpdateReferencesCommand.java
index 68f46584c3f..50d19411a53 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.groups/src/org/eclipse/papyrus/diagram/common/groups/commands/UpdateReferencesCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.groups/src/org/eclipse/papyrus/uml/diagram/common/groups/commands/UpdateReferencesCommand.java
@@ -11,7 +11,7 @@
  *   Atos Origin - Initial API and implementation

  *

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

-package org.eclipse.papyrus.diagram.common.groups.commands;

+package org.eclipse.papyrus.uml.diagram.common.groups.commands;

 

 import java.util.Collection;

 import java.util.List;

@@ -25,8 +25,8 @@ import org.eclipse.emf.transaction.TransactionalEditingDomain;
 import org.eclipse.gmf.runtime.common.core.command.CommandResult;

 import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

 import org.eclipse.gmf.runtime.emf.commands.core.command.AbstractTransactionalCommand;

-import org.eclipse.papyrus.diagram.common.groups.core.utils.Utils;

-import org.eclipse.papyrus.diagram.common.groups.groupcontainment.AbstractContainerNodeDescriptor;

+import org.eclipse.papyrus.uml.diagram.common.groups.core.utils.Utils;

+import org.eclipse.papyrus.uml.diagram.common.groups.groupcontainment.AbstractContainerNodeDescriptor;

 

 /**

  * Update all references of a parent group.

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.groups/src/org/eclipse/papyrus/diagram/common/groups/commands/utlis/CommandsUtils.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.groups/src/org/eclipse/papyrus/uml/diagram/common/groups/commands/utlis/CommandsUtils.java
index c6096a43368..4bc0d50e1d0 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.groups/src/org/eclipse/papyrus/diagram/common/groups/commands/utlis/CommandsUtils.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.groups/src/org/eclipse/papyrus/uml/diagram/common/groups/commands/utlis/CommandsUtils.java
@@ -11,7 +11,7 @@
  *   Atos Origin - Initial API and implementation

  *

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

-package org.eclipse.papyrus.diagram.common.groups.commands.utlis;

+package org.eclipse.papyrus.uml.diagram.common.groups.commands.utlis;

 

 import java.util.ArrayList;

 import java.util.Collections;

@@ -47,19 +47,19 @@ import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;
 import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.diagram.common.groups.Messages;

-import org.eclipse.papyrus.diagram.common.groups.commands.ChangeGraphicalParentCommand;

-import org.eclipse.papyrus.diagram.common.groups.commands.ChangeGraphicalParentCommand.Mode;

-import org.eclipse.papyrus.diagram.common.groups.commands.ChangeModelParentCommand;

-import org.eclipse.papyrus.diagram.common.groups.commands.ChooseChildrenNotificationCommand;

-import org.eclipse.papyrus.diagram.common.groups.commands.ChooseParentNotificationCommand;

-import org.eclipse.papyrus.diagram.common.groups.commands.SetUpReferencesCommand;

-import org.eclipse.papyrus.diagram.common.groups.commands.UpdateReferencesCommand;

-import org.eclipse.papyrus.diagram.common.groups.core.groupcontainment.GroupContainmentRegistry;

-import org.eclipse.papyrus.diagram.common.groups.core.utils.DefaultModelParent;

-import org.eclipse.papyrus.diagram.common.groups.core.utils.Utils;

-import org.eclipse.papyrus.diagram.common.groups.groupcontainment.AbstractContainerNodeDescriptor;

-import org.eclipse.papyrus.diagram.common.groups.utils.GroupRequestConstants;

+import org.eclipse.papyrus.uml.diagram.common.groups.Messages;

+import org.eclipse.papyrus.uml.diagram.common.groups.commands.ChangeGraphicalParentCommand;

+import org.eclipse.papyrus.uml.diagram.common.groups.commands.ChangeModelParentCommand;

+import org.eclipse.papyrus.uml.diagram.common.groups.commands.ChooseChildrenNotificationCommand;

+import org.eclipse.papyrus.uml.diagram.common.groups.commands.ChooseParentNotificationCommand;

+import org.eclipse.papyrus.uml.diagram.common.groups.commands.SetUpReferencesCommand;

+import org.eclipse.papyrus.uml.diagram.common.groups.commands.UpdateReferencesCommand;

+import org.eclipse.papyrus.uml.diagram.common.groups.commands.ChangeGraphicalParentCommand.Mode;

+import org.eclipse.papyrus.uml.diagram.common.groups.core.groupcontainment.GroupContainmentRegistry;

+import org.eclipse.papyrus.uml.diagram.common.groups.core.utils.DefaultModelParent;

+import org.eclipse.papyrus.uml.diagram.common.groups.core.utils.Utils;

+import org.eclipse.papyrus.uml.diagram.common.groups.groupcontainment.AbstractContainerNodeDescriptor;

+import org.eclipse.papyrus.uml.diagram.common.groups.utils.GroupRequestConstants;

 

 /**

  * Util class for command

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.groups/src/org/eclipse/papyrus/diagram/common/groups/core/GroupNotificationBuilderFactory.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.groups/src/org/eclipse/papyrus/uml/diagram/common/groups/core/GroupNotificationBuilderFactory.java
index 33f9394e8db..ee5a4bfa2dd 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.groups/src/org/eclipse/papyrus/diagram/common/groups/core/GroupNotificationBuilderFactory.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.groups/src/org/eclipse/papyrus/uml/diagram/common/groups/core/GroupNotificationBuilderFactory.java
@@ -11,12 +11,12 @@
  *   Atos Origin - Initial API and implementation

  *

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

-package org.eclipse.papyrus.diagram.common.groups.core;

+package org.eclipse.papyrus.uml.diagram.common.groups.core;

 

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

-import org.eclipse.papyrus.diagram.common.groups.core.ui.CompositeCreatorWithCommand;

 import org.eclipse.papyrus.ui.toolbox.notification.Type;

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

+import org.eclipse.papyrus.uml.diagram.common.groups.core.ui.CompositeCreatorWithCommand;

 

 /**

  * This class builds all the necessary notifications for the group framework.

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.groups/src/org/eclipse/papyrus/diagram/common/groups/core/PendingGroupNotificationsManager.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.groups/src/org/eclipse/papyrus/uml/diagram/common/groups/core/PendingGroupNotificationsManager.java
index 9cdd59df424..565ed257466 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.groups/src/org/eclipse/papyrus/diagram/common/groups/core/PendingGroupNotificationsManager.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.groups/src/org/eclipse/papyrus/uml/diagram/common/groups/core/PendingGroupNotificationsManager.java
@@ -11,17 +11,17 @@
  *   Atos Origin - Initial API and implementation

  *

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

-package org.eclipse.papyrus.diagram.common.groups.core;

+package org.eclipse.papyrus.uml.diagram.common.groups.core;

 

 import java.util.HashMap;

 import java.util.Map;

 

 import org.eclipse.gmf.runtime.diagram.ui.editparts.DiagramEditPart;

 import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

-import org.eclipse.papyrus.diagram.common.groups.core.ui.ChooseChildrenNotificationConfigurator;

-import org.eclipse.papyrus.diagram.common.groups.core.ui.ChooseParentNotificationConfigurator;

-import org.eclipse.papyrus.diagram.common.groups.core.ui.NotificationConfigurator;

 import org.eclipse.papyrus.ui.toolbox.notification.INotification;

+import org.eclipse.papyrus.uml.diagram.common.groups.core.ui.ChooseChildrenNotificationConfigurator;

+import org.eclipse.papyrus.uml.diagram.common.groups.core.ui.ChooseParentNotificationConfigurator;

+import org.eclipse.papyrus.uml.diagram.common.groups.core.ui.NotificationConfigurator;

 

 /**

  * The pending group notifications manager handles notifications which have not been resolved.

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.groups/src/org/eclipse/papyrus/diagram/common/groups/core/groupcontainment/GroupContainmentRegistry.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.groups/src/org/eclipse/papyrus/uml/diagram/common/groups/core/groupcontainment/GroupContainmentRegistry.java
index b9caf4e3bd5..f3fc090b96d 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.groups/src/org/eclipse/papyrus/diagram/common/groups/core/groupcontainment/GroupContainmentRegistry.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.groups/src/org/eclipse/papyrus/uml/diagram/common/groups/core/groupcontainment/GroupContainmentRegistry.java
@@ -11,7 +11,7 @@
  *   Atos Origin - Initial API and implementation

  *

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

-package org.eclipse.papyrus.diagram.common.groups.core.groupcontainment;

+package org.eclipse.papyrus.uml.diagram.common.groups.core.groupcontainment;

 

 import java.util.HashMap;

 import java.util.HashSet;

@@ -29,7 +29,7 @@ import org.eclipse.emf.ecore.EReference;
 import org.eclipse.gmf.runtime.diagram.ui.editparts.DiagramEditPart;

 import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.diagram.common.groups.groupcontainment.AbstractContainerNodeDescriptor;

+import org.eclipse.papyrus.uml.diagram.common.groups.groupcontainment.AbstractContainerNodeDescriptor;

 

 

 /**

@@ -40,7 +40,7 @@ import org.eclipse.papyrus.diagram.common.groups.groupcontainment.AbstractContai
 public class GroupContainmentRegistry {

 

 	/** The GroupContainment extension point id */

-	private static final String GROUP_EXTENSION_POINT = "org.eclipse.papyrus.diagram.common.groups.groupcontainment";

+	private static final String GROUP_EXTENSION_POINT = "org.eclipse.papyrus.uml.diagram.common.groups.groupcontainment";

 

 	/** The name of the extension node for model containment */

 	private static final String MODEL_CONTAINER_NODE = "modelContainer";

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.groups/src/org/eclipse/papyrus/diagram/common/groups/core/ui/CheckboxIGraphicalFocusListenner.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.groups/src/org/eclipse/papyrus/uml/diagram/common/groups/core/ui/CheckboxIGraphicalFocusListenner.java
index 91f87e441c8..9732dd698c5 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.groups/src/org/eclipse/papyrus/diagram/common/groups/core/ui/CheckboxIGraphicalFocusListenner.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.groups/src/org/eclipse/papyrus/uml/diagram/common/groups/core/ui/CheckboxIGraphicalFocusListenner.java
@@ -1,4 +1,4 @@
-package org.eclipse.papyrus.diagram.common.groups.core.ui;

+package org.eclipse.papyrus.uml.diagram.common.groups.core.ui;

 

 import org.eclipse.emf.transaction.TransactionalEditingDomain;

 import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.groups/src/org/eclipse/papyrus/diagram/common/groups/core/ui/ChooseChildrenNotificationConfigurator.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.groups/src/org/eclipse/papyrus/uml/diagram/common/groups/core/ui/ChooseChildrenNotificationConfigurator.java
index 78ff2e44dca..ecad5d2fb7f 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.groups/src/org/eclipse/papyrus/diagram/common/groups/core/ui/ChooseChildrenNotificationConfigurator.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.groups/src/org/eclipse/papyrus/uml/diagram/common/groups/core/ui/ChooseChildrenNotificationConfigurator.java
@@ -11,7 +11,7 @@
  *   Atos Origin - Initial API and implementation

  *

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

-package org.eclipse.papyrus.diagram.common.groups.core.ui;

+package org.eclipse.papyrus.uml.diagram.common.groups.core.ui;

 

 import java.util.ArrayList;

 import java.util.HashMap;

@@ -26,12 +26,12 @@ import org.eclipse.gef.EditPolicy;
 import org.eclipse.gmf.runtime.diagram.ui.editparts.CompartmentEditPart;

 import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

 import org.eclipse.papyrus.commands.wrappers.GMFtoEMFCommandWrapper;

-import org.eclipse.papyrus.diagram.common.groups.Messages;

-import org.eclipse.papyrus.diagram.common.groups.commands.ChangeGraphicalParentCommand;

-import org.eclipse.papyrus.diagram.common.groups.core.PendingGroupNotificationsManager;

-import org.eclipse.papyrus.diagram.common.groups.core.ui.utils.CreatorUtils;

 import org.eclipse.papyrus.ui.toolbox.notification.ICompositeCreator;

 import org.eclipse.papyrus.ui.toolbox.notification.builders.IContext;

+import org.eclipse.papyrus.uml.diagram.common.groups.Messages;

+import org.eclipse.papyrus.uml.diagram.common.groups.commands.ChangeGraphicalParentCommand;

+import org.eclipse.papyrus.uml.diagram.common.groups.core.PendingGroupNotificationsManager;

+import org.eclipse.papyrus.uml.diagram.common.groups.core.ui.utils.CreatorUtils;

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.events.DisposeEvent;

 import org.eclipse.swt.events.DisposeListener;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.groups/src/org/eclipse/papyrus/diagram/common/groups/core/ui/ChooseParentNotificationConfigurator.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.groups/src/org/eclipse/papyrus/uml/diagram/common/groups/core/ui/ChooseParentNotificationConfigurator.java
index f7504e9a21c..7850179e2d5 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.groups/src/org/eclipse/papyrus/diagram/common/groups/core/ui/ChooseParentNotificationConfigurator.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.groups/src/org/eclipse/papyrus/uml/diagram/common/groups/core/ui/ChooseParentNotificationConfigurator.java
@@ -11,7 +11,7 @@
  *   Atos Origin - Initial API and implementation

  *

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

-package org.eclipse.papyrus.diagram.common.groups.core.ui;

+package org.eclipse.papyrus.uml.diagram.common.groups.core.ui;

 

 import java.util.HashMap;

 import java.util.List;

@@ -25,14 +25,14 @@ import org.eclipse.gef.EditPart;
 import org.eclipse.gef.EditPolicy;

 import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

 import org.eclipse.papyrus.commands.wrappers.GMFtoEMFCommandWrapper;

-import org.eclipse.papyrus.diagram.common.groups.Messages;

-import org.eclipse.papyrus.diagram.common.groups.commands.ChangeGraphicalParentCommand;

-import org.eclipse.papyrus.diagram.common.groups.commands.ChangeModelParentCommand;

-import org.eclipse.papyrus.diagram.common.groups.commands.ChooseParentNotificationCommand;

-import org.eclipse.papyrus.diagram.common.groups.core.PendingGroupNotificationsManager;

-import org.eclipse.papyrus.diagram.common.groups.core.ui.utils.CreatorUtils;

-import org.eclipse.papyrus.diagram.common.groups.core.utils.Utils;

 import org.eclipse.papyrus.ui.toolbox.notification.builders.IContext;

+import org.eclipse.papyrus.uml.diagram.common.groups.Messages;

+import org.eclipse.papyrus.uml.diagram.common.groups.commands.ChangeGraphicalParentCommand;

+import org.eclipse.papyrus.uml.diagram.common.groups.commands.ChangeModelParentCommand;

+import org.eclipse.papyrus.uml.diagram.common.groups.commands.ChooseParentNotificationCommand;

+import org.eclipse.papyrus.uml.diagram.common.groups.core.PendingGroupNotificationsManager;

+import org.eclipse.papyrus.uml.diagram.common.groups.core.ui.utils.CreatorUtils;

+import org.eclipse.papyrus.uml.diagram.common.groups.core.utils.Utils;

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.events.DisposeEvent;

 import org.eclipse.swt.events.DisposeListener;

@@ -248,7 +248,7 @@ public class ChooseParentNotificationConfigurator extends NotificationConfigurat
 					}

 				}

 			} else {

-				org.eclipse.papyrus.diagram.common.groups.Activator.getDefault().getLog().log(new Status(Status.WARNING, org.eclipse.papyrus.diagram.common.groups.Activator.PLUGIN_ID, "One of the needed element is unavailable"));

+				org.eclipse.papyrus.uml.diagram.common.groups.Activator.getDefault().getLog().log(new Status(Status.WARNING, org.eclipse.papyrus.uml.diagram.common.groups.Activator.PLUGIN_ID, "One of the needed element is unavailable"));

 			}

 		}

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.groups/src/org/eclipse/papyrus/diagram/common/groups/core/ui/CompositeCreatorWithCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.groups/src/org/eclipse/papyrus/uml/diagram/common/groups/core/ui/CompositeCreatorWithCommand.java
index 11b7c2ce885..05701008d2c 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.groups/src/org/eclipse/papyrus/diagram/common/groups/core/ui/CompositeCreatorWithCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.groups/src/org/eclipse/papyrus/uml/diagram/common/groups/core/ui/CompositeCreatorWithCommand.java
@@ -11,7 +11,7 @@
  *   Atos Origin - Initial API and implementation

  *

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

-package org.eclipse.papyrus.diagram.common.groups.core.ui;

+package org.eclipse.papyrus.uml.diagram.common.groups.core.ui;

 

 import java.util.ArrayList;

 import java.util.HashMap;

@@ -19,10 +19,10 @@ import java.util.Map;
 

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

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

-import org.eclipse.papyrus.diagram.common.groups.core.PendingGroupNotificationsManager;

 import org.eclipse.papyrus.ui.toolbox.notification.ICompositeCreator;

 import org.eclipse.papyrus.ui.toolbox.notification.NotificationRunnable;

 import org.eclipse.papyrus.ui.toolbox.notification.builders.IContext;

+import org.eclipse.papyrus.uml.diagram.common.groups.core.PendingGroupNotificationsManager;

 

 /**

  * The CompositeCreator with command is an abstract implementation of ICompositeCreator which take cares of storing a command which evolves with the

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.groups/src/org/eclipse/papyrus/diagram/common/groups/core/ui/NotificationConfigurator.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.groups/src/org/eclipse/papyrus/uml/diagram/common/groups/core/ui/NotificationConfigurator.java
index ef70395136d..3d98ef51e4b 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.groups/src/org/eclipse/papyrus/diagram/common/groups/core/ui/NotificationConfigurator.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.groups/src/org/eclipse/papyrus/uml/diagram/common/groups/core/ui/NotificationConfigurator.java
@@ -1,4 +1,4 @@
-package org.eclipse.papyrus.diagram.common.groups.core.ui;

+package org.eclipse.papyrus.uml.diagram.common.groups.core.ui;

 

 

 

@@ -6,8 +6,6 @@ import java.util.ArrayList;
 import java.util.Collection;

 

 import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

-import org.eclipse.papyrus.diagram.common.groups.core.GroupNotificationBuilderFactory;

-import org.eclipse.papyrus.diagram.common.groups.core.PendingGroupNotificationsManager;

 import org.eclipse.papyrus.ui.toolbox.notification.ICompositeCreator;

 import org.eclipse.papyrus.ui.toolbox.notification.INotification;

 import org.eclipse.papyrus.ui.toolbox.notification.NotificationRunnable;

@@ -15,6 +13,8 @@ import org.eclipse.papyrus.ui.toolbox.notification.builders.IContext;
 import org.eclipse.papyrus.ui.toolbox.notification.builders.NotificationBuilder;

 import org.eclipse.papyrus.ui.toolbox.notification.view.AbstractInsideComposite;

 import org.eclipse.papyrus.ui.toolbox.notification.view.PapyrusNotificationView;

+import org.eclipse.papyrus.uml.diagram.common.groups.core.GroupNotificationBuilderFactory;

+import org.eclipse.papyrus.uml.diagram.common.groups.core.PendingGroupNotificationsManager;

 import org.eclipse.ui.IViewPart;

 import org.eclipse.ui.PartInitException;

 import org.eclipse.ui.PlatformUI;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.groups/src/org/eclipse/papyrus/diagram/common/groups/core/ui/utils/CreatorUtils.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.groups/src/org/eclipse/papyrus/uml/diagram/common/groups/core/ui/utils/CreatorUtils.java
index 0ab8fbb82dc..07529186ff9 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.groups/src/org/eclipse/papyrus/diagram/common/groups/core/ui/utils/CreatorUtils.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.groups/src/org/eclipse/papyrus/uml/diagram/common/groups/core/ui/utils/CreatorUtils.java
@@ -11,7 +11,7 @@
  *   Atos Origin - Initial API and implementation

  *

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

-package org.eclipse.papyrus.diagram.common.groups.core.ui.utils;

+package org.eclipse.papyrus.uml.diagram.common.groups.core.ui.utils;

 

 import org.eclipse.emf.ecore.EClass;

 import org.eclipse.emf.ecore.EObject;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.groups/src/org/eclipse/papyrus/diagram/common/groups/core/utils/DefaultModelParent.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.groups/src/org/eclipse/papyrus/uml/diagram/common/groups/core/utils/DefaultModelParent.java
index c03656c237a..62996c32134 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.groups/src/org/eclipse/papyrus/diagram/common/groups/core/utils/DefaultModelParent.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.groups/src/org/eclipse/papyrus/uml/diagram/common/groups/core/utils/DefaultModelParent.java
@@ -11,7 +11,7 @@
  *   Atos Origin - Initial API and implementation

  *

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

-package org.eclipse.papyrus.diagram.common.groups.core.utils;

+package org.eclipse.papyrus.uml.diagram.common.groups.core.utils;

 

 import org.eclipse.emf.ecore.EReference;

 import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.groups/src/org/eclipse/papyrus/diagram/common/groups/core/utils/Utils.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.groups/src/org/eclipse/papyrus/uml/diagram/common/groups/core/utils/Utils.java
index d53644b19d1..58c4cf348e5 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.groups/src/org/eclipse/papyrus/diagram/common/groups/core/utils/Utils.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.groups/src/org/eclipse/papyrus/uml/diagram/common/groups/core/utils/Utils.java
@@ -11,7 +11,7 @@
  *   Atos Origin - Initial API and implementation

  *

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

-package org.eclipse.papyrus.diagram.common.groups.core.utils;

+package org.eclipse.papyrus.uml.diagram.common.groups.core.utils;

 

 import java.util.ArrayList;

 import java.util.Collection;

@@ -53,11 +53,11 @@ import org.eclipse.gmf.runtime.notation.LayoutConstraint;
 import org.eclipse.gmf.runtime.notation.Node;

 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.papyrus.commands.wrappers.GEFtoEMFCommandWrapper;

-import org.eclipse.papyrus.diagram.common.groups.commands.ChangeModelParentCommand;

-import org.eclipse.papyrus.diagram.common.groups.core.groupcontainment.GroupContainmentRegistry;

-import org.eclipse.papyrus.diagram.common.groups.groupcontainment.AbstractContainerNodeDescriptor;

-import org.eclipse.papyrus.diagram.common.groups.utils.GraphicalAndModelElementComparator;

-import org.eclipse.papyrus.diagram.common.groups.utils.GraphicalAndModelElementComparator.Mode;

+import org.eclipse.papyrus.uml.diagram.common.groups.commands.ChangeModelParentCommand;

+import org.eclipse.papyrus.uml.diagram.common.groups.core.groupcontainment.GroupContainmentRegistry;

+import org.eclipse.papyrus.uml.diagram.common.groups.groupcontainment.AbstractContainerNodeDescriptor;

+import org.eclipse.papyrus.uml.diagram.common.groups.utils.GraphicalAndModelElementComparator;

+import org.eclipse.papyrus.uml.diagram.common.groups.utils.GraphicalAndModelElementComparator.Mode;

 

 

 /**

@@ -606,7 +606,7 @@ public class Utils {
 								// parents already handled in the first recursion (as direct parent group)

 							} else if(elementAlreadyVisited.contains(currentElementParentGroup)) {

 								// element already met, avoid infinite loop

-								org.eclipse.papyrus.diagram.common.groups.Activator.getDefault().getLog().log(new Status(Status.WARNING, org.eclipse.papyrus.diagram.common.groups.Activator.PLUGIN_ID, "There is a circle element reference"));

+								org.eclipse.papyrus.uml.diagram.common.groups.Activator.getDefault().getLog().log(new Status(Status.WARNING, org.eclipse.papyrus.uml.diagram.common.groups.Activator.PLUGIN_ID, "There is a circle element reference"));

 							} else {

 								//else iterate recursively also on this group's parents

 								withDrawRedundantElementReferenced(originalEObject, groupFrameworkReferences, directlyReferencedByElement, elementAlreadyVisited, currentElementParentGroup);

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.groups/src/org/eclipse/papyrus/diagram/common/groups/edit/policies/CreateInGroupEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.groups/src/org/eclipse/papyrus/uml/diagram/common/groups/edit/policies/CreateInGroupEditPolicy.java
index 631ff8896f6..813d283be42 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.groups/src/org/eclipse/papyrus/diagram/common/groups/edit/policies/CreateInGroupEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.groups/src/org/eclipse/papyrus/uml/diagram/common/groups/edit/policies/CreateInGroupEditPolicy.java
@@ -11,7 +11,7 @@
  *   Atos Origin - Initial API and implementation

  *

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

-package org.eclipse.papyrus.diagram.common.groups.edit.policies;

+package org.eclipse.papyrus.uml.diagram.common.groups.edit.policies;

 

 import java.util.ArrayList;

 import java.util.Iterator;

@@ -42,12 +42,12 @@ import org.eclipse.gmf.runtime.emf.commands.core.command.CompositeTransactionalC
 import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.diagram.common.groups.commands.utlis.CommandsUtils;

-import org.eclipse.papyrus.diagram.common.groups.core.groupcontainment.GroupContainmentRegistry;

-import org.eclipse.papyrus.diagram.common.groups.core.utils.Utils;

-import org.eclipse.papyrus.diagram.common.groups.groupcontainment.AbstractContainerNodeDescriptor;

-import org.eclipse.papyrus.diagram.common.groups.utils.GroupRequestConstants;

-import org.eclipse.papyrus.diagram.common.util.DiagramEditPartsUtil;

+import org.eclipse.papyrus.uml.diagram.common.groups.commands.utlis.CommandsUtils;

+import org.eclipse.papyrus.uml.diagram.common.groups.core.groupcontainment.GroupContainmentRegistry;

+import org.eclipse.papyrus.uml.diagram.common.groups.core.utils.Utils;

+import org.eclipse.papyrus.uml.diagram.common.groups.groupcontainment.AbstractContainerNodeDescriptor;

+import org.eclipse.papyrus.uml.diagram.common.groups.utils.GroupRequestConstants;

+import org.eclipse.papyrus.uml.diagram.common.util.DiagramEditPartsUtil;

 

 

 /**

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.groups/src/org/eclipse/papyrus/diagram/common/groups/edit/policies/XYLayoutEditGroupPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.groups/src/org/eclipse/papyrus/uml/diagram/common/groups/edit/policies/XYLayoutEditGroupPolicy.java
index ea493dd4914..4a87a13251b 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.groups/src/org/eclipse/papyrus/diagram/common/groups/edit/policies/XYLayoutEditGroupPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.groups/src/org/eclipse/papyrus/uml/diagram/common/groups/edit/policies/XYLayoutEditGroupPolicy.java
@@ -11,7 +11,7 @@
  *   Atos Origin - Initial API and implementation

  *

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

-package org.eclipse.papyrus.diagram.common.groups.edit.policies;

+package org.eclipse.papyrus.uml.diagram.common.groups.edit.policies;

 

 

 import java.util.ArrayList;

@@ -38,18 +38,18 @@ import org.eclipse.gmf.runtime.diagram.ui.editparts.DiagramEditPart;
 import org.eclipse.gmf.runtime.diagram.ui.editparts.GraphicalEditPart;

 import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

 import org.eclipse.gmf.runtime.diagram.ui.editpolicies.XYLayoutEditPolicy;

-import org.eclipse.papyrus.diagram.common.groups.commands.ChangeGraphicalParentCommand;

-import org.eclipse.papyrus.diagram.common.groups.commands.ChangeGraphicalParentCommand.Mode;

-import org.eclipse.papyrus.diagram.common.groups.commands.ChangeModelParentCommand;

-import org.eclipse.papyrus.diagram.common.groups.commands.SetUpReferencesCommand;

-import org.eclipse.papyrus.diagram.common.groups.commands.UpdateReferencesCommand;

-import org.eclipse.papyrus.diagram.common.groups.commands.utlis.CommandsUtils;

-import org.eclipse.papyrus.diagram.common.groups.core.groupcontainment.GroupContainmentRegistry;

-import org.eclipse.papyrus.diagram.common.groups.core.utils.DefaultModelParent;

-import org.eclipse.papyrus.diagram.common.groups.core.utils.Utils;

-import org.eclipse.papyrus.diagram.common.groups.groupcontainment.AbstractContainerNodeDescriptor;

-import org.eclipse.papyrus.diagram.common.groups.utils.GroupRequestConstants;

-import org.eclipse.papyrus.diagram.common.util.DiagramEditPartsUtil;

+import org.eclipse.papyrus.uml.diagram.common.groups.commands.ChangeGraphicalParentCommand;

+import org.eclipse.papyrus.uml.diagram.common.groups.commands.ChangeModelParentCommand;

+import org.eclipse.papyrus.uml.diagram.common.groups.commands.SetUpReferencesCommand;

+import org.eclipse.papyrus.uml.diagram.common.groups.commands.UpdateReferencesCommand;

+import org.eclipse.papyrus.uml.diagram.common.groups.commands.ChangeGraphicalParentCommand.Mode;

+import org.eclipse.papyrus.uml.diagram.common.groups.commands.utlis.CommandsUtils;

+import org.eclipse.papyrus.uml.diagram.common.groups.core.groupcontainment.GroupContainmentRegistry;

+import org.eclipse.papyrus.uml.diagram.common.groups.core.utils.DefaultModelParent;

+import org.eclipse.papyrus.uml.diagram.common.groups.core.utils.Utils;

+import org.eclipse.papyrus.uml.diagram.common.groups.groupcontainment.AbstractContainerNodeDescriptor;

+import org.eclipse.papyrus.uml.diagram.common.groups.utils.GroupRequestConstants;

+import org.eclipse.papyrus.uml.diagram.common.util.DiagramEditPartsUtil;

 

 /**

  * This edit policy is used to handle node positioning inside a group after creation or after a {@link ChangeBoundsRequest} You can find example of

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.groups/src/org/eclipse/papyrus/diagram/common/groups/groupcontainment/AbstractContainerNodeDescriptor.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.groups/src/org/eclipse/papyrus/uml/diagram/common/groups/groupcontainment/AbstractContainerNodeDescriptor.java
index eada82c041a..8787e0174fc 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.groups/src/org/eclipse/papyrus/diagram/common/groups/groupcontainment/AbstractContainerNodeDescriptor.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.groups/src/org/eclipse/papyrus/uml/diagram/common/groups/groupcontainment/AbstractContainerNodeDescriptor.java
@@ -12,7 +12,7 @@
  *

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

 

-package org.eclipse.papyrus.diagram.common.groups.groupcontainment;

+package org.eclipse.papyrus.uml.diagram.common.groups.groupcontainment;

 

 import java.util.ArrayList;

 import java.util.List;

@@ -25,7 +25,7 @@ import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
 import org.eclipse.gmf.runtime.notation.View;

 

 /**

- * This abstract class describes the required methods to register to the org.eclipse.papyrus.diagram.common.groups.groupcontainment extension point.

+ * This abstract class describes the required methods to register to the org.eclipse.papyrus.uml.diagram.common.groups.groupcontainment extension point.

  * These methods allow to recover necessary information on the container node for a given type.

  * 

  * @author adaussy

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.groups/src/org/eclipse/papyrus/diagram/common/groups/preferences/OpacityFactoryHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.groups/src/org/eclipse/papyrus/uml/diagram/common/groups/preferences/OpacityFactoryHelper.java
index c608defd0c7..d827837b3a6 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.groups/src/org/eclipse/papyrus/diagram/common/groups/preferences/OpacityFactoryHelper.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.groups/src/org/eclipse/papyrus/uml/diagram/common/groups/preferences/OpacityFactoryHelper.java
@@ -11,7 +11,7 @@
  *   Atos Origin - Initial API and implementation

  *

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

-package org.eclipse.papyrus.diagram.common.groups.preferences;

+package org.eclipse.papyrus.uml.diagram.common.groups.preferences;

 

 import org.eclipse.draw2d.Shape;

 import org.eclipse.jface.dialogs.DialogPage;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.groups/src/org/eclipse/papyrus/diagram/common/groups/preferences/OpacityGroup.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.groups/src/org/eclipse/papyrus/uml/diagram/common/groups/preferences/OpacityGroup.java
index 7b8336725d5..d85e98ea307 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.groups/src/org/eclipse/papyrus/diagram/common/groups/preferences/OpacityGroup.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.groups/src/org/eclipse/papyrus/uml/diagram/common/groups/preferences/OpacityGroup.java
@@ -11,12 +11,12 @@
  *   Atos Origin - Initial API and implementation

  *

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

-package org.eclipse.papyrus.diagram.common.groups.preferences;

+package org.eclipse.papyrus.uml.diagram.common.groups.preferences;

 

 import org.eclipse.jface.dialogs.DialogPage;

 import org.eclipse.jface.preference.ScaleFieldEditor;

-import org.eclipse.papyrus.diagram.common.ui.helper.HelpComponentFactory;

 import org.eclipse.papyrus.preferences.ui.AbstractGroup;

+import org.eclipse.papyrus.uml.diagram.common.ui.helper.HelpComponentFactory;

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.layout.GridLayout;

 import org.eclipse.swt.widgets.Composite;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.groups/src/org/eclipse/papyrus/diagram/common/groups/tabbedproperties/appearance/ChooseGraphicalParentSection.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.groups/src/org/eclipse/papyrus/uml/diagram/common/groups/tabbedproperties/appearance/ChooseGraphicalParentSection.java
index 6ea59510302..cc3bdb300ea 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.groups/src/org/eclipse/papyrus/diagram/common/groups/tabbedproperties/appearance/ChooseGraphicalParentSection.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.groups/src/org/eclipse/papyrus/uml/diagram/common/groups/tabbedproperties/appearance/ChooseGraphicalParentSection.java
@@ -11,7 +11,7 @@
  *   Atos Origin - Initial API and implementation

  *

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

-package org.eclipse.papyrus.diagram.common.groups.tabbedproperties.appearance;

+package org.eclipse.papyrus.uml.diagram.common.groups.tabbedproperties.appearance;

 

 import org.eclipse.gmf.runtime.diagram.ui.properties.sections.AbstractNotationPropertiesSection;

 import org.eclipse.swt.graphics.Image;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.groups/src/org/eclipse/papyrus/diagram/common/groups/tabbedproperties/appearance/ChooseGraphicalParentSectionFilter.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.groups/src/org/eclipse/papyrus/uml/diagram/common/groups/tabbedproperties/appearance/ChooseGraphicalParentSectionFilter.java
index 9eaf3730cea..881f45db5df 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.groups/src/org/eclipse/papyrus/diagram/common/groups/tabbedproperties/appearance/ChooseGraphicalParentSectionFilter.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.groups/src/org/eclipse/papyrus/uml/diagram/common/groups/tabbedproperties/appearance/ChooseGraphicalParentSectionFilter.java
@@ -11,7 +11,7 @@
  *   Atos Origin - Initial API and implementation

  *

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

-package org.eclipse.papyrus.diagram.common.groups.tabbedproperties.appearance;

+package org.eclipse.papyrus.uml.diagram.common.groups.tabbedproperties.appearance;

 

 import org.eclipse.jface.viewers.IFilter;

 

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.groups/src/org/eclipse/papyrus/diagram/common/groups/utils/GraphicalAndModelElementComparator.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.groups/src/org/eclipse/papyrus/uml/diagram/common/groups/utils/GraphicalAndModelElementComparator.java
index 4a332c26499..6e38988e038 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.groups/src/org/eclipse/papyrus/diagram/common/groups/utils/GraphicalAndModelElementComparator.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.groups/src/org/eclipse/papyrus/uml/diagram/common/groups/utils/GraphicalAndModelElementComparator.java
@@ -11,7 +11,7 @@
  *   Atos Origin - Initial API and implementation

  *

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

-package org.eclipse.papyrus.diagram.common.groups.utils;

+package org.eclipse.papyrus.uml.diagram.common.groups.utils;

 

 import java.util.Comparator;

 import java.util.Map;

@@ -19,7 +19,7 @@ import java.util.Map;
 import org.eclipse.emf.ecore.EObject;

 import org.eclipse.gef.EditPart;

 import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

-import org.eclipse.papyrus.diagram.common.groups.core.groupcontainment.GroupContainmentRegistry;

+import org.eclipse.papyrus.uml.diagram.common.groups.core.groupcontainment.GroupContainmentRegistry;

 

 /**

  * This comparator give a way to have compare two IgraphicalEditParts by their parental link.

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.groups/src/org/eclipse/papyrus/diagram/common/groups/utils/GroupRequestConstants.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.groups/src/org/eclipse/papyrus/uml/diagram/common/groups/utils/GroupRequestConstants.java
index 1695c7e8dba..f0940856050 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.groups/src/org/eclipse/papyrus/diagram/common/groups/utils/GroupRequestConstants.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.groups/src/org/eclipse/papyrus/uml/diagram/common/groups/utils/GroupRequestConstants.java
@@ -11,7 +11,7 @@
  *   Atos Origin - Initial API and implementation

  *

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

-package org.eclipse.papyrus.diagram.common.groups.utils;

+package org.eclipse.papyrus.uml.diagram.common.groups.utils;

 

 /**

  * This class contains constants used by requests concerned by groups