X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FPromptUserConfig.java;h=6dbbbb01870d5a19da6a10b7e2a1dfefffd19c16;hb=155a17a423e980849fd4dc5f857da1a72b0010b9;hp=95d9c69c710a2f1bafe2e608417304ca899890d4;hpb=797df64fa2a0a30773d0f48f5494d4155e5a8be3;p=jalview.git
diff --git a/src/jalview/gui/PromptUserConfig.java b/src/jalview/gui/PromptUserConfig.java
index 95d9c69..6dbbbb0 100644
--- a/src/jalview/gui/PromptUserConfig.java
+++ b/src/jalview/gui/PromptUserConfig.java
@@ -1,29 +1,29 @@
/*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.7)
- * Copyright (C) 2011 J Procter, AM Waterhouse, J Engelhardt, LM Lui, G Barton, M Clamp, S Searle
+ * 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;
import jalview.bin.Cache;
+import jalview.bin.Console;
import java.awt.Component;
-import java.io.*;
-import java.net.*;
-
-import javax.swing.*;
public class PromptUserConfig implements Runnable
{
@@ -90,7 +90,7 @@ public class PromptUserConfig implements Runnable
* @param desktop
* - where the dialog box will be shown
* @param property
- * - boolean property in jalview.bin.Cache
+ * - boolean property in Cache
* @param dialogTitle
* - title of prompt box
* @param dialogText
@@ -119,6 +119,7 @@ public class PromptUserConfig implements Runnable
this.allowCancel = allowCancel;
}
+ @Override
public void run()
{
if (property == null)
@@ -126,14 +127,14 @@ public class PromptUserConfig implements Runnable
return;
}
// First - check to see if wee have an old questionnaire/response id pair.
- String lastq = jalview.bin.Cache.getProperty(property);
+ String lastq = Cache.getProperty(property);
if (lastq == null)
{
raiseDialog();
- Cache.log.debug("Got user response.");
+ Console.debug("Got user response.");
}
- lastq = jalview.bin.Cache.getProperty(property);
+ lastq = Cache.getProperty(property);
String extype = "";
Exception e = null;
if (lastq == null)
@@ -183,7 +184,7 @@ public class PromptUserConfig implements Runnable
// report any exceptions
if (e != null)
{
- Cache.log.warn("Unexpected exception when executing the " + extype
+ Console.warn("Unexpected exception when executing the " + extype
+ " runnable for property " + property, e);
}
}
@@ -193,57 +194,53 @@ public class PromptUserConfig implements Runnable
*/
private void raiseDialog()
{
- if (jalview.bin.Cache.log.isDebugEnabled())
+ if (Console.isDebugEnabled())
{
- jalview.bin.Cache.log.debug("Prompting user for " + dialogTitle
+ Console.debug("Prompting user for " + dialogTitle
+ " for Cache property " + property);
}
try
{
- int reply = JOptionPane.showInternalConfirmDialog(
- 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)
+ Console.debug("Got response : " + reply);
+ if (reply == JvOptionPane.YES_OPTION)
{
- jalview.bin.Cache.setProperty(property, "true");
+ Cache.setProperty(property, "true");
}
- else if (reply == JOptionPane.NO_OPTION)
+ else if (reply == JvOptionPane.NO_OPTION)
{
if (removeifunset)
{
- jalview.bin.Cache.removeProperty(property);
+ Cache.removeProperty(property);
}
else
{
- jalview.bin.Cache.setProperty(property, "false");
+ Cache.setProperty(property, "false");
}
}
else
{
- jalview.bin.Cache.log.debug("User cancelled setting " + property);
+ Console.debug("User cancelled setting " + property);
return;
}
// verify the property is set for debugging
- if (jalview.bin.Cache.log.isDebugEnabled())
+ if (Console.isDebugEnabled())
{
- jalview.bin.Cache.log.debug("User set property to "
- + jalview.bin.Cache.getProperty(property));
+ Console.debug(
+ "User set property to " + Cache.getProperty(property));
}
} catch (Exception e)
{
- jalview.bin.Cache.log.warn(
+ Console.warn(
"Unexpected exception when prompting user for yes/no setting for property "
- + property, e);
+ + property,
+ e);
}
}
}