Changeset 612 for AE/installer2/src/net/oni2/aeinstaller/gui

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/gui

Files:

• MainWin.java (modified) (2 diffs)
• MainWin.properties (modified) (1 diff)
• MainWin.yml (modified) (1 diff)

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