X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fjalview%2Fws%2Frest%2FRestJob.java;h=64d75e89db9d1da965e9d410f91f5d4c0cd946bf;hb=70f9c4700f20a8fa57ed7eb974277d8bad0723c2;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..64d75e8 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. * @@ -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