more iterators out; some time checks

[jalview.git] / src / jalview / ext / ensembl / EnsemblRestClient.java

diff --git a/src/jalview/ext/ensembl/EnsemblRestClient.java b/src/jalview/ext/ensembl/EnsemblRestClient.java
index b3113f9..bef1db0 100644 (file)
--- a/src/jalview/ext/ensembl/EnsemblRestClient.java
+++ b/src/jalview/ext/ensembl/EnsemblRestClient.java
@@ -457,8 +457,9 @@ boolean checkEnsembl()
     StringBuilder postBody = new StringBuilder(64);
     postBody.append("{\"ids\":[");
     first = true;
-    for (String id : ids)
+    for (int i = 0, n = ids.size(); i < n; i++)
     {
+      String id = ids.get(i);
       if (!first)
       {
         postBody.append(",");
@@ -500,17 +501,17 @@ boolean checkEnsembl()
        if (url == null)
           url = getUrl(ids);
        
-       Platform.timeCheck("EnsembleRestClient.getJSON0 " + url, Platform.TIME_MARK);
-       
        Reader br = null;
        try {
+
+         Platform.timeCheck(null, Platform.TIME_MARK);
+               
       br = (url == null ? null : getHttpResponse(url, ids, msDelay));
 
-      Platform.timeCheck("EnsembleRestClient.getJSON1 parsing... ", Platform.TIME_MARK);
-       
       Object ret = (br == null ? null : JSONUtils.parse(br));
 
-      Platform.timeCheck("EnsembleRestClient.getJSON2 ...done ", Platform.TIME_MARK);
+         Platform.timeCheck("EnsembleRestClient.getJSON " + url, Platform.TIME_MARK);
+       
 
       if (ret != null && mapKey != null)
            ret = ((Map<String, Object>) ret).get(mapKey);