git://source.jalview.org
/
jalview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'develop' into bug/JAL-4059_update_swingJS_for_JalviewJS_2_11_2_and_2_11_3
[jalview.git]
/
src
/
jalview
/
gui
/
PromptUserConfig.java
diff --git
a/src/jalview/gui/PromptUserConfig.java
b/src/jalview/gui/PromptUserConfig.java
index
fb90ce7
..
6dbbbb0
100644
(file)
--- a/
src/jalview/gui/PromptUserConfig.java
+++ b/
src/jalview/gui/PromptUserConfig.java
@@
-21,11
+21,10
@@
package jalview.gui;
import jalview.bin.Cache;
package jalview.gui;
import jalview.bin.Cache;
+import jalview.bin.Console;
import java.awt.Component;
import java.awt.Component;
-import javax.swing.JOptionPane;
-
public class PromptUserConfig implements Runnable
{
/**
public class PromptUserConfig implements Runnable
{
/**
@@
-91,7
+90,7
@@
public class PromptUserConfig implements Runnable
* @param desktop
* - where the dialog box will be shown
* @param property
* @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
* @param dialogTitle
* - title of prompt box
* @param dialogText
@@
-120,6
+119,7
@@
public class PromptUserConfig implements Runnable
this.allowCancel = allowCancel;
}
this.allowCancel = allowCancel;
}
+ @Override
public void run()
{
if (property == null)
public void run()
{
if (property == null)
@@
-127,14
+127,14
@@
public class PromptUserConfig implements Runnable
return;
}
// First - check to see if wee have an old questionnaire/response id pair.
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();
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)
String extype = "";
Exception e = null;
if (lastq == null)
@@
-184,7
+184,7
@@
public class PromptUserConfig implements Runnable
// report any exceptions
if (e != null)
{
// 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);
}
}
+ " runnable for property " + property, e);
}
}
@@
-194,58
+194,53
@@
public class PromptUserConfig implements Runnable
*/
private void raiseDialog()
{
*/
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
{
+ " for Cache property " + property);
}
try
{
- int reply = JvOptionPane.showConfirmDialog(
- Desktop.desktop, // component,
+ int reply = JvOptionPane.showConfirmDialog(Desktop.desktop, // component,
dialogText, dialogTitle,
(allowCancel) ? JvOptionPane.YES_NO_CANCEL_OPTION
: JvOptionPane.YES_NO_OPTION,
JvOptionPane.QUESTION_MESSAGE);
dialogText, dialogTitle,
(allowCancel) ? JvOptionPane.YES_NO_CANCEL_OPTION
: JvOptionPane.YES_NO_OPTION,
JvOptionPane.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
// and finish parsing the result
- jalview.bin.Cache.log.debug("Got response : " + reply);
+ Console.debug("Got response : " + reply);
if (reply == JvOptionPane.YES_OPTION)
{
if (reply == JvOptionPane.YES_OPTION)
{
- jalview.bin.Cache.setProperty(property, "true");
+ Cache.setProperty(property, "true");
}
else if (reply == JvOptionPane.NO_OPTION)
{
if (removeifunset)
{
}
else if (reply == JvOptionPane.NO_OPTION)
{
if (removeifunset)
{
- jalview.bin.Cache.removeProperty(property);
+ Cache.removeProperty(property);
}
else
{
}
else
{
- jalview.bin.Cache.setProperty(property, "false");
+ Cache.setProperty(property, "false");
}
}
else
{
}
}
else
{
- jalview.bin.Cache.log.debug("User cancelled setting " + property);
+ Console.debug("User cancelled setting " + property);
return;
}
// verify the property is set for debugging
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)
{
}
} catch (Exception e)
{
- jalview.bin.Cache.log.warn(
+ Console.warn(
"Unexpected exception when prompting user for yes/no setting for property "
"Unexpected exception when prompting user for yes/no setting for property "
- + property, e);
+ + property,
+ e);
}
}
}
}
}
}