Changeset 612

Timestamp:

Jan 14, 2013, 7:55:16 PM (12 years ago)

Author:

alloc

Message:

AEI2:

• Moved .NET check to before window initialisation

Location:

AE/installer2/src/net/oni2/aeinstaller

Files:

• AEInstaller.properties (modified) (1 diff)
• AEInstaller2.java (modified) (3 diffs)
• gui/MainWin.java (modified) (2 diffs)
• gui/MainWin.properties (modified) (1 diff)
• gui/MainWin.yml (modified) (1 diff)

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

@@ -1 +1 @@
 appname=AE Installer 2
-appversion=0.75
+appversion=0.76
 
 invalidPath.title=Wrong directory
 invalidPath.text=This program has to be placed in the subfolder Edition/AEInstaller inside a vanilla Oni folder.\nThe full path of the .jar-file has to be:\nOniFolder/Edition/AEInstaller/AEInstaller2.jar
+
+dotNetMissing.title=.NET is not installed
+dotNetMissing.text=.NET, which is required to use this tool, is not installed on this machine.<br>Please download and install it:<br>%1

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

@@ -24 +24 @@
 import net.oni2.aeinstaller.backend.oni.Installer;
 import net.oni2.aeinstaller.backend.oni.OniSplit;
+import net.oni2.aeinstaller.gui.HTMLLinkLabel;
 import net.oni2.aeinstaller.gui.MainWin;
 
@@ -126 +127 @@
                 System.out.println("DownPath:  " + Paths.getDownloadPath());
                 System.out.println("TempPath:  " + Paths.getTempPath());
-                System.out.println("ValidPath: "
-                                + Installer.verifyRunningDirectory());
+                System.out.println("ValidPath: " + Installer.verifyRunningDirectory());
                 System.out.println("Platform:  " + Settings.getPlatform());
                 System.out.println("Architect: " + Settings.getArchitecture());
@@ -141 +141 @@
                                 + SizeFormatter.format(Paths.getInstallerPath()
                                                 .getUsableSpace(), 3));
+
+                if (!OniSplit.isDotNETInstalled()) {
+                        HTMLLinkLabel hll = new HTMLLinkLabel();
+                        String dlUrl = "";
+                        switch (Settings.getPlatform()) {
+                                case WIN:
+                                        switch (Settings.getArchitecture()) {
+                                                case X86:
+                                                        dlUrl = "http://download.microsoft.com/download/c/6/e/c6e88215-0178-4c6c-b5f3-158ff77b1f38/NetFx20SP2_x86.exe";
+                                                        break;
+                                                case AMD64:
+                                                        dlUrl = "http://download.microsoft.com/download/c/6/e/c6e88215-0178-4c6c-b5f3-158ff77b1f38/NetFx20SP2_x64.exe";
+                                                        break;
+                                        }
+                                        break;
+                                default:
+                                        dlUrl = "http://www.go-mono.com/mono-downloads/download.html";
+                        }
+                        hll.setText(basicBundle.getString("dotNetMissing.text").replaceAll(
+                                        "%1", String.format("<a href=\"%s\">%s</a>", dlUrl, dlUrl)));
+                        JOptionPane.showMessageDialog(null, hll,
+                                        basicBundle.getString("dotNetMissing.title"),
+                                        JOptionPane.ERROR_MESSAGE);
+                        return;
+                }
 
                 if (!Installer.verifyRunningDirectory()) {

AE/installer2/src/net/oni2/aeinstaller/gui/MainWin.java

@@ -52 +52 @@
 import net.oni2.aeinstaller.backend.oni.InstallProgressListener;
 import net.oni2.aeinstaller.backend.oni.Installer;
-import net.oni2.aeinstaller.backend.oni.OniSplit;
 import net.oni2.aeinstaller.gui.about.AboutDialog;
 import net.oni2.aeinstaller.gui.downloadwindow.Downloader;
@@ -350 +349 @@
         }
 
-        @SuppressWarnings("unused")
-        private void checkDotNet() {
-                if (!OniSplit.isDotNETInstalled()) {
-                        HTMLLinkLabel hll = new HTMLLinkLabel();
-                        String dlUrl = "";
-                        switch (Settings.getPlatform()) {
-                                case WIN:
-                                        switch (Settings.getArchitecture()) {
-                                                case X86:
-                                                        dlUrl = "http://download.microsoft.com/download/c/6/e/c6e88215-0178-4c6c-b5f3-158ff77b1f38/NetFx20SP2_x86.exe";
-                                                        break;
-                                                case AMD64:
-                                                        dlUrl = "http://download.microsoft.com/download/c/6/e/c6e88215-0178-4c6c-b5f3-158ff77b1f38/NetFx20SP2_x64.exe";
-                                                        break;
-                                        }
-                                        break;
-                                default:
-                                        dlUrl = "http://www.go-mono.com/mono-downloads/download.html";
-                        }
-                        hll.setText(bundle.getString("dotNetMissing.text").replaceAll("%1",
-                                        String.format("<a href=\"%s\">%s</a>", dlUrl, dlUrl)));
-                        JOptionPane.showMessageDialog(this, hll,
-                                        bundle.getString("dotNetMissing.title"),
-                                        JOptionPane.ERROR_MESSAGE);
-                        exit();
-                }
-        }
-
         @DoInBackground(progressMessage = "mandatoryFiles.title", cancelable = false, indeterminateProgress = false)
         private void checkMandatoryFiles(final BackgroundEvent evt) {

AE/installer2/src/net/oni2/aeinstaller/gui/MainWin.properties

@@ -59 +59 @@
 mandatoryToolsInstall.title=Installing mandatory tools
 
-dotNetMissing.title=.NET is not installed
-dotNetMissing.text=.NET, which is required to use this tool, is not installed on this machine.<br>Please download and install it:<br>%1
-

AE/installer2/src/net/oni2/aeinstaller/gui/MainWin.yml

@@ -6 +6 @@
   locationRelativeTo: null
   defaultCloseOperation: doNothingOnClose
-  onWindowOpened: [checkDotNet,execDepotUpdate,checkMandatoryFiles,initialize,checkUpdates,focus]
+  onWindowOpened: [execDepotUpdate,checkMandatoryFiles,initialize,checkUpdates,focus]
   onWindowClosing: [saveLocalData,exit]
   iconImage: img.ae