Changeset 1202 for java/installer2/src/net/oni2

Timestamp:

Nov 4, 2025, 9:25:43 PM (12 hours ago)

Author:

alloc

Message:

AEI 2.31: Fixes for reading offline package cache

Location:

java/installer2/src/net/oni2/aeinstaller

Files:

• AEInstaller.properties (modified) (1 diff)
• backend/packages/Package.java (modified) (1 diff)
• backend/packages/PackageManager.java (modified) (3 diffs)
• backend/packages/Type.java (modified) (1 diff)

java/installer2/src/net/oni2/aeinstaller/AEInstaller.properties

@@ -1 +1 @@
 appname=AE Installer 2
-appversion=.30
+appversion=.31

java/installer2/src/net/oni2/aeinstaller/backend/packages/Package.java

@@ -101 +101 @@
                         updateLocalData();
         }
+        
+        /**
+         * XML deserialization constructor
+         */
+        public Package () {}
 
         private void clearLocalOnlyInfo() {

java/installer2/src/net/oni2/aeinstaller/backend/packages/PackageManager.java

@@ -7 +7 @@
 import java.io.FileOutputStream;
 import java.io.IOException;
+import java.io.InputStreamReader;
+import java.io.Reader;
 import java.util.Collection;
 import java.util.HashMap;
@@ -448 +450 @@
                 try {
                         FileInputStream fis = new FileInputStream(cacheFile);
+                        Reader reader = new InputStreamReader(fis, "ISO-8859-1");
                         XStream xs = getXStream();
-                        Object obj = xs.fromXML(fis);
+                        Object obj = xs.fromXML(reader);
                         fis.close();
                         if (obj instanceof PackageManager) {
@@ -456 +459 @@
                         }
                 } catch (XStreamException e) {
+                        e.printStackTrace();
                 } catch (FileNotFoundException e) {
                 } catch (IOException e) {

java/installer2/src/net/oni2/aeinstaller/backend/packages/Type.java

@@ -20 +20 @@
                 this.name = name;
         }
+        
+        /**
+         * XML deserialization constructor
+         */
+        public Type() {}
 
         void addEntry(Package m) {