X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Furls%2FCustomUrlProvider.java;h=07f406849eddc3810bf906f1d7249c83bbb4ca8a;hb=6b560f7df25c0f8157531243fb461eb7ead76ab6;hp=b10d8167fb4e16b8dfa9bae9d1bf320746e6142e;hpb=40f8e76e5d28e2c2fe5fddab72fe797a696bed8a;p=jalview.git diff --git a/src/jalview/urls/CustomUrlProvider.java b/src/jalview/urls/CustomUrlProvider.java index b10d816..07f4068 100644 --- 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 getLinksForMenu() + public List getLinksForMenu() { - Vector links = new Vector(); + List links = new ArrayList(); Iterator> 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;