X-Git-Url: http://source.jalview.org/gitweb/?p=jalview.git;a=blobdiff_plain;f=src%2Fjalview%2Fext%2Fensembl%2FEnsemblMap.java;h=f2ab1956a49712df9c162b4c3651c18b7d7f2e74;hp=cfc679cd05bc61b25bc4b05a0309b14cc478b7e4;hb=57738a1f3c19b1c3a00bd3ac5108f8cd0af32f99;hpb=e7338a61f3ce96dadf44ac80b2b32cc5ba4b94c8

diff --git a/src/jalview/ext/ensembl/EnsemblMap.java b/src/jalview/ext/ensembl/EnsemblMap.java
index cfc679c..f2ab195 100644
--- a/src/jalview/ext/ensembl/EnsemblMap.java
+++ b/src/jalview/ext/ensembl/EnsemblMap.java
@@ -104,8 +104,8 @@ public class EnsemblMap extends EnsemblRestClient
    * @return
    * @throws MalformedURLException
    */
-  protected URL getAssemblyMapUrl(String species, String chromosome, String fromRef,
-          String toRef, int startPos, int endPos)
+  protected URL getAssemblyMapUrl(String species, String chromosome,
+          String fromRef, String toRef, int startPos, int endPos)
           throws MalformedURLException
   {
     /*
@@ -152,8 +152,8 @@ public class EnsemblMap extends EnsemblRestClient
     URL url = null;
     try
     {
-      url = getAssemblyMapUrl(species, chromosome, fromRef, toRef, queryRange[0],
-              queryRange[1]);
+      url = getAssemblyMapUrl(species, chromosome, fromRef, toRef,
+              queryRange[0], queryRange[1]);
       return (parseAssemblyMappingResponse(url));
     } catch (Throwable t)
     {
@@ -184,7 +184,8 @@ public class EnsemblMap extends EnsemblRestClient
 
     try
     {
-      Iterator<Object> rvals = (Iterator<Object>) getJSON(url, null, -1, MODE_ITERATOR, MAPPINGS);
+      Iterator<Object> rvals = (Iterator<Object>) getJSON(url, null, -1,
+              MODE_ITERATOR, MAPPINGS);
       if (rvals == null)
       {
         return null;
@@ -285,9 +286,9 @@ public class EnsemblMap extends EnsemblRestClient
   URL getIdMapUrl(String domain, String accession, int start, int end,
           String cdsOrCdna) throws MalformedURLException
   {
-    String url = String
-            .format("%s/map/%s/%s/%d..%d?include_original_region=1&content-type=application/json",
-                    domain, cdsOrCdna, accession, start, end);
+    String url = String.format(
+            "%s/map/%s/%s/%d..%d?include_original_region=1&content-type=application/json",
+            domain, cdsOrCdna, accession, start, end);
     return new URL(url);
   }
 
@@ -312,13 +313,13 @@ public class EnsemblMap extends EnsemblRestClient
    * @return
    */
   @SuppressWarnings("unchecked")
-GeneLociI parseIdMappingResponse(URL url, String accession,
-          String domain)
+  GeneLociI parseIdMappingResponse(URL url, String accession, String domain)
   {
 
     try
     {
-      Iterator<Object> rvals = (Iterator<Object>) getJSON(url, null, -1, MODE_ITERATOR, MAPPINGS);
+      Iterator<Object> rvals = (Iterator<Object>) getJSON(url, null, -1,
+              MODE_ITERATOR, MAPPINGS);
       if (rvals == null)
       {
         return null;
@@ -331,7 +332,8 @@ GeneLociI parseIdMappingResponse(URL url, String accession,
       while (rvals.hasNext())
       {
         Map<String, Object> val = (Map<String, Object>) rvals.next();
-        Map<String, Object> original = (Map<String, Object>) val.get("original");
+        Map<String, Object> original = (Map<String, Object>) val
+                .get("original");
         fromEnd = Integer.parseInt(original.get("end").toString());
 
         Map<String, Object> mapped = (Map<String, Object>) val.get(MAPPED);
@@ -340,16 +342,16 @@ GeneLociI parseIdMappingResponse(URL url, String accession,
         String ass = mapped.get("assembly_name").toString();
         if (assembly != null && !assembly.equals(ass))
         {
-          System.err
-                  .println("EnsemblMap found multiple assemblies - can't resolve");
+          System.err.println(
+                  "EnsemblMap found multiple assemblies - can't resolve");
           return null;
         }
         assembly = ass;
         String chr = mapped.get("seq_region_name").toString();
         if (chromosome != null && !chromosome.equals(chr))
         {
-          System.err
-                  .println("EnsemblMap found multiple chromosomes - can't resolve");
+          System.err.println(
+                  "EnsemblMap found multiple chromosomes - can't resolve");
           return null;
         }
         chromosome = chr;
@@ -372,8 +374,9 @@ GeneLociI parseIdMappingResponse(URL url, String accession,
               .getSpecies(accession);
       final String as = assembly;
       final String chr = chromosome;
-      List<int[]> fromRange = Collections.singletonList(new int[] { 1,
-          fromEnd });
+      List<int[]> fromRange = Collections
+              .singletonList(new int[]
+              { 1, fromEnd });
       Mapping mapping = new Mapping(new MapList(fromRange, regions, 1, 1));
       return new GeneLocus(species == null ? "" : species, as, chr,
               mapping);