X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fdatamodel%2FAlignment.java;h=b4e2b3f45be44f4ef1db3623dbf085a6b4aee2cc;hb=9807ea8cc4e867378c52d51b832168d4bc611d29;hp=2545ec1355a8d852ea3201da6ddc9048fd9addf8;hpb=7e4c4ad887a30dc26496087b0150f4ac2fe355ec;p=jalview.git

diff --git a/src/jalview/datamodel/Alignment.java b/src/jalview/datamodel/Alignment.java
index 2545ec1..b4e2b3f 100755
--- a/src/jalview/datamodel/Alignment.java
+++ b/src/jalview/datamodel/Alignment.java
@@ -59,6 +59,16 @@ public class Alignment implements AlignmentI
         for (i = 0; i < seqs.length; i++)
         {
             sequences.addElement(seqs[i]);
+
+            if(seqs[i].getDatasetSequence()!=null
+            && seqs[i].getDatasetSequence().getAnnotation()!=null)
+            {
+
+              for(int a=0; a<seqs[i].getDatasetSequence().getAnnotation().length; a++)
+              {
+                       this.addAnnotation(seqs[i].getDatasetSequence().getAnnotation()[a], seqs[i]);
+              }
+            }
         }
 
         getWidth();
@@ -380,47 +390,7 @@ public class Alignment implements AlignmentI
         return ret;
     }
 
-    /**
-     * DOCUMENT ME!
-     *
-     * @param sg DOCUMENT ME!
-     */
-    public void addSuperGroup(SuperGroup sg)
-    {
-        superGroup.addElement(sg);
-    }
-
-    /**
-     * DOCUMENT ME!
-     *
-     * @param sg DOCUMENT ME!
-     */
-    public void removeSuperGroup(SuperGroup sg)
-    {
-        superGroup.removeElement(sg);
-    }
-
-    /**
-     * DOCUMENT ME!
-     *
-     * @param sg DOCUMENT ME!
-     *
-     * @return DOCUMENT ME!
-     */
-    public SuperGroup getSuperGroup(SequenceGroup sg)
-    {
-        for (int i = 0; i < this.superGroup.size(); i++)
-        {
-            SuperGroup temp = (SuperGroup) superGroup.elementAt(i);
-
-            if (temp.sequenceGroups.contains(sg))
-            {
-                return temp;
-            }
-        }
 
-        return null;
-    }
 
     /**    */
     public void addGroup(SequenceGroup sg)
@@ -642,25 +612,83 @@ public class Alignment implements AlignmentI
         annotations = temp;
     }
 
-
-    public void addAnnotation(AlignmentAnnotation aa, SequenceI seqRef, int index)
+    /**
+     *
+     * @param aa AlignmentAnnotation
+     * @param seqRef The sequence to associate this annotation with
+     * @return The adjusted AlignmentAnnotation, with dataset sequence and annotation added
+     */
+    public AlignmentAnnotation addAnnotation(AlignmentAnnotation aa, SequenceI seqRef)
     {
-      aa.refSequence = seqRef;
-      if(seqRef!=null && index!=0)
+      if(seqRef!=null)
       {
-        int aSize = aa.annotations.length;
-        int newIndex;
-        Annotation [] temp = new Annotation[seqRef.getLength()];
-        for(int a=0; a<aSize; a++)
+          //We can only add Annotations to the dataset sequences
+           if(seqRef.getDatasetSequence()==null)
+           {
+                  setDataset(null);
+            }
+
+        AlignmentAnnotation []  old = seqRef.getDatasetSequence().getAnnotation();
+
+        //First check if this is a new annotation or not. If it is new,
+        //we must add the annotation to the dataset
+        boolean newAnnotation = true;
+        if(seqRef.getDatasetSequence().getAnnotation()!=null)
         {
-          newIndex = seqRef.findIndex(a + index)-1;
-          temp[newIndex] = aa.annotations[a];
+          for(int a=0; a<old.length; a++)
+          {
+            if(old[a] == aa)
+            {
+
+              newAnnotation = false;
+              break;
+            }
+          }
         }
 
-        aa.annotations = temp;
+        if(newAnnotation)
+         {
+           seqRef.getDatasetSequence().addAlignmentAnnotation(aa);
+         }
+
+          AlignmentAnnotation copy = null;
+          if (aa.graph > 0)
+            copy = new AlignmentAnnotation(
+                aa.label, aa.description, aa.annotations, aa.graphMin,
+                aa.graphMax, aa.graph
+                );
+          else
+            copy = new AlignmentAnnotation(
+                aa.label, aa.description, aa.annotations
+                );
+
+         copy.datasetAnnotation = aa;
+
+         addAnnotation(copy);
+
+         copy.sequenceRef = seqRef;
+
+         return copy;
+      }
+      else
+      {
+        addAnnotation(aa);
+        return aa;
       }
+    }
 
-      addAnnotation(aa);
+    public void adjustSequenceAnnotations()
+    {
+      if(annotations!=null)
+      {
+        for (int a = 0; a < annotations.length; a++)
+        {
+          if (annotations[a].sequenceRef != null)
+          {
+            annotations[a].adjustForAlignment();
+          }
+        }
+      }
     }
 
     /**
@@ -671,30 +699,52 @@ public class Alignment implements AlignmentI
     public void addAnnotation(AlignmentAnnotation aa)
     {
         int aSize = 1;
-
         if (annotations != null)
         {
             aSize = annotations.length + 1;
         }
 
-
         AlignmentAnnotation[] temp = new AlignmentAnnotation[aSize];
 
-        temp[0] = aa;
+        temp[aSize-1] = aa;
 
-        int i = 1;
+        int i = 0;
 
         if (aSize > 1)
         {
-            for (i = 1; i < (aSize); i++)
+            for (i = 0; i < (aSize-1); i++)
             {
-                temp[i] = annotations[i-1];
+                temp[i] = annotations[i];
             }
         }
 
         annotations = temp;
     }
 
+    public void setAnnotationIndex(AlignmentAnnotation aa, int index)
+    {
+      if(aa==null || annotations==null || annotations.length-1<index)
+        return;
+
+      int aSize = annotations.length;
+      AlignmentAnnotation[] temp = new AlignmentAnnotation[aSize];
+
+      temp[index] = aa;
+
+      for (int i = 0; i < aSize; i++)
+      {
+        if(i==index)
+          continue;
+
+        if(i<index)
+          temp[i] = annotations[i];
+        else
+          temp[i] = annotations[i-1];
+      }
+
+        annotations = temp;
+    }
+
     /**
      * DOCUMENT ME!
      *