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-2316 Refactoring of functionality to provide urls to gui
[jalview.git]
/
src
/
jalview
/
gui
/
Desktop.java
diff --git
a/src/jalview/gui/Desktop.java
b/src/jalview/gui/Desktop.java
index
28606f1
..
63f797d
100644
(file)
--- a/
src/jalview/gui/Desktop.java
+++ b/
src/jalview/gui/Desktop.java
@@
-20,7
+20,6
@@
*/
package jalview.gui;
*/
package jalview.gui;
-import static jalview.util.UrlConstants.EMBLEBI_STRING;
import static jalview.util.UrlConstants.SEQUENCE_ID;
import jalview.api.AlignViewportI;
import static jalview.util.UrlConstants.SEQUENCE_ID;
import jalview.api.AlignViewportI;
@@
-38,6
+37,7
@@
import jalview.structure.StructureSelectionManager;
import jalview.util.ImageMaker;
import jalview.util.MessageManager;
import jalview.util.Platform;
import jalview.util.ImageMaker;
import jalview.util.MessageManager;
import jalview.util.Platform;
+import jalview.util.UrlProviderI;
import jalview.viewmodel.AlignmentViewport;
import jalview.ws.params.ParamManager;
import jalview.viewmodel.AlignmentViewport;
import jalview.ws.params.ParamManager;
@@
-2277,7
+2277,8
@@
public class Desktop extends jalview.jbgui.GDesktop implements
{
// check what the actual links are - if it's just the default don't
// bother with the warning
{
// check what the actual links are - if it's just the default don't
// bother with the warning
- Vector<String> links = Preferences.sequenceURLLinks;
+ Vector<String> links = Preferences.sequenceUrlLinks
+ .getLinksForDisplay();
// only need to check links if there is one with a
// SEQUENCE_ID which is not the default EMBL_EBI link
// only need to check links if there is one with a
// SEQUENCE_ID which is not the default EMBL_EBI link
@@
-2287,7
+2288,8
@@
public class Desktop extends jalview.jbgui.GDesktop implements
while (li.hasNext())
{
String link = li.next();
while (li.hasNext())
{
String link = li.next();
- if (link.contains(SEQUENCE_ID) && !link.equals(EMBLEBI_STRING))
+ if (link.contains(SEQUENCE_ID)
+ && !link.equals(UrlProviderI.DEFAULT_STRING))
{
check = true;
int barPos = link.indexOf("|");
{
check = true;
int barPos = link.indexOf("|");