git://source.jalview.org
/
jalview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'bug/JAL-2687concurrentModification' into features/JAL-2608closeOverview
[jalview.git]
/
src
/
jalview
/
urls
/
CustomUrlProvider.java
diff --git
a/src/jalview/urls/CustomUrlProvider.java
b/src/jalview/urls/CustomUrlProvider.java
index
b10d816
..
0d5ef99
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.Map;
import java.util.Map.Entry;
import java.util.StringTokenizer;
-import java.util.Vector;
/**
*
/**
*
@@
-150,8
+149,7
@@
public class CustomUrlProvider extends UrlProviderImpl
{
Map.Entry<String, String> pair = it.next();
urls.put(pair.getKey(),
{
Map.Entry<String, String> pair = it.next();
urls.put(pair.getKey(),
- new UrlLink(pair.getKey(), pair.getValue(),
- pair.getKey()));
+ new UrlLink(pair.getKey(), pair.getValue(), pair.getKey()));
}
upgradeOldLinks(urls);
return urls;
}
upgradeOldLinks(urls);
return urls;
@@
-167,15
+165,15
@@
public class CustomUrlProvider extends UrlProviderImpl
{
urls.remove(SRS_LABEL);
UrlLink link = new UrlLink(UrlConstants.DEFAULT_STRING);
{
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
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())
Iterator<Map.Entry<String, UrlLink>> it = selectedUrls.entrySet()
.iterator();
while (it.hasNext())
@@
-297,15
+295,13
@@
public class CustomUrlProvider extends UrlProviderImpl
}
if (link.getIsSelected())
{
}
if (link.getIsSelected())
{
- selurls.put(link.getId(),
- new UrlLink(link.getName(), link.getUrl(), link.getName()));
+ selurls.put(link.getId(), new UrlLink(link.getDescription(),
+ link.getUrl(), link.getDescription()));
}
else
{
}
else
{
- unselurls
- .put(link.getId(),
- new UrlLink(link.getName(), link.getUrl(), link
- .getName()));
+ unselurls.put(link.getId(), new UrlLink(link.getDescription(),
+ link.getUrl(), link.getDescription()));
}
// sort out primary and selected ids
if (link.getIsPrimary())
}
// sort out primary and selected ids
if (link.getIsPrimary())
@@
-327,7
+323,7
@@
public class CustomUrlProvider extends UrlProviderImpl
&& (!selectedUrls.containsKey(UrlConstants.DEFAULT_LABEL)))
{
UrlLink link = new UrlLink(UrlConstants.DEFAULT_STRING);
&& (!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;
selectedUrls.put(UrlConstants.DEFAULT_LABEL, link);
}
primaryUrl = UrlConstants.DEFAULT_LABEL;
@@
-337,7
+333,8
@@
public class CustomUrlProvider extends UrlProviderImpl
@Override
public boolean contains(String id)
{
@Override
public boolean contains(String id)
{
- return (selectedUrls.containsKey(id) || nonselectedUrls.containsKey(id));
+ return (selectedUrls.containsKey(id)
+ || nonselectedUrls.containsKey(id));
}
}
}
}