X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fws%2Fsifts%2FSiftsClient.java;h=32bb7b7b97c2e0f037e8c8011ba692c3b54e5f8a;hb=d9b79c023346253c10dc907d1e75f509823266c4;hp=4951d2f5fa2552069d1d9f7e30c481cf7392b1cd;hpb=239d28bd8c08790bbc513a09b2b869fff862f63f;p=jalview.git

diff --git a/src/jalview/ws/sifts/SiftsClient.java b/src/jalview/ws/sifts/SiftsClient.java
index 4951d2f..32bb7b7 100644
--- a/src/jalview/ws/sifts/SiftsClient.java
+++ b/src/jalview/ws/sifts/SiftsClient.java
@@ -96,14 +96,6 @@ public class SiftsClient implements SiftsClientI
 
   private static final String SIFTS_FTP_BASE_URL = "ftp://ftp.ebi.ac.uk/pub/databases/msd/sifts/xml/";
 
-  public static final String DEFAULT_SIFTS_DOWNLOAD_DIR = System
-          .getProperty("user.home")
-          + File.separatorChar
-          + ".sifts_downloads" + File.separatorChar;
-
-  public static final String SIFTS_DOWNLOAD_DIR = jalview.bin.Cache
-          .getDefault("sifts_download_dir", DEFAULT_SIFTS_DOWNLOAD_DIR);
-
   private final static String NEWLINE = System.lineSeparator();
 
   private String curSourceDBRef;
@@ -227,7 +219,8 @@ public class SiftsClient implements SiftsClientI
    */
   public static File getSiftsFile(String pdbId) throws SiftsException
   {
-    File siftsFile = new File(SIFTS_DOWNLOAD_DIR + pdbId.toLowerCase()
+    File siftsFile = new File(SiftsSettings.getSiftDownloadDirectory()
+            + pdbId.toLowerCase()
             + ".xml.gz");
     if (siftsFile.exists())
     {
@@ -252,8 +245,10 @@ public class SiftsClient implements SiftsClientI
   {
     String siftFile = pdbId + ".xml.gz";
     String siftsFileFTPURL = SIFTS_FTP_BASE_URL + siftFile;
-    String downloadedSiftsFile = SIFTS_DOWNLOAD_DIR + siftFile;
-    File siftsDownloadDir = new File(SIFTS_DOWNLOAD_DIR);
+    String downloadedSiftsFile = SiftsSettings.getSiftDownloadDirectory()
+            + siftFile;
+    File siftsDownloadDir = new File(
+            SiftsSettings.getSiftDownloadDirectory());
     if (!siftsDownloadDir.exists())
     {
       siftsDownloadDir.mkdirs();
@@ -291,7 +286,8 @@ public class SiftsClient implements SiftsClientI
    */
   public static boolean deleteSiftsFileByPDBId(String pdbId)
   {
-    File siftsFile = new File(SIFTS_DOWNLOAD_DIR + pdbId.toLowerCase()
+    File siftsFile = new File(SiftsSettings.getSiftDownloadDirectory()
+            + pdbId.toLowerCase()
             + ".xml.gz");
     if (siftsFile.exists())
     {
@@ -322,13 +318,13 @@ public class SiftsClient implements SiftsClientI
     else
     {
       DBRefEntry[] dbRefs = seq.getDBRefs();
-      if (dbRefs == null || dbRefs.length < 1)
-      {
-        final SequenceI[] seqs = new SequenceI[] { seq };
-        new jalview.ws.DBRefFetcher(seqs, null, null, null, false)
-                .fetchDBRefs(true);
-        dbRefs = seq.getDBRefs();
-      }
+      // if (dbRefs == null || dbRefs.length < 1)
+      // {
+      // // final SequenceI[] seqs = new SequenceI[] { seq };
+      // // new jalview.ws.DBRefFetcher(seqs, null, null, null, false)
+      // // .fetchDBRefs(true);
+      // dbRefs = seq.getDBRefs();
+      // }
 
       if (dbRefs == null || dbRefs.length < 1)
       {