JAL-2388 Tidies and unit tests

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

diff --git a/src/jalview/appletgui/OverviewCanvas.java b/src/jalview/appletgui/OverviewCanvas.java
index ffba5b9..23e82df 100644 (file)
--- a/src/jalview/appletgui/OverviewCanvas.java
+++ b/src/jalview/appletgui/OverviewCanvas.java
@@ -21,18 +21,16 @@
 package jalview.appletgui;
 
 import jalview.renderer.OverviewRenderer;
-import jalview.renderer.seqfeatures.FeatureColourFinder;
 import jalview.viewmodel.OverviewDimensions;
 
 import java.awt.Color;
+import java.awt.Component;
 import java.awt.Dimension;
 import java.awt.Frame;
 import java.awt.Graphics;
 import java.awt.Image;
 
-import javax.swing.JComponent;
-
-public class OverviewCanvas extends JComponent
+public class OverviewCanvas extends Component
 {
   // This is set true if the alignment view changes whilst
   // the overview is being calculated
@@ -112,26 +110,26 @@ public class OverviewCanvas extends JComponent
     {
       fr.transferSettings(transferRenderer);
     }
-    FeatureColourFinder finder = new FeatureColourFinder(fr);
 
     setPreferredSize(new Dimension(od.getWidth(), od.getHeight()));
 
-    OverviewRenderer or = new OverviewRenderer(sr, finder, od);
+    OverviewRenderer or = new OverviewRenderer(sr, fr, od);
     miniMe = nullFrame.createImage(od.getWidth(), od.getHeight());
     offscreen = nullFrame.createImage(od.getWidth(), od.getHeight());
 
     miniMe = or.draw(od.getRows(av.getAlignment()),
-            od.getColumns(av.getAlignment().getHiddenColumns()));
+            od.getColumns(av.getAlignment()));
 
     Graphics mg = miniMe.getGraphics();
 
-    // check for conservation annotation to make sure overview works for DNA too
+    // checks for conservation annotation to make sure overview works for DNA
+    // too
     if (showAnnotation)
     {
       mg.translate(0, od.getSequencesHeight());
       or.drawGraph(mg, av.getAlignmentConservationAnnotation(),
               av.getCharWidth(), od.getGraphHeight(),
-              od.getColumns(av.getAlignment().getHiddenColumns()));
+              od.getColumns(av.getAlignment()));
       mg.translate(0, -od.getSequencesHeight());
     }
     System.gc();