JAL-2316 Changes following review.

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

diff --git a/src/jalview/urls/UrlProvider.java b/src/jalview/urls/UrlProvider.java
index 19fa196..bd01e89 100644 (file)
--- a/src/jalview/urls/UrlProvider.java
+++ b/src/jalview/urls/UrlProvider.java
@@ -63,11 +63,11 @@ public class UrlProvider implements UrlProviderI
     {
       // if the defaultUrl can't be found in any of the providers
       // set up a custom default url
-      chooseDefaultUrl();
+      choosePrimaryUrl();
     }
     else
     {
-      setDefaultUrl(defaultUrlString);
+      setPrimaryUrl(defaultUrlString);
     }
   }
 
@@ -78,7 +78,7 @@ public class UrlProvider implements UrlProviderI
   {
     for (UrlProviderI p : providers)
     {
-      if (p.getClass().equals(CustomUrlProvider.class))
+      if (p instanceof CustomUrlProvider)
       {
         return p;
       }
@@ -90,12 +90,12 @@ public class UrlProvider implements UrlProviderI
   }
   
   @Override
-  public boolean setDefaultUrl(String id)
+  public boolean setPrimaryUrl(String id)
   {
     boolean outcome = false;
     for (UrlProviderI p : providers)
     {
-      if (p.setDefaultUrl(id))
+      if (p.setPrimaryUrl(id))
       {
         outcome = true;
       }
@@ -180,18 +180,18 @@ public class UrlProvider implements UrlProviderI
   }
 
   @Override
-  public String getDefaultUrl(String seqid)
+  public String getPrimaryUrl(String seqid)
   {
     String link = null;
     for (UrlProviderI p : providers)
     {
-      if (p.getDefaultUrl(seqid) == null)
+      if (p.getPrimaryUrl(seqid) == null)
       {
         continue;
       }
       else
       {
-        link = p.getDefaultUrl(seqid);
+        link = p.getPrimaryUrl(seqid);
         break;
       }
     }
@@ -199,18 +199,18 @@ public class UrlProvider implements UrlProviderI
   }
 
   @Override
-  public String getDefaultUrlId()
+  public String getPrimaryUrlId()
   {
     String id = null;
     for (UrlProviderI p : providers)
     {
-      if (p.getDefaultUrlId() == null)
+      if (p.getPrimaryUrlId() == null)
       {
         continue;
       }
       else
       {
-        id = p.getDefaultUrlId();
+        id = p.getPrimaryUrlId();
         break;
       }
     }
@@ -218,18 +218,18 @@ public class UrlProvider implements UrlProviderI
   }
 
   @Override
-  public String getDefaultTarget(String seqid)
+  public String getPrimaryTarget(String seqid)
   {
     String target = null;
     for (UrlProviderI p : providers)
     {
-      if (p.getDefaultTarget(seqid) == null)
+      if (p.getPrimaryTarget(seqid) == null)
       {
         continue;
       }
       else
       {
-        target = p.getDefaultTarget(seqid);
+        target = p.getPrimaryTarget(seqid);
         break;
       }
     }
@@ -237,10 +237,10 @@ public class UrlProvider implements UrlProviderI
   }
   
   @Override
-  public String chooseDefaultUrl()
+  public String choosePrimaryUrl()
   {
     // choose a custom url default
-    return customProvider.chooseDefaultUrl();
+    return customProvider.choosePrimaryUrl();
   }
 
   @Override