JAL-2838 JAL-2872 added sorting from the Aptx frame (still misbehaving

[jalview.git] / src / jalview / ext / archaeopteryx / AptxFrame.java

diff --git a/src/jalview/ext/archaeopteryx/AptxFrame.java b/src/jalview/ext/archaeopteryx/AptxFrame.java
index 9a47836..79798d3 100644 (file)
--- a/src/jalview/ext/archaeopteryx/AptxFrame.java
+++ b/src/jalview/ext/archaeopteryx/AptxFrame.java
@@ -1,10 +1,11 @@
 package jalview.ext.archaeopteryx;
 
 import jalview.bin.Cache;
-import jalview.ext.treeviewer.ExternalTreeControlsI;
-import jalview.ext.treeviewer.ExternalTreeFrame;
-import jalview.ext.treeviewer.ExternalTreeI;
-import jalview.ext.treeviewer.ExternalTreePanel;
+import jalview.ext.treeviewer.TreeControlsI;
+import jalview.ext.treeviewer.TreeFrameI;
+import jalview.ext.treeviewer.TreeI;
+import jalview.ext.treeviewer.TreePanelI;
+import jalview.ext.treeviewer.TreeViewerUtils;
 import jalview.gui.Desktop;
 import jalview.gui.EPSOptions;
 import jalview.io.JalviewFileChooser;
@@ -38,13 +39,13 @@ import org.forester.archaeopteryx.MainFrame;
 import org.forester.phylogeny.Phylogeny;
 import org.jibble.epsgraphics.EpsGraphics2D;
 
-public class AptxFrame implements ExternalTreeFrame
+public class AptxFrame implements TreeFrameI
 {
   private final MainFrame aptxFrame;
 
-  private ExternalTreePanel aptxPanel;
+  private TreePanelI aptxPanel;
 
-  private ExternalTreeControlsI aptxControls;
+  private TreeControlsI aptxControls;
 
 
   public AptxFrame(Phylogeny tree, Configuration aptxConfig,
@@ -146,13 +147,26 @@ public class AptxFrame implements ExternalTreeFrame
                 "Filter alignment to show only currently visible sequences");
 
         refreshJalview.setFont(menu.getFont());
+        refreshJalview.addActionListener(
+                TreeViewerUtils.getActiveTreeViews().get(this));
+        sortByTree.addActionListener(new ActionListener()
+        {
+
+          @Override
+          public void actionPerformed(ActionEvent e)
+          {
+            TreeViewerUtils.getActiveTreeViews().get(AptxFrame.this)
+                    .sortByTree_actionPerformed();
+
+          }
+
+        });
 
         menu.add(sortByTree);
         menu.add(refreshJalview);
 
         sortByTree.setFont(menu.getFont());
-        refreshJalview
-                .addActionListener(AptxInit.getAllAptxFrames().get(this));
+
 
 
       }
@@ -228,13 +242,13 @@ public class AptxFrame implements ExternalTreeFrame
     }
   }
   @Override
-  public ExternalTreePanel getTreePanel()
+  public TreePanelI getTreePanel()
   {
     return aptxPanel;
   }
 
   @Override
-  public ExternalTreeI getTree()
+  public TreeI getTree()
   {
     return aptxPanel.getTree();
   }
@@ -253,7 +267,7 @@ public class AptxFrame implements ExternalTreeFrame
   }
 
   @Override
-  public ExternalTreeControlsI getTreeControls()
+  public TreeControlsI getTreeControls()
   {
     return aptxControls;
   }