X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FPreferences.java;fp=src%2Fjalview%2Fgui%2FPreferences.java;h=4f094e174fe819e1763e22af0385ee849b44e381;hb=e80a27f6eb12a788bbc78347a760e795ad8bd8c6;hp=b57b951b89dc730f137940821b0f31ba9bb4806c;hpb=f25f512fc2041d802ff09254ae6a9644c9d4262a;p=jalview.git diff --git a/src/jalview/gui/Preferences.java b/src/jalview/gui/Preferences.java index b57b951..4f094e1 100755 --- a/src/jalview/gui/Preferences.java +++ b/src/jalview/gui/Preferences.java @@ -21,9 +21,8 @@ package jalview.gui; import static jalview.util.UrlConstants.EMBLEBI_STRING; -import static jalview.util.UrlConstants.OLD_EMBLEBI_STRING; +import static jalview.util.UrlConstants.DB_ACCESSION; import static jalview.util.UrlConstants.SEQUENCE_ID; -import static jalview.util.UrlConstants.SEQUENCE_NAME; import static jalview.util.UrlConstants.SRS_STRING; import jalview.analysis.AnnotationSorter.SequenceAnnotationOrder; @@ -127,10 +126,10 @@ public class Preferences extends GPreferences String name = st.nextToken(); String url = st.nextToken(); // check for '|' within a regex - int rxstart = url.indexOf("$" + SEQUENCE_ID + "$"); + int rxstart = url.indexOf("$" + DB_ACCESSION + "$"); if (rxstart == -1) { - rxstart = url.indexOf("$" + SEQUENCE_NAME + "$"); + rxstart = url.indexOf("$" + SEQUENCE_ID + "$"); } while (rxstart == -1 && url.indexOf("/=$") == -1) { @@ -149,12 +148,6 @@ public class Preferences extends GPreferences { sequenceURLLinks.setElementAt(EMBLEBI_STRING, srsPos); } - // upgrade old EMBL-EBI link - int emblPos = sequenceURLLinks.indexOf(OLD_EMBLEBI_STRING); - if (emblPos > -1) - { - sequenceURLLinks.setElementAt(EMBLEBI_STRING, emblPos); - } } /**