From 24777c59b567371f85d1cc3f1824e7ce35fb3f46 Mon Sep 17 00:00:00 2001
From: Stephane Dallongeville <stephane@outlook.com>
Date: Mon, 14 Sep 2020 17:39:54 +0200
Subject: [PATCH] fixed possible NPE
---
.../adufour/protocols/gui/block/WorkFlowPanel.java | 14 +++++++++-----
.../plugins/adufour/protocols/gui/link/Line.java | 8 ++++----
2 files changed, 13 insertions(+), 9 deletions(-)
diff --git a/src/main/java/plugins/adufour/protocols/gui/block/WorkFlowPanel.java b/src/main/java/plugins/adufour/protocols/gui/block/WorkFlowPanel.java
index fed9063..1742785 100644
--- a/src/main/java/plugins/adufour/protocols/gui/block/WorkFlowPanel.java
+++ b/src/main/java/plugins/adufour/protocols/gui/block/WorkFlowPanel.java
@@ -331,12 +331,16 @@ public class WorkFlowPanel extends BlockPanel implements VarVisibilityListener
if (blockDesc.isCollapsed())
return;
- DragDropZone dz = varDropZones.get(variable);
- int y = dz.getLocationOnScreen().y;
- int offsetY = getLocationOnScreen().y;
+ DragDropZone dz = getP1Zone();
+
+ if (dz != null)
+ {
+ int y = dz.getLocationOnScreen().y;
+ int offsetY = getLocationOnScreen().y;
- x1 = dz.getWidth();
- y1 = y - offsetY + dz.getHeight() / 2;
+ x1 = dz.getWidth();
+ y1 = y - offsetY + dz.getHeight() / 2;
+ }
}
@Override
diff --git a/src/main/java/plugins/adufour/protocols/gui/link/Line.java b/src/main/java/plugins/adufour/protocols/gui/link/Line.java
index 5ac5ab3..a7e45eb 100644
--- a/src/main/java/plugins/adufour/protocols/gui/link/Line.java
+++ b/src/main/java/plugins/adufour/protocols/gui/link/Line.java
@@ -120,12 +120,12 @@ public abstract class Line extends Line2D.Float implements ComponentListener, Mo
if (p1z != null)
p1z.addMouseListener(this);
- else
- System.err.print("source drag zone null !");
+// else
+// System.err.print("source drag zone null !");
if (p2z != null)
p2z.addMouseListener(this);
- else
- System.err.print("destination drop zone null !");
+// else
+// System.err.print("destination drop zone null !");
}
/**
--
GitLab