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
JAL-2507 fix test: knockon from capitalisation on secondary structure from stockholm...
[jalview.git]
/
src
/
jalview
/
io
/
WSWUBlastClient.java
diff --git
a/src/jalview/io/WSWUBlastClient.java
b/src/jalview/io/WSWUBlastClient.java
index
0badbf7
..
55e72eb
100755
(executable)
--- a/
src/jalview/io/WSWUBlastClient.java
+++ b/
src/jalview/io/WSWUBlastClient.java
@@
-1,6
+1,6
@@
/*
/*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.9.0b2)
- * Copyright (C) 2015 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.
*
*
* This file is part of Jalview.
*
@@
-27,6
+27,7
@@
import jalview.datamodel.Sequence;
import jalview.gui.AlignmentPanel;
import jalview.gui.CutAndPasteTransfer;
import jalview.gui.Desktop;
import jalview.gui.AlignmentPanel;
import jalview.gui.CutAndPasteTransfer;
import jalview.gui.Desktop;
+import jalview.gui.JvOptionPane;
import jalview.util.MessageManager;
import java.util.ArrayList;
import jalview.util.MessageManager;
import java.util.ArrayList;
@@
-35,7
+36,6
@@
import java.util.StringTokenizer;
import java.util.Vector;
import javax.swing.ImageIcon;
import java.util.Vector;
import javax.swing.ImageIcon;
-import javax.swing.JOptionPane;
import uk.ac.ebi.www.Data;
import uk.ac.ebi.www.InputParams;
import uk.ac.ebi.www.Data;
import uk.ac.ebi.www.InputParams;
@@
-150,11
+150,11
@@
public class WSWUBlastClient
{
// This must be outside the run() body as java 1.5
// will not return any value from the OptionPane to the expired thread.
{
// This must be outside the run() body as java 1.5
// will not return any value from the OptionPane to the expired thread.
- int reply = JOptionPane.showConfirmDialog(Desktop.desktop,
+ int reply = JvOptionPane.showConfirmDialog(Desktop.desktop,
"Automatically update suggested ids?",
"Automatically update suggested ids?",
- "Auto replace sequence ids", JOptionPane.YES_NO_OPTION);
+ "Auto replace sequence ids", JvOptionPane.YES_NO_OPTION);
- if (reply == JOptionPane.YES_OPTION)
+ if (reply == JvOptionPane.YES_OPTION)
{
Enumeration keys = suggestedIds.elements();
while (keys.hasMoreElements())
{
Enumeration keys = suggestedIds.elements();
while (keys.hasMoreElements())
@@
-211,6
+211,7
@@
public class WSWUBlastClient
}
}
}
}
+ @Override
public void run()
{
while (jobsRunning > 0)
public void run()
{
while (jobsRunning > 0)
@@
-250,6
+251,7
@@
public class WSWUBlastClient
this.sequence = sequence;
}
this.sequence = sequence;
}
+ @Override
public void run()
{
StartJob();
public void run()
{
StartJob();