JAL-1517 update copyright to version 2.8.2

[jalview.git] / src / jalview / io / vamsas / Tree.java

diff --git a/src/jalview/io/vamsas/Tree.java b/src/jalview/io/vamsas/Tree.java
index 5caded1..02ce434 100644 (file)
--- a/src/jalview/io/vamsas/Tree.java
+++ b/src/jalview/io/vamsas/Tree.java
@@ -1,19 +1,20 @@
 /*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.7)
- * Copyright (C) 2011 J Procter, AM Waterhouse, J Engelhardt, LM Lui, G Barton, M Clamp, S Searle
- *
+ * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.2)
+ * Copyright (C) 2014 The Jalview Authors
+ * 
  * This file is part of Jalview.
- *
+ * 
  * Jalview is free software: you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
+ * modify it under the terms of the GNU General Public License 
  * as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
- *
- * Jalview is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty
- * of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ *  
+ * Jalview is distributed in the hope that it will be useful, but 
+ * WITHOUT ANY WARRANTY; without even the implied warranty 
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR 
  * PURPOSE.  See the GNU General Public License for more details.
- *
+ * 
  * You should have received a copy of the GNU General Public License along with Jalview.  If not, see <http://www.gnu.org/licenses/>.
+ * The Jalview Authors are detailed in the 'AUTHORS' file.
  */
 package jalview.io.vamsas;
 
@@ -99,7 +100,7 @@ public class Tree extends DatastoreItem
 
   /*
    * (non-Javadoc)
-   *
+   * 
    * @see jalview.io.vamsas.DatastoreItem#addFromDocument()
    */
   @Override
@@ -130,7 +131,7 @@ public class Tree extends DatastoreItem
 
   /*
    * (non-Javadoc)
-   *
+   * 
    * @see jalview.io.vamsas.DatastoreItem#conflict()
    */
   @Override
@@ -142,7 +143,7 @@ public class Tree extends DatastoreItem
 
   /*
    * (non-Javadoc)
-   *
+   * 
    * @see jalview.io.vamsas.DatastoreItem#update()
    */
   @Override
@@ -163,7 +164,7 @@ public class Tree extends DatastoreItem
 
   /*
    * (non-Javadoc)
-   *
+   * 
    * @see jalview.io.vamsas.DatastoreItem#updateFromDoc()
    */
   @Override
@@ -174,7 +175,7 @@ public class Tree extends DatastoreItem
     // TODO: Tree.updateFromDoc
     /*
      * TreePanel tp = (TreePanel) jvobj; // getvObj2jv(tree);
-     *
+     * 
      * // make a new tree Object[] idata =
      * recoverInputData(tree.getProvenance()); try { if (idata != null &&
      * idata[0] != null) { inputData = (AlignmentView) idata[0]; } ntree =
@@ -201,7 +202,7 @@ public class Tree extends DatastoreItem
   /**
    * correctly creates provenance for trees calculated on an alignment by
    * jalview.
-   *
+   * 
    * @param jal
    * @param tp
    * @return
@@ -256,7 +257,7 @@ public class Tree extends DatastoreItem
 
   /**
    * look up SeqCigars in an existing alignment.
-   *
+   * 
    * @param jal
    * @param sequences
    * @return vector of alignment sequences in order of SeqCigar array (but
@@ -268,22 +269,24 @@ public class Tree extends DatastoreItem
     System.arraycopy(sequences, 0, tseqs, 0, sequences.length);
     Vector alsq = new Vector();
     List<SequenceI> jalsqs;
-    synchronized (jalsqs=jal.getSequences())
-    {for (SequenceI asq:jalsqs)
+    synchronized (jalsqs = jal.getSequences())
     {
-      for (int t = 0; t < sequences.length; t++)
+      for (SequenceI asq : jalsqs)
       {
-        if (tseqs[t] != null
-                && (tseqs[t].getRefSeq() == asq || tseqs[t].getRefSeq() == asq
-                        .getDatasetSequence()))
-        // && tseqs[t].getStart()>=asq.getStart() &&
-        // tseqs[t].getEnd()<=asq.getEnd())
+        for (int t = 0; t < sequences.length; t++)
         {
-          tseqs[t] = null;
-          alsq.add(asq);
+          if (tseqs[t] != null
+                  && (tseqs[t].getRefSeq() == asq || tseqs[t].getRefSeq() == asq
+                          .getDatasetSequence()))
+          // && tseqs[t].getStart()>=asq.getStart() &&
+          // tseqs[t].getEnd()<=asq.getEnd())
+          {
+            tseqs[t] = null;
+            alsq.add(asq);
+          }
         }
       }
-    }}
+    }
     if (alsq.size() < sequences.length)
       Cache.log
               .warn("Not recovered all alignment sequences for given set of input sequence CIGARS");
@@ -291,9 +294,9 @@ public class Tree extends DatastoreItem
   }
 
   /**
-   *
+   * 
    * Update jalview newick representation with TreeNode map
-   *
+   * 
    * @param tp
    *          the treepanel that this tree is bound to.
    */
@@ -358,7 +361,7 @@ public class Tree extends DatastoreItem
   // / TODO: refactor to vamsas :start
   /**
    * construct treenode mappings for mapped sequences
-   *
+   * 
    * @param ntree
    * @param newick
    * @return
@@ -435,7 +438,7 @@ public class Tree extends DatastoreItem
 
   /**
    * call to match up Treenode specs to NJTree parsed from document object.
-   *
+   * 
    * @param nodespec
    * @param leaves
    *          as returned from NJTree.findLeaves( .., ..) ..
@@ -476,7 +479,7 @@ public class Tree extends DatastoreItem
   // todo: end refactor to vamsas library
   /**
    * add jalview object to vamsas document
-   *
+   * 
    */
   @Override
   public void addToDocument()
@@ -497,7 +500,7 @@ public class Tree extends DatastoreItem
   /**
    * note: this function assumes that all sequence and alignment objects
    * referenced in input data has already been associated with jalview objects.
-   *
+   * 
    * @param tp
    * @param alignFrame
    * @return Object[] { AlignmentView, AlignmentI - reference alignment for