Changeset 617

Timestamp:

Jan 15, 2013, 2:20:48 AM (12 years ago)

Author:

alloc

Message:

AEI2:

• Fixed file-menu problem on MacOS

Location:

AE/installer2/src/net/oni2/aeinstaller

Files:

• AEInstaller.properties (modified) (1 diff)
• gui/MainWin.java (modified) (4 diffs)
• gui/MainWin.yml (modified) (1 diff)

AE/installer2/src/net/oni2/aeinstaller/AEInstaller.properties

@@ -1 +1 @@
 appname=AE Installer 2
-appversion=0.78
+appversion=0.79
 
 invalidPath.title=Wrong directory

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

@@ -388 +388 @@
 
         @DoInBackground(progressMessage = "installing.title", cancelable = false, indeterminateProgress = false)
-        private void install(final BackgroundEvent evt) {
+        private boolean install(final BackgroundEvent evt) {
                 TreeSet<Mod> mods = new TreeSet<Mod>();
                 mods.addAll(ModManager.getInstance().getMandatoryMods());
@@ -405 +405 @@
                                 System.out.println("Download files: " + toDownload.toString());
                                 Downloader dl = new Downloader(toDownload);
-                                dl.setVisible(true);
-                                if (!dl.isFinished())
-                                        break;
+                                try {
+                                        dl.setVisible(true);
+                                        if (!dl.isFinished())
+                                                break;
+                                } finally {
+                                        dl.dispose();
+                                }
                         }
                         HashMap<Mod, HashSet<Mod>> dependencies = ModManager.getInstance()
@@ -430 +434 @@
                         }
                 }
-
+                
                 if (instReady) {
                         System.out.println("Install mods: " + mods.toString());
@@ -443 +447 @@
                                 }
                         });
-
-                        JOptionPane.showMessageDialog(this,
-                                        bundle.getString("installDone.text"),
-                                        bundle.getString("installDone.title"),
-                                        JOptionPane.INFORMATION_MESSAGE);
-                }
+                        return true;
+                }
+                return false;
+        }
+        
+        @SuppressWarnings("unused")
+        private void installDone() {
+                JOptionPane.showMessageDialog(this,
+                                bundle.getString("installDone.text"),
+                                bundle.getString("installDone.title"),
+                                JOptionPane.INFORMATION_MESSAGE);
         }
 

AE/installer2/src/net/oni2/aeinstaller/gui/MainWin.yml

@@ -49 +49 @@
                 JTable(name=tblMods, visible=false)
             - JButton(name=btnRevertSelection, icon=img.undo16, text=btnRevertSelection.text, toolTipText=btnRevertSelection.tooltip, onAction=[revertSelection])
-            - JButton(name=btnInstall, icon=img.install, text=btnInstall.text, toolTipText=btnInstall.tooltip, onAction=[install])
+            - JButton(name=btnInstall, icon=img.install, text=btnInstall.text, toolTipText=btnInstall.tooltip, onAction=[install,installDone])
             - JLabel(name=lblDownloadSize, text=lblDownloadSize.text)
             - JLabel(name=lblDownloadSizeVal)