X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fws%2Frest%2FRestJob.java;h=5fbc303f5655fbc38e4f9f82d9c77ed3584961d9;hb=92e39eb6a3ab1a0e3ab45cef49a64a1c7a7007b6;hp=770824a4606179934b7bcd6f50fd8f642bdf7abe;hpb=47168f025aefdaa044802bd5f8f510ffe43a4808;p=jalview.git diff --git a/src/jalview/ws/rest/RestJob.java b/src/jalview/ws/rest/RestJob.java index 770824a..5fbc303 100644 --- 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.2) - * 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. * @@ -20,13 +20,6 @@ */ 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; @@ -37,6 +30,13 @@ import jalview.ws.AWsJob; 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 { @@ -90,13 +90,15 @@ 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. - 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 ArrayList alinp = new ArrayList(); int paramsWithData = 0; - // TODO: JAL-715 - generalise the following validation logic for all parameter types + // TODO: JAL-715 - generalise the following validation logic for all + // parameter types // we cheat for moment - since we know a-priori what data is available and // what inputs we have implemented so far for (Map.Entry prm : rsd.inputParams.entrySet()) @@ -113,7 +115,9 @@ public class RestJob extends AWsJob && _input.getGroups() != null && _input.getGroups().size() >= -1 + prm.getValue().min) { - // the test above is not rigorous but fixes JAL-1298, since submission will fail if the partition set doesn't contain at least one partition + // the test above is not rigorous but fixes JAL-1298, since + // submission will fail if the partition set doesn't contain at + // least one partition alinp.add(prm.getValue()); } else