Changeset 730

Timestamp:

Mar 21, 2013, 6:25:39 PM (12 years ago)

Author:

alloc

Message:

AEI2 0.99w:

• Self-update invocation

Location:

java

Files:

• ProgramSettings/.classpath (modified) (1 diff)
• installer2/.classpath (modified) (1 diff)
• installer2/locales/net/oni2/aeinstaller/localization/Global_de.properties (modified) (1 diff)
• installer2/src/net/oni2/aeinstaller/AEInstaller.properties (modified) (1 diff)
• installer2/src/net/oni2/aeinstaller/AEInstaller2.java (modified) (5 diffs)
• installer2/src/net/oni2/aeinstaller/backend/Paths.java (modified) (2 diffs)
• installer2/src/net/oni2/aeinstaller/localization/Global.properties (modified) (1 diff)

java/ProgramSettings/.classpath

@@ -3 +3 @@
         <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="lib" path="/ThirdPartyLibs/xstream-1.4.3.jar"/>
+        <classpathentry kind="lib" path="/_ThirdPartyLibs/xstream-1.4.3.jar"/>
         <classpathentry kind="output" path="bin"/>
 </classpath>

java/installer2/.classpath

@@ -3 +3 @@
         <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="lib" path="/home/ci/Development/Oni/_Libraries/swingbuilder/betterbeansbinding-core-1.3.0.jar"/>
-        <classpathentry kind="lib" path="/home/ci/Development/Oni/_Libraries/swingbuilder/betterbeansbinding-el-1.3.0.jar"/>
-        <classpathentry kind="lib" path="/home/ci/Development/Oni/_Libraries/swingbuilder/betterbeansbinding-swingbinding-1.3.0.jar"/>
-        <classpathentry kind="lib" path="/home/ci/Development/Oni/_Libraries/swingbuilder/commons-lang-2.4.jar"/>
-        <classpathentry kind="lib" path="/home/ci/Development/Oni/_Libraries/swingbuilder/javabuilder-core-1.1.0.jar"/>
-        <classpathentry kind="lib" path="/home/ci/Development/Oni/_Libraries/swingbuilder/javabuilder-swing-1.1.0.jar"/>
-        <classpathentry kind="lib" path="/home/ci/Development/Oni/_Libraries/swingbuilder/jsr305-1.3.7.jar"/>
-        <classpathentry kind="lib" path="/home/ci/Development/Oni/_Libraries/swingbuilder/miglayout-3.7.1.jar"/>
-        <classpathentry kind="lib" path="/home/ci/Development/Oni/_Libraries/swingbuilder/slf4j-api-1.6.1.jar"/>
-        <classpathentry kind="lib" path="/home/ci/Development/Oni/_Libraries/swingbuilder/slf4j-simple-1.6.1.jar"/>
-        <classpathentry kind="lib" path="/home/ci/Development/Oni/_Libraries/swingbuilder/snakeyaml-1.7.jar"/>
-        <classpathentry kind="lib" path="/home/ci/Development/Oni/_Libraries/JSON-java.jar"/>
-        <classpathentry kind="lib" path="/home/ci/Development/Oni/_Libraries/httpclient/httpclient-4.2.2.jar"/>
-        <classpathentry kind="lib" path="/home/ci/Development/Oni/_Libraries/httpclient/httpcore-4.2.2.jar"/>
-        <classpathentry kind="lib" path="/home/ci/Development/Oni/_Libraries/httpclient/commons-logging-1.1.1.jar"/>
-        <classpathentry kind="lib" path="/home/ci/Development/Oni/_Libraries/xstream-1.4.3.jar"/>
-        <classpathentry kind="lib" path="/home/ci/Development/Oni/_Libraries/macify.jar"/>
-        <classpathentry kind="lib" path="/home/ci/Development/Oni/_Libraries/commons-io-2.4.jar">
-                <attributes>
-                        <attribute name="javadoc_location" value="jar:platform:/resource/OniJavaLibraries/commons-io-2.4-javadoc.jar!/"/>
-                </attributes>
-        </classpathentry>
         <classpathentry combineaccessrules="false" kind="src" path="/ProgramSettings"/>
         <classpathentry combineaccessrules="false" kind="src" path="/PlatformTools"/>
+        <classpathentry kind="lib" path="/_ThirdPartyLibs/httpclient/commons-logging-1.1.1.jar"/>
+        <classpathentry kind="lib" path="/_ThirdPartyLibs/httpclient/httpclient-4.2.2.jar"/>
+        <classpathentry kind="lib" path="/_ThirdPartyLibs/httpclient/httpcore-4.2.2.jar"/>
+        <classpathentry kind="lib" path="/_ThirdPartyLibs/swingbuilder/betterbeansbinding-core-1.3.0.jar"/>
+        <classpathentry kind="lib" path="/_ThirdPartyLibs/swingbuilder/betterbeansbinding-el-1.3.0.jar"/>
+        <classpathentry kind="lib" path="/_ThirdPartyLibs/swingbuilder/betterbeansbinding-swingbinding-1.3.0.jar"/>
+        <classpathentry kind="lib" path="/_ThirdPartyLibs/swingbuilder/commons-lang-2.4.jar"/>
+        <classpathentry kind="lib" path="/_ThirdPartyLibs/swingbuilder/javabuilder-core-1.1.0.jar"/>
+        <classpathentry kind="lib" path="/_ThirdPartyLibs/swingbuilder/javabuilder-swing-1.1.0.jar"/>
+        <classpathentry kind="lib" path="/_ThirdPartyLibs/swingbuilder/jsr305-1.3.7.jar"/>
+        <classpathentry kind="lib" path="/_ThirdPartyLibs/swingbuilder/miglayout-3.7.1.jar"/>
+        <classpathentry kind="lib" path="/_ThirdPartyLibs/swingbuilder/slf4j-api-1.6.1.jar"/>
+        <classpathentry kind="lib" path="/_ThirdPartyLibs/swingbuilder/slf4j-simple-1.6.1.jar"/>
+        <classpathentry kind="lib" path="/_ThirdPartyLibs/swingbuilder/snakeyaml-1.7.jar"/>
+        <classpathentry kind="lib" path="/_ThirdPartyLibs/commons-io-2.4.jar"/>
+        <classpathentry kind="lib" path="/_ThirdPartyLibs/JSON-java.jar"/>
+        <classpathentry kind="lib" path="/_ThirdPartyLibs/macify.jar"/>
+        <classpathentry kind="lib" path="/_ThirdPartyLibs/xstream-1.4.3.jar"/>
+        <classpathentry combineaccessrules="false" kind="src" path="/SVNAccess"/>
         <classpathentry kind="output" path="bin"/>
 </classpath>

java/installer2/locales/net/oni2/aeinstaller/localization/Global_de.properties

@@ -10 +10 @@
 offlineModeStartup.title=Offline-Modus
 offlineModeStartup.text=Es konnte keine Verbindung zum ModDepot hergestellt werden.\nAEI wird im Offline-Modus ausgeführt.\nAktualisierungen oder Downloads sind nicht möglich.
+
+aeiUpdateAvailable.title=Aktualisierung verfügbar!
+aeiUpdateAvailable.text=Eine Aktualisierung für den AEInstaller ist verfügbar.\nBitte jetzt mit einem Klick auf Ja updaten.

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

@@ -1 +1 @@
 appname=AE Installer 2
-appversion=0.99v
+appversion=0.99w

java/installer2/src/net/oni2/aeinstaller/AEInstaller2.java

@@ -32 +32 @@
 import net.oni2.platformtools.PlatformInformation;
 import net.oni2.platformtools.PlatformInformation.Platform;
+import net.oni2.platformtools.applicationinvoker.ApplicationInvoker;
 import net.oni2.platformtools.applicationinvoker.DotNet;
+import net.oni2.platformtools.applicationinvoker.EExeType;
+import net.oni2.svnaccess.SVN;
 
 import org.javabuilders.swing.SwingJavaBuilder;
@@ -64 +67 @@
                 }
         }
-        
+
         private static void initBundles() {
-                File localesDir = CaseInsensitiveFile.getCaseInsensitiveFile(Paths.getInstallerPath(), "locales");
+                File localesDir = CaseInsensitiveFile.getCaseInsensitiveFile(
+                                Paths.getInstallerPath(), "locales");
                 if (localesDir.isDirectory())
                         addClassPath(localesDir);
@@ -121 +125 @@
                         }
                 }
-                
+
                 initBundles();
 
@@ -173 +177 @@
                 System.out.println("ValidPath: " + Installer.verifyRunningDirectory());
                 System.out.println("Platform:  " + PlatformInformation.getPlatform());
-                System.out.println("Architect: " + PlatformInformation.getArchitecture());
+                System.out.println("Architect: "
+                                + PlatformInformation.getArchitecture());
                 System.out.println(".NET:      " + DotNet.isInstalled());
                 System.out.println("OniSplit:  " + OniSplit.isOniSplitInstalled());
@@ -241 +246 @@
                 SettingsManager.getInstance().setOfflineMode(offline);
 
+                if (!offline) {
+                        SVN svn = new SVN();
+                        try {
+                                int x = svn.checkSVN("http://svn.aei.oni2.net",
+                                                new File(Paths.getPrefsPath(), "bin"));
+                                if (x > 0) {
+                                        // Update available
+                                        int res = JOptionPane.showConfirmDialog(null,
+                                                        globalBundle.getString("aeiUpdateAvailable.text"),
+                                                        globalBundle.getString("aeiUpdateAvailable.title"),
+                                                        JOptionPane.YES_NO_OPTION,
+                                                        JOptionPane.INFORMATION_MESSAGE);
+                                        if (res == JOptionPane.YES_OPTION) {
+                                                File updater = new File(Paths.getInstallerPath(),
+                                                                "AEInstaller2Updater.jar");
+                                                ApplicationInvoker.execute(EExeType.JAR, null, updater,
+                                                                null);
+                                                return;
+                                        }
+                                } else if (x == 0) {
+                                        // Up to date
+                                } else if (x < 0) {
+                                        // No WC at given path
+                                }
+                        } catch (Exception e) {
+                                e.printStackTrace();
+                        }
+                }
+
                 SwingUtilities.invokeLater(new Runnable() {
                         public void run() {

java/installer2/src/net/oni2/aeinstaller/backend/Paths.java

@@ -36 +36 @@
                         return new File(wd);
                 } else {
-                        String jarPath = SettingsManager.class.getProtectionDomain()
+                        String jarPath = Paths.class.getProtectionDomain()
                                         .getCodeSource().getLocation().getPath();
                         String decodedPath = null;
@@ -44 +44 @@
                                 e.printStackTrace();
                         }
-                        return new File(decodedPath).getParentFile();
+                        return new File(decodedPath).getParentFile().getParentFile();
                 }
         }

java/installer2/src/net/oni2/aeinstaller/localization/Global.properties

@@ -10 +10 @@
 offlineModeStartup.title=Offline mode
 offlineModeStartup.text=Connection to the ModDepot could not be established.\nAEI will run in offline mode.\nUpdates or installation of mods not already downloaded will not be possible.
+
+aeiUpdateAvailable.title=Update available!
+aeiUpdateAvailable.text=An update for the AEInstaller is available.\nPlease update now by selecting Yes.