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;
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;
* name of identifiers.org download file
* @return hashmap of identifiers.org data, keyed by MIRIAM id
*/
- private HashMap<String, UrlLink> readIdentifiers(
- String idFileName)
+ private HashMap<String, UrlLink> readIdentifiers(String idFileName)
{
JSONParser parser = new JSONParser();
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++)
} catch (FileNotFoundException e)
{
e.printStackTrace();
+ idData.clear();
} catch (IOException e)
{
e.printStackTrace();
+ idData.clear();
} catch (ParseException e)
{
e.printStackTrace();
+ idData.clear();
}
return idData;
}
}
@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;
}