From: "Enrico Weigelt, metux IT consult" <[email protected]>
---
src/net/sf/freecol/common/io/FreeColDirectories.java | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/src/net/sf/freecol/common/io/FreeColDirectories.java
b/src/net/sf/freecol/common/io/FreeColDirectories.java
index a7b2496d587..db3b4ec9de9 100644
--- a/src/net/sf/freecol/common/io/FreeColDirectories.java
+++ b/src/net/sf/freecol/common/io/FreeColDirectories.java
@@ -133,12 +133,6 @@ public class FreeColDirectories {
public static final String MOD_DESCRIPTOR_FILE_NAME = "mod.xml";
- /** 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)
- || Utils.directoryAllPresent(f, MOD_DESCRIPTOR_FILE_NAME,
- SPECIFICATION_FILE_NAME);
-
/**
* The directory containing automatically created save games. At
* program start, the path of this directory is based on the path
@@ -1182,7 +1176,13 @@ public class FreeColDirectories {
* @return A list of {@code File}s containing rulesets.
*/
public static List<File> getTcFileList() {
- return collectFiles(getRulesDirectory(), tcFileFilter);
+ List<File> result = new ArrayList<File>();
+ for (File f : getRulesDirectory().listFiles())
+ if (Utils.fileAnySuffix(f, TC_FILE_SUFFIX, ZIP_FILE_SUFFIX)
+ || Utils.directoryAllPresent(f, MOD_DESCRIPTOR_FILE_NAME,
SPECIFICATION_FILE_NAME))
+ result.add(f);
+ Collections.sort(result);
+ return result;
}
/**
--
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
[email protected]
https://lists.sourceforge.net/lists/listinfo/freecol-developers
