From: kiramt <k.mourao@dundee.ac.uk>
Date: Mon, 24 Oct 2016 09:38:56 +0000 (+0100)
Subject: Correct Preferences to check for SEQUENCE_NAME as well as SEQUENCE_ID on
X-Git-Tag: Release_2_10_1^2~32
X-Git-Url: http://source.jalview.org/gitweb/?p=jalview.git;a=commitdiff_plain;h=2332cc49df69d7b21359814e3b847609a7cd61e6

Correct Preferences to check for SEQUENCE_NAME as well as SEQUENCE_ID on
initialisation.
---

diff --git a/src/jalview/gui/Preferences.java b/src/jalview/gui/Preferences.java
index b36a73d..b57b951 100755
--- a/src/jalview/gui/Preferences.java
+++ b/src/jalview/gui/Preferences.java
@@ -23,6 +23,7 @@ package jalview.gui;
 import static jalview.util.UrlConstants.EMBLEBI_STRING;
 import static jalview.util.UrlConstants.OLD_EMBLEBI_STRING;
 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,6 +128,10 @@ public class Preferences extends GPreferences
         String url = st.nextToken();
         // check for '|' within a regex
         int rxstart = url.indexOf("$" + SEQUENCE_ID + "$");
+        if (rxstart == -1)
+        {
+          rxstart = url.indexOf("$" + SEQUENCE_NAME + "$");
+        }
         while (rxstart == -1 && url.indexOf("/=$") == -1)
         {
           url = url + "|" + st.nextToken();