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

Timestamp:

Jan 12, 2013, 11:48:33 PM (12 years ago)

Author:

alloc

Message:

AEI2: Added load/save config

Location:

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

Files:

• MainWin.java (modified) (7 diffs)
• MainWin.properties (modified) (1 diff)
• modtable/ModTableModel.java (modified) (4 diffs)

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

@@ -1 +1 @@
 package net.oni2.aeinstaller.gui;
 
+import java.io.File;
 import java.util.ArrayList;
 import java.util.List;
@@ -10 +11 @@
 import javax.swing.JComboBox;
 import javax.swing.JComponent;
+import javax.swing.JFileChooser;
 import javax.swing.JFrame;
 import javax.swing.JLabel;
@@ -22 +24 @@
 import javax.swing.event.ListSelectionEvent;
 import javax.swing.event.ListSelectionListener;
+import javax.swing.filechooser.FileFilter;
 import javax.swing.table.TableRowSorter;
 
+import net.oni2.aeinstaller.backend.Paths;
 import net.oni2.aeinstaller.backend.Settings;
 import net.oni2.aeinstaller.backend.Settings.Platform;
@@ -32 +36 @@
 import net.oni2.aeinstaller.backend.mods.ModManager;
 import net.oni2.aeinstaller.backend.mods.Type;
+import net.oni2.aeinstaller.backend.mods.download.ModDownloader;
+import net.oni2.aeinstaller.backend.mods.download.ModDownloader.State;
+import net.oni2.aeinstaller.backend.mods.download.ModDownloaderListener;
 import net.oni2.aeinstaller.backend.oni.InstallProgressListener;
 import net.oni2.aeinstaller.backend.oni.Installer;
@@ -222 +229 @@
         }
 
+        private JFileChooser getConfigOpenSaveDialog(boolean save) {
+                JFileChooser fc = new JFileChooser();
+                fc.setCurrentDirectory(Paths.getEditionBasePath());
+                if (save)
+                        fc.setDialogType(JFileChooser.SAVE_DIALOG);
+                else
+                        fc.setDialogType(JFileChooser.OPEN_DIALOG);
+                fc.setFileSelectionMode(JFileChooser.FILES_ONLY);
+                fc.setFileFilter(new FileFilter() {
+                        @Override
+                        public String getDescription() {
+                                return "XML files";
+                        }
+
+                        @Override
+                        public boolean accept(File arg0) {
+                                return (arg0.isDirectory())
+                                                || (arg0.getName().toLowerCase().endsWith(".xml"));
+                        }
+                });
+                fc.setMultiSelectionEnabled(false);
+                return fc;
+        }
+
         @SuppressWarnings("unused")
         private void loadConfig() {
-                // TODO method stub
-                JOptionPane.showMessageDialog(this, "loadConfig", "todo",
-                                JOptionPane.INFORMATION_MESSAGE);
+                JFileChooser fc = getConfigOpenSaveDialog(false);
+                int res = fc.showOpenDialog(this);
+                if (res == JFileChooser.APPROVE_OPTION) {
+                        if (fc.getSelectedFile().exists())
+                                model.reloadSelection(fc.getSelectedFile());
+                }
         }
 
         @SuppressWarnings("unused")
         private void saveConfig() {
-                // TODO method stub
-                JOptionPane.showMessageDialog(this, "saveConfig", "todo",
-                                JOptionPane.INFORMATION_MESSAGE);
+                JFileChooser fc = getConfigOpenSaveDialog(true);
+                int res = fc.showSaveDialog(this);
+                if (res == JFileChooser.APPROVE_OPTION) {
+                        File f = fc.getSelectedFile();
+                        if (!f.getName().endsWith(".xml"))
+                                f = new File(f.getParentFile(), f.getName() + ".xml");
+                        ModManager.getInstance().saveModSelection(f,
+                                        model.getSelectedMods());
+                }
         }
 
@@ -257 +297 @@
         @SuppressWarnings("unused")
         private void revertSelection() {
-                // TODO method stub
-                JOptionPane.showMessageDialog(this, "revertSelection", "todo",
-                                JOptionPane.INFORMATION_MESSAGE);
+                model.revertSelection();
         }
 
         @DoInBackground(progressMessage = "mandatoryFiles.title", cancelable = false, indeterminateProgress = false)
         private void checkMandatoryFiles(final BackgroundEvent evt) {
-                //TODO
-                System.out.println("Mandatory Tools:");
+                TreeSet<Mod> mand = new TreeSet<Mod>();
                 for (Mod m : ModManager.getInstance().getMandatoryTools()) {
-                        System.out.format("  %05d %15s - Local: %b - Update: %b", m.getPackageNumber(), m.getName(), m.isLocalAvailable(), m.isNewerAvailable());
-                }
-                System.out.println();
-                
-                System.out.println("Mandatory Mods:");
+                        if (m.isNewerAvailable()) {
+                                mand.add(m);
+                        }
+                }
                 for (Mod m : ModManager.getInstance().getMandatoryMods()) {
-                        System.out.format("  %05d %15s - Local: %b - Update: %b", m.getPackageNumber(), m.getName(), m.isLocalAvailable(), m.isNewerAvailable());
-                }
+                        if (m.isNewerAvailable()) {
+                                mand.add(m);
+                        }
+                }
+                if (mand.size() > 0) {
+                        ModDownloader m = new ModDownloader(mand,
+                                        new ModDownloaderListener() {
+                                                @Override
+                                                public void updateStatus(ModDownloader source,
+                                                                State state, int filesDown, int filesTotal,
+                                                                int bytesDown, int bytesTotal) {
+                                                        evt.setProgressEnd(filesTotal);
+                                                        evt.setProgressValue(filesDown);
+                                                }
+                                        });
+                        while (!m.isFinished()) {
+                                try {
+                                        Thread.sleep(50);
+                                } catch (InterruptedException e) {
+                                        // TODO Auto-generated catch block
+                                        e.printStackTrace();
+                                }
+                        }
+                }
+                evt.setProgressMessage(bundle.getString("mandatoryToolsInstall.title"));
+                Installer.installTools(ModManager.getInstance().getMandatoryTools());
         }
 
@@ -287 +347 @@
                 System.out.println("Install mods:");
                 for (Mod m : mods) {
-                        System.out
-                                        .println("  " + m.getPackageNumber() + ": " + m.getName());
+                        System.out.println("  " + m.getPackageNumberString() + ": "
+                                        + m.getName());
                 }
 

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

@@ -47 +47 @@
 installing.title=Installing mods
 mandatoryFiles.title=Checking for mandatory files
+mandatoryToolsInstall.title=Installing mandatory tools

AE/installer2/src/net/oni2/aeinstaller/gui/modtable/ModTableModel.java

@@ -1 +1 @@
 package net.oni2.aeinstaller.gui.modtable;
 
+import java.io.File;
 import java.util.HashSet;
 import java.util.ResourceBundle;
@@ -44 +45 @@
                                 return mod.getName();
                         case 1:
-                                return mod.getPackageNumber();
+                                return mod.getPackageNumberString();
                         case 2:
                                 String type = "";
@@ -94 +95 @@
                                 return String.class;
                         case 1:
-                                return Integer.class;
+                                return String.class;
                         case 2:
                                 return String.class;
@@ -149 +150 @@
                 items.clear();
                 items.addAll(ModManager.getInstance().getMods());
+                revertSelection();
+        }
+
+        /**
+         * Revert the selection to the mods that are currently installed
+         */
+        public void revertSelection() {
                 install.clear();
-                // TODO check installed
                 for (int i = 0; i < items.size(); i++) {
-                        install.add(i, false);
-                }
+                        install.add(i, ModManager.getInstance()
+                                        .isModInstalled(items.get(i)));
+                }
+                fireTableDataChanged();
+        }
+
+        /**
+         * Reload the selection after a config was loaded
+         * 
+         * @param config
+         *            Config to load
+         */
+        public void reloadSelection(File config) {
+                Vector<Integer> selected = ModManager.getInstance().loadModSelection(
+                                config);
+                install.clear();
+                for (int i = 0; i < items.size(); i++) {
+                        install.add(i, selected.contains(items.get(i).getPackageNumber()));
+                }
+                fireTableDataChanged();
         }