X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FVamsasApplication.java;h=c094b1c362ffce4ffbe320cf23b771e5ee2bb7d1;hb=09d3b755d9b00f5c3acb44049aedd49361dc0690;hp=d2086e0788a736b71acc3cfd51dbb4b463756ca7;hpb=3d0101179759ef157b088ea135423cd909512d9f;p=jalview.git diff --git a/src/jalview/gui/VamsasApplication.java b/src/jalview/gui/VamsasApplication.java index d2086e0..c094b1c 100644 --- a/src/jalview/gui/VamsasApplication.java +++ b/src/jalview/gui/VamsasApplication.java @@ -484,8 +484,8 @@ public class VamsasApplication implements SelectionSource, VamsasSource errorsDuringUpdate = true; Cache.log.error("Exception synchronizing " + af.getTitle() + " " - + (af.getViewport().viewName == null ? "" - : " view " + af.getViewport().viewName) + + (af.getViewport().getViewName() == null ? "" + : " view " + af.getViewport().getViewName()) + " to document.", e); stored = false; } @@ -1074,16 +1074,16 @@ public class VamsasApplication implements SelectionSource, VamsasSource } else { - // int[] intervals = colsel.getVisibleContigs( - // seqsel.getStartRes(), seqsel.getEndRes() + 1); - int[] intervals = hidden.getVisibleContigs( - seqsel.getStartRes(), seqsel.getEndRes() + 1); - for (int iv = 0; iv < intervals.length; iv += 2) + Iterator intervals = hidden + .getVisContigsIterator(seqsel.getStartRes(), + seqsel.getEndRes() + 1, false); + while (intervals.hasNext()) { + int[] region = intervals.next(); Seg s = new Seg(); - s.setStart(intervals[iv] + 1); // vamsas indices begin at - // 1, not zero. - s.setEnd(intervals[iv + 1] + 1); + s.setStart(region[0] + 1); // vamsas indices begin at 1, + // not zero. + s.setEnd(region[1] + 1); s.setInclusive(true); range.addSeg(s); }