From ba2255324de03f4f66ed1883c105404c4c97c66b Mon Sep 17 00:00:00 2001
From: amwaterhouse <Andrew Waterhouse>
Date: Wed, 3 Aug 2005 13:08:14 +0000
Subject: [PATCH] Use Container to get fontMetrics

---
 src/jalview/gui/AlignViewport.java  |    5 ++---
 src/jalview/gui/AlignmentPanel.java |   13 +++----------
 2 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/src/jalview/gui/AlignViewport.java b/src/jalview/gui/AlignViewport.java
index 3af97ab..904e1e2 100755
--- a/src/jalview/gui/AlignViewport.java
+++ b/src/jalview/gui/AlignViewport.java
@@ -531,10 +531,9 @@ public class AlignViewport
     {
         font = f;
 
-        javax.swing.JFrame temp = new javax.swing.JFrame();
-        temp.addNotify();
+        Container c = new Container();
 
-        java.awt.FontMetrics fm = temp.getGraphics().getFontMetrics(font);
+        java.awt.FontMetrics fm = c.getFontMetrics(font);
         setCharHeight(fm.getHeight());
         setCharWidth(fm.charWidth('M'));
     }
diff --git a/src/jalview/gui/AlignmentPanel.java b/src/jalview/gui/AlignmentPanel.java
index d1b9350..7aff9ab 100755
--- a/src/jalview/gui/AlignmentPanel.java
+++ b/src/jalview/gui/AlignmentPanel.java
@@ -167,16 +167,9 @@ public class AlignmentPanel extends GAlignmentPanel
      */
     public Dimension calculateIdWidth()
     {
-        Graphics g = this.getGraphics();
+      Container c = new Container();
 
-        if (g == null)
-        {
-            javax.swing.JFrame f = new javax.swing.JFrame();
-            f.addNotify();
-            g = f.getGraphics();
-        }
-
-        FontMetrics fm = g.getFontMetrics(av.font);
+        FontMetrics fm = c.getFontMetrics(av.font);
         AlignmentI al = av.getAlignment();
 
         int i = 0;
@@ -209,7 +202,7 @@ public class AlignmentPanel extends GAlignmentPanel
 
         if (al.getAlignmentAnnotation() != null)
         {
-            fm = g.getFontMetrics(alabels.getFont());
+            fm = c.getFontMetrics(alabels.getFont());
 
             while (i < al.getAlignmentAnnotation().length)
             {
-- 
1.7.10.2