Merge branch 'kjvdh/features/PhylogenyViewer' of
[jalview.git] / src / jalview / gui / AlignFrame.java
index 1c19eb1..71f240b 100644 (file)
@@ -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);