JAL-1807

[jalview.git] / src / jalview / appletgui / AlignmentPanel.java

diff --git a/src/jalview/appletgui/AlignmentPanel.java b/src/jalview/appletgui/AlignmentPanel.java
index d82b3c3..e7df488 100644 (file)
--- a/src/jalview/appletgui/AlignmentPanel.java
+++ b/src/jalview/appletgui/AlignmentPanel.java
@@ -33,10 +33,10 @@ import java.awt.BorderLayout;
 import java.awt.Color;
 import java.awt.Dimension;
 import java.awt.FontMetrics;
-import java.awt.Frame;
+import awt2swing.Frame;
 import java.awt.Graphics;
-import java.awt.Panel;
-import java.awt.Scrollbar;
+import awt2swing.Panel;
+import awt2swing.Scrollbar;
 import java.awt.event.AdjustmentEvent;
 import java.awt.event.AdjustmentListener;
 import java.awt.event.ComponentAdapter;
@@ -240,10 +240,9 @@ public class AlignmentPanel extends Panel implements AdjustmentListener,
     {
       av.nullFrame = new Frame();
       av.nullFrame.addNotify();
+      av.nullFrame.setFont(av.font);
     }
-
     Graphics g = av.nullFrame.getGraphics();
-
     FontMetrics fm = g.getFontMetrics(av.font);
     AlignmentI al = av.getAlignment();
 
@@ -768,6 +767,8 @@ public class AlignmentPanel extends Panel implements AdjustmentListener,
 
   public void adjustmentValueChanged(AdjustmentEvent evt)
   {
+       if (annotationPanel == null)
+               return; // BH in process of loading
     int oldX = av.getStartRes();
     int oldY = av.getStartSeq();
 
@@ -968,8 +969,9 @@ public class AlignmentPanel extends Panel implements AdjustmentListener,
     paint(g);
   }
 
-  public void paint(Graphics g)
+  public void paintComponent(Graphics g)
   {
+       System.out.println("alignframe paintcomp");
     invalidate();
     Dimension d = idPanel.idCanvas.getSize();
     final int canvasHeight = seqPanel.seqCanvas.getSize().height;
@@ -1003,16 +1005,16 @@ public class AlignmentPanel extends Panel implements AdjustmentListener,
       setScrollValues(av.getStartRes(), av.getStartSeq());
     }
 
-    seqPanel.seqCanvas.repaint();
-    idPanel.idCanvas.repaint();
+//bh    seqPanel.seqCanvas.repaint();
+//bh    idPanel.idCanvas.repaint();
     if (!av.getWrapAlignment())
     {
       if (av.isShowAnnotation())
       {
-        alabels.repaint();
-        annotationPanel.repaint();
+//bh        alabels.repaint();
+//bh        annotationPanel.repaint();
       }
-      scalePanel.repaint();
+//bh      scalePanel.repaint();
     }
 
   }