From 5ea8e6710e4ee75c6ee633aaae54cbe05f3ce8a1 Mon Sep 17 00:00:00 2001
From: Fabien Tessier <fabien.tessier@telecom-paristech.fr>
Date: Tue, 3 Oct 2017 13:14:55 +0200
Subject: [PATCH] Fix exception when click on an empty panel
---
src/main/java/ui/MainGUI.java | 9 ++++++---
src/main/java/ui/TURTLEPanelPopupListener.java | 9 ++++++---
2 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/src/main/java/ui/MainGUI.java b/src/main/java/ui/MainGUI.java
index ee133dd5e7..7fc0d35ba4 100644
--- a/src/main/java/ui/MainGUI.java
+++ b/src/main/java/ui/MainGUI.java
@@ -8182,15 +8182,18 @@ public class MainGUI implements ActionListener, WindowListener, KeyListener, Pe
}
public void mousePressed(MouseEvent e) {
- activetdp.tdmm.setSelection(-1, -1);
+ if (activetdp != null)
+ activetdp.tdmm.setSelection(-1, -1);
checkForPopup(e);
}
public void mouseReleased(MouseEvent e) {
- activetdp.tdmm.setSelection(-1, -1);
+ if (activetdp != null)
+ activetdp.tdmm.setSelection(-1, -1);
checkForPopup(e);
}
public void mouseClicked(MouseEvent e) {
- activetdp.tdmm.setSelection(-1, -1);
+ if (activetdp != null)
+ activetdp.tdmm.setSelection(-1, -1);
checkForPopup(e);
}
diff --git a/src/main/java/ui/TURTLEPanelPopupListener.java b/src/main/java/ui/TURTLEPanelPopupListener.java
index b4f9cefc1e..3cd707e515 100755
--- a/src/main/java/ui/TURTLEPanelPopupListener.java
+++ b/src/main/java/ui/TURTLEPanelPopupListener.java
@@ -75,17 +75,20 @@ public class TURTLEPanelPopupListener extends MouseAdapter /* popup menus onto t
}
public void mousePressed(MouseEvent e) {
- mgui.getCurrentTDiagramPanel().getMouseManager().setSelection(-1, -1);
+ if (mgui.getCurrentTDiagramPanel() != null)
+ mgui.getCurrentTDiagramPanel().getMouseManager().setSelection(-1, -1);
checkForPopup(e);
}
public void mouseReleased(MouseEvent e) {
- mgui.getCurrentTDiagramPanel().getMouseManager().setSelection(-1, -1);
+ if (mgui.getCurrentTDiagramPanel() != null)
+ mgui.getCurrentTDiagramPanel().getMouseManager().setSelection(-1, -1);
checkForPopup(e);
}
public void mouseClicked(MouseEvent e) {
- mgui.getCurrentTDiagramPanel().getMouseManager().setSelection(-1, -1);
+ if (mgui.getCurrentTDiagramPanel() != null)
+ mgui.getCurrentTDiagramPanel().getMouseManager().setSelection(-1, -1);
checkForPopup(e);
}
--
GitLab