JAL-4020 class formatting

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

diff --git a/src/jalview/urls/UrlProviderImpl.java b/src/jalview/urls/UrlProviderImpl.java
index 5e85062..d2fd359 100644 (file)
--- a/src/jalview/urls/UrlProviderImpl.java
+++ b/src/jalview/urls/UrlProviderImpl.java
@@ -20,6 +20,7 @@
  */
 package jalview.urls;
 
+import jalview.urls.api.UrlProviderI;
 import jalview.util.UrlLink;
 
 import java.util.ArrayList;
@@ -43,36 +44,37 @@ public abstract class UrlProviderImpl implements UrlProviderI
   private static final Pattern MIRIAM_PATTERN = Pattern
           .compile("^MIR:\\d{8}$");
 
-  protected String defaultUrl;
+  protected String primaryUrl;
 
-  protected String getDefaultUrl(String seqid, HashMap<String, UrlLink> urls)
+  protected String getPrimaryUrl(String seqid,
+          HashMap<String, UrlLink> urls)
   {
     if (seqid.length() < MIN_SUBST_LENGTH)
     {
       return null;
     }
-    else if (defaultUrl == null)
+    else if (primaryUrl == null)
     {
       return null;
     }
-    else if (!urls.containsKey(defaultUrl))
+    else if (!urls.containsKey(primaryUrl))
     {
       return null;
     }
     else
     {
       String url = null;
-      UrlLink urlLink = urls.get(defaultUrl);
-      String[] defaultUrls = urlLink.makeUrls(seqid, true);
-      if (defaultUrls == null || defaultUrls[0] == null
-              || defaultUrls[0].length() < MIN_SUBST_LENGTH)
+      UrlLink urlLink = urls.get(primaryUrl);
+      String[] primaryUrls = urlLink.makeUrls(seqid, true);
+      if (primaryUrls == null || primaryUrls[0] == null
+              || primaryUrls[0].length() < MIN_SUBST_LENGTH)
       {
         url = null;
       }
       else
       {
         // just take first URL made from regex
-        url = defaultUrls[1];
+        url = primaryUrls[1];
       }
       return url;
     }
@@ -92,7 +94,7 @@ public abstract class UrlProviderImpl implements UrlProviderI
     for (Entry<String, UrlLink> entry : urls.entrySet())
     {
       String key = entry.getKey();
-      boolean isDefault = (key.equals(defaultUrl));
+      boolean isPrimary = (key.equals(primaryUrl));
       boolean isSelected;
       if (selectedUrls != null)
       {
@@ -102,8 +104,8 @@ public abstract class UrlProviderImpl implements UrlProviderI
       {
         isSelected = selected;
       }
-      displayLinks.add(new UrlLinkDisplay(key, entry.getValue(),
-              isSelected, isDefault));
+      displayLinks.add(new UrlLinkDisplay(key, entry.getValue(), isSelected,
+              isPrimary));
     }
     return displayLinks;
   }
@@ -119,4 +121,3 @@ public abstract class UrlProviderImpl implements UrlProviderI
     return !isMiriamId(id);
   }
 }
-