X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fio%2FBackupFilenameFilter.java;h=573040fb824aec95e973563e76ad00589b9eb8e4;hb=e51f922b88b1f316e27cf4c19eef437ff592d74d;hp=568f1c920e21c2fd5db6baac71bea9b2b9bd9c36;hpb=95d4b3209ee3ab5f13232da00dc23153da86bc28;p=jalview.git

diff --git a/src/jalview/io/BackupFilenameFilter.java b/src/jalview/io/BackupFilenameFilter.java
index 568f1c9..573040f 100644
--- 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,100 +39,8 @@ public class BackupFilenameFilter implements FilenameFilter
     }
 
     BackupFilenameParts bffp = new BackupFilenameParts(filename, base,
-            template, digits, extension);
-    ret = bffp.isBackupFile();
-    return ret;
+            template, digits);
+    return bffp.isBackupFile();
   }
 
 }
-
-class BackupFilenameParts
-{
-  String base;
-
-  String templateStart;
-
-  int num;
-
-  int digits;
-
-  String templateEnd;
-
-  String extension;
-
-  boolean isBackupFile;
-
-  public BackupFilenameParts(File file, String base, String template, int digits,
-          String extension)
-  {
-    this(file.getName(), base, template, digits, extension);
-  }
-
-  public BackupFilenameParts(String filename, String base, String template,
-          int digits, String extension)
-  {
-    this.isBackupFile = false;
-
-    // calculate minimum length of a backup filename
-    int minlength = base.length() + template.length()
-            - BackupFiles.NUM_PLACEHOLDER.length() + digits
-            + extension.length();
-
-    if (!(filename.startsWith(base) && filename.endsWith(extension)
-            && filename.length() >= minlength))
-    {
-      // non-starter
-      return;
-    }
-
-    int numcharstart = template.indexOf(BackupFiles.NUM_PLACEHOLDER);
-    String templateStart = template;
-    String templateEnd = "";
-    if (numcharstart > -1)
-    {
-      templateStart = template.substring(0, numcharstart);
-      templateEnd = template.substring(numcharstart + BackupFiles.NUM_PLACEHOLDER.length());
-    }
-    
-    int startLength = base.length() + templateStart.length();
-    int endLength = templateEnd.length() + extension.length();
-    String numString = filename.substring(startLength,
-            filename.length() - endLength);
-
-    if (filename.length() >= startLength + digits + endLength
-            && filename.startsWith(base + templateStart)
-            && filename.endsWith(templateEnd + extension)
-            && numString.matches("[0-9]+"))
-    {
-      this.base = base;
-      this.templateStart = templateStart;
-      this.num = Integer.parseInt(numString);
-      this.digits = digits;
-      this.templateStart = templateStart;
-      this.templateEnd = templateEnd;
-      this.isBackupFile = true;
-    }
-    
-  }
-
-  public static String getBackupFilename(int index, String base,
-          String template,
-          int digits, String extension)
-  {
-    String numString = String.format("%0" + digits + "d", index);
-    String backupSuffix = template.replaceAll(BackupFiles.NUM_PLACEHOLDER,
-            numString);
-    String backupfilename = base + backupSuffix + extension;
-    return backupfilename;
-  }
-
-  public boolean isBackupFile()
-  {
-    return this.isBackupFile;
-  }
-
-  public int indexNum()
-  {
-    return this.num;
-  }
-}
\ No newline at end of file