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 628 by alloc, Fri Jan 18 10:58:49 2013 UTC vs.
Revision 629 by alloc, Fri Jan 18 11:17:17 2013 UTC

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

Diff Legend

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