X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=inline;f=src%2Fjalview%2Furls%2FIdentifiersUrlProvider.java;h=c9386666168df27674d0aeaa82440c5c35b480c6;hb=70af62ad365829d2fc430db10336cf13c4d4ce1a;hp=51d181d0bb7337eb1ad008a8f62c397ba3a4a4ec;hpb=a1bf90058be8be92554ecbc5868982dcdbed5a80;p=jalview.git

diff --git a/src/jalview/urls/IdentifiersUrlProvider.java b/src/jalview/urls/IdentifiersUrlProvider.java
index 51d181d..c938666 100644
--- a/src/jalview/urls/IdentifiersUrlProvider.java
+++ b/src/jalview/urls/IdentifiersUrlProvider.java
@@ -35,7 +35,6 @@ import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
 import java.util.StringTokenizer;
-import java.util.Vector;
 
 import org.json.simple.JSONArray;
 import org.json.simple.JSONObject;
@@ -53,6 +52,10 @@ import org.json.simple.parser.ParseException;
 public class IdentifiersUrlProvider extends UrlProviderImpl
 {
 
+  private static final String LOCAL_KEY = "Local";
+
+  private static final String ID_ORG_KEY = "identifiers.org";
+
   // map of string ids to urls
   private HashMap<String, UrlLink> urls;
 
@@ -84,8 +87,24 @@ public class IdentifiersUrlProvider extends UrlProviderImpl
     try
     {
       FileReader reader = new FileReader(idFileName);
+      String key = "";
+      JSONObject obj = (JSONObject) parser.parse(reader);
+      if (obj.containsKey(ID_ORG_KEY))
+      {
+        key = ID_ORG_KEY;
+      }
+      else if (obj.containsKey(LOCAL_KEY))
+      {
+        key = LOCAL_KEY;
+      }
+      else
+      {
+        System.out
+                .println("Unexpected key returned from identifiers jalview service");
+        return idData;
+      }
 
-      JSONArray jsonarray = (JSONArray) parser.parse(reader);
+      JSONArray jsonarray = (JSONArray) obj.get(key);
 
       // loop over each entry in JSON array and build HashMap entry
       for (int i = 0; i < jsonarray.size(); i++)
@@ -94,18 +113,22 @@ public class IdentifiersUrlProvider extends UrlProviderImpl
 
         String url = (String) item.get("url") + "/" + DELIM + DB_ACCESSION
                 + DELIM;
-        UrlLink link = new UrlLink((String) item.get("name") + SEP + url);
+        UrlLink link = new UrlLink((String) item.get("name"), url,
+                (String) item.get("prefix"));
         idData.put((String) item.get("id"), link);
       }
     } catch (FileNotFoundException e)
     {
       e.printStackTrace();
+      idData.clear();
     } catch (IOException e)
     {
       e.printStackTrace();
+      idData.clear();
     } catch (ParseException e)
     {
       e.printStackTrace();
+      idData.clear();
     }
     return idData;
   }
@@ -169,12 +192,12 @@ public class IdentifiersUrlProvider extends UrlProviderImpl
   }
 
   @Override
-  public Vector<String> getLinksForMenu()
+  public List<String> getLinksForMenu()
   {
-    Vector<String> links = new Vector<String>();
+    List<String> links = new ArrayList<String>();
     for (String key : selectedUrls)
     {
-      links.add(urls.get(key).toString());
+      links.add(urls.get(key).toStringWithTarget());
     }
     return links;
   }