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-JS/develop' of https://source.jalview.org/git/jalview.git into...
[jalview.git]
/
src
/
jalview
/
ws
/
rest
/
RestJob.java
diff --git
a/src/jalview/ws/rest/RestJob.java
b/src/jalview/ws/rest/RestJob.java
index
f080127
..
824af90
100644
(file)
--- a/
src/jalview/ws/rest/RestJob.java
+++ b/
src/jalview/ws/rest/RestJob.java
@@
-1,6
+1,6
@@
/*
/*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.2b1)
- * Copyright (C) 2014 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.
*
@@
-20,13
+20,6
@@
*/
package jalview.ws.rest;
*/
package jalview.ws.rest;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Hashtable;
-import java.util.Map;
-import java.util.Set;
-import java.util.Vector;
-
import jalview.datamodel.AlignmentAnnotation;
import jalview.datamodel.AlignmentI;
import jalview.datamodel.AlignmentOrder;
import jalview.datamodel.AlignmentAnnotation;
import jalview.datamodel.AlignmentI;
import jalview.datamodel.AlignmentOrder;
@@
-37,6
+30,13
@@
import jalview.ws.AWsJob;
import jalview.ws.rest.params.Alignment;
import jalview.ws.rest.params.SeqGroupIndexVector;
import jalview.ws.rest.params.Alignment;
import jalview.ws.rest.params.SeqGroupIndexVector;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Hashtable;
+import java.util.Map;
+import java.util.Set;
+import java.util.Vector;
+
public class RestJob extends AWsJob
{
public class RestJob extends AWsJob
{
@@
-77,8
+77,8
@@
public class RestJob extends AWsJob
* @param viscontigs
* visible contigs of an alignment view from which _input was derived
*/
* @param viscontigs
* visible contigs of an alignment view from which _input was derived
*/
- public RestJob(int jobNum, RestJobThread restJobThread,
- AlignmentI _input, int[] viscontigs)
+ public RestJob(int jobNum, RestJobThread restJobThread, AlignmentI _input,
+ int[] viscontigs)
{
rsd = restJobThread.restClient.service;
jobnum = jobNum;
{
rsd = restJobThread.restClient.service;
jobnum = jobNum;
@@
-90,8
+90,8
@@
public class RestJob extends AWsJob
// get sequences for the alignmentI
// get groups trimmed to alignment columns
// get any annotation trimmed to start/end columns, too.
// get sequences for the alignmentI
// get groups trimmed to alignment columns
// get any annotation trimmed to start/end columns, too.
- squniq = jalview.analysis.SeqsetUtils.uniquify(
- _input.getSequencesArray(), true);
+ squniq = jalview.analysis.SeqsetUtils
+ .uniquify(_input.getSequencesArray(), true);
// prepare input
// form alignment+groups+annotation,preprocess and then record references
// for formatters
// prepare input
// form alignment+groups+annotation,preprocess and then record references
// for formatters
@@
-122,8
+122,8
@@
public class RestJob extends AWsJob
}
else
{
}
else
{
- statMessage = ("Not enough groups defined on the alignment - need at least " + prm
- .getValue().min);
+ statMessage = ("Not enough groups defined on the alignment - need at least "
+ + prm.getValue().min);
}
}
}
}
}
}