From b50d2bb26bc6ed559108806f1e7c8d9afb2e610f Mon Sep 17 00:00:00 2001
From: Philipp Spohr <spohr.philipp@web.de>
Date: Mon, 11 Dec 2017 11:17:28 +0100
Subject: [PATCH] CrashFix
---
.../de/hhu/ba/yoshikoWrapper/graphModel/YoshikoCluster.java | 4 +++-
.../hhu/ba/yoshikoWrapper/swing/components/ResultPanel.java | 4 ++--
.../java/de/hhu/ba/yoshikoWrapper/tasks/AlgorithmTask.java | 2 +-
3 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/src/main/java/de/hhu/ba/yoshikoWrapper/graphModel/YoshikoCluster.java b/src/main/java/de/hhu/ba/yoshikoWrapper/graphModel/YoshikoCluster.java
index 9f6289b..282c5c7 100644
--- a/src/main/java/de/hhu/ba/yoshikoWrapper/graphModel/YoshikoCluster.java
+++ b/src/main/java/de/hhu/ba/yoshikoWrapper/graphModel/YoshikoCluster.java
@@ -176,7 +176,9 @@ public class YoshikoCluster {
public void delete() {
if (subnet != null) {
- CyCore.networkManager.destroyNetwork(subnet);
+ if (CyCore.networkManager.networkExists(subnet.hashCode())) {
+ CyCore.networkManager.destroyNetwork(subnet);
+ }
}
}
diff --git a/src/main/java/de/hhu/ba/yoshikoWrapper/swing/components/ResultPanel.java b/src/main/java/de/hhu/ba/yoshikoWrapper/swing/components/ResultPanel.java
index a7a93cb..327b6b4 100644
--- a/src/main/java/de/hhu/ba/yoshikoWrapper/swing/components/ResultPanel.java
+++ b/src/main/java/de/hhu/ba/yoshikoWrapper/swing/components/ResultPanel.java
@@ -161,7 +161,7 @@ NetworkAboutToBeDestroyedListener
@Override
public void actionPerformed(ActionEvent e) {
- deleteSolution();
+ deleteResult();
}
});
@@ -214,7 +214,7 @@ NetworkAboutToBeDestroyedListener
CyCore.registrar.registerService(this, NetworkAboutToBeDestroyedListener.class, new Properties());
}
- public void deleteSolution() {
+ public void deleteResult() {
int dialogResult = JOptionPane.showConfirmDialog (
null,
diff --git a/src/main/java/de/hhu/ba/yoshikoWrapper/tasks/AlgorithmTask.java b/src/main/java/de/hhu/ba/yoshikoWrapper/tasks/AlgorithmTask.java
index 30f4bb5..b7d61f7 100644
--- a/src/main/java/de/hhu/ba/yoshikoWrapper/tasks/AlgorithmTask.java
+++ b/src/main/java/de/hhu/ba/yoshikoWrapper/tasks/AlgorithmTask.java
@@ -282,7 +282,7 @@ public class AlgorithmTask extends AbstractTask implements ObservableTask {
}
//Delete (incomplete) c_result panel
if (resultPanel != null) {
- resultPanel.deleteSolution();
+ resultPanel.deleteResult();
}
super.cancel();
}
--
GitLab