X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Furls%2FIdentifiersUrlProvider.java;h=07eb23efc9211dd3054b79a1818dc317a6fcaa9a;hb=038cd8338ccca1cec7e00979f796740add7c4aed;hp=0dab7198e2fff8c617d09be7c63bb60d7bdf7a3c;hpb=8e7cf85a7f61f425e808cac53ead7bc27e402242;p=jalview.git diff --git a/src/jalview/urls/IdentifiersUrlProvider.java b/src/jalview/urls/IdentifiersUrlProvider.java index 0dab719..07eb23e 100644 --- a/src/jalview/urls/IdentifiersUrlProvider.java +++ b/src/jalview/urls/IdentifiersUrlProvider.java @@ -63,7 +63,7 @@ public class IdentifiersUrlProvider extends UrlProviderImpl public IdentifiersUrlProvider(String cachedUrlList) { urls = readIdentifiers(IdOrgSettings.getDownloadLocation()); - selectedUrls = new ArrayList(); + selectedUrls = new ArrayList<>(); checkSelectionMatchesUrls(cachedUrlList); } @@ -78,7 +78,7 @@ public class IdentifiersUrlProvider extends UrlProviderImpl private HashMap readIdentifiers(String idFileName) { // identifiers.org data - HashMap idData = new HashMap(); + HashMap idData = new HashMap<>(); String errorMessage = null; try @@ -123,12 +123,14 @@ private HashMap readIdentifiers(String idFileName) // Typical report here is "NetworkError" because the file does not exist. // "https://." is coming from System.getProperty("user.home"), but this could // be set by the page developer to anything, of course. - errorMessage = (/** @j2sNative String.fromCharCode.apply(null, reader.$in.is.buf.slice(0,12)) || */e.toString()); + errorMessage = e.toString(); idData.clear(); } // BH 2018 -- added more valuable report if (errorMessage != null) + { System.err.println("IdentifiersUrlProvider: cannot read " + idFileName + ": " + errorMessage); + } return idData; } @@ -193,7 +195,7 @@ private HashMap readIdentifiers(String idFileName) @Override public List getLinksForMenu() { - List links = new ArrayList(); + List links = new ArrayList<>(); for (String key : selectedUrls) { links.add(urls.get(key).toStringWithTarget()); @@ -210,7 +212,7 @@ private HashMap readIdentifiers(String idFileName) @Override public void setUrlData(List links) { - selectedUrls = new ArrayList(); + selectedUrls = new ArrayList<>(); Iterator it = links.iterator(); while (it.hasNext())