JAL-2316 Added database name column to URL links table in preferences

[jalview.git] / src / jalview / urls / IdentifiersUrlProvider.java

diff --git a/src/jalview/urls/IdentifiersUrlProvider.java b/src/jalview/urls/IdentifiersUrlProvider.java
index 6c01f97..0219b54 100644 (file)
--- a/src/jalview/urls/IdentifiersUrlProvider.java
+++ b/src/jalview/urls/IdentifiersUrlProvider.java
@@ -94,7 +94,8 @@ 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)
@@ -128,19 +129,19 @@ public class IdentifiersUrlProvider extends UrlProviderImpl
     }
 
     // reset defaultUrl in case it is no longer selected
-    setDefaultUrl(defaultUrl);
+    setPrimaryUrl(primaryUrl);
   }
 
   @Override
-  public boolean setDefaultUrl(String id)
+  public boolean setPrimaryUrl(String id)
   {
     if (urls.containsKey(id))
     {
-      defaultUrl = id;
+      primaryUrl = id;
     }
     else
     {
-      defaultUrl = null;
+      primaryUrl = null;
     }
 
     return urls.containsKey(id);
@@ -205,9 +206,9 @@ public class IdentifiersUrlProvider extends UrlProviderImpl
           {
             selectedUrls.add(link.getId());
           }
-          if (link.getIsDefault())
+          if (link.getIsPrimary())
           {
-            setDefaultUrl(link.getId());
+            setPrimaryUrl(link.getId());
           }
         }
       }
@@ -215,25 +216,25 @@ public class IdentifiersUrlProvider extends UrlProviderImpl
   }
 
   @Override
-  public String getDefaultUrl(String seqid)
+  public String getPrimaryUrl(String seqid)
   {
-    return super.getDefaultUrl(seqid, urls);
+    return super.getPrimaryUrl(seqid, urls);
   }
 
   @Override
-  public String getDefaultUrlId()
+  public String getPrimaryUrlId()
   {
-    return defaultUrl;
+    return primaryUrl;
   }
 
   @Override
-  public String getDefaultTarget(String seqid)
+  public String getPrimaryTarget(String seqid)
   {
     return null;
   }
 
   @Override
-  public String chooseDefaultUrl()
+  public String choosePrimaryUrl()
   {
     return null;
   }