JAL-3521 Change grouped Jalview windows on linux taskbar to have name Jalview
[jalview.git] / src / jalview / gui / OverviewCanvas.java
index 2991889..0f49381 100644 (file)
@@ -25,6 +25,7 @@ import jalview.bin.Cache;
 import jalview.renderer.OverviewRenderer;
 import jalview.renderer.OverviewResColourFinder;
 import jalview.viewmodel.OverviewDimensions;
+import jalview.viewmodel.seqfeatures.FeatureRendererModel;
 
 import java.awt.Color;
 import java.awt.Dimension;
@@ -132,7 +133,7 @@ public class OverviewCanvas extends JComponent
    *          the renderer to transfer feature colouring from
    */
   public void draw(boolean showSequenceFeatures, boolean showAnnotation,
-          FeatureRenderer transferRenderer)
+          FeatureRendererModel transferRenderer)
   {
     miniMe = null;
 
@@ -157,11 +158,9 @@ public class OverviewCanvas extends JComponent
     {
       mg.translate(0, od.getSequencesHeight());
       or.drawGraph(mg, av.getAlignmentConservationAnnotation(),
-              av.getCharWidth(), od.getGraphHeight(),
-              od.getColumns(av.getAlignment()));
+              od.getGraphHeight(), od.getColumns(av.getAlignment()));
       mg.translate(0, -od.getSequencesHeight());
     }
-    System.gc();
 
     or.removePropertyChangeListener(progressPanel);
     or = null;
@@ -183,7 +182,7 @@ public class OverviewCanvas extends JComponent
   @Override
   public void paintComponent(Graphics g)
   {
-    // super.paintComponent(g);
+    super.paintComponent(g);
 
     if (restart)
     {
@@ -259,6 +258,7 @@ public class OverviewCanvas extends JComponent
   public void dispose()
   {
     dispose = true;
+    od = null;
     synchronized (this)
     {
       restart = true;