From 398ef0ac4f9bf5b1acf10f6e5f6ff4fe46b8c463 Mon Sep 17 00:00:00 2001
From: elcnesh <elcnesh@cardforge.org>
Date: Thu, 2 Apr 2015 08:48:12 +0000
Subject: [PATCH] Don't allow confirm dialog without title

---
 forge-gui/src/main/java/forge/interfaces/IGuiGame.java       | 1 -
 forge-gui/src/main/java/forge/match/AbstractGuiGame.java     | 5 -----
 forge-gui/src/main/java/forge/player/HumanPlay.java          | 3 +--
 .../src/main/java/forge/player/PlayerControllerHuman.java    | 2 +-
 4 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/forge-gui/src/main/java/forge/interfaces/IGuiGame.java b/forge-gui/src/main/java/forge/interfaces/IGuiGame.java
index dbf758f2678..c9f6fdd7125 100644
--- a/forge-gui/src/main/java/forge/interfaces/IGuiGame.java
+++ b/forge-gui/src/main/java/forge/interfaces/IGuiGame.java
@@ -64,7 +64,6 @@ public interface IGuiGame {
     void showErrorDialog(String message);
     void showErrorDialog(String message, String title);
 
-    boolean showConfirmDialog(String message);
     boolean showConfirmDialog(String message, String title);
     boolean showConfirmDialog(String message, String title, boolean defaultYes);
     boolean showConfirmDialog(String message, String title, String yesButtonText, String noButtonText);
diff --git a/forge-gui/src/main/java/forge/match/AbstractGuiGame.java b/forge-gui/src/main/java/forge/match/AbstractGuiGame.java
index 9a783c65c65..87e191b064a 100644
--- a/forge-gui/src/main/java/forge/match/AbstractGuiGame.java
+++ b/forge-gui/src/main/java/forge/match/AbstractGuiGame.java
@@ -616,11 +616,6 @@ public abstract class AbstractGuiGame implements IGuiGame, IMayViewCards {
         showErrorDialog(message, "Error");
     }
 
-    @Override
-    public boolean showConfirmDialog(final String message) {
-        return showConfirmDialog(message, null);
-    }
-
     @Override
     public boolean showConfirmDialog(final String message, final String title) {
         return showConfirmDialog(message, title, true);
diff --git a/forge-gui/src/main/java/forge/player/HumanPlay.java b/forge-gui/src/main/java/forge/player/HumanPlay.java
index 3ae9dd436e7..815dbdb06ea 100644
--- a/forge-gui/src/main/java/forge/player/HumanPlay.java
+++ b/forge-gui/src/main/java/forge/player/HumanPlay.java
@@ -93,8 +93,7 @@ public class HumanPlay {
 
             final HumanPlaySpellAbility req = new HumanPlaySpellAbility(controller, sa, payment);
             req.playAbility(true, false, false);
-        }
-        else if (payManaCostIfNeeded(controller, p, sa)) {
+        } else if (payManaCostIfNeeded(controller, p, sa)) {
             if (sa.isSpell() && !source.isCopiedSpell()) {
                 sa.setHostCard(p.getGame().getAction().moveToStack(source));
             }
diff --git a/forge-gui/src/main/java/forge/player/PlayerControllerHuman.java b/forge-gui/src/main/java/forge/player/PlayerControllerHuman.java
index 2b5b31ab913..71afe88ff4e 100644
--- a/forge-gui/src/main/java/forge/player/PlayerControllerHuman.java
+++ b/forge-gui/src/main/java/forge/player/PlayerControllerHuman.java
@@ -1453,7 +1453,7 @@ public class PlayerControllerHuman
             try {
                 state.initFromGame(game);
                 File f = GuiBase.getInterface().getSaveFile(new File(ForgeConstants.USER_GAMES_DIR, "state.txt"));
-                if (f != null && (!f.exists() || getGui().showConfirmDialog("Overwrite existing file?"))) {
+                if (f != null && (!f.exists() || getGui().showConfirmDialog("Overwrite existing file?", "File exists!"))) {
                     final BufferedWriter bw = new BufferedWriter(new FileWriter(f));
                     bw.write(state.toString());
                     bw.close();