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
JAL-629 null check and neatening code
[jalview.git]
/
src
/
jalview
/
urls
/
CustomUrlProvider.java
diff --git
a/src/jalview/urls/CustomUrlProvider.java
b/src/jalview/urls/CustomUrlProvider.java
index
86d5660
..
d23f771
100644
(file)
--- a/
src/jalview/urls/CustomUrlProvider.java
+++ b/
src/jalview/urls/CustomUrlProvider.java
@@
-107,12
+107,12
@@
public class CustomUrlProvider extends UrlProviderImpl
{
// cachedUrlList is in form <label>|<url>|<label>|<url>...
// parse cachedUrlList into labels (used as id) and url links
{
// cachedUrlList is in form <label>|<url>|<label>|<url>...
// parse cachedUrlList into labels (used as id) and url links
- HashMap<String, UrlLink> urls = new HashMap<String, UrlLink>();
+ HashMap<String, UrlLink> urls = new HashMap<>();
StringTokenizer st = new StringTokenizer(urlStrings, SEP);
while (st.hasMoreElements())
{
StringTokenizer st = new StringTokenizer(urlStrings, SEP);
while (st.hasMoreElements())
{
- String name = st.nextToken();
+ String name = st.nextToken().trim();
if (!isMiriamId(name))
{
if (!isMiriamId(name))
{
@@
-129,6
+129,7
@@
public class CustomUrlProvider extends UrlProviderImpl
{
url = url + SEP + st.nextToken();
}
{
url = url + SEP + st.nextToken();
}
+ url = url.trim();
urls.put(name, new UrlLink(name, url, name));
}
}
urls.put(name, new UrlLink(name, url, name));
}
}
@@
-138,7
+139,7
@@
public class CustomUrlProvider extends UrlProviderImpl
private HashMap<String, UrlLink> parseUrlList(Map<String, String> urlList)
{
private HashMap<String, UrlLink> parseUrlList(Map<String, String> urlList)
{
- HashMap<String, UrlLink> urls = new HashMap<String, UrlLink>();
+ HashMap<String, UrlLink> urls = new HashMap<>();
if (urlList == null)
{
return urls;
if (urlList == null)
{
return urls;
@@
-187,7
+188,7
@@
public class CustomUrlProvider extends UrlProviderImpl
@Override
public List<String> getLinksForMenu()
{
@Override
public List<String> getLinksForMenu()
{
- List<String> links = new ArrayList<String>();
+ List<String> links = new ArrayList<>();
Iterator<Map.Entry<String, UrlLink>> it = selectedUrls.entrySet()
.iterator();
while (it.hasNext())
Iterator<Map.Entry<String, UrlLink>> it = selectedUrls.entrySet()
.iterator();
while (it.hasNext())
@@
-201,7
+202,7
@@
public class CustomUrlProvider extends UrlProviderImpl
@Override
public List<UrlLinkDisplay> getLinksForTable()
{
@Override
public List<UrlLinkDisplay> getLinksForTable()
{
- ArrayList<UrlLinkDisplay> displayLinks = new ArrayList<UrlLinkDisplay>();
+ ArrayList<UrlLinkDisplay> displayLinks = new ArrayList<>();
displayLinks = getLinksForTable(selectedUrls, true);
displayLinks.addAll(getLinksForTable(nonselectedUrls, false));
return displayLinks;
displayLinks = getLinksForTable(selectedUrls, true);
displayLinks.addAll(getLinksForTable(nonselectedUrls, false));
return displayLinks;
@@
-289,8
+290,8
@@
public class CustomUrlProvider extends UrlProviderImpl
@Override
public void setUrlData(List<UrlLinkDisplay> links)
{
@Override
public void setUrlData(List<UrlLinkDisplay> links)
{
- HashMap<String, UrlLink> unselurls = new HashMap<String, UrlLink>();
- HashMap<String, UrlLink> selurls = new HashMap<String, UrlLink>();
+ HashMap<String, UrlLink> unselurls = new HashMap<>();
+ HashMap<String, UrlLink> selurls = new HashMap<>();
Iterator<UrlLinkDisplay> it = links.iterator();
while (it.hasNext())
Iterator<UrlLinkDisplay> it = links.iterator();
while (it.hasNext())