Merge branch 'develop' into features/JAL-4134_use_annotation_row_for_colours_and_groups

[jalview.git] / src / jalview / datamodel / SequenceNode.java

diff --git a/src/jalview/datamodel/SequenceNode.java b/src/jalview/datamodel/SequenceNode.java
index 30179f5..9d00fa5 100755 (executable)
--- a/src/jalview/datamodel/SequenceNode.java
+++ b/src/jalview/datamodel/SequenceNode.java
@@ -26,7 +26,7 @@ package jalview.datamodel;
  * @author $author$
  * @version $Revision$
  */
-public class SequenceNode extends BinaryNode
+public class SequenceNode extends BinaryNode<SequenceI>
 {
   private boolean placeholder = false;
 
@@ -38,57 +38,22 @@ public class SequenceNode extends BinaryNode
     super();
   }
 
-  /**
-   * Creates a new SequenceNode object.
-   * 
-   * @param val
-   *          DOCUMENT ME!
-   * @param parent
-   *          DOCUMENT ME!
-   * @param dist
-   *          DOCUMENT ME!
-   * @param name
-   *          DOCUMENT ME!
-   */
-  public SequenceNode(Object val, BinaryNode parent, double dist,
-          String name)
+  public SequenceNode(SequenceI val, BinaryNode<SequenceI> parent,
+          String name, double dist, int bootstrap, boolean dummy)
   {
-    super(val, parent, name);
-    this.dist = dist;
+    super(val, parent, name, dist, bootstrap, dummy);
   }
 
-  /**
-   * Creates a new SequenceNode object.
-   * 
-   * @param val
-   *          DOCUMENT ME!
-   * @param parent
-   *          DOCUMENT ME!
-   * @param name
-   *          DOCUMENT ME!
-   * @param dist
-   *          DOCUMENT ME!
-   * @param bootstrap
-   *          DOCUMENT ME!
-   * @param dummy
-   *          DOCUMENT ME!
-   */
-  public SequenceNode(Object val, BinaryNode parent, String name,
-          double dist, int bootstrap, boolean dummy)
+  public SequenceNode(SequenceI element, BinaryNode<SequenceI> parent,
+          String name, double dist, int bootstrap)
   {
-    super(val, parent, name);
-    this.dist = dist;
-    this.bootstrap = bootstrap;
-    this.dummy = dummy;
+    super(element, parent, name, dist, bootstrap);
   }
 
-  /**
-   * @param dummy
-   *          true if node is created for the representation of polytomous trees
-   */
-  public boolean isDummy()
+  public SequenceNode(SequenceI element, BinaryNode<SequenceI> parent,
+          String name, double dist)
   {
-    return dummy;
+    super(element, parent, name, dist);
   }
 
   /*
@@ -103,22 +68,6 @@ public class SequenceNode extends BinaryNode
   /**
    * DOCUMENT ME!
    * 
-   * @param newstate
-   *          DOCUMENT ME!
-   * 
-   * @return DOCUMENT ME!
-   */
-  public boolean setDummy(boolean newstate)
-  {
-    boolean oldstate = dummy;
-    dummy = newstate;
-
-    return oldstate;
-  }
-
-  /**
-   * DOCUMENT ME!
-   * 
    * @param Placeholder
    *          DOCUMENT ME!
    */