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

27 files changed, 1 insertions, 38 deletions

diff --git a/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/command/MessageAbstractReorientCommand.java b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/command/MessageAbstractReorientCommand.java
index ea00cabc888..3b4474135e2 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/command/MessageAbstractReorientCommand.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/command/MessageAbstractReorientCommand.java
@@ -27,7 +27,6 @@ import org.eclipse.uml2.uml.Interaction;
 import org.eclipse.uml2.uml.InteractionFragment;

 import org.eclipse.uml2.uml.Lifeline;

 import org.eclipse.uml2.uml.Message;

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

 import org.eclipse.uml2.uml.MessageOccurrenceSpecification;

 

 /**

diff --git a/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/command/MessageAsyncReorientCommand.java b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/command/MessageAsyncReorientCommand.java
index 0bf8ac69468..57e1200c50b 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/command/MessageAsyncReorientCommand.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/command/MessageAsyncReorientCommand.java
@@ -14,7 +14,6 @@
 package org.eclipse.papyrus.uml.service.types.command;

 

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

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

 

 /**

  * Basic re-orient command for Asynchronous {@link Message}.

diff --git a/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/command/MessageDeleteReorientCommand.java b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/command/MessageDeleteReorientCommand.java
index 5b9292f0815..dce9093252b 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/command/MessageDeleteReorientCommand.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/command/MessageDeleteReorientCommand.java
@@ -15,7 +15,6 @@ package org.eclipse.papyrus.uml.service.types.command;
 

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

 import org.eclipse.uml2.uml.Interaction;

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

 

 public class MessageDeleteReorientCommand extends MessageAbstractReorientCommand {

 

diff --git a/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/AssociationBaseEditHelper.java b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/AssociationBaseEditHelper.java
index e0cbf2503c7..6377027ed62 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/AssociationBaseEditHelper.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/AssociationBaseEditHelper.java
@@ -26,7 +26,6 @@ import org.eclipse.gmf.runtime.notation.Diagram;
 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.papyrus.uml.service.types.command.AssociationReorientCommand;

 import org.eclipse.papyrus.uml.service.types.utils.RequestParameterConstants;

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

 import org.eclipse.uml2.uml.Classifier;

 import org.eclipse.uml2.uml.UMLPackage;

 

diff --git a/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/BehavioredClassifierEditHelper.java b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/BehavioredClassifierEditHelper.java
index c4728627794..6eab47c3b66 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/BehavioredClassifierEditHelper.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/BehavioredClassifierEditHelper.java
@@ -14,7 +14,6 @@
  *****************************************************************************/

 package org.eclipse.papyrus.uml.service.types.helper;

 

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

 import org.eclipse.uml2.uml.UMLPackage;

 

 /**

diff --git a/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/CollaborationEditHelper.java b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/CollaborationEditHelper.java
index 26106983c55..c3dbf8eba04 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/CollaborationEditHelper.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/CollaborationEditHelper.java
@@ -14,7 +14,6 @@
  *****************************************************************************/

 package org.eclipse.papyrus.uml.service.types.helper;

 

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

 import org.eclipse.uml2.uml.UMLPackage;

 

 /**

diff --git a/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/ComponentRealizationEditHelper.java b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/ComponentRealizationEditHelper.java
index d78f5b02fbe..08fb98a96f8 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/ComponentRealizationEditHelper.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/ComponentRealizationEditHelper.java
@@ -21,7 +21,6 @@ import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipReques
 import org.eclipse.papyrus.uml.service.types.command.ComponentRealizationReorientCommand;

 import org.eclipse.uml2.uml.Classifier;

 import org.eclipse.uml2.uml.Component;

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

 import org.eclipse.uml2.uml.UMLPackage;

 

 /**

diff --git a/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/ExtendEditHelper.java b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/ExtendEditHelper.java
index b56e52b00ef..15c42b3a5b7 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/ExtendEditHelper.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/ExtendEditHelper.java
@@ -19,7 +19,6 @@ import org.eclipse.emf.ecore.EReference;
 import org.eclipse.gmf.runtime.common.core.command.ICommand;

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

 import org.eclipse.papyrus.uml.service.types.command.ExtendReorientCommand;

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

 import org.eclipse.uml2.uml.UMLPackage;

 import org.eclipse.uml2.uml.UseCase;

 

diff --git a/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/GeneralizationEditHelper.java b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/GeneralizationEditHelper.java
index d034f4d21af..61b948f8112 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/GeneralizationEditHelper.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/GeneralizationEditHelper.java
@@ -24,7 +24,6 @@ import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;
 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

 import org.eclipse.papyrus.uml.service.types.command.GeneralizationReorientCommand;

 import org.eclipse.uml2.uml.Classifier;

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

 import org.eclipse.uml2.uml.UMLPackage;

 

 /**

diff --git a/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/IncludeEditHelper.java b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/IncludeEditHelper.java
index 2e8d41590bc..3d1fdf8670b 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/IncludeEditHelper.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/IncludeEditHelper.java
@@ -19,7 +19,6 @@ import org.eclipse.emf.ecore.EReference;
 import org.eclipse.gmf.runtime.common.core.command.ICommand;

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

 import org.eclipse.papyrus.uml.service.types.command.IncludeReorientCommand;

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

 import org.eclipse.uml2.uml.UMLPackage;

 import org.eclipse.uml2.uml.UseCase;

 

diff --git a/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/InformationFlowEditHelper.java b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/InformationFlowEditHelper.java
index ba561fec386..2a52ca1c796 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/InformationFlowEditHelper.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/InformationFlowEditHelper.java
@@ -19,7 +19,6 @@ import org.eclipse.emf.ecore.EReference;
 import org.eclipse.gmf.runtime.common.core.command.ICommand;

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

 import org.eclipse.papyrus.uml.service.types.command.InformationFlowReorientCommand;

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

 import org.eclipse.uml2.uml.NamedElement;

 import org.eclipse.uml2.uml.UMLPackage;

 

diff --git a/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/InterfaceRealizationEditHelper.java b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/InterfaceRealizationEditHelper.java
index 40ea3b074ab..99301c68b74 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/InterfaceRealizationEditHelper.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/InterfaceRealizationEditHelper.java
@@ -21,7 +21,6 @@ import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipReques
 import org.eclipse.papyrus.uml.service.types.command.InterfaceRealizationReorientCommand;

 import org.eclipse.uml2.uml.BehavioredClassifier;

 import org.eclipse.uml2.uml.Interface;

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

 import org.eclipse.uml2.uml.UMLPackage;

 

 /**

diff --git a/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/ProtocolConformanceEditHelper.java b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/ProtocolConformanceEditHelper.java
index 353db2e8c34..8a30a4f898b 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/ProtocolConformanceEditHelper.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/ProtocolConformanceEditHelper.java
@@ -19,7 +19,6 @@ import org.eclipse.emf.ecore.EReference;
 import org.eclipse.gmf.runtime.common.core.command.ICommand;

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

 import org.eclipse.papyrus.uml.service.types.command.ProtocolConformanceReorientCommand;

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

 import org.eclipse.uml2.uml.ProtocolStateMachine;

 import org.eclipse.uml2.uml.UMLPackage;

 

diff --git a/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/ProtocolStateMachineEditHelper.java b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/ProtocolStateMachineEditHelper.java
index bb94f6bb309..a11851dcc28 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/ProtocolStateMachineEditHelper.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/ProtocolStateMachineEditHelper.java
@@ -20,7 +20,6 @@ import java.util.List;
 import org.eclipse.gmf.runtime.common.core.command.ICommand;

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

 import org.eclipse.uml2.uml.DirectedRelationship;

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

 import org.eclipse.uml2.uml.ProtocolStateMachine;

 import org.eclipse.uml2.uml.UMLPackage;

 

diff --git a/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/SubstitutionEditHelper.java b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/SubstitutionEditHelper.java
index 721b69acbe9..7c676667dbd 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/SubstitutionEditHelper.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/SubstitutionEditHelper.java
@@ -20,7 +20,6 @@ import org.eclipse.gmf.runtime.common.core.command.ICommand;
 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

 import org.eclipse.papyrus.uml.service.types.command.SubstitutionReorientCommand;

 import org.eclipse.uml2.uml.Classifier;

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

 import org.eclipse.uml2.uml.UMLPackage;

 

 /**

diff --git a/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/UseCaseEditHelper.java b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/UseCaseEditHelper.java
index 07477c4d889..65c7b07eb7b 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/UseCaseEditHelper.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/UseCaseEditHelper.java
@@ -20,8 +20,6 @@ import java.util.List;
 import org.eclipse.gmf.runtime.common.core.command.ICommand;

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

 import org.eclipse.uml2.uml.DirectedRelationship;

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

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

 import org.eclipse.uml2.uml.UMLPackage;

 import org.eclipse.uml2.uml.UseCase;

 

diff --git a/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/advice/ClassifierHelperAdvice.java b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/advice/ClassifierHelperAdvice.java
index be349850edd..f69425fd332 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/advice/ClassifierHelperAdvice.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/advice/ClassifierHelperAdvice.java
@@ -35,7 +35,6 @@ import org.eclipse.papyrus.uml.service.types.utils.RequestParameterConstants;
 import org.eclipse.uml2.uml.Association;

 import org.eclipse.uml2.uml.Classifier;

 import org.eclipse.uml2.uml.ConnectorEnd;

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

 import org.eclipse.uml2.uml.Port;

 import org.eclipse.uml2.uml.Property;

 import org.eclipse.uml2.uml.UMLPackage;

diff --git a/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/advice/ConnectorHelperAdvice.java b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/advice/ConnectorHelperAdvice.java
index 4d418f8fb49..bcddfc36730 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/advice/ConnectorHelperAdvice.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/advice/ConnectorHelperAdvice.java
@@ -17,7 +17,6 @@ import org.eclipse.gmf.runtime.common.core.command.ICommand;
 import org.eclipse.gmf.runtime.common.core.command.UnexecutableCommand;

 import org.eclipse.gmf.runtime.emf.type.core.edithelper.AbstractEditHelperAdvice;

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

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

 import org.eclipse.uml2.uml.ConnectorEnd;

 

 /**

diff --git a/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/advice/EncapsulatedClassifierHelperAdvice.java b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/advice/EncapsulatedClassifierHelperAdvice.java
index 09231198a49..98effb5655a 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/advice/EncapsulatedClassifierHelperAdvice.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/advice/EncapsulatedClassifierHelperAdvice.java
@@ -27,7 +27,6 @@ import org.eclipse.gmf.runtime.emf.type.core.requests.MoveRequest;
 import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

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

 import org.eclipse.uml2.uml.ConnectorEnd;

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

 import org.eclipse.uml2.uml.Port;

 import org.eclipse.uml2.uml.UMLPackage;

 

diff --git a/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/advice/ExecutionSpecificationHelperAdvice.java b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/advice/ExecutionSpecificationHelperAdvice.java
index f3accc28656..59fc27480f0 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/advice/ExecutionSpecificationHelperAdvice.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/advice/ExecutionSpecificationHelperAdvice.java
@@ -24,8 +24,8 @@ import org.eclipse.emf.ecore.EObject;
 import org.eclipse.gmf.runtime.common.core.command.ICommand;

 import org.eclipse.gmf.runtime.emf.type.core.edithelper.AbstractEditHelperAdvice;

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

-import org.eclipse.papyrus.uml.diagram.common.helper.InteractionFragmentHelper;

 import org.eclipse.papyrus.infra.core.utils.PapyrusEcoreUtils;

+import org.eclipse.papyrus.uml.diagram.common.helper.InteractionFragmentHelper;

 import org.eclipse.uml2.uml.ExecutionSpecification;

 import org.eclipse.uml2.uml.InteractionFragment;

 import org.eclipse.uml2.uml.Lifeline;

diff --git a/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/advice/FeatureNameInitializerHelperAdvice.java b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/advice/FeatureNameInitializerHelperAdvice.java
index 4d25e931545..29759668708 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/advice/FeatureNameInitializerHelperAdvice.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/advice/FeatureNameInitializerHelperAdvice.java
@@ -24,7 +24,6 @@ import org.eclipse.gmf.runtime.emf.type.core.edithelper.AbstractEditHelperAdvice
 import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

 import org.eclipse.papyrus.uml.service.types.utils.NamedElementHelper;

 import org.eclipse.uml2.uml.Feature;

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

 

 /**

  * <pre>

diff --git a/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/advice/NamedElementInitializerHelperAdvice.java b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/advice/NamedElementInitializerHelperAdvice.java
index d8c7856a136..60cdb0ef826 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/advice/NamedElementInitializerHelperAdvice.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/advice/NamedElementInitializerHelperAdvice.java
@@ -24,7 +24,6 @@ import org.eclipse.gmf.runtime.emf.type.core.edithelper.AbstractEditHelperAdvice
 import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

 import org.eclipse.papyrus.uml.service.types.utils.NamedElementHelper;

 import org.eclipse.uml2.uml.NamedElement;

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

 

 /**

  * <pre>

diff --git a/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/advice/OccurrenceSpecificationHelperAdvice.java b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/advice/OccurrenceSpecificationHelperAdvice.java
index b7b55cfe9ee..b858c98d3d9 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/advice/OccurrenceSpecificationHelperAdvice.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/advice/OccurrenceSpecificationHelperAdvice.java
@@ -13,20 +13,9 @@
  *****************************************************************************/

 package org.eclipse.papyrus.uml.service.types.helper.advice;

 

-import java.util.ArrayList;

-import java.util.List;

-

-import org.eclipse.emf.ecore.EObject;

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

 import org.eclipse.gmf.runtime.emf.type.core.edithelper.AbstractEditHelperAdvice;

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

-import org.eclipse.papyrus.uml.diagram.common.helper.DurationConstraintHelper;

-import org.eclipse.papyrus.uml.diagram.common.helper.DurationObservationHelper;

-import org.eclipse.papyrus.uml.diagram.common.helper.TimeConstraintHelper;

-import org.eclipse.papyrus.uml.diagram.common.helper.TimeObservationHelper;

-import org.eclipse.papyrus.infra.core.utils.PapyrusEcoreUtils;

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

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

 

 /**

  * Helper advice for all {@link OccurrenceSpecification} elements.

diff --git a/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/advice/RefineEditHelperAdvice.java b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/advice/RefineEditHelperAdvice.java
index 4cd9abf34fe..cf20caee13b 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/advice/RefineEditHelperAdvice.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/advice/RefineEditHelperAdvice.java
@@ -20,7 +20,6 @@ import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;
 import org.eclipse.papyrus.uml.service.types.utils.NamedElementHelper;

 import org.eclipse.uml2.uml.NamedElement;

 import org.eclipse.uml2.uml.profile.l2.L2Package;

-import org.eclipse.uml2.uml.profile.l2.Refine;

 import org.eclipse.uml2.uml.util.UMLUtil.StereotypeApplicationHelper;

 

 /** Standard Profile {@link Refine} edit helper advice */

diff --git a/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/advice/StructuredClassifierHelperAdvice.java b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/advice/StructuredClassifierHelperAdvice.java
index 39c8bfa2085..a02d1185555 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/advice/StructuredClassifierHelperAdvice.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/advice/StructuredClassifierHelperAdvice.java
@@ -18,7 +18,6 @@ import org.eclipse.gmf.runtime.common.core.command.UnexecutableCommand;
 import org.eclipse.gmf.runtime.emf.type.core.edithelper.AbstractEditHelperAdvice;

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

 import org.eclipse.uml2.uml.Connector;

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

 

 /**

  * <pre>

diff --git a/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/advice/TraceEditHelperAdvice.java b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/advice/TraceEditHelperAdvice.java
index bceccd7c0e5..eaf3de97522 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/advice/TraceEditHelperAdvice.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/advice/TraceEditHelperAdvice.java
@@ -20,7 +20,6 @@ import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;
 import org.eclipse.papyrus.uml.service.types.utils.NamedElementHelper;

 import org.eclipse.uml2.uml.NamedElement;

 import org.eclipse.uml2.uml.profile.l2.L2Package;

-import org.eclipse.uml2.uml.profile.l2.Trace;

 import org.eclipse.uml2.uml.util.UMLUtil.StereotypeApplicationHelper;

 

 /** Standard Profile {@link Trace} edit helper advice */

diff --git a/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/utils/NamedElementHelper.java b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/utils/NamedElementHelper.java
index 6d90f705090..a328e3d83e3 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/utils/NamedElementHelper.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/utils/NamedElementHelper.java
@@ -19,7 +19,6 @@ import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EObject;

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

 import org.eclipse.uml2.uml.Element;

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

 

 /**

  * This singleton is used to find a new element name with