JAL-1807 Bob's first commit -- Applet loaded; needs image

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

diff --git a/src/jalview/appletgui/AlignViewport.java b/src/jalview/appletgui/AlignViewport.java
index ef17215..65d263a 100644 (file)
--- a/src/jalview/appletgui/AlignViewport.java
+++ b/src/jalview/appletgui/AlignViewport.java
@@ -22,7 +22,6 @@ package jalview.appletgui;
 
 import jalview.analysis.NJTree;
 import jalview.api.AlignViewportI;
-import jalview.api.FeatureRenderer;
 import jalview.bin.JalviewLite;
 import jalview.commands.CommandI;
 import jalview.datamodel.AlignmentI;
@@ -37,7 +36,9 @@ import jalview.structure.CommandListener;
 import jalview.structure.SelectionSource;
 import jalview.structure.StructureSelectionManager;
 import jalview.structure.VamsasSource;
+import jalview.util.Platform;
 import jalview.viewmodel.AlignmentViewport;
+import jalview.workers.AlignCalcManager;
 
 import java.awt.Font;
 
@@ -52,14 +53,12 @@ public class AlignViewport extends AlignmentViewport implements
 
   NJTree currentTree = null;
 
-  public jalview.bin.JalviewLite applet;
+  public JalviewLite applet;
 
   boolean MAC = false;
 
   private AnnotationColumnChooser annotationColumnSelectionState;
 
-  private FeatureRenderer featureRenderer;
-
   public void finalize()
   {
     applet = null;
@@ -71,7 +70,7 @@ public class AlignViewport extends AlignmentViewport implements
   public AlignViewport(AlignmentI al, JalviewLite applet)
   {
     super();
-    calculator = new jalview.workers.AlignCalcManager();
+    calculator = new AlignCalcManager();
     this.applet = applet;
     alignment = al;
     // we always pad gaps
@@ -132,7 +131,7 @@ public class AlignViewport extends AlignmentViewport implements
     }
     setFont(font);
 
-    MAC = new jalview.util.Platform().isAMac();
+    MAC = Platform.isAMac();
 
     if (applet != null)
     {
@@ -258,7 +257,7 @@ public class AlignViewport extends AlignmentViewport implements
     return sq;
   }
 
-  java.awt.Frame nullFrame;
+  awt2swing.Frame nullFrame;
 
   protected FeatureSettings featureSettings = null;
 
@@ -269,8 +268,9 @@ public class AlignViewport extends AlignmentViewport implements
     font = f;
     if (nullFrame == null)
     {
-      nullFrame = new java.awt.Frame();
+      nullFrame = new awt2swing.Frame();
       nullFrame.addNotify();
+      nullFrame.setFont(font);
     }
 
     java.awt.FontMetrics fm = nullFrame.getGraphics().getFontMetrics(font);
@@ -341,8 +341,7 @@ public class AlignViewport extends AlignmentViewport implements
   @Override
   public StructureSelectionManager getStructureSelectionManager()
   {
-    return jalview.structure.StructureSelectionManager
-            .getStructureSelectionManager(applet);
+    return StructureSelectionManager.getStructureSelectionManager(applet);
   }
 
   /**
@@ -470,17 +469,5 @@ public class AlignViewport extends AlignmentViewport implements
     }
   }
 
-  @Override
-  public FeatureRenderer getFeatureRenderer()
-  {
-    return featureRenderer;
-  }
-
-  @Override
-  public void setFeatureRenderer(FeatureRenderer featureRenderer)
-  {
-    this.featureRenderer = featureRenderer;
-
-  }
 
 }