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-3247 Script to produce auto file association files for mac and windows installer...
[jalview.git]
/
src
/
jalview
/
urls
/
UrlProvider.java
diff --git
a/src/jalview/urls/UrlProvider.java
b/src/jalview/urls/UrlProvider.java
index
19fa196
..
2cb0173
100644
(file)
--- a/
src/jalview/urls/UrlProvider.java
+++ b/
src/jalview/urls/UrlProvider.java
@@
-63,11
+63,11
@@
public class UrlProvider implements UrlProviderI
{
// if the defaultUrl can't be found in any of the providers
// set up a custom default url
{
// if the defaultUrl can't be found in any of the providers
// set up a custom default url
- chooseDefaultUrl();
+ choosePrimaryUrl();
}
else
{
}
else
{
- setDefaultUrl(defaultUrlString);
+ setPrimaryUrl(defaultUrlString);
}
}
}
}
@@
-78,24
+78,24
@@
public class UrlProvider implements UrlProviderI
{
for (UrlProviderI p : providers)
{
{
for (UrlProviderI p : providers)
{
- if (p.getClass().equals(CustomUrlProvider.class))
+ if (p instanceof CustomUrlProvider)
{
return p;
}
}
{
return p;
}
}
- System.out
- .println("Error initialising UrlProvider - no custom url provider");
+ System.out.println(
+ "Error initialising UrlProvider - no custom url provider");
return null;
}
return null;
}
-
+
@Override
@Override
- public boolean setDefaultUrl(String id)
+ public boolean setPrimaryUrl(String id)
{
boolean outcome = false;
for (UrlProviderI p : providers)
{
{
boolean outcome = false;
for (UrlProviderI p : providers)
{
- if (p.setDefaultUrl(id))
+ if (p.setPrimaryUrl(id))
{
outcome = true;
}
{
outcome = true;
}
@@
-120,7
+120,7
@@
public class UrlProvider implements UrlProviderI
}
return outcome;
}
}
return outcome;
}
-
+
@Override
public String writeUrlsAsString(boolean selected)
{
@Override
public String writeUrlsAsString(boolean selected)
{
@@
-180,18
+180,18
@@
public class UrlProvider implements UrlProviderI
}
@Override
}
@Override
- public String getDefaultUrl(String seqid)
+ public String getPrimaryUrl(String seqid)
{
String link = null;
for (UrlProviderI p : providers)
{
{
String link = null;
for (UrlProviderI p : providers)
{
- if (p.getDefaultUrl(seqid) == null)
+ if (p.getPrimaryUrl(seqid) == null)
{
continue;
}
else
{
{
continue;
}
else
{
- link = p.getDefaultUrl(seqid);
+ link = p.getPrimaryUrl(seqid);
break;
}
}
break;
}
}
@@
-199,18
+199,18
@@
public class UrlProvider implements UrlProviderI
}
@Override
}
@Override
- public String getDefaultUrlId()
+ public String getPrimaryUrlId()
{
String id = null;
for (UrlProviderI p : providers)
{
{
String id = null;
for (UrlProviderI p : providers)
{
- if (p.getDefaultUrlId() == null)
+ if (p.getPrimaryUrlId() == null)
{
continue;
}
else
{
{
continue;
}
else
{
- id = p.getDefaultUrlId();
+ id = p.getPrimaryUrlId();
break;
}
}
break;
}
}
@@
-218,29
+218,29
@@
public class UrlProvider implements UrlProviderI
}
@Override
}
@Override
- public String getDefaultTarget(String seqid)
+ public String getPrimaryTarget(String seqid)
{
String target = null;
for (UrlProviderI p : providers)
{
{
String target = null;
for (UrlProviderI p : providers)
{
- if (p.getDefaultTarget(seqid) == null)
+ if (p.getPrimaryTarget(seqid) == null)
{
continue;
}
else
{
{
continue;
}
else
{
- target = p.getDefaultTarget(seqid);
+ target = p.getPrimaryTarget(seqid);
break;
}
}
return target;
}
break;
}
}
return target;
}
-
+
@Override
@Override
- public String chooseDefaultUrl()
+ public String choosePrimaryUrl()
{
// choose a custom url default
{
// choose a custom url default
- return customProvider.chooseDefaultUrl();
+ return customProvider.choosePrimaryUrl();
}
@Override
}
@Override