X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fappletgui%2FIdPanel.java;h=03f5b25f5b59fa9c6d35250112f34b91701d9779;hb=2e699d341f8e64868e3c279f9c02af617c4e9b44;hp=eab849b7581f232090c910dbbd5bdb1ad25422f8;hpb=425c3769b24f953eed5af873d0e832e76c4d9c3a;p=jalview.git diff --git a/src/jalview/appletgui/IdPanel.java b/src/jalview/appletgui/IdPanel.java index eab849b..03f5b25 100755 --- a/src/jalview/appletgui/IdPanel.java +++ b/src/jalview/appletgui/IdPanel.java @@ -1,6 +1,6 @@ /* * Jalview - A Sequence Alignment Editor and Viewer - * Copyright (C) 2005 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle + * Copyright (C) 2006 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -50,12 +50,12 @@ public class IdPanel idCanvas.addMouseMotionListener(this); String label, url; - if(parent.alignFrame.applet!=null) + if(av.applet!=null) { for (int i = 1; i < 10; i++) { - label = parent.alignFrame.applet.getParameter("linkLabel_" + i); - url = parent.alignFrame.applet.getParameter("linkURL_" + i); + label = av.applet.getParameter("linkLabel_" + i); + url = av.applet.getParameter("linkURL_" + i); if (label != null && url != null) links.addElement(label + "|" + url); @@ -230,6 +230,12 @@ public class IdPanel { lastid = start; + + if (end >= av.getAlignment().getHeight()) + { + end = av.getAlignment().getHeight() - 1; + } + if (end < start) { int tmp = start; @@ -256,7 +262,7 @@ public class IdPanel av.getSelectionGroup().recalcConservation(); mouseDragging = false; - PaintRefresher.Refresh(this, av.alignment); + PaintRefresher.Refresh(this, av.getSequenceSetId()); } public void highlightSearchResults(java.util.Vector found)