From 30268cf056582a13459db8b4bf72aeb7763dcbbf Mon Sep 17 00:00:00 2001
From: Stephane Dallongeville <stephane@outlook.com>
Date: Mon, 21 Sep 2020 10:49:41 +0200
Subject: [PATCH] fixed possible NPE
---
.../adufour/protocols/gui/block/WorkFlowContainer.java | 5 ++++-
.../plugins/adufour/protocols/gui/block/WorkFlowPanel.java | 6 ++++++
2 files changed, 10 insertions(+), 1 deletion(-)
diff --git a/src/main/java/plugins/adufour/protocols/gui/block/WorkFlowContainer.java b/src/main/java/plugins/adufour/protocols/gui/block/WorkFlowContainer.java
index 3a64436..26edb37 100644
--- a/src/main/java/plugins/adufour/protocols/gui/block/WorkFlowContainer.java
+++ b/src/main/java/plugins/adufour/protocols/gui/block/WorkFlowContainer.java
@@ -553,7 +553,7 @@ public class WorkFlowContainer extends JLayeredPane implements WorkFlowListener,
}
MainFrame.pasteSelection(embed, true);
-
+
workFlow.addBlock(embed.getBlockDescriptor());
}
@@ -584,6 +584,9 @@ public class WorkFlowContainer extends JLayeredPane implements WorkFlowListener,
public BlockPanel getBlockPanel(BlockDescriptor blockInfo)
{
+ if (blockInfo == null)
+ return null;
+
if (blockInfo.getBlock() == workFlow)
return getParentPanel();
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 1742785..1ee2001 100644
--- a/src/main/java/plugins/adufour/protocols/gui/block/WorkFlowPanel.java
+++ b/src/main/java/plugins/adufour/protocols/gui/block/WorkFlowPanel.java
@@ -311,6 +311,9 @@ public class WorkFlowPanel extends BlockPanel implements VarVisibilityListener
{
final BlockPanel ownerPanel = innerFlowPane.getBlockPanel(innerBlock);
+ if (ownerPanel == null)
+ return;
+
exposingLinks.put(variable, new RoundedSquareLine(WorkFlowPanel.this, ownerPanel, variable)
{
@Override
@@ -375,6 +378,9 @@ public class WorkFlowPanel extends BlockPanel implements VarVisibilityListener
{
final BlockPanel ownerPanel = innerFlowPane.getBlockPanel(innerBlock);
+ if (ownerPanel == null)
+ return;
+
exposingLinks.put(variable, new RoundedSquareLine(ownerPanel, WorkFlowPanel.this, variable)
{
@Override
--
GitLab