From ed5202340a98c3edcb36568ed38fb0c70ec6f9e0 Mon Sep 17 00:00:00 2001 From: ArsenalNut Date: Mon, 8 Oct 2012 13:11:10 +0000 Subject: [PATCH] add a check to ignore .svn directories --- src/main/java/forge/gauntlet/GauntletIO.java | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/src/main/java/forge/gauntlet/GauntletIO.java b/src/main/java/forge/gauntlet/GauntletIO.java index fe4a4d8a2cf..0122b47299b 100644 --- a/src/main/java/forge/gauntlet/GauntletIO.java +++ b/src/main/java/forge/gauntlet/GauntletIO.java @@ -38,6 +38,8 @@ public class GauntletIO { public static final String REGEX_QUICK = "^" + GauntletIO.PREFIX_QUICK + "[0-9]+\\.dat$"; /** Regex for locked gauntlet save files. */ public static final String REGEX_LOCKED = "^LOCKED_.+\\.dat$"; + /** Regex for Subversion files. */ + public static final String SVN_IGNORE = "^\\.svn$"; /** * Gets the serializer. @@ -57,7 +59,8 @@ public class GauntletIO { public static File[] getGauntletFilesUnlocked() { final FilenameFilter filter = new FilenameFilter() { public boolean accept(File dir, String name) { - return !name.matches(GauntletIO.REGEX_LOCKED); + return (!name.matches(GauntletIO.REGEX_LOCKED) + && !name.matches(GauntletIO.SVN_IGNORE)); } }; @@ -69,7 +72,8 @@ public class GauntletIO { public static File[] getGauntletFilesQuick() { final FilenameFilter filter = new FilenameFilter() { public boolean accept(File dir, String name) { - return name.matches(GauntletIO.REGEX_QUICK); + return (name.matches(GauntletIO.REGEX_QUICK) + && !name.matches(GauntletIO.SVN_IGNORE)); } }; @@ -81,7 +85,8 @@ public class GauntletIO { public static File[] getGauntletFilesLocked() { final FilenameFilter filter = new FilenameFilter() { public boolean accept(File dir, String name) { - return name.matches(GauntletIO.REGEX_LOCKED); + return (name.matches(GauntletIO.REGEX_LOCKED) + && !name.matches(GauntletIO.SVN_IGNORE)); } };