reconciled with develop

[jalview.git] / src / jalview / io / BackupFilenameParts.java

diff --git a/src/jalview/io/BackupFilenameParts.java b/src/jalview/io/BackupFilenameParts.java
index 4f93ece..1504404 100644 (file)
--- a/src/jalview/io/BackupFilenameParts.java
+++ b/src/jalview/io/BackupFilenameParts.java
@@ -1,7 +1,5 @@
 package jalview.io;
 
-import jalview.bin.Cache;
-
 import java.io.File;
 
 public class BackupFilenameParts
@@ -113,7 +111,9 @@ public class BackupFilenameParts
           String filename, String base, boolean extensionMatch)
   {
     BackupFilenameParts bfp = new BackupFilenameParts();
-    String template = Cache.getDefault(BackupFiles.SUFFIX, null);
+    BackupFilesPresetEntry bfpe = BackupFilesPresetEntry
+            .getSavedBackupEntry();
+    String template = bfpe.suffix;
     if (template == null)
     {
       return bfp;
@@ -121,8 +121,7 @@ public class BackupFilenameParts
     int digits;
     try
     {
-      digits = Integer
-              .parseInt(Cache.getDefault(BackupFiles.SUFFIX_DIGITS, null));
+      digits = bfpe.digits;
     } catch (Exception e)
     {
       return bfp;