X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fjalview%2Fws%2Frest%2Fparams%2FSeqGroupIndexVector.java;h=dcb7fab8876a2fb694eaa703d10358a04241c22f;hb=5a3e8375831cd87fb3668e0945f907ddce0ab82a;hp=30dc47353b473ce4723cf549c007a7e46a257cb7;hpb=7ab5d6b0ba5fec1ea4a4239e79c476d841622485;p=jalview.git diff --git a/src/jalview/ws/rest/params/SeqGroupIndexVector.java b/src/jalview/ws/rest/params/SeqGroupIndexVector.java index 30dc473..dcb7fab 100644 --- a/src/jalview/ws/rest/params/SeqGroupIndexVector.java +++ b/src/jalview/ws/rest/params/SeqGroupIndexVector.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. * @@ -23,6 +23,7 @@ package jalview.ws.rest.params; import jalview.datamodel.AlignmentI; import jalview.datamodel.SequenceGroup; import jalview.datamodel.SequenceI; +import jalview.util.MessageManager; import jalview.ws.params.OptionI; import jalview.ws.params.simple.IntegerParameter; import jalview.ws.params.simple.Option; @@ -47,13 +48,12 @@ import org.apache.http.entity.mime.content.StringBody; * @author JimP * */ -public class SeqGroupIndexVector extends InputType implements - AlignmentProcessor +public class SeqGroupIndexVector extends InputType + implements AlignmentProcessor { public SeqGroupIndexVector() { - super(new Class[] - { AlignmentI.class }); + super(new Class[] { AlignmentI.class }); } /** @@ -99,8 +99,10 @@ public class SeqGroupIndexVector extends InputType implements { if (sg.getSize() < minsize) { - throw new NoValidInputDataException("Group contains less than " - + minsize + " sequences."); + throw new NoValidInputDataException(MessageManager.formatMessage( + "exception.notvaliddata_group_contains_less_than_min_seqs", + new String[] + { Integer.valueOf(minsize).toString() })); } // TODO: refactor to sequenceGroup for efficiency - // getAlignmentRowInterval(AlignmentI al) @@ -118,8 +120,7 @@ public class SeqGroupIndexVector extends InputType implements } if (se == null) { - se = new int[] - { p, p }; + se = new int[] { p, p }; } else { @@ -141,19 +142,16 @@ public class SeqGroupIndexVector extends InputType implements { if (lowest - 1 > minsize) { - gl.add(0, new int[] - { 0, lowest - 2 }); + gl.add(0, new int[] { 0, lowest - 2 }); } if ((al.getHeight() - 1 - highest) > minsize) { - gl.add(new int[] - { highest + 1, al.getHeight() - 1 }); + gl.add(new int[] { highest + 1, al.getHeight() - 1 }); } } else { - gl.add(new int[] - { 0, al.getHeight() - 1 }); + gl.add(new int[] { 0, al.getHeight() - 1 }); } if (min >= 0 && gl.size() < min) { @@ -261,8 +259,8 @@ public class SeqGroupIndexVector extends InputType implements return true; } catch (Exception x) { - warnings.append("Invalid molecule type '" + val - + "'. Must be one of ("); + warnings.append( + "Invalid molecule type '" + val + "'. Must be one of ("); for (molType v : molType.values()) { warnings.append(" " + v);