Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormgolubev2012-05-01 21:19:37 -0400
committermgolubev2012-05-01 21:40:47 -0400
commitc3d2e27a69a6a18754ecaf4224aed5deb1af6257 (patch)
treeb687b0faf12f4a467cc70015a54870234849f5e7
parent686ae22a066b6171ab2d44855e006062a397954e (diff)
downloadorg.eclipse.gmf-tooling-3.0.M7-merging-all.tar.gz
org.eclipse.gmf-tooling-3.0.M7-merging-all.tar.xz
org.eclipse.gmf-tooling-3.0.M7-merging-all.zip
[237059] - sample diagram regenerated after: "custom reparent-aware3.0.M7-merging-all
editpolicy is generated for all containers", no need for custom EP anymore
-rw-r--r--examples/org.eclipse.gmf.examples.ocldriven.diagram/custom-src/org/eclipse/gmf/examples/ocldriven/diagram/custom/policies/TOECreationEditPolicyWithCustomReparent.java12
-rw-r--r--examples/org.eclipse.gmf.examples.ocldriven.diagram/src/org/eclipse/gmf/examples/ocldriven/toe/diagram/edit/parts/AllHolderEditPart.java5
-rw-r--r--examples/org.eclipse.gmf.examples.ocldriven.diagram/src/org/eclipse/gmf/examples/ocldriven/toe/diagram/edit/parts/DepartmentDepartment_staff2EditPart.java7
-rw-r--r--examples/org.eclipse.gmf.examples.ocldriven.diagram/src/org/eclipse/gmf/examples/ocldriven/toe/diagram/edit/parts/DepartmentDepartment_staffEditPart.java7
-rw-r--r--examples/org.eclipse.gmf.examples.ocldriven/model/toe.gmfgen12
5 files changed, 9 insertions, 34 deletions
diff --git a/examples/org.eclipse.gmf.examples.ocldriven.diagram/custom-src/org/eclipse/gmf/examples/ocldriven/diagram/custom/policies/TOECreationEditPolicyWithCustomReparent.java b/examples/org.eclipse.gmf.examples.ocldriven.diagram/custom-src/org/eclipse/gmf/examples/ocldriven/diagram/custom/policies/TOECreationEditPolicyWithCustomReparent.java
deleted file mode 100644
index 6190fae9c..000000000
--- a/examples/org.eclipse.gmf.examples.ocldriven.diagram/custom-src/org/eclipse/gmf/examples/ocldriven/diagram/custom/policies/TOECreationEditPolicyWithCustomReparent.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package org.eclipse.gmf.examples.ocldriven.diagram.custom.policies;
-
-import org.eclipse.gmf.examples.ocldriven.toe.diagram.part.TOEVisualIDRegistry;
-import org.eclipse.gmf.tooling.runtime.edit.policies.reparent.CreationEditPolicyWithCustomReparent;
-
-public class TOECreationEditPolicyWithCustomReparent extends CreationEditPolicyWithCustomReparent {
-
- public TOECreationEditPolicyWithCustomReparent() {
- super(TOEVisualIDRegistry.TYPED_INSTANCE);
- }
-
-}
diff --git a/examples/org.eclipse.gmf.examples.ocldriven.diagram/src/org/eclipse/gmf/examples/ocldriven/toe/diagram/edit/parts/AllHolderEditPart.java b/examples/org.eclipse.gmf.examples.ocldriven.diagram/src/org/eclipse/gmf/examples/ocldriven/toe/diagram/edit/parts/AllHolderEditPart.java
index 653a84e7e..daa6e129c 100644
--- a/examples/org.eclipse.gmf.examples.ocldriven.diagram/src/org/eclipse/gmf/examples/ocldriven/toe/diagram/edit/parts/AllHolderEditPart.java
+++ b/examples/org.eclipse.gmf.examples.ocldriven.diagram/src/org/eclipse/gmf/examples/ocldriven/toe/diagram/edit/parts/AllHolderEditPart.java
@@ -8,12 +8,13 @@ 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.examples.ocldriven.diagram.custom.policies.TOECreationEditPolicyWithCustomReparent;
import org.eclipse.gmf.examples.ocldriven.toe.diagram.edit.policies.AllHolderCanonicalEditPolicy;
import org.eclipse.gmf.examples.ocldriven.toe.diagram.edit.policies.AllHolderItemSemanticEditPolicy;
+import org.eclipse.gmf.examples.ocldriven.toe.diagram.part.TOEVisualIDRegistry;
import org.eclipse.gmf.runtime.diagram.ui.editparts.DiagramEditPart;
import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
import org.eclipse.gmf.runtime.notation.View;
+import org.eclipse.gmf.tooling.runtime.edit.policies.reparent.CreationEditPolicyWithCustomReparent;
/**
* @generated
@@ -44,7 +45,7 @@ public class AllHolderEditPart extends DiagramEditPart {
super.createDefaultEditPolicies();
installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new AllHolderItemSemanticEditPolicy());
installEditPolicy(EditPolicyRoles.CANONICAL_ROLE, new AllHolderCanonicalEditPolicy());
- installEditPolicy(EditPolicyRoles.CREATION_ROLE, new TOECreationEditPolicyWithCustomReparent());
+ installEditPolicy(EditPolicyRoles.CREATION_ROLE, new CreationEditPolicyWithCustomReparent(TOEVisualIDRegistry.TYPED_INSTANCE));
// removeEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.POPUPBAR_ROLE);
}
diff --git a/examples/org.eclipse.gmf.examples.ocldriven.diagram/src/org/eclipse/gmf/examples/ocldriven/toe/diagram/edit/parts/DepartmentDepartment_staff2EditPart.java b/examples/org.eclipse.gmf.examples.ocldriven.diagram/src/org/eclipse/gmf/examples/ocldriven/toe/diagram/edit/parts/DepartmentDepartment_staff2EditPart.java
index eab656328..b6502231e 100644
--- a/examples/org.eclipse.gmf.examples.ocldriven.diagram/src/org/eclipse/gmf/examples/ocldriven/toe/diagram/edit/parts/DepartmentDepartment_staff2EditPart.java
+++ b/examples/org.eclipse.gmf.examples.ocldriven.diagram/src/org/eclipse/gmf/examples/ocldriven/toe/diagram/edit/parts/DepartmentDepartment_staff2EditPart.java
@@ -1,17 +1,17 @@
package org.eclipse.gmf.examples.ocldriven.toe.diagram.edit.parts;
import org.eclipse.draw2d.IFigure;
-import org.eclipse.gmf.examples.ocldriven.diagram.custom.policies.TOECreationEditPolicyWithCustomReparent;
import org.eclipse.gmf.examples.ocldriven.toe.diagram.edit.policies.DepartmentDepartment_staff2CanonicalEditPolicy;
import org.eclipse.gmf.examples.ocldriven.toe.diagram.edit.policies.DepartmentDepartment_staff2ItemSemanticEditPolicy;
import org.eclipse.gmf.examples.ocldriven.toe.diagram.part.Messages;
+import org.eclipse.gmf.examples.ocldriven.toe.diagram.part.TOEVisualIDRegistry;
import org.eclipse.gmf.runtime.diagram.ui.editparts.ShapeCompartmentEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CreationEditPolicy;
import org.eclipse.gmf.runtime.diagram.ui.editpolicies.DragDropEditPolicy;
import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
import org.eclipse.gmf.runtime.diagram.ui.figures.ResizableCompartmentFigure;
import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;
import org.eclipse.gmf.runtime.notation.View;
+import org.eclipse.gmf.tooling.runtime.edit.policies.reparent.CreationEditPolicyWithCustomReparent;
/**
* @generated
@@ -52,10 +52,9 @@ public class DepartmentDepartment_staff2EditPart extends ShapeCompartmentEditPar
protected void createDefaultEditPolicies() {
super.createDefaultEditPolicies();
installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DepartmentDepartment_staff2ItemSemanticEditPolicy());
- installEditPolicy(EditPolicyRoles.CREATION_ROLE, new CreationEditPolicy());
+ installEditPolicy(EditPolicyRoles.CREATION_ROLE, new CreationEditPolicyWithCustomReparent(TOEVisualIDRegistry.TYPED_INSTANCE));
installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy());
installEditPolicy(EditPolicyRoles.CANONICAL_ROLE, new DepartmentDepartment_staff2CanonicalEditPolicy());
- installEditPolicy(EditPolicyRoles.CREATION_ROLE, new TOECreationEditPolicyWithCustomReparent());
}
/**
diff --git a/examples/org.eclipse.gmf.examples.ocldriven.diagram/src/org/eclipse/gmf/examples/ocldriven/toe/diagram/edit/parts/DepartmentDepartment_staffEditPart.java b/examples/org.eclipse.gmf.examples.ocldriven.diagram/src/org/eclipse/gmf/examples/ocldriven/toe/diagram/edit/parts/DepartmentDepartment_staffEditPart.java
index 5b441aeaf..98755e714 100644
--- a/examples/org.eclipse.gmf.examples.ocldriven.diagram/src/org/eclipse/gmf/examples/ocldriven/toe/diagram/edit/parts/DepartmentDepartment_staffEditPart.java
+++ b/examples/org.eclipse.gmf.examples.ocldriven.diagram/src/org/eclipse/gmf/examples/ocldriven/toe/diagram/edit/parts/DepartmentDepartment_staffEditPart.java
@@ -1,17 +1,17 @@
package org.eclipse.gmf.examples.ocldriven.toe.diagram.edit.parts;
import org.eclipse.draw2d.IFigure;
-import org.eclipse.gmf.examples.ocldriven.diagram.custom.policies.TOECreationEditPolicyWithCustomReparent;
import org.eclipse.gmf.examples.ocldriven.toe.diagram.edit.policies.DepartmentDepartment_staffCanonicalEditPolicy;
import org.eclipse.gmf.examples.ocldriven.toe.diagram.edit.policies.DepartmentDepartment_staffItemSemanticEditPolicy;
import org.eclipse.gmf.examples.ocldriven.toe.diagram.part.Messages;
+import org.eclipse.gmf.examples.ocldriven.toe.diagram.part.TOEVisualIDRegistry;
import org.eclipse.gmf.runtime.diagram.ui.editparts.ShapeCompartmentEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CreationEditPolicy;
import org.eclipse.gmf.runtime.diagram.ui.editpolicies.DragDropEditPolicy;
import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
import org.eclipse.gmf.runtime.diagram.ui.figures.ResizableCompartmentFigure;
import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;
import org.eclipse.gmf.runtime.notation.View;
+import org.eclipse.gmf.tooling.runtime.edit.policies.reparent.CreationEditPolicyWithCustomReparent;
/**
* @generated
@@ -52,10 +52,9 @@ public class DepartmentDepartment_staffEditPart extends ShapeCompartmentEditPart
protected void createDefaultEditPolicies() {
super.createDefaultEditPolicies();
installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DepartmentDepartment_staffItemSemanticEditPolicy());
- installEditPolicy(EditPolicyRoles.CREATION_ROLE, new CreationEditPolicy());
+ installEditPolicy(EditPolicyRoles.CREATION_ROLE, new CreationEditPolicyWithCustomReparent(TOEVisualIDRegistry.TYPED_INSTANCE));
installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy());
installEditPolicy(EditPolicyRoles.CANONICAL_ROLE, new DepartmentDepartment_staffCanonicalEditPolicy());
- installEditPolicy(EditPolicyRoles.CREATION_ROLE, new TOECreationEditPolicyWithCustomReparent());
}
/**
diff --git a/examples/org.eclipse.gmf.examples.ocldriven/model/toe.gmfgen b/examples/org.eclipse.gmf.examples.ocldriven/model/toe.gmfgen
index d13367643..f54f3107f 100644
--- a/examples/org.eclipse.gmf.examples.ocldriven/model/toe.gmfgen
+++ b/examples/org.eclipse.gmf.examples.ocldriven/model/toe.gmfgen
@@ -18,10 +18,6 @@
<viewmap
xsi:type="gmfgen:FigureViewmap"
figureQualifiedClassName="org.eclipse.draw2d.FreeformLayer"/>
- <behaviour
- xsi:type="gmfgen:CustomBehaviour"
- key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CREATION_ROLE"
- editPolicyQualifiedClassName="org.eclipse.gmf.examples.ocldriven.diagram.custom.policies.TOECreationEditPolicyWithCustomReparent"/>
<domainDiagramElement
href="toe.genmodel#//toe/AllHolder"/>
<childNodes
@@ -631,10 +627,6 @@
xsi:type="gmfgen:ParentAssignedViewmap"
getterName="getFigureDepartmentFigure_content_pane"
figureQualifiedClassName="org.eclipse.draw2d.RectangleFigure"/>
- <behaviour
- xsi:type="gmfgen:CustomBehaviour"
- key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CREATION_ROLE"
- editPolicyQualifiedClassName="org.eclipse.gmf.examples.ocldriven.diagram.custom.policies.TOECreationEditPolicyWithCustomReparent"/>
</compartments>
<compartments
visualID="7002"
@@ -654,10 +646,6 @@
xsi:type="gmfgen:ParentAssignedViewmap"
getterName="getFigureDepartmentFigure_content_pane"
figureQualifiedClassName="org.eclipse.draw2d.RectangleFigure"/>
- <behaviour
- xsi:type="gmfgen:CustomBehaviour"
- key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CREATION_ROLE"
- editPolicyQualifiedClassName="org.eclipse.gmf.examples.ocldriven.diagram.custom.policies.TOECreationEditPolicyWithCustomReparent"/>
</compartments>
<palette>
<groups

Back to the top