X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fio%2FBackupFilenameParts.java;h=93aa602ee20cdd25e30ae74eba0cf59a84562bfd;hb=fb7ba61b4b7e4bc0260a288cd07335321f61ad18;hp=b9f766e658c4fadf1a8bef97b0c71afad7a337bb;hpb=d9a4775abc320c59c605b143c665ff0fede7783d;p=jalview.git diff --git a/src/jalview/io/BackupFilenameParts.java b/src/jalview/io/BackupFilenameParts.java index b9f766e..93aa602 100644 --- 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;