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

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

diff --git a/src/jalview/io/BackupFilenameParts.java b/src/jalview/io/BackupFilenameParts.java
index b9f766e..93aa602 100644 (file)
--- a/src/jalview/io/BackupFilenameParts.java
+++ b/src/jalview/io/BackupFilenameParts.java
@@ -14,28 +14,23 @@ public class BackupFilenameParts
 
   String templateEnd;
 
-  String extension;
-
   boolean isBackupFile;
 
-  public BackupFilenameParts(File file, String base, String template, int digits,
-          String extension)
+  public BackupFilenameParts(File file, String base, String template, int digits)
   {
-    this(file.getName(), base, template, digits, extension);
+    this(file.getName(), base, template, digits);
   }
 
   public BackupFilenameParts(String filename, String base, String template,
-          int digits, String extension)
+          int digits)
   {
     this.isBackupFile = false;
 
     // calculate minimum length of a backup filename
     int minlength = base.length() + template.length()
-            - BackupFiles.NUM_PLACEHOLDER.length() + digits
-            + extension.length();
+            - BackupFiles.NUM_PLACEHOLDER.length() + digits ;
 
-    if (!(filename.startsWith(base) && filename.endsWith(extension)
-            && filename.length() >= minlength))
+    if (!(filename.startsWith(base) && filename.length() >= minlength))
     {
       // non-starter
       return;
@@ -52,13 +47,13 @@ public class BackupFilenameParts
     }
     
     int startLength = base.length() + templateStart.length();
-    int endLength = templateEnd.length() + extension.length();
+    int endLength = templateEnd.length();
     String numString = filename.substring(startLength,
             filename.length() - endLength);
 
     if (filename.length() >= startLength + digits + endLength
             && filename.startsWith(base + templateStart)
-            && filename.endsWith(templateEnd + extension)
+            && filename.endsWith(templateEnd)
             && numString.matches("[0-9]+"))
     {
       this.base = base;