X-Git-Url: https://gerrit.simantics.org/r/gitweb?p=simantics%2Fplatform.git;a=blobdiff_plain;f=bundles%2Forg.simantics.g2d%2Fsrc%2Forg%2Fsimantics%2Fg2d%2Fdiagram%2Fparticipant%2FTerminalPainter.java;h=d9c707993798974e4bb5ffce2fef813fce57f5df;hp=e4c7ac2011e0b0dcf2a70f29dd9dc800e8593a22;hb=452670c58399d8054872655841ebb6e66d9c6b6e;hpb=0ae2b770234dfc3cbb18bd38f324125cf0faca07 diff --git a/bundles/org.simantics.g2d/src/org/simantics/g2d/diagram/participant/TerminalPainter.java b/bundles/org.simantics.g2d/src/org/simantics/g2d/diagram/participant/TerminalPainter.java index e4c7ac201..d9c707993 100644 --- a/bundles/org.simantics.g2d/src/org/simantics/g2d/diagram/participant/TerminalPainter.java +++ b/bundles/org.simantics.g2d/src/org/simantics/g2d/diagram/participant/TerminalPainter.java @@ -43,6 +43,8 @@ import org.simantics.utils.datastructures.hints.IHintListener; import org.simantics.utils.datastructures.hints.IHintObservable; import org.simantics.utils.datastructures.hints.IHintContext.Key; import org.simantics.utils.datastructures.hints.IHintContext.KeyOf; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Paints terminals of elements. @@ -51,6 +53,7 @@ import org.simantics.utils.datastructures.hints.IHintContext.KeyOf; */ public class TerminalPainter extends AbstractDiagramParticipant { + private static final Logger LOGGER = LoggerFactory.getLogger(TerminalPainter.class); public static final int PAINT_PRIORITY = ElementPainter.ELEMENT_PAINT_PRIORITY + 10; public interface TerminalHoverStrategy { @@ -186,7 +189,7 @@ public class TerminalPainter extends AbstractDiagramParticipant { // Paint terminals normally if (paintAreaTerminals || paintPointTerminals) { - List pickedTerminals = TerminalUtil.pickTerminals(diagram, null, paintPointTerminals, paintAreaTerminals); + List pickedTerminals = TerminalUtil.pickTerminals(getContext(), diagram, null, paintPointTerminals, paintAreaTerminals); paintTerminals(node, Color.BLUE, diagram, null, pickedTerminals, null); if(pickedTerminals.size() > 0) repaint = true; } @@ -196,7 +199,7 @@ public class TerminalPainter extends AbstractDiagramParticipant { AffineTransform invTx = util.getInverseTransform(); if (invTx == null) { - System.err.println("NO CANVAS TRANSFORM INVERSE AVAILABLE, CANVAS TRANSFORM IS: " + util.getTransform()); + LOGGER.warn("NO CANVAS TRANSFORM INVERSE AVAILABLE, CANVAS TRANSFORM IS: " + util.getTransform()); return; } @@ -205,7 +208,7 @@ public class TerminalPainter extends AbstractDiagramParticipant { Rectangle2D controlPickRect = getPickRectangle(mi.controlPosition.getX(), mi.controlPosition.getY()); Shape canvasPickRect = GeometryUtils.transformShape(controlPickRect, invTx); - List tis = TerminalUtil.pickTerminals(diagram, canvasPickRect, paintHoverAreaTerminals, paintHoverPointTerminals); + List tis = TerminalUtil.pickTerminals(getContext(), diagram, canvasPickRect, paintHoverAreaTerminals, paintHoverPointTerminals); paintTerminals(node, Color.RED, diagram, canvasPickRect.getBounds2D(), tis, strategy); if(tis.size() > 0) repaint = true; }