Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortfesenko2010-07-20 10:17:41 +0000
committertfesenko2010-07-20 10:17:41 +0000
commit8dbcd29ed8f1c7dbfc4d2b4199827f6186c1bf11 (patch)
tree3d7aae606065cb89568793e0a984e204a61fb88f
parent8a17964754080bdf8899b85b588f0c63d2b5981f (diff)
downloadorg.eclipse.papyrus-8dbcd29ed8f1c7dbfc4d2b4199827f6186c1bf11.tar.gz
org.eclipse.papyrus-8dbcd29ed8f1c7dbfc4d2b4199827f6186c1bf11.tar.xz
org.eclipse.papyrus-8dbcd29ed8f1c7dbfc4d2b4199827f6186c1bf11.zip
318000 - [Class Diagram] Refactor the creation / move / drag and drop behavior of the ContainmentLink - use improved notification dialog -drop
-rw-r--r--plugins/uml/org.eclipse.papyrus.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/ModelPackageableElementCompartment2EditPart.java3
-rw-r--r--plugins/uml/org.eclipse.papyrus.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/ModelPackageableElementCompartmentEditPart.java2
-rw-r--r--plugins/uml/org.eclipse.papyrus.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/PackagePackageableElementCompartment2EditPart.java3
-rw-r--r--plugins/uml/org.eclipse.papyrus.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/PackagePackageableElementCompartmentEditPart.java3
4 files changed, 11 insertions, 0 deletions
diff --git a/plugins/uml/org.eclipse.papyrus.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/ModelPackageableElementCompartment2EditPart.java b/plugins/uml/org.eclipse.papyrus.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/ModelPackageableElementCompartment2EditPart.java
index 30763755c58..70f6d0d5407 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/ModelPackageableElementCompartment2EditPart.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/ModelPackageableElementCompartment2EditPart.java
@@ -29,6 +29,7 @@ import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;
import org.eclipse.gmf.runtime.notation.NotationPackage;
import org.eclipse.gmf.runtime.notation.View;
import org.eclipse.papyrus.diagram.clazz.custom.policies.ClassDiagramDragDropEditPolicy;
+import org.eclipse.papyrus.diagram.clazz.custom.policies.CustomContainmentCreationEditPolicy;
import org.eclipse.papyrus.diagram.clazz.custom.policies.RemoveOrphanViewPolicy;
import org.eclipse.papyrus.diagram.clazz.edit.policies.ModelPackageableElementCompartment2ItemSemanticEditPolicy;
import org.eclipse.papyrus.diagram.clazz.part.Messages;
@@ -69,6 +70,8 @@ public class ModelPackageableElementCompartment2EditPart extends ShapeCompartmen
installEditPolicy("RemoveOrphanView", new RemoveOrphanViewPolicy()); //$NON-NLS-1$
installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new ClassDiagramDragDropEditPolicy());
installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomContainerEditPolicy());
+ installEditPolicy(EditPolicyRoles.CREATION_ROLE, new CustomContainmentCreationEditPolicy());
+
}
/**
diff --git a/plugins/uml/org.eclipse.papyrus.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/ModelPackageableElementCompartmentEditPart.java b/plugins/uml/org.eclipse.papyrus.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/ModelPackageableElementCompartmentEditPart.java
index ab648d2d2f9..168f43b50c3 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/ModelPackageableElementCompartmentEditPart.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/ModelPackageableElementCompartmentEditPart.java
@@ -29,6 +29,7 @@ import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;
import org.eclipse.gmf.runtime.notation.NotationPackage;
import org.eclipse.gmf.runtime.notation.View;
import org.eclipse.papyrus.diagram.clazz.custom.policies.ClassDiagramDragDropEditPolicy;
+import org.eclipse.papyrus.diagram.clazz.custom.policies.CustomContainmentCreationEditPolicy;
import org.eclipse.papyrus.diagram.clazz.custom.policies.RemoveOrphanViewPolicy;
import org.eclipse.papyrus.diagram.clazz.edit.policies.ModelPackageableElementCompartmentItemSemanticEditPolicy;
import org.eclipse.papyrus.diagram.clazz.part.Messages;
@@ -69,6 +70,7 @@ public class ModelPackageableElementCompartmentEditPart extends ShapeCompartment
installEditPolicy("RemoveOrphanView", new RemoveOrphanViewPolicy()); //$NON-NLS-1$
installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new ClassDiagramDragDropEditPolicy());
installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomContainerEditPolicy());
+ installEditPolicy(EditPolicyRoles.CREATION_ROLE, new CustomContainmentCreationEditPolicy());
}
/**
diff --git a/plugins/uml/org.eclipse.papyrus.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/PackagePackageableElementCompartment2EditPart.java b/plugins/uml/org.eclipse.papyrus.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/PackagePackageableElementCompartment2EditPart.java
index 3cf1a1cc50e..8cec542bfa7 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/PackagePackageableElementCompartment2EditPart.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/PackagePackageableElementCompartment2EditPart.java
@@ -70,6 +70,9 @@ public class PackagePackageableElementCompartment2EditPart extends ShapeCompartm
installEditPolicy("RemoveOrphanView", new RemoveOrphanViewPolicy()); //$NON-NLS-1$
installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new ClassDiagramDragDropEditPolicy());
installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomContainerEditPolicy());
+ installEditPolicy(EditPolicyRoles.CREATION_ROLE, new CreationEditPolicy());
+
+ installEditPolicy(EditPolicyRoles.CREATION_ROLE, new CustomContainmentCreationEditPolicy());
}
/**
diff --git a/plugins/uml/org.eclipse.papyrus.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/PackagePackageableElementCompartmentEditPart.java b/plugins/uml/org.eclipse.papyrus.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/PackagePackageableElementCompartmentEditPart.java
index 0990381be13..eab749f1644 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/PackagePackageableElementCompartmentEditPart.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/PackagePackageableElementCompartmentEditPart.java
@@ -29,6 +29,7 @@ import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;
import org.eclipse.gmf.runtime.notation.NotationPackage;
import org.eclipse.gmf.runtime.notation.View;
import org.eclipse.papyrus.diagram.clazz.custom.policies.ClassDiagramDragDropEditPolicy;
+import org.eclipse.papyrus.diagram.clazz.custom.policies.CustomContainmentCreationEditPolicy;
import org.eclipse.papyrus.diagram.clazz.custom.policies.RemoveOrphanViewPolicy;
import org.eclipse.papyrus.diagram.clazz.edit.policies.PackagePackageableElementCompartmentItemSemanticEditPolicy;
import org.eclipse.papyrus.diagram.clazz.part.Messages;
@@ -69,6 +70,8 @@ public class PackagePackageableElementCompartmentEditPart extends ShapeCompartme
installEditPolicy("RemoveOrphanView", new RemoveOrphanViewPolicy()); //$NON-NLS-1$
installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new ClassDiagramDragDropEditPolicy());
installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomContainerEditPolicy());
+
+ installEditPolicy(EditPolicyRoles.CREATION_ROLE, new CustomContainmentCreationEditPolicy());
}
/**

Back to the top