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 9f6289b6006f60c6211a95a602aaaebc9da26e4c..282c5c7674389421a4f67a973009df9965428698 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 a7a93cbda255e5c032af9198cc6221e1b1d4b8d2..327b6b428c35154de18c53029801d0711892f4c1 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 30f4bb589fc06c9cc4623335021101c78b9b03ad..b7d61f7903e4c654d55480253ff3a77e54fe8700 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(); }