The modal confirm dialog is now an internal frame.

Author: stiangre

Diff for: src/net/sf/freecol/client/gui/Canvas.java

@@ -56,14 +56,11 @@
 import javax.swing.Timer;
 import javax.swing.UIManager;
 import javax.swing.border.EmptyBorder;
-import javax.swing.event.InternalFrameAdapter;
-import javax.swing.event.InternalFrameEvent;
 import javax.swing.plaf.basic.BasicInternalFrameUI;
 
 import net.sf.freecol.client.ClientOptions;
 import net.sf.freecol.client.FreeColClient;
 import net.sf.freecol.client.gui.SwingGUI.PopupPosition;
-import net.sf.freecol.client.gui.action.FreeColAction;
 import net.sf.freecol.client.gui.dialog.FreeColDialog;
 import net.sf.freecol.client.gui.mapviewer.CanvasMapViewer;
 import net.sf.freecol.client.gui.mapviewer.MapViewer;
@@ -84,7 +81,6 @@
 import net.sf.freecol.common.i18n.Messages;
 import net.sf.freecol.common.model.Specification;
 import net.sf.freecol.common.option.IntegerOption;
-import net.sf.freecol.common.option.Option;
 import net.sf.freecol.common.option.OptionGroup;
 import net.sf.freecol.common.resources.Video;
 
@@ -164,6 +160,8 @@ public static class ToolBoxFrame extends JInternalFrame {}
      * A timer triggering repaints in order to display animations on the {@link CanvasMapViewer}.
      */
     private Timer animationTimer;
+    
+    private int displayedModalDialogs = 0;
 
 
     /**
@@ -1129,6 +1127,22 @@ public void dialogAdd(FreeColDialog<?> fcd) {
         }
         dialogs.add(fcd);
     }
+    
+    /**
+     * Should be called before displaying a modal. Remember to call {@link #modalDialogRemove}
+     * afterwards in a finally-block.
+     */
+    public void modalDialogAdd() {
+        logger.fine("Displaying modal dialog.");
+        displayedModalDialogs++;
+        if (displayedModalDialogs == 1) {
+            freeColClient.getActionManager().update();
+            repaint();
+        }
+        if  (displayedModalDialogs > 1) {
+            logger.warning("Displaying more than one modal dialog at the same time.");
+        }
+    }
 
     /**
      * Remove a dialog from the current dialog list.
@@ -1142,6 +1156,24 @@ public void dialogRemove(FreeColDialog<?> fcd) {
         }
         if (nothingShowing()) updateMenuBar();
     }
+    
+    
+    /**
+     * Should be called after a modal dialog has been removed.
+     * @see #modalDialogAdd
+     */
+    public void modalDialogRemove() {
+        logger.fine("Modal dialog dismissed.");
+        displayedModalDialogs--;
+        if (displayedModalDialogs == 0) {
+            freeColClient.getActionManager().update();
+            repaint();
+        }
+    }
+    
+    public int getDisplayedModalDialogs() {
+        return displayedModalDialogs;
+    }
 
     /**
      * Get a currentlydisplayed FreeColDialog of a given type.

Diff for: src/net/sf/freecol/client/gui/DialogHandler.java

@@ -26,6 +26,10 @@
  */
 public interface DialogHandler<T> {
 
+    /**
+     * This method gets called when the response is ready.
+     * @param response The response, or {@code null} if the user cancelled.
+     */
     void handle(T response);
 
 };

Diff for: src/net/sf/freecol/client/gui/GUI.java

@@ -1795,13 +1795,13 @@ public void displayStartChat(String sender, String message,
 
 
     /**
-     * Checks if a client options dialog is present.
+     * Checks if a dialog is showing.
      *
      * Used by: FreeColAction.shouldBeEnabled
      *
-     * @return True if the client options are showing.
+     * @return True if at least one dialog is showing.
      */
-    public boolean isClientOptionsDialogShowing() {
+    public boolean isDialogShowing() {
         return false;
     }
 

Diff for: src/net/sf/freecol/client/gui/SwingGUI.java

@@ -1747,8 +1747,8 @@ public void displayStartChat(String sender, String message,
      * {@inheritDoc}
      */
     @Override
-    public boolean isClientOptionsDialogShowing() {
-        return this.canvas.getExistingFreeColDialog(ClientOptionsDialog.class) != null;
+    public boolean isDialogShowing() {
+        return this.canvas.getDisplayedModalDialogs() > 0 || this.canvas.getExistingFreeColDialog(ClientOptionsDialog.class) != null;
     }
 
     /**

Diff for: src/net/sf/freecol/client/gui/Widgets.java

@@ -27,6 +27,7 @@
 import java.util.logging.Logger;
 
 import javax.swing.ImageIcon;
+import javax.swing.JOptionPane;
 import javax.swing.SwingUtilities;
 import javax.swing.filechooser.FileFilter;
 
@@ -43,7 +44,6 @@
 import net.sf.freecol.client.gui.dialog.EndTurnDialog;
 import net.sf.freecol.client.gui.dialog.FirstContactDialog;
 import net.sf.freecol.client.gui.dialog.FreeColChoiceDialog;
-import net.sf.freecol.client.gui.dialog.FreeColConfirmDialog;
 import net.sf.freecol.client.gui.dialog.FreeColDialog;
 import net.sf.freecol.client.gui.dialog.FreeColStringInputDialog;
 import net.sf.freecol.client.gui.dialog.GameOptionsDialog;
@@ -231,10 +231,23 @@ private FreeColFrame getFrame() {
      */
     public boolean confirm(StringTemplate tmpl, ImageIcon icon,
                            String okKey, String cancelKey, PopupPosition pos) {
-        FreeColConfirmDialog dialog
-            = new FreeColConfirmDialog(this.freeColClient, getFrame(), true,
-                                       tmpl, icon, okKey, cancelKey);
-        return this.canvas.showFreeColDialog(dialog, pos);
+        try {
+            this.canvas.modalDialogAdd();
+            final String ok = Messages.message(okKey);
+            final String cancel = Messages.message(cancelKey);
+            final int result = JOptionPane.showInternalOptionDialog(canvas,
+                    Messages.message(tmpl),
+                    null,
+                    JOptionPane.DEFAULT_OPTION,
+                    JOptionPane.PLAIN_MESSAGE,
+                    icon,
+                    new Object[] { ok, cancel },
+                    cancel);
+            
+            return (result == 0);
+        } finally {
+            this.canvas.modalDialogRemove();
+        }
     }
 
     /**

Diff for: src/net/sf/freecol/client/gui/action/FreeColAction.java

@@ -362,7 +362,7 @@ public MenuKeyListener getMenuKeyListener() {
      *     is not visible.
      */
     protected boolean shouldBeEnabled() {
-        return !getGUI().isClientOptionsDialogShowing();
+        return !getGUI().isDialogShowing();
     }
 
     /**