X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fjalview%2Fio%2FBackupFilenameParts.java;h=339cefa6e10b52a91705e7d1fee3879024e27604;hb=ae91bd2b6c74d4b6267d0df5670db7207707130b;hp=4f93eced8db2b39465c2dae904270840eeff52ea;hpb=2c6e8912516541ca2a380c3bb35a656fe7afdab2;p=jalview.git diff --git a/src/jalview/io/BackupFilenameParts.java b/src/jalview/io/BackupFilenameParts.java index 4f93ece..339cefa 100644 --- a/src/jalview/io/BackupFilenameParts.java +++ b/src/jalview/io/BackupFilenameParts.java @@ -1,7 +1,25 @@ +/* + * 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 . + * The Jalview Authors are detailed in the 'AUTHORS' file. + */ package jalview.io; -import jalview.bin.Cache; - import java.io.File; public class BackupFilenameParts @@ -113,7 +131,9 @@ public class BackupFilenameParts String filename, String base, boolean extensionMatch) { BackupFilenameParts bfp = new BackupFilenameParts(); - String template = Cache.getDefault(BackupFiles.SUFFIX, null); + BackupFilesPresetEntry bfpe = BackupFilesPresetEntry + .getSavedBackupEntry(); + String template = bfpe.suffix; if (template == null) { return bfp; @@ -121,8 +141,7 @@ public class BackupFilenameParts int digits; try { - digits = Integer - .parseInt(Cache.getDefault(BackupFiles.SUFFIX_DIGITS, null)); + digits = bfpe.digits; } catch (Exception e) { return bfp;