From 55e4d94e97c75896a361ff87e542a2dec48ec2dd Mon Sep 17 00:00:00 2001 From: Laurie Prince Date: Mon, 5 Dec 2022 14:02:10 -0500 Subject: [PATCH] Issue #484 Fix use DiagramRenderer instance --- src/org/jetuml/diagram/builder/DiagramBuilder.java | 6 +++--- src/org/jetuml/diagram/builder/SequenceDiagramBuilder.java | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/org/jetuml/diagram/builder/DiagramBuilder.java b/src/org/jetuml/diagram/builder/DiagramBuilder.java index fbbfe9bb8..13ad392b1 100644 --- 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 index d8b692069..bbd908ff4 100644 --- a/src/org/jetuml/diagram/builder/SequenceDiagramBuilder.java +++ b/src/org/jetuml/diagram/builder/SequenceDiagramBuilder.java @@ -248,7 +248,7 @@ private Optional 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 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); } /**