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

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/modtable

Files:

• ModTable.java (modified) (3 diffs)
• ModTableModel.java (modified) (4 diffs)

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

@@ -70 +70 @@
         /**
          * Create a new ModTable
-         */
-        public ModTable() {
+         * 
+         * @param contentType
+         *            Content to show
+         */
+        public ModTable(ETableContentType contentType) {
                 super();
+
+                this.contentType = contentType;
 
                 setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
@@ -81 +86 @@
                 ((JComponent) getDefaultRenderer(Boolean.class)).setOpaque(true);
 
-                model = new ModTableModel();
+                model = new ModTableModel(contentType);
 
                 setModel(model);
@@ -101 +106 @@
                 for (int i = 0; i < model.getColumnCount(); i++) {
                         model.setColumnConstraints(i, getColumnModel().getColumn(i));
+                }
+
+                if (contentType != ETableContentType.MODS) {
+                        getColumnModel().removeColumn(getColumnModel().getColumn(0));
                 }
         }

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

@@ -14 +14 @@
 import net.oni2.aeinstaller.backend.packages.Package;
 import net.oni2.aeinstaller.backend.packages.PackageManager;
+import net.oni2.aeinstaller.gui.modtable.ModTable.ETableContentType;
 
 /**
@@ -32 +33 @@
         private SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
 
+        private ETableContentType contentType = ETableContentType.MODS;
+
         /**
          * Create a new model
-         */
-        public ModTableModel() {
+         * 
+         * @param contentType
+         *            Content type to show
+         */
+        public ModTableModel(ETableContentType contentType) {
+                this.contentType = contentType;
         }
 
@@ -182 +189 @@
         public void reloadData() {
                 items.clear();
-                items.addAll(PackageManager.getInstance().getModsValidAndNotCore());
+                switch (contentType) {
+                        case MODS:
+                                items.addAll(PackageManager.getInstance()
+                                                .getModsValidAndNotCore());
+                                break;
+                        case TOOLS:
+                                items.addAll(PackageManager.getInstance().getTools());
+                                break;
+                        case CORE:
+                                items.addAll(PackageManager.getInstance().getCoreTools());
+                                items.addAll(PackageManager.getInstance().getCoreMods());
+                                break;
+                }
                 revertSelection();
         }
@@ -205 +224 @@
          */
         public void reloadSelection(File config) {
-                Vector<Integer> selected = PackageManager.getInstance()
-                                .loadModSelection(config);
-                install.clear();
-                for (int i = 0; i < items.size(); i++) {
-                        install.add(i, selected.contains(items.get(i).getPackageNumber()));
-                }
-                fireTableDataChanged();
+                if (contentType == ETableContentType.MODS) {
+                        Vector<Integer> selected = PackageManager.getInstance()
+                                        .loadModSelection(config);
+                        install.clear();
+                        for (int i = 0; i < items.size(); i++) {
+                                install.add(i,
+                                                selected.contains(items.get(i).getPackageNumber()));
+                        }
+                        fireTableDataChanged();
+                }
         }