X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fdatamodel%2FSequence.java;h=3bd7b4b71968551aca235cc435e161269fa700d9;hb=ca47e4d0e1176893b414fba3fbe8a308e24cc52e;hp=f5558559b37e5f6dbeb3dac62d4e06ed490d3681;hpb=b83eff8c672cede0305da3c76823dab414749dde;p=jalview.git

diff --git a/src/jalview/datamodel/Sequence.java b/src/jalview/datamodel/Sequence.java
index f555855..3bd7b4b 100755
--- a/src/jalview/datamodel/Sequence.java
+++ b/src/jalview/datamodel/Sequence.java
@@ -21,7 +21,6 @@
 package jalview.datamodel;
 
 import jalview.analysis.AlignSeq;
-import jalview.api.DBRefEntryI;
 import jalview.datamodel.features.SequenceFeatures;
 import jalview.datamodel.features.SequenceFeaturesI;
 import jalview.util.Comparison;
@@ -47,25 +46,52 @@ import fr.orsay.lri.varna.models.rna.RNA;
  */
 public class Sequence extends ASequence implements SequenceI
 {
+
+  /**
+   * A subclass that gives us access to modCount, which tracks whether there
+   * have been any changes. We use this to update
+   * 
+   * @author hansonr
+   *
+   * @param <T>
+   */
+  @SuppressWarnings("serial")
+  public class DBModList<T> extends ArrayList<DBRefEntry>
+  {
+
+    protected int getModCount()
+    {
+      return modCount;
+    }
+
+  }
+
   SequenceI datasetSequence;
 
-  String name;
+  private String name;
 
   private char[] sequence;
 
-  String description;
+  private String description;
 
-  int start;
+  private int start;
 
-  int end;
+  private int end;
 
-  Vector<PDBEntry> pdbIds;
+  private Vector<PDBEntry> pdbIds;
 
-  String vamsasId;
+  private String vamsasId;
 
-  DBRefEntry[] dbrefs;
+  private DBModList<DBRefEntry> dbrefs; // controlled access
 
-  RNA rna;
+  /**
+   * a flag to let us know that elements have changed in dbrefs
+   * 
+   * @author Bob Hanson
+   */
+  private int refModCount = 0;
+
+  private RNA rna;
 
   /**
    * This annotation is displayed below the alignment but the positions are tied
@@ -73,7 +99,7 @@ public class Sequence extends ASequence implements SequenceI
    *
    * TODO: change to List<>
    */
-  Vector<AlignmentAnnotation> annotation;
+  private Vector<AlignmentAnnotation> annotation;
 
   private SequenceFeaturesI sequenceFeatureStore;
 
@@ -278,18 +304,18 @@ public class Sequence extends ASequence implements SequenceI
     {
       setDatasetSequence(seq.getDatasetSequence());
     }
-    
+
     /*
      * only copy DBRefs and seqfeatures if we really are a dataset sequence
      */
     if (datasetSequence == null)
     {
-      if (seq.getDBRefs() != null)
+      List<DBRefEntry> dbr = seq.getDBRefs();
+      if (dbr != null)
       {
-        DBRefEntry[] dbr = seq.getDBRefs();
-        for (int i = 0; i < dbr.length; i++)
+        for (int i = 0, n = dbr.size(); i < n; i++)
         {
-          addDBRef(new DBRefEntry(dbr[i]));
+          addDBRef(new DBRefEntry(dbr.get(i)));
         }
       }
 
@@ -353,8 +379,8 @@ public class Sequence extends ASequence implements SequenceI
   {
     if (sf.getType() == null)
     {
-      System.err.println("SequenceFeature type may not be null: "
-              + sf.toString());
+      System.err.println(
+              "SequenceFeature type may not be null: " + sf.toString());
       return false;
     }
 
@@ -446,18 +472,19 @@ public class Sequence extends ASequence implements SequenceI
   }
 
   /**
-   * DOCUMENT ME!
+   * Answers the sequence name, with '/start-end' appended if jvsuffix is true
    * 
-   * @return DOCUMENT ME!
+   * @return
    */
   @Override
   public String getDisplayId(boolean jvsuffix)
   {
-    StringBuffer result = new StringBuffer(name);
-    if (jvsuffix)
+    if (!jvsuffix)
     {
-      result.append("/" + start + "-" + end);
+      return name;
     }
+    StringBuilder result = new StringBuilder(name);
+    result.append("/").append(start).append("-").append(end);
 
     return result.toString();
   }
@@ -496,6 +523,7 @@ public class Sequence extends ASequence implements SequenceI
   public void setStart(int start)
   {
     this.start = start;
+    sequenceChanged();
   }
 
   /**
@@ -573,8 +601,8 @@ public class Sequence extends ASequence implements SequenceI
   public char[] getSequence()
   {
     // return sequence;
-    return sequence == null ? null : Arrays.copyOf(sequence,
-            sequence.length);
+    return sequence == null ? null
+            : Arrays.copyOf(sequence, sequence.length);
   }
 
   /*
@@ -670,8 +698,8 @@ public class Sequence extends ASequence implements SequenceI
   public void setGeneLoci(String speciesId, String assemblyId,
           String chromosomeId, MapList map)
   {
-    addDBRef(new DBRefEntry(speciesId, assemblyId, DBRefEntry.CHROMOSOME
-            + ":" + chromosomeId, new Mapping(map)));
+    addDBRef(new GeneLocus(speciesId, assemblyId, chromosomeId,
+            new Mapping(map)));
   }
 
   /**
@@ -682,41 +710,14 @@ public class Sequence extends ASequence implements SequenceI
   @Override
   public GeneLociI getGeneLoci()
   {
-    DBRefEntry[] refs = getDBRefs();
+    List<DBRefEntry> refs = getDBRefs();
     if (refs != null)
     {
       for (final DBRefEntry ref : refs)
       {
-        if (ref.isChromosome())
+        if (ref instanceof GeneLociI)
         {
-          return new GeneLociI()
-          {
-            @Override
-            public String getSpeciesId()
-            {
-              return ref.getSource();
-            }
-
-            @Override
-            public String getAssemblyId()
-            {
-              return ref.getVersion();
-            }
-
-            @Override
-            public String getChromosomeId()
-            {
-              // strip off "chromosome:" prefix to chrId
-              return ref.getAccessionId().substring(
-                      DBRefEntry.CHROMOSOME.length() + 1);
-            }
-
-            @Override
-            public MapList getMap()
-            {
-              return ref.getMap().getMap();
-            }
-          };
+          return (GeneLociI) ref;
         }
       }
     }
@@ -879,7 +880,7 @@ public class Sequence extends ASequence implements SequenceI
     {
       return findPosition(column + 1, cursor);
     }
-    
+
     // TODO recode this more naturally i.e. count residues only
     // as they are found, not 'in anticipation'
 
@@ -1066,7 +1067,7 @@ public class Sequence extends ASequence implements SequenceI
    * {@inheritDoc}
    */
   @Override
-  public Range findPositions(int fromColumn, int toColumn)
+  public ContiguousI findPositions(int fromColumn, int toColumn)
   {
     if (toColumn < fromColumn || fromColumn < 1)
     {
@@ -1184,7 +1185,7 @@ public class Sequence extends ASequence implements SequenceI
   {
     ArrayList<int[]> map = new ArrayList<>();
     int lastj = -1, j = 0;
-    int pos = start;
+    // int pos = start;
     int seqlen = sequence.length;
     while ((j < seqlen))
     {
@@ -1218,7 +1219,7 @@ public class Sequence extends ASequence implements SequenceI
   {
     BitSet map = new BitSet();
     int lastj = -1, j = 0;
-    int pos = start;
+    // int pos = start;
     int seqlen = sequence.length;
     while ((j < seqlen))
     {
@@ -1386,24 +1387,22 @@ public class Sequence extends ASequence implements SequenceI
     vamsasId = id;
   }
 
+  @Deprecated
   @Override
-  public void setDBRefs(DBRefEntry[] dbref)
+  public void setDBRefs(DBModList<DBRefEntry> newDBrefs)
   {
     if (dbrefs == null && datasetSequence != null
             && this != datasetSequence)
     {
-      datasetSequence.setDBRefs(dbref);
+      datasetSequence.setDBRefs(newDBrefs);
       return;
     }
-    dbrefs = dbref;
-    if (dbrefs != null)
-    {
-      DBRefUtils.ensurePrimaries(this);
-    }
+    dbrefs = newDBrefs;
+    refModCount = 0;
   }
 
   @Override
-  public DBRefEntry[] getDBRefs()
+  public DBModList<DBRefEntry> getDBRefs()
   {
     if (dbrefs == null && datasetSequence != null
             && this != datasetSequence)
@@ -1424,12 +1423,12 @@ public class Sequence extends ASequence implements SequenceI
 
     if (dbrefs == null)
     {
-      dbrefs = new DBRefEntry[0];
+      dbrefs = new DBModList<>();
     }
 
-    for (DBRefEntryI dbr : dbrefs)
+    for (int ib = 0, nb = dbrefs.size(); ib < nb; ib++)
     {
-      if (dbr.updateFrom(entry))
+      if (dbrefs.get(ib).updateFrom(entry))
       {
         /*
          * found a dbref that either matched, or could be
@@ -1439,18 +1438,19 @@ public class Sequence extends ASequence implements SequenceI
       }
     }
 
-    /*
-     * extend the array to make room for one more
-     */
-    // TODO use an ArrayList instead
-    int j = dbrefs.length;
-    DBRefEntry[] temp = new DBRefEntry[j + 1];
-    System.arraycopy(dbrefs, 0, temp, 0, j);
-    temp[temp.length - 1] = entry;
+    // /// BH OUCH!
+    // /*
+    // * extend the array to make room for one more
+    // */
+    // // TODO use an ArrayList instead
+    // int j = dbrefs.length;
+    // List<DBRefEntry> temp = new DBRefEntry[j + 1];
+    // System.arraycopy(dbrefs, 0, temp, 0, j);
+    // temp[temp.length - 1] = entry;
+    //
+    // dbrefs = temp;
 
-    dbrefs = temp;
-
-    DBRefUtils.ensurePrimaries(this);
+    dbrefs.add(entry);
   }
 
   @Override
@@ -1563,6 +1563,8 @@ public class Sequence extends ASequence implements SequenceI
 
   private int _seqhash = 0;
 
+  private List<DBRefEntry> primaryRefs;
+
   /**
    * Answers false if the sequence is more than 85% nucleotide (ACGTU), else
    * true
@@ -1580,7 +1582,7 @@ public class Sequence extends ASequence implements SequenceI
       _isNa = Comparison.isNucleotide(this);
     }
     return !_isNa;
-  };
+  }
 
   /*
    * (non-Javadoc)
@@ -1694,13 +1696,14 @@ public class Sequence extends ASequence implements SequenceI
       // TODO: could merge DBRefs
       return datasetSequence.updatePDBIds();
     }
-    if (dbrefs == null || dbrefs.length == 0)
+    if (dbrefs == null || dbrefs.size() == 0)
     {
       return false;
     }
     boolean added = false;
-    for (DBRefEntry dbr : dbrefs)
+    for (int ib = 0, nb = dbrefs.size(); ib < nb; ib++)
     {
+      DBRefEntry dbr = dbrefs.get(ib);
       if (DBRefSource.PDB.equals(dbr.getSource()))
       {
         /*
@@ -1736,8 +1739,9 @@ public class Sequence extends ASequence implements SequenceI
       List<SequenceFeature> sfs = entry.getSequenceFeatures();
       for (SequenceFeature feature : sfs)
       {
-       SequenceFeature sf[] = (mp != null) ? mp.locateFeature(feature)
-                : new SequenceFeature[] { new SequenceFeature(feature) };
+        SequenceFeature sf[] = (mp != null) ? mp.locateFeature(feature)
+                : new SequenceFeature[]
+                { new SequenceFeature(feature) };
         if (sf != null)
         {
           for (int sfi = 0; sfi < sf.length; sfi++)
@@ -1759,12 +1763,12 @@ public class Sequence extends ASequence implements SequenceI
       }
     }
     // transfer database references
-    DBRefEntry[] entryRefs = entry.getDBRefs();
+    List<DBRefEntry> entryRefs = entry.getDBRefs();
     if (entryRefs != null)
     {
-      for (int r = 0; r < entryRefs.length; r++)
+      for (int r = 0, n = entryRefs.size(); r < n; r++)
       {
-        DBRefEntry newref = new DBRefEntry(entryRefs[r]);
+        DBRefEntry newref = new DBRefEntry(entryRefs.get(r));
         if (newref.getMap() != null && mp != null)
         {
           // remap ref using our local mapping
@@ -1795,13 +1799,32 @@ public class Sequence extends ASequence implements SequenceI
   public List<AlignmentAnnotation> getAlignmentAnnotations(String calcId,
           String label)
   {
+    return getAlignmentAnnotations(calcId, label, null, true);
+  }
+
+  @Override
+  public List<AlignmentAnnotation> getAlignmentAnnotations(String calcId,
+          String label, String description)
+  {
+    return getAlignmentAnnotations(calcId, label, description, false);
+  }
+
+  private List<AlignmentAnnotation> getAlignmentAnnotations(String calcId,
+          String label, String description, boolean nullWildcard)
+  {
     List<AlignmentAnnotation> result = new ArrayList<>();
     if (this.annotation != null)
     {
       for (AlignmentAnnotation ann : annotation)
       {
-        if (ann.calcId != null && ann.calcId.equals(calcId)
-                && ann.label != null && ann.label.equals(label))
+        if (((nullWildcard && calcId == null)
+                || (ann.calcId != null && ann.calcId.equals(calcId)))
+                && ((nullWildcard && label == null)
+                        || (ann.label != null && ann.label.equals(label)))
+                && ((nullWildcard && description == null)
+                        || (ann.description != null
+                                && ann.description.equals(description))))
+
         {
           result.add(ann);
         }
@@ -1838,6 +1861,8 @@ public class Sequence extends ASequence implements SequenceI
     return null;
   }
 
+  private List<DBRefEntry> tmpList;
+
   @Override
   public List<DBRefEntry> getPrimaryDBRefs()
   {
@@ -1845,16 +1870,29 @@ public class Sequence extends ASequence implements SequenceI
     {
       return datasetSequence.getPrimaryDBRefs();
     }
-    if (dbrefs == null || dbrefs.length == 0)
+    if (dbrefs == null || dbrefs.size() == 0)
     {
       return Collections.emptyList();
     }
     synchronized (dbrefs)
     {
-      List<DBRefEntry> primaries = new ArrayList<>();
-      DBRefEntry[] tmp = new DBRefEntry[1];
-      for (DBRefEntry ref : dbrefs)
+      if (refModCount == dbrefs.getModCount() && primaryRefs != null)
       {
+        return primaryRefs; // no changes
+      }
+      refModCount = dbrefs.getModCount();
+      List<DBRefEntry> primaries = (primaryRefs == null
+              ? (primaryRefs = new ArrayList<>())
+              : primaryRefs);
+      primaries.clear();
+      if (tmpList == null)
+      {
+        tmpList = new ArrayList<>();
+        tmpList.add(null); // for replacement
+      }
+      for (int i = 0, n = dbrefs.size(); i < n; i++)
+      {
+        DBRefEntry ref = dbrefs.get(i);
         if (!ref.isPrimaryCandidate())
         {
           continue;
@@ -1869,8 +1907,8 @@ public class Sequence extends ASequence implements SequenceI
           }
         }
         // whilst it looks like it is a primary ref, we also sanity check type
-        if (DBRefUtils.getCanonicalName(DBRefSource.PDB)
-                .equals(DBRefUtils.getCanonicalName(ref.getSource())))
+        if (DBRefSource.PDB_CANONICAL_NAME
+                .equals(ref.getCanonicalSourceName()))
         {
           // PDB dbrefs imply there should be a PDBEntry associated
           // TODO: tighten PDB dbrefs
@@ -1879,21 +1917,28 @@ public class Sequence extends ASequence implements SequenceI
           // handle on the PDBEntry, and a real mapping between sequence and
           // extracted sequence from PDB file
           PDBEntry pdbentry = getPDBEntry(ref.getAccessionId());
-          if (pdbentry != null && pdbentry.getFile() != null)
+          if (pdbentry == null || pdbentry.getFile() == null)
           {
-            primaries.add(ref);
+            continue;
           }
-          continue;
         }
-        // check standard protein or dna sources
-        tmp[0] = ref;
-        DBRefEntry[] res = DBRefUtils.selectDbRefs(!isProtein(), tmp);
-        if (res != null && res[0] == tmp[0])
+        else
         {
-          primaries.add(ref);
-          continue;
+          // check standard protein or dna sources
+          tmpList.set(0, ref);
+          List<DBRefEntry> res = DBRefUtils.selectDbRefs(!isProtein(),
+                  tmpList);
+          if (res == null || res.get(0) != tmpList.get(0))
+          {
+            continue;
+          }
         }
+        primaries.add(ref);
       }
+
+      // version must be not null, as otherwise it will not be a candidate,
+      // above
+      DBRefUtils.ensurePrimaries(this, primaries);
       return primaries;
     }
   }
@@ -1911,15 +1956,6 @@ public class Sequence extends ASequence implements SequenceI
 
     List<SequenceFeature> result = getFeatures().findFeatures(startPos,
             endPos, types);
-    if (datasetSequence != null)
-    {
-      result = datasetSequence.getFeatures().findFeatures(startPos, endPos,
-              types);
-    }
-    else
-    {
-      result = sequenceFeatureStore.findFeatures(startPos, endPos, types);
-    }
 
     /*
      * if end column is gapped, endPos may be to the right,