JAL-2316 Changes following review.

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

diff --git a/src/jalview/urls/UrlLinkDisplay.java b/src/jalview/urls/UrlLinkDisplay.java
index 2582f90..5991d76 100644 (file)
--- a/src/jalview/urls/UrlLinkDisplay.java
+++ b/src/jalview/urls/UrlLinkDisplay.java
@@ -39,7 +39,7 @@ public class UrlLinkDisplay
   private String id; // id is not supplied to display, but used to identify
                      // entries when saved
 
-  private boolean isDefault;
+  private boolean isPrimary;
 
   private boolean isSelected;
 
@@ -52,7 +52,7 @@ public class UrlLinkDisplay
       add(MessageManager.formatMessage("label.name"));
       add(MessageManager.formatMessage("label.url"));
       add(MessageManager.formatMessage("label.inmenu"));
-      add(MessageManager.formatMessage("label.default"));
+      add(MessageManager.formatMessage("label.primary"));
       add(MessageManager.formatMessage("label.id"));
     }
   };
@@ -64,7 +64,7 @@ public class UrlLinkDisplay
 
   public final static int SELECTED = 2;
 
-  public final static int DEFAULT = 3;
+  public final static int PRIMARY = 3;
 
   public final static int ID = 4;
 
@@ -72,7 +72,7 @@ public class UrlLinkDisplay
           boolean rowSelected, boolean rowDefault)
   {
     id = rowId;
-    isDefault = rowDefault;
+    isPrimary = rowDefault;
     isSelected = rowSelected;
 
     link = rowLink;
@@ -94,9 +94,9 @@ public class UrlLinkDisplay
     return link.getUrlWithToken();
   }
 
-  public boolean getIsDefault()
+  public boolean getIsPrimary()
   {
-    return isDefault;
+    return isPrimary;
   }
 
   public boolean getIsSelected()
@@ -116,7 +116,7 @@ public class UrlLinkDisplay
 
   public void setIsDefault(boolean rowDefault)
   {
-    isDefault = rowDefault;
+    isPrimary = rowDefault;
   }
 
   public void setIsSelected(boolean rowSelected)
@@ -132,8 +132,8 @@ public class UrlLinkDisplay
       return id;
     case URL:
       return getUrl();
-    case DEFAULT:
-      return isDefault;
+    case PRIMARY:
+      return isPrimary;
     case SELECTED:
       return isSelected;
     case NAME:
@@ -153,8 +153,8 @@ public class UrlLinkDisplay
     case URL:
       setUrl((String) value);
       break;
-    case DEFAULT:
-      isDefault = (boolean) value;
+    case PRIMARY:
+      isPrimary = (boolean) value;
       break;
     case SELECTED:
       isSelected = (boolean) value;
@@ -176,9 +176,9 @@ public class UrlLinkDisplay
    */
   public boolean isEditable(int index)
   {
-    if (index == DEFAULT)
+    if (index == PRIMARY)
     {
-      // default link must not be a $DB_ACCESSION$ link
+      // primary link must not be a $DB_ACCESSION$ link
       // so only allow editing if it is not
       return (!link.usesDBAccession());
     }