X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fappletgui%2FOverviewCanvas.java;h=07f591971754be002438eb8392145dba1f51bdec;hb=refs%2Fheads%2Ftask%2FJAL-3252_adapt_getdown_to_unpack_tgz_resource_files;hp=718c15b46bb3bedef710f1a3c7fdd4f205aa83de;hpb=fb548a8458941602b0b8b45da5aaf60206e10ec2;p=jalview.git diff --git a/src/jalview/appletgui/OverviewCanvas.java b/src/jalview/appletgui/OverviewCanvas.java index 718c15b..07f5919 100644 --- 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.OverviewResColourFinder; import jalview.viewmodel.OverviewDimensions; import java.awt.Color; @@ -112,7 +113,7 @@ public class OverviewCanvas extends Component setPreferredSize(new Dimension(od.getWidth(), od.getHeight())); or = new OverviewRenderer(fr, od, av.getAlignment(), - av.getResidueShading()); + av.getResidueShading(), new OverviewResColourFinder()); miniMe = nullFrame.createImage(od.getWidth(), od.getHeight()); offscreen = nullFrame.createImage(od.getWidth(), od.getHeight()); @@ -127,11 +128,9 @@ public class OverviewCanvas extends Component { 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(); if (restart) { @@ -163,4 +162,12 @@ public class OverviewCanvas extends Component } } + /** + * Nulls references to protect against potential memory leaks + */ + void dispose() + { + od = null; + } + }