380517: [Papyrus] We should use explicit plug-in dependencies whenever possible

https://bugs.eclipse.org/bugs/show_bug.cgi?id=380517

+ removed some unused dependencies and imports

19 files changed, 13 insertions, 40 deletions

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/META-INF/MANIFEST.MF b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/META-INF/MANIFEST.MF
index bc0ad9bfee2..dae9e2655a2 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/META-INF/MANIFEST.MF
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/META-INF/MANIFEST.MF
@@ -23,34 +23,22 @@ Require-Bundle: org.eclipse.core.expressions,
  org.eclipse.gmf.runtime.diagram.ui.render,

  org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide,

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

- org.eclipse.ocl.ecore;visibility:=reexport,

+ org.eclipse.ocl.ecore,

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

  org.eclipse.papyrus.uml.diagram.common;bundle-version="0.9.0",

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

  org.eclipse.papyrus.extensionpoints.editors;bundle-version="0.9.0",

- org.eclipse.ocl.uml;bundle-version="3.0.0",

  org.eclipse.gmf.runtime.diagram.ui.providers;bundle-version="1.3.0",

  org.eclipse.core.runtime,

  org.eclipse.core.resources,

- org.eclipse.jface,

- org.eclipse.ui.ide,

- org.eclipse.ui.views,

- org.eclipse.emf.ecore,

- org.eclipse.emf.ecore.xmi,

- org.eclipse.emf.edit.ui,

  org.eclipse.gmf.runtime.emf.core,

  org.eclipse.gmf.runtime.emf.commands.core,

  org.eclipse.gmf.runtime.emf.ui.properties,

  org.eclipse.gmf.runtime.diagram.ui,

  org.eclipse.gmf.runtime.diagram.ui.providers.ide,

  org.eclipse.gmf.runtime.diagram.ui.resources.editor,

- org.eclipse.uml2.uml;visibility:=reexport,

- org.eclipse.uml2.uml.edit;visibility:=reexport,

- org.eclipse.emf.ecore;visibility:=reexport,

- org.eclipse.emf.ecore.edit;visibility:=reexport,

- org.eclipse.emf.validation;visibility:=reexport,

- org.eclipse.gmf.runtime.draw2d.ui;visibility:=reexport,

- org.eclipse.gef,

+ org.eclipse.uml2.uml,

+ org.eclipse.gmf.runtime.draw2d.ui,

  org.eclipse.ui,

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

  org.eclipse.papyrus.uml.service.types,

@@ -59,10 +47,19 @@ Require-Bundle: org.eclipse.core.expressions,
  org.eclipse.papyrus.infra.emf;bundle-version="0.9.0",

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

  org.eclipse.papyrus.uml.appearance;bundle-version="0.9.0",

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

+ org.eclipse.ui.ide;bundle-version="3.8.0",

+ org.eclipse.papyrus.infra.core.log;bundle-version="0.9.0",

+ org.eclipse.papyrus.infra.core.sasheditor;bundle-version="0.9.0",

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

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

+ org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="0.9.0",

+ org.eclipse.papyrus.infra.gmfdiag.navigation;bundle-version="0.9.0",

+ org.eclipse.uml2.uml.edit;bundle-version="4.0.0",

  org.eclipse.gmf.tooling.runtime;bundle-version="3.0.0"

 Bundle-Vendor: %providerName

 Eclipse-LazyStart: true

-Bundle-Version: 0.10.0.qualifier

+Bundle-Version: 0.9.0.qualifier

 Bundle-ManifestVersion: 2

 Bundle-Activator: org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramEditorPlugin

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

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/command/CreateAssociationClassSupplement.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/command/CreateAssociationClassSupplement.java
index 8bca336f6bf..7ac75ccc687 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/command/CreateAssociationClassSupplement.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/command/CreateAssociationClassSupplement.java
@@ -19,12 +19,10 @@ import org.eclipse.core.commands.ExecutionException;
 import org.eclipse.core.runtime.NullProgressMonitor;

 import org.eclipse.emf.ecore.EObject;

 import org.eclipse.emf.transaction.TransactionalEditingDomain;

-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

 import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

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

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

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

-import org.eclipse.papyrus.infra.widgets.toolbox.LookForElement;

 import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.PropertyForComponentCreateCommand;

 import org.eclipse.papyrus.uml.diagram.clazz.providers.ElementInitializers;

 import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/command/CreateAssociationSupplement.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/command/CreateAssociationSupplement.java
index 59cb601b8e3..e6267b200cd 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/command/CreateAssociationSupplement.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/command/CreateAssociationSupplement.java
@@ -19,11 +19,9 @@ import org.eclipse.core.commands.ExecutionException;
 import org.eclipse.core.runtime.NullProgressMonitor;

 import org.eclipse.emf.ecore.EObject;

 import org.eclipse.emf.transaction.TransactionalEditingDomain;

-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

 import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

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

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

-import org.eclipse.papyrus.infra.widgets.toolbox.LookForElement;

 import org.eclipse.papyrus.uml.diagram.clazz.providers.ElementInitializers;

 import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

 import org.eclipse.papyrus.uml.diagram.common.commands.SupplementCommand;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/command/DestroyAssociationCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/command/DestroyAssociationCommand.java
index db1e2226214..555e95351be 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/command/DestroyAssociationCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/command/DestroyAssociationCommand.java
@@ -18,10 +18,8 @@ import org.eclipse.core.runtime.IAdaptable;
 import org.eclipse.core.runtime.IProgressMonitor;

 import org.eclipse.core.runtime.NullProgressMonitor;

 import org.eclipse.gmf.runtime.common.core.command.CommandResult;

-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

 import org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand;

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

-import org.eclipse.papyrus.infra.widgets.toolbox.LookForElement;

 import org.eclipse.uml2.uml.Association;

 

 /**

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/helper/AssociationClassHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/helper/AssociationClassHelper.java
index 8739d13b798..9c29519a94f 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/helper/AssociationClassHelper.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/helper/AssociationClassHelper.java
@@ -47,7 +47,6 @@ 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.Node;

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

-import org.eclipse.papyrus.infra.widgets.toolbox.LookForElement;

 import org.eclipse.papyrus.uml.diagram.clazz.custom.command.AssociationClassViewCreateCommand;

 import org.eclipse.papyrus.uml.diagram.clazz.custom.command.CustomDeferredCreateConnectionViewCommand;

 import org.eclipse.papyrus.uml.diagram.clazz.custom.command.PropertyCommandForAssociation;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/helper/ClazzDiagramAssociationHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/helper/ClazzDiagramAssociationHelper.java
index 48b2561452b..7ab80d2e29d 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/helper/ClazzDiagramAssociationHelper.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/helper/ClazzDiagramAssociationHelper.java
@@ -19,10 +19,8 @@ import org.eclipse.core.commands.ExecutionException;
 import org.eclipse.core.runtime.NullProgressMonitor;

 import org.eclipse.emf.ecore.EObject;

 import org.eclipse.emf.transaction.TransactionalEditingDomain;

-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

 import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

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

-import org.eclipse.papyrus.infra.widgets.toolbox.LookForElement;

 import org.eclipse.papyrus.uml.diagram.clazz.custom.command.PropertyCommandForAssociation;

 import org.eclipse.papyrus.uml.diagram.clazz.providers.ElementInitializers;

 import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/policies/AbstractNestedClassifierListenerEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/policies/AbstractNestedClassifierListenerEditPolicy.java
index 2cef1cd9ea5..f7909a2fdc4 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/policies/AbstractNestedClassifierListenerEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/policies/AbstractNestedClassifierListenerEditPolicy.java
@@ -20,7 +20,6 @@ import org.eclipse.core.runtime.IAdaptable;
 import org.eclipse.emf.common.notify.Notification;

 import org.eclipse.emf.ecore.EObject;

 import org.eclipse.emf.ecore.EStructuralFeature;

-import org.eclipse.gef.EditPolicy;

 import org.eclipse.gef.commands.Command;

 import org.eclipse.gmf.runtime.common.core.command.CompositeCommand;

 import org.eclipse.gmf.runtime.common.core.command.ICommand;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/policies/AppliedStereotypeAbstractionLabelDisplayEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/policies/AppliedStereotypeAbstractionLabelDisplayEditPolicy.java
index 6636bcc2d8d..a4d7b641ea0 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/policies/AppliedStereotypeAbstractionLabelDisplayEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/policies/AppliedStereotypeAbstractionLabelDisplayEditPolicy.java
@@ -14,7 +14,6 @@
 package org.eclipse.papyrus.uml.diagram.clazz.custom.policies;

 

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLinkLabelDisplayEditPolicy;

-import org.eclipse.uml2.uml.Abstraction;

 

 /**

  * Edit Policy for Applied Stereotype Label for {@link Abstraction}.

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/policies/AppliedStereotypeElementImportLabelDisplayEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/policies/AppliedStereotypeElementImportLabelDisplayEditPolicy.java
index 13e26cca7c8..adf8aae6d65 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/policies/AppliedStereotypeElementImportLabelDisplayEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/policies/AppliedStereotypeElementImportLabelDisplayEditPolicy.java
@@ -14,7 +14,6 @@
 package org.eclipse.papyrus.uml.diagram.clazz.custom.policies;

 

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLinkLabelDisplayEditPolicy;

-import org.eclipse.uml2.uml.ElementImport;

 

 /**

  * Edit Policy for Applied Stereotype Label for {@link ElementImport}.

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/policies/AppliedStereotypePackageImportLabelDisplayEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/policies/AppliedStereotypePackageImportLabelDisplayEditPolicy.java
index 460df4bd067..9bf57b4ceb9 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/policies/AppliedStereotypePackageImportLabelDisplayEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/policies/AppliedStereotypePackageImportLabelDisplayEditPolicy.java
@@ -14,7 +14,6 @@
 package org.eclipse.papyrus.uml.diagram.clazz.custom.policies;

 

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLinkLabelDisplayEditPolicy;

-import org.eclipse.uml2.uml.PackageImport;

 

 /**

  * Edit Policy for Applied Stereotype Label for {@link PackageImport}.

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/policies/AppliedStereotypePackageMergeLabelDisplayEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/policies/AppliedStereotypePackageMergeLabelDisplayEditPolicy.java
index 84cb30ffbe6..63f7a1cc457 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/policies/AppliedStereotypePackageMergeLabelDisplayEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/policies/AppliedStereotypePackageMergeLabelDisplayEditPolicy.java
@@ -14,7 +14,6 @@
 package org.eclipse.papyrus.uml.diagram.clazz.custom.policies;

 

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLinkLabelDisplayEditPolicy;

-import org.eclipse.uml2.uml.PackageMerge;

 

 /**

  * Edit Policy for Applied Stereotype Label for {@link PackageMerge}.

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/policies/AppliedStereotypeUsageLabelDisplayEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/policies/AppliedStereotypeUsageLabelDisplayEditPolicy.java
index 7694397fda4..96e8e3bf3d5 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/policies/AppliedStereotypeUsageLabelDisplayEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/policies/AppliedStereotypeUsageLabelDisplayEditPolicy.java
@@ -14,7 +14,6 @@
 package org.eclipse.papyrus.uml.diagram.clazz.custom.policies;

 

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLinkLabelDisplayEditPolicy;

-import org.eclipse.uml2.uml.Usage;

 

 /**

  * Edit Policy for Applied Stereotype LAbel for {@link Usage}.

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/policies/CustomContainmentCreationEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/policies/CustomContainmentCreationEditPolicy.java
index 9c9ff59a061..428f48f5f67 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/policies/CustomContainmentCreationEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/policies/CustomContainmentCreationEditPolicy.java
@@ -27,7 +27,6 @@ import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;
 import org.eclipse.gmf.runtime.diagram.ui.editparts.GroupEditPart;

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

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

-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CreationEditPolicy;

 import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramUIMessages;

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

 import org.eclipse.papyrus.uml.diagram.clazz.custom.helper.ContainmentDragDropHelper;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/policies/CustomPackageReparentCreationEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/policies/CustomPackageReparentCreationEditPolicy.java
index e7c54e2f500..bffc413d2d5 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/policies/CustomPackageReparentCreationEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/policies/CustomPackageReparentCreationEditPolicy.java
@@ -28,7 +28,6 @@ import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;
 import org.eclipse.gmf.runtime.diagram.ui.editparts.GroupEditPart;

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

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

-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CreationEditPolicy;

 import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramUIMessages;

 import org.eclipse.gmf.runtime.diagram.ui.requests.EditCommandRequestWrapper;

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

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/policies/NestedClazzCompartmentCreationEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/policies/NestedClazzCompartmentCreationEditPolicy.java
index d183aa1b429..1df5ba5a154 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/policies/NestedClazzCompartmentCreationEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/policies/NestedClazzCompartmentCreationEditPolicy.java
@@ -31,7 +31,6 @@ import org.eclipse.gmf.runtime.diagram.ui.commands.CreateCommand;
 import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

 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.CreationEditPolicy;

 import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramUIMessages;

 import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;

 import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest.ViewDescriptor;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/policies/ObservationLayoutEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/policies/ObservationLayoutEditPolicy.java
index 5a5fe432ab9..1ea7b5b0d8f 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/policies/ObservationLayoutEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/policies/ObservationLayoutEditPolicy.java
@@ -23,7 +23,6 @@ import org.eclipse.gef.requests.CreateRequest;
 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.DurationObservationNameEditPart;

 import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.DurationObservationStereotypeLabelEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.TimeObservationEditPart;

 import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.TimeObservationNameEditPart;

 import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.TimeObservationStereotypeLabelEditPart;

 import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/policies/itemsemantic/CustomAssociationItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/policies/itemsemantic/CustomAssociationItemSemanticEditPolicy.java
index a945b11a209..8e341a36013 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/policies/itemsemantic/CustomAssociationItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/policies/itemsemantic/CustomAssociationItemSemanticEditPolicy.java
@@ -17,17 +17,14 @@ import java.util.ArrayList;
 import java.util.List;

 

 import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.edit.command.DeleteCommand;

 import org.eclipse.gef.commands.Command;

 import org.eclipse.gef.commands.CompoundCommand;

 import org.eclipse.gef.commands.UnexecutableCommand;

 import org.eclipse.gmf.runtime.common.core.command.ICommand;

 import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

-import org.eclipse.gmf.runtime.emf.commands.core.command.CompositeTransactionalCommand;

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

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

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

-import org.eclipse.papyrus.commands.wrappers.EMFtoGMFCommandWrapper;

 import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

 import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

 import org.eclipse.papyrus.uml.diagram.clazz.custom.command.BranchDependenctReorientCommand;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/preferences/IPapyrusInstancePreferencesConstant.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/preferences/IPapyrusInstancePreferencesConstant.java
index 8d7291fcb8e..05abb42b430 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/preferences/IPapyrusInstancePreferencesConstant.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/preferences/IPapyrusInstancePreferencesConstant.java
@@ -13,7 +13,6 @@
  *****************************************************************************/

 package org.eclipse.papyrus.uml.diagram.clazz.custom.preferences;

 

-import org.eclipse.uml2.uml.InstanceSpecification;

 

 

 /**

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/preferences/InstanceSpecificationPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/preferences/InstanceSpecificationPreferencePage.java
index 6a1ef9176c5..0293ebc1329 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/preferences/InstanceSpecificationPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/preferences/InstanceSpecificationPreferencePage.java
@@ -29,7 +29,6 @@ import org.eclipse.swt.layout.FormLayout;
 import org.eclipse.swt.widgets.Button;

 import org.eclipse.swt.widgets.Composite;

 import org.eclipse.swt.widgets.Group;

-import org.eclipse.uml2.uml.InstanceSpecification;

 

 /**

  * Specific {@link Property} preference page