|
@@ -20,7 +20,7 @@ public class Canvas extends JPanel {
|
|
|
private static final Logger log = Logger.getLogger(Canvas.class.getName());
|
|
|
private final GroupNode groupNode;
|
|
|
private final Control control;
|
|
|
- private final CanvasMouseListener listener = new CanvasMouseListener();
|
|
|
+ private final CanvasMouseListener canvasMouseListener = new CanvasMouseListener();
|
|
|
private boolean enabled = true;
|
|
|
|
|
|
|
|
@@ -30,8 +30,8 @@ public class Canvas extends JPanel {
|
|
|
control.OnGuiSetEnabled.addListener(this::setCanvasEnabled);
|
|
|
control.OnSelectionChanged.addListener(this::repaint);
|
|
|
|
|
|
- this.addMouseListener(listener);
|
|
|
- this.addMouseMotionListener(listener);
|
|
|
+ this.addMouseListener(canvasMouseListener);
|
|
|
+ this.addMouseMotionListener(canvasMouseListener);
|
|
|
}
|
|
|
|
|
|
public static Rectangle getBoundsOfObject(AbstractCanvasObject obj) {
|
|
@@ -69,9 +69,9 @@ public class Canvas extends JPanel {
|
|
|
groupNode.getSwitches().forEach(hS -> Rendering.drawSwitchObject(g2d, hS));
|
|
|
groupNode.getGroupNodes().forEach(groupNode -> Rendering.drawGroupNode(g2d, groupNode));
|
|
|
groupNode.getNodes().forEach(node -> Rendering.drawNode(g2d, node));
|
|
|
- switch (listener.state) {
|
|
|
- case BoxSelection -> Rendering.drawSelectionBox(g2d, listener.getRectangleOfSelectionBox());
|
|
|
- case EdgeCreation -> Rendering.drawNewEdgeLine(g2d, listener.selectedOnPressed.getPosition(), listener.lastPosition);
|
|
|
+ switch (canvasMouseListener.state) {
|
|
|
+ case BoxSelection -> Rendering.drawSelectionBox(g2d, canvasMouseListener.getRectangleOfSelectionBox());
|
|
|
+ case EdgeCreation -> Rendering.drawNewEdgeLine(g2d, canvasMouseListener.selectedOnPressed.getPosition(), canvasMouseListener.lastPosition);
|
|
|
}
|
|
|
|
|
|
|