X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fext%2Farchaeopteryx%2FAptxFrame.java;h=92d2da236d4d202ca217ad01f6347d4a198b9642;hb=2c3b0597cfb782c08f8ec3686412fc4975a1dbd3;hp=c517ed3a96230fb1cad91a066ac27ab6731ad553;hpb=163acbff0a52f00ca79bd5eec693009738d1b370;p=jalview.git

diff --git a/src/jalview/ext/archaeopteryx/AptxFrame.java b/src/jalview/ext/archaeopteryx/AptxFrame.java
index c517ed3..92d2da2 100644
--- a/src/jalview/ext/archaeopteryx/AptxFrame.java
+++ b/src/jalview/ext/archaeopteryx/AptxFrame.java
@@ -1,10 +1,12 @@
 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.TreeViewerBindingI;
+import jalview.ext.treeviewer.TreeViewerUtils;
 import jalview.gui.Desktop;
 import jalview.gui.EPSOptions;
 import jalview.io.JalviewFileChooser;
@@ -38,13 +40,15 @@ 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 ExternalTreeControlsI aptxControls;
+
+  private TreePanelI aptxPanel;
+
+  private TreeControlsI aptxControls;
 
 
   public AptxFrame(Phylogeny tree, Configuration aptxConfig,
@@ -146,23 +150,36 @@ public class AptxFrame implements ExternalTreeFrame
                 "Filter alignment to show only currently visible sequences");
 
         refreshJalview.setFont(menu.getFont());
-
-        menu.add(sortByTree);
-        menu.add(refreshJalview);
-
-        sortByTree.setFont(menu.getFont());
-        refreshJalview.addActionListener(new ActionListener()
+        refreshJalview.addActionListener(new ActionListener() {
+          
+          @Override
+          public void actionPerformed(ActionEvent e) {
+            TreeViewerBindingI bindingManager = TreeViewerUtils
+                    .getActiveTreeViews().get(AptxFrame.this);
+            bindingManager.actionPerformed(e);
+          }
+        });
+                
+        sortByTree.addActionListener(new ActionListener()
         {
 
           @Override
           public void actionPerformed(ActionEvent e)
           {
-            // TODO Auto-generated method stub
+            TreeViewerBindingI bindingManager = TreeViewerUtils
+                    .getActiveTreeViews().get(AptxFrame.this);
+            bindingManager.sortByTree_actionPerformed();
 
           }
 
         });
 
+        menu.add(sortByTree);
+        menu.add(refreshJalview);
+
+        sortByTree.setFont(menu.getFont());
+
+
 
       }
 
@@ -237,13 +254,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();
   }
@@ -262,7 +279,7 @@ public class AptxFrame implements ExternalTreeFrame
   }
 
   @Override
-  public ExternalTreeControlsI getTreeControls()
+  public TreeControlsI getTreeControls()
   {
     return aptxControls;
   }