Changeset 641 for AE/installer2/src/net/oni2/aeinstaller/gui

Timestamp:

Jan 21, 2013, 12:14:52 PM (12 years ago)

Author:

alloc

Message:

AEI2 0.98:

• Reduced number+size of HTTP queries
• Removed "submitter" field
• Added output of dependencies to be selected before continuing

Location:

AE/installer2/src/net/oni2/aeinstaller/gui

Files:

• MainWin.java (modified) (15 diffs)
• MainWin.yml (modified) (3 diffs)
• about/AboutDialog.java (modified) (1 diff)
• settings/SettingsDialog.java (modified) (1 diff)
• toolmanager/ToolManager.java (modified) (4 diffs)
• toolmanager/ToolManager.yml (modified) (2 diffs)

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

@@ -82 +82 @@
         private JMenu mainMenu;
         private JMenu toolsMenu;
-        private TreeSet<JMenuItem> toolsMenuItems = new TreeSet<JMenuItem>();
+        private Vector<JMenuItem> toolsMenuItems = new Vector<JMenuItem>();
 
         private JSplitPane contents;
@@ -94 +94 @@
 
         private JLabel lblTitleVal;
-        private JLabel lblSubmitterVal;
         private JLabel lblCreatorVal;
         private JLabel lblTypesVal;
@@ -106 +105 @@
         private TreeSet<Mod> execUpdates = null;
 
-        private enum EInstallResult {
+        private enum EInstallState {
                 DONE,
+                READY,
+                ABORTED,
                 OFFLINE,
-                INCOMPATIBLE
+                INCOMPATIBLE,
+                CHECKING
         };
 
-        private EInstallResult installDone = EInstallResult.DONE;
+        private EInstallState installState = EInstallState.DONE;
+        private TreeSet<Mod> installMods = null;
 
         /**
@@ -468 +471 @@
         }
 
-        @DoInBackground(progressMessage = "installing.title", cancelable = false, indeterminateProgress = false)
-        private void install(final BackgroundEvent evt) {
+        @SuppressWarnings("unused")
+        private void install() {
                 TreeSet<Mod> mods = new TreeSet<Mod>();
                 mods.addAll(ModManager.getInstance().getMandatoryMods());
                 mods.addAll(tblMods.getSelectedMods());
 
-                boolean instReady = false;
-                installDone = EInstallResult.DONE;
-
-                while (!instReady) {
+                installState = EInstallState.CHECKING;
+
+                while (installState == EInstallState.CHECKING) {
                         TreeSet<Mod> toDownload = new TreeSet<Mod>();
                         for (Mod m : mods) {
@@ -484 +486 @@
                         }
                         if (Settings.getInstance().isOfflineMode()) {
-                                installDone = EInstallResult.OFFLINE;
+                                installState = EInstallState.OFFLINE;
                                 break;
                         }
@@ -491 +493 @@
                                 try {
                                         dl.setVisible(true);
-                                        if (!dl.isFinished())
+                                        if (!dl.isFinished()) {
+                                                installState = EInstallState.ABORTED;
                                                 break;
+                                        }
                                 } finally {
                                         dl.dispose();
@@ -500 +504 @@
                                         .checkDependencies(mods);
                         if (dependencies.size() > 0) {
-                                System.out.println("Unmet dependencies: "
-                                                + dependencies.toString());
+                                int size = 0;
+                                String depsLocalString = "";
+                                String depsDownloadString = "";
                                 for (Mod m : dependencies.keySet()) {
-                                        for (Mod mDep : dependencies.get(m))
-                                                mods.add(mDep);
+                                        for (Mod 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.getString("installDependencies.text"),
+                                                depsLocalString, depsDownloadString,
+                                                SizeFormatter.format(size, 3)), bundle
+                                                .getString("installDependencies.title"),
+                                                JOptionPane.YES_NO_OPTION,
+                                                JOptionPane.INFORMATION_MESSAGE);
+                                if (res == JOptionPane.NO_OPTION) {
+                                        installState = EInstallState.ABORTED;
+                                        break;
                                 }
                         } else {
@@ -510 +544 @@
                                                 .checkIncompabitilites(mods);
                                 if (conflicts.size() > 0) {
-                                        installDone = EInstallResult.INCOMPATIBLE;
+                                        installState = EInstallState.INCOMPATIBLE;
                                         System.err.println("Incompatible mods: "
                                                         + conflicts.toString());
+                                        // TODO: Message window with incompatibilities
                                         break;
                                 } else {
-                                        instReady = true;
-                                }
-                        }
-                }
-
-                if (instReady) {
-                        TreeSet<Mod> actuallyMods = new TreeSet<Mod>();
+                                        installState = EInstallState.READY;
+                                }
+                        }
+                }
+
+                if (installState == EInstallState.READY) {
+                        installMods = new TreeSet<Mod>();
                         TreeSet<Mod> actuallyTools = new TreeSet<Mod>();
 
@@ -528 +563 @@
                                         actuallyTools.add(m);
                                 else
-                                        actuallyMods.add(m);
+                                        installMods.add(m);
                         }
 
@@ -534 +569 @@
                                 Installer.installTools(actuallyTools);
                         }
-
-                        Installer.install(actuallyMods, new InstallProgressListener() {
+                }
+
+        }
+
+        @DoInBackground(progressMessage = "installing.title", cancelable = false, indeterminateProgress = false)
+        private void installExec(final BackgroundEvent evt) {
+                if (installState == EInstallState.READY) {
+                        Installer.install(installMods, new InstallProgressListener() {
                                 @Override
                                 public void installProgressUpdate(int done, int total,
@@ -544 +585 @@
                                 }
                         });
-                        installDone = EInstallResult.DONE;
-                }
+                        installState = EInstallState.DONE;
+                }
+                installMods = null;
         }
 
@@ -551 +593 @@
         private void installDone() {
                 ModManager.getInstance().updateInstalledMods();
-                revertSelection();
-                switch (installDone) {
+                switch (installState) {
                         case DONE:
+                                revertSelection();
                                 JOptionPane.showMessageDialog(this,
                                                 bundle.getString("installDone.text"),
@@ -565 +607 @@
                                                 JOptionPane.WARNING_MESSAGE);
                                 break;
-                        case INCOMPATIBLE:
+                        default:
                                 break;
                 }
@@ -573 +615 @@
         public void modSelectionChanged(ModTable source, Mod m) {
                 lblTitleVal.setText("");
-                lblSubmitterVal.setText("");
                 lblCreatorVal.setText("");
                 lblDescriptionVal.setText("");
@@ -582 +623 @@
                 if (m != null) {
                         lblTitleVal.setText(m.getName());
-                        lblSubmitterVal.setText(m.getSubmitter());
                         lblCreatorVal.setText(m.getCreator());
                         lblDescriptionVal.setText(m.getDescription());

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

@@ -58 +58 @@
                 ModTable(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,installDone])
+            - JButton(name=btnInstall, icon=img.install, text=btnInstall.text, toolTipText=btnInstall.tooltip, onAction=[install,installExec,installDone])
             - JLabel(name=lblDownloadSize, text=lblDownloadSize.text)
             - JLabel(name=lblDownloadSizeVal)
@@ -71 +71 @@
             - JLabel(name=lblTitle, text=lblTitle.text)
             - JLabel(name=lblTitleVal)
-            - JLabel(name=lblSubmitter, text=lblSubmitter.text)
-            - JLabel(name=lblSubmitterVal)
             - JLabel(name=lblCreator, text=lblCreator.text)
             - JLabel(name=lblCreatorVal)
@@ -89 +87 @@
                  [min]             [grow]
                  >lblTitle         lblTitleVal         [min]
-                 >lblSubmitter     lblSubmitterVal     [min]
                  >lblCreator       lblCreatorVal       [min]
                  >lblTypes         lblTypesVal         [min]

AE/installer2/src/net/oni2/aeinstaller/gui/about/AboutDialog.java

@@ -55 +55 @@
                                 .put(ksCtrlW, "close");
                 getRootPane().getActionMap().put("close", closeAction);
+
+                setLocationRelativeTo(null);
         }
 

AE/installer2/src/net/oni2/aeinstaller/gui/settings/SettingsDialog.java

@@ -60 +60 @@
 
                 initValues();
+
+                setLocationRelativeTo(null);
         }
 

AE/installer2/src/net/oni2/aeinstaller/gui/toolmanager/ToolManager.java

@@ -52 +52 @@
 
         private JLabel lblTitleVal;
-        private JLabel lblSubmitterVal;
         private JLabel lblCreatorVal;
         private JLabel lblPlatformVal;
@@ -101 +100 @@
                 icoUninstall = new ImageIcon(getClass().getResource(
                                 SwingJavaBuilder.getConfig().getResource("img.uninstall")));
+                
+                setLocationRelativeTo(null);
         }
 
@@ -147 +148 @@
         public void valueChanged(ListSelectionEvent evt) {
                 lblTitleVal.setText("");
-                lblSubmitterVal.setText("");
                 lblCreatorVal.setText("");
                 lblDescriptionVal.setText("");
@@ -159 +159 @@
                         Mod m = (Mod) lstTools.getSelectedValue();
                         lblTitleVal.setText(m.getName());
-                        lblSubmitterVal.setText(m.getSubmitter());
                         lblCreatorVal.setText(m.getCreator());
                         lblDescriptionVal.setText(m.getDescription());

AE/installer2/src/net/oni2/aeinstaller/gui/toolmanager/ToolManager.yml

@@ -18 +18 @@
             - JLabel(name=lblTitle, text=lblTitle.text)
             - JLabel(name=lblTitleVal)
-            - JLabel(name=lblSubmitter, text=lblSubmitter.text)
-            - JLabel(name=lblSubmitterVal)
             - JLabel(name=lblCreator, text=lblCreator.text)
             - JLabel(name=lblCreatorVal)
@@ -35 +33 @@
                  [min]             [grow]
                  >lblTitle         lblTitleVal         [min]
-                 >lblSubmitter     lblSubmitterVal     [min]
                  >lblCreator       lblCreatorVal       [min]
                  >lblPlatform      lblPlatformVal      [min]