X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fanalysis%2FCrossRef.java;h=c69858f01d080be00983a90aaf5cf3e863e3592f;hb=da1ce6ca071deb35b983a41f6eeed43f30b3c3b2;hp=4f01cea243c05bf3bf922276190f0e25db6e1d7c;hpb=26b115b0a77d521da92a06572d9b7819c2d0d49a;p=jalview.git

diff --git a/src/jalview/analysis/CrossRef.java b/src/jalview/analysis/CrossRef.java
index 4f01cea..c69858f 100644
--- a/src/jalview/analysis/CrossRef.java
+++ b/src/jalview/analysis/CrossRef.java
@@ -31,8 +31,7 @@ import jalview.datamodel.SequenceFeature;
 import jalview.datamodel.SequenceI;
 import jalview.util.DBRefUtils;
 import jalview.util.MapList;
-import jalview.ws.SequenceFetcherFactory;
-import jalview.ws.seqfetcher.ASequenceFetcher;
+import jalview.ws.SequenceFetcher;
 
 import java.util.ArrayList;
 import java.util.Iterator;
@@ -402,7 +401,6 @@ public class CrossRef
   private void retrieveCrossRef(List<DBRefEntry> sourceRefs, SequenceI seq,
           List<DBRefEntry> xrfs, boolean fromDna, AlignedCodonFrame cf)
   {
-    ASequenceFetcher sftch = SequenceFetcherFactory.getSequenceFetcher();
     SequenceI[] retrieved = null;
     SequenceI dss = seq.getDatasetSequence() == null ? seq
             : seq.getDatasetSequence();
@@ -418,7 +416,8 @@ public class CrossRef
     }
     try
     {
-      retrieved = sftch.getSequences(sourceRefs, !fromDna);
+      retrieved = SequenceFetcher.getInstance()
+              .getSequences(sourceRefs, !fromDna);
     } catch (Exception e)
     {
       System.err.println(
@@ -483,9 +482,9 @@ public class CrossRef
   private void removeAlreadyRetrievedSeqs(List<DBRefEntry> sourceRefs,
           boolean fromDna)
   {
-    List<DBRefEntry> dbrSourceSet = new ArrayList<DBRefEntry>(sourceRefs);
+    List<DBRefEntry> dbrSourceSet = new ArrayList<>(sourceRefs);
     List<SequenceI> dsSeqs = dataset.getSequences();
-    for (int ids = dsSeqs.size(); --ids >= 0;)
+    for (int ids = 0, nds = dsSeqs.size(); ids < nds; ids++)
     {
       SequenceI sq = dsSeqs.get(ids);
       boolean dupeFound = false;
@@ -494,11 +493,11 @@ public class CrossRef
       if (sq.isProtein() == fromDna)
       {
     	List<DBRefEntry> sqdbrefs = sq.getPrimaryDBRefs();
-        for (int idb = sqdbrefs.size(); --idb >= 0;)
+        for (int idb = 0, ndb = sqdbrefs.size(); idb < ndb; idb++)
         {
           DBRefEntry dbr = sqdbrefs.get(idb);	
           List<DBRefEntry> searchrefs = DBRefUtils.searchRefs(dbrSourceSet, dbr, DBRefUtils.SEARCH_MODE_FULL);
-          for (int isr = searchrefs.size(); --isr >= 0;)
+          for (int isr = 0, nsr = searchrefs.size(); isr < nsr; isr++)
           {
             sourceRefs.remove(searchrefs.get(isr));
             dupeFound = true;