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

Timestamp:

Apr 1, 2013, 2:13:33 PM (12 years ago)

Author:

alloc

Message:

AEI2.00:

• Core package download in download window

File:

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

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

@@ -54 +54 @@
 import net.oni2.aeinstaller.backend.packages.PackageManager;
 import net.oni2.aeinstaller.backend.packages.Type;
-import net.oni2.aeinstaller.backend.packages.download.ModDownloader;
-import net.oni2.aeinstaller.backend.packages.download.ModDownloader.State;
-import net.oni2.aeinstaller.backend.packages.download.ModDownloaderListener;
 import net.oni2.aeinstaller.gui.about.AboutDialog;
 import net.oni2.aeinstaller.gui.corepackages.CorePackagesDialog;
@@ -357 +354 @@
         private void doUpdate() {
                 if (execUpdates != null && execUpdates.size() > 0) {
-                        Downloader dl = new Downloader(execUpdates, null);
+                        Downloader dl = new Downloader(execUpdates, null, false);
                         try {
                                 dl.setVisible(true);
@@ -504 +501 @@
                                                 try {
                                                         ApplicationInvoker.execute(m.getExeType(),
-                                                                        m.getWorkingDir(), m.getExeFile(), null, false);
+                                                                        m.getWorkingDir(), m.getExeFile(), null,
+                                                                        false);
                                                 } catch (ERuntimeNotInstalledException e) {
                                                         JOptionPane.showMessageDialog(null,
@@ -547 +545 @@
         }
 
-        @DoInBackground(progressMessage = "checkCorePackages.title", cancelable = false, indeterminateProgress = false)
-        private void checkCorePackages(final BackgroundEvent evt) {
+        @SuppressWarnings("unused")
+        private void checkCorePackages() {
                 if (!SettingsManager.getInstance().isOfflineMode()) {
                         for (Package m : PackageManager.getInstance().getCoreTools()) {
@@ -561 +559 @@
                         }
                         if (execCoreUpdates.size() > 0) {
-                                ModDownloader m = new ModDownloader(execCoreUpdates,
-                                                new ModDownloaderListener() {
-                                                        @Override
-                                                        public void updateStatus(ModDownloader source,
-                                                                        Package currentDownload, State state,
-                                                                        int filesDown, int filesTotal,
-                                                                        int bytesDown, int bytesTotal,
-                                                                        int duration, int remaining, int speed) {
-                                                                evt.setProgressEnd(filesTotal);
-                                                                evt.setProgressValue(filesDown);
-                                                        }
-                                                });
-                                while (!m.isFinished()) {
-                                        try {
-                                                Thread.sleep(10);
-                                        } catch (InterruptedException e) {
-                                                e.printStackTrace();
-                                        }
-                                }
-                        }
-                        evt.setProgressMessage(bundle.getString("coreToolsInstall.title"));
+                                Downloader dl = new Downloader(execCoreUpdates, null, true);
+                                try {
+                                        dl.setVisible(true);
+                                } finally {
+                                        dl.dispose();
+                                }
+                        }
                         ToolsManager.installTools(PackageManager.getInstance()
                                         .getCoreTools(), false);
@@ -626 +610 @@
 
                         if (toDownload.size() > 0) {
-                                Downloader dl = new Downloader(toDownload, installDeps);
+                                Downloader dl = new Downloader(toDownload, installDeps, false);
                                 try {
                                         dl.setVisible(true);