JAL-3397 final update

[jalview.git] / src / jalview / gui / AnnotationPanel.java

diff --git a/src/jalview/gui/AnnotationPanel.java b/src/jalview/gui/AnnotationPanel.java
index d8d27d0..af7bc26 100755 (executable)
--- a/src/jalview/gui/AnnotationPanel.java
+++ b/src/jalview/gui/AnnotationPanel.java
@@ -150,9 +150,7 @@ public class AnnotationPanel extends JPanel implements AwtRenderPanelI,
    */
   public AnnotationPanel(AlignmentPanel ap)
   {
-//         setBackground(Color.white);  // BH 2019
-
-           ToolTipManager.sharedInstance().registerComponent(this);
+    ToolTipManager.sharedInstance().registerComponent(this);
     ToolTipManager.sharedInstance().setInitialDelay(0);
     ToolTipManager.sharedInstance().setDismissDelay(10000);
     this.ap = ap;
@@ -1135,6 +1133,7 @@ public class AnnotationPanel extends JPanel implements AwtRenderPanelI,
 
     gg.dispose();
     
+
     fastPaint = true;
 
     // Call repaint on alignment panel so that repaints from other alignment
@@ -1299,18 +1298,23 @@ public class AnnotationPanel extends JPanel implements AwtRenderPanelI,
     // Here we only want to fastpaint on a scroll, with resize using a normal
     // paint, so scroll events are identified as changes to the horizontal or
     // vertical start value.
-    if (evt.getPropertyName().equals(ViewportRanges.STARTRES))
+    switch (evt.getPropertyName())
     {
+    case ViewportRanges.STARTRES:
       fastPaint((int) evt.getNewValue() - (int) evt.getOldValue());
-    }
-    else if (evt.getPropertyName().equals(ViewportRanges.STARTRESANDSEQ))
-    {
+      break;
+    case ViewportRanges.STARTRESANDSEQ:
       fastPaint(((int[]) evt.getNewValue())[0]
               - ((int[]) evt.getOldValue())[0]);
-    }
-    else if (evt.getPropertyName().equals(ViewportRanges.MOVE_VIEWPORT))
-    {
+      break;
+    case ViewportRanges.MOVE_VIEWPORT:
       repaint();
+      break;
+    case ViewportRanges.STARTSEQ:
+    case ViewportRanges.ENDRES:
+    case ViewportRanges.ENDSEQ:
+      // ignore
+      break;
     }
   }