Changeset 657 for AE/installer2/src/net/oni2/aeinstaller/gui/modtable

Timestamp:

Jan 29, 2013, 12:43:01 PM (12 years ago)

Author:

alloc

Message:

AEI2 0.99i:

• Added (un)select all button
• Fixed install in offline mode
• Added entry in mod-table-context menu to delete local package
• Added "added" column to mod table

Location:

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

Files:

• ModTable.java (modified) (5 diffs)
• ModTableFilter.java (modified) (4 diffs)
• ModTableModel.java (modified) (5 diffs)

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

@@ -19 +19 @@
 import javax.swing.JComponent;
 import javax.swing.JMenuItem;
+import javax.swing.JOptionPane;
 import javax.swing.JPopupMenu;
 import javax.swing.JTable;
@@ -42 +43 @@
                         .getBundle("net.oni2.aeinstaller.localization.ModTable");
 
+        /**
+         * @author Christian Illy
+         */
+        public enum ETableContentType {
+                /**
+                 * Table showing mods
+                 */
+                MODS,
+                /**
+                 * Table showing tools
+                 */
+                TOOLS,
+                /**
+                 * Table showing core packages
+                 */
+                CORE
+        };
+
         private HashSet<ModSelectionListener> modSelListeners = new HashSet<ModSelectionListener>();
 
         private ModTableModel model;
         private TableRowSorter<ModTableModel> sorter;
+
+        private ETableContentType contentType = ETableContentType.MODS;
 
         /**
@@ -186 +207 @@
          */
         public void setFilter(Type type, int downloadState) {
-                sorter.setRowFilter(new ModTableFilter(type, downloadState));
+                sorter.setRowFilter(new ModTableFilter(type, downloadState,
+                                contentType == ETableContentType.CORE, false));
         }
 
@@ -203 +225 @@
                         }
                 }
+        }
+
+        /**
+         * Select/Unselect all currently visible items depending on the current
+         * state of selection
+         */
+        public void unSelectAll() {
+                boolean isAll = true;
+                for (int i = 0; i < getRowCount(); i++) {
+                        int modRow = convertRowIndexToModel(i);
+                        boolean inst = (Boolean) model.getValueAt(modRow, 0);
+                        if (!inst) {
+                                isAll = false;
+                                break;
+                        }
+                }
+
+                for (int i = 0; i < getRowCount(); i++) {
+                        int modRow = convertRowIndexToModel(i);
+                        model.setValueAt(!isAll, modRow, 0);
+                }
+                invalidate();
+                repaint();
         }
 
@@ -267 +312 @@
                                         }
 
+                                        if (mod.isLocalAvailable()
+                                                        && contentType != ETableContentType.CORE) {
+                                                // Delete package folder item
+                                                JMenuItem deleteModFolder = new JMenuItem(
+                                                                bundle.getString("deletePackage.text"));
+                                                deleteModFolder.addActionListener(new ActionListener() {
+                                                        @Override
+                                                        public void actionPerformed(ActionEvent arg0) {
+                                                                if (mod.getNode() == null) {
+                                                                        JOptionPane.showMessageDialog(
+                                                                                        null,
+                                                                                        bundle.getString("deletePackageLocalOnly.text"),
+                                                                                        bundle.getString("deletePackageLocalOnly.title"),
+                                                                                        JOptionPane.INFORMATION_MESSAGE);
+                                                                } else {
+                                                                        int res = JOptionPane.showConfirmDialog(
+                                                                                        null,
+                                                                                        bundle.getString("deletePackageConfirm.text"),
+                                                                                        bundle.getString("deletePackageConfirm.title"),
+                                                                                        JOptionPane.YES_NO_OPTION,
+                                                                                        JOptionPane.WARNING_MESSAGE);
+                                                                        if (res == JOptionPane.YES_OPTION) {
+                                                                                mod.deleteLocalPackage();
+                                                                                invalidate();
+                                                                                repaint();
+                                                                        }
+                                                                }
+                                                        }
+                                                });
+                                                popup.add(deleteModFolder);
+                                        }
+
                                         if (popup.getSubElements().length > 0)
                                                 popup.show(e.getComponent(), e.getX(), e.getY());

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

@@ -13 +13 @@
         private int downloadState = 0;
 
+        private boolean showCorePackages = false;
+        private boolean showInvalidPlatform = false;
+
         /**
          * @param type
@@ -18 +21 @@
          * @param downloadState
          *            Show only: 0 = all, 1 = online, 2 = downloaded
+         * @param showCorePackages
+         *            Show core packages in table
+         * @param showInvalidPlatform
+         *            Show packages not valid on this platform
          */
-        public ModTableFilter(Type type, int downloadState) {
+        public ModTableFilter(Type type, int downloadState,
+                        boolean showCorePackages, boolean showInvalidPlatform) {
                 super();
                 this.type = type;
                 this.downloadState = downloadState;
+                this.showCorePackages = showCorePackages;
+                this.showInvalidPlatform = showInvalidPlatform;
         }
 
@@ -28 +38 @@
         public boolean include(
                         RowFilter.Entry<? extends ModTableModel, ? extends Integer> entry) {
-                Package mod = (Package) entry.getModel().getValueAt(entry.getIdentifier(), -1);
-                
-                if (mod.isCorePackage())
+                Package mod = (Package) entry.getModel().getValueAt(
+                                entry.getIdentifier(), -1);
+
+                if (mod.isCorePackage() && !showCorePackages)
                         return false;
 
-                if (!mod.isValidOnPlatform())
+                if (!mod.isValidOnPlatform() && !showInvalidPlatform)
                         return false;
 
@@ -47 +58 @@
                                 break;
                 }
-                
+
                 return result;
         }

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

@@ -60 +60 @@
                                 return res;
                         case 5:
+                                if (mod.getNode() != null)
+                                        return sdf.format(new Date(
+                                                        mod.getNode().getCreated() * 1000));
+                                else
+                                        return null;
+                        case 6:
                                 if (mod.getFile() != null)
                                         return sdf.format(new Date(
@@ -83 +89 @@
                                 return bundle.getString("mod.state");
                         case 5:
+                                return bundle.getString("mod.added");
+                        case 6:
                                 return bundle.getString("mod.date");
                 }
@@ -95 +103 @@
         @Override
         public int getColumnCount() {
-                return 6;
+                return 7;
         }
 
@@ -112 +120 @@
                                 return String.class;
                         case 5:
+                                return String.class;
+                        case 6:
                                 return String.class;
                 }
@@ -153 +163 @@
                                 break;
                         case 5:
-                                w = 115;
+                                w = 100;
+                                col.setPreferredWidth(w);
+                                col.setMinWidth(w);
+                                col.setMaxWidth(w);
+                                break;
+                        case 6:
+                                w = 100;
                                 col.setPreferredWidth(w);
                                 col.setMinWidth(w);