git://source.jalview.org
/
jalview.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
ab658ca
)
JAL-2316 Missed change from previous checkin
author
kiramt
<k.mourao@dundee.ac.uk>
Mon, 12 Dec 2016 13:43:16 +0000
(13:43 +0000)
committer
kiramt
<k.mourao@dundee.ac.uk>
Mon, 12 Dec 2016 13:43:16 +0000
(13:43 +0000)
src/jalview/urls/CustomUrlProvider.java
patch
|
blob
|
history
diff --git
a/src/jalview/urls/CustomUrlProvider.java
b/src/jalview/urls/CustomUrlProvider.java
index
f4dcc0c
..
dae9ccd
100644
(file)
--- a/
src/jalview/urls/CustomUrlProvider.java
+++ b/
src/jalview/urls/CustomUrlProvider.java
@@
-76,7
+76,8
@@
public class CustomUrlProvider extends UrlProviderImpl
nonselectedUrls = parseUrlStrings(storedUrlList);
} catch (Exception ex)
{
nonselectedUrls = parseUrlStrings(storedUrlList);
} catch (Exception ex)
{
- System.out.println(ex + "\nError parsing sequence links");
+ System.out
+ .println(ex.getMessage() + "\nError parsing sequence links");
}
}
}
}
@@
-98,7
+99,8
@@
public class CustomUrlProvider extends UrlProviderImpl
nonselectedUrls = parseUrlList(storedUrlList);
} catch (Exception ex)
{
nonselectedUrls = parseUrlList(storedUrlList);
} catch (Exception ex)
{
- System.out.println(ex + "\nError parsing sequence links");
+ System.out
+ .println(ex.getMessage() + "\nError parsing sequence links");
}
}
}
}
@@
-138,6
+140,11
@@
public class CustomUrlProvider extends UrlProviderImpl
private HashMap<String, UrlLink> parseUrlList(Map<String, String> urlList)
{
HashMap<String, UrlLink> urls = new HashMap<String, UrlLink>();
private HashMap<String, UrlLink> parseUrlList(Map<String, String> urlList)
{
HashMap<String, UrlLink> urls = new HashMap<String, UrlLink>();
+ if (urlList == null)
+ {
+ return urls;
+ }
+
Iterator<Map.Entry<String, String>> it = urlList.entrySet().iterator();
while (it.hasNext())
{
Iterator<Map.Entry<String, String>> it = urlList.entrySet().iterator();
while (it.hasNext())
{
@@
-194,10
+201,6
@@
public class CustomUrlProvider extends UrlProviderImpl
@Override
public boolean setDefaultUrl(String id)
{
@Override
public boolean setDefaultUrl(String id)
{
- /*if (id == null)
- {
- defaultUrl = null;
- }*/
if (selectedUrls.containsKey(id))
{
defaultUrl = id;
if (selectedUrls.containsKey(id))
{
defaultUrl = id;
@@
-315,14
+318,8
@@
public class CustomUrlProvider extends UrlProviderImpl
public String chooseDefaultUrl()
{
// unilaterally set the default id to the EMBL_EBI link
public String chooseDefaultUrl()
{
// unilaterally set the default id to the EMBL_EBI link
-
- if (nonselectedUrls.containsKey(UrlConstants.DEFAULT_LABEL))
- {
- // default key must be selected so remove from nonselected list
- nonselectedUrls.remove(UrlConstants.DEFAULT_LABEL);
- }
-
- if (!selectedUrls.containsKey(UrlConstants.DEFAULT_LABEL))
+ if ((!nonselectedUrls.containsKey(UrlConstants.DEFAULT_LABEL))
+ && (!selectedUrls.containsKey(UrlConstants.DEFAULT_LABEL)))
{
selectedUrls.put(UrlConstants.DEFAULT_LABEL, new UrlLink(
UrlConstants.DEFAULT_STRING));
{
selectedUrls.put(UrlConstants.DEFAULT_LABEL, new UrlLink(
UrlConstants.DEFAULT_STRING));
@@
-331,4
+328,10
@@
public class CustomUrlProvider extends UrlProviderImpl
return UrlConstants.DEFAULT_LABEL;
}
return UrlConstants.DEFAULT_LABEL;
}
+ @Override
+ public boolean contains(String id)
+ {
+ return (selectedUrls.containsKey(id) || nonselectedUrls.containsKey(id));
+ }
+
}
}