Changeset 646 for AE/installer2/src/net/oni2/aeinstaller/backend/mods/download

Timestamp:

Jan 23, 2013, 12:43:13 PM (12 years ago)

Author:

alloc

Message:

AEI2 0.99c:

• Download window: Show which file is currently being downloaded and if it is an automaticly resolved dependency
• Added mandatory packages dialog
• Added option to show automatic resolved dependencies after installation is done instead of interrupting installation process to ask whether to continue
• ToolManager: version number + last change added
• Correct output of download-size in mainwin after installation of mods done

Location:

AE/installer2/src/net/oni2/aeinstaller/backend/mods/download

Files:

• ModDownloader.java (modified) (2 diffs)
• ModDownloaderListener.java (modified) (3 diffs)

AE/installer2/src/net/oni2/aeinstaller/backend/mods/download/ModDownloader.java

@@ -73 +73 @@
                 if ((state == State.RUNNING) && (currentDownload < downloads.size())) {
                         downloads.get(currentDownload).start();
-                }else if (state == State.RUNNING) {
+                } else if (state == State.RUNNING) {
                         state = State.LAST_FILE_DOWNLOADED;
                         notifyListener();
@@ -102 +102 @@
 
         private void notifyListener() {
-                listener.updateStatus(this, state, unpacked, downloads.size(),
-                                downloadedComplete + downloadedCurrent, totalSize,
-                                getTimeElapsed(), getTimeRemaining(), getDownloadSpeed());
+                if (currentDownload < downloads.size()) {
+                        listener.updateStatus(this,
+                                        downloads.get(currentDownload).getMod(), state, unpacked,
+                                        downloads.size(), downloadedComplete + downloadedCurrent,
+                                        totalSize, getTimeElapsed(), getTimeRemaining(),
+                                        getDownloadSpeed());
+                } else {
+                        listener.updateStatus(this, null, state, unpacked,
+                                        downloads.size(), downloadedComplete + downloadedCurrent,
+                                        totalSize, getTimeElapsed(), getTimeRemaining(),
+                                        getDownloadSpeed());
+                }
         }
 

AE/installer2/src/net/oni2/aeinstaller/backend/mods/download/ModDownloaderListener.java

@@ -1 +1 @@
 package net.oni2.aeinstaller.backend.mods.download;
 
+import net.oni2.aeinstaller.backend.mods.Mod;
 import net.oni2.aeinstaller.backend.mods.download.ModDownloader.State;
 
@@ -12 +13 @@
          * @param source
          *            Event source
+         * @param currentDownload
+         *            Currently downloading mod
          * @param state
          *            Current state
@@ -29 +32 @@
          *            Average download speed in B/s
          */
-        public void updateStatus(ModDownloader source, State state, int filesDown,
-                        int filesTotal, int bytesDown, int bytesTotal, int duration,
-                        int remaining, int speed);
+        public void updateStatus(ModDownloader source, Mod currentDownload,
+                        State state, int filesDown, int filesTotal, int bytesDown,
+                        int bytesTotal, int duration, int remaining, int speed);
 }