Changeset 810 for java/installer2/src/net/oni2/aeinstaller/gui/MainWin.java

Timestamp:

Apr 12, 2013, 8:05:40 PM (12 years ago)

Author:

alloc

Message:

AEI2.03:

• Fixes #7
• Fixes regression introduced by fixing #8

File:

• java/installer2/src/net/oni2/aeinstaller/gui/MainWin.java (modified) (2 diffs)

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

@@ -476 +476 @@
                                         p.getName()));
                 b.append("[/code]");
-                
+
                 StringSelection selection = new StringSelection(b.toString());
-            Clipboard clipboard = Toolkit.getDefaultToolkit().getSystemClipboard();
-            clipboard.setContents(selection, selection);
+                Clipboard clipboard = Toolkit.getDefaultToolkit().getSystemClipboard();
+                clipboard.setContents(selection, selection);
         }
 
@@ -894 +894 @@
 
         private void oni(boolean windowed) {
-                try {
-                        OniLauncher.launch(windowed);
-                } catch (FileNotFoundException e) {
+                if (!Paths.getEditionGDF().isDirectory()) {
                         JOptionPane.showMessageDialog(this,
-                                        bundle.getString("oniExeNotFound.text"),
-                                        bundle.getString("oniExeNotFound.title"),
-                                        JOptionPane.ERROR_MESSAGE);
-                        e.printStackTrace();
-                } catch (ERuntimeNotInstalledException e) {
-                        JOptionPane.showMessageDialog(this,
-                                        bundle.getString("wineNotFound.text"),
-                                        bundle.getString("wineNotFound.title"),
-                                        JOptionPane.ERROR_MESSAGE);
-                        e.printStackTrace();
+                                        bundle.getString("notInstalled.text"),
+                                        bundle.getString("notInstalled.title"),
+                                        JOptionPane.WARNING_MESSAGE);
+                } else {
+                        try {
+                                OniLauncher.launch(windowed);
+                        } catch (FileNotFoundException e) {
+                                JOptionPane.showMessageDialog(this,
+                                                bundle.getString("oniExeNotFound.text"),
+                                                bundle.getString("oniExeNotFound.title"),
+                                                JOptionPane.ERROR_MESSAGE);
+                                e.printStackTrace();
+                        } catch (ERuntimeNotInstalledException e) {
+                                JOptionPane.showMessageDialog(this,
+                                                bundle.getString("wineNotFound.text"),
+                                                bundle.getString("wineNotFound.title"),
+                                                JOptionPane.ERROR_MESSAGE);
+                                e.printStackTrace();
+                        }
                 }
         }