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

Timestamp:

Feb 25, 2013, 5:52:49 PM (12 years ago)

Author:

alloc

Message:

AEI2 0.99r:

• Add number of selected mods label to main win
• Add "Redownload package" to package tables context menu
• Unpacker: Filter out mac specific ".DS_Store" files

Location:

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

Files:

• DownloadSizeListener.java (deleted)
• ModInstallSelectionListener.java (added)
• ModTable.java (modified) (4 diffs)
• ModTableModel.java (modified) (7 diffs)

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

@@ -38 +38 @@
 import net.oni2.aeinstaller.backend.packages.Package;
 import net.oni2.aeinstaller.backend.packages.Type;
+import net.oni2.aeinstaller.gui.downloadwindow.Downloader;
 
 /**
@@ -173 +174 @@
          *            Listener to add
          */
-        public void addDownloadSizeListener(DownloadSizeListener listener) {
+        public void addDownloadSizeListener(ModInstallSelectionListener listener) {
                 model.addDownloadSizeListener(listener);
         }
@@ -181 +182 @@
          *            Listener to remove
          */
-        public void removeDownloadSizeListener(DownloadSizeListener listener) {
+        public void removeDownloadSizeListener(ModInstallSelectionListener listener) {
                 model.removeDownloadSizeListener(listener);
         }
@@ -332 +333 @@
                                                 });
                                                 popup.add(openDepotPage);
+                                        }
+
+                                        if (mod.getFile() != null) {
+                                                // Download package
+                                                JMenuItem downloadPackage = new JMenuItem(
+                                                                bundle.getString("downloadPackage.text"));
+                                                downloadPackage.addActionListener(new ActionListener() {
+                                                        @Override
+                                                        public void actionPerformed(ActionEvent arg0) {
+                                                                TreeSet<Package> toDo = new TreeSet<Package>();
+                                                                TreeSet<Package> deps = new TreeSet<Package>();
+                                                                toDo.add(mod);
+                                                                Downloader dl = new Downloader(toDo, deps);
+                                                                try {
+                                                                        dl.setVisible(true);
+                                                                } finally {
+                                                                        dl.dispose();
+                                                                }
+                                                                invalidate();
+                                                                repaint();
+                                                        }
+                                                });
+                                                popup.add(downloadPackage);
                                         }
 

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

@@ -29 +29 @@
         private Vector<Boolean> install = new Vector<Boolean>();
 
-        private HashSet<DownloadSizeListener> listeners = new HashSet<DownloadSizeListener>();
+        private HashSet<ModInstallSelectionListener> listeners = new HashSet<ModInstallSelectionListener>();
 
         private SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
@@ -210 +210 @@
         public void revertSelection() {
                 install.clear();
+                int count = 0;
                 for (int i = 0; i < items.size(); i++) {
-                        install.add(i, items.get(i).isInstalled());
-                }
-                notifyDownloadSize(0);
+                        boolean installed = items.get(i).isInstalled();
+                        install.add(i, installed);
+                        if (installed)
+                                count++;
+                }
+                notifyDownloadSize(0, count);
                 fireTableDataChanged();
         }
@@ -262 +266 @@
         }
 
-        private void notifyDownloadSize(int size) {
-                for (DownloadSizeListener dsl : listeners)
-                        dsl.downloadSizeChanged(size);
+        private void notifyDownloadSize(int size, int count) {
+                for (ModInstallSelectionListener dsl : listeners)
+                        dsl.modInstallSelectionChanged(size, count);
         }
 
@@ -274 +278 @@
 
                         int size = 0;
+                        int count = 0;
                         for (int i = 0; i < items.size(); i++) {
                                 if (install.get(i)) {
+                                        count++;
                                         Package m = items.get(i);
                                         if (!m.isLocalAvailable())
@@ -281 +287 @@
                                 }
                         }
-                        notifyDownloadSize(size);
+                        notifyDownloadSize(size, count);
                 }
         }
@@ -289 +295 @@
          *            Listener to receive download size changed events
          */
-        public void addDownloadSizeListener(DownloadSizeListener lis) {
+        public void addDownloadSizeListener(ModInstallSelectionListener lis) {
                 listeners.add(lis);
         }
@@ -297 +303 @@
          *            Listener to no longer receive download size changed events
          */
-        public void removeDownloadSizeListener(DownloadSizeListener lis) {
+        public void removeDownloadSizeListener(ModInstallSelectionListener lis) {
                 listeners.remove(lis);
         }