Url links changes - incomplete checkin as battery low

[jalview.git] / src / jalview / gui / Preferences.java

diff --git a/src/jalview/gui/Preferences.java b/src/jalview/gui/Preferences.java
index be0ac05..718e14f 100755 (executable)
--- a/src/jalview/gui/Preferences.java
+++ b/src/jalview/gui/Preferences.java
@@ -21,9 +21,6 @@
 package jalview.gui;
 
 import static jalview.util.UrlConstants.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;
 import jalview.bin.Cache;
@@ -36,6 +33,8 @@ import jalview.jbgui.GSequenceLink;
 import jalview.schemes.ColourSchemeProperty;
 import jalview.util.MessageManager;
 import jalview.util.Platform;
+import jalview.util.UrlProvider;
+import jalview.util.UrlProviderI;
 import jalview.ws.sifts.SiftsSettings;
 
 import java.awt.BorderLayout;
@@ -48,7 +47,6 @@ import java.awt.event.MouseEvent;
 import java.io.File;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.StringTokenizer;
 import java.util.Vector;
 
 import javax.help.HelpSetException;
@@ -102,7 +100,8 @@ public class Preferences extends GPreferences
    * Holds name and link separated with | character. Sequence ID must be
    * $SEQUENCE_ID$ or $SEQUENCE_ID=/.possible | chars ./=$
    */
-  public static Vector<String> sequenceURLLinks;
+  // public static Vector<String> sequenceURLLinks;
+  public static UrlProviderI sequenceUrlLinks;
 
   /**
    * Holds name and link separated with | character. Sequence IDS and Sequences
@@ -116,40 +115,42 @@ public class Preferences extends GPreferences
   static
   {
     String string = Cache.getDefault("SEQUENCE_LINKS", EMBLEBI_STRING);
-    sequenceURLLinks = new Vector<String>();
+    sequenceUrlLinks = new UrlProvider(EMBLEBI_STRING.split("\\|")[0],
+            string); // TODO sort out the default string
+    // sequenceURLLinks = new Vector<String>();
 
-    try
-    {
-      StringTokenizer st = new StringTokenizer(string, "|");
-      while (st.hasMoreElements())
-      {
-        String name = st.nextToken();
-        String url = st.nextToken();
-        // check for '|' within a regex
-        int rxstart = url.indexOf("$" + SEQUENCE_ID + "$");
-        if (rxstart == -1)
+    /*    try
+        {
+          StringTokenizer st = new StringTokenizer(string, "|");
+          while (st.hasMoreElements())
+          {
+            String name = st.nextToken();
+            String url = st.nextToken();
+            // check for '|' within a regex
+            int rxstart = url.indexOf("$" + DB_ACCESSION + "$");
+            if (rxstart == -1)
+            {
+              rxstart = url.indexOf("$" + SEQUENCE_ID + "$");
+            }
+            while (rxstart == -1 && url.indexOf("/=$") == -1)
+            {
+              url = url + "|" + st.nextToken();
+            }
+            sequenceURLLinks.addElement(name + "|" + url);
+          }
+        } catch (Exception ex)
         {
-          rxstart = url.indexOf("$" + SEQUENCE_NAME + "$");
+          System.out.println(ex + "\nError parsing sequence links");
         }
-        while (rxstart == -1 && url.indexOf("/=$") == -1)
         {
-          url = url + "|" + st.nextToken();
+          // upgrade old SRS link
+          int srsPos = sequenceURLLinks.indexOf(SRS_STRING);
+          if (srsPos > -1)
+          {
+            sequenceURLLinks.setElementAt(EMBLEBI_STRING, srsPos);
+          }
         }
-        sequenceURLLinks.addElement(name + "|" + url);
-      }
-    } catch (Exception ex)
-    {
-      System.out.println(ex + "\nError parsing sequence links");
-    }
-    {
-      // upgrade old SRS link
-      int srsPos = sequenceURLLinks.indexOf(SRS_STRING);
-      if (srsPos > -1)
-      {
-        sequenceURLLinks.setElementAt(EMBLEBI_STRING, srsPos);
-      }
-    }
-
+    */
     /**
      * TODO: reformulate groupURL encoding so two or more can be stored in the
      * .properties file as '|' separated strings
@@ -345,13 +346,14 @@ public class Preferences extends GPreferences
      */
     nameLinks = new Vector<String>();
     urlLinks = new Vector<String>();
-    for (int i = 0; i < sequenceURLLinks.size(); i++)
-    {
-      String link = sequenceURLLinks.elementAt(i).toString();
-      nameLinks.addElement(link.substring(0, link.indexOf("|")));
-      urlLinks.addElement(link.substring(link.indexOf("|") + 1));
-    }
-
+    sequenceUrlLinks.getLinksForDisplay(nameLinks, urlLinks);
+    /*    for (HashMap.Entry<String, UrlLink> entry: sequenceUrlLinks.getUrlLinks())
+        {
+          String link = sequenceURLLinks.elementAt(i).toString();
+          nameLinks.addElement(link.substring(0, link.indexOf("|")));
+          urlLinks.addElement(link.substring(link.indexOf("|") + 1));
+        }
+    */
     updateLinkData();
 
     useProxy.setSelected(Cache.getDefault("USE_PROXY", false));
@@ -548,27 +550,39 @@ public class Preferences extends GPreferences
 
     jalview.util.BrowserLauncher.resetBrowser();
 
-    if (nameLinks.size() > 0)
+    String links = sequenceUrlLinks.writeUrlsAsString();
+    if (links.isEmpty())
     {
-      StringBuffer links = new StringBuffer();
-      sequenceURLLinks = new Vector<String>();
-      for (int i = 0; i < nameLinks.size(); i++)
-      {
-        sequenceURLLinks.addElement(nameLinks.elementAt(i) + "|"
-                + urlLinks.elementAt(i));
-        links.append(sequenceURLLinks.elementAt(i).toString());
-        links.append("|");
-      }
-      // remove last "|"
-      links.setLength(links.length() - 1);
-      Cache.applicationProperties.setProperty("SEQUENCE_LINKS",
-              links.toString());
+      Cache.applicationProperties.remove("SEQUENCE_LINKS");
     }
     else
     {
-      Cache.applicationProperties.remove("SEQUENCE_LINKS");
+      Cache.applicationProperties.setProperty("SEQUENCE_LINKS",
+              links.toString());
     }
 
+    /*    if (nameLinks.size() > 0)
+        {
+          StringBuffer links = new StringBuffer();
+          sequenceURLLinks = new Vector<String>();
+          for (int i = 0; i < nameLinks.size(); i++)
+          {
+            sequenceURLLinks.addElement(nameLinks.elementAt(i) + "|"
+                    + urlLinks.elementAt(i));
+            links.append(sequenceURLLinks.elementAt(i).toString());
+            links.append("|");
+          }
+          // remove last "|"
+          links.setLength(links.length() - 1);
+          Cache.applicationProperties.setProperty("SEQUENCE_LINKS",
+                  links.toString());
+        }
+        else
+        {
+          Cache.applicationProperties.remove("SEQUENCE_LINKS");
+          sequenceURLLinks.clear();
+        }*/
+
     Cache.applicationProperties.setProperty("USE_PROXY",
             Boolean.toString(useProxy.isSelected()));