JAL-1551 tidy

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

diff --git a/src/jalview/datamodel/SequenceGroup.java b/src/jalview/datamodel/SequenceGroup.java
index 3439248..d403d6e 100755 (executable)
--- a/src/jalview/datamodel/SequenceGroup.java
+++ b/src/jalview/datamodel/SequenceGroup.java
@@ -20,6 +20,11 @@
  */
 package jalview.datamodel;
 
+import jalview.analysis.AAFrequency;
+import jalview.analysis.Conservation;
+import jalview.schemes.ColourSchemeI;
+import jalview.schemes.ResidueProperties;
+
 import java.awt.Color;
 import java.util.ArrayList;
 import java.util.Hashtable;
@@ -27,11 +32,6 @@ import java.util.List;
 import java.util.Map;
 import java.util.Vector;
 
-import jalview.analysis.AAFrequency;
-import jalview.analysis.Conservation;
-import jalview.schemes.ColourSchemeI;
-import jalview.schemes.ResidueProperties;
-
 /**
  * Collects a set contiguous ranges on a set of sequences
  * 
@@ -209,7 +209,7 @@ public class SequenceGroup implements AnnotatedCollectionI
       if (seqs[ipos] != null)
       {
         seqs[ipos].setDescription(seq.getDescription());
-        seqs[ipos].setDBRef(seq.getDBRef());
+        seqs[ipos].setDBRefs(seq.getDBRefs());
         seqs[ipos].setSequenceFeatures(seq.getSequenceFeatures());
         if (seq.getDatasetSequence() != null)
         {
@@ -613,13 +613,13 @@ public class SequenceGroup implements AnnotatedCollectionI
   {
     synchronized (sequences)
     {
-    if (sequences.contains(s))
-    {
-      deleteSequence(s, recalc);
-    }
-    else
-    {
-      addSequence(s, recalc);
+      if (sequences.contains(s))
+      {
+        deleteSequence(s, recalc);
+      }
+      else
+      {
+        addSequence(s, recalc);
       }
     }
   }
@@ -775,8 +775,9 @@ public class SequenceGroup implements AnnotatedCollectionI
     synchronized (sequences)
     {
       // MC This needs to get reset when characters are inserted and deleted
-      boolean first=true;
-      for (SequenceI seq:sequences) {
+      boolean first = true;
+      for (SequenceI seq : sequences)
+      {
         if (first || seq.getLength() > width)
         {
           width = seq.getLength();
@@ -893,6 +894,7 @@ public class SequenceGroup implements AnnotatedCollectionI
   /**
    * @return the representative sequence for this group
    */
+  @Override
   public SequenceI getSeqrep()
   {
     return seqrep;
@@ -905,6 +907,7 @@ public class SequenceGroup implements AnnotatedCollectionI
    * @param seqrep
    *          the seqrep to set (null means no sequence representative)
    */
+  @Override
   public void setSeqrep(SequenceI seqrep)
   {
     this.seqrep = seqrep;
@@ -914,6 +917,7 @@ public class SequenceGroup implements AnnotatedCollectionI
    * 
    * @return true if group has a sequence representative
    */
+  @Override
   public boolean hasSeqrep()
   {
     return seqrep != null;
@@ -1035,7 +1039,8 @@ public class SequenceGroup implements AnnotatedCollectionI
 
   /**
    * 
-   * @return automatically calculated consensus row
+   * @return automatically calculated consensus row note: the row is a stub if a
+   *         consensus calculation has not yet been performed on the group
    */
   public AlignmentAnnotation getConsensus()
   {