X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fdatamodel%2FSequence.java;h=d52e0497aa7f52b5a3c7092328c53c134cc93aa5;hb=41b0e9331ac71787c1280aa1d809f54c575fbf97;hp=6cf06466b1c0eb4c9ffb8593ee278b2a93246b1f;hpb=26b115b0a77d521da92a06572d9b7819c2d0d49a;p=jalview.git diff --git a/src/jalview/datamodel/Sequence.java b/src/jalview/datamodel/Sequence.java index 6cf0646..d52e049 100755 --- a/src/jalview/datamodel/Sequence.java +++ b/src/jalview/datamodel/Sequence.java @@ -27,7 +27,6 @@ import jalview.util.Comparison; import jalview.util.DBRefUtils; import jalview.util.MapList; import jalview.util.StringUtils; -import jalview.ws.params.InvalidArgumentException; import java.util.ArrayList; import java.util.Arrays; @@ -48,39 +47,42 @@ 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 - */ + /** + * A subclass that gives us access to modCount, which tracks whether there + * have been any changes. We use this to update + * + * @author hansonr + * + * @param + */ @SuppressWarnings("serial") - protected class DBModList extends ArrayList { + public class DBModList extends ArrayList + { + + protected int getModCount() + { + return modCount; + } - protected int getModCount() { - return modCount; - } - } -SequenceI datasetSequence; + 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 pdbIds; + private Vector pdbIds; - String vamsasId; + private String vamsasId; - private DBModList dbrefs; // controlled acces + private DBModList dbrefs; // controlled access /** * a flag to let us know that elements have changed in dbrefs @@ -89,15 +91,15 @@ SequenceI datasetSequence; */ private int refModCount = 0; - RNA rna; - + private RNA rna; + /** * This annotation is displayed below the alignment but the positions are tied * to the residues of this sequence * * TODO: change to List<> */ - Vector annotation; + private Vector annotation; private SequenceFeaturesI sequenceFeatureStore; @@ -302,7 +304,7 @@ SequenceI datasetSequence; { setDatasetSequence(seq.getDatasetSequence()); } - + /* * only copy DBRefs and seqfeatures if we really are a dataset sequence */ @@ -377,8 +379,8 @@ SequenceI datasetSequence; { 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; } @@ -470,18 +472,19 @@ SequenceI datasetSequence; } /** - * 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(); } @@ -520,6 +523,7 @@ SequenceI datasetSequence; public void setStart(int start) { this.start = start; + sequenceChanged(); } /** @@ -597,8 +601,8 @@ SequenceI datasetSequence; public char[] getSequence() { // return sequence; - return sequence == null ? null : Arrays.copyOf(sequence, - sequence.length); + return sequence == null ? null + : Arrays.copyOf(sequence, sequence.length); } /* @@ -694,8 +698,8 @@ SequenceI datasetSequence; 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))); } /** @@ -711,36 +715,9 @@ SequenceI datasetSequence; { 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; } } } @@ -903,7 +880,7 @@ SequenceI datasetSequence; { return findPosition(column + 1, cursor); } - + // TODO recode this more naturally i.e. count residues only // as they are found, not 'in anticipation' @@ -1090,7 +1067,7 @@ SequenceI datasetSequence; * {@inheritDoc} */ @Override - public Range findPositions(int fromColumn, int toColumn) + public ContiguousI findPositions(int fromColumn, int toColumn) { if (toColumn < fromColumn || fromColumn < 1) { @@ -1208,7 +1185,7 @@ SequenceI datasetSequence; { ArrayList map = new ArrayList<>(); int lastj = -1, j = 0; - int pos = start; + // int pos = start; int seqlen = sequence.length; while ((j < seqlen)) { @@ -1242,7 +1219,7 @@ SequenceI datasetSequence; { BitSet map = new BitSet(); int lastj = -1, j = 0; - int pos = start; + // int pos = start; int seqlen = sequence.length; while ((j < seqlen)) { @@ -1410,35 +1387,22 @@ SequenceI datasetSequence; vamsasId = id; } - @SuppressWarnings("deprecation") -@Override - public void setDBRefs(List newDBrefs) throws InvalidArgumentException + @Deprecated + @Override + public void setDBRefs(DBModList newDBrefs) { if (dbrefs == null && datasetSequence != null && this != datasetSequence) { - datasetSequence.setDBRefs((DBModList)newDBrefs); + datasetSequence.setDBRefs(newDBrefs); return; } - if (newDBrefs != null && !(newDBrefs instanceof DBModList)) - throw new InvalidArgumentException("DBrefs must have DBModList class"); - - dbrefs = (DBModList)newDBrefs; + dbrefs = newDBrefs; refModCount = 0; } @Override - public void getDBRefsFrom(SequenceI seq) { - try { - setDBRefs(seq.getDBRefs()); - } catch (InvalidArgumentException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - } - - @Override - public List getDBRefs() + public DBModList getDBRefs() { if (dbrefs == null && datasetSequence != null && this != datasetSequence) @@ -1448,7 +1412,6 @@ SequenceI datasetSequence; return dbrefs; } - @Override public void addDBRef(DBRefEntry entry) { @@ -1460,10 +1423,10 @@ SequenceI datasetSequence; if (dbrefs == null) { - dbrefs = new DBModList(); + dbrefs = new DBModList<>(); } - for (int ib = 0, nb= dbrefs.size(); ib < nb; ib++) + for (int ib = 0, nb = dbrefs.size(); ib < nb; ib++) { if (dbrefs.get(ib).updateFrom(entry)) { @@ -1475,19 +1438,18 @@ SequenceI datasetSequence; } } + // /// BH OUCH! + // /* + // * extend the array to make room for one more + // */ + // // TODO use an ArrayList instead + // int j = dbrefs.length; + // List temp = new DBRefEntry[j + 1]; + // System.arraycopy(dbrefs, 0, temp, 0, j); + // temp[temp.length - 1] = entry; + // + // dbrefs = temp; -// /// BH OUCH! -// /* -// * extend the array to make room for one more -// */ -// // TODO use an ArrayList instead -// int j = dbrefs.length; -// List temp = new DBRefEntry[j + 1]; -// System.arraycopy(dbrefs, 0, temp, 0, j); -// temp[temp.length - 1] = entry; -// -// dbrefs = temp; - dbrefs.add(entry); } @@ -1601,7 +1563,7 @@ SequenceI datasetSequence; private int _seqhash = 0; -private List primaryRefs; + private List primaryRefs; /** * Answers false if the sequence is more than 85% nucleotide (ACGTU), else @@ -1620,7 +1582,7 @@ private List primaryRefs; _isNa = Comparison.isNucleotide(this); } return !_isNa; - }; + } /* * (non-Javadoc) @@ -1777,8 +1739,9 @@ private List primaryRefs; List 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++) @@ -1836,13 +1799,30 @@ private List primaryRefs; public List getAlignmentAnnotations(String calcId, String label) { + return getAlignmentAnnotations(calcId, label, null, true); + } + + @Override + public List getAlignmentAnnotations(String calcId, + String label, String description) + { + return getAlignmentAnnotations(calcId, label, description, false); + } + + private List getAlignmentAnnotations(String calcId, + String label, String description, boolean ignoreDescription) + { List 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 ((ann.calcId != null && ann.calcId.equals(calcId)) + && (ann.label != null && ann.label.equals(label)) + && ((ignoreDescription && description == null) + || (ann.description != null + && ann.description.equals(description)))) + { result.add(ann); } @@ -1880,7 +1860,7 @@ private List primaryRefs; } private List tmpList; - + @Override public List getPrimaryDBRefs() { @@ -1895,21 +1875,22 @@ private List primaryRefs; synchronized (dbrefs) { if (refModCount == dbrefs.getModCount() && primaryRefs != null) - return primaryRefs; { - refModCount = dbrefs.getModCount(); - DBRefUtils.ensurePrimaries(this); - primaryRefs = null; + return primaryRefs; // no changes } - List primaries = (primaryRefs == null ? (primaryRefs = new ArrayList<>()) : primaryRefs); + refModCount = dbrefs.getModCount(); + List primaries = (primaryRefs == null + ? (primaryRefs = new ArrayList<>()) + : primaryRefs); primaries.clear(); - if (tmpList == null) { - tmpList = new ArrayList<>(); - tmpList.add(null); // for replacement + 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); + DBRefEntry ref = dbrefs.get(i); if (!ref.isPrimaryCandidate()) { continue; @@ -1924,7 +1905,8 @@ private List primaryRefs; } } // whilst it looks like it is a primary ref, we also sanity check type - if (DBRefSource.PDB_CANONICAL_NAME.equals(ref.getCanonicalSourceName())) + if (DBRefSource.PDB_CANONICAL_NAME + .equals(ref.getCanonicalSourceName())) { // PDB dbrefs imply there should be a PDBEntry associated // TODO: tighten PDB dbrefs @@ -1937,17 +1919,24 @@ private List primaryRefs; { continue; } - } else { - // check standard protein or dna sources - tmpList.set(0, ref); - List res = DBRefUtils.selectDbRefs(!isProtein(), tmpList); - if (res == null || res.get(0) != tmpList.get(0)) - { - continue; - } - } + } + else + { + // check standard protein or dna sources + tmpList.set(0, ref); + List 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; } } @@ -1965,15 +1954,6 @@ private List primaryRefs; List 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,