cleanup some duplicate code

by changing it to something backed by a HashMap with
 the id as key things can be found without looping over every element.
 This reduced the startup time on my machine to about half of the original time

.idea/artifacts/ATContentStudio_jar.xml

@@ -10,7 +10,6 @@
         <element id="extracted-dir" path="$PROJECT_DIR$/lib/jsoup-1.10.2.jar" path-in-jar="/" />
         <element id="extracted-dir" path="$PROJECT_DIR$/lib/json_simple-1.1.jar" path-in-jar="/" />
         <element id="extracted-dir" path="$PROJECT_DIR$/lib/ui.jar" path-in-jar="/" />
-        <element id="extracted-dir" path="$PROJECT_DIR$/lib/AndorsTrainer_v0.1.5.jar" path-in-jar="/" />
         <element id="extracted-dir" path="$PROJECT_DIR$/lib/jide-oss.jar" path-in-jar="/" />
       </element>
     </root>

.idea/codeStyles/Project.xml

@@ -10,5 +10,10 @@
       <option name="BINARY_OPERATION_WRAP" value="5" />
       <option name="SOFT_MARGINS" value="120" />
     </codeStyleSettings>
+    <codeStyleSettings language="JSON">
+      <indentOptions>
+        <option name="INDENT_SIZE" value="4" />
+      </indentOptions>
+    </codeStyleSettings>
   </code_scheme>
 </component>

createProject.bat

@@ -61,6 +61,8 @@ if not exist %2\%1\.gitignore (
 
     echo .workspace > .gitignore
     echo .project >> .gitignore
+    echo .workspace.json >> .gitignore
+    echo .project.json >> .gitignore
     echo altered/drawable >> .gitignore
     echo altered/drawable/* >> .gitignore
     echo created/drawable >> .gitignore

packaging/package.sh

@@ -31,7 +31,6 @@ EXTRA_SOURCE_DIRS=(
 
 # --- Libraries to include ---
 LIBRARIES=(
-  "AndorsTrainer_v0.1.5.jar"
   "bsh-2.0b4.jar"
   "jide-oss.jar"
   "json_simple-1.1.jar"

res/ATCS_latest

@@ -1 +1 @@
-v0.6.21
+v0.6.22

src/com/gpl/rpg/atcontentstudio/ATContentStudio.java

@@ -20,6 +20,10 @@ import java.io.InputStreamReader;
 import java.net.MalformedURLException;
 import java.net.URISyntaxException;
 import java.net.URL;
+import java.net.http.HttpTimeoutException;
+import java.util.Enumeration;
+import java.util.HashMap;
+import java.util.LinkedList;
 import java.util.List;
 import java.util.*;
 import java.util.logging.Level;
@@ -61,22 +65,8 @@ public class ATContentStudio {
 
         ConfigCache.init();
 
-        try {
+        String laf = ConfigCache.getFavoriteLaFClassName();
-            String laf = ConfigCache.getFavoriteLaFClassName();
+        setLookAndFeel(laf);
-            if (laf == null)
-                laf = UIManager.getSystemLookAndFeelClassName();
-            UIManager.setLookAndFeel(laf);
-        } catch (ClassNotFoundException e) {
-            e.printStackTrace();
-        } catch (InstantiationException e) {
-            e.printStackTrace();
-        } catch (IllegalAccessException e) {
-            e.printStackTrace();
-        } catch (UnsupportedLookAndFeelException e) {
-            e.printStackTrace();
-        }
-
-        scaleUIFont();
 
         // Need to keep a strong reference to it, to avoid garbage collection that'll
         // reset this setting.
@@ -112,7 +102,6 @@ public class ATContentStudio {
                             frame.setVisible(true);
                             frame.setDefaultCloseOperation(StudioFrame.DO_NOTHING_ON_CLOSE);
                         }
-
                     });
                     for (File f : ConfigCache.getKnownWorkspaces()) {
                         if (workspaceRoot.equals(f)) {
@@ -130,6 +119,34 @@ public class ATContentStudio {
         });
     }
 
+    public static void setLookAndFeel(String laf) {
+        if (laf == null)
+        {
+            System.out.println("No look and feel specified, using system default.");
+            laf = UIManager.getSystemLookAndFeelClassName();
+        }
+        System.out.println("Info: Setting look and feel to: " + laf);
+
+        try {
+            UIManager.setLookAndFeel(laf);
+        } catch (ClassNotFoundException e) {
+            System.err.println("Failed to load system look and feel. ");
+            System.err.println("Installed look and feel classes: ");
+            for (UIManager.LookAndFeelInfo info : UIManager.getInstalledLookAndFeels()) {
+                System.err.println("  " + info.getName() + " (" + info.getClassName() + ")");
+            }
+            System.err.println("Tried to load: " + laf + " but got this error:");
+
+            e.printStackTrace();
+        } catch (InstantiationException | UnsupportedLookAndFeelException | IllegalAccessException e) {
+            e.printStackTrace();
+        }
+        var newLaF = UIManager.getLookAndFeel();
+        System.out.println("Using look and feel: " + newLaF.getName() + " (" + newLaF.getClass().getName() + ")");
+
+        scaleUIFont();
+    }
+
     private static void checkUpdate() {
         BufferedReader in = null;
         try {
@@ -152,13 +169,13 @@ public class ATContentStudio {
                 style.append("font-weight:" + (font.isBold() ? "bold" : "normal") + ";");
                 style.append("font-size:" + font.getSize() + "pt;");
                 style.append("background-color: rgb(" + color.getRed() + "," + color.getGreen() + "," + color.getBlue()
-                                     + ");");
+                        + ");");
 
                 JEditorPane ep = new JEditorPane("text/html",
-                                                 "<html><body style=\"" + style + "\">" + "You are not running the latest ATCS version.<br/>"
+                        "<html><body style=\"" + style + "\">" + "You are not running the latest ATCS version.<br/>"
-                                                         + "You can get the latest version (" + lastLine + ") by clicking the link below.<br/>"
+                                + "You can get the latest version (" + lastLine + ") by clicking the link below.<br/>"
-                                                         + "<a href=\"" + DOWNLOAD_URL + "\">" + DOWNLOAD_URL + "</a><br/>" + "<br/>"
+                                + "<a href=\"" + DOWNLOAD_URL + "\">" + DOWNLOAD_URL + "</a><br/>" + "<br/>"
-                                                         + "</body></html>");
+                                + "</body></html>");
 
                 ep.setEditable(false);
                 ep.setBorder(null);
@@ -183,8 +200,14 @@ public class ATContentStudio {
             }
         } catch (MalformedURLException e) {
             e.printStackTrace();
+        } catch (HttpTimeoutException e) {
+            System.out.println("Could not connect to url to check for updates (timeout): " + CHECK_UPDATE_URL);
         } catch (IOException e) {
-            e.printStackTrace();
+            if (e.getMessage() != null && e.getMessage().startsWith("Server returned HTTP response code:")) {
+                System.out.println("Could not fetch current version from server to check for updates (non-success-status): " + e.getMessage());
+            } else {
+                System.out.println("Could not check for updates: '" + CHECK_UPDATE_URL + "' - " + e.getMessage());
+            }
         } finally {
             try {
                 if (in != null)

src/com/gpl/rpg/atcontentstudio/io/JsonSerializable.java

@@ -0,0 +1,8 @@
+package com.gpl.rpg.atcontentstudio.io;
+
+import java.util.Map;
+
+public interface JsonSerializable {
+    Map toMap();
+    void fromMap(Map map);
+}

src/com/gpl/rpg/atcontentstudio/model/GameSource.java

@@ -1,5 +1,6 @@
 package com.gpl.rpg.atcontentstudio.model;
 
+import com.gpl.rpg.atcontentstudio.io.JsonSerializable;
 import com.gpl.rpg.atcontentstudio.model.Project.ResourceSet;
 import com.gpl.rpg.atcontentstudio.model.gamedata.GameDataSet;
 import com.gpl.rpg.atcontentstudio.model.maps.TMXMapSet;
@@ -24,7 +25,7 @@ import java.io.*;
 import java.util.List;
 import java.util.*;
 
-public class GameSource implements ProjectTreeNode, Serializable {
+public class GameSource implements ProjectTreeNode, Serializable, JsonSerializable {
 
     private static final long serialVersionUID = -1512979360971918158L;
 
@@ -38,6 +39,22 @@ public class GameSource implements ProjectTreeNode, Serializable {
     public transient WriterModeDataSet writerModeDataSet;
     private transient SavedSlotCollection v;
 
+
+    @Override
+    public Map toMap() {
+        Map map = new HashMap();
+        map.put("type", type.toString());
+        map.put("baseFolder", baseFolder.getPath());
+        return map;
+    }
+
+    @Override
+    public void fromMap(Map map) {
+        if(map==null)return;
+        type = Enum.valueOf(Type.class, (String)map.get("type"));
+        baseFolder = new File((String) map.get("baseFolder"));
+    }
+
     public static enum Type {
         source,
         referenced,
@@ -52,6 +69,10 @@ public class GameSource implements ProjectTreeNode, Serializable {
 
     public transient Map<String, List<String>> referencedSourceFiles = null;
 
+    public GameSource(Map json, Project parent) {
+        fromMap(json);
+        refreshTransients(parent);
+    }
     public GameSource(File folder, Project parent) {
         this.parent = parent;
         this.baseFolder = folder;

src/com/gpl/rpg/atcontentstudio/model/Preferences.java

@@ -1,19 +1,53 @@
 package com.gpl.rpg.atcontentstudio.model;
 
+import com.gpl.rpg.atcontentstudio.io.JsonSerializable;
+
 import java.awt.*;
 import java.io.Serializable;
 import java.util.HashMap;
 import java.util.Map;
 
-public class Preferences implements Serializable {
+public class Preferences implements Serializable, JsonSerializable {
 
     private static final long serialVersionUID = 2455802658424031276L;
 
     public Dimension windowSize = null;
-    public Map<String, Integer> splittersPositions = new HashMap<String, Integer>();
+    public Map<String, Integer> splittersPositions = new HashMap<>();
 
     public Preferences() {
 
     }
 
+    @Override
+    public Map toMap() {
+        Map map = new HashMap();
+
+        if(windowSize!= null){
+            Map windowSizeMap = new HashMap<>();
+            windowSizeMap.put("width", windowSize.width);
+            windowSizeMap.put("height", windowSize.height);
+            map.put("windowSize", windowSizeMap);
+        }
+
+        map.put("splittersPositions", splittersPositions);
+        return map;
+    }
+
+    @Override
+    public void fromMap(Map map) {
+        if(map == null) return;
+
+        Map windowSize1 = (Map) map.get("windowSize");
+        if(windowSize1 != null){
+            windowSize = new Dimension(((Number) windowSize1.get("width")).intValue(), ((Number) windowSize1.get("height")).intValue());
+        }
+
+        Map<String, Number> splitters = (Map<String, Number>) map.get("splittersPositions");
+        Map<String, Integer> splittersInt = new HashMap<>(splitters.size());
+        for (Map.Entry<String, Number> entry : splitters. entrySet()){
+            splittersInt.put(entry.getKey(), entry.getValue().intValue());
+        }
+        splittersPositions = splittersInt;
+
+    }
 }

src/com/gpl/rpg/atcontentstudio/model/Project.java

@@ -2,7 +2,7 @@ package com.gpl.rpg.atcontentstudio.model;
 
 import com.gpl.rpg.atcontentstudio.ATContentStudio;
 import com.gpl.rpg.atcontentstudio.Notification;
-import com.gpl.rpg.atcontentstudio.io.JsonPrettyWriter;
+import com.gpl.rpg.atcontentstudio.io.JsonSerializable;
 import com.gpl.rpg.atcontentstudio.io.SettingsSave;
 import com.gpl.rpg.atcontentstudio.model.GameSource.Type;
 import com.gpl.rpg.atcontentstudio.model.bookmarks.BookmarksRoot;
@@ -11,13 +11,11 @@ import com.gpl.rpg.atcontentstudio.model.maps.TMXMap;
 import com.gpl.rpg.atcontentstudio.model.maps.TMXMapSet;
 import com.gpl.rpg.atcontentstudio.model.maps.Worldmap;
 import com.gpl.rpg.atcontentstudio.model.maps.WorldmapSegment;
-import com.gpl.rpg.atcontentstudio.model.saves.SavedGamesSet;
 import com.gpl.rpg.atcontentstudio.model.sprites.Spritesheet;
 import com.gpl.rpg.atcontentstudio.model.tools.writermode.WriterModeData;
 import com.gpl.rpg.atcontentstudio.ui.DefaultIcons;
 import com.gpl.rpg.atcontentstudio.ui.WorkerDialog;
 import com.gpl.rpg.atcontentstudio.utils.FileUtils;
-import org.json.simple.JSONArray;
 import org.w3c.dom.Comment;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
@@ -42,7 +40,7 @@ import java.nio.file.Paths;
 import java.util.List;
 import java.util.*;
 
-public class Project implements ProjectTreeNode, Serializable {
+public class Project implements ProjectTreeNode, Serializable, JsonSerializable {
 
     private static final long serialVersionUID = 4807454973303366758L;
     private static final String drawablePath = TMXMapSet.DEFAULT_REL_PATH_TO_DRAWABLE.replace("\\", "/");
@@ -50,6 +48,7 @@ public class Project implements ProjectTreeNode, Serializable {
 
     //Every instance field that is not transient will be saved in this file.
     public static final String SETTINGS_FILE = ".project";
+    public static final String SETTINGS_FILE_JSON = ".project.json";
 
     public String name;
 
@@ -58,20 +57,40 @@ public class Project implements ProjectTreeNode, Serializable {
 
     public GameSource baseContent; //A.k.a library
 
-    public GameSource referencedContent; //Pointers to base content
     public transient GameSource alteredContent; //Copied from base content (does not overwrite yet)
     public transient GameSource createdContent; //Stand-alone.
     public transient BookmarksRoot bookmarks;
 
 
-    public SavedGamesSet saves; //For simulations.
-
     public transient SavedSlotCollection v;
 
     public transient Workspace parent;
 
     public Properties knownSpritesheetsProperties;
 
+    @Override
+    public Map toMap() {
+        Map map = new HashMap();
+        map.put("name", name.toString());
+        map.put("baseFolder", baseFolder.getPath());
+        map.put("open", open);
+        map.put("baseContent", baseContent.toMap());
+        map.put("sourceSetToUse", sourceSetToUse.toString());
+        return map;
+    }
+
+    @Override
+    public void fromMap(Map map) {
+        if(map==null)return;
+        name = (String) map.get("name");
+        baseFolder = new File((String) map.get("baseFolder"));
+        open = (boolean) map.get("open");
+
+        baseContent = new GameSource((Map) map.get("baseContent"), this);
+
+        sourceSetToUse = Enum.valueOf(ResourceSet.class, (String)map.get("sourceSetToUse"));
+    }
+
     public static enum ResourceSet {
         gameData,
         debugData,
@@ -80,7 +99,16 @@ public class Project implements ProjectTreeNode, Serializable {
 
     public ResourceSet sourceSetToUse;
 
-    public Project(Workspace w, String name, File source, ResourceSet sourceSet) {
+    public Project(Workspace w, File projectFile) {
+        this.parent = w;
+        loadSpritesheetProperties();
+        Map json = FileUtils.mapFromJsonFile(projectFile);
+        this.fromMap(json);
+
+        initializeData();
+        save();
+    }
+    public Project(Workspace w, String name, File source, ResourceSet sourceSet){
         this.parent = w;
         this.name = name;
         this.sourceSetToUse = sourceSet;
@@ -93,38 +121,28 @@ public class Project implements ProjectTreeNode, Serializable {
             Notification.addError("Eror creating project root folder: " + e.getMessage());
             e.printStackTrace();
         }
+
+        loadSpritesheetProperties();
+        baseContent = new GameSource(source, this);
         open = true;
+        initializeData();
+        linkAll();
+        save();
+    }
+
+    private void initializeData() {
         v = new SavedSlotCollection();
 
-        knownSpritesheetsProperties = new Properties();
+        alteredContent = new GameSource(this, Type.altered);
-        try {
+        createdContent = new GameSource(this, Type.created);
-            knownSpritesheetsProperties.load(Project.class.getResourceAsStream("/spritesheets.properties"));
-        } catch (IOException e) {
-            Notification.addWarn("Unable to load default spritesheets properties.");
-            e.printStackTrace();
-        }
-
-
-        baseContent = new GameSource(source, this);
-
-//		referencedContent = new GameSource(this, GameSource.Type.referenced);
-
-        alteredContent = new GameSource(this, GameSource.Type.altered);
-        createdContent = new GameSource(this, GameSource.Type.created);
         bookmarks = new BookmarksRoot(this);
 
-        saves = new SavedGamesSet(this);
 
         v.add(createdContent);
         v.add(alteredContent);
 //		v.add(referencedContent);
         v.add(baseContent);
-        v.add(saves);
         v.add(bookmarks);
-
-        linkAll();
-
-        save();
     }
 
 
@@ -207,12 +225,20 @@ public class Project implements ProjectTreeNode, Serializable {
 
     public static Project fromFolder(Workspace w, File projRoot) {
         Project p;
-        File f = new File(projRoot, Project.SETTINGS_FILE);
+
-        if (!f.exists()) {
+        File fJson = new File(projRoot, Project.SETTINGS_FILE_JSON);
-            Notification.addError("Unable to find " + SETTINGS_FILE + " for project " + projRoot.getName());
+        if (fJson.exists()) {
-            return null;
+            p = new Project(w, fJson);
         } else {
-            p = (Project) SettingsSave.loadInstance(f, "Project");
+            File f = new File(projRoot, Project.SETTINGS_FILE);
+            if (!f.exists()) {
+                Notification.addError("Unable to find " + SETTINGS_FILE + " for project " + projRoot.getName());
+                return null;
+            } else {
+                p = (Project) SettingsSave.loadInstance(f, "Project");
+                p.baseFolder = projRoot;
+            }
+            p.save();
         }
         p.refreshTransients(w);
         return p;
@@ -223,13 +249,7 @@ public class Project implements ProjectTreeNode, Serializable {
 
         projectElementListeners = new HashMap<Class<? extends GameDataElement>, List<ProjectElementListener>>();
 
-        try {
+        loadSpritesheetProperties();
-            knownSpritesheetsProperties = new Properties();
-            knownSpritesheetsProperties.load(Project.class.getResourceAsStream("/spritesheets.properties"));
-        } catch (IOException e) {
-            Notification.addWarn("Unable to load default spritesheets properties.");
-            e.printStackTrace();
-        }
 
         if (sourceSetToUse == null) {
             sourceSetToUse = ResourceSet.allFiles;
@@ -244,14 +264,11 @@ public class Project implements ProjectTreeNode, Serializable {
         createdContent = new GameSource(this, GameSource.Type.created);
         bookmarks = new BookmarksRoot(this);
 
-        saves.refreshTransients();
-
         v = new SavedSlotCollection();
         v.add(createdContent);
         v.add(alteredContent);
 //		v.add(referencedContent);
         v.add(baseContent);
-        v.add(saves);
         v.add(bookmarks);
 
 
@@ -259,51 +276,40 @@ public class Project implements ProjectTreeNode, Serializable {
 
     }
 
-    public void linkAll() {
+    private void loadSpritesheetProperties() {
-        for (ProjectTreeNode node : baseContent.gameData.v.getNonEmptyIterable()) {
+        knownSpritesheetsProperties = new Properties();
-            if (node instanceof GameDataCategory<?>) {
+        try {
-                for (GameDataElement e : ((GameDataCategory<?>) node)) {
+            knownSpritesheetsProperties.load(Project.class.getResourceAsStream("/spritesheets.properties"));
-                    e.link();
+        } catch (IOException e) {
-                }
+            Notification.addWarn("Unable to load default spritesheets properties.");
-            }
+            e.printStackTrace();
-        }
-        for (ProjectTreeNode node : baseContent.gameMaps.tmxMaps) {
-            ((TMXMap) node).link();
-        }
-        for (ProjectTreeNode node : alteredContent.gameData.v.getNonEmptyIterable()) {
-            if (node instanceof GameDataCategory<?>) {
-                for (GameDataElement e : ((GameDataCategory<?>) node)) {
-                    e.link();
-                }
-            }
-        }
-        for (ProjectTreeNode node : alteredContent.gameMaps.tmxMaps) {
-            ((TMXMap) node).link();
-        }
-        for (ProjectTreeNode node : createdContent.gameData.v.getNonEmptyIterable()) {
-            if (node instanceof GameDataCategory<?>) {
-                for (GameDataElement e : ((GameDataCategory<?>) node)) {
-                    e.link();
-                }
-            }
-        }
-        for (ProjectTreeNode node : createdContent.gameMaps.tmxMaps) {
-            ((TMXMap) node).link();
         }
+    }
 
-        for (WorldmapSegment node : createdContent.worldmap) {
+    public void linkAll() {
+        linkGameData(baseContent);
+        linkGameData(alteredContent);
+        linkGameData(createdContent);
+    }
+
+    private void linkGameData(GameSource source) {
+        for (ProjectTreeNode node : source.gameData.v.getNonEmptyIterable()) {
+            if (node instanceof GameDataCategory<?>) {
+                for (GameDataElement e : ((GameDataCategory<?>) node).toList()) {
+                    e.link();
+                }
+            }
+        }
+        for (TMXMap node : source.gameMaps.tmxMaps) {
             node.link();
         }
-        for (WorldmapSegment node : alteredContent.worldmap) {
+        for (WorldmapSegment node : source.worldmap) {
-            node.link();
-        }
-        for (WorldmapSegment node : baseContent.worldmap) {
             node.link();
         }
     }
 
     public void save() {
-        SettingsSave.saveInstance(this, new File(baseFolder, Project.SETTINGS_FILE), "Project " + this.name);
+        FileUtils.writeStringToFile(FileUtils.toJsonString(toMap()),new File(baseFolder, Project.SETTINGS_FILE_JSON), "Project " + this.name);
     }
 
 
@@ -909,14 +915,14 @@ public class Project implements ProjectTreeNode, Serializable {
 
     public void moveToCreated(JSONElement target) {
         target.childrenRemoved(new ArrayList<ProjectTreeNode>());
-        ((GameDataCategory<?>) target.getParent()).remove(target);
+        ((GameDataCategory<?>) target.getParent()).removeGeneric(target);
         target.state = GameDataElement.State.created;
         createdContent.gameData.addElement(target);
     }
 
     public void moveToAltered(JSONElement target) {
         target.childrenRemoved(new ArrayList<ProjectTreeNode>());
-        ((GameDataCategory<?>) target.getParent()).remove(target);
+        ((GameDataCategory<?>) target.getParent()).removeGeneric(target);
         target.state = GameDataElement.State.created;
         ((JSONElement) target).jsonFile = new File(baseContent.gameData.getGameDataElement(((JSONElement) target).getClass(), target.id).jsonFile.getAbsolutePath());
         alteredContent.gameData.addElement((JSONElement) target);
@@ -981,11 +987,6 @@ public class Project implements ProjectTreeNode, Serializable {
     }
 
 
-    public void addSave(File selectedFile) {
-        saves.addSave(selectedFile);
-    }
-
-
     public List<NPC> getSpawnGroup(String spawngroup_id) {
         List<NPC> result = new ArrayList<NPC>();
         int i = getNPCCount();
@@ -1179,18 +1180,18 @@ public class Project implements ProjectTreeNode, Serializable {
     public List<String> writeDataDeltaForDataType(GameDataCategory<? extends JSONElement> created, GameDataCategory<? extends JSONElement> altered, GameDataCategory<? extends JSONElement> source, Class<? extends JSONElement> gdeClass, File targetFolder) {
         List<String> filenamesToWrite = new LinkedList<String>();
         Map<String, List<Map>> dataToWritePerFilename = new LinkedHashMap<String, List<Map>>();
-        for (JSONElement gde : altered) {
+        for (JSONElement gde : altered.toList()) {
             if (!filenamesToWrite.contains(gde.jsonFile.getName())) {
                 filenamesToWrite.add(gde.jsonFile.getName());
             }
         }
-        for (JSONElement gde : created) {
+        for (JSONElement gde : created.toList()) {
             if (!filenamesToWrite.contains(gde.jsonFile.getName())) {
                 filenamesToWrite.add(gde.jsonFile.getName());
             }
         }
         for (String fName : filenamesToWrite) {
-            for (JSONElement gde : source) {
+            for (JSONElement gde : source.toList()) {
                 if (gde.jsonFile.getName().equals(fName)) {
                     if (dataToWritePerFilename.get(fName) == null) {
                         dataToWritePerFilename.put(fName, new ArrayList<Map>());
@@ -1199,7 +1200,7 @@ public class Project implements ProjectTreeNode, Serializable {
                     dataToWritePerFilename.get(fName).add(getGameDataElement(gdeClass, gde.id).toJson());
                 }
             }
-            for (JSONElement gde : created) {
+            for (JSONElement gde : created.toList()) {
                 if (gde.jsonFile.getName().equals(fName)) {
                     if (dataToWritePerFilename.get(fName) == null) {
                         dataToWritePerFilename.put(fName, new ArrayList<Map>());
@@ -1211,22 +1212,9 @@ public class Project implements ProjectTreeNode, Serializable {
         }
         for (String fName : dataToWritePerFilename.keySet()) {
             File jsonFile = new File(targetFolder, fName);
-            StringWriter writer = new JsonPrettyWriter();
+
-            try {
+            String textToWrite = FileUtils.toJsonString(dataToWritePerFilename.get(fName));
-                JSONArray.writeJSONString(dataToWritePerFilename.get(fName), writer);
+            FileUtils.writeStringToFile(textToWrite, jsonFile, "JSON file '"+jsonFile.getAbsolutePath()+"'", false);
-            } catch (IOException e) {
-                //Impossible with a StringWriter
-            }
-            String textToWrite = writer.toString();
-            try {
-                FileWriter w = new FileWriter(jsonFile);
-                w.write(textToWrite);
-                w.close();
-//				Notification.addSuccess("Json file "+jsonFile.getAbsolutePath()+" saved.");
-            } catch (IOException e) {
-                Notification.addError("Error while writing json file " + jsonFile.getAbsolutePath() + " : " + e.getMessage());
-                e.printStackTrace();
-            }
         }
         return filenamesToWrite;
     }

src/com/gpl/rpg/atcontentstudio/model/Workspace.java

@@ -2,27 +2,29 @@ package com.gpl.rpg.atcontentstudio.model;
 
 import com.gpl.rpg.atcontentstudio.ATContentStudio;
 import com.gpl.rpg.atcontentstudio.Notification;
+import com.gpl.rpg.atcontentstudio.io.JsonSerializable;
 import com.gpl.rpg.atcontentstudio.io.SettingsSave;
 import com.gpl.rpg.atcontentstudio.model.GameSource.Type;
 import com.gpl.rpg.atcontentstudio.model.gamedata.GameDataSet;
 import com.gpl.rpg.atcontentstudio.ui.ProjectsTree.ProjectsTreeModel;
 import com.gpl.rpg.atcontentstudio.ui.WorkerDialog;
+import com.gpl.rpg.atcontentstudio.utils.FileUtils;
+import org.jsoup.SerializationException;
 
 import javax.swing.tree.TreeNode;
 import javax.swing.tree.TreePath;
 import java.awt.*;
-import java.io.File;
+import java.io.*;
-import java.io.IOException;
-import java.io.Serializable;
 import java.nio.file.Files;
 import java.util.List;
 import java.util.*;
 
-public class Workspace implements ProjectTreeNode, Serializable {
+public class Workspace implements ProjectTreeNode, Serializable, JsonSerializable {
 
     private static final long serialVersionUID = 7938633033601384956L;
 
     public static final String WS_SETTINGS_FILE = ".workspace";
+    public static final String WS_SETTINGS_FILE_JSON = ".workspace.json";
 
     public static Workspace activeWorkspace;
 
@@ -38,6 +40,7 @@ public class Workspace implements ProjectTreeNode, Serializable {
     public transient ProjectsTreeModel projectsTreeModel = null;
 
     public Workspace(File workspaceRoot) {
+        boolean freshWorkspace = false;
         baseFolder = workspaceRoot;
         if (!workspaceRoot.exists()) {
             try {
@@ -49,44 +52,105 @@ public class Workspace implements ProjectTreeNode, Serializable {
             }
         }
         settings = new WorkspaceSettings(this);
-        settingsFile = new File(workspaceRoot, WS_SETTINGS_FILE);
+        settingsFile = new File(workspaceRoot, WS_SETTINGS_FILE_JSON);
         if (!settingsFile.exists()) {
             try {
                 settingsFile.createNewFile();
+                freshWorkspace = true;
             } catch (IOException e) {
                 Notification.addError("Error creating workspace datafile: "
                                               + e.getMessage());
                 e.printStackTrace();
             }
+            Notification.addSuccess("New workspace created: "
+                                            + workspaceRoot.getAbsolutePath());
         }
-        Notification.addSuccess("New workspace created: "
+        if (freshWorkspace)
-                                        + workspaceRoot.getAbsolutePath());
+            save();
-        save();
+    }
+
+    @Override
+    public Map toMap() {
+        Map map = new HashMap();
+        map.put("serialVersionUID", serialVersionUID);
+        map.put("preferences", preferences.toMap());
+        map.put("projectsName", (new ArrayList<String>(projectsName)));
+        map.put("projectsOpenByName", projectsOpenByName);
+        List<String> l = new ArrayList<>(knownMapSourcesFolders.size());
+        for (File f: knownMapSourcesFolders){
+            l.add(f.getPath());
+        }
+        map.put("knownMapSourcesFolders", l);
+        return map;
+    }
+
+    @Override
+    public void fromMap(Map map) {
+        if(serialVersionUID != (long) map.get("serialVersionUID")){
+            throw new SerializationException("wrong seriaVersionUID");
+        }
+
+        preferences.fromMap((Map) map.get("preferences"));
+
+        projectsName = new HashSet<>((List<String>) map.getOrDefault("projectsName", new HashSet<String>()));
+
+        projectsOpenByName = (Map<String, Boolean>) map.getOrDefault("projectsOpenByName", new HashMap<String, Boolean>() );
+
+        List<String> knownMapSourcesFolders1 = (List<String>) map.getOrDefault("knownMapSourcesFolders", new ArrayList<String>());
+        knownMapSourcesFolders = new HashSet<>();
+        if (knownMapSourcesFolders1 != null){
+            int size = knownMapSourcesFolders1.size();
+            for (String path: knownMapSourcesFolders1) {
+                //TODO: catch invalid paths...?
+                knownMapSourcesFolders.add(new File(path));
+            }
+        }
+
     }
 
     public static void setActive(File workspaceRoot) {
         Workspace w;
-        File f = new File(workspaceRoot, WS_SETTINGS_FILE);
+        File f2 = new File(workspaceRoot, WS_SETTINGS_FILE_JSON);
-        if (!workspaceRoot.exists() || !f.exists()) {
+        if (f2.exists()) {
-            w = new Workspace(workspaceRoot);
+            w = loadWorkspaceFromJson(workspaceRoot, f2);
+            w.refreshTransients();
         } else {
-            w = (Workspace) SettingsSave.loadInstance(f, "Workspace");
+            Notification.addInfo("Could not find json workspace file. Checking for binary file");
-            if (w == null) {
+            File f = new File(workspaceRoot, WS_SETTINGS_FILE);
+            if (!workspaceRoot.exists() || !f.exists()) {
                 w = new Workspace(workspaceRoot);
             } else {
-                w.refreshTransients();
+                w = (Workspace) SettingsSave.loadInstance(f, "Workspace");
+                if (w == null) {
+                    w = new Workspace(workspaceRoot);
+                } else {
+                    w.settingsFile = f2;
+                    w.baseFolder = workspaceRoot;
+                    Notification.addInfo("Switched workspace to json format.");
+                    w.refreshTransients();
+                }
+                w.save();
             }
         }
         activeWorkspace = w;
     }
 
+    private static Workspace loadWorkspaceFromJson(File workspaceRoot, File settingsFile) {
+        Workspace w = w = new Workspace(workspaceRoot);
+        Map json = FileUtils.mapFromJsonFile(settingsFile);
+        if (json!= null) {
+            w.fromMap(json);
+        }
+        return w;
+    }
+
     public static void saveActive() {
         activeWorkspace.save();
     }
 
     public void save() {
         settings.save();
-        SettingsSave.saveInstance(this, settingsFile, "Workspace");
+        FileUtils.writeStringToFile(FileUtils.toJsonString(this), settingsFile, "Workspace");
     }
 
     @Override
@@ -356,5 +420,4 @@ public class Workspace implements ProjectTreeNode, Serializable {
         }
         return false;
     }
-
 }

src/com/gpl/rpg/atcontentstudio/model/WorkspaceSettings.java

@@ -1,8 +1,7 @@
 package com.gpl.rpg.atcontentstudio.model;
 
 import com.gpl.rpg.atcontentstudio.Notification;
-import com.gpl.rpg.atcontentstudio.io.JsonPrettyWriter;
+import com.gpl.rpg.atcontentstudio.utils.FileUtils;
-import org.json.simple.JSONObject;
 import org.json.simple.parser.JSONParser;
 
 import java.io.*;
@@ -108,22 +107,8 @@ public class WorkspaceSettings {
         }
 
         json.put(VERSION_KEY, SETTINGS_VERSION);
-        StringWriter writer = new JsonPrettyWriter();
+        String toWrite = FileUtils.toJsonString(json);
-        try {
+        FileUtils.writeStringToFile(toWrite, file, "Workspace settings");
-            JSONObject.writeJSONString(json, writer);
-        } catch (IOException e) {
-            //Impossible with a StringWriter
-        }
-        String toWrite = writer.toString();
-        try {
-            FileWriter w = new FileWriter(file);
-            w.write(toWrite);
-            w.close();
-            Notification.addSuccess("Workspace settings saved.");
-        } catch (IOException e) {
-            Notification.addError("Error while saving workspace settings : " + e.getMessage());
-            e.printStackTrace();
-        }
     }
 
     public void resetDefault() {

src/com/gpl/rpg/atcontentstudio/model/gamedata/GameDataCategory.java

@@ -1,31 +1,115 @@
 package com.gpl.rpg.atcontentstudio.model.gamedata;
 
 import com.gpl.rpg.atcontentstudio.Notification;
-import com.gpl.rpg.atcontentstudio.io.JsonPrettyWriter;
 import com.gpl.rpg.atcontentstudio.model.*;
-import com.gpl.rpg.atcontentstudio.model.GameSource.Type;
 import com.gpl.rpg.atcontentstudio.ui.DefaultIcons;
-import org.json.simple.JSONArray;
+import com.gpl.rpg.atcontentstudio.utils.FileUtils;
 
 import javax.swing.tree.TreeNode;
 import java.awt.*;
-import java.io.*;
+import java.io.File;
-import java.util.List;
 import java.util.*;
+import java.util.List;
 
-public class GameDataCategory<E extends JSONElement> extends ArrayList<E> implements ProjectTreeNode, Serializable {
+public class GameDataCategory<E extends JSONElement> implements ProjectTreeNode {
+    //region Data
+    private final ArrayList<String> keyList = new ArrayList<>();
+    private final HashMap<String, E> dataMap = new HashMap<>();
+
+    //endregion
 
-    private static final long serialVersionUID = 5486008219704443733L;
 
     public GameDataSet parent;
     public String name;
 
     public GameDataCategory(GameDataSet parent, String name) {
-        super();
         this.parent = parent;
         this.name = name;
     }
 
+    //region Helpers
+    public E get(String key) {
+        return dataMap.get(key);
+    }
+
+    public E get(int index) {
+        String key = keyList.get(index);
+        return dataMap.get(key);
+    }
+
+    public E getIgnoreCase(String key) {
+        for (String k : keyList) {
+            if (k.equalsIgnoreCase(key)) {
+                return dataMap.get(k);
+            }
+        }
+        return null;
+    }
+
+    public E put(String key, E element) {
+        if (!dataMap.containsKey(key)) {
+            keyList.add(key);
+        }
+        return dataMap.put(key, element);
+    }
+
+    public void add(E quest) {
+        String key = quest.id;
+        put(key, quest);
+    }
+
+    public E remove(String key) {
+        if (dataMap.containsKey(key)) {
+            keyList.remove(key);
+        }
+        return dataMap.remove(key);
+    }
+
+    public E remove(int index) {
+        String key = keyList.get(index);
+        keyList.remove(index);
+        return dataMap.remove(key);
+    }
+
+    public boolean removeGeneric(JSONElement element){
+        return remove((E) element);
+    }
+    public boolean remove(E element) {
+        String key = element.id;
+        int index = getProject().getNodeIndex(element);
+        boolean result = false;
+        if (dataMap.containsKey(key)) {
+            keyList.remove(key);
+            dataMap.remove(key);
+            result = true;
+        }
+        getProject().fireElementRemoved(element, index);
+        return result;
+    }
+
+    public int size() {
+        return dataMap.size();
+    }
+    public int indexOf(String key) {
+        return keyList.indexOf(key);
+    }
+    public int indexOf(E element) {
+        String key = element.id;
+        return keyList.indexOf(key);
+    }
+
+    public ArrayList<E> toList() {
+        ArrayList<E> list = new ArrayList<>();
+        for (String key : keyList) {
+            list.add(dataMap.get(key));
+        }
+        return list;
+    }
+
+    //endregion
+
+    //region copied implementation of ProjectTreeNode
+
     @Override
     public TreeNode getChildAt(int childIndex) {
         return get(childIndex);
@@ -43,7 +127,7 @@ public class GameDataCategory<E extends JSONElement> extends ArrayList<E> implem
 
     @Override
     public int getIndex(TreeNode node) {
-        return indexOf(node);
+        return indexOf((E) node);
     }
 
     @Override
@@ -58,7 +142,7 @@ public class GameDataCategory<E extends JSONElement> extends ArrayList<E> implem
 
     @Override
     public Enumeration<E> children() {
-        return Collections.enumeration(this);
+        return Collections.enumeration(toList());
     }
 
     @Override
@@ -86,7 +170,7 @@ public class GameDataCategory<E extends JSONElement> extends ArrayList<E> implem
     @Override
     public void notifyCreated() {
         childrenAdded(new ArrayList<ProjectTreeNode>());
-        for (E node : this) {
+        for (E node : dataMap.values()) {
             node.notifyCreated();
         }
     }
@@ -132,10 +216,15 @@ public class GameDataCategory<E extends JSONElement> extends ArrayList<E> implem
     }
 
     @Override
-    public Type getDataType() {
+    public GameSource.Type getDataType() {
         return parent.getDataType();
     }
 
+    @Override
+    public boolean isEmpty() {
+        return dataMap.isEmpty();
+    }
+
     @SuppressWarnings("rawtypes")
     public void save(File jsonFile) {
         if (getDataType() != GameSource.Type.created && getDataType() != GameSource.Type.altered) {
@@ -143,7 +232,7 @@ public class GameDataCategory<E extends JSONElement> extends ArrayList<E> implem
             return;
         }
         List<Map> dataToSave = new ArrayList<Map>();
-        for (E element : this) {
+        for (E element : dataMap.values()) {
             if (element.jsonFile.equals(jsonFile)) {
                 dataToSave.add(element.toJson());
             }
@@ -157,26 +246,13 @@ public class GameDataCategory<E extends JSONElement> extends ArrayList<E> implem
 
             return;
         }
-        StringWriter writer = new JsonPrettyWriter();
+
-        try {
+        String toWrite = FileUtils.toJsonString(dataToSave);
-            JSONArray.writeJSONString(dataToSave, writer);
+        if(FileUtils.writeStringToFile(toWrite, jsonFile, "JSON file '"+jsonFile.getAbsolutePath()+"'")){
-        } catch (IOException e) {
+            for (E element : dataMap.values()) {
-            //Impossible with a StringWriter
-        }
-        String toWrite = writer.toString();
-        try {
-            FileWriter w = new FileWriter(jsonFile);
-            w.write(toWrite);
-            w.close();
-            for (E element : this) {
                 element.state = GameDataElement.State.saved;
             }
-            Notification.addSuccess("Json file " + jsonFile.getAbsolutePath() + " saved.");
-        } catch (IOException e) {
-            Notification.addError("Error while writing json file " + jsonFile.getAbsolutePath() + " : " + e.getMessage());
-            e.printStackTrace();
         }
-
     }
 
 
@@ -185,7 +261,8 @@ public class GameDataCategory<E extends JSONElement> extends ArrayList<E> implem
         GameDataCategory<? extends JSONElement> impactedCategory = null;
         String impactedFileName = fileName;
         Map<String, Integer> containedIds = new LinkedHashMap<String, Integer>();
-        for (JSONElement node : this) {
+        ArrayList<E> list = toList();
+        for (JSONElement node : list) {
             if (node.getDataType() == GameSource.Type.created && getProject().baseContent.gameData.getGameDataElement(node.getClass(), node.id) != null) {
                 if (getProject().alteredContent.gameData.getGameDataElement(node.getClass(), node.id) != null) {
                     events.add(new SaveEvent(SaveEvent.Type.moveToAltered, node, true, "Element ID matches one already present in the altered game content. Change this ID before saving."));
@@ -214,7 +291,7 @@ public class GameDataCategory<E extends JSONElement> extends ArrayList<E> implem
         for (String key : containedIds.keySet()) {
             if (containedIds.get(key) > 1) {
                 E node = null;
-                for (E n : this) {
+                for (E n : list) {
                     if (key.equals(n.id)) {
                         node = n;
                         break;
@@ -230,19 +307,15 @@ public class GameDataCategory<E extends JSONElement> extends ArrayList<E> implem
         return events;
     }
 
-    public boolean remove(E o) {
-        int index = getProject().getNodeIndex(o);
-        boolean result = super.remove(o);
-        getProject().fireElementRemoved(o, index);
-        return result;
-    }
-
     @Override
     public boolean needsSaving() {
-        for (E node : this) {
+        for (E node : dataMap.values()) {
             if (node.needsSaving()) return true;
         }
         return false;
     }
 
+    //endregion
+
 }
+

src/com/gpl/rpg/atcontentstudio/model/gamedata/GameDataSet.java

@@ -67,7 +67,7 @@ public class GameDataSet implements ProjectTreeNode, Serializable {
         items = new GameDataCategory<Item>(this, Item.getStaticDesc());
         itemCategories = new GameDataCategory<ItemCategory>(this, ItemCategory.getStaticDesc());
         npcs = new GameDataCategory<NPC>(this, NPC.getStaticDesc());
-        quests = new GameDataCategory<Quest>(this, Quest.getStaticDesc());
+        quests = new GameDataCategory<>(this, Quest.getStaticDesc());
 
         v.add(actorConditions);
         v.add(dialogues);
@@ -256,82 +256,42 @@ public class GameDataSet implements ProjectTreeNode, Serializable {
 
     public ActorCondition getActorCondition(String id) {
         if (actorConditions == null) return null;
-        for (ActorCondition gde : actorConditions) {
+        return actorConditions.get(id);
-            if (id.equals(gde.id)) {
-                return gde;
-            }
-        }
-        return null;
     }
 
     public Dialogue getDialogue(String id) {
         if (dialogues == null) return null;
-        for (Dialogue gde : dialogues) {
+        return dialogues.get(id);
-            if (id.equals(gde.id)) {
-                return gde;
-            }
-        }
-        return null;
     }
 
     public Droplist getDroplist(String id) {
         if (droplists == null) return null;
-        for (Droplist gde : droplists) {
+        return droplists.get(id);
-            if (id.equals(gde.id)) {
-                return gde;
-            }
-        }
-        return null;
     }
 
     public Item getItem(String id) {
         if (items == null) return null;
-        for (Item gde : items) {
+        return items.get(id);
-            if (id.equals(gde.id)) {
-                return gde;
-            }
-        }
-        return null;
     }
 
     public ItemCategory getItemCategory(String id) {
         if (itemCategories == null) return null;
-        for (ItemCategory gde : itemCategories) {
+        return itemCategories.get(id);
-            if (id.equals(gde.id)) {
-                return gde;
-            }
-        }
-        return null;
     }
 
     public NPC getNPC(String id) {
         if (npcs == null) return null;
-        for (NPC gde : npcs) {
+        return npcs.get(id);
-            if (id.equals(gde.id)) {
-                return gde;
-            }
-        }
-        return null;
     }
 
     public NPC getNPCIgnoreCase(String id) {
         if (npcs == null) return null;
-        for (NPC gde : npcs) {
+        return npcs.getIgnoreCase(id);
-            if (id.equalsIgnoreCase(gde.id)) {
-                return gde;
-            }
-        }
-        return null;
     }
 
     public Quest getQuest(String id) {
         if (quests == null) return null;
-        for (Quest gde : quests) {
+        return quests.get(id);
-            if (id.equals(gde.id)) {
-                return gde;
-            }
-        }
-        return null;
     }
 
     @Override

src/com/gpl/rpg/atcontentstudio/model/gamedata/JSONElement.java

@@ -4,6 +4,7 @@ import com.gpl.rpg.atcontentstudio.Notification;
 import com.gpl.rpg.atcontentstudio.io.JsonPrettyWriter;
 import com.gpl.rpg.atcontentstudio.model.GameDataElement;
 import com.gpl.rpg.atcontentstudio.model.SaveEvent;
+import com.gpl.rpg.atcontentstudio.utils.FileUtils;
 import org.json.simple.JSONObject;
 import org.json.simple.parser.JSONParser;
 import org.json.simple.parser.ParseException;
@@ -73,16 +74,10 @@ public abstract class JSONElement extends GameDataElement {
     public abstract Map toJson();
 
     public String toJsonString() {
-        StringWriter writer = new JsonPrettyWriter();
+        Map json = this.toJson();
-        try {
+        return FileUtils.toJsonString(json);
-            JSONObject.writeJSONString(this.toJson(), writer);
-        } catch (IOException e) {
-            //Impossible with a StringWriter
-        }
-        return writer.toString();
     }
 
-
     @Override
     public GameDataSet getDataSet() {
         if (parent == null) {

src/com/gpl/rpg/atcontentstudio/model/gamedata/Quest.java

@@ -186,5 +186,4 @@ public class Quest extends JSONElement {
         }
         return null;
     }
-
 }

src/com/gpl/rpg/atcontentstudio/model/saves/SavedGame.java

@@ -1,185 +0,0 @@
-package com.gpl.rpg.atcontentstudio.model.saves;
-
-import com.gpl.rpg.andorstrainer.io.SavedGameIO;
-import com.gpl.rpg.atcontentstudio.model.GameDataElement;
-import com.gpl.rpg.atcontentstudio.model.GameSource.Type;
-import com.gpl.rpg.atcontentstudio.model.Project;
-import com.gpl.rpg.atcontentstudio.model.ProjectTreeNode;
-import com.gpl.rpg.atcontentstudio.model.SaveEvent;
-import com.gpl.rpg.atcontentstudio.model.gamedata.GameDataSet;
-import com.gpl.rpg.atcontentstudio.ui.DefaultIcons;
-
-import javax.swing.tree.TreeNode;
-import java.awt.*;
-import java.io.File;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Enumeration;
-import java.util.List;
-
-public class SavedGame extends GameDataElement {
-
-    private static final long serialVersionUID = -6443495534761084990L;
-
-    public File savedFile;
-    transient public com.gpl.rpg.andorstrainer.model.SavedGame loadedSave = null;
-    transient public SavedGamesSet parent;
-
-    public SavedGame(SavedGamesSet parent, File f) throws IOException {
-        savedFile = f;
-        refreshTransients(parent);
-    }
-
-    public void refreshTransients(SavedGamesSet parent) throws IOException {
-        this.parent = parent;
-        this.loadedSave = SavedGameIO.loadFile(savedFile);
-        if (this.loadedSave == null) {
-            throw new IOException("Unable to load save: " + savedFile.getAbsolutePath());
-        }
-    }
-
-    @Override
-    public Enumeration<ProjectTreeNode> children() {
-        return null;
-    }
-
-    @Override
-    public boolean getAllowsChildren() {
-        return false;
-    }
-
-    @Override
-    public TreeNode getChildAt(int arg0) {
-        return null;
-    }
-
-    @Override
-    public int getChildCount() {
-        return 0;
-    }
-
-    @Override
-    public int getIndex(TreeNode arg0) {
-        return 0;
-    }
-
-    @Override
-    public TreeNode getParent() {
-        return parent;
-    }
-
-    @Override
-    public boolean isLeaf() {
-        return true;
-    }
-
-    @Override
-    public void childrenAdded(List<ProjectTreeNode> path) {
-        path.add(0, this);
-        parent.childrenAdded(path);
-    }
-
-    @Override
-    public void childrenChanged(List<ProjectTreeNode> path) {
-        path.add(0, this);
-        parent.childrenChanged(path);
-    }
-
-    @Override
-    public void childrenRemoved(List<ProjectTreeNode> path) {
-        path.add(0, this);
-        parent.childrenRemoved(path);
-    }
-
-    @Override
-    public void notifyCreated() {
-        childrenAdded(new ArrayList<ProjectTreeNode>());
-    }
-
-    @Override
-    public String getDesc() {
-        return (needsSaving() ? "*" : "") + loadedSave.displayInfo;
-    }
-
-    @Override
-    public Project getProject() {
-        return parent.getProject();
-    }
-
-    @Override
-    public Image getIcon() {
-        return DefaultIcons.getHeroIcon();
-    }
-
-    @Override
-    public Image getLeafIcon() {
-        return DefaultIcons.getHeroIcon();
-    }
-
-    @Override
-    public Image getClosedIcon() {
-        return null;
-    }
-
-    @Override
-    public Image getOpenIcon() {
-        return null;
-    }
-
-    @Override
-    public GameDataSet getDataSet() {
-        return null;
-    }
-
-    @Override
-    public Type getDataType() {
-        return null;
-    }
-
-    @Override
-    public boolean isEmpty() {
-        return false;
-    }
-
-    @Override
-    public void parse() {
-        // TODO Auto-generated method stub
-
-    }
-
-    @Override
-    public void link() {
-        // TODO Auto-generated method stub
-
-    }
-
-    @Override
-    public GameDataElement clone() {
-        // TODO Auto-generated method stub
-        return null;
-    }
-
-    @Override
-    public void elementChanged(GameDataElement oldOne, GameDataElement newOne) {
-        // TODO Auto-generated method stub
-
-    }
-
-    @Override
-    public String getProjectFilename() {
-        // TODO Auto-generated method stub
-        return null;
-    }
-
-    @Override
-    public void save() {
-        // TODO Auto-generated method stub
-
-    }
-
-    @Override
-    public List<SaveEvent> attemptSave() {
-        // TODO Auto-generated method stub
-        return null;
-    }
-}

src/com/gpl/rpg/atcontentstudio/model/saves/SavedGamesSet.java

@@ -1,188 +0,0 @@
-package com.gpl.rpg.atcontentstudio.model.saves;
-
-import com.gpl.rpg.atcontentstudio.Notification;
-import com.gpl.rpg.atcontentstudio.model.GameSource.Type;
-import com.gpl.rpg.atcontentstudio.model.Project;
-import com.gpl.rpg.atcontentstudio.model.ProjectTreeNode;
-import com.gpl.rpg.atcontentstudio.model.gamedata.GameDataSet;
-import com.gpl.rpg.atcontentstudio.ui.DefaultIcons;
-
-import javax.swing.tree.TreeNode;
-import java.awt.*;
-import java.io.File;
-import java.io.IOException;
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.Enumeration;
-import java.util.List;
-import java.util.Vector;
-
-public class SavedGamesSet implements ProjectTreeNode, Serializable {
-
-    private static final long serialVersionUID = -6565834239789184087L;
-
-    public Vector<SavedGame> saves; //For simulations.
-
-    public Project parent;
-
-    public SavedGamesSet(Project parent) {
-        this.parent = parent;
-        saves = new Vector<SavedGame>();
-    }
-
-    public void refreshTransients() {
-        for (SavedGame save : saves) {
-            try {
-                save.refreshTransients(this);
-            } catch (IOException e) {
-                Notification.addError(e.getMessage());
-            }
-        }
-    }
-
-    public void addSave(File f) {
-        try {
-            ProjectTreeNode higherEmptyParent = this;
-            while (higherEmptyParent != null) {
-                if (higherEmptyParent.getParent() != null && ((ProjectTreeNode) higherEmptyParent.getParent()).isEmpty())
-                    higherEmptyParent = (ProjectTreeNode) higherEmptyParent.getParent();
-                else break;
-            }
-            if (higherEmptyParent == this && !this.isEmpty()) higherEmptyParent = null;
-            SavedGame node = new SavedGame(this, f);
-            saves.add(node);
-            if (higherEmptyParent != null) higherEmptyParent.notifyCreated();
-            else node.notifyCreated();
-        } catch (IOException e) {
-            Notification.addError(e.getMessage());
-        }
-    }
-
-    public SavedGame getSave(File f) {
-        for (SavedGame save : saves) {
-            if (save.savedFile.equals(f)) return save;
-        }
-        return null;
-    }
-
-    @Override
-    public Enumeration<? extends ProjectTreeNode> children() {
-        return saves.elements();
-    }
-
-    @Override
-    public boolean getAllowsChildren() {
-        return true;
-    }
-
-    @Override
-    public TreeNode getChildAt(int arg0) {
-        return saves.elementAt(arg0);
-    }
-
-    @Override
-    public int getChildCount() {
-        return saves.size();
-    }
-
-    @Override
-    public int getIndex(TreeNode arg0) {
-        return saves.indexOf(arg0);
-    }
-
-    @Override
-    public TreeNode getParent() {
-        return parent;
-    }
-
-    @Override
-    public boolean isLeaf() {
-        return false;
-    }
-
-    @Override
-    public void childrenAdded(List<ProjectTreeNode> path) {
-        path.add(0, this);
-        parent.childrenAdded(path);
-    }
-
-    @Override
-    public void childrenChanged(List<ProjectTreeNode> path) {
-        path.add(0, this);
-        parent.childrenChanged(path);
-    }
-
-    @Override
-    public void childrenRemoved(List<ProjectTreeNode> path) {
-        if (path.size() == 1 && this.getChildCount() == 1) {
-            childrenRemoved(new ArrayList<ProjectTreeNode>());
-        } else {
-            path.add(0, this);
-            parent.childrenRemoved(path);
-        }
-    }
-
-    @Override
-    public void notifyCreated() {
-        childrenAdded(new ArrayList<ProjectTreeNode>());
-        for (SavedGame s : saves) {
-            s.notifyCreated();
-        }
-    }
-
-    @Override
-    public String getDesc() {
-        return (needsSaving() ? "*" : "") + "Saved games";
-    }
-
-    @Override
-    public Project getProject() {
-        return parent.getProject();
-    }
-
-
-    @Override
-    public Image getIcon() {
-        return getOpenIcon();
-    }
-
-    @Override
-    public Image getClosedIcon() {
-        return DefaultIcons.getSavClosedIcon();
-    }
-
-    @Override
-    public Image getLeafIcon() {
-        return DefaultIcons.getSavClosedIcon();
-    }
-
-    @Override
-    public Image getOpenIcon() {
-        return DefaultIcons.getSavOpenIcon();
-    }
-
-
-    @Override
-    public GameDataSet getDataSet() {
-        return null;
-    }
-
-    @Override
-    public Type getDataType() {
-        return null;
-    }
-
-    @Override
-    public boolean isEmpty() {
-        return saves.isEmpty();
-    }
-
-
-    @Override
-    public boolean needsSaving() {
-        for (ProjectTreeNode node : saves) {
-            if (node.needsSaving()) return true;
-        }
-        return false;
-    }
-}

src/com/gpl/rpg/atcontentstudio/model/sprites/SpriteSheetSet.java

@@ -10,9 +10,7 @@ import com.gpl.rpg.atcontentstudio.ui.DefaultIcons;
 import javax.swing.tree.TreeNode;
 import java.awt.*;
 import java.io.File;
-import java.util.ArrayList;
+import java.util.*;
-import java.util.Collections;
-import java.util.Enumeration;
 import java.util.List;
 
 public class SpriteSheetSet implements ProjectTreeNode {
@@ -44,6 +42,7 @@ public class SpriteSheetSet implements ProjectTreeNode {
                 }
             }
         }
+        spritesheets.sort(Comparator.comparing(s -> s.id));
     }
 
     @Override

src/com/gpl/rpg/atcontentstudio/model/tools/i18n/PotGenerator.java

@@ -19,12 +19,12 @@ public class PotGenerator {
 
         GameSource gsrc = proj.baseContent;
 
-        for (ActorCondition ac : gsrc.gameData.actorConditions) {
+        for (ActorCondition ac : gsrc.gameData.actorConditions.toList()) {
             pushString(stringsResources, resourcesStrings, ac.display_name, getPotContextComment(ac));
             pushString(stringsResources, resourcesStrings, ac.description, getPotContextComment(ac) + ":description");
         }
 
-        for (Dialogue d : gsrc.gameData.dialogues) {
+        for (Dialogue d : gsrc.gameData.dialogues.toList()) {
             pushString(stringsResources, resourcesStrings, d.message, getPotContextComment(d));
             if (d.replies == null) continue;
             for (Dialogue.Reply r : d.replies) {
@@ -34,20 +34,20 @@ public class PotGenerator {
             }
         }
 
-        for (ItemCategory ic : gsrc.gameData.itemCategories) {
+        for (ItemCategory ic : gsrc.gameData.itemCategories.toList()) {
             pushString(stringsResources, resourcesStrings, ic.name, getPotContextComment(ic));
         }
 
-        for (Item i : gsrc.gameData.items) {
+        for (Item i : gsrc.gameData.items.toList()) {
             pushString(stringsResources, resourcesStrings, i.name, getPotContextComment(i));
             pushString(stringsResources, resourcesStrings, i.description, getPotContextComment(i) + ":description");
         }
 
-        for (NPC npc : gsrc.gameData.npcs) {
+        for (NPC npc : gsrc.gameData.npcs.toList()) {
             pushString(stringsResources, resourcesStrings, npc.name, getPotContextComment(npc));
         }
 
-        for (Quest q : gsrc.gameData.quests) {
+        for (Quest q : gsrc.gameData.quests.toList()) {
             if (q.visible_in_log != null && q.visible_in_log != 0) {
                 pushString(stringsResources, resourcesStrings, q.name, getPotContextComment(q));
                 for (QuestStage qs : q.stages) {

src/com/gpl/rpg/atcontentstudio/model/tools/resoptimizer/ResourcesCompactor.java

@@ -3,10 +3,7 @@ package com.gpl.rpg.atcontentstudio.model.tools.resoptimizer;
 import com.gpl.rpg.atcontentstudio.io.JsonPrettyWriter;
 import com.gpl.rpg.atcontentstudio.model.GameDataElement;
 import com.gpl.rpg.atcontentstudio.model.Project;
-import com.gpl.rpg.atcontentstudio.model.gamedata.ActorCondition;
+import com.gpl.rpg.atcontentstudio.model.gamedata.*;
-import com.gpl.rpg.atcontentstudio.model.gamedata.GameDataSet;
-import com.gpl.rpg.atcontentstudio.model.gamedata.Item;
-import com.gpl.rpg.atcontentstudio.model.gamedata.NPC;
 import com.gpl.rpg.atcontentstudio.model.maps.TMXMap;
 import com.gpl.rpg.atcontentstudio.model.maps.TMXMapSet;
 import com.gpl.rpg.atcontentstudio.model.sprites.SpriteSheetSet;
@@ -81,12 +78,13 @@ public class ResourcesCompactor {
         File folder = new File(baseFolder.getAbsolutePath() + File.separator + GameDataSet.DEFAULT_REL_PATH_IN_SOURCE);
         if (!folder.exists()) folder.mkdirs();
 
-        for (ActorCondition ac : proj.baseContent.gameData.actorConditions) {
+        ArrayList<ActorCondition> actorConditions = proj.baseContent.gameData.actorConditions.toList();
+        for (ActorCondition ac : actorConditions) {
             if (filesCovered.contains(ac.jsonFile)) continue;
             File currentFile = ac.jsonFile;
             filesCovered.add(currentFile);
             List<Map> dataToSave = new ArrayList<Map>();
-            for (ActorCondition acond : proj.baseContent.gameData.actorConditions) {
+            for (ActorCondition acond : actorConditions) {
                 if (!acond.jsonFile.equals(currentFile)) continue;
                 Map json = acond.toJson();
                 json.put("iconID", convertObjectSprite(acond.icon_id).toStringID());
@@ -96,12 +94,13 @@ public class ResourcesCompactor {
             writeJson(dataToSave, target);
         }
 
-        for (Item it : proj.baseContent.gameData.items) {
+        ArrayList<Item> items = proj.baseContent.gameData.items.toList();
+        for (Item it : items) {
             if (filesCovered.contains(it.jsonFile)) continue;
             File currentFile = it.jsonFile;
             filesCovered.add(currentFile);
             List<Map> dataToSave = new ArrayList<Map>();
-            for (Item item : proj.baseContent.gameData.items) {
+            for (Item item : items) {
                 if (!item.jsonFile.equals(currentFile)) continue;
                 Map json = item.toJson();
                 json.put("iconID", convertObjectSprite(item.icon_id).toStringID());
@@ -112,12 +111,13 @@ public class ResourcesCompactor {
         }
 
 
-        for (NPC np : proj.baseContent.gameData.npcs) {
+        ArrayList<NPC> npcs = proj.baseContent.gameData.npcs.toList();
+        for (NPC np : npcs) {
             if (filesCovered.contains(np.jsonFile)) continue;
             File currentFile = np.jsonFile;
             filesCovered.add(currentFile);
             List<Map> dataToSave = new ArrayList<Map>();
-            for (NPC npc : proj.baseContent.gameData.npcs) {
+            for (NPC npc : npcs) {
                 if (!npc.jsonFile.equals(currentFile)) continue;
                 Map json = npc.toJson();
                 if (proj.getImage(npc.icon_id).getWidth(null) == TILE_WIDTH_IN_PIXELS || proj.getImage(npc.icon_id).getHeight(null) == TILE_HEIGHT_IN_PIXELS) {
@@ -145,16 +145,12 @@ public class ResourcesCompactor {
     private Minify jsonMinifier = new Minify();
 
     private void writeJson(List<Map> dataToSave, File target) {
-        StringWriter writer = new JsonPrettyWriter();
+        String toWrite = FileUtils.toJsonString(dataToSave);
-        try {
+        toWrite = jsonMinifier.minify(toWrite);
-            JSONArray.writeJSONString(dataToSave, writer);
+        FileUtils.writeStringToFile(toWrite, target, null);
-        } catch (IOException e) {
-            //Impossible with a StringWriter
-        }
-        String toWrite = writer.toString();
         try {
             FileWriter w = new FileWriter(target);
-            w.write(jsonMinifier.minify(toWrite));
+            w.write(toWrite);
             w.close();
         } catch (IOException e) {
             e.printStackTrace();

src/com/gpl/rpg/atcontentstudio/model/tools/writermode/WriterModeDataSet.java

@@ -6,6 +6,7 @@ import com.gpl.rpg.atcontentstudio.model.*;
 import com.gpl.rpg.atcontentstudio.model.GameSource.Type;
 import com.gpl.rpg.atcontentstudio.model.gamedata.GameDataSet;
 import com.gpl.rpg.atcontentstudio.ui.DefaultIcons;
+import com.gpl.rpg.atcontentstudio.utils.FileUtils;
 import org.json.simple.JSONArray;
 import org.json.simple.parser.JSONParser;
 import org.json.simple.parser.ParseException;
@@ -155,24 +156,12 @@ public class WriterModeDataSet implements ProjectTreeNode, Serializable {
 
             return;
         }
-        StringWriter writer = new JsonPrettyWriter();
+
-        try {
+        String toWrite = FileUtils.toJsonString(dataToSave);
-            JSONArray.writeJSONString(dataToSave, writer);
+        if(FileUtils.writeStringToFile(toWrite, writerFile, "Json file " + writerFile.getAbsolutePath())) {
-        } catch (IOException e) {
-            //Impossible with a StringWriter
-        }
-        String toWrite = writer.toString();
-        try {
-            FileWriter w = new FileWriter(writerFile);
-            w.write(toWrite);
-            w.close();
             for (WriterModeData element : writerModeDataList) {
                 element.state = GameDataElement.State.saved;
             }
-            Notification.addSuccess("Json file " + writerFile.getAbsolutePath() + " saved.");
-        } catch (IOException e) {
-            Notification.addError("Error while writing json file " + writerFile.getAbsolutePath() + " : " + e.getMessage());
-            e.printStackTrace();
         }
     }
 

src/com/gpl/rpg/atcontentstudio/ui/EditorsArea.java

@@ -4,13 +4,11 @@ import com.gpl.rpg.atcontentstudio.model.ProjectTreeNode;
 import com.gpl.rpg.atcontentstudio.model.gamedata.*;
 import com.gpl.rpg.atcontentstudio.model.maps.TMXMap;
 import com.gpl.rpg.atcontentstudio.model.maps.WorldmapSegment;
-import com.gpl.rpg.atcontentstudio.model.saves.SavedGame;
 import com.gpl.rpg.atcontentstudio.model.sprites.Spritesheet;
 import com.gpl.rpg.atcontentstudio.model.tools.writermode.WriterModeData;
 import com.gpl.rpg.atcontentstudio.ui.gamedataeditors.*;
 import com.gpl.rpg.atcontentstudio.ui.map.TMXMapEditor;
 import com.gpl.rpg.atcontentstudio.ui.map.WorldMapEditor;
-import com.gpl.rpg.atcontentstudio.ui.saves.SavedGameEditor;
 import com.gpl.rpg.atcontentstudio.ui.sprites.SpritesheetEditor;
 import com.gpl.rpg.atcontentstudio.ui.tools.writermode.WriterModeEditor;
 import com.jidesoft.swing.JideTabbedPane;
@@ -129,15 +127,6 @@ public class EditorsArea extends JPanel {
     }
 
 
-    public void openEditor(SavedGame save) {
-        if (editors.containsKey(save)) {
-            tabHolder.setSelectedComponent(editors.get(save));
-            return;
-        }
-        openEditor(new SavedGameEditor(save));
-    }
-
-
     public void openEditor(WorldmapSegment node) {
         if (editors.containsKey(node)) {
             tabHolder.setSelectedComponent(editors.get(node));

src/com/gpl/rpg/atcontentstudio/ui/ProjectsTree.java

@@ -1,6 +1,5 @@
 package com.gpl.rpg.atcontentstudio.ui;
 
-import com.gpl.rpg.andorstrainer.AndorsTrainer;
 import com.gpl.rpg.atcontentstudio.ATContentStudio;
 import com.gpl.rpg.atcontentstudio.model.ProjectTreeNode;
 import com.gpl.rpg.atcontentstudio.model.Workspace;
@@ -8,7 +7,6 @@ import com.gpl.rpg.atcontentstudio.model.bookmarks.BookmarkEntry;
 import com.gpl.rpg.atcontentstudio.model.gamedata.JSONElement;
 import com.gpl.rpg.atcontentstudio.model.maps.TMXMap;
 import com.gpl.rpg.atcontentstudio.model.maps.WorldmapSegment;
-import com.gpl.rpg.atcontentstudio.model.saves.SavedGame;
 import com.gpl.rpg.atcontentstudio.model.sprites.Spritesheet;
 import com.gpl.rpg.atcontentstudio.model.tools.writermode.WriterModeData;
 import com.jidesoft.swing.TreeSearchable;
@@ -36,12 +34,6 @@ public class ProjectsTree extends JPanel {
 
     private JPopupMenu popupMenu;
 
-    private Thread konamiTimeout = null;
-    private boolean exit = false;
-    private int timeout = 200;
-    private Integer[] konamiBuffer = new Integer[]{null, null, null, null, null, null, null, null, null, null};
-    private boolean konamiCodeEntered = false;
-
     public ProjectsTree() {
         super();
         setLayout(new BorderLayout());
@@ -68,22 +60,6 @@ public class ProjectsTree extends JPanel {
                     if (projectsTree.getSelectionPath() != null) {
                         itemAction((ProjectTreeNode) projectsTree.getSelectionPath().getLastPathComponent());
                     }
-                } else {
-                    if (konamiTimeout == null) {
-                        startKonamiCount();
-                    }
-                    int i = 0;
-                    while (i < konamiBuffer.length && konamiBuffer[i] != null) {
-                        i++;
-                    }
-                    if (i < konamiBuffer.length) {
-                        konamiBuffer[i] = e.getKeyCode();
-                        if (!compareBuffers()) {
-                            exit = true;
-                        } else {
-                            resetTimeout();
-                        }
-                    }
                 }
             }
         });
@@ -198,10 +174,6 @@ public class ProjectsTree extends JPanel {
             addNextSeparator = true;
             popupMenu.add(new JMenuItem(actions.createWorldmap));
         }
-        if (actions.loadSave.isEnabled()) {
-            addNextSeparator = true;
-            popupMenu.add(new JMenuItem(actions.loadSave));
-        }
         if (addNextSeparator) {
             popupMenu.add(new JSeparator());
             addNextSeparator = false;
@@ -245,311 +217,6 @@ public class ProjectsTree extends JPanel {
             popupMenu.add(new JSeparator());
             addNextSeparator = false;
         }
-
-        if (konamiCodeEntered) {
-            JMenuItem openTrainer = new JMenuItem("Start Andor's Trainer...");
-            popupMenu.add(openTrainer);
-            popupMenu.addSeparator();
-            openTrainer.addActionListener(new ActionListener() {
-                @Override
-                public void actionPerformed(ActionEvent e) {
-                    new Thread() {
-                        public void run() {
-                            AndorsTrainer.startApp(false);
-                        }
-                    }.start();
-                }
-            });
-        }
-
-//		if (projectsTree.getSelectionPath() == null || projectsTree.getSelectionPath().getLastPathComponent() == null) {
-//			JMenuItem addProject = new JMenuItem("Create project...");
-//			popupMenu.add(addProject);
-//			addProject.addActionListener(new ActionListener() {
-//				@Override
-//				public void actionPerformed(ActionEvent e) {
-//					new ProjectCreationWizard().setVisible(true);
-//				}
-//			});
-//			popupMenu.addSeparator();
-//		} else if (projectsTree.getSelectionPaths().length > 1) {
-//			boolean deleteAll = false;
-//			final List<GameDataElement> elementsToDelete = new ArrayList<GameDataElement>();
-//			for (TreePath selected : projectsTree.getSelectionPaths()) {
-//				if (selected.getLastPathComponent() instanceof GameDataElement && ((GameDataElement)selected.getLastPathComponent()).writable) {
-//					elementsToDelete.add((GameDataElement) selected.getLastPathComponent());
-//					deleteAll = true;
-//				} else {
-//					deleteAll = false;
-//					break;
-//				}
-//			}
-//			if (deleteAll) {
-//				JMenuItem deleteItems = new JMenuItem("Delete all selected elements");
-//				popupMenu.add(deleteItems);
-//				deleteItems.addActionListener(new ActionListener() {
-//					@Override
-//					public void actionPerformed(ActionEvent e) {
-//						final Map<GameDataCategory<JSONElement>, Set<File>> impactedCategories = new IdentityHashMap<GameDataCategory<JSONElement>, Set<File>>();
-//						for (GameDataElement element : elementsToDelete) {
-//							ATContentStudio.frame.closeEditor(element);
-//							element.childrenRemoved(new ArrayList<ProjectTreeNode>());
-//							if (element instanceof JSONElement) {
-//								@SuppressWarnings("unchecked")
-//								GameDataCategory<JSONElement> category = (GameDataCategory<JSONElement>) element.getParent();
-//								category.remove(element);
-//								if (impactedCategories.get(category) == null) {
-//									impactedCategories.put(category, new HashSet<File>());
-//								}
-//								impactedCategories.get(category).add(((JSONElement) element).jsonFile);
-//							} else if (element instanceof TMXMap) {
-//								TMXMapSet parent = (TMXMapSet) element.getParent();
-//								parent.tmxMaps.remove(element);
-//							}
-//						}
-//						new Thread() {
-//							@Override
-//							public void run() {
-//								final List<SaveEvent> events = new ArrayList<SaveEvent>();
-//								List<SaveEvent> catEvents = null;
-//								for (GameDataCategory<JSONElement> category : impactedCategories.keySet()) {
-//									for (File f : impactedCategories.get(category)) {
-//										catEvents = category.attemptSave(true, f.getName());
-//										if (catEvents.isEmpty()) {
-//											category.save(f);
-//										} else {
-//											events.addAll(catEvents);
-//										}
-//									}
-//								}
-//								if (!events.isEmpty()) {
-//									new SaveItemsWizard(events, null).setVisible(true);
-//								}
-//							}
-//						}.start();
-//					}
-//				});
-//			}
-//			
-//			popupMenu.addSeparator();
-//		} else {
-//			final ProjectTreeNode selected = (ProjectTreeNode) projectsTree.getSelectionPath().getLastPathComponent();
-//			if (selected instanceof Project) {
-//				JMenuItem closeProject = new JMenuItem("Close Project...");
-//				JMenuItem deleteProject = new JMenuItem("Delete Project...");
-//				popupMenu.add(closeProject);
-//				popupMenu.add(deleteProject);
-//				popupMenu.addSeparator();
-//				closeProject.addActionListener(new ActionListener() {
-//					@Override
-//					public void actionPerformed(ActionEvent e) {
-//						Workspace.closeProject((Project) selected);
-//					}
-//				});
-//				deleteProject.addActionListener(new ActionListener() {
-//					@Override
-//					public void actionPerformed(ActionEvent e) {
-//						int confirm = JOptionPane.showConfirmDialog(ProjectsTree.this, "Are you sure you wish to delete this project ?\nAll files created for it will be deleted too...", "Delete this project ?", JOptionPane.OK_CANCEL_OPTION);
-//						if (confirm == JOptionPane.OK_OPTION) {
-//							Workspace.deleteProject(((Project)projectsTree.getSelectionPath().getLastPathComponent()));
-//						}
-//					}
-//				});
-//			}
-//			if (selected instanceof ClosedProject) {
-//				JMenuItem openProject = new JMenuItem("Open Project...");
-//				JMenuItem deleteProject = new JMenuItem("Delete Project...");
-//				popupMenu.add(openProject);
-//				popupMenu.add(deleteProject);
-//				popupMenu.addSeparator();
-//				openProject.addActionListener(new ActionListener() {
-//					@Override
-//					public void actionPerformed(ActionEvent e) {
-//						Workspace.openProject(((ClosedProject)selected));
-//					}
-//				});
-//				deleteProject.addActionListener(new ActionListener() {
-//					@Override
-//					public void actionPerformed(ActionEvent e) {
-//						int confirm = JOptionPane.showConfirmDialog(ProjectsTree.this, "Are you sure you wish to delete this project ?\nAll files created for it will be deleted too...", "Delete this project ?", JOptionPane.OK_CANCEL_OPTION);
-//						if (confirm == JOptionPane.OK_OPTION) {
-//							Workspace.deleteProject(((ClosedProject)selected));
-//						}
-//					}
-//				});
-//			}
-//			if (selected.getProject() != null) {
-//				final Project proj = ((ProjectTreeNode)selected).getProject();
-//				JMenuItem createGDE = new JMenuItem("Create Game Data Element (JSON)");
-//				popupMenu.add(createGDE);
-//				createGDE.addActionListener(new ActionListener() {
-//					@Override
-//					public void actionPerformed(ActionEvent e) {
-//						new JSONCreationWizard(proj).setVisible(true);
-//					}
-//				});
-//				JMenuItem importJson = new JMenuItem("Import JSON data");
-//				popupMenu.add(importJson);
-//				importJson.addActionListener(new ActionListener() {
-//					@Override
-//					public void actionPerformed(ActionEvent e) {
-//						new JSONImportWizard(proj).setVisible(true);
-//					}
-//				});
-//				//TODO move somewhere else
-//				JMenu compareElementsMenu = new JMenu("Open comparator for...");
-//				JMenuItem compareItems = new JMenuItem("Items");
-//				compareElementsMenu.add(compareItems);
-//				compareItems.addActionListener(new ActionListener() {
-//					@Override
-//					public void actionPerformed(ActionEvent e) {
-//						ATContentStudio.frame.editors.openEditor(new ItemsTableView(selected.getProject()));
-//					}
-//				});
-//				JMenuItem compareNPCs = new JMenuItem("NPCs");
-//				compareElementsMenu.add(compareNPCs);
-//				compareNPCs.addActionListener(new ActionListener() {
-//					@Override
-//					public void actionPerformed(ActionEvent e) {
-//						ATContentStudio.frame.editors.openEditor(new NPCsTableView(selected.getProject()));
-//					}
-//				});
-//				popupMenu.add(compareElementsMenu);
-//				
-//				JMenuItem exportProjectPackage = new JMenuItem("Export project");
-//				exportProjectPackage.addActionListener(new ActionListener() {
-//					@Override
-//					public void actionPerformed(ActionEvent e) {
-//						JFileChooser chooser = new JFileChooser() {
-//							private static final long serialVersionUID = 8039332384370636746L;
-//							public boolean accept(File f) {
-//								return f.isDirectory() || f.getName().endsWith(".zip") || f.getName().endsWith(".ZIP"); 
-//							}
-//						};
-//						chooser.setMultiSelectionEnabled(false);
-//						int result = chooser.showSaveDialog(ATContentStudio.frame);
-//						if (result == JFileChooser.APPROVE_OPTION) {
-//							selected.getProject().generateExportPackage(chooser.getSelectedFile());
-//						}
-//					}
-//				});
-//				popupMenu.add(exportProjectPackage);
-//				popupMenu.addSeparator();
-//			}
-//			if (selected instanceof GameDataElement) {
-//				final GameDataElement node = ((GameDataElement)selected); 
-//				if (node.state == GameDataElement.State.modified){
-//					JMenuItem saveItem = new JMenuItem("Save this element");
-//					saveItem.addActionListener(new ActionListener() {
-//						@Override
-//						public void actionPerformed(ActionEvent e) {
-//							node.save();
-//							ATContentStudio.frame.nodeChanged(node);
-//						}
-//					});
-//					popupMenu.add(saveItem);
-//				}
-//				
-//				JMenuItem deleteItem = null;
-//				if (node.getDataType() == GameSource.Type.created) {
-//					deleteItem = new JMenuItem("Delete this element");
-//				} else if (node.getDataType() == GameSource.Type.altered) {
-//					deleteItem = new JMenuItem("Revert to original");
-//				} 
-//				if (deleteItem != null) {
-//					popupMenu.add(deleteItem);
-//					deleteItem.addActionListener(new ActionListener() {
-//						@SuppressWarnings("unchecked")
-//						@Override
-//						public void actionPerformed(ActionEvent e) {
-//							ATContentStudio.frame.closeEditor(node);
-//							new Thread() {
-//								@Override
-//								public void run() {
-//									node.childrenRemoved(new ArrayList<ProjectTreeNode>());
-//									if (node.getParent() instanceof GameDataCategory<?>) {
-//										((GameDataCategory<?>)node.getParent()).remove(node);
-//										List<SaveEvent> events = node.attemptSave();
-//										if (events == null || events.isEmpty()) {
-//											node.save();
-//										} else {
-//											new SaveItemsWizard(events, null).setVisible(true);
-//										}
-//									}
-//								}
-//							}.start();
-//						}
-//					});
-//				}
-//				popupMenu.addSeparator();
-//				
-//			}
-//			if (selected instanceof Project || selected instanceof SavedGamesSet) {
-//				JMenuItem addSave = new JMenuItem("Load saved game...");
-//				popupMenu.add(addSave);
-//				popupMenu.addSeparator();
-//				addSave.addActionListener(new ActionListener() {
-//					@Override
-//					public void actionPerformed(ActionEvent e) {
-//						JFileChooser chooser = new JFileChooser("Select an Andor's Trail save file");
-//						if (chooser.showOpenDialog(ATContentStudio.frame) == JFileChooser.APPROVE_OPTION) {
-//							selected.getProject().addSave(chooser.getSelectedFile());
-//							selected.getProject().save();
-//						}
-//					}
-//				});
-//				
-//			}
-//		}
-//		if (konamiCodeEntered) {
-//			JMenuItem openTrainer = new JMenuItem("Start Andor's Trainer...");
-//			popupMenu.add(openTrainer);
-//			popupMenu.addSeparator();
-//			openTrainer.addActionListener(new ActionListener() {
-//				@Override
-//				public void actionPerformed(ActionEvent e) {
-//					new Thread() {
-//						public void run() {
-//							AndorsTrainer.startApp(false);
-//						}
-//					}.start();
-//				}
-//			});
-//		}
-//		JMenu changeLaF = new JMenu("Change Look and Feel");
-//		for (final LookAndFeelInfo i : UIManager.getInstalledLookAndFeels()) {
-//			final JMenuItem lafItem = new JMenuItem("Switch to "+i.getName());
-//			changeLaF.add(lafItem);
-//			lafItem.addActionListener(new ActionListener() {
-//				@Override
-//				public void actionPerformed(ActionEvent e) {
-//					try {
-//						UIManager.setLookAndFeel(i.getClassName());
-//						SwingUtilities.updateComponentTreeUI(ATContentStudio.frame);
-//						ConfigCache.setFavoriteLaFClassName(i.getClassName());
-//					} catch (ClassNotFoundException e1) {
-//						e1.printStackTrace();
-//					} catch (InstantiationException e1) {
-//						e1.printStackTrace();
-//					} catch (IllegalAccessException e1) {
-//						e1.printStackTrace();
-//					} catch (UnsupportedLookAndFeelException e1) {
-//						e1.printStackTrace();
-//					}
-//				}
-//			});
-//		}
-//		popupMenu.add(changeLaF);
-//		popupMenu.addSeparator();
-//		JMenuItem showAbout = new JMenuItem("About...");
-//		popupMenu.add(showAbout);
-//		popupMenu.addSeparator();
-//		showAbout.addActionListener(new ActionListener() {
-//			@Override
-//			public void actionPerformed(ActionEvent e) {
-//				ATContentStudio.frame.showAbout();
-//			}
-//		});
     }
 
     public void popupActivated(MouseEvent e) {
@@ -584,10 +251,6 @@ public class ProjectsTree extends JPanel {
             ATContentStudio.frame.openEditor((WriterModeData) node);
         } else if (node instanceof BookmarkEntry) {
             ATContentStudio.frame.openEditor(((BookmarkEntry) node).bookmarkedElement);
-        } else if (node instanceof SavedGame) {
-            if (konamiCodeEntered) {
-                ATContentStudio.frame.openEditor((SavedGame) node);
-            }
         }
     }
 
@@ -704,65 +367,4 @@ public class ProjectsTree extends JPanel {
         projectsTree.scrollPathToVisible(tp);
     }
 
-    protected void startKonamiCount() {
-        resetTimeout();
-        exit = false;
-        konamiTimeout = new Thread() {
-            @Override
-            public void run() {
-                while (!exit && timeout > 0) {
-                    try {
-                        Thread.sleep(10);
-                    } catch (InterruptedException e) {
-                    }
-                    timeout -= 10;
-                }
-                konamiTimeout = null;
-                konamiBuffer = new Integer[]{null, null, null, null, null, null, null, null, null, null};
-            }
-        };
-        konamiTimeout.start();
-    }
-
-    protected void resetTimeout() {
-        timeout = 400;
-    }
-
-    protected boolean compareBuffers() {
-        if (konamiBuffer[0] == null) return true;
-        else if (konamiBuffer[0] != KeyEvent.VK_UP) return false;
-
-        if (konamiBuffer[1] == null) return true;
-        else if (konamiBuffer[1] != KeyEvent.VK_UP) return false;
-
-        if (konamiBuffer[2] == null) return true;
-        else if (konamiBuffer[2] != KeyEvent.VK_DOWN) return false;
-
-        if (konamiBuffer[3] == null) return true;
-        else if (konamiBuffer[3] != KeyEvent.VK_DOWN) return false;
-
-        if (konamiBuffer[4] == null) return true;
-        else if (konamiBuffer[4] != KeyEvent.VK_LEFT) return false;
-
-        if (konamiBuffer[5] == null) return true;
-        else if (konamiBuffer[5] != KeyEvent.VK_RIGHT) return false;
-
-        if (konamiBuffer[6] == null) return true;
-        else if (konamiBuffer[6] != KeyEvent.VK_LEFT) return false;
-
-        if (konamiBuffer[7] == null) return true;
-        else if (konamiBuffer[7] != KeyEvent.VK_RIGHT) return false;
-
-        if (konamiBuffer[8] == null) return true;
-        else if (konamiBuffer[8] != KeyEvent.VK_B) return false;
-
-        if (konamiBuffer[9] == null) return true;
-        else if (konamiBuffer[9] != KeyEvent.VK_A) return false;
-
-        konamiCodeEntered = true;
-
-        exit = true;
-        return true;
-    }
-
 }

src/com/gpl/rpg/atcontentstudio/ui/SaveItemsWizard.java

@@ -163,7 +163,7 @@ public class SaveItemsWizard extends JDialog {
                 @Override
                 public void actionPerformed(ActionEvent e) {
 
-                    Map<GameDataCategory<JSONElement>, Set<File>> jsonToSave = new IdentityHashMap<GameDataCategory<JSONElement>, Set<File>>();
+                    Map<GameDataCategory<JSONElement>, Set<File>> jsonToSave = new IdentityHashMap<>();
                     for (SaveEvent event : movedToCreatedList) {
                         if (event.target instanceof JSONElement) {
                             if (!jsonToSave.containsKey(event.target.getParent())) {

src/com/gpl/rpg/atcontentstudio/ui/StudioFrame.java

@@ -8,7 +8,6 @@ import com.gpl.rpg.atcontentstudio.model.Workspace;
 import com.gpl.rpg.atcontentstudio.model.gamedata.JSONElement;
 import com.gpl.rpg.atcontentstudio.model.maps.TMXMap;
 import com.gpl.rpg.atcontentstudio.model.maps.WorldmapSegment;
-import com.gpl.rpg.atcontentstudio.model.saves.SavedGame;
 import com.gpl.rpg.atcontentstudio.model.sprites.Spritesheet;
 import com.gpl.rpg.atcontentstudio.model.tools.writermode.WriterModeData;
 
@@ -127,7 +126,6 @@ public class StudioFrame extends JFrame {
         projectMenu.add(new JMenuItem(actions.importJSON));
         projectMenu.add(new JMenuItem(actions.createMap));
         projectMenu.add(new JMenuItem(actions.createWorldmap));
-        projectMenu.add(new JMenuItem(actions.loadSave));
         getJMenuBar().add(projectMenu);
 
         JMenu toolsMenu = new JMenu("Tools");
@@ -147,20 +145,10 @@ public class StudioFrame extends JFrame {
             lafItem.addActionListener(new ActionListener() {
                 @Override
                 public void actionPerformed(ActionEvent e) {
-                    try {
+                    String lookAndFeel = i.getClassName();
-                        UIManager.setLookAndFeel(i.getClassName());
+                    ATContentStudio.setLookAndFeel(lookAndFeel);
-                        ATContentStudio.scaleUIFont();
+                    SwingUtilities.updateComponentTreeUI(ATContentStudio.frame);
-                        SwingUtilities.updateComponentTreeUI(ATContentStudio.frame);
+                    ConfigCache.setFavoriteLaFClassName(lookAndFeel);
-                        ConfigCache.setFavoriteLaFClassName(i.getClassName());
-                    } catch (ClassNotFoundException e1) {
-                        e1.printStackTrace();
-                    } catch (InstantiationException e1) {
-                        e1.printStackTrace();
-                    } catch (IllegalAccessException e1) {
-                        e1.printStackTrace();
-                    } catch (UnsupportedLookAndFeelException e1) {
-                        e1.printStackTrace();
-                    }
                 }
             });
         }
@@ -204,10 +192,6 @@ public class StudioFrame extends JFrame {
         }
     }
 
-    public void openEditor(SavedGame save) {
-        editors.openEditor(save);
-    }
-
     public void openEditor(WorldmapSegment node) {
         editors.openEditor(node);
     }
@@ -237,5 +221,4 @@ public class StudioFrame extends JFrame {
         editors.showAbout();
     }
 
-
 }

src/com/gpl/rpg/atcontentstudio/ui/WorkspaceActions.java

@@ -6,7 +6,6 @@ import com.gpl.rpg.atcontentstudio.model.gamedata.*;
 import com.gpl.rpg.atcontentstudio.model.maps.TMXMap;
 import com.gpl.rpg.atcontentstudio.model.maps.Worldmap;
 import com.gpl.rpg.atcontentstudio.model.maps.WorldmapSegment;
-import com.gpl.rpg.atcontentstudio.model.saves.SavedGamesSet;
 import com.gpl.rpg.atcontentstudio.model.tools.writermode.WriterModeData;
 import com.gpl.rpg.atcontentstudio.model.tools.writermode.WriterModeDataSet;
 import com.gpl.rpg.atcontentstudio.ui.tools.BeanShellView;
@@ -122,7 +121,7 @@ public class WorkspaceActions {
                         if (element.getParent() instanceof GameDataCategory<?>) {
                             @SuppressWarnings("unchecked")
                             GameDataCategory<JSONElement> category = (GameDataCategory<JSONElement>) element.getParent();
-                            category.remove(element);
+                            category.remove((JSONElement) element);
                             if (impactedCategories.get(category) == null) {
                                 impactedCategories.put(category, new HashSet<File>());
                             }
@@ -190,7 +189,7 @@ public class WorkspaceActions {
                         node.childrenRemoved(new ArrayList<ProjectTreeNode>());
                         if (node instanceof JSONElement) {
                             if (node.getParent() instanceof GameDataCategory<?>) {
-                                ((GameDataCategory<?>) node.getParent()).remove(node);
+                                ((GameDataCategory<?>) node.getParent()).removeGeneric((JSONElement) node);
                                 List<SaveEvent> events = node.attemptSave();
                                 if (events == null || events.isEmpty()) {
                                     node.save();
@@ -315,22 +314,6 @@ public class WorkspaceActions {
         }
     };
 
-    public ATCSAction loadSave = new ATCSAction("Load saved game...", "Opens the saved game loading wizard") {
-        public void actionPerformed(ActionEvent e) {
-            if (!(selectedNode instanceof Project || selectedNode instanceof SavedGamesSet)) return;
-            JFileChooser chooser = new JFileChooser("Select an Andor's Trail save file");
-            if (chooser.showOpenDialog(ATContentStudio.frame) == JFileChooser.APPROVE_OPTION) {
-                selectedNode.getProject().addSave(chooser.getSelectedFile());
-                selectedNode.getProject().save();
-            }
-        }
-
-        public void selectionChanged(ProjectTreeNode selectedNode, TreePath[] selectedPaths) {
-            setEnabled(selectedNode instanceof Project || selectedNode instanceof SavedGamesSet);
-        }
-
-    };
-
     public ATCSAction compareItems = new ATCSAction("Items comparator", "Opens an editor showing all the items of the project in a table") {
         public void actionPerformed(ActionEvent e) {
             if (selectedNode == null || selectedNode.getProject() == null) return;
@@ -466,7 +449,6 @@ public class WorkspaceActions {
         actions.add(createGDE);
         actions.add(createMap);
         actions.add(importJSON);
-        actions.add(loadSave);
         actions.add(compareItems);
         actions.add(compareNPCs);
         actions.add(exportProject);

src/com/gpl/rpg/atcontentstudio/ui/gamedataeditors/JSONElementEditor.java

@@ -164,7 +164,7 @@ public abstract class JSONElementEditor extends Editor {
                     ATContentStudio.frame.closeEditor(node);
                     node.childrenRemoved(new ArrayList<ProjectTreeNode>());
                     if (node.getParent() instanceof GameDataCategory<?>) {
-                        ((GameDataCategory<?>) node.getParent()).remove(node);
+                        ((GameDataCategory<?>) node.getParent()).removeGeneric(node);
                         node.save();
                         GameDataElement newOne = proj.getGameDataElement(node.getClass(), node.id);
                         if (node instanceof Quest) {

src/com/gpl/rpg/atcontentstudio/ui/saves/SavedGameEditor.java

@@ -1,30 +0,0 @@
-package com.gpl.rpg.atcontentstudio.ui.saves;
-
-import com.gpl.rpg.atcontentstudio.ATContentStudio;
-import com.gpl.rpg.atcontentstudio.model.saves.SavedGame;
-import com.gpl.rpg.atcontentstudio.ui.DefaultIcons;
-import com.gpl.rpg.atcontentstudio.ui.Editor;
-
-import javax.swing.*;
-import java.awt.*;
-
-public class SavedGameEditor extends Editor {
-
-    private static final long serialVersionUID = 6055910379650778737L;
-
-    public SavedGameEditor(SavedGame save) {
-        this.name = save.loadedSave.displayInfo;
-        this.icon = new ImageIcon(DefaultIcons.getHeroIcon());
-        this.target = save;
-        setLayout(new BorderLayout());
-        add(new JScrollPane(new com.gpl.rpg.andorstrainer.ui.SavedGameEditor(save.loadedSave, ATContentStudio.frame)), BorderLayout.CENTER);
-
-    }
-
-    @Override
-    public void targetUpdated() {
-        // TODO Auto-generated method stub
-
-    }
-
-}

src/com/gpl/rpg/atcontentstudio/ui/sprites/SpritesheetEditor.java

@@ -53,9 +53,14 @@ public class SpritesheetEditor extends Editor {
 
     public SpritesheetEditor(Spritesheet sheet) {
         super();
-        this.icon = new ImageIcon(sheet.getIcon(0));
         this.name = sheet.id;
         this.target = sheet;
+        Image icon = sheet.getIcon(0);
+        if (icon == null) {
+            Notification.addError("Unable to open spritesheet " + sheet.id + " because the image is missing. This might be because its an UI spritesheet, which is not supported in ATCS");
+            return;
+        }
+        this.icon = new ImageIcon(icon);
 
         JPanel pane = new JPanel();
 

src/com/gpl/rpg/atcontentstudio/utils/FileUtils.java

@@ -1,14 +1,104 @@
 package com.gpl.rpg.atcontentstudio.utils;
 
+import com.gpl.rpg.atcontentstudio.Notification;
+import com.gpl.rpg.atcontentstudio.io.JsonPrettyWriter;
+import com.gpl.rpg.atcontentstudio.io.JsonSerializable;
+import org.json.simple.JSONArray;
+import org.json.simple.JSONObject;
+import org.json.simple.parser.JSONParser;
+import org.json.simple.parser.ParseException;
+
 import java.io.*;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.nio.file.StandardCopyOption;
+import java.util.List;
+import java.util.Map;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipOutputStream;
 
 public class FileUtils {
+    public static String toJsonString(JsonSerializable jsonSerializable) {
+        return toJsonString(jsonSerializable.toMap());
+    }
+    public static String toJsonString(Map json) {
+        StringWriter writer = new JsonPrettyWriter();
+        try {
+            JSONObject.writeJSONString(json, writer);
+        } catch (IOException e) {
+            //Impossible with a StringWriter
+        }
+        return writer.toString();
+    }
+    public static String toJsonString(List json) {
+        StringWriter writer = new JsonPrettyWriter();
+        try {
+            JSONArray.writeJSONString(json, writer);
+        } catch (IOException e) {
+            //Impossible with a StringWriter
+        }
+        return writer.toString();
+    }
+
+    public static Object fromJsonString(String json) {
+        Object o;
+        try {
+            JSONParser parser = new JSONParser();
+            o = parser.parse(json);
+        } catch (ParseException e) {
+            throw new RuntimeException(e);
+        }
+        return o;
+    }
+
+    public static Map mapFromJsonFile(File file){
+        String json = readFileToString(file);
+        if (json == null) {
+            return null;
+        }
+        Map map = (Map)FileUtils.fromJsonString(json);
+        return map;
+    }
+
+    public static boolean writeStringToFile(String toWrite, File file, String type) {
+        return writeStringToFile(toWrite, file, type, true);
+    }
+    public static boolean writeStringToFile(String toWrite, File file, String type, boolean notifyOnSuccess) {
+        try {
+            FileWriter w = new FileWriter(file);
+            w.write(toWrite);
+            w.close();
+            if(type != null) {
+                Notification.addSuccess(type + " saved.");
+            }
+            return true;
+        } catch (IOException e) {
+            if(type != null) {
+                Notification.addError("Error while saving " + type + " : " + e.getMessage());
+            }
+            e.printStackTrace();
+            return false;
+        }
+    }
+
+    public static String readFileToString(File settingsFile) {
+        String json;
+        try{
+            FileReader file = new FileReader(settingsFile);
+            BufferedReader reader = new BufferedReader(file);
+            StringBuilder builder = new StringBuilder();
+            int c;
+            while ((c = reader.read()) != -1) {
+                builder.append((char) c);
+            }
+            json = builder.toString();
+        }catch (IOException e){
+            json = null;
+            e.printStackTrace();
+        }
+        return json;
+    }
 
     public static void deleteDir(File dir) {
         if (dir.exists()) {