import jalview.analysis.scoremodels.SimilarityParams;
import jalview.api.analysis.ScoreModelI;
import jalview.datamodel.Alignment;
-import jalview.datamodel.ColumnSelection;
+import jalview.datamodel.HiddenColumns;
import jalview.datamodel.SequenceI;
import jalview.io.NewickFile;
import jalview.util.MessageManager;
import java.awt.event.ItemEvent;
import java.awt.event.ItemListener;
-public class TreePanel extends EmbmenuFrame implements ActionListener,
- ItemListener
+public class TreePanel extends EmbmenuFrame
+ implements ActionListener, ItemListener, AutoCloseable
{
SequenceI[] seq;
}
@Override
- public void finalize() throws Throwable
+ public void close()
{
ap = null;
av = null;
- super.finalize();
+ super.close();
}
/**
}
Object[] alAndColsel = tree.getOriginalData()
- .getAlignmentAndColumnSelection(gc);
+ .getAlignmentAndHiddenColumns(gc);
if (alAndColsel != null && alAndColsel[0] != null)
{
AlignFrame af = new AlignFrame(al, av.applet,
"Original Data for Tree", false);
- af.viewport.setHiddenColumns((ColumnSelection) alAndColsel[1]);
+ af.viewport.getAlignment()
+ .setHiddenColumns((HiddenColumns) alAndColsel[1]);
}
}
else
}
else
{
- ScoreModelI sm = configureScoreModel(pwtype);
- TreeBuilder njtree = type.equals(TreeBuilder.NEIGHBOUR_JOINING) ? new NJTree(
- av, sm, SimilarityParams.Jalview)
+ ScoreModelI sm1 = ScoreModels.getInstance().getScoreModel(pwtype,
+ treeCanvas.ap);
+ ScoreModelI sm = sm1;
+ TreeBuilder njtree = type.equals(TreeBuilder.NEIGHBOUR_JOINING)
+ ? new NJTree(av, sm, SimilarityParams.Jalview)
: new AverageDistanceTree(av, sm, SimilarityParams.Jalview);
tree = new TreeModel(njtree);
}
bootstrapMenu.setState(showBoots);
treeCanvas.setShowBootstrap(showBoots);
treeCanvas.setShowDistances(showDist);
- treeCanvas.setMarkPlaceholders(av.applet.getDefaultParameter(
- "showUnlinkedTreeNodes", false));
+ treeCanvas.setMarkPlaceholders(av.applet
+ .getDefaultParameter("showUnlinkedTreeNodes", false));
}
treeCanvas.repaint();
jMenu2.setLabel(MessageManager.getString("action.view"));
fontSize.setLabel(MessageManager.getString("action.font"));
fontSize.addActionListener(this);
- bootstrapMenu.setLabel(MessageManager
- .getString("label.show_bootstrap_values"));
+ bootstrapMenu.setLabel(
+ MessageManager.getString("label.show_bootstrap_values"));
bootstrapMenu.addItemListener(this);
distanceMenu.setLabel(MessageManager.getString("label.show_distances"));
distanceMenu.addItemListener(this);
- placeholdersMenu.setLabel(MessageManager
- .getString("label.mark_unassociated_leaves"));
+ placeholdersMenu.setLabel(
+ MessageManager.getString("label.mark_unassociated_leaves"));
placeholdersMenu.addItemListener(this);
fitToWindow.setState(true);
fitToWindow.setLabel(MessageManager.getString("label.fit_to_window"));
inputData.addActionListener(this);
}
- /**
- * Gets an instantiated score model for the given name, configured for the
- * current view if applicable
- *
- * @param modelName
- * @return
- */
- protected ScoreModelI configureScoreModel(String modelName)
- {
- ScoreModelI sm = ScoreModels.getInstance().getScoreModel(modelName,
- treeCanvas.ap);
- return sm;
- }
-
}