JAL-2805 more interface work

diff --git a/src/jalview/ext/archaeopteryx/JalviewToAptxAssociation.java b/src/jalview/ext/archaeopteryx/JalviewToAptxAssociation.java
index 4d34a96..7ee5918 100644 (file)
--- a/src/jalview/ext/archaeopteryx/JalviewToAptxAssociation.java
+++ b/src/jalview/ext/archaeopteryx/JalviewToAptxAssociation.java
@@ -10,7 +10,7 @@ import org.forester.phylogeny.Phylogeny;
 import org.forester.phylogeny.PhylogenyNode;
 
 public class JalviewToAptxAssociation
-        implements JalviewToSequenceAssociationI<Phylogeny>
+        implements JalviewToLoadedTreeAssociationI<Phylogeny>
 {
   SequenceI[] alignSequences;
 

diff --git a/src/jalview/ext/archaeopteryx/JalviewToLoadedTreeAssociationI.java b/src/jalview/ext/archaeopteryx/JalviewToLoadedTreeAssociationI.java
new file mode 100644 (file)
index 0000000..ad6a370
--- /dev/null
+++ b/src/jalview/ext/archaeopteryx/JalviewToLoadedTreeAssociationI.java
@@ -0,0 +1,15 @@
+package jalview.ext.archaeopteryx;
+
+import jalview.datamodel.SequenceI;
+
+/**
+ * Note that this will take anything as a Tree object.
+ * 
+ * @author kjvanderheide
+ *
+ * @param <T>
+ */
+interface JalviewToLoadedTreeAssociationI<T>
+{
+  public void associateLeavesToSequences(SequenceI[] seqs, T tree);
+}

diff --git a/src/jalview/ext/archaeopteryx/JalviewToSequenceAssociationI.java b/src/jalview/ext/archaeopteryx/JalviewToSequenceAssociationI.java
deleted file mode 100644 (file)
index 9f116a7..0000000
--- a/src/jalview/ext/archaeopteryx/JalviewToSequenceAssociationI.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package jalview.ext.archaeopteryx;
-
-import jalview.datamodel.SequenceI;
-
-interface JalviewToSequenceAssociationI<T>
-{
-  public void associateLeavesToSequences(SequenceI[] seqs, T tree);
-}