X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FPromptUserConfig.java;h=cb594523893446e509dffbf6700f7ea3e341cd1e;hb=4d0add405d43affa61fbf54d8a6624665bc8498d;hp=c710a8948eb67a989c5332ddabee7637062efe8b;hpb=865a855a4ca87eadb3e5ff284ed32ed307d9c34b;p=jalview.git
diff --git a/src/jalview/gui/PromptUserConfig.java b/src/jalview/gui/PromptUserConfig.java
index c710a89..cb59452 100644
--- a/src/jalview/gui/PromptUserConfig.java
+++ b/src/jalview/gui/PromptUserConfig.java
@@ -1,19 +1,21 @@
/*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.0b1)
- * Copyright (C) 2014 The Jalview Authors
+ * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$)
+ * Copyright (C) $$Year-Rel$$ 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;
@@ -22,8 +24,6 @@ import jalview.bin.Cache;
import java.awt.Component;
-import javax.swing.*;
-
public class PromptUserConfig implements Runnable
{
/**
@@ -118,6 +118,7 @@ public class PromptUserConfig implements Runnable
this.allowCancel = allowCancel;
}
+ @Override
public void run()
{
if (property == null)
@@ -199,25 +200,19 @@ public class PromptUserConfig implements Runnable
}
try
{
- int reply = JOptionPane.showConfirmDialog(
- Desktop.desktop, // component,
+ int reply = JvOptionPane.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();
- }
+ (allowCancel) ? JvOptionPane.YES_NO_CANCEL_OPTION
+ : JvOptionPane.YES_NO_OPTION,
+ JvOptionPane.QUESTION_MESSAGE);
+
// and finish parsing the result
jalview.bin.Cache.log.debug("Got response : " + reply);
- if (reply == JOptionPane.YES_OPTION)
+ if (reply == JvOptionPane.YES_OPTION)
{
jalview.bin.Cache.setProperty(property, "true");
}
- else if (reply == JOptionPane.NO_OPTION)
+ else if (reply == JvOptionPane.NO_OPTION)
{
if (removeifunset)
{
@@ -243,7 +238,8 @@ public class PromptUserConfig implements Runnable
{
jalview.bin.Cache.log.warn(
"Unexpected exception when prompting user for yes/no setting for property "
- + property, e);
+ + property,
+ e);
}
}
}