X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fanalysis%2FCrossRef.java;h=a71e61419fdbe53928ad17d5fbc07db3ee6e70be;hb=a21b84a669a9620f6943b9b5054e8756cb6f0687;hp=2e6431cb804901b36e6914a5a262b54c288b6ddb;hpb=1503bcb2b548b7f6bc11bcbf081455ab94839099;p=jalview.git diff --git a/src/jalview/analysis/CrossRef.java b/src/jalview/analysis/CrossRef.java index 2e6431c..a71e614 100644 --- a/src/jalview/analysis/CrossRef.java +++ b/src/jalview/analysis/CrossRef.java @@ -97,7 +97,7 @@ public class CrossRef { dss = dss.getDatasetSequence(); } - DBRefEntry[] rfs = findXDbRefs(dna, dss.getDBRef()); + DBRefEntry[] rfs = findXDbRefs(dna, dss.getDBRefs()); for (int r = 0; rfs != null && r < rfs.length; r++) { if (!refs.contains(rfs[r].getSource())) @@ -109,13 +109,13 @@ public class CrossRef { // search for references to this sequence's direct references. DBRefEntry[] lrfs = CrossRef - .findXDbRefs(!dna, seqs[s].getDBRef()); + .findXDbRefs(!dna, seqs[s].getDBRefs()); List rseqs = new ArrayList(); CrossRef.searchDatasetXrefs(seqs[s], !dna, lrfs, dataset, rseqs, null); // don't need to specify codon frame for mapping here for (SequenceI rs : rseqs) { - DBRefEntry[] xrs = findXDbRefs(dna, rs.getDBRef()); // not used?? + DBRefEntry[] xrs = findXDbRefs(dna, rs.getDBRefs()); // not used?? for (int r = 0; rfs != null && r < rfs.length; r++) { if (!refs.contains(rfs[r].getSource())) @@ -159,7 +159,7 @@ public class CrossRef Vector cseqs = new Vector(); for (int s = 0; s < seqs.length; s++) { - DBRefEntry[] cdna = findXDbRefs(true, seqs[s].getDBRef()); + DBRefEntry[] cdna = findXDbRefs(true, seqs[s].getDBRefs()); for (int c = 0; c < cdna.length; c++) { if (cdna[c].getSource().equals(DBRefSource.EMBLCDS)) @@ -219,11 +219,11 @@ public class CrossRef dss = dss.getDatasetSequence(); } boolean found = false; - DBRefEntry[] xrfs = CrossRef.findXDbRefs(dna, dss.getDBRef()); + DBRefEntry[] xrfs = CrossRef.findXDbRefs(dna, dss.getDBRefs()); if ((xrfs == null || xrfs.length == 0) && dataset != null) { System.out.println("Attempting to find ds Xrefs refs."); - DBRefEntry[] lrfs = CrossRef.findXDbRefs(!dna, seqs[s].getDBRef()); + DBRefEntry[] lrfs = CrossRef.findXDbRefs(!dna, seqs[s].getDBRefs()); // less ambiguous would be a 'find primary dbRefEntry' method. // filter for desired source xref here found = CrossRef.searchDatasetXrefs(dss, !dna, lrfs, dataset, @@ -330,7 +330,7 @@ public class CrossRef { // TODO: examine each sequence for 'redundancy' jalview.datamodel.DBRefEntry[] dbr = retrieved[rs] - .getDBRef(); + .getDBRefs(); if (dbr != null && dbr.length > 0) { for (int di = 0; di < dbr.length; di++) @@ -500,7 +500,7 @@ public class CrossRef } // look for direct or indirect references in common - DBRefEntry[] poss = nxt.getDBRef(), cands = null; + DBRefEntry[] poss = nxt.getDBRefs(), cands = null; if (direct) { cands = jalview.util.DBRefUtils.searchRefs(poss, xrf);