JAL-2805 Jalview sequence binding interface expanded

diff --git a/src/jalview/ext/archaeopteryx/ArchaeopteryxInit.java b/src/jalview/ext/archaeopteryx/ArchaeopteryxInit.java
index ce0917d..bd7de87 100644 (file)
--- a/src/jalview/ext/archaeopteryx/ArchaeopteryxInit.java
+++ b/src/jalview/ext/archaeopteryx/ArchaeopteryxInit.java
@@ -54,10 +54,10 @@ public final class ArchaeopteryxInit
   public static MainFrame createInstance(
           final TreeBuilder calculatedTree) // very dense method, to be split up
   {
-    ArchaeopteryxTreeConverter aptxTreeBuilder = new ArchaeopteryxTreeConverter(
+    ExternalTreeBuilderI<Phylogeny, PhylogenyNode> aptxTreeBuilder = new ArchaeopteryxTreeBuilder(
             calculatedTree);
 
-    Phylogeny aptxTree = aptxTreeBuilder.buildAptxTree();
+    Phylogeny aptxTree = aptxTreeBuilder.buildTree();
     Phylogeny[] aptxTrees = { aptxTree }; // future possibility to load in
                                           // several trees simultaneously
 
@@ -81,7 +81,7 @@ public final class ArchaeopteryxInit
     return aptxApp;
   }
 
-  public static JalviewTreeViewerBindingI bindNodesToJalviewSequences(
+  public static JalviewTreeViewerBindingI<?> bindNodesToJalviewSequences(
           final MainFrame aptxApp,
           final AlignmentViewport jalviewAlignViewport,
           final Map<SequenceI, PhylogenyNode> alignMappedToNodes,

diff --git a/src/jalview/ext/archaeopteryx/JalviewAptxBinding.java b/src/jalview/ext/archaeopteryx/JalviewAptxBinding.java
index f3305fd..0a444b2 100644 (file)
--- a/src/jalview/ext/archaeopteryx/JalviewAptxBinding.java
+++ b/src/jalview/ext/archaeopteryx/JalviewAptxBinding.java
@@ -28,7 +28,8 @@ import org.forester.phylogeny.PhylogenyNode;
  * @author kjvanderheide
  *
  */
-public final class JalviewAptxBinding implements JalviewTreeViewerBindingI
+public final class JalviewAptxBinding
+        implements JalviewTreeViewerBindingI<PhylogenyNode>
 {
   private org.forester.archaeopteryx.TreePanel treeView;
 
@@ -166,6 +167,7 @@ public final class JalviewAptxBinding implements JalviewTreeViewerBindingI
 
 
 
+  @Override
   public void showMatchingSequence(final PhylogenyNode nodeToMatch)
   {
     SequenceI matchingSequence = nodesBoundToSequences.get(nodeToMatch);
@@ -177,6 +179,7 @@ public final class JalviewAptxBinding implements JalviewTreeViewerBindingI
     }
   }
 
+  @Override
   public void showMatchingChildSequences(final PhylogenyNode parentNode)
   {
     final List<PhylogenyNode> childNodes = PhylogenyMethods

diff --git a/src/jalview/ext/archaeopteryx/JalviewTreeViewerBindingI.java b/src/jalview/ext/archaeopteryx/JalviewTreeViewerBindingI.java
index f506024..f7183af 100644 (file)
--- a/src/jalview/ext/archaeopteryx/JalviewTreeViewerBindingI.java
+++ b/src/jalview/ext/archaeopteryx/JalviewTreeViewerBindingI.java
@@ -35,13 +35,16 @@ import java.awt.event.MouseListener;
  * @author kjvanderheide
  *
  */
-interface JalviewTreeViewerBindingI
+interface JalviewTreeViewerBindingI<N>
         extends ActionListener, MouseListener, SelectionListener,
         SelectionSource
 {
   public void showNodeSelectionOnAlign(MouseEvent e);
 
-  public void treeSelectionChanged(final SequenceI sequence);
+  public void treeSelectionChanged(SequenceI sequence);
 
+  public void showMatchingSequence(N nodeToMatch);
+
+  public void showMatchingChildSequences(N parentNode);
 
 }