X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fanalysis%2FCrossRef.java;fp=src%2Fjalview%2Fanalysis%2FCrossRef.java;h=82c809ba7c9aab2142e00832a3dfbd46b45061e9;hb=53c54d0ada46fa839095ace36e18e30ddcf63aa0;hp=e6bae9b1a0c31c5f8057109d188bf69df5072763;hpb=eb18fbe86d8a42079f82f96791695e9ca24f3be5;p=jalview.git diff --git a/src/jalview/analysis/CrossRef.java b/src/jalview/analysis/CrossRef.java index e6bae9b..82c809b 100644 --- a/src/jalview/analysis/CrossRef.java +++ b/src/jalview/analysis/CrossRef.java @@ -99,7 +99,7 @@ public class CrossRef */ public List findXrefSourcesForSequences(boolean dna) { - List sources = new ArrayList(); + List sources = new ArrayList<>(); for (SequenceI seq : fromSeqs) { if (seq != null) @@ -107,16 +107,15 @@ public class CrossRef findXrefSourcesForSequence(seq, dna, sources); } } - sources.remove(DBRefSource.EMBL); // hack to prevent EMBL xrefs resulting in - // redundant datasets + + // hack to prevent EMBL xrefs resulting in redundant datasets + sources.remove(DBRefSource.EMBL); + if (dna) { - sources.remove(DBRefSource.ENSEMBL); // hack to prevent Ensembl and - // EnsemblGenomes xref option shown - // from cdna panel - sources.remove(DBRefSource.ENSEMBLGENOMES); + // hack to prevent Ensembl xref option shown from cdna panel + sources.remove(DBRefSource.ENSEMBL); } - // redundant datasets return sources; } @@ -151,7 +150,7 @@ public class CrossRef * find sequence's direct (dna-to-dna, peptide-to-peptide) xrefs */ DBRefEntry[] lrfs = DBRefUtils.selectDbRefs(fromDna, seq.getDBRefs()); - List foundSeqs = new ArrayList(); + List foundSeqs = new ArrayList<>(); /* * find sequences in the alignment which xref one of these DBRefs @@ -218,7 +217,7 @@ public class CrossRef public Alignment findXrefSequences(String source, boolean fromDna) { - rseqs = new ArrayList(); + rseqs = new ArrayList<>(); AlignedCodonFrame cf = new AlignedCodonFrame(); matcher = new SequenceIdMatcher(dataset.getSequences()); @@ -430,8 +429,8 @@ public class CrossRef if (retrieved != null) { boolean addedXref = false; - List newDsSeqs = new ArrayList(), - doNotAdd = new ArrayList(); + List newDsSeqs = new ArrayList<>(), + doNotAdd = new ArrayList<>(); for (SequenceI retrievedSequence : retrieved) {