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 'Jalview-BH/JAL-3026-JAL-3063-JAXB' into
[jalview.git]
/
src
/
jalview
/
gui
/
Desktop.java
diff --git
a/src/jalview/gui/Desktop.java
b/src/jalview/gui/Desktop.java
index
6b7a278
..
1e258b8
100644
(file)
--- a/
src/jalview/gui/Desktop.java
+++ b/
src/jalview/gui/Desktop.java
@@
-1125,9
+1125,8
@@
public class Desktop extends jalview.jbgui.GDesktop
MessageManager.getString("label.open_local_file"));
chooser.setToolTipText(MessageManager.getString("action.open"));
MessageManager.getString("label.open_local_file"));
chooser.setToolTipText(MessageManager.getString("action.open"));
- chooser.addResponse(new RunResponse(JalviewFileChooser.APPROVE_OPTION)
+ chooser.addResponse(0, new RunResponse(JalviewFileChooser.APPROVE_OPTION)
{
{
-
@Override
public void run()
{
@Override
public void run()
{
@@
-1263,7
+1262,7
@@
public class Desktop extends jalview.jbgui.GDesktop
}};
String dialogOption = MessageManager
.getString("label.input_alignment_from_url");
}};
String dialogOption = MessageManager
.getString("label.input_alignment_from_url");
- JvOptionPane.newOptionDialog(desktop).addResponse(action)
+ JvOptionPane.newOptionDialog(desktop).addResponse(0, action)
.showInternalDialog(panel, dialogOption,
JvOptionPane.YES_NO_CANCEL_OPTION,
JvOptionPane.PLAIN_MESSAGE, null, options,
.showInternalDialog(panel, dialogOption,
JvOptionPane.YES_NO_CANCEL_OPTION,
JvOptionPane.PLAIN_MESSAGE, null, options,
@@
-1746,7
+1745,7
@@
public class Desktop extends jalview.jbgui.GDesktop
"Jalview Project");
chooser.setFileView(new JalviewFileView());
chooser.setDialogTitle(MessageManager.getString("label.restore_state"));
"Jalview Project");
chooser.setFileView(new JalviewFileView());
chooser.setDialogTitle(MessageManager.getString("label.restore_state"));
- chooser.addResponse(new RunResponse(JalviewFileChooser.APPROVE_OPTION)
+ chooser.addResponse(0, new RunResponse(JalviewFileChooser.APPROVE_OPTION)
{
@Override
public void run()
{
@Override
public void run()