[#505] Fix bug

prmr · Jul 11, 2023 · 7eefb78 · 7eefb78
1 parent 2976a1b
commit 7eefb78
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/src/org/jetuml/diagram/builder/ClassDiagramBuilder.java b/src/org/jetuml/diagram/builder/ClassDiagramBuilder.java
@@ -31,6 +31,7 @@
 import org.jetuml.diagram.nodes.PackageNode;
 import org.jetuml.diagram.nodes.TypeNode;
 import org.jetuml.geom.Point;
+import org.jetuml.geom.Rectangle;
 
 /**
  * A builder for class diagrams.
@@ -305,6 +306,8 @@ public DiagramOperation createUnlinkFromPackageOperation(List<Node> pNodes)
 		Node parent = findSharedParent(pNodes).get();
 		// CSOFF:
 		Node outerParent = parent.hasParent() ? parent.getParent() : null; //CSON:
+		Rectangle parentBound = packageNodeRenderer().getBounds(parent);
+
 		if( outerParent == null )
 		{
 			// The parent of the nodes in pNodes does not have parent, 
@@ -316,6 +319,8 @@ public DiagramOperation createUnlinkFromPackageOperation(List<Node> pNodes)
 							aDiagramRenderer.diagram().addRootNode(pNode);
 							parent.removeChild(pNode);
 						}
+						parent.translate( parentBound.getX()-parent.position().getX(),  
+							parentBound.getY()-parent.position().getY() );
 					},
 					()->
 					{
@@ -337,6 +342,8 @@ public DiagramOperation createUnlinkFromPackageOperation(List<Node> pNodes)
 							parent.removeChild(pNode);
 							outerParent.addChild(pNode);
 						}
+						parent.translate( parentBound.getX()-parent.position().getX(),  
+									parentBound.getY()-parent.position().getY() );
 					},
 					()->
 					{

diff --git a/src/org/jetuml/diagram/builder/DiagramBuilder.java b/src/org/jetuml/diagram/builder/DiagramBuilder.java
@@ -481,7 +481,7 @@ private Runnable createDetachOperation(Node pNode)
 		};
 	}
 
-	private PackageNodeRenderer packageNodeRenderer()
+	protected PackageNodeRenderer packageNodeRenderer()
 	{
 		return (PackageNodeRenderer)aDiagramRenderer.rendererFor(PackageNode.class);
 	}
-Original file line number
+Diff line change
@@ Expand Up / @@ -481,7 +481,7 @@ private Runnable createDetachOperation(Node pNode) @@
     		};
     	}
-    	private PackageNodeRenderer packageNodeRenderer()
+    	protected PackageNodeRenderer packageNodeRenderer()
     	{
     		return (PackageNodeRenderer)aDiagramRenderer.rendererFor(PackageNode.class);
     	}
@@ Expand Down @@