fix index out of bounds

fix addon-parts being unknown
fix config save path

Author: Idrinth

src/main/java/de/idrinth/waraddonclient/gui/Window.java

@@ -5,6 +5,7 @@
 import de.idrinth.waraddonclient.service.Backup;
 import de.idrinth.waraddonclient.model.Addon;
 import de.idrinth.waraddonclient.model.GuiAddonList;
+import de.idrinth.waraddonclient.model.NoAddon;
 import java.io.IOException;
 import java.net.URISyntaxException;
 import net.lingala.zip4j.exception.ZipException;
@@ -26,7 +27,7 @@
 
 public class Window extends JFrame {
 
-    private Addon activeAddon = new de.idrinth.waraddonclient.model.NoAddon();
+    private Addon activeAddon = new NoAddon();
 
     private final GuiAddonList addonList;
 
@@ -755,7 +756,10 @@ private class TableListener implements ListSelectionListener {
         @Override
         public void valueChanged(ListSelectionEvent event) {
             try {
-                activeAddon = addonList.get(addonListTable.convertRowIndexToModel(addonListTable.getSelectedRow()));
+                int row = addonListTable.getSelectedRow();
+                if (row != -1) {
+                    activeAddon = addonList.get(addonListTable.convertRowIndexToModel(row));
+                }
             } catch (java.lang.ArrayIndexOutOfBoundsException exception) {
                 logger.error(exception);
                 return;

src/main/java/de/idrinth/waraddonclient/model/ActualAddon.java

@@ -279,23 +279,28 @@ private void writeMetaDataFile(ZipFile zipFile) throws IOException {
             tmp.mkdirs();
             zipFile.extractAll(tmp.getAbsolutePath());
             StringBuilder sb = new StringBuilder();
+            ArrayList<String> folders = new ArrayList<>();
             for (File folder : tmp.listFiles()) {
                 sb.append("<folder>");
                 sb.append(folder.getName());
                 sb.append("</folder>");
+                folders.add(folder.getName());
             }
             Utils.deleteFolder(tmp);
             File target = find(name);
+            folders.add(target.getName());
             target.mkdirs();
-            FileUtils.writeStringToFile(
-                new File(target.getAbsoluteFile() + config.getVersionFile()),
-                "<?xml version=\"1.0\" encoding=\"UTF-8\"?><UiMod>"
-                + "<name>" + name + "</name>"
-                + "<version>" + version + "</version>"
-                + "<folders>" + sb + "</folders>"
-                + "</UiMod>",
-                StandardCharsets.UTF_8
-            );
+            for (String folder : folders) {
+                FileUtils.writeStringToFile(
+                    new File(config.getAddonFolder() + folder + config.getVersionFile()),
+                    "<?xml version=\"1.0\" encoding=\"UTF-8\"?><UiMod>"
+                    + "<name>" + name + "</name>"
+                    + "<version>" + version + "</version>"
+                    + "<folders>" + sb + "</folders>"
+                    + "</UiMod>",
+                    StandardCharsets.UTF_8
+                );
+            }
         }
     }
 

src/main/java/de/idrinth/waraddonclient/model/AddonList.java

@@ -34,8 +34,13 @@ public AddonList(Request client, BaseLogger logger, XmlParser parser, Config con
     }
 
     protected void processAddonDir() {
-        for (File folder : new File(config.getAddonFolder()).listFiles()) {
-            if (folder.isDirectory()) {
+        File addonFolder = new File(config.getAddonFolder());
+        if (!addonFolder.isDirectory()) {
+            return;
+        }
+        for (File folder : addonFolder.listFiles()) {
+            File version = new File(folder.getAbsolutePath() + config.getVersionFile());
+            if (folder.isDirectory() && !version.exists()) {
                 try {
                     add(new UnknownAddon(folder, client, logger, parser, config));
                     unknowns.put(folder.getName(), rows.get(rows.size() - 1).getName());

src/main/java/de/idrinth/waraddonclient/model/UnknownAddon.java

@@ -48,8 +48,7 @@ public UnknownAddon(File folder, Request client, BaseLogger logger, XmlParser pa
             throw new InvalidArgumentException("Folder is known Add-On folder.");
         }
         for (java.io.File fileEntry : folder.listFiles()) {
-            if (!fileEntry.isDirectory()
-                    && FilenameUtils.getExtension(fileEntry.getName()).equalsIgnoreCase("mod")) {
+            if (!fileEntry.isDirectory() && FilenameUtils.getExtension(fileEntry.getName()).equalsIgnoreCase("mod")) {
                 try {
                     NodeList list = parser.parse(fileEntry).getElementsByTagName("UiMod");
                     installed = list.item(0).getAttributes().getNamedItem("version").getTextContent();

src/main/java/de/idrinth/waraddonclient/service/Config.java

@@ -40,7 +40,7 @@ public class Config {
 
     private static final String VERSION_FILE = "/self.idrinth";
 
-    private final Preferences prefs = Preferences.userRoot().node(Config.class.getClass().getName());
+    private final Preferences prefs = Preferences.userRoot().node(Config.class.getCanonicalName());
 
     private final String version;