X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FPromptUserConfig.java;h=5911b38426035a8d0bc9f4763a4f50b32b85c278;hb=c19d2a91ca05e052e3408bf5852d88eb5d0608f1;hp=a9c16563df9533928f97840404a979805d65b2df;hpb=d423f22792e47dbc800ae220a58677f988971d06;p=jalview.git
diff --git a/src/jalview/gui/PromptUserConfig.java b/src/jalview/gui/PromptUserConfig.java
index a9c1656..5911b38 100644
--- a/src/jalview/gui/PromptUserConfig.java
+++ b/src/jalview/gui/PromptUserConfig.java
@@ -1,29 +1,30 @@
/*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.5)
- * Copyright (C) 2010 J Procter, AM Waterhouse, G Barton, M Clamp, S Searle
+ * Jalview - A Sequence Alignment Editor and Viewer (Version 2.9.0b2)
+ * Copyright (C) 2015 The Jalview Authors
*
* This file is part of Jalview.
*
* Jalview is free software: you can redistribute it and/or
* modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
- *
+ * as published by the Free Software Foundation, either version 3
+ * of the License, or (at your option) any later version.
+ *
* Jalview is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty
* of MERCHANTABILITY or FITNESS FOR A PARTICULAR
* PURPOSE. See the GNU General Public License for more details.
*
- * You should have received a copy of the GNU General Public License along with Jalview. If not, see .
+ * You should have received a copy of the GNU General Public License
+ * along with Jalview. If not, see .
+ * The Jalview Authors are detailed in the 'AUTHORS' file.
*/
package jalview.gui;
import jalview.bin.Cache;
import java.awt.Component;
-import java.io.*;
-import java.net.*;
-import javax.swing.*;
+import javax.swing.JOptionPane;
public class PromptUserConfig implements Runnable
{
@@ -200,12 +201,19 @@ public class PromptUserConfig implements Runnable
}
try
{
- int reply = JOptionPane.showInternalConfirmDialog(
+ int reply = JOptionPane.showConfirmDialog(
Desktop.desktop, // component,
dialogText, dialogTitle,
(allowCancel) ? JOptionPane.YES_NO_CANCEL_OPTION
: JOptionPane.YES_NO_OPTION,
JOptionPane.QUESTION_MESSAGE);
+ // now, ask the desktop to relayer any external windows that might have
+ // been obsured
+ if (Desktop.instance != null)
+ {
+ Desktop.instance.relayerWindows();
+ }
+ // and finish parsing the result
jalview.bin.Cache.log.debug("Got response : " + reply);
if (reply == JOptionPane.YES_OPTION)
{