Changeset 612 for AE/installer2/src
- Timestamp:
- Jan 14, 2013, 7:55:16 PM (12 years ago)
- Location:
- AE/installer2/src/net/oni2/aeinstaller
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
AE/installer2/src/net/oni2/aeinstaller/AEInstaller.properties
r608 r612 1 1 appname=AE Installer 2 2 appversion=0.7 52 appversion=0.76 3 3 4 4 invalidPath.title=Wrong directory 5 5 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 6 7 dotNetMissing.title=.NET is not installed 8 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
r603 r612 24 24 import net.oni2.aeinstaller.backend.oni.Installer; 25 25 import net.oni2.aeinstaller.backend.oni.OniSplit; 26 import net.oni2.aeinstaller.gui.HTMLLinkLabel; 26 27 import net.oni2.aeinstaller.gui.MainWin; 27 28 … … 126 127 System.out.println("DownPath: " + Paths.getDownloadPath()); 127 128 System.out.println("TempPath: " + Paths.getTempPath()); 128 System.out.println("ValidPath: " 129 + Installer.verifyRunningDirectory()); 129 System.out.println("ValidPath: " + Installer.verifyRunningDirectory()); 130 130 System.out.println("Platform: " + Settings.getPlatform()); 131 131 System.out.println("Architect: " + Settings.getArchitecture()); … … 141 141 + SizeFormatter.format(Paths.getInstallerPath() 142 142 .getUsableSpace(), 3)); 143 144 if (!OniSplit.isDotNETInstalled()) { 145 HTMLLinkLabel hll = new HTMLLinkLabel(); 146 String dlUrl = ""; 147 switch (Settings.getPlatform()) { 148 case WIN: 149 switch (Settings.getArchitecture()) { 150 case X86: 151 dlUrl = "http://download.microsoft.com/download/c/6/e/c6e88215-0178-4c6c-b5f3-158ff77b1f38/NetFx20SP2_x86.exe"; 152 break; 153 case AMD64: 154 dlUrl = "http://download.microsoft.com/download/c/6/e/c6e88215-0178-4c6c-b5f3-158ff77b1f38/NetFx20SP2_x64.exe"; 155 break; 156 } 157 break; 158 default: 159 dlUrl = "http://www.go-mono.com/mono-downloads/download.html"; 160 } 161 hll.setText(basicBundle.getString("dotNetMissing.text").replaceAll( 162 "%1", String.format("<a href=\"%s\">%s</a>", dlUrl, dlUrl))); 163 JOptionPane.showMessageDialog(null, hll, 164 basicBundle.getString("dotNetMissing.title"), 165 JOptionPane.ERROR_MESSAGE); 166 return; 167 } 143 168 144 169 if (!Installer.verifyRunningDirectory()) { -
AE/installer2/src/net/oni2/aeinstaller/gui/MainWin.java
r611 r612 52 52 import net.oni2.aeinstaller.backend.oni.InstallProgressListener; 53 53 import net.oni2.aeinstaller.backend.oni.Installer; 54 import net.oni2.aeinstaller.backend.oni.OniSplit;55 54 import net.oni2.aeinstaller.gui.about.AboutDialog; 56 55 import net.oni2.aeinstaller.gui.downloadwindow.Downloader; … … 350 349 } 351 350 352 @SuppressWarnings("unused")353 private void checkDotNet() {354 if (!OniSplit.isDotNETInstalled()) {355 HTMLLinkLabel hll = new HTMLLinkLabel();356 String dlUrl = "";357 switch (Settings.getPlatform()) {358 case WIN:359 switch (Settings.getArchitecture()) {360 case X86:361 dlUrl = "http://download.microsoft.com/download/c/6/e/c6e88215-0178-4c6c-b5f3-158ff77b1f38/NetFx20SP2_x86.exe";362 break;363 case AMD64:364 dlUrl = "http://download.microsoft.com/download/c/6/e/c6e88215-0178-4c6c-b5f3-158ff77b1f38/NetFx20SP2_x64.exe";365 break;366 }367 break;368 default:369 dlUrl = "http://www.go-mono.com/mono-downloads/download.html";370 }371 hll.setText(bundle.getString("dotNetMissing.text").replaceAll("%1",372 String.format("<a href=\"%s\">%s</a>", dlUrl, dlUrl)));373 JOptionPane.showMessageDialog(this, hll,374 bundle.getString("dotNetMissing.title"),375 JOptionPane.ERROR_MESSAGE);376 exit();377 }378 }379 380 351 @DoInBackground(progressMessage = "mandatoryFiles.title", cancelable = false, indeterminateProgress = false) 381 352 private void checkMandatoryFiles(final BackgroundEvent evt) { -
AE/installer2/src/net/oni2/aeinstaller/gui/MainWin.properties
r611 r612 59 59 mandatoryToolsInstall.title=Installing mandatory tools 60 60 61 dotNetMissing.title=.NET is not installed62 dotNetMissing.text=.NET, which is required to use this tool, is not installed on this machine.<br>Please download and install it:<br>%163 -
AE/installer2/src/net/oni2/aeinstaller/gui/MainWin.yml
r611 r612 6 6 locationRelativeTo: null 7 7 defaultCloseOperation: doNothingOnClose 8 onWindowOpened: [ checkDotNet,execDepotUpdate,checkMandatoryFiles,initialize,checkUpdates,focus]8 onWindowOpened: [execDepotUpdate,checkMandatoryFiles,initialize,checkUpdates,focus] 9 9 onWindowClosing: [saveLocalData,exit] 10 10 iconImage: img.ae
Note:
See TracChangeset
for help on using the changeset viewer.