X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fws%2Frest%2Fparams%2FSeqGroupIndexVector.java;fp=src%2Fjalview%2Fws%2Frest%2Fparams%2FSeqGroupIndexVector.java;h=c5b64d7eb7d6e19582f20d205ff5927f39e5e2b7;hb=8edebdd9789b2d93fb8f9db24b8be2c1e6317690;hp=5c25b472ad89546e1c9b370d28d77015338b6a58;hpb=eee8dfa05eeea5b7cc295ba020647842502efe63;p=jalview.git diff --git a/src/jalview/ws/rest/params/SeqGroupIndexVector.java b/src/jalview/ws/rest/params/SeqGroupIndexVector.java index 5c25b47..c5b64d7 100644 --- a/src/jalview/ws/rest/params/SeqGroupIndexVector.java +++ b/src/jalview/ws/rest/params/SeqGroupIndexVector.java @@ -20,10 +20,12 @@ */ package jalview.ws.rest.params; +import jalview.analysis.AlignmentSorter; import jalview.datamodel.AlignmentI; import jalview.datamodel.SequenceGroup; import jalview.datamodel.SequenceI; import jalview.util.MessageManager; +import jalview.util.QuickSort; import jalview.ws.params.OptionI; import jalview.ws.params.simple.IntegerParameter; import jalview.ws.params.simple.Option; @@ -78,7 +80,7 @@ public class SeqGroupIndexVector extends InputType implements */ public AlignmentI prepareAlignment(AlignmentI al) { - jalview.analysis.AlignmentSorter.sortByGroup(al); + AlignmentSorter.sortByGroup(al); return al; } @@ -124,9 +126,13 @@ public class SeqGroupIndexVector extends InputType implements else { if (p < se[0]) + { se[0] = p; + } if (p > se[1]) + { se[1] = p; + } } } if (se != null) @@ -170,8 +176,10 @@ public class SeqGroupIndexVector extends InputType implements int[][] vals = gl.toArray(new int[gl.size()][]); int[] srt = new int[gl.size()]; for (int i = 0; i < vals.length; i++) + { srt[i] = vals[i][0]; - jalview.util.QuickSort.sortInt(srt, vals); + } + QuickSort.sortInt(srt, vals); list = false; int last = vals[0][0] - 1; for (int[] range : vals) @@ -245,7 +253,9 @@ public class SeqGroupIndexVector extends InputType implements { minsize = Integer.valueOf(val); if (minsize >= 0) + { return true; + } } catch (Exception x) {