JAL-3141 removed redundant method to tests

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

diff --git a/src/jalview/io/BackupFiles.java b/src/jalview/io/BackupFiles.java
index 28eefd6..3fc57fc 100644 (file)
--- a/src/jalview/io/BackupFiles.java
+++ b/src/jalview/io/BackupFiles.java
@@ -8,6 +8,7 @@ import jalview.util.MessageManager;
 import java.io.File;
 import java.io.IOException;
 import java.util.Arrays;
+import java.util.Map;
 import java.util.HashMap;
 import java.util.TreeMap;
 
@@ -232,7 +233,7 @@ public class BackupFiles
     String basename = filename;
     String extension = "";
     int dotcharpos = filename.lastIndexOf('.');
-    // don't split of filenames with the last '.' at the very beginning or
+    // don't split filenames with the last '.' at the very beginning or
     // very end of the filename
     if ((dotcharpos > 0) && (dotcharpos < filename.length() - 1))
     {
@@ -260,18 +261,7 @@ public class BackupFiles
     }
     else
     {
-
-      // sort the backup files (based on integer found in the suffix) using a
-      // precomputed Hashmap for speed
-      HashMap<Integer, File> bfHashMap = new HashMap<>();
-      for (int i = 0; i < backupFiles.length; i++)
-      {
-        File f = backupFiles[i];
-        BackupFilenameParts bfp = new BackupFilenameParts(f, basename, suffix, digits, extension);
-        bfHashMap.put(bfp.indexNum(), f);
-      }
-      TreeMap<Integer, File> bfTreeMap = new TreeMap<>();
-      bfTreeMap.putAll(bfHashMap);
+      TreeMap<Integer, File> bfTreeMap = sortBackupFilesAsTreeMap(backupFiles, basename, extension);
 
       if (reverseOrder)
       {
@@ -367,6 +357,19 @@ public class BackupFiles
       }
     }
 
+    deleteOldFiles(oldFilesToDelete, confirmDeleteExtraInfo);
+
+    // Let's make the new backup file!! yay, got there at last!
+    String latestBackupFilename = dir + File.separatorChar
+            + BackupFilenameFilter.getBackupFilename(nextIndexNum, basename,
+                    suffix, digits, extension);
+    File latestBackupFile = new File(latestBackupFilename);
+    ret = ret && file.renameTo(latestBackupFile);
+
+    return ret;
+  }
+
+  private void deleteOldFiles(File[] oldFilesToDelete, String confirmDeleteExtraInfo) {
     if (oldFilesToDelete != null && oldFilesToDelete.length > 0)
     {
       // delete old backup/version files
@@ -414,15 +417,21 @@ public class BackupFiles
       }
 
     }
+  }
 
-    // Let's make the new backup file!! yay, got there at last!
-    String latestBackupFilename = dir + File.separatorChar
-            + BackupFilenameFilter.getBackupFilename(nextIndexNum, basename,
-                    suffix, digits, extension);
-    File latestBackupFile = new File(latestBackupFilename);
-    ret = ret && file.renameTo(latestBackupFile);
-
-    return ret;
+  private TreeMap sortBackupFilesAsTreeMap(File[] backupFiles, String basename, String extension) {
+      // sort the backup files (based on integer found in the suffix) using a
+      // precomputed Hashmap for speed
+      Map<Integer, File> bfHashMap = new HashMap<>();
+      for (int i = 0; i < backupFiles.length; i++)
+      {
+          File f = backupFiles[i];
+          BackupFilenameParts bfp = new BackupFilenameParts(f, basename, suffix, digits, extension);
+          bfHashMap.put(bfp.indexNum(), f);
+      }
+      TreeMap<Integer, File> bfTreeMap = new TreeMap<>();
+      bfTreeMap.putAll(bfHashMap);
+      return bfTreeMap;
   }
 
   public boolean rollBackupsAndRenameTempFile()
@@ -465,7 +474,7 @@ public class BackupFiles
     return rename;
   }
 
-  public static TreeMap<Integer, File> lsBackupFilesAsTreeMap(
+  public static TreeMap<Integer, File> getBackupFilesAsTreeMap(
           String fileName,
           String suffix, int digits)
   {
@@ -504,7 +513,7 @@ public class BackupFiles
     
     // sort the backup files (based on integer found in the suffix) using a
     // precomputed Hashmap for speed
-    HashMap<Integer, File> bfHashMap = new HashMap<>();
+    Map<Integer, File> bfHashMap = new HashMap<>();
     for (int i = 0; i < backupFiles.length; i++)
     {
       File f = backupFiles[i];
@@ -518,15 +527,6 @@ public class BackupFiles
     return bfTreeMap;
   }
 
-  public static File[] lsBackupFiles(String fileName, String suffix,
-          int digits)
-  {
-    TreeMap<Integer, File> bfTreeMap = lsBackupFilesAsTreeMap(fileName,
-            suffix, digits);
-    File[] backupFiles = new File[bfTreeMap.size()];
-    bfTreeMap.values().toArray(backupFiles);
-    return backupFiles;
-  }
 
 }