X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fws%2Frest%2Fparams%2FSeqIdVector.java;h=3dfa3c9d0cc224e4f68614f8da114b0403211783;hb=ab43013b7e357b84b4abade0dba949668dfb2a0e;hp=c77c8da9d90cfb12079c2ea2e453bf1dc1c935c4;hpb=a789f790fbb3ab13f1967b42781b837b58bf9bbc;p=jalview.git diff --git a/src/jalview/ws/rest/params/SeqIdVector.java b/src/jalview/ws/rest/params/SeqIdVector.java index c77c8da..3dfa3c9 100644 --- a/src/jalview/ws/rest/params/SeqIdVector.java +++ b/src/jalview/ws/rest/params/SeqIdVector.java @@ -1,3 +1,23 @@ +/* + * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.2b1) + * Copyright (C) 2014 The Jalview Authors + * + * This file is part of Jalview. + * + * Jalview is free software: you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation, either version 3 + * of the License, or (at your option) any later version. + * + * Jalview is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty + * of MERCHANTABILITY or FITNESS FOR A PARTICULAR + * PURPOSE. See the GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with Jalview. If not, see . + * The Jalview Authors are detailed in the 'AUTHORS' file. + */ package jalview.ws.rest.params; import jalview.datamodel.AlignmentI; @@ -7,15 +27,11 @@ import jalview.ws.params.simple.Option; import jalview.ws.rest.InputType; import jalview.ws.rest.NoValidInputDataException; import jalview.ws.rest.RestJob; -import jalview.ws.rest.RestServiceDescription; -import jalview.ws.rest.InputType.molType; import java.io.UnsupportedEncodingException; import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import java.util.regex.Matcher; -import java.util.regex.Pattern; import org.apache.http.entity.mime.content.ContentBody; import org.apache.http.entity.mime.content.StringBody; @@ -64,9 +80,9 @@ public class SeqIdVector extends InputType ArrayList prms = new ArrayList(); super.addBaseParams(prms); prms.add("sep='" + sep + "'"); - if (type!=null) + if (type != null) { - prms.add("type='"+type+"'"); + prms.add("type='" + type + "'"); } return prms; } @@ -114,8 +130,7 @@ public class SeqIdVector extends InputType "Separator character between elements of vector", true, ",", sep, Arrays.asList(new String[] { " ", ",", ";", "\t", "|" }), null)); - lst.add(createMolTypeOption("type", "Sequence type", false, type, - null)); + lst.add(createMolTypeOption("type", "Sequence type", false, type, null)); return lst; } }