Changeset 669 for AE/installer2

Timestamp:

Feb 10, 2013, 2:36:15 AM (12 years ago)

Author:

alloc

Message:

AEI2 0.99o:

• Fixed bug when having the dep-notification after installation finishes

Location:

AE/installer2/src/net/oni2/aeinstaller

Files:

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

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

@@ -1 +1 @@
 appname=AE Installer 2
-appversion=0.99n
+appversion=0.99o

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

@@ -552 +552 @@
                                         toDownload.add(m);
                         }
+
                         if (toDownload.size() > 0 && Settings.getInstance().isOfflineMode()) {
                                 installState = EInstallState.OFFLINE;
                                 break;
                         }
+
                         if (toDownload.size() > 0) {
                                 Downloader dl = new Downloader(toDownload, installDeps);
@@ -568 +570 @@
                                 }
                         }
+
                         HashMap<Package, HashSet<Package>> dependencies = PackageManager
                                         .getInstance().checkDependencies(mods);
@@ -575 +578 @@
                                 }
 
+                                int size = 0;
+                                String depsLocalString = "";
+                                String depsDownloadString = "";
+                                for (Package m : dependencies.keySet()) {
+                                        for (Package mDep : dependencies.get(m)) {
+                                                if (!mods.contains(mDep)) {
+                                                        mods.add(mDep);
+                                                        if (!mDep.isLocalAvailable()) {
+                                                                size += mDep.getZipSize();
+                                                                if (depsDownloadString.length() > 0)
+                                                                        depsDownloadString += "\n";
+                                                                depsDownloadString += " - " + mDep.getName();
+                                                        } else {
+                                                                if (depsLocalString.length() > 0)
+                                                                        depsLocalString += "\n";
+                                                                depsLocalString += " - " + mDep.getName();
+                                                        }
+                                                }
+                                        }
+                                }
+
+                                if (depsLocalString.length() == 0)
+                                        depsLocalString = bundle
+                                                        .getString("installDependencies.none");
+                                if (depsDownloadString.length() == 0)
+                                        depsDownloadString = bundle
+                                                        .getString("installDependencies.none");
+
                                 if (!Settings.getInstance()
                                                 .get("notifyDepsAfterInstall", false)) {
-                                        int size = 0;
-                                        String depsLocalString = "";
-                                        String depsDownloadString = "";
-                                        for (Package m : dependencies.keySet()) {
-                                                for (Package mDep : dependencies.get(m)) {
-                                                        if (!mods.contains(mDep)) {
-                                                                mods.add(mDep);
-                                                                if (!mDep.isLocalAvailable()) {
-                                                                        size += mDep.getZipSize();
-                                                                        if (depsDownloadString.length() > 0)
-                                                                                depsDownloadString += "\n";
-                                                                        depsDownloadString += " - "
-                                                                                        + mDep.getName();
-                                                                } else {
-                                                                        if (depsLocalString.length() > 0)
-                                                                                depsLocalString += "\n";
-                                                                        depsLocalString += " - " + mDep.getName();
-                                                                }
-                                                        }
-                                                }
-                                        }
-                                        if (depsLocalString.length() == 0)
-                                                depsLocalString = bundle
-                                                                .getString("installDependencies.none");
-                                        if (depsDownloadString.length() == 0)
-                                                depsDownloadString = bundle
-                                                                .getString("installDependencies.none");
-
                                         int res = JOptionPane.showConfirmDialog(this, String
                                                         .format(bundle
@@ -613 +616 @@
                                                         JOptionPane.YES_NO_OPTION,
                                                         JOptionPane.INFORMATION_MESSAGE);
+
                                         if (res == JOptionPane.NO_OPTION) {
                                                 installState = EInstallState.ABORTED;
@@ -665 +669 @@
                         }
                 }
-
         }