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 db1645a..916d660 100644 (file)
--- a/src/jalview/io/BackupFilenameFilter.java
+++ b/src/jalview/io/BackupFilenameFilter.java
@@ -13,21 +13,16 @@ public class BackupFilenameFilter implements FilenameFilter
 
   public int digits;
 
-  public String extension;
-
-  public BackupFilenameFilter(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 dir, String filename)
   {
-    boolean ret = false;
     try
     {
       File file = new File(
@@ -44,18 +39,17 @@ public class BackupFilenameFilter implements FilenameFilter
     }
 
     BackupFilenameParts bffp = new BackupFilenameParts(filename, base,
-            template, digits, extension);
-    ret = bffp.isBackupFile();
-    return ret;
+            template, digits);
+    return bffp.isBackupFile();
   }
 
   public static String getBackupFilename(int index, String base,
-          String template, int digits, String extension)
+          String template, int digits)
   {
     String numString = String.format("%0" + digits + "d", index);
     String backupSuffix = template.replaceAll(BackupFiles.NUM_PLACEHOLDER,
             numString);
-    String backupfilename = base + backupSuffix + extension;
+    String backupfilename = base + backupSuffix;
     return backupfilename;
   }