X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FAlignFrame.java;h=71f240b205b99af556b12224de1ffb27de3732d5;hb=91bea2a1185e438bfd52fc1848cf615068016192;hp=1c19eb1d900267bd945c2c113e2d31c597979083;hpb=7bf767decd23672a1b5eb67974c99f58c54f788f;p=jalview.git diff --git a/src/jalview/gui/AlignFrame.java b/src/jalview/gui/AlignFrame.java index 1c19eb1..71f240b 100644 --- a/src/jalview/gui/AlignFrame.java +++ b/src/jalview/gui/AlignFrame.java @@ -60,9 +60,9 @@ import jalview.datamodel.SeqCigar; import jalview.datamodel.Sequence; import jalview.datamodel.SequenceGroup; import jalview.datamodel.SequenceI; -import jalview.ext.forester.io.ExternalTreeParserI; -import jalview.ext.forester.io.ForesterTreeParser; import jalview.ext.forester.io.SupportedTreeFileFilter; +import jalview.ext.forester.io.TreeParser; +import jalview.ext.treeviewer.ExternalTreeParserI; import jalview.gui.ColourMenuHelper.ColourChangeListener; import jalview.gui.ViewSelectionMenu.ViewSetProvider; import jalview.io.AlignmentProperties; @@ -3771,6 +3771,7 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener, @Override public void actionPerformed(ActionEvent e) { + // adapt to Aptx tp.sortByTree_actionPerformed(); addHistoryItem(tp.sortAlignmentIn(alignPanel)); @@ -3903,7 +3904,7 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener, NewickFile fin = null; try { - ExternalTreeParserI treeParser = new ForesterTreeParser( + ExternalTreeParserI treeParser = new TreeParser( filePath); treeParser.loadTreeFile(viewport);