From c37b56988d93e431c395067dd133620292755f60 Mon Sep 17 00:00:00 2001 From: "Nut.andor" Date: Sat, 25 Oct 2025 22:46:59 +0200 Subject: [PATCH] sort problem --- .../atcontentstudio/model/gamedata/GameDataCategory.java | 2 +- .../rpg/atcontentstudio/model/gamedata/GameDataSet.java | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/com/gpl/rpg/atcontentstudio/model/gamedata/GameDataCategory.java b/src/com/gpl/rpg/atcontentstudio/model/gamedata/GameDataCategory.java index c50e40d..3f44ed9 100644 --- a/src/com/gpl/rpg/atcontentstudio/model/gamedata/GameDataCategory.java +++ b/src/com/gpl/rpg/atcontentstudio/model/gamedata/GameDataCategory.java @@ -170,7 +170,7 @@ public class GameDataCategory implements ProjectTreeNode @Override public void notifyCreated() { childrenAdded(new ArrayList()); - for (E node : dataMap.values()) { + for (E node : toList()) { node.notifyCreated(); } } diff --git a/src/com/gpl/rpg/atcontentstudio/model/gamedata/GameDataSet.java b/src/com/gpl/rpg/atcontentstudio/model/gamedata/GameDataSet.java index 9563f8d..a888635 100644 --- a/src/com/gpl/rpg/atcontentstudio/model/gamedata/GameDataSet.java +++ b/src/com/gpl/rpg/atcontentstudio/model/gamedata/GameDataSet.java @@ -13,8 +13,7 @@ import javax.swing.tree.TreeNode; import java.awt.*; import java.io.File; import java.io.Serializable; -import java.util.ArrayList; -import java.util.Enumeration; +import java.util.*; import java.util.List; @@ -159,7 +158,9 @@ public class GameDataSet implements ProjectTreeNode, Serializable { } } else if (parent.type != GameSource.Type.referenced) { - for (File f : baseFolder.listFiles()) { + List files = new ArrayList(Arrays.stream(baseFolder.listFiles()).toList()); + Collections.sort(files,Comparator.comparing(x->x.getName())); + for (File f : files) { if (f.getName().startsWith("actorconditions_")) { ActorCondition.fromJson(f, actorConditions); } else if (f.getName().startsWith("conversationlist_")) {