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 remote-tracking branch 'origin/features/JAL-2620alternativeCodeTables' into...
[jalview.git]
/
src
/
jalview
/
gui
/
PromptUserConfig.java
diff --git
a/src/jalview/gui/PromptUserConfig.java
b/src/jalview/gui/PromptUserConfig.java
index
fb90ce7
..
cb59452
100644
(file)
--- a/
src/jalview/gui/PromptUserConfig.java
+++ b/
src/jalview/gui/PromptUserConfig.java
@@
-24,8
+24,6
@@
import jalview.bin.Cache;
import java.awt.Component;
import java.awt.Component;
-import javax.swing.JOptionPane;
-
public class PromptUserConfig implements Runnable
{
/**
public class PromptUserConfig implements Runnable
{
/**
@@
-120,6
+118,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)
@@
-201,18
+200,12
@@
public class PromptUserConfig implements Runnable
}
try
{
}
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
jalview.bin.Cache.log.debug("Got response : " + reply);
if (reply == JvOptionPane.YES_OPTION)
// and finish parsing the result
jalview.bin.Cache.log.debug("Got response : " + reply);
if (reply == JvOptionPane.YES_OPTION)
@@
-245,7
+238,8
@@
public class PromptUserConfig implements Runnable
{
jalview.bin.Cache.log.warn(
"Unexpected exception when prompting user for yes/no setting for property "
{
jalview.bin.Cache.log.warn(
"Unexpected exception when prompting user for yes/no setting for property "
- + property, e);
+ + property,
+ e);
}
}
}
}
}
}