ViewVC Help

View File | Revision Log | View Changeset | Root Listing

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

Comparing java/installer2/src/net/oni2/aeinstaller/gui/MainWin.java (file contents):
Revision 809 by alloc, Fri Apr 12 17:37:24 2013 UTC vs.
Revision 810 by alloc, Fri Apr 12 18:05:40 2013 UTC

#	Line 475 | Line 475 | public class MainWin extends JFrame impl
475		b.append(String.format("%s %s%n", p.getPackageNumberString(),
476		p.getName()));
477		b.append("[/code]");
478	<
478	>
479		StringSelection selection = new StringSelection(b.toString());
480	<	Clipboard clipboard = Toolkit.getDefaultToolkit().getSystemClipboard();
481	<	clipboard.setContents(selection, selection);
480	>	Clipboard clipboard = Toolkit.getDefaultToolkit().getSystemClipboard();
481	>	clipboard.setContents(selection, selection);
482		}
483
484		@SuppressWarnings("unused")
#	Line 893 | Line 893 | public class MainWin extends JFrame impl
893		}
894
895		private void oni(boolean windowed) {
896	<	try {
897	<	OniLauncher.launch(windowed);
898	<	} catch (FileNotFoundException e) {
899	<	JOptionPane.showMessageDialog(this,
900	<	bundle.getString("oniExeNotFound.text"),
901	<	bundle.getString("oniExeNotFound.title"),
902	<	JOptionPane.ERROR_MESSAGE);
903	<	e.printStackTrace();
904	<	} catch (ERuntimeNotInstalledException e) {
896	>	if (!Paths.getEditionGDF().isDirectory()) {
897		JOptionPane.showMessageDialog(this,
898	<	bundle.getString("wineNotFound.text"),
899	<	bundle.getString("wineNotFound.title"),
900	<	JOptionPane.ERROR_MESSAGE);
901	<	e.printStackTrace();
898	>	bundle.getString("notInstalled.text"),
899	>	bundle.getString("notInstalled.title"),
900	>	JOptionPane.WARNING_MESSAGE);
901	>	} else {
902	>	try {
903	>	OniLauncher.launch(windowed);
904	>	} catch (FileNotFoundException e) {
905	>	JOptionPane.showMessageDialog(this,
906	>	bundle.getString("oniExeNotFound.text"),
907	>	bundle.getString("oniExeNotFound.title"),
908	>	JOptionPane.ERROR_MESSAGE);
909	>	e.printStackTrace();
910	>	} catch (ERuntimeNotInstalledException e) {
911	>	JOptionPane.showMessageDialog(this,
912	>	bundle.getString("wineNotFound.text"),
913	>	bundle.getString("wineNotFound.title"),
914	>	JOptionPane.ERROR_MESSAGE);
915	>	e.printStackTrace();
916	>	}
917		}
918		}
919

Diff Legend

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