Changeset 1202

Timestamp:

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

Author:

alloc

Message:

AEI 2.31: Fixes for reading offline package cache

Location:

java

Files:

• ModDepotAccess/src/net/oni2/moddepot/DepotManager.java (modified) (1 diff)
• installer2/.classpath (modified) (2 diffs)
• installer2/src/net/oni2/aeinstaller/AEInstaller.properties (modified) (1 diff)
• installer2/src/net/oni2/aeinstaller/backend/packages/Package.java (modified) (1 diff)
• installer2/src/net/oni2/aeinstaller/backend/packages/PackageManager.java (modified) (3 diffs)
• installer2/src/net/oni2/aeinstaller/backend/packages/Type.java (modified) (1 diff)

java/ModDepotAccess/src/net/oni2/moddepot/DepotManager.java

@@ -219 +219 @@
                         return (code >= 200) && (code <= 299);
                 } catch (IOException e) {
-                        e.printStackTrace();
+                        System.out.println();
+                        System.out.println("Checking connection failed:");
+                        e.printStackTrace();
+                        System.out.println();
                 }
                 return false;

java/installer2/.classpath

@@ -2 +2 @@
 <classpath>
         <classpathentry kind="src" path="src"/>
-        <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+        <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6">
+                <attributes>
+                        <attribute name="module" value="true"/>
+                </attributes>
+        </classpathentry>
         <classpathentry combineaccessrules="false" kind="src" path="/ProgramSettings"/>
         <classpathentry combineaccessrules="false" kind="src" path="/PlatformTools"/>
@@ -27 +31 @@
         <classpathentry combineaccessrules="false" kind="src" path="/UTF8ResourceBundleLoader"/>
         <classpathentry combineaccessrules="false" kind="src" path="/SwingComponents"/>
-        <classpathentry combineaccessrules="false" kind="src" path="/NaturalOrderComparator"/>
         <classpathentry combineaccessrules="false" kind="src" path="/ProxySettings"/>
         <classpathentry kind="lib" path="/_ThirdPartyLibs/javax.mail.jar"/>
+        <classpathentry kind="lib" path="/_ThirdPartyLibs/NaturalOrderComparator.jar"/>
         <classpathentry kind="output" path="bin"/>
 </classpath>

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) {