X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FAlignFrame.java;h=deb8d1105cfde5d51421c3be72a262f200716ae6;hb=f7ef599318242d5d63dbe1e9679224534f7b6aa3;hp=427cb00392114e64955482ee886b1f63de4ba5bd;hpb=adb0e40de73f283b41ff2cb76a9394ff848424f2;p=jalview.git diff --git a/src/jalview/gui/AlignFrame.java b/src/jalview/gui/AlignFrame.java index 427cb00..deb8d11 100644 --- a/src/jalview/gui/AlignFrame.java +++ b/src/jalview/gui/AlignFrame.java @@ -3898,46 +3898,41 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener, } @Override - protected void loadTreeDbItem_actionPerformed(ActionEvent e) - { - chooseTreeDb(); - } - - @Override protected void loadTreeBaseStudy_actionPerformed(ActionEvent e) { - // TODO Auto-generated method stub + chooseTreeDb(); } @Override protected void loadTreeOfLife_actionPerformed(ActionEvent e) { - // TODO Auto-generated method stub + chooseTreeDb(); } @Override protected void loadTreeFam_actionPerformed(ActionEvent e) { - // TODO Auto-generated method stub + chooseTreeDb(); } @Override protected void loadTreePfam_actionPerformed(ActionEvent e) { - // TODO Auto-generated method stub + chooseTreeDb(); } @Override protected void loadTreeBase_actionPerformed(ActionEvent e) { - // TODO Auto-generated method stub + chooseTreeDb(); } + public void chooseTreeFile() { // Pick the tree file @@ -3960,7 +3955,8 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener, { String filePath = chooser.getSelectedFile().getPath(); Cache.setProperty("LAST_DIRECTORY", filePath); - + + TreeParser treeParser = new TreeParser(filePath); treeParser.loadTree(viewport); @@ -4038,6 +4034,7 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener, { + } public TreePanel showNewickTree(NewickFile nf, String treeTitle)