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-1954 formatting
[jalview.git]
/
src
/
jalview
/
ws
/
jws1
/
SeqSearchWSThread.java
diff --git
a/src/jalview/ws/jws1/SeqSearchWSThread.java
b/src/jalview/ws/jws1/SeqSearchWSThread.java
index
a6e3731
..
a28494c
100644
(file)
--- a/
src/jalview/ws/jws1/SeqSearchWSThread.java
+++ b/
src/jalview/ws/jws1/SeqSearchWSThread.java
@@
-34,7
+34,9
@@
import jalview.ws.AWsJob;
import jalview.ws.JobStateSummary;
import jalview.ws.WSClientI;
import jalview.ws.JobStateSummary;
import jalview.ws.WSClientI;
+import java.util.HashMap;
import java.util.Hashtable;
import java.util.Hashtable;
+import java.util.Map;
import java.util.Vector;
import vamsas.objects.simple.MsaResult;
import java.util.Vector;
import vamsas.objects.simple.MsaResult;
@@
-168,7
+170,7
@@
class SeqSearchWSThread extends JWS1Thread implements WSClientI
*
* @return null or { Alignment(+features and annotation), NewickFile)}
*/
*
* @return null or { Alignment(+features and annotation), NewickFile)}
*/
- public Object[] getAlignment(Alignment dataset, Hashtable featureColours)
+ public Object[] getAlignment(Alignment dataset, Map featureColours)
{
if (result != null && result.isFinished())
{
if (result != null && result.isFinished())
@@
-610,7
+612,7
@@
class SeqSearchWSThread extends JWS1Thread implements WSClientI
// NewickFile nf[] = new NewickFile[jobs.length];
for (int j = 0; j < jobs.length; j++)
{
// NewickFile nf[] = new NewickFile[jobs.length];
for (int j = 0; j < jobs.length; j++)
{
- Hashtable featureColours = new Hashtable();
+ Map featureColours = new HashMap();
Alignment al = null;
NewickFile nf = null;
if (jobs[j].hasResults())
Alignment al = null;
NewickFile nf = null;
if (jobs[j].hasResults())