Merge branch 'documentation/JAL-3407_2.11.1_release' into releases/Release_2_11_1_Branch

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

diff --git a/src/jalview/io/BackupFilenameFilter.java b/src/jalview/io/BackupFilenameFilter.java
index db1645a..b8a721e 100644 (file)
--- a/src/jalview/io/BackupFilenameFilter.java
+++ b/src/jalview/io/BackupFilenameFilter.java
@@ -1,3 +1,23 @@
+/*
+ * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$)
+ * Copyright (C) $$Year-Rel$$ The Jalview Authors
+ * 
+ * This file is part of Jalview.
+ * 
+ * Jalview is free software: you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License 
+ * as published by the Free Software Foundation, either version 3
+ * of the License, or (at your option) any later version.
+ *  
+ * Jalview is distributed in the hope that it will be useful, but 
+ * WITHOUT ANY WARRANTY; without even the implied warranty 
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR 
+ * PURPOSE.  See the GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with Jalview.  If not, see <http://www.gnu.org/licenses/>.
+ * The Jalview Authors are detailed in the 'AUTHORS' file.
+ */
 package jalview.io;
 
 import java.io.File;
@@ -13,21 +33,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,20 +59,8 @@ public class BackupFilenameFilter implements FilenameFilter
     }
 
     BackupFilenameParts bffp = new BackupFilenameParts(filename, base,
-            template, digits, extension);
-    ret = bffp.isBackupFile();
-    return ret;
-  }
-
-  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;
+            template, digits);
+    return bffp.isBackupFile();
   }
 
 }
-