JAL-2316 Changes following review.

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

diff --git a/src/jalview/urls/CustomUrlProvider.java b/src/jalview/urls/CustomUrlProvider.java
index dae9ccd..0471e4b 100644 (file)
--- a/src/jalview/urls/CustomUrlProvider.java
+++ b/src/jalview/urls/CustomUrlProvider.java
@@ -199,22 +199,22 @@ public class CustomUrlProvider extends UrlProviderImpl
   }
 
   @Override
-  public boolean setDefaultUrl(String id)
+  public boolean setPrimaryUrl(String id)
   {
     if (selectedUrls.containsKey(id))
     {
-      defaultUrl = id;
+      primaryUrl = id;
     }
     else if (nonselectedUrls.containsKey(id))
     {
-      defaultUrl = id;
+      primaryUrl = id;
     }
     else
     {
-      defaultUrl = null;
+      primaryUrl = null;
     }
 
-    return (defaultUrl != null);
+    return (primaryUrl != null);
   }
 
   @Override
@@ -249,26 +249,26 @@ public class CustomUrlProvider extends UrlProviderImpl
   }
 
   @Override
-  public String getDefaultUrl(String seqid)
+  public String getPrimaryUrl(String seqid)
   {
-    String result = super.getDefaultUrl(seqid, selectedUrls);
+    String result = super.getPrimaryUrl(seqid, selectedUrls);
     if (result == null)
     {
-      result = super.getDefaultUrl(seqid, nonselectedUrls);
+      result = super.getPrimaryUrl(seqid, nonselectedUrls);
     }
     return result;
   }
 
   @Override
-  public String getDefaultUrlId()
+  public String getPrimaryUrlId()
   {
-    return defaultUrl;
+    return primaryUrl;
   }
 
   @Override
-  public String getDefaultTarget(String seqid)
+  public String getPrimaryTarget(String seqid)
   {
-    return selectedUrls.get(defaultUrl).getTarget();
+    return selectedUrls.get(primaryUrl).getTarget();
   }
 
   @Override
@@ -302,10 +302,10 @@ public class CustomUrlProvider extends UrlProviderImpl
           unselurls.put(link.getId(), new UrlLink(link.getName() + SEP
                   + link.getUrl()));
         }
-        // sort out default and selected ids
-        if (link.getIsDefault())
+        // sort out primary and selected ids
+        if (link.getIsPrimary())
         {
-          setDefaultUrl(link.getId());
+          setPrimaryUrl(link.getId());
         }
       }
 
@@ -315,16 +315,16 @@ public class CustomUrlProvider extends UrlProviderImpl
   }
 
   @Override
-  public String chooseDefaultUrl()
+  public String choosePrimaryUrl()
   {
-    // unilaterally set the default id to the EMBL_EBI link
+    // unilaterally set the primary id to the EMBL_EBI link
     if ((!nonselectedUrls.containsKey(UrlConstants.DEFAULT_LABEL))
             && (!selectedUrls.containsKey(UrlConstants.DEFAULT_LABEL)))
     {
       selectedUrls.put(UrlConstants.DEFAULT_LABEL, new UrlLink(
               UrlConstants.DEFAULT_STRING));
     }
-    defaultUrl = UrlConstants.DEFAULT_LABEL;
+    primaryUrl = UrlConstants.DEFAULT_LABEL;
     return UrlConstants.DEFAULT_LABEL;
   }