Changeset 658 for AE/installer2/src/net/oni2/aeinstaller/gui/corepackages

Timestamp:

Jan 29, 2013, 1:34:16 PM (12 years ago)

Author:

alloc

Message:

AEI2 0.99i:

• Lots of refactorings for the GUI:
  • Global type for the mod info box (Main, Tools, Core)
  • Same table for Main, Tools, Core

Location:

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

Files:

• CorePackagesDialog.java (modified) (5 diffs)
• CorePackagesDialog.yml (modified) (2 diffs)

AE/installer2/src/net/oni2/aeinstaller/gui/corepackages/CorePackagesDialog.java

@@ -1 +1 @@
 package net.oni2.aeinstaller.gui.corepackages;
 
-import java.awt.Dimension;
-import java.awt.Insets;
 import java.awt.event.ActionEvent;
 import java.awt.event.KeyEvent;
-import java.text.SimpleDateFormat;
-import java.util.Date;
 import java.util.ResourceBundle;
-import java.util.TreeSet;
 
 import javax.swing.AbstractAction;
-import javax.swing.DefaultListModel;
 import javax.swing.JComponent;
 import javax.swing.JDialog;
-import javax.swing.JLabel;
-import javax.swing.JList;
+import javax.swing.JScrollPane;
 import javax.swing.JSplitPane;
 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.packages.Package;
-import net.oni2.aeinstaller.backend.packages.PackageManager;
-import net.oni2.aeinstaller.backend.packages.Type;
-import net.oni2.aeinstaller.gui.HTMLLinkLabel;
+import net.oni2.aeinstaller.gui.modtable.ModSelectionListener;
+import net.oni2.aeinstaller.gui.modtable.ModTable;
+import net.oni2.aeinstaller.gui.modtable.ModTable.ETableContentType;
+import net.oni2.aeinstaller.gui.packageinfobox.PackageInfoBox;
 
 import org.javabuilders.BuildResult;
@@ -34 +24 @@
  * @author Christian Illy
  */
-public class CorePackagesDialog extends JDialog implements
-                ListSelectionListener {
+public class CorePackagesDialog extends JDialog implements ModSelectionListener {
         private static final long serialVersionUID = -5444213842599816301L;
 
@@ -46 +35 @@
         private JSplitPane contents;
 
-        private JList lstTools;
+        private JScrollPane scrollTools;
+        private ModTable tblTools;
 
-        private JLabel lblTitleVal;
-        private JLabel lblCreatorVal;
-        private JLabel lblTypesVal;
-        private JLabel lblPlatformVal;
-        private JLabel lblPackageNumberVal;
-        private JLabel lblVersionNumberVal;
-        private JLabel lblLastChangeVal;
-        private HTMLLinkLabel lblDescriptionVal;
-        private JLabel lblDownloadSizeVal;
-
-        private SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+        private PackageInfoBox pkgInfo;
 
         /**
@@ -64 +44 @@
          */
         public CorePackagesDialog() {
-                setMinimumSize(new Dimension(getWidth() + 100, getHeight() + 100));
-
                 AbstractAction closeAction = new AbstractAction() {
 
@@ -81 +59 @@
                 getRootPane().getActionMap().put("close", closeAction);
 
-                contents.setDividerLocation(200);
+                contents.setDividerLocation(550);
                 contents.setResizeWeight(0.4);
 
-                lstTools.addListSelectionListener(this);
-                lstTools.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
+                tblTools = new ModTable(ETableContentType.CORE);
+                tblTools.reloadData();
+                scrollTools.setViewportView(tblTools);
 
-                DefaultListModel dlm = new DefaultListModel();
-                TreeSet<Package> tools = PackageManager.getInstance().getCoreTools();
-                for (Package m : tools)
-                        dlm.addElement(m);
-                TreeSet<Package> mods = PackageManager.getInstance().getCoreMods();
-                for (Package m : mods)
-                        dlm.addElement(m);
-                lstTools.setModel(dlm);
+                tblTools.addModSelectionListener(this);
 
                 setLocationRelativeTo(null);
-                lblDescriptionVal.setMargin(new Insets(-15, 0, 0, 0));
         }
 
         @Override
-        public void valueChanged(ListSelectionEvent evt) {
-                lblTitleVal.setText("");
-                lblCreatorVal.setText("");
-                lblDescriptionVal.setText("");
-                lblTypesVal.setText("");
-                lblPlatformVal.setText("");
-                lblPackageNumberVal.setText("");
-                lblVersionNumberVal.setText("");
-                lblLastChangeVal.setText("");
-                lblDownloadSizeVal.setText("");
-
-                if (lstTools.getSelectedValue() instanceof Package) {
-                        Package m = (Package) lstTools.getSelectedValue();
-                        lblTitleVal.setText(m.getName());
-                        lblCreatorVal.setText(m.getCreator());
-                        lblDescriptionVal.setText(m.getDescription());
-
-                        String types = "";
-                        for (Type t : m.getTypes()) {
-                                if (types.length() > 0)
-                                        types += ", ";
-                                types += t.getName();
-                        }
-                        lblTypesVal.setText(types);
-                        lblPlatformVal.setText(m.getPlatform().toString());
-                        lblPackageNumberVal.setText(m.getPackageNumberString());
-                        lblVersionNumberVal.setText(m.getVersion());
-                        if (m.getFile() != null)
-                                lblLastChangeVal.setText(sdf.format(new Date(m.getFile()
-                                                .getTimestamp() * 1000)));
-                        lblDownloadSizeVal.setText(SizeFormatter.format(m.getZipSize(), 3));
-                }
+        public void modSelectionChanged(ModTable source, Package mod) {
+                pkgInfo.updateInfo(mod);
         }
 }

AE/installer2/src/net/oni2/aeinstaller/gui/corepackages/CorePackagesDialog.yml

@@ -2 +2 @@
   name: frame
   title: frame.title
-  size: packed
+  size: 900x500
   locationRelativeTo: null
   defaultCloseOperation: disposeOnClose
@@ -10 +10 @@
     - JSplitPane(name=contents, orientation=horizontalSplit, continuousLayout=true):
         - JPanel(name=panTools):
-            - JScrollPane(name=scrollTools, vScrollBar=always, hScrollBar=asNeeded):
-                JList(name=lstTools)
+            - JScrollPane(name=scrollTools, vScrollBar=always, hScrollBar=never)
             - MigLayout: |
                  [grow]
                  scrollTools   [grow]
-        - JPanel(name=panInfo):
-            - JLabel(name=lblTitle, text=lblTitle.text)
-            - JLabel(name=lblTitleVal)
-            - JLabel(name=lblCreator, text=lblCreator.text)
-            - JLabel(name=lblCreatorVal)
-            - JLabel(name=lblTypes, text=lblTypes.text)
-            - JLabel(name=lblTypesVal)
-            - JLabel(name=lblPlatform, text=lblPlatform.text)
-            - JLabel(name=lblPlatformVal)
-            - JLabel(name=lblPackageNumber, text=lblPackageNumber.text)
-            - JLabel(name=lblPackageNumberVal)
-            - JLabel(name=lblVersionNumber, text=lblVersionNumber.text)
-            - JLabel(name=lblVersionNumberVal)
-            - JLabel(name=lblLastChange, text=lblLastChange.text)
-            - JLabel(name=lblLastChangeVal)
-            - JLabel(name=lblDescription, text=lblDescription.text)
-            - JScrollPane(name=scrollDescription, vScrollBar=always, hScrollBar=asNeeded):
-                HTMLLinkLabel(name=lblDescriptionVal)
-            - JLabel(name=lblDownloadSize, text=lblDownloadSize.text)
-            - JLabel(name=lblDownloadSizeVal)
-            - MigLayout: |
-                 [min]             [grow]
-                 >lblTitle         lblTitleVal         [min]
-                 >lblCreator       lblCreatorVal       [min]
-                 >lblTypes         lblTypesVal         [min]
-                 >lblPlatform      lblPlatformVal      [min]
-                 >lblPackageNumber lblPackageNumberVal [min]
-                 >lblVersionNumber lblVersionNumberVal [min]
-                 >lblLastChange    lblLastChangeVal    [min]
-                 >^lblDescription  scrollDescription   [grow]
-                 >lblDownloadSize  lblDownloadSizeVal  [min]
+        - PackageInfoBox(name=pkgInfo)
     - MigLayout: |
          [grow]