X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fappletgui%2FIdPanel.java;h=8a0efc3ddeb0feb8b1f42ae974c16a8ecc09de79;hb=48b925b3dd950c86b1add0f2a90a2d0f8b6e316e;hp=d2832f84f93305d101787cbc5974a6179c36c1fb;hpb=797df64fa2a0a30773d0f48f5494d4155e5a8be3;p=jalview.git diff --git a/src/jalview/appletgui/IdPanel.java b/src/jalview/appletgui/IdPanel.java index d2832f8..8a0efc3 100755 --- a/src/jalview/appletgui/IdPanel.java +++ b/src/jalview/appletgui/IdPanel.java @@ -19,6 +19,7 @@ package jalview.appletgui; import java.awt.*; import java.awt.event.*; +import java.util.List; import java.util.Vector; import jalview.datamodel.*; @@ -272,7 +273,7 @@ public class IdPanel extends Panel implements MouseListener, } if (mouseDragging && e.getY() >= getSize().height - && av.alignment.getHeight() > av.getEndSeq()) + && av.getAlignment().getHeight() > av.getEndSeq()) { scrollThread = new ScrollThread(false); } @@ -331,7 +332,7 @@ public class IdPanel extends Panel implements MouseListener, { av.setSelectionGroup(new SequenceGroup()); av.getSelectionGroup().setStartRes(0); - av.getSelectionGroup().setEndRes(av.alignment.getWidth() - 1); + av.getSelectionGroup().setEndRes(av.getAlignment().getWidth() - 1); } if (e.isShiftDown() && lastid != -1) @@ -377,7 +378,7 @@ public class IdPanel extends Panel implements MouseListener, for (int i = start; i <= end; i++) { av.getSelectionGroup().addSequence( - av.getAlignment().getSequenceAt(i), false); + av.getAlignment().getSequenceAt(i), i==end); } } @@ -400,16 +401,16 @@ public class IdPanel extends Panel implements MouseListener, av.sendSelection(); } - public void highlightSearchResults(java.util.Vector found) + public void highlightSearchResults(List list) { - idCanvas.setHighlighted(found); + idCanvas.setHighlighted(list); - if (found == null) + if (list == null) { return; } - int index = av.alignment.findIndex((SequenceI) found.elementAt(0)); + int index = av.getAlignment().findIndex(list.get(0)); // do we need to scroll the panel? if (av.getStartSeq() > index || av.getEndSeq() < index) @@ -454,7 +455,7 @@ public class IdPanel extends Panel implements MouseListener, { selectSeqs(lastid - 1, seq); } - else if (seq > lastid && seq < av.alignment.getHeight()) + else if (seq > lastid && seq < av.getAlignment().getHeight()) { selectSeqs(lastid + 1, seq); }