Updating world selector logic to make sure latest world detail is always used

Author: Explv

osbot_manager/src/bot_parameters/configuration/World.java

@@ -7,6 +7,8 @@
 import org.jsoup.select.Elements;
 
 import java.io.IOException;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
 import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.Comparator;
@@ -27,9 +29,9 @@ public class World implements BotParameter, Serializable {
         return Integer.compare(w1.getNumber(), w2.getNumber());
     };
 
-    private final WorldType type;
-    private final int number;
-    private final String detail;
+    private WorldType type;
+    private int number;
+    private String detail;
 
     public World(final WorldType type, final int number, final String detail) {
         this.type = type;
@@ -49,6 +51,29 @@ public final String getDetail() {
         return detail;
     }
 
+    private void writeObject(ObjectOutputStream stream) throws IOException {
+        stream.writeObject(getType());
+        stream.writeInt(getNumber());
+        stream.writeObject(getDetail());
+    }
+
+    private void readObject(ObjectInputStream stream) throws ClassNotFoundException, IOException {
+        type = (WorldType) stream.readObject();
+        number = stream.readInt();
+        detail = (String) stream.readObject();
+    }
+
+    @Override
+    public boolean equals(Object other) {
+        if (!(other instanceof World)) {
+            return false;
+        }
+
+        World otherWorld = (World) other;
+
+        return getType() == otherWorld.getType() && getNumber() == otherWorld.getNumber();
+    }
+
     @Override
     public String toString() {
         String worldStr = getType().toString() + " " + getNumber();

osbot_manager/src/gui/dialogues/world_selector_dialog/WorldSelectorDialog.java

@@ -2,6 +2,7 @@
 
 import bot_parameters.configuration.World;
 import bot_parameters.configuration.WorldType;
+import gui.dialogues.error_dialog.ExceptionDialog;
 import javafx.collections.FXCollections;
 import javafx.collections.ListChangeListener;
 import javafx.collections.ObservableList;
@@ -110,7 +111,18 @@ public WorldSelectorDialog() {
     }
 
     public void setSelectedWorlds(final ObservableList<World> selectedWorlds) {
-        this.selectedWorlds.setAll(selectedWorlds);
+        this.selectedWorlds.clear();
+
+        for (final World world : selectedWorlds) {
+            // We get the world from the list of latest worlds, in case the world detail has changed
+            int latestWorldIndex = allWorlds.indexOf(world);
+            if (latestWorldIndex == -1) {
+                continue;
+            } else {
+                this.selectedWorlds.add(allWorlds.get(latestWorldIndex));
+            }
+        }
+
         this.availableWorlds.setAll(allWorlds);
         this.availableWorlds.removeAll(selectedWorlds);
     }

osbot_manager/src/main/Version.java

@@ -8,7 +8,7 @@
 
 public class Version {
 
-    private final static float currentVersion = 8.1f;
+    private final static float currentVersion = 8.2f;
 
     public static boolean isLatestVersion() {
         try {