JAL-2316 Added database name column to URL links table in preferences

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

diff --git a/src/jalview/urls/UrlLinkDisplay.java b/src/jalview/urls/UrlLinkDisplay.java
index 5991d76..814370e 100644 (file)
--- a/src/jalview/urls/UrlLinkDisplay.java
+++ b/src/jalview/urls/UrlLinkDisplay.java
@@ -49,6 +49,7 @@ public class UrlLinkDisplay
   private final static List<String> colNames = new ArrayList<String>()
   {
     {
+      add(MessageManager.formatMessage("label.database"));
       add(MessageManager.formatMessage("label.name"));
       add(MessageManager.formatMessage("label.url"));
       add(MessageManager.formatMessage("label.inmenu"));
@@ -58,15 +59,17 @@ public class UrlLinkDisplay
   };
 
   // column positions
-  public final static int NAME = 0;
+  public final static int DATABASE = 0;
 
-  public final static int URL = 1;
+  public final static int NAME = 1;
 
-  public final static int SELECTED = 2;
+  public final static int URL = 2;
 
-  public final static int PRIMARY = 3;
+  public final static int SELECTED = 3;
 
-  public final static int ID = 4;
+  public final static int PRIMARY = 4;
+
+  public final static int ID = 5;
 
   public UrlLinkDisplay(String rowId, UrlLink rowLink,
           boolean rowSelected, boolean rowDefault)
@@ -89,6 +92,11 @@ public class UrlLinkDisplay
     return link.getLabel();
   }
 
+  public String getDBName()
+  {
+    return link.getDBName();
+  }
+
   public String getUrl()
   {
     return link.getUrlWithToken();
@@ -111,7 +119,12 @@ public class UrlLinkDisplay
 
   public void setUrl(String rowUrl)
   {
-    link = new UrlLink(getName(), rowUrl);
+    link = new UrlLink(getName(), rowUrl, getName());
+  }
+
+  public void setDescription(String desc)
+  {
+    link.setDescription(desc);
   }
 
   public void setIsDefault(boolean rowDefault)
@@ -138,6 +151,8 @@ public class UrlLinkDisplay
       return isSelected;
     case NAME:
       return getName();
+    case DATABASE:
+      return getDBName();
     default:
       return null;
     }
@@ -160,6 +175,8 @@ public class UrlLinkDisplay
       isSelected = (boolean) value;
       break;
     case NAME:
+      setDescription((String) value);
+    case DATABASE:
       setName((String) value);
       break;
     default:
@@ -199,7 +216,7 @@ public class UrlLinkDisplay
    */
   public static List<String> getDisplayColumnNames()
   {
-    // Display names between NAME and ID (excludes ID)
-    return colNames.subList(NAME, ID);
+    // Display names between DESCRIPTION and ID (excludes ID)
+    return colNames.subList(DATABASE, ID);
   }
 }