ViewVC Help

View File | Revision Log | View Changeset | Root Listing

root/Oni2/java/installer2/src/net/oni2/aeinstaller/gui/MainWin.java

Comparing AE/installer2/src/net/oni2/aeinstaller/gui/MainWin.java (file contents):
Revision 656 by alloc, Sat Jan 26 23:56:11 2013 UTC vs.
Revision 657 by alloc, Tue Jan 29 11:43:01 2013 UTC

#	Line 144 | Line 144 | public class MainWin extends JFrame impl
144
145		tblMods.addModSelectionListener(this);
146		tblMods.addDownloadSizeListener(this);
147	<
147	>
148		lblDescriptionVal.setMargin(new Insets(-15, 0, 0, 0));
149		}
150
#	Line 173 | Line 173 | public class MainWin extends JFrame impl
173
174		@DoInBackground(progressMessage = "updateDepot.title", cancelable = false, indeterminateProgress = false)
175		private void execDepotUpdate(final BackgroundEvent evt) {
176	<	if (!Settings.getInstance().isOfflineMode() && !Settings.getInstance().isNoCacheUpdateMode()) {
176	>	if (!Settings.getInstance().isOfflineMode()
177	>	&& !Settings.getInstance().isNoCacheUpdateMode()) {
178		long start = new Date().getTime();
179
180		try {
#	Line 199 | Line 200 | public class MainWin extends JFrame impl
200		|| Settings.getInstance().get("notifyupdates", true)) {
201		if (Settings.getInstance().isOfflineMode()) {
202		if (evtSource != this) {
203	<	JOptionPane.showMessageDialog(this,
204	<	bundle.getString("offlineMode.text"),
205	<	bundle.getString("offlineMode.title"),
203	>	JOptionPane.showMessageDialog(
204	>	this,
205	>	SwingJavaBuilder.getConfig().getResource(
206	>	"offlineMode.text"),
207	>	SwingJavaBuilder.getConfig().getResource(
208	>	"offlineMode.title"),
209		JOptionPane.WARNING_MESSAGE);
210		}
211		} else {
212	<	TreeSet<Package> mods = PackageManager.getInstance().getUpdatableMods();
212	>	TreeSet<Package> mods = PackageManager.getInstance()
213	>	.getUpdatableMods();
214		TreeSet<Package> tools = PackageManager.getInstance()
215		.getUpdatableTools();
216		int size = 0;
#	Line 446 | Line 451 | public class MainWin extends JFrame impl
451		private void revertSelection() {
452		tblMods.revertSelection();
453		}
454	+
455	+	@SuppressWarnings("unused")
456	+	private void unSelectAll() {
457	+	tblMods.unSelectAll();
458	+	}
459
460		@DoInBackground(progressMessage = "checkCorePackages.title", cancelable = false, indeterminateProgress = false)
461		private void checkCorePackages(final BackgroundEvent evt) {
#	Line 481 | Line 491 | public class MainWin extends JFrame impl
491		}
492		}
493		}
494	<	evt.setProgressMessage(bundle
495	<	.getString("coreToolsInstall.title"));
486	<	Installer
487	<	.installTools(PackageManager.getInstance().getCoreTools());
494	>	evt.setProgressMessage(bundle.getString("coreToolsInstall.title"));
495	>	Installer.installTools(PackageManager.getInstance().getCoreTools());
496		}
497		}
498
#	Line 519 | Line 527 | public class MainWin extends JFrame impl
527		if (!m.isLocalAvailable())
528		toDownload.add(m);
529		}
530	<	if (Settings.getInstance().isOfflineMode()) {
530	>	if (toDownload.size() > 0 && Settings.getInstance().isOfflineMode()) {
531		installState = EInstallState.OFFLINE;
532		break;
533		}
#	Line 535 | Line 543 | public class MainWin extends JFrame impl
543		dl.dispose();
544		}
545		}
546	<	HashMap<Package, HashSet<Package>> dependencies = PackageManager.getInstance()
547	<	.checkDependencies(mods);
546	>	HashMap<Package, HashSet<Package>> dependencies = PackageManager
547	>	.getInstance().checkDependencies(mods);
548		if (dependencies.size() > 0) {
549		for (HashSet<Package> hm : dependencies.values()) {
550		installDeps.addAll(hm);
#	Line 680 | Line 688 | public class MainWin extends JFrame impl
688		}
689		break;
690		case OFFLINE:
691	<	JOptionPane.showMessageDialog(this,
692	<	bundle.getString("offlineMode.text"),
693	<	bundle.getString("offlineMode.title"),
691	>	JOptionPane.showMessageDialog(
692	>	this,
693	>	SwingJavaBuilder.getConfig().getResource(
694	>	"offlineMode.text"),
695	>	SwingJavaBuilder.getConfig().getResource(
696	>	"offlineMode.title"),
697		JOptionPane.WARNING_MESSAGE);
698		break;
699		default:

Diff Legend

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