X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fdatamodel%2FAlignmentAnnotation.java;h=470497e12ceff0a258443205d43fa153667df87b;hb=7418f2aca1d88b04abebcce7940006e202c5f19c;hp=04689cdead5eecd4d6fdfaf276abe465f227cf3b;hpb=80f46a9ba6bea3531ff6e59cf68f9f870e5af4da;p=jalview.git

diff --git a/src/jalview/datamodel/AlignmentAnnotation.java b/src/jalview/datamodel/AlignmentAnnotation.java
index 04689cd..470497e 100755
--- a/src/jalview/datamodel/AlignmentAnnotation.java
+++ b/src/jalview/datamodel/AlignmentAnnotation.java
@@ -1,6 +1,6 @@
 /*
 * Jalview - A Sequence Alignment Editor and Viewer
-* Copyright (C) 2005 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle
+* Copyright (C) 2006 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle
 *
 * This program is free software; you can redistribute it and/or
 * modify it under the terms of the GNU General Public License
@@ -262,7 +262,9 @@ public class AlignmentAnnotation
        * @param seqRef
        * @param startRes
        */
-      public void createSequenceMapping(SequenceI seqRef, int startRes)
+      public void createSequenceMapping(SequenceI seqRef,
+                                        int startRes,
+                                        boolean alreadyMapped)
       {
         if(seqRef == null)
           return;
@@ -270,33 +272,22 @@ public class AlignmentAnnotation
         sequenceMapping = new java.util.Hashtable();
 
         sequenceRef = seqRef;
-
-        if(startRes < sequenceRef.getStart())
-          startRes = sequenceRef.getStart();
-
         int seqPos;
 
-        int fileOffset = 0;
-        if(startRes > sequenceRef.getStart())
-        {
-          fileOffset = startRes - sequenceRef.getStart();
-        }
-
         for(int i = 0; i < annotations.length; i++)
         {
-            seqPos = sequenceRef.findPosition(i + fileOffset);
-            if(seqPos<annotations.length)
+            if (annotations[i] != null)
             {
-              if (annotations[i] != null)
-              {
-                  sequenceMapping.put(new Integer(seqPos),
-                                      annotations[i]);
-              }
+              if(alreadyMapped)
+                seqPos = seqRef.findPosition(i);
+              else
+                seqPos = i+startRes;
+
+              sequenceMapping.put(new Integer(seqPos), annotations[i]);
             }
          }
 
         adjustForAlignment();
-
       }
 
       public void adjustForAlignment()