JAL-2591 simplifying hidden columns usage

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

diff --git a/src/jalview/urls/CustomUrlProvider.java b/src/jalview/urls/CustomUrlProvider.java
index b10d816..07f4068 100644 (file)
--- a/src/jalview/urls/CustomUrlProvider.java
+++ b/src/jalview/urls/CustomUrlProvider.java
@@ -37,7 +37,6 @@ import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.StringTokenizer;
-import java.util.Vector;
 
 /**
  * 
@@ -167,15 +166,15 @@ public class CustomUrlProvider extends UrlProviderImpl
     {
       urls.remove(SRS_LABEL);
       UrlLink link = new UrlLink(UrlConstants.DEFAULT_STRING);
-      link.setDescription(UrlConstants.DEFAULT_LABEL);
+      link.setLabel(UrlConstants.DEFAULT_LABEL);
       urls.put(UrlConstants.DEFAULT_LABEL, link);
     }
   }
 
   @Override
-  public Vector<String> getLinksForMenu()
+  public List<String> getLinksForMenu()
   {
-    Vector<String> links = new Vector<String>();
+    List<String> links = new ArrayList<String>();
     Iterator<Map.Entry<String, UrlLink>> it = selectedUrls.entrySet()
             .iterator();
     while (it.hasNext())
@@ -298,14 +297,14 @@ public class CustomUrlProvider extends UrlProviderImpl
         if (link.getIsSelected())
         {
           selurls.put(link.getId(),
-                  new UrlLink(link.getName(), link.getUrl(), link.getName()));
+                  new UrlLink(link.getDescription(), link.getUrl(), link.getDescription()));
         }
         else
         {
           unselurls
                   .put(link.getId(),
-                          new UrlLink(link.getName(), link.getUrl(), link
-                                  .getName()));
+                          new UrlLink(link.getDescription(), link.getUrl(), link
+                                  .getDescription()));
         }
         // sort out primary and selected ids
         if (link.getIsPrimary())
@@ -327,7 +326,7 @@ public class CustomUrlProvider extends UrlProviderImpl
             && (!selectedUrls.containsKey(UrlConstants.DEFAULT_LABEL)))
     {
       UrlLink link = new UrlLink(UrlConstants.DEFAULT_STRING);
-      link.setDescription(UrlConstants.DEFAULT_LABEL);
+      link.setLabel(UrlConstants.DEFAULT_LABEL);
       selectedUrls.put(UrlConstants.DEFAULT_LABEL, link);
     }
     primaryUrl = UrlConstants.DEFAULT_LABEL;