Issue #484 Fix use DiagramRenderer instance

prmr · Dec 5, 2022 · 55e4d94 · 55e4d94
1 parent 6781859
commit 55e4d94
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/src/org/jetuml/diagram/builder/DiagramBuilder.java b/src/org/jetuml/diagram/builder/DiagramBuilder.java
@@ -480,7 +480,7 @@ private Runnable createDetachOperation(Node pNode)
 		{
 			return ()-> 
 			{ 
-				Rectangle parentBound = packageNodeViewer().getBounds(parent);
+				Rectangle parentBound = packageNodeRenderer().getBounds(parent);
 				pNode.detach(); 
 				parent.removeChild(pNode); 
 				parent.translate( parentBound.getX()-parent.position().getX(),  parentBound.getY()-parent.position().getY() );
@@ -493,9 +493,9 @@ private Runnable createDetachOperation(Node pNode)
 		};
 	}
 
-	private PackageNodeRenderer packageNodeViewer()
+	private PackageNodeRenderer packageNodeRenderer()
 	{
-		return (PackageNodeRenderer)DiagramType.newRendererInstanceFor(aDiagramRenderer.diagram()).rendererFor(PackageNode.class);
+		return (PackageNodeRenderer)aDiagramRenderer.rendererFor(PackageNode.class);
 	}
 
 	private Point computePosition(Dimension pDimension, Point pRequestedPosition)

diff --git a/src/org/jetuml/diagram/builder/SequenceDiagramBuilder.java b/src/org/jetuml/diagram/builder/SequenceDiagramBuilder.java
@@ -248,7 +248,7 @@ private Optional<ImplicitParameterNode> insideTargetArea(Point pPoint)
 		{
 			if( node instanceof ImplicitParameterNode && aDiagramRenderer.contains(node, pPoint) )
 			{
-				if( !(pPoint.getY() < implicitParameterNodeViewer().getTopRectangle(node).getMaxY() + CALL_NODE_YGAP) )
+				if( !(pPoint.getY() < implicitParameterRenderer().getTopRectangle(node).getMaxY() + CALL_NODE_YGAP) )
 				{
 					return Optional.of( (ImplicitParameterNode)node );
 				}
@@ -257,9 +257,9 @@ private Optional<ImplicitParameterNode> insideTargetArea(Point pPoint)
 		return Optional.empty();
 	}
 
-	private ImplicitParameterNodeRenderer implicitParameterNodeViewer()
+	private ImplicitParameterNodeRenderer implicitParameterRenderer()
 	{
-		return (ImplicitParameterNodeRenderer)DiagramType.newRendererInstanceFor(aDiagramRenderer.diagram()).rendererFor(ImplicitParameterNode.class);
+		return (ImplicitParameterNodeRenderer)aDiagramRenderer.rendererFor(ImplicitParameterNode.class);
 	}
 
 	/**