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 features/JAL-2446NCList
[jalview.git]
/
src
/
jalview
/
ws
/
AWSThread.java
diff --git
a/src/jalview/ws/AWSThread.java
b/src/jalview/ws/AWSThread.java
index
156bd84
..
2ef5256
100644
(file)
--- a/
src/jalview/ws/AWSThread.java
+++ b/
src/jalview/ws/AWSThread.java
@@
-1,6
+1,6
@@
/*
/*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.9)
- * 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.
*
@@
-31,8
+31,8
@@
import jalview.gui.WebserviceInfo;
import jalview.util.MessageManager;
import jalview.viewmodel.seqfeatures.FeatureRendererSettings;
import jalview.util.MessageManager;
import jalview.viewmodel.seqfeatures.FeatureRendererSettings;
-import java.util.LinkedHashSet;
-import java.util.Set;
+import java.util.ArrayList;
+import java.util.List;
public abstract class AWSThread extends Thread
{
public abstract class AWSThread extends Thread
{
@@
-60,7
+60,7
@@
public abstract class AWSThread extends Thread
/**
* dataset sequence relationships to be propagated onto new results
*/
/**
* dataset sequence relationships to be propagated onto new results
*/
- protected Set<AlignedCodonFrame> codonframe = null;
+ protected List<AlignedCodonFrame> codonframe = null;
/**
* are there jobs still running in this thread.
/**
* are there jobs still running in this thread.
@@
-98,6
+98,7
@@
public abstract class AWSThread extends Thread
/**
* generic web service job/subjob poll loop
*/
/**
* generic web service job/subjob poll loop
*/
+ @Override
public void run()
{
JobStateSummary jstate = null;
public void run()
{
JobStateSummary jstate = null;
@@
-378,11
+379,11
@@
public abstract class AWSThread extends Thread
WsUrl = wsurl2;
if (alframe != null)
{
WsUrl = wsurl2;
if (alframe != null)
{
- Set<AlignedCodonFrame> cf = alframe.getViewport().getAlignment()
+ List<AlignedCodonFrame> cf = alframe.getViewport().getAlignment()
.getCodonFrames();
if (cf != null)
{
.getCodonFrames();
if (cf != null)
{
- codonframe = new LinkedHashSet<AlignedCodonFrame>();
+ codonframe = new ArrayList<AlignedCodonFrame>();
codonframe.addAll(cf);
}
}
codonframe.addAll(cf);
}
}