X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=inline;f=src%2Fjalview%2Fappletgui%2FAnnotationPanel.java;h=4b9fa679f5d1254be3eca9543abcd27bc1f82bb5;hb=8ba93f7655ea7165579539158b6a5eb076135bba;hp=27043067549fbd7f7867899ce01abce85f17244b;hpb=b2f9a8d7bce642ff4011bc6d49e02bb0569fbb11;p=jalview.git
diff --git a/src/jalview/appletgui/AnnotationPanel.java b/src/jalview/appletgui/AnnotationPanel.java
index 2704306..4b9fa67 100755
--- a/src/jalview/appletgui/AnnotationPanel.java
+++ b/src/jalview/appletgui/AnnotationPanel.java
@@ -1,19 +1,21 @@
/*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.1)
+ * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.2)
* Copyright (C) 2014 The Jalview Authors
*
* This file is part of Jalview.
*
* Jalview is free software: you can redistribute it and/or
* modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
+ * as published by the Free Software Foundation, either version 3
+ * of the License, or (at your option) any later version.
*
* Jalview is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty
* of MERCHANTABILITY or FITNESS FOR A PARTICULAR
* PURPOSE. See the GNU General Public License for more details.
*
- * You should have received a copy of the GNU General Public License along with Jalview. If not, see .
+ * You should have received a copy of the GNU General Public License
+ * along with Jalview. If not, see .
* The Jalview Authors are detailed in the 'AUTHORS' file.
*/
package jalview.appletgui;
@@ -238,7 +240,7 @@ public class AnnotationPanel extends Panel implements AwtRenderPanelI,
aa[activeRow].hasText = true;
if (evt.getActionCommand().equals(STEM))
{
- aa[activeRow].showAllColLabels=true;
+ aa[activeRow].showAllColLabels = true;
}
}
@@ -323,7 +325,8 @@ public class AnnotationPanel extends Panel implements AwtRenderPanelI,
return;
}
- PopupMenu pop = new PopupMenu(MessageManager.getString("label.structure_type"));
+ PopupMenu pop = new PopupMenu(
+ MessageManager.getString("label.structure_type"));
MenuItem item;
/*
* Just display the needed structure options
@@ -624,7 +627,8 @@ public class AnnotationPanel extends Panel implements AwtRenderPanelI,
g.setColor(Color.black);
if (av.validCharWidth)
{
- g.drawString(MessageManager.getString("label.alignment_has_no_annotations"), 20, 15);
+ g.drawString(MessageManager
+ .getString("label.alignment_has_no_annotations"), 20, 15);
}
return;
@@ -636,10 +640,13 @@ public class AnnotationPanel extends Panel implements AwtRenderPanelI,
int scrollOffset = 0;
- public void setScrollOffset(int value)
+ public void setScrollOffset(int value, boolean repaint)
{
scrollOffset = value;
- repaint();
+ if (repaint)
+ {
+ repaint();
+ }
}
@Override
@@ -659,16 +666,21 @@ public class AnnotationPanel extends Panel implements AwtRenderPanelI,
{
return imgWidth;
}
+
private int[] bounds = new int[2];
+
@Override
public int[] getVisibleVRange()
{
- if (ap!=null && ap.alabels!=null)
+ if (ap != null && ap.alabels != null)
{
- int sOffset=-ap.alabels.scrollOffset;
- int visHeight = sOffset+ap.annotationPanelHolder.getHeight();
- bounds[0] = sOffset; bounds[1]=visHeight;
- return bounds;
- } else return null;
+ int sOffset = -ap.alabels.scrollOffset;
+ int visHeight = sOffset + ap.annotationPanelHolder.getHeight();
+ bounds[0] = sOffset;
+ bounds[1] = visHeight;
+ return bounds;
+ }
+ else
+ return null;
}
}