X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FVamsasApplication.java;h=c094b1c362ffce4ffbe320cf23b771e5ee2bb7d1;hb=80e3ac6ebcb27e0d13ce639d1c3105f7cd6f83fe;hp=3bf7c24b5a8a38ea981c2041a426bcc1af25ead0;hpb=e2c3b3602486cee3f85dd8dfc7856a5ce6701669;p=jalview.git diff --git a/src/jalview/gui/VamsasApplication.java b/src/jalview/gui/VamsasApplication.java index 3bf7c24..c094b1c 100644 --- a/src/jalview/gui/VamsasApplication.java +++ b/src/jalview/gui/VamsasApplication.java @@ -42,7 +42,6 @@ import java.io.IOException; import java.util.Hashtable; import java.util.IdentityHashMap; import java.util.Iterator; -import java.util.List; import javax.swing.JInternalFrame; @@ -485,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; } @@ -1075,15 +1074,15 @@ public class VamsasApplication implements SelectionSource, VamsasSource } else { - // int[] intervals = colsel.getVisibleContigs( - // seqsel.getStartRes(), seqsel.getEndRes() + 1); - List intervals = hidden.getVisibleContigs( - seqsel.getStartRes(), seqsel.getEndRes() + 1); - for (int[] region : intervals) + Iterator intervals = hidden + .getVisContigsIterator(seqsel.getStartRes(), + seqsel.getEndRes() + 1, false); + while (intervals.hasNext()) { + int[] region = intervals.next(); Seg s = new Seg(); - s.setStart(region[0] + 1); // vamsas indices begin at - // 1, not zero. + s.setStart(region[0] + 1); // vamsas indices begin at 1, + // not zero. s.setEnd(region[1] + 1); s.setInclusive(true); range.addSeg(s);