From 10d90d3d648caceb268d1bcf6cec335712ffe5ba Mon Sep 17 00:00:00 2001
From: Manfred Karrer <mk@nucleo.io>
Date: Mon, 1 Dec 2014 20:37:57 +0100
Subject: [PATCH] Handle Close button in popup title #300

---
 .../io/bitsquare/gui/components/Popups.java   | 53 +++++++++----------
 .../java/io/bitsquare/gui/main/MainView.java  |  2 +-
 .../account/content/fiat/FiatAccountView.java |  4 +-
 .../registration/RegistrationView.java        |  1 -
 .../main/funds/withdrawal/WithdrawalView.java |  8 ++-
 .../trade/createoffer/CreateOfferView.java    |  3 +-
 .../main/trade/offerbook/OfferBookView.java   |  5 +-
 .../main/trade/takeoffer/TakeOfferView.java   |  3 +-
 8 files changed, 36 insertions(+), 43 deletions(-)

diff --git a/src/main/java/io/bitsquare/gui/components/Popups.java b/src/main/java/io/bitsquare/gui/components/Popups.java
index 0ad9b5806f..bdd73d3c55 100644
--- a/src/main/java/io/bitsquare/gui/components/Popups.java
+++ b/src/main/java/io/bitsquare/gui/components/Popups.java
@@ -51,6 +51,10 @@ public class Popups {
 
     private static OverlayManager overlayManager;
 
+    public static void removeBlurContent() {
+        overlayManager.removeBlurContent();
+    }
+
     // Information
     public static void openInfoPopup(String message) {
         openInfoPopup(null, message);
@@ -64,7 +68,6 @@ public class Popups {
             public void handle(ActionEvent actionEvent) {
                 getProperties().put("type", "CLOSE");
                 Dialog.Actions.CLOSE.handle(actionEvent);
-                overlayManager.removeBlurContent();
             }
         });
         openInfoPopup(masthead, message, actions);
@@ -77,6 +80,7 @@ public class Popups {
                 .masthead(masthead)
                 .actions(actions)
                 .showInformation();
+        removeBlurContent();
     }
 
     // Confirm
@@ -92,16 +96,13 @@ public class Popups {
             public void handle(ActionEvent actionEvent) {
                 getProperties().put("type", "OK");
                 Dialog.Actions.OK.handle(actionEvent);
-                overlayManager.removeBlurContent();
             }
-
         });
         actions.add(new AbstractAction(BSResources.get("shared.cancel")) {
             @Override
             public void handle(ActionEvent actionEvent) {
                 getProperties().put("type", "CANCEL");
                 Dialog.Actions.CANCEL.handle(actionEvent);
-                overlayManager.removeBlurContent();
             }
         });
         return openConfirmPopup(title, masthead, message, actions);
@@ -134,7 +135,6 @@ public class Popups {
             public void handle(ActionEvent actionEvent) {
                 getProperties().put("type", "CLOSE");
                 Dialog.Actions.CLOSE.handle(actionEvent);
-                overlayManager.removeBlurContent();
             }
         });
         openWarningPopup(title, masthead, message, actions);
@@ -148,18 +148,19 @@ public class Popups {
                 .masthead(masthead)
                 .actions(actions)
                 .showWarning();
+        removeBlurContent();
     }
 
     // Error
-    public static Action openErrorPopup(String message) {
-        return openErrorPopup("Error", message);
+    public static void openErrorPopup(String message) {
+        openErrorPopup("Error", message);
     }
 
-    public static Action openErrorPopup(String title, String message) {
-        return openErrorPopup(title, null, message);
+    public static void openErrorPopup(String title, String message) {
+        openErrorPopup(title, null, message);
     }
 
-    public static Action openErrorPopup(String title, String masthead, String message) {
+    public static void openErrorPopup(String title, String masthead, String message) {
         overlayManager.blurContent();
         List<Action> actions = new ArrayList<>();
         actions.add(new AbstractAction(BSResources.get("shared.close")) {
@@ -167,32 +168,32 @@ public class Popups {
             public void handle(ActionEvent actionEvent) {
                 getProperties().put("type", "CLOSE");
                 Dialog.Actions.CLOSE.handle(actionEvent);
-                overlayManager.removeBlurContent();
             }
         });
-        return openErrorPopup(title, masthead, message, actions);
+        openErrorPopup(title, masthead, message, actions);
     }
 
-    private static Action openErrorPopup(String title, String masthead, String message, List<Action> actions) {
-        return Dialogs.create()
+    private static void openErrorPopup(String title, String masthead, String message, List<Action> actions) {
+        Dialogs.create()
                 .owner(primaryStage)
                 .title(title)
                 .message(message)
                 .masthead(masthead)
                 .actions(actions)
                 .showError();
+        removeBlurContent();
     }
 
     // Exception
-    public static Action openExceptionPopup(Throwable throwable) {
-        return openExceptionPopup(throwable, "Exception", "That should not have happened...");
+    public static void openExceptionPopup(Throwable throwable) {
+        openExceptionPopup(throwable, "Exception", "That should not have happened...");
     }
 
-    public static Action openExceptionPopup(Throwable throwable, String title, String message) {
-        return openExceptionPopup(throwable, title, null, message);
+    public static void openExceptionPopup(Throwable throwable, String title, String message) {
+        openExceptionPopup(throwable, title, null, message);
     }
 
-    private static Action openExceptionPopup(Throwable throwable, String title, String masthead, String message) {
+    private static void openExceptionPopup(Throwable throwable, String title, String masthead, String message) {
         overlayManager.blurContent();
         List<Action> actions = new ArrayList<>();
         actions.add(new AbstractAction(BSResources.get("shared.close")) {
@@ -200,16 +201,16 @@ public class Popups {
             public void handle(ActionEvent actionEvent) {
                 getProperties().put("type", "CLOSE");
                 Dialog.Actions.CLOSE.handle(actionEvent);
-                overlayManager.removeBlurContent();
             }
         });
-        return Dialogs.create()
+        Dialogs.create()
                 .owner(primaryStage)
                 .title(title)
                 .message(message)
                 .masthead(masthead)
                 .actions(actions)
                 .showException(throwable);
+        removeBlurContent();
     }
 
     // Support handling of uncaught exception from any thread (also non gui thread)
@@ -221,18 +222,16 @@ public class Popups {
 
         Runnable runnable = () -> {
             if (Throwables.getRootCause(throwable) instanceof BlockStoreException) {
-                Action response = Popups.openErrorPopup("Error", "Application already running",
+                Popups.openErrorPopup("Error", "Application already running",
                         "This application is already running and cannot be started twice.\n\n " +
                                 "Check your system tray to reopen the window of the running application.");
-                if (Popups.isOK(response))
-                    Platform.exit();
+                Platform.exit();
             }
             else {
-                Action response = Popups.openExceptionPopup(throwable, "Exception", "A critical error has occurred.",
+                Popups.openExceptionPopup(throwable, "Exception", "A critical error has occurred.",
                         "Please copy the exception details and open a bug report at:\n " +
                                 "https://github.com/bitsquare/bitsquare/issues.");
-                if (Popups.isOK(response))
-                    Platform.exit();
+                Platform.exit();
             }
         };
 
diff --git a/src/main/java/io/bitsquare/gui/main/MainView.java b/src/main/java/io/bitsquare/gui/main/MainView.java
index a8dea619c2..2a590f05e8 100644
--- a/src/main/java/io/bitsquare/gui/main/MainView.java
+++ b/src/main/java/io/bitsquare/gui/main/MainView.java
@@ -316,7 +316,7 @@ public class MainView extends InitializableView<StackPane, MainViewModel> {
 
         // For alpha
         vBox.setDisable(true);
-        
+
         return vBox;
     }
 
diff --git a/src/main/java/io/bitsquare/gui/main/account/content/fiat/FiatAccountView.java b/src/main/java/io/bitsquare/gui/main/account/content/fiat/FiatAccountView.java
index 6166179d71..a9e32943e9 100644
--- a/src/main/java/io/bitsquare/gui/main/account/content/fiat/FiatAccountView.java
+++ b/src/main/java/io/bitsquare/gui/main/account/content/fiat/FiatAccountView.java
@@ -212,7 +212,6 @@ public class FiatAccountView extends ActivatableViewAndModel<GridPane, FiatAccou
                     public void handle(ActionEvent actionEvent) {
                         getProperties().put("type", "NO");
                         Dialog.Actions.NO.handle(actionEvent);
-                        overlayManager.removeBlurContent();
                     }
                 });
 
@@ -221,7 +220,6 @@ public class FiatAccountView extends ActivatableViewAndModel<GridPane, FiatAccou
                     public void handle(ActionEvent actionEvent) {
                         getProperties().put("type", "YES");
                         Dialog.Actions.YES.handle(actionEvent);
-                        overlayManager.removeBlurContent();
                     }
                 });
 
@@ -232,6 +230,8 @@ public class FiatAccountView extends ActivatableViewAndModel<GridPane, FiatAccou
 
                 if (Popups.isYes(response))
                     model.addCountryToAcceptedCountriesList();
+
+                overlayManager.removeBlurContent();
             }
         });
 
diff --git a/src/main/java/io/bitsquare/gui/main/account/content/registration/RegistrationView.java b/src/main/java/io/bitsquare/gui/main/account/content/registration/RegistrationView.java
index 35c2b86980..9831285c93 100644
--- a/src/main/java/io/bitsquare/gui/main/account/content/registration/RegistrationView.java
+++ b/src/main/java/io/bitsquare/gui/main/account/content/registration/RegistrationView.java
@@ -112,7 +112,6 @@ public class RegistrationView extends InitializableView<GridPane, RegistrationVi
                         if (wizard != null)
                             wizard.nextStep(RegistrationView.this);
                         Dialog.Actions.CLOSE.handle(actionEvent);
-                        overlayManager.removeBlurContent();
                     }
                 });
 
diff --git a/src/main/java/io/bitsquare/gui/main/funds/withdrawal/WithdrawalView.java b/src/main/java/io/bitsquare/gui/main/funds/withdrawal/WithdrawalView.java
index d215db3de2..a5a0646790 100644
--- a/src/main/java/io/bitsquare/gui/main/funds/withdrawal/WithdrawalView.java
+++ b/src/main/java/io/bitsquare/gui/main/funds/withdrawal/WithdrawalView.java
@@ -151,12 +151,12 @@ public class WithdrawalView extends ActivatableViewAndModel {
                             "You receive in total: " +
                             formatter.formatCoinWithCode(amount.subtract(FeePolicy.TX_FEE)) + " BTC\n\n" +
                             "Are you sure you withdraw that amount?");
+
+            Popups.removeBlurContent();
             if (Popups.isOK(response)) {
                 try {
-                    walletService.sendFunds(
-                            withdrawFromTextField.getText(), withdrawToTextField.getText(),
+                    walletService.sendFunds(withdrawFromTextField.getText(), withdrawToTextField.getText(),
                             amount, callback);
-
                     fillList();
                 } catch (AddressFormatException e) {
                     Popups.openErrorPopup("Address invalid",
@@ -168,13 +168,11 @@ public class WithdrawalView extends ActivatableViewAndModel {
                     Popups.openErrorPopup("Wrong inputs", "Please check the inputs.");
                 }
             }
-
         }
         else {
             Popups.openErrorPopup("Insufficient amount",
                     "The amount to transfer is lower the the transaction fee and the min. possible tx value.");
         }
-
     }
 
     private void fillList() {
diff --git a/src/main/java/io/bitsquare/gui/main/trade/createoffer/CreateOfferView.java b/src/main/java/io/bitsquare/gui/main/trade/createoffer/CreateOfferView.java
index f162f1a039..f31970a6b6 100644
--- a/src/main/java/io/bitsquare/gui/main/trade/createoffer/CreateOfferView.java
+++ b/src/main/java/io/bitsquare/gui/main/trade/createoffer/CreateOfferView.java
@@ -156,7 +156,6 @@ public class CreateOfferView extends ActivatableViewAndModel<AnchorPane, CreateO
                 public void handle(ActionEvent actionEvent) {
                     getProperties().put("type", "CLOSE");
                     Dialog.Actions.CLOSE.handle(actionEvent);
-                    overlayManager.removeBlurContent();
                 }
             });
             Popups.openInfoPopup("To ensure that both traders behave fair they need to pay a security deposit.",
@@ -296,6 +295,7 @@ public class CreateOfferView extends ActivatableViewAndModel<AnchorPane, CreateO
                 Popups.openErrorPopup(BSResources.get("shared.error"),
                         BSResources.get("createOffer.amountPriceBox.error.message",
                                 model.requestPlaceOfferErrorMessage.get()));
+                Popups.removeBlurContent();
             }
         });
 
@@ -323,7 +323,6 @@ public class CreateOfferView extends ActivatableViewAndModel<AnchorPane, CreateO
                             e.printStackTrace();
                         }
                         Dialog.Actions.CLOSE.handle(actionEvent);
-                        overlayManager.removeBlurContent();
                     }
                 });
 
diff --git a/src/main/java/io/bitsquare/gui/main/trade/offerbook/OfferBookView.java b/src/main/java/io/bitsquare/gui/main/trade/offerbook/OfferBookView.java
index b3e17944da..9aa4c6ee61 100644
--- a/src/main/java/io/bitsquare/gui/main/trade/offerbook/OfferBookView.java
+++ b/src/main/java/io/bitsquare/gui/main/trade/offerbook/OfferBookView.java
@@ -206,7 +206,6 @@ public class OfferBookView extends ActivatableViewAndModel<GridPane, OfferBookVi
             public void handle(ActionEvent actionEvent) {
                 getProperties().put("type", "OK");
                 Dialog.Actions.OK.handle(actionEvent);
-                overlayManager.removeBlurContent();
                 navigation.setReturnPath(navigation.getCurrentPath());
                 navigation.navigateTo(MainView.class, AccountView.class, AccountSetupWizard.class);
             }
@@ -240,7 +239,6 @@ public class OfferBookView extends ActivatableViewAndModel<GridPane, OfferBookVi
             public void handle(ActionEvent actionEvent) {
                 getProperties().put("type", "YES");
                 Dialog.Actions.YES.handle(actionEvent);
-                overlayManager.removeBlurContent();
             }
         });
         actions.add(new AbstractAction(BSResources.get("shared.no")) {
@@ -248,7 +246,6 @@ public class OfferBookView extends ActivatableViewAndModel<GridPane, OfferBookVi
             public void handle(ActionEvent actionEvent) {
                 getProperties().put("type", "NO");
                 Dialog.Actions.NO.handle(actionEvent);
-                overlayManager.removeBlurContent();
             }
         });
 
@@ -257,6 +254,8 @@ public class OfferBookView extends ActivatableViewAndModel<GridPane, OfferBookVi
                 restrictionsInfo,
                 actions);
 
+        Popups.removeBlurContent();
+
         if (Popups.isYes(response))
             navigation.navigateTo(MainView.class, AccountView.class, AccountSettingsView.class, RestrictionsView.class);
         else
diff --git a/src/main/java/io/bitsquare/gui/main/trade/takeoffer/TakeOfferView.java b/src/main/java/io/bitsquare/gui/main/trade/takeoffer/TakeOfferView.java
index e9aae2b972..9ab8f8df72 100644
--- a/src/main/java/io/bitsquare/gui/main/trade/takeoffer/TakeOfferView.java
+++ b/src/main/java/io/bitsquare/gui/main/trade/takeoffer/TakeOfferView.java
@@ -178,7 +178,6 @@ public class TakeOfferView extends ActivatableViewAndModel<AnchorPane, TakeOffer
                 public void handle(ActionEvent actionEvent) {
                     getProperties().put("type", "CLOSE");
                     Dialog.Actions.CLOSE.handle(actionEvent);
-                    overlayManager.removeBlurContent();
                 }
             });
             Popups.openInfoPopup("To ensure that both traders behave fair they need to pay a security deposit.",
@@ -280,6 +279,7 @@ public class TakeOfferView extends ActivatableViewAndModel<AnchorPane, TakeOffer
                 Popups.openErrorPopup(BSResources.get("shared.error"),
                         BSResources.get("takeOffer.amountPriceBox.error.message",
                                 model.requestTakeOfferErrorMessage.get()));
+                Popups.removeBlurContent();
             }
         });
 
@@ -308,7 +308,6 @@ public class TakeOfferView extends ActivatableViewAndModel<AnchorPane, TakeOffer
                             e.printStackTrace();
                         }
                         Dialog.Actions.CLOSE.handle(actionEvent);
-                        overlayManager.removeBlurContent();
                     }
                 });