JAL-3141 Changed suffix position to after the extension (removed extension detection...

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

diff --git a/src/jalview/io/BackupFilenameFilter.java b/src/jalview/io/BackupFilenameFilter.java
index 647e250..916d660 100644 (file)
--- a/src/jalview/io/BackupFilenameFilter.java
+++ b/src/jalview/io/BackupFilenameFilter.java
@@ -2,8 +2,9 @@ package jalview.io;
 
 import java.io.File;
 import java.io.FilenameFilter;
+import java.io.IOException;
 
-public class BackupFileFilter implements FilenameFilter
+public class BackupFilenameFilter implements FilenameFilter
 {
 
   public String base;
@@ -12,49 +13,45 @@ public class BackupFileFilter implements FilenameFilter
 
   public int digits;
 
-  public String extension;
-
-  public BackupFileFilter(String base, String template, int digits,
-          String extension)
+  public BackupFilenameFilter(String base, String template, int digits)
   {
     this.base = base;
     this.template = template;
     this.digits = digits;
-    this.extension = extension;
   }
 
   @Override
-  public boolean accept(File file, String filename)
+  public boolean accept(File dir, String filename)
   {
-    if (file.isDirectory())
-    {
-      return true;
-    }
-    else
+    try
     {
-      int numcharstart = template.indexOf(BackupFiles.NUM_PLACEHOLDER);
-      String templateStart = template;
-      String templateEnd = "";
-      if (numcharstart > -1)
+      File file = new File(
+              dir.getCanonicalPath() + File.separatorChar + filename);
+      if (file.isDirectory())
       {
-        templateStart = template.substring(0, numcharstart);
-        templateEnd = template.substring(numcharstart + BackupFiles.NUM_PLACEHOLDER.length());
+        // backup files aren't dirs!
+        return false;
       }
-      int startLength = base.length() + templateStart.length();
-      int endLength = templateEnd.length() + extension.length();
-      if (filename.length() == startLength + digits + endLength
-              && filename.startsWith(base + templateStart)
-              && filename.endsWith(templateEnd + extension)
-              && filename
-                      .substring(startLength,
-                              filename.length() - endLength + 1)
-                      .matches("[0-9]+"))
-      {
-        return true;
-      }
-
+    } catch (IOException e)
+    {
+      System.out.println("IOException when checking file '" + filename
+              + "' is a backupfile");
     }
-    return false;
+
+    BackupFilenameParts bffp = new BackupFilenameParts(filename, base,
+            template, digits);
+    return bffp.isBackupFile();
+  }
+
+  public static String getBackupFilename(int index, String base,
+          String template, int digits)
+  {
+    String numString = String.format("%0" + digits + "d", index);
+    String backupSuffix = template.replaceAll(BackupFiles.NUM_PLACEHOLDER,
+            numString);
+    String backupfilename = base + backupSuffix;
+    return backupfilename;
   }
 
 }
+