JAL-2316 Separate label/db name in UrlProviders. Unit test updates.

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

diff --git a/src/jalview/urls/UrlLinkDisplay.java b/src/jalview/urls/UrlLinkDisplay.java
index 814370e..0eabff7 100644 (file)
--- a/src/jalview/urls/UrlLinkDisplay.java
+++ b/src/jalview/urls/UrlLinkDisplay.java
@@ -87,14 +87,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 +112,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 +150,7 @@ public class UrlLinkDisplay
     case SELECTED:
       return isSelected;
     case NAME:
-      return getName();
+      return getDescription();
     case DATABASE:
       return getDBName();
     default:
@@ -177,7 +177,7 @@ public class UrlLinkDisplay
     case NAME:
       setDescription((String) value);
     case DATABASE:
-      setName((String) value);
+      setDBName((String) value);
       break;
     default:
       // do nothing