REOPENED - bug 313985: [Composite Structure Diagram] port becomes invisible after moving

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

2 files changed, 1 insertions, 51 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 3ee1b3d5f97..78d8e0aa38f 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
@@ -29,8 +29,6 @@ public class «editPartClassName» «EXPAND extendsList» «EXPAND implementsLis
 	

 	«EXPAND impl::diagram::editparts::DiagramEditPart::_constructor-»

 	

-	«EXPAND impl::diagram::editparts::DiagramEditPart::_applyClippingStrategy-»

-	

 	«EXPAND createDefaultEditPolicies-»

 	

 	«EXPAND impl::diagram::editparts::DiagramEditPart::createFigure-»

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 a5f5205f01b..e88d01f61c4 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
@@ -24,55 +24,7 @@
 «DEFINE _constructor FOR gmfgen::GenDiagram-»
 	«EXPAND xpt::Common::generatedMemberComment»
 	public «editPartClassName»(org.eclipse.gmf.runtime.notation.View view) {
-		super(view);
-		
-		«REM» Add clipping strategy settings, see bug313985: https://bugs.eclipse.org/bugs/show_bug.cgi?id=313985«ENDREM»
-		getFigure ().setClippingStrategy (new org.eclipse.draw2d.IClippingStrategy () {
-
-			public org.eclipse.draw2d.geometry.Rectangle[] getClip(org.eclipse.draw2d.IFigure childFigure) {
-				// very inefficient, since it implies several tree traversals. Bit handles modifications of the tree structure
-				// It's a workaround instead of the better solution to fix BorderedNodeFigure (overload and let it return
-				// getExtendedBounds)
-				// See bug 313985 (https://bugs.eclipse.org/bugs/show_bug.cgi?id=313985) for more details
-				applyClippingStrategy (childFigure);
-				if (childFigure instanceof org.eclipse.gmf.runtime.diagram.ui.figures.BorderedNodeFigure) {
-					return new org.eclipse.draw2d.geometry.Rectangle [] { ((org.eclipse.gmf.runtime.diagram.ui.figures.BorderedNodeFigure) childFigure).getExtendedBounds () };
-				
-				} else {
-					return new org.eclipse.draw2d.geometry.Rectangle [] { childFigure.getBounds () };
-				}
-			}
-		});		
-	}
-«ENDDEFINE»
-
-«REM» Add clipping strategy settings, see bug313985: https://bugs.eclipse.org/bugs/show_bug.cgi?id=313985«ENDREM»
-«DEFINE _applyClippingStrategy FOR gmfgen::GenDiagram-»
-	«EXPAND xpt::Common::generatedMemberComment»
-	public void applyClippingStrategy (org.eclipse.draw2d.IFigure fig) {
-		boolean hasBorderedNodeChild = false;
-		for (Object child : fig.getChildren ()) {
-			if (child instanceof org.eclipse.draw2d.IFigure) {
-				applyClippingStrategy ((org.eclipse.draw2d.IFigure) child);
-				if (child instanceof org.eclipse.gmf.runtime.diagram.ui.figures.BorderedNodeFigure) {
-					hasBorderedNodeChild = true;
-				}
-			}
-		}
-		if (hasBorderedNodeChild && (fig.getClippingStrategy () == null)) { 
-			fig.setClippingStrategy (new org.eclipse.draw2d.IClippingStrategy () {
-
-				public org.eclipse.draw2d.geometry.Rectangle[] getClip(org.eclipse.draw2d.IFigure childFigure) {
-					if (childFigure instanceof org.eclipse.gmf.runtime.diagram.ui.figures.BorderedNodeFigure) {
-						return new org.eclipse.draw2d.geometry.Rectangle [] { ((org.eclipse.gmf.runtime.diagram.ui.figures.BorderedNodeFigure) childFigure).getExtendedBounds () };
-					}
-					else {
-						return new org.eclipse.draw2d.geometry.Rectangle [] { childFigure.getBounds () };
-					}
-				}
-			});
-		}
-
+		super(view);		
 	}
 «ENDDEFINE»