371460: [UML Diagram Common] The UML Diagram Common plug-in should be split

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

14 files changed, 36 insertions, 23 deletions

diff --git a/plugins/developer/org.eclipse.papyrus.def/dynamic-templates3.5/codegen/aspects/diagram/editparts/DiagramEditPart.xpt b/plugins/developer/org.eclipse.papyrus.def/dynamic-templates3.5/codegen/aspects/diagram/editparts/DiagramEditPart.xpt
index 78d8e0aa38f..bf00c48f07d 100644
--- a/plugins/developer/org.eclipse.papyrus.def/dynamic-templates3.5/codegen/aspects/diagram/editparts/DiagramEditPart.xpt
+++ b/plugins/developer/org.eclipse.papyrus.def/dynamic-templates3.5/codegen/aspects/diagram/editparts/DiagramEditPart.xpt
@@ -47,7 +47,11 @@ public class «editPartClassName» «EXPAND extendsList» «EXPAND implementsLis
 }

 «ENDAROUND»

 

-«DEFINE extendsList FOR gmfgen::GenDiagram»extends org.eclipse.gmf.runtime.diagram.ui.editparts.DiagramEditPart«ENDDEFINE»

+

+«REM»BEGIN: PapyrusGenCode«ENDREM»

+«REM»patches the super type of the link edit part in case the controlled object represents a UML element«ENDREM»

+«DEFINE extendsList FOR gmfgen::GenDiagram»extends «EXPAND impl::diagram::editparts::DiagramEditPart::extendsListContents»«ENDDEFINE»

+«REM»END: PapyrusGenCode«ENDREM»

 

 «DEFINE implementsList FOR gmfgen::GenDiagram»«ENDDEFINE»

 

diff --git a/plugins/developer/org.eclipse.papyrus.def/dynamic-templates3.5/codegen/aspects/impl/diagram/editparts/DiagramEditPart.xpt b/plugins/developer/org.eclipse.papyrus.def/dynamic-templates3.5/codegen/aspects/impl/diagram/editparts/DiagramEditPart.xpt
index f3b5ef8b7db..953ea295629 100644
--- a/plugins/developer/org.eclipse.papyrus.def/dynamic-templates3.5/codegen/aspects/impl/diagram/editparts/DiagramEditPart.xpt
+++ b/plugins/developer/org.eclipse.papyrus.def/dynamic-templates3.5/codegen/aspects/impl/diagram/editparts/DiagramEditPart.xpt
@@ -21,6 +21,15 @@
 «IMPORT 'http://www.eclipse.org/emf/2002/Ecore'»
 «EXTENSION xpt::diagram::editparts::Utils»
 
+
+«REM»BEGIN: PapyrusGenCode«ENDREM»
+«REM»computes super type of the link edit part in case the edit part manages a representation of a UML element«ENDREM»
+«DEFINE extendsListContents FOR gmfgen::GenDiagram-»
+org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusDiagramEditPart
+«ENDDEFINE»
+«REM»END: BEGIN: PapyrusGenCode«ENDREM»
+
+
 «DEFINE _constructor FOR gmfgen::GenDiagram-»
 	«EXPAND xpt::Common::generatedMemberComment»
 	public «editPartClassName»(org.eclipse.gmf.runtime.notation.View view) {
diff --git a/plugins/developer/org.eclipse.papyrus.def/dynamic-templates3.5/codegen/aspects/impl/diagram/editparts/LinkEditPart.xpt b/plugins/developer/org.eclipse.papyrus.def/dynamic-templates3.5/codegen/aspects/impl/diagram/editparts/LinkEditPart.xpt
index d38f38b864e..a0595abc8b2 100644
--- a/plugins/developer/org.eclipse.papyrus.def/dynamic-templates3.5/codegen/aspects/impl/diagram/editparts/LinkEditPart.xpt
+++ b/plugins/developer/org.eclipse.papyrus.def/dynamic-templates3.5/codegen/aspects/impl/diagram/editparts/LinkEditPart.xpt
@@ -21,7 +21,7 @@
 
 «IF papyrusgmfgenextension::ExtendedGenView.allInstances()->select(v:papyrusgmfgenextension::ExtendedGenView|v.genView->includes(self) and v.superOwnedEditPart<>null)->size()<>0»
 	«FOREACH papyrusgmfgenextension::ExtendedGenView.allInstances()->select(v:papyrusgmfgenextension::ExtendedGenView|v.genView->includes(self) and v.superOwnedEditPart<>null) AS extendedObject»«EXPAND specifyInheritance FOR extendedObject»«ENDFOREACH-»
-«ELSE»org.eclipse.gmf.runtime.diagram.ui.editparts.ConnectionNodeEditPart
+«ELSE»org.eclipse.papyrus.infra.gmfdiag.common.editpart.ConnectionEditPart
 «ENDIF»
 «ENDDEFINE»
 «REM»END: BEGIN: PapyrusGenCode«ENDREM»
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/AssociationClassDashedLinkEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/AssociationClassDashedLinkEditPart.java
index e3866a84db2..2488da643b2 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/AssociationClassDashedLinkEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/AssociationClassDashedLinkEditPart.java
@@ -15,18 +15,18 @@ package org.eclipse.papyrus.uml.diagram.clazz.edit.parts;
 import org.eclipse.draw2d.Connection;

 import org.eclipse.draw2d.Graphics;

 import org.eclipse.gef.EditPolicy;

-import org.eclipse.gmf.runtime.diagram.ui.editparts.ConnectionNodeEditPart;

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

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

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

 import org.eclipse.gmf.runtime.draw2d.ui.figures.PolylineConnectionEx;

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

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.ConnectionEditPart;

 import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.CustomGraphicalNodeEditPolicy;

 

 /**

  * @generated

  */

-public class AssociationClassDashedLinkEditPart extends ConnectionNodeEditPart implements ITreeBranchEditPart {

+public class AssociationClassDashedLinkEditPart extends ConnectionEditPart implements ITreeBranchEditPart {

 

 	/**

 	 * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/CommentAnnotatedElementEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/CommentAnnotatedElementEditPart.java
index 3021770ccf9..fc2377c3882 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/CommentAnnotatedElementEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/CommentAnnotatedElementEditPart.java
@@ -15,18 +15,18 @@ package org.eclipse.papyrus.uml.diagram.clazz.edit.parts;
 import org.eclipse.draw2d.Connection;

 import org.eclipse.draw2d.Graphics;

 import org.eclipse.gef.EditPolicy;

-import org.eclipse.gmf.runtime.diagram.ui.editparts.ConnectionNodeEditPart;

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

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

 import org.eclipse.gmf.runtime.draw2d.ui.figures.PolylineConnectionEx;

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

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.ConnectionEditPart;

 import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.CustomGraphicalNodeEditPolicy;

 import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.CommentAnnotatedElementItemSemanticEditPolicy;

 

 /**

  * @generated

  */

-public class CommentAnnotatedElementEditPart extends ConnectionNodeEditPart implements ITreeBranchEditPart {

+public class CommentAnnotatedElementEditPart extends ConnectionEditPart implements ITreeBranchEditPart {

 

 	/**

 	 * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ConnectorDurationObservationEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ConnectorDurationObservationEditPart.java
index 815072446c0..3eab4380a51 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ConnectorDurationObservationEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ConnectorDurationObservationEditPart.java
@@ -14,17 +14,17 @@ package org.eclipse.papyrus.uml.diagram.clazz.edit.parts;
 

 import org.eclipse.draw2d.Connection;

 import org.eclipse.draw2d.Graphics;

-import org.eclipse.gmf.runtime.diagram.ui.editparts.ConnectionNodeEditPart;

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

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

 import org.eclipse.gmf.runtime.draw2d.ui.figures.PolylineConnectionEx;

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

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.ConnectionEditPart;

 import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.ConnectorDurationObservationItemSemanticEditPolicy;

 

 /**

  * @generated

  */

-public class ConnectorDurationObservationEditPart extends ConnectionNodeEditPart implements ITreeBranchEditPart {

+public class ConnectorDurationObservationEditPart extends ConnectionEditPart implements ITreeBranchEditPart {

 

 	/**

 	 * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ConnectorTimeObservationEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ConnectorTimeObservationEditPart.java
index 28f1dd405eb..d871feb7ba1 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ConnectorTimeObservationEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ConnectorTimeObservationEditPart.java
@@ -14,17 +14,17 @@ package org.eclipse.papyrus.uml.diagram.clazz.edit.parts;
 

 import org.eclipse.draw2d.Connection;

 import org.eclipse.draw2d.Graphics;

-import org.eclipse.gmf.runtime.diagram.ui.editparts.ConnectionNodeEditPart;

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

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

 import org.eclipse.gmf.runtime.draw2d.ui.figures.PolylineConnectionEx;

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

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.ConnectionEditPart;

 import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.ConnectorTimeObservationItemSemanticEditPolicy;

 

 /**

  * @generated

  */

-public class ConnectorTimeObservationEditPart extends ConnectionNodeEditPart implements ITreeBranchEditPart {

+public class ConnectorTimeObservationEditPart extends ConnectionEditPart implements ITreeBranchEditPart {

 

 	/**

 	 * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ConstraintConstrainedElementEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ConstraintConstrainedElementEditPart.java
index b986694dfe2..5a463ebf8f7 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ConstraintConstrainedElementEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ConstraintConstrainedElementEditPart.java
@@ -15,18 +15,18 @@ package org.eclipse.papyrus.uml.diagram.clazz.edit.parts;
 import org.eclipse.draw2d.Connection;

 import org.eclipse.draw2d.Graphics;

 import org.eclipse.gef.EditPolicy;

-import org.eclipse.gmf.runtime.diagram.ui.editparts.ConnectionNodeEditPart;

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

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

 import org.eclipse.gmf.runtime.draw2d.ui.figures.PolylineConnectionEx;

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

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.ConnectionEditPart;

 import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.CustomGraphicalNodeEditPolicy;

 import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.ConstraintConstrainedElementItemSemanticEditPolicy;

 

 /**

  * @generated

  */

-public class ConstraintConstrainedElementEditPart extends ConnectionNodeEditPart implements ITreeBranchEditPart {

+public class ConstraintConstrainedElementEditPart extends ConnectionEditPart implements ITreeBranchEditPart {

 

 	/**

 	 * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ContainmentLinkEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ContainmentLinkEditPart.java
index bab4d498009..441710fc1e9 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ContainmentLinkEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ContainmentLinkEditPart.java
@@ -14,18 +14,18 @@ package org.eclipse.papyrus.uml.diagram.clazz.edit.parts;
 

 import org.eclipse.draw2d.Connection;

 import org.eclipse.gef.EditPolicy;

-import org.eclipse.gmf.runtime.diagram.ui.editparts.ConnectionNodeEditPart;

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

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

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

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

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.ConnectionEditPart;

 import org.eclipse.papyrus.uml.diagram.clazz.custom.figure.AddedLinkFigure;

 import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.CustomViewComponentEditPolicy;

 

 /**

  * @generated

  */

-public class ContainmentLinkEditPart extends ConnectionNodeEditPart implements ITreeBranchEditPart {

+public class ContainmentLinkEditPart extends ConnectionEditPart implements ITreeBranchEditPart {

 

 	/**

 	 * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ContainmentSubLinkEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ContainmentSubLinkEditPart.java
index 9acff5efbda..57fca8bc031 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ContainmentSubLinkEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ContainmentSubLinkEditPart.java
@@ -14,11 +14,11 @@ package org.eclipse.papyrus.uml.diagram.clazz.edit.parts;
 

 import org.eclipse.draw2d.Connection;

 import org.eclipse.gef.EditPolicy;

-import org.eclipse.gmf.runtime.diagram.ui.editparts.ConnectionNodeEditPart;

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

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

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

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

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.ConnectionEditPart;

 import org.eclipse.papyrus.uml.diagram.clazz.custom.figure.AddedLinkFigure;

 import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.CustomViewComponentEditPolicy;

 import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.itemsemantic.CustomContainmentSubLinkItemSemanticEditPolicy;

@@ -26,7 +26,7 @@ import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.itemsemantic.Custom
 /**

  * @generated

  */

-public class ContainmentSubLinkEditPart extends ConnectionNodeEditPart implements ITreeBranchEditPart {

+public class ContainmentSubLinkEditPart extends ConnectionEditPart implements ITreeBranchEditPart {

 

 	/**

 	 * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/DependencyBranchEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/DependencyBranchEditPart.java
index b07be4f7f55..39f6a8bf67c 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/DependencyBranchEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/DependencyBranchEditPart.java
@@ -14,10 +14,10 @@ package org.eclipse.papyrus.uml.diagram.clazz.edit.parts;
 

 import org.eclipse.draw2d.Connection;

 import org.eclipse.gef.EditPolicy;

-import org.eclipse.gmf.runtime.diagram.ui.editparts.ConnectionNodeEditPart;

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

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

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

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.ConnectionEditPart;

 import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.CustomGraphicalNodeEditPolicy;

 import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.DependencyBranchSemanticEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.figure.edge.DashedEdgeFigure;

@@ -25,7 +25,7 @@ import org.eclipse.papyrus.uml.diagram.common.figure.edge.DashedEdgeFigure;
 /**

  * @generated

  */

-public class DependencyBranchEditPart extends ConnectionNodeEditPart implements ITreeBranchEditPart {

+public class DependencyBranchEditPart extends ConnectionEditPart implements ITreeBranchEditPart {

 

 	/**

 	 * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/InstanceSpecificationLinkEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/InstanceSpecificationLinkEditPart.java
index 0c7c34c0858..fd03d45f9b2 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/InstanceSpecificationLinkEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/InstanceSpecificationLinkEditPart.java
@@ -15,10 +15,10 @@ package org.eclipse.papyrus.uml.diagram.clazz.edit.parts;
 import org.eclipse.draw2d.Connection;

 import org.eclipse.gef.EditPart;

 import org.eclipse.gef.EditPolicy;

-import org.eclipse.gmf.runtime.diagram.ui.editparts.ConnectionNodeEditPart;

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

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

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

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.ConnectionEditPart;

 import org.eclipse.papyrus.uml.diagram.clazz.custom.figure.InstanceSpecificationLinkFigure;

 import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.CustomGraphicalNodeEditPolicy;

 import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.InstanceSpecificationLinkItemSemanticEditPolicy;

@@ -26,7 +26,7 @@ import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.InstanceSpecification
 /**

  * @generated

  */

-public class InstanceSpecificationLinkEditPart extends ConnectionNodeEditPart implements ITreeBranchEditPart {

+public class InstanceSpecificationLinkEditPart extends ConnectionEditPart implements ITreeBranchEditPart {

 

 	/**

 	 * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ModelEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ModelEditPart.java
index c21f5161b5f..9c9202dbfe6 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ModelEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ModelEditPart.java
@@ -22,10 +22,10 @@ import org.eclipse.gef.Request;
 import org.eclipse.gef.commands.Command;

 import org.eclipse.gef.editpolicies.NonResizableEditPolicy;

 import org.eclipse.gef.handles.MoveHandle;

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

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

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

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

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusDiagramEditPart;

 import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.ClassDiagramDragDropEditPolicy;

 import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.RemoveOrphanViewPolicy;

 import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.ModelItemSemanticEditPolicy;

@@ -37,7 +37,7 @@ import org.eclipse.papyrus.uml.diagram.common.util.MDTUtil;
 /**

  * @generated

  */

-public class ModelEditPart extends DiagramEditPart {

+public class ModelEditPart extends PapyrusDiagramEditPart {

 

 	/**

 	 * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/part/UMLVisualIDRegistry.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/part/UMLVisualIDRegistry.java
index 035a1439f42..93c5dfa5413 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/part/UMLVisualIDRegistry.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/part/UMLVisualIDRegistry.java
@@ -1845,7 +1845,7 @@ public class UMLVisualIDRegistry {
 		root.addNode(3024, viewInfo);

 		root.addNode(2008, viewInfo);

 		root.addNode(2002, viewInfo);

-		viewInfo = new BaseViewInfo(3032, ViewInfo.Node, "org.eclipse.emf.ecore.impl.DynamicEObjectImpl@2f8b574 (eClass: org.eclipse.emf.ecore.impl.EClassImpl@1650d432 (name: OclInvalid_Class) (instanceClassName: null) (abstract: false, interface: false))");

+		viewInfo = new BaseViewInfo(3032, ViewInfo.Node, "org.eclipse.emf.ecore.impl.DynamicEObjectImpl@978d33f (eClass: org.eclipse.emf.ecore.impl.EClassImpl@5b74d1f4 (name: OclInvalid_Class) (instanceClassName: null) (abstract: false, interface: false))");

 		root.addNode(2008, viewInfo);

 		viewInfo = new BaseViewInfo(3033, ViewInfo.Node, "TemplateSignature");

 		root.addNode(2005, viewInfo);