{
// 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())
{
- String name = st.nextToken();
+ String name = st.nextToken().trim();
if (!isMiriamId(name))
{
{
url = url + SEP + st.nextToken();
}
+ url = url.trim();
urls.put(name, new UrlLink(name, url, name));
}
}
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;
@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())
@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;
@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())