X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Furls%2FUrlLinkDisplay.java;h=39d6b35d15a1172eecb3940a07ef52f889d8fdbc;hb=483ecb5e4541537778844529cc93204f9124b68d;hp=814370eddbcf827d916c023f1c4d6565968e5fbe;hpb=40f8e76e5d28e2c2fe5fddab72fe797a696bed8a;p=jalview.git

diff --git a/src/jalview/urls/UrlLinkDisplay.java b/src/jalview/urls/UrlLinkDisplay.java
index 814370e..39d6b35 100644
--- a/src/jalview/urls/UrlLinkDisplay.java
+++ b/src/jalview/urls/UrlLinkDisplay.java
@@ -36,17 +36,22 @@ import java.util.List;
 
 public class UrlLinkDisplay
 {
-  private String id; // id is not supplied to display, but used to identify
-                     // entries when saved
+  // column positions
+  public static final int DATABASE = 0;
 
-  private boolean isPrimary;
+  public static final int NAME = 1;
 
-  private boolean isSelected;
+  public static final int URL = 2;
 
-  private UrlLink link;
+  public static final int SELECTED = 3;
+
+  public static final int PRIMARY = 4;
+
+  public static final int ID = 5;
 
   // Headers for columns in table
-  private final static List<String> colNames = new ArrayList<String>()
+  @SuppressWarnings("serial")
+  private static final List<String> COLNAMES = new ArrayList<String>()
   {
     {
       add(MessageManager.formatMessage("label.database"));
@@ -58,21 +63,17 @@ public class UrlLinkDisplay
     }
   };
 
-  // column positions
-  public final static int DATABASE = 0;
-
-  public final static int NAME = 1;
-
-  public final static int URL = 2;
+  private String id; // id is not supplied to display, but used to identify
+  // entries when saved
 
-  public final static int SELECTED = 3;
+  private boolean isPrimary;
 
-  public final static int PRIMARY = 4;
+  private boolean isSelected;
 
-  public final static int ID = 5;
+  private UrlLink link;
 
-  public UrlLinkDisplay(String rowId, UrlLink rowLink,
-          boolean rowSelected, boolean rowDefault)
+  public UrlLinkDisplay(String rowId, UrlLink rowLink, boolean rowSelected,
+          boolean rowDefault)
   {
     id = rowId;
     isPrimary = rowDefault;
@@ -87,14 +88,14 @@ public class UrlLinkDisplay
     return id;
   }
 
-  public String getName()
+  public String getDescription()
   {
     return link.getLabel();
   }
 
   public String getDBName()
   {
-    return link.getDBName();
+    return link.getTarget();
   }
 
   public String getUrl()
@@ -112,19 +113,19 @@ public class UrlLinkDisplay
     return isSelected;
   }
 
-  public void setName(String name)
+  public void setDBName(String name)
   {
-    link.setLabel(name);
+    link.setTarget(name);
   }
 
   public void setUrl(String rowUrl)
   {
-    link = new UrlLink(getName(), rowUrl, getName());
+    link = new UrlLink(getDescription(), rowUrl, getDBName());
   }
 
   public void setDescription(String desc)
   {
-    link.setDescription(desc);
+    link.setLabel(desc);
   }
 
   public void setIsDefault(boolean rowDefault)
@@ -150,7 +151,7 @@ public class UrlLinkDisplay
     case SELECTED:
       return isSelected;
     case NAME:
-      return getName();
+      return getDescription();
     case DATABASE:
       return getDBName();
     default:
@@ -176,8 +177,9 @@ public class UrlLinkDisplay
       break;
     case NAME:
       setDescription((String) value);
+      // deliberate fall through
     case DATABASE:
-      setName((String) value);
+      setDBName((String) value);
       break;
     default:
       // do nothing
@@ -199,13 +201,9 @@ public class UrlLinkDisplay
       // so only allow editing if it is not
       return (!link.usesDBAccession());
     }
-    else if (index == SELECTED)
-    {
-      return true;
-    }
     else
     {
-      return false;
+      return index == SELECTED;
     }
   }
 
@@ -217,6 +215,6 @@ public class UrlLinkDisplay
   public static List<String> getDisplayColumnNames()
   {
     // Display names between DESCRIPTION and ID (excludes ID)
-    return colNames.subList(DATABASE, ID);
+    return COLNAMES.subList(DATABASE, ID);
   }
 }