git://source.jalview.org
/
jalview.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
931daab
)
JAL-3141 improvement on BackupFilenameParts filename matching
author
Ben Soares
<bsoares@dundee.ac.uk>
Mon, 28 Jan 2019 10:53:32 +0000
(10:53 +0000)
committer
Ben Soares
<bsoares@dundee.ac.uk>
Mon, 28 Jan 2019 10:53:32 +0000
(10:53 +0000)
src/jalview/io/BackupFilenameParts.java
patch
|
blob
|
history
diff --git
a/src/jalview/io/BackupFilenameParts.java
b/src/jalview/io/BackupFilenameParts.java
index
a4fbb3b
..
4f93ece
100644
(file)
--- a/
src/jalview/io/BackupFilenameParts.java
+++ b/
src/jalview/io/BackupFilenameParts.java
@@
-93,7
+93,11
@@
public class BackupFilenameParts
if (filename.length() >= startLength + digits + endLength
&& filename.startsWith(base + templateStart)
&& filename.endsWith(templateEnd)
if (filename.length() >= startLength + digits + endLength
&& filename.startsWith(base + templateStart)
&& filename.endsWith(templateEnd)
- && numString.matches("[0-9]*"))
+ // match exactly digits number of number-characters (numString
+ // should be all digits and at least the right length), or more than
+ // digits long with proviso it's not zero-leading.
+ && (numString.matches("[0-9]{" + digits + "}")
+ || numString.matches("[1-9][0-9]{" + digits + ",}")))
{
this.base = extensionMatch ? savedFilename + base : base;
this.templateStart = templateStart;
{
this.base = extensionMatch ? savedFilename + base : base;
this.templateStart = templateStart;