ViewVC Help

View File | Revision Log | View Changeset | Root Listing

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

Comparing AE/installer2/src/net/oni2/aeinstaller/AEInstaller2.java (file contents):
Revision 637 by alloc, Sun Jan 20 11:28:12 2013 UTC vs.
Revision 640 by alloc, Sun Jan 20 18:02:43 2013 UTC

#	Line 39 | Line 39 | public class AEInstaller2 {
39		.getBundle("net.oni2.aeinstaller.Images");
40		private static ResourceBundle basicBundle = ResourceBundle
41		.getBundle("net.oni2.aeinstaller.AEInstaller");
42	<	private static ResourceBundle startupBundle = ResourceBundle
43	<	.getBundle("net.oni2.aeinstaller.localization.Startup");
42	>	private static ResourceBundle globalBundle = ResourceBundle
43	>	.getBundle("net.oni2.aeinstaller.localization.Global");
44
45		private static Application app = null;
46
#	Line 92 | Line 92 | public class AEInstaller2 {
92
93		SwingJavaBuilder.getConfig().addResourceBundle(imagesBundle);
94		SwingJavaBuilder.getConfig().addResourceBundle(basicBundle);
95	<	SwingJavaBuilder.getConfig().addResourceBundle(startupBundle);
95	>	SwingJavaBuilder.getConfig().addResourceBundle(globalBundle);
96		SwingJavaBuilder.getConfig().setMarkInvalidResourceBundleKeys(true);
97		SwingJavaBuilder.getConfig().addType("JToolBarSeparator",
98		JToolBar.Separator.class);
#	Line 163 | Line 163 | public class AEInstaller2 {
163		default:
164		dlUrl = "http://www.go-mono.com/mono-downloads/download.html";
165		}
166	<	hll.setText(startupBundle
166	>	hll.setText(globalBundle
167		.getString("dotNetMissing.text")
168		.replaceAll(
169		"%1",
170		String.format("<a href=\"%s\">%s</a>", dlUrl, dlUrl)));
171		JOptionPane.showMessageDialog(null, hll,
172	<	startupBundle.getString("dotNetMissing.title"),
172	>	globalBundle.getString("dotNetMissing.title"),
173		JOptionPane.ERROR_MESSAGE);
174		return;
175		}
176
177		if (!Installer.verifyRunningDirectory()) {
178		JOptionPane.showMessageDialog(null,
179	<	startupBundle.getString("invalidPath.text"),
180	<	startupBundle.getString("invalidPath.title"),
179	>	globalBundle.getString("invalidPath.text"),
180	>	globalBundle.getString("invalidPath.title"),
181		JOptionPane.ERROR_MESSAGE);
182		if (!Settings.isDebug()) {
183		return;
#	Line 187 | Line 187 | public class AEInstaller2 {
187		boolean offline = !DepotManager.getInstance().checkConnection();
188		if (offline) {
189		JOptionPane.showMessageDialog(null,
190	<	startupBundle.getString("offlineMode.text"),
191	<	startupBundle.getString("offlineMode.title"),
190	>	globalBundle.getString("offlineMode.text"),
191	>	globalBundle.getString("offlineMode.title"),
192		JOptionPane.INFORMATION_MESSAGE);
193		}
194		Settings.getInstance().setOfflineMode(offline);

Diff Legend

–	Removed lines
+	Added lines
<	Changed lines (old)
>	Changed lines (new)