Changeset 626

Timestamp:

Jan 17, 2013, 8:52:55 PM (12 years ago)

Author:

alloc

Message:

AEI2 0.86:

• Added patch-type to tools

Location:

AE/installer2/src/net/oni2/aeinstaller

Files:

• AEInstaller.properties (modified) (1 diff)
• backend/depot/DepotConfig.java (modified) (2 diffs)
• backend/depot/model/NodeMod.java (modified) (1 diff)
• backend/mods/ModManager.java (modified) (2 diffs)
• gui/toolmanager/ToolManager.java (modified) (1 diff)
• gui/toolmanager/ToolManager.properties (added)
• gui/toolmanager/ToolManager.yml (added)

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

@@ -1 +1 @@
 appname=AE Installer 2
-appversion=0.85
+appversion=0.86
 
 invalidPath.title=Wrong directory

AE/installer2/src/net/oni2/aeinstaller/backend/depot/DepotConfig.java

@@ -1 +1 @@
 package net.oni2.aeinstaller.backend.depot;
+
+import java.util.TreeSet;
 
 import net.oni2.aeinstaller.backend.Settings;
@@ -65 +67 @@
 
         /**
-         * @return Taxonomy term name for modtype Tool
+         * @return Taxonomy term names for mods of type Tool
          */
-        public static String getTaxonomyName_ModType_Tool() {
-                return "Tool";
+        public static TreeSet<String> getTaxonomyName_ModType_Tool() {
+                TreeSet<String> res = new TreeSet<String>();
+                res.add("Tool");
+                res.add("Patch");
+                return res;
         }
 

AE/installer2/src/net/oni2/aeinstaller/backend/depot/model/NodeMod.java

@@ -153 +153 @@
          */
         public boolean isTool() {
-                TaxonomyTerm tt = DepotManager.getInstance().getTaxonomyTerm(
-                                DepotConfig.getTaxonomyName_ModType_Tool());
-                return getTypes().contains(tt);
+                HashSet<TaxonomyTerm> types = getTypes();
+                for (String s : DepotConfig.getTaxonomyName_ModType_Tool()) {
+                        TaxonomyTerm tt = DepotManager.getInstance().getTaxonomyTerm(s);
+                        if (types.contains(tt))
+                                return true;
+                }
+                return false;
         }
 }

AE/installer2/src/net/oni2/aeinstaller/backend/mods/ModManager.java

@@ -10 +10 @@
 import java.util.HashMap;
 import java.util.HashSet;
+import java.util.TreeMap;
 import java.util.TreeSet;
 import java.util.Vector;
@@ -208 +209 @@
          * @return Collection of tools valid on this platform and not mandatory
          */
-        public Collection<Mod> getTools() {
-                Vector<Mod> res = new Vector<Mod>();
+        public TreeMap<String, Mod> getTools() {
+                TreeMap<String, Mod> res = new TreeMap<String, Mod>();
                 for (Mod m : tools.values())
                         if (m.isValidOnPlatform() && !m.isMandatoryMod())
-                                res.add(m);
+                                res.put(m.getName(), m);
                 return res;
         }

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

@@ -1 +1 @@
 package net.oni2.aeinstaller.gui.toolmanager;
 
+import java.awt.Dimension;
+import java.awt.event.ActionEvent;
+import java.awt.event.KeyEvent;
+import java.util.ResourceBundle;
+import java.util.TreeMap;
+
+import javax.swing.AbstractAction;
+import javax.swing.DefaultListModel;
+import javax.swing.JButton;
+import javax.swing.JComponent;
 import javax.swing.JDialog;
+import javax.swing.JLabel;
+import javax.swing.JList;
+import javax.swing.JOptionPane;
+import javax.swing.KeyStroke;
+import javax.swing.ListSelectionModel;
+import javax.swing.event.ListSelectionEvent;
+import javax.swing.event.ListSelectionListener;
+
+import net.oni2.aeinstaller.backend.SizeFormatter;
+import net.oni2.aeinstaller.backend.mods.Mod;
+import net.oni2.aeinstaller.backend.mods.ModManager;
+import net.oni2.aeinstaller.backend.oni.Installer;
+import net.oni2.aeinstaller.gui.HTMLLinkLabel;
+
+import org.javabuilders.BuildResult;
+import org.javabuilders.swing.SwingJavaBuilder;
 
 /**
  * @author Christian Illy
  */
-public class ToolManager extends JDialog {
+public class ToolManager extends JDialog implements ListSelectionListener {
         private static final long serialVersionUID = 343221630538866384L;
 
-        //TODO
+        private ResourceBundle bundle = ResourceBundle.getBundle(getClass()
+                        .getName());
+        @SuppressWarnings("unused")
+        private BuildResult result = SwingJavaBuilder.build(this, bundle);
+
+        private JList lstTools;
+
+        private JLabel lblSubmitterVal;
+        private JLabel lblCreatorVal;
+        private JLabel lblPlatformVal;
+        private JLabel lblPackageNumberVal;
+        private HTMLLinkLabel lblDescriptionVal;
+        private JLabel lblDownloadSizeVal;
+
+        private JButton btnInstall;
+
+        /**
+         * Open the dialog
+         */
+        public ToolManager() {
+                setMinimumSize(new Dimension(getWidth() + 100, getHeight() + 100));
+
+                AbstractAction closeAction = new AbstractAction() {
+
+                        private static final long serialVersionUID = 1L;
+
+                        public void actionPerformed(ActionEvent arg0) {
+                                dispose();
+                        }
+                };
+                KeyStroke ksCtrlW = KeyStroke
+                                .getKeyStroke('W', KeyEvent.CTRL_DOWN_MASK);
+                getRootPane()
+                                .getInputMap(JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT)
+                                .put(ksCtrlW, "close");
+                getRootPane().getActionMap().put("close", closeAction);
+
+                lstTools.addListSelectionListener(this);
+                lstTools.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
+
+                DefaultListModel dlm = new DefaultListModel();
+                TreeMap<String, Mod> tools = ModManager.getInstance().getTools();
+                for (String name : tools.keySet())
+                        dlm.addElement(tools.get(name));
+        }
+
+        @SuppressWarnings("unused")
+        private void install() {
+                // TODO: care for offline mode
+                JOptionPane.showMessageDialog(this, "install", "todo",
+                                JOptionPane.INFORMATION_MESSAGE);
+        }
+
+        @SuppressWarnings("unused")
+        private void installDone() {
+        }
+
+        @Override
+        public void valueChanged(ListSelectionEvent evt) {
+                lblSubmitterVal.setText("");
+                lblCreatorVal.setText("");
+                lblDescriptionVal.setText("");
+                lblPlatformVal.setText("");
+                lblPackageNumberVal.setText("");
+                lblDownloadSizeVal.setText("");
+                btnInstall.setEnabled(false);
+
+                if (lstTools.getSelectedValue() instanceof Mod) {
+                        Mod m = (Mod) lstTools.getSelectedValue();
+                        lblSubmitterVal.setText(m.getName());
+                        lblCreatorVal.setText(m.getCreator());
+                        lblDescriptionVal.setText(m.getDescription());
+                        lblPlatformVal.setText(m.getPlatform().toString());
+                        lblPackageNumberVal.setText(m.getPackageNumberString());
+                        lblDownloadSizeVal.setText(SizeFormatter.format(m.getZipSize(), 3));
+                        btnInstall.setEnabled(true);
+                        if (Installer.getInstalledTools().contains(m.getPackageNumber())) {
+                                btnInstall.setText(bundle.getString("btnInstall.un.text"));
+                                btnInstall.setToolTipText(bundle
+                                                .getString("btnInstall.un.tooltip"));
+                        } else {
+                                btnInstall.setText(bundle.getString("btnInstall.text"));
+                                btnInstall.setToolTipText(bundle
+                                                .getString("btnInstall.tooltip"));
+                        }
+                }
+        }
 }