JAL-2388 Reverted and re-did applet changes

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

diff --git a/src/jalview/appletgui/OverviewCanvas.java b/src/jalview/appletgui/OverviewCanvas.java
index c763308..ffba5b9 100644 (file)
--- a/src/jalview/appletgui/OverviewCanvas.java
+++ b/src/jalview/appletgui/OverviewCanvas.java
@@ -21,6 +21,7 @@
 package jalview.appletgui;
 
 import jalview.renderer.OverviewRenderer;
+import jalview.renderer.seqfeatures.FeatureColourFinder;
 import jalview.viewmodel.OverviewDimensions;
 
 import java.awt.Color;
@@ -28,9 +29,10 @@ import java.awt.Dimension;
 import java.awt.Frame;
 import java.awt.Graphics;
 import java.awt.Image;
-import java.awt.Panel;
 
-public class OverviewCanvas extends Panel
+import javax.swing.JComponent;
+
+public class OverviewCanvas extends JComponent
 {
   // This is set true if the alignment view changes whilst
   // the overview is being calculated
@@ -101,16 +103,6 @@ public class OverviewCanvas extends Panel
     }
   }
 
-  /**
-   * Draw the overview sequences
-   * 
-   * @param showSequenceFeatures
-   *          true if sequence features are to be shown
-   * @param showAnnotation
-   *          true if the annotation is to be shown
-   * @param transferRenderer
-   *          the renderer to transfer feature colouring from
-   */
   public void draw(boolean showSequenceFeatures, boolean showAnnotation,
           FeatureRenderer transferRenderer)
   {
@@ -120,10 +112,11 @@ public class OverviewCanvas extends Panel
     {
       fr.transferSettings(transferRenderer);
     }
+    FeatureColourFinder finder = new FeatureColourFinder(fr);
 
     setPreferredSize(new Dimension(od.getWidth(), od.getHeight()));
 
-    OverviewRenderer or = new OverviewRenderer(sr, fr, od);
+    OverviewRenderer or = new OverviewRenderer(sr, finder, od);
     miniMe = nullFrame.createImage(od.getWidth(), od.getHeight());
     offscreen = nullFrame.createImage(od.getWidth(), od.getHeight());
 
@@ -132,8 +125,7 @@ public class OverviewCanvas extends Panel
 
     Graphics mg = miniMe.getGraphics();
 
-    // checks for conservation annotation to make sure overview works for DNA
-    // too
+    // check for conservation annotation to make sure overview works for DNA too
     if (showAnnotation)
     {
       mg.translate(0, od.getSequencesHeight());