fixes issue 2897

src/com/dmdirc/addons/ui_swing/components/addonbrowser/AddonFilter.java

@@ -0,0 +1,94 @@
+/*
+ * 
+ * Copyright (c) 2006-2008 Chris Smith, Shane Mc Cormack, Gregory Holmes
+ * 
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ * 
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package com.dmdirc.addons.ui_swing.components.addonbrowser;
+
+import javax.swing.ButtonModel;
+import javax.swing.JTextField;
+import javax.swing.RowFilter;
+import javax.swing.RowFilter.Entry;
+import javax.swing.table.DefaultTableModel;
+
+/**
+ * Addon filter.
+ */
+public class AddonFilter extends RowFilter<DefaultTableModel, Integer> {
+
+    private ButtonModel verifiedBox;
+    private ButtonModel unverifiedBox;
+    private ButtonModel installedBox;
+    private ButtonModel notinstalledBox;
+    private ButtonModel pluginsBox;
+    private ButtonModel themesBox;
+    private ButtonModel actionsBox;
+    private JTextField searchBox;
+
+    /**
+     * Creates a new addon filter.
+     * 
+     * @param verifiedBox
+     * @param unverifiedBox
+     * @param installedBox
+     * @param notinstalledBox
+     * @param pluginsBox
+     * @param themesBox
+     * @param actionsBox
+     * @param searchBox
+     */
+    public AddonFilter(final ButtonModel verifiedBox,
+            final ButtonModel unverifiedBox, final ButtonModel installedBox,
+            final ButtonModel notinstalledBox, final ButtonModel pluginsBox,
+            final ButtonModel themesBox, final ButtonModel actionsBox,
+            final JTextField searchBox) {
+        this.verifiedBox = verifiedBox;
+        this.unverifiedBox = unverifiedBox;
+        this.installedBox = installedBox;
+        this.notinstalledBox = notinstalledBox;
+        this.pluginsBox = pluginsBox;
+        this.themesBox = themesBox;
+        this.actionsBox = actionsBox;
+        this.searchBox = searchBox;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public boolean include(
+            Entry<? extends DefaultTableModel, ? extends Integer> entry) {
+        AddonInfo info = ((AddonInfoLabel) entry.getModel().getValueAt(entry.
+                getIdentifier(), 0)).getAddonInfo();
+        if ((!verifiedBox.isSelected() && info.isVerified()) ||
+                (!unverifiedBox.isSelected() && !info.isVerified()) ||
+                (!installedBox.isSelected() && info.isInstalled()) ||
+                (!notinstalledBox.isSelected() &&
+                !info.isInstalled()) || (!pluginsBox.isSelected() &&
+                info.getType() == AddonType.TYPE_PLUGIN) ||
+                (!themesBox.isSelected() && info.getType() ==
+                AddonType.TYPE_THEME) ||
+                (!actionsBox.isSelected() && info.getType() ==
+                AddonType.TYPE_ACTION_PACK) || (!searchBox.getText().
+                isEmpty() && !info.matches(searchBox.getText()))) {
+            return false;
+        }
+        return true;
+    }
+}

src/com/dmdirc/addons/ui_swing/components/addonbrowser/AddonInfoLabel.java

@@ -94,4 +94,13 @@ public class AddonInfoLabel extends JPanel {
 
         add(new JSeparator(), "newline, span, growx, pushx, gaptop 5");
     }
+
+    /**
+     * Returns the addon info for this label.
+     *
+     * @return Addon info
+     */
+    public AddonInfo getAddonInfo() {
+        return addonInfo;
+    }
 }

src/com/dmdirc/addons/ui_swing/components/addonbrowser/AddonSorter.java

@@ -0,0 +1,85 @@
+/*
+ * 
+ * Copyright (c) 2006-2008 Chris Smith, Shane Mc Cormack, Gregory Holmes
+ * 
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ * 
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package com.dmdirc.addons.ui_swing.components.addonbrowser;
+
+import java.util.Comparator;
+
+import javax.swing.ButtonModel;
+import javax.swing.table.DefaultTableModel;
+import javax.swing.table.TableRowSorter;
+
+/**
+ * Addon sorter.
+ */
+public class AddonSorter extends TableRowSorter<DefaultTableModel> implements
+        Comparator<AddonInfoLabel> {
+
+    private ButtonModel sortByDate;
+    private ButtonModel sortByName;
+    private ButtonModel sortByRating;
+    private ButtonModel sortByStatus;
+
+    /**
+     * Creates a new addon sorter.
+     * 
+     * @param model
+     * @param sortByDate
+     * @param sortByName
+     * @param sortByRating
+     * @param sortByStatus
+     * @param filter 
+     */
+    public AddonSorter(final DefaultTableModel model, final ButtonModel sortByDate,
+            final ButtonModel sortByName, final ButtonModel sortByRating,
+            final ButtonModel sortByStatus, final AddonFilter filter) {
+        super(model);
+        this.sortByDate = sortByDate;
+        this.sortByName = sortByName;
+        this.sortByRating = sortByRating;
+        this.sortByStatus = sortByStatus;
+
+        setRowFilter(filter);
+        setComparator(0, this);
+        toggleSortOrder(0);
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public int compare(final AddonInfoLabel o1, final AddonInfoLabel o2) {
+        final AddonInfo info1 = o1.getAddonInfo();
+        final AddonInfo info2 = o2.getAddonInfo();
+        System.out.println("compare");
+        if (sortByDate.isSelected()) {
+            return info1.getId() - info2.getId();
+        } else if (sortByName.isSelected()) {
+            return info1.getTitle().compareTo(info2.getTitle());
+        } else if (sortByRating.isSelected()) {
+            return info1.getRating() - info2.getRating();
+        } else if (sortByStatus.isSelected()) {
+            return (info1.isVerified() ? 1 : 0) - (info2.isVerified() ? 1 : 0);
+        } else {
+            return 0;
+        }
+    }
+}

src/com/dmdirc/addons/ui_swing/components/addonbrowser/AddonTable.java

@@ -24,6 +24,7 @@
 package com.dmdirc.addons.ui_swing.components.addonbrowser;
 
 import javax.swing.JTable;
+import javax.swing.RowSorter;
 import javax.swing.table.DefaultTableModel;
 import javax.swing.table.TableCellRenderer;
 import javax.swing.table.TableModel;
@@ -44,13 +45,13 @@ public class AddonTable extends JTable {
      * Creates a new addon table.
      */
     public AddonTable() {
-        super(new DefaultTableModel(new String[]{"Addon",}, 0));
+        super(new DefaultTableModel(0, 1));
         setTableHeader(null);
     }
 
     /** {@inheritDoc} */
     @Override
-    public TableCellRenderer getCellRenderer(int row, int column) {
+    public TableCellRenderer getCellRenderer(final int row, final int column) {
         return new AddonInfoCellRenderer();
     }
 
@@ -60,4 +61,29 @@ public class AddonTable extends JTable {
         return (DefaultTableModel) super.getModel();
     }
 
+    /** {@inheritDoc} */
+    @Override
+    public void setModel(final TableModel dataModel) {
+        if (!(dataModel instanceof DefaultTableModel)) {
+            throw new IllegalArgumentException("Row sorter must be of type DefaultTableModel");
+        }
+        super.setModel(dataModel);
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    @SuppressWarnings("unchecked")
+    public AddonSorter getRowSorter() {
+        return (AddonSorter) super.getRowSorter();
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public void setRowSorter(final RowSorter<? extends TableModel> sorter) {
+        if (!(sorter instanceof AddonSorter)) {
+            throw new IllegalArgumentException("Row sorter must be of type AddonSorter");
+        }
+        super.setRowSorter(sorter);
+    }
+
 }

src/com/dmdirc/addons/ui_swing/components/addonbrowser/BrowserWindow.java

@@ -19,12 +19,11 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
+
 package com.dmdirc.addons.ui_swing.components.addonbrowser;
 
 import com.dmdirc.Main;
 import com.dmdirc.addons.ui_swing.MainFrame;
-import com.dmdirc.addons.ui_swing.UIUtilities;
-import com.dmdirc.addons.ui_swing.components.LoggingSwingWorker;
 import com.dmdirc.util.ConfigFile;
 import com.dmdirc.util.InvalidConfigFileException;
 
@@ -32,25 +31,18 @@ import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.io.File;
 import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.List;
 import java.util.Map;
 
 import javax.swing.BorderFactory;
 import javax.swing.ButtonGroup;
-import javax.swing.DefaultListModel;
 import javax.swing.JCheckBox;
 import javax.swing.JDialog;
-import javax.swing.JLabel;
 import javax.swing.JPanel;
 import javax.swing.JRadioButton;
 import javax.swing.JScrollPane;
-import javax.swing.JTable;
 import javax.swing.JTextField;
 
-import javax.swing.table.DefaultTableModel;
+import javax.swing.SwingUtilities;
 import net.miginfocom.swing.MigLayout;
 
 /**
@@ -58,8 +50,7 @@ import net.miginfocom.swing.MigLayout;
  * 
  * @author chris
  */
-public class BrowserWindow extends JDialog implements ActionListener,
-        Comparator<AddonInfo> {
+public class BrowserWindow extends JDialog implements ActionListener {
 
     /**
      * A version number for this class. It should be changed whenever the class
@@ -82,12 +73,14 @@ public class BrowserWindow extends JDialog implements ActionListener,
     /** The installed checkbox. */
     private final JCheckBox installedBox = new JCheckBox("Installed", true);
     /** The not installed checkbox. */
-    private final JCheckBox notinstalledBox = new JCheckBox("Not installed", true);
+    private final JCheckBox notinstalledBox = new JCheckBox("Not installed",
+            true);
     /** The panel used to list addons. */
     private final AddonTable list = new AddonTable();
     /** The scrollpane for the list panel. */
     private final JScrollPane scrollPane = new JScrollPane(list,
-            JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED, JScrollPane.HORIZONTAL_SCROLLBAR_NEVER);
+            JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED,
+            JScrollPane.HORIZONTAL_SCROLLBAR_NEVER);
     /** The sort by name button. */
     private final JRadioButton nameButton = new JRadioButton("Name", true);
     /** The sort by rating button. */
@@ -96,15 +89,19 @@ public class BrowserWindow extends JDialog implements ActionListener,
     private final JRadioButton dateButton = new JRadioButton("Date", false);
     /** The sort by status button. */
     private final JRadioButton statusButton = new JRadioButton("Status", false);
-    /** All known addon infos. */
-    private final List<AddonInfo> infos = new ArrayList<AddonInfo>();
+    /** Row sorter. */
+    private final AddonSorter sorter;
+    /** Addon filter. */
+    private final AddonFilter filter;
 
     /**
      * Creates and displays a new browser window.
      */
     public BrowserWindow() {
-        super((MainFrame) Main.getUI().getMainWindow(), "DMDirc Addon Browser", false);
-        setIconImage(((MainFrame) Main.getUI().getMainWindow()).getIcon().getImage());
+        super((MainFrame) Main.getUI().getMainWindow(), "DMDirc Addon Browser",
+                false);
+        setIconImage(((MainFrame) Main.getUI().getMainWindow()).getIcon().
+                getImage());
         setResizable(false);
         setLayout(new MigLayout("fill, wmin 650, hmin 600"));
         scrollPane.getVerticalScrollBar().setUnitIncrement(15);
@@ -144,6 +141,16 @@ public class BrowserWindow extends JDialog implements ActionListener,
 
         initListeners();
 
+        filter = new AddonFilter(verifiedBox.getModel(),
+                unverifiedBox.getModel(), installedBox.getModel(),
+                notinstalledBox.getModel(), pluginsBox.getModel(), themesBox.
+                getModel(), actionsBox.getModel(),
+                searchBox);
+        sorter = new AddonSorter(list.getModel(), dateButton.getModel(), 
+                nameButton.getModel(), ratingButton.getModel(),
+                statusButton.getModel(), filter);
+        list.setRowSorter(sorter);
+
         try {
             loadData();
         } catch (IOException ex) {
@@ -170,17 +177,17 @@ public class BrowserWindow extends JDialog implements ActionListener,
         themesBox.addActionListener(this);
         actionsBox.addActionListener(this);
 
-        nameButton.addActionListener(this);
-        ratingButton.addActionListener(this);
-        dateButton.addActionListener(this);
-        statusButton.addActionListener(this);
-
         verifiedBox.addActionListener(this);
         unverifiedBox.addActionListener(this);
         installedBox.addActionListener(this);
         notinstalledBox.addActionListener(this);
 
         searchBox.addActionListener(this);
+
+        nameButton.addActionListener(this);
+        ratingButton.addActionListener(this);
+        dateButton.addActionListener(this);
+        statusButton.addActionListener(this);
     }
 
     /**
@@ -190,92 +197,30 @@ public class BrowserWindow extends JDialog implements ActionListener,
      * @throws InvalidConfigFileException If the file is corrupt somehow
      */
     private void loadData() throws IOException, InvalidConfigFileException {
-        ConfigFile data = new ConfigFile(Main.getConfigDir() + File.separator + "addons.feed");
+        ConfigFile data = new ConfigFile(Main.getConfigDir() + File.separator +
+                "addons.feed");
         data.read();
-        int i = 0;
 
         for (Map<String, String> entry : data.getKeyDomains().values()) {
             final AddonInfo info = new AddonInfo(entry);
-            infos.add(info);
+            list.getModel().addRow(new Object[]{new AddonInfoLabel(info),});
         }
-
-        sortAndFilter();
     }
 
     /**
-     * Sorts and filters the list of addons according to the currently selected
-     * options.
-     */
-    private void sortAndFilter() {
-        list.getModel().setRowCount(0);
-        list.add(new JLabel("Sorting list.", JLabel.CENTER), "grow, pushy");
-
-        new LoggingSwingWorker() {
-
-            final List<AddonInfo> newInfos = new ArrayList<AddonInfo>();
-
-            /* {@inheritDoc} */
-            @Override
-            protected Object doInBackground() {
-                for (AddonInfo info : infos) {
-                    if ((!verifiedBox.isSelected() && info.isVerified()) ||
-                            (!unverifiedBox.isSelected() && !info.isVerified()) ||
-                            (!installedBox.isSelected() && info.isInstalled()) ||
-                            (!notinstalledBox.isSelected() &&
-                            !info.isInstalled()) || (!pluginsBox.isSelected() &&
-                            info.getType() == AddonType.TYPE_PLUGIN) ||
-                            (!themesBox.isSelected() && info.getType() ==
-                            AddonType.TYPE_THEME) ||
-                            (!actionsBox.isSelected() && info.getType() ==
-                            AddonType.TYPE_ACTION_PACK) || (!searchBox.getText().
-                            isEmpty() && !info.matches(searchBox.getText()))) {
-                        continue;
-                    }
-
-                    newInfos.add(info);
-                }
-
-                Collections.sort(newInfos, BrowserWindow.this);
-                return newInfos;
-            }
-
-            /* {@inheritDoc} */
-            @Override
-            protected void done() {
-                super.done();
-
-                list.getModel().setRowCount(0);
-                for (AddonInfo info : newInfos) {
-                    list.getModel().addRow(new Object[] {new AddonInfoLabel(info), });
-                }
-                UIUtilities.resetScrollPane(scrollPane);
-            }
-        }.execute();
-    }
-
-    /** 
      * {@inheritDoc}
-     * 
+     *
      * @param e Action event
      */
     @Override
     public void actionPerformed(final ActionEvent e) {
-        sortAndFilter();
-    }
+        SwingUtilities.invokeLater(new Runnable() {
 
-    /** {@inheritDoc} */
-    @Override
-    public int compare(final AddonInfo o1, final AddonInfo o2) {
-        if (dateButton.isSelected()) {
-            return o1.getId() - o2.getId();
-        } else if (nameButton.isSelected()) {
-            return o1.getTitle().compareTo(o2.getTitle());
-        } else if (ratingButton.isSelected()) {
-            return o1.getRating() - o2.getRating();
-        } else if (statusButton.isSelected()) {
-            return (o1.isVerified() ? 1 : 0) - (o2.isVerified() ? 1 : 0);
-        } else {
-            return 0;
-        }
+            /** {@inheritDoc} */
+            @Override
+            public void run() {
+                sorter.sort();
+            }
+        });
     }
 }

src/com/dmdirc/addons/ui_swing/components/addonbrowser/DownloaderWindow.java

@@ -6,6 +6,7 @@
 package com.dmdirc.addons.ui_swing.components.addonbrowser;
 
 import com.dmdirc.Main;
+import com.dmdirc.addons.ui_swing.MainFrame;
 import com.dmdirc.ui.CoreUIUtils;
 import com.dmdirc.util.DownloadListener;
 import com.dmdirc.util.Downloader;
@@ -35,6 +36,8 @@ public class DownloaderWindow extends JDialog implements Runnable, DownloadListe
 
     /** Instantiates a new downloader window. */
     public DownloaderWindow() {
+        super((MainFrame) Main.getUI().getMainWindow(), "DMDirc Addon Browser",
+                false);
         setTitle("Downloading addon information...");
         setLayout(new MigLayout("fill"));
         add(jpb, "grow");