From e6637b9af8c5c1ff7deece129b4001f4e6c1e490 Mon Sep 17 00:00:00 2001 From: comp500 Date: Sat, 10 Aug 2019 19:37:14 +0100 Subject: [PATCH] Wrong use of boolean, should be different --- .../java/link/infra/packwiz/installer/UpdateManager.java | 2 ++ .../link/infra/packwiz/installer/ui/IUserInterface.java | 1 + .../infra/packwiz/installer/ui/OptionsSelectWindow.java | 8 ++++---- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/main/java/link/infra/packwiz/installer/UpdateManager.java b/src/main/java/link/infra/packwiz/installer/UpdateManager.java index ee482fb..e6bf70e 100644 --- a/src/main/java/link/infra/packwiz/installer/UpdateManager.java +++ b/src/main/java/link/infra/packwiz/installer/UpdateManager.java @@ -172,6 +172,8 @@ public class UpdateManager { } if (cancelled) { + System.out.println("Update cancelled by user!"); + System.exit(1); return; } diff --git a/src/main/java/link/infra/packwiz/installer/ui/IUserInterface.java b/src/main/java/link/infra/packwiz/installer/ui/IUserInterface.java index 5b815cc..9793677 100644 --- a/src/main/java/link/infra/packwiz/installer/ui/IUserInterface.java +++ b/src/main/java/link/infra/packwiz/installer/ui/IUserInterface.java @@ -23,6 +23,7 @@ public interface IUserInterface { void executeManager(Runnable task); + // Return true if the installation was cancelled! Future showOptions(List option); } diff --git a/src/main/java/link/infra/packwiz/installer/ui/OptionsSelectWindow.java b/src/main/java/link/infra/packwiz/installer/ui/OptionsSelectWindow.java index 23eb679..dc5732d 100644 --- a/src/main/java/link/infra/packwiz/installer/ui/OptionsSelectWindow.java +++ b/src/main/java/link/infra/packwiz/installer/ui/OptionsSelectWindow.java @@ -102,14 +102,14 @@ public class OptionsSelectWindow extends JDialog implements ActionListener { addWindowListener(new WindowAdapter() { @Override public void windowClosing(WindowEvent e) { - future.complete(false); + future.complete(true); } @Override public void windowClosed(WindowEvent e) { // Just in case closing didn't get triggered - if something else called dispose() the // future will have already completed - future.complete(false); + future.complete(true); } }); } @@ -189,10 +189,10 @@ public class OptionsSelectWindow extends JDialog implements ActionListener { public void actionPerformed(ActionEvent e) { if (e.getActionCommand().equals("OK")) { tableModel.finalise(); - future.complete(true); + future.complete(false); dispose(); } else if (e.getActionCommand().equals("Cancel")) { - future.complete(false); + future.complete(true); dispose(); } }