JAL-2316 GUI updates to Connections tab in Preferences dialog

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

diff --git a/src/jalview/urls/UrlProvider.java b/src/jalview/urls/UrlProvider.java
index af618f0..37e95e2 100644 (file)
--- a/src/jalview/urls/UrlProvider.java
+++ b/src/jalview/urls/UrlProvider.java
@@ -20,6 +20,8 @@
  */
 package jalview.urls;
 
+import static jalview.util.UrlConstants.SEP;
+
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
@@ -57,7 +59,7 @@ public class UrlProvider implements UrlProviderI
     UrlProviderI idProvider = new IdentifiersUrlProvider(cachedUrlList,
             ID_ORG_FILE);
     customProvider = new CustomUrlProvider(cachedUrlList);
-    // providers.add(idProvider);
+    providers.add(idProvider);
     providers.add(customProvider);
 
     // check that the defaultUrl still exists
@@ -134,7 +136,10 @@ public class UrlProvider implements UrlProviderI
     for (UrlProviderI p : providers)
     {
       result += p.writeUrlsAsString();
+      result += SEP;
     }
+    // remove last sep
+    result = result.substring(0, result.length() - 1);
     return result;
   }
 
@@ -156,6 +161,26 @@ public class UrlProvider implements UrlProviderI
   }
 
   @Override
+  public List<UrlLinkDisplay> getLinksForTable()
+  {
+    ArrayList<UrlLinkDisplay> displayLinks = new ArrayList<UrlLinkDisplay>();
+    for (UrlProviderI p : providers)
+    {
+      displayLinks.addAll(p.getLinksForTable());
+    }
+    return displayLinks;
+  }
+
+  @Override
+  public void setUrlData(List<UrlLinkDisplay> links)
+  {
+    for (UrlProviderI p : providers)
+    {
+      p.setUrlData(links);
+    }
+  }
+
+  @Override
   public String getDefaultUrl(String seqid)
   {
     String link = null;
@@ -207,4 +232,9 @@ public class UrlProvider implements UrlProviderI
     return customProvider.chooseDefaultUrl();
   }
 
+  @Override
+  public boolean isUserEntry(String id)
+  {
+    return customProvider.isUserEntry(id);
+  }
 }