From: "Enrico Weigelt, metux IT consult" <enrico.weig...@gr13.net>
---
src/net/sf/freecol/common/io/FreeColDirectories.java | 18 +++++++++++-------
1 file changed, 11 insertions(+), 7 deletions(-)
diff --git a/src/net/sf/freecol/common/io/FreeColDirectories.java
b/src/net/sf/freecol/common/io/FreeColDirectories.java
index 09432988dfb..a7b2496d587 100644
--- a/src/net/sf/freecol/common/io/FreeColDirectories.java
+++ b/src/net/sf/freecol/common/io/FreeColDirectories.java
@@ -133,11 +133,6 @@ public class FreeColDirectories {
public static final String MOD_DESCRIPTOR_FILE_NAME = "mod.xml";
- /** Predicate to filter suitable candidates to be made into mods. */
- private static final Predicate<File> modFileFilter = f ->
- Utils.fileAnySuffix(f, MOD_FILE_SUFFIX, ZIP_FILE_SUFFIX)
- || Utils.directoryAllPresent(f, MOD_DESCRIPTOR_FILE_NAME);
-
/** Predicate to filter suitable candidates to be made into TCs. */
private static final Predicate<File> tcFileFilter = f ->
Utils.fileAnySuffix(f, TC_FILE_SUFFIX, ZIP_FILE_SUFFIX)
@@ -1002,6 +997,11 @@ public class FreeColDirectories {
locale);
}
+ private static boolean checkModFile(File f) {
+ return (Utils.fileAnySuffix(f, MOD_FILE_SUFFIX, ZIP_FILE_SUFFIX)
+ || Utils.directoryAllPresent(f, MOD_DESCRIPTOR_FILE_NAME));
+ }
+
/**
* Get a list of the standard and current user mod files.
*
@@ -1009,8 +1009,12 @@ public class FreeColDirectories {
*/
public static List<File> getModFileList() {
List<File> ret = new ArrayList<>();
- ret.addAll(collectFiles(getStandardModsDirectory(), modFileFilter));
- ret.addAll(collectFiles(getUserModsDirectory(), modFileFilter));
+ for (File f : getStandardModsDirectory().listFiles())
+ if (checkModFile(f)) ret.add(f);
+
+ for (File f : getUserModsDirectory().listFiles())
+ if (checkModFile(f)) ret.add(f);
+
return ret;
}
--
2.11.0.rc0.7.gbe5a750
------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, SlashDot.org! http://sdm.link/slashdot
_______________________________________________
Freecol-developers mailing list
Freecol-developers@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/freecol-developers
