Channel list UI.

Fixes-Issue: CLIENT-8
Change-Id: Ib0598492cd63a59896634f4a74758c34d0d6853b
Reviewed-on: http://gerrit.dmdirc.com/2212
Reviewed-by: Chris Smith <chris@dmdirc.com>
Automatic-Compile: DMDirc Build Manager

src/com/dmdirc/addons/ui_swing/adapters/ObservableListTableModelAdapter.java

@@ -22,6 +22,7 @@
 
 package com.dmdirc.addons.ui_swing.adapters;
 
+import com.dmdirc.addons.ui_swing.UIUtilities;
 import com.dmdirc.util.ListObserver;
 import com.dmdirc.util.ObservableList;
 
@@ -67,21 +68,42 @@ public abstract class ObservableListTableModelAdapter<T> extends AbstractTableMo
         @Override
         public void onItemsAdded(final Object source, final int startIndex,
                 final int endIndex) {
-            fireTableRowsInserted(startIndex, endIndex);
+            UIUtilities.invokeLater(new Runnable() {
+
+                /** {@inheritDoc} */
+                @Override
+                public void run() {
+                    fireTableRowsInserted(startIndex, endIndex);
+                }
+            });
         }
 
         /** {@inheritDoc} */
         @Override
         public void onItemsRemoved(final Object source, final int startIndex,
                 final int endIndex) {
-            fireTableRowsDeleted(startIndex, endIndex);
+            UIUtilities.invokeLater(new Runnable() {
+
+                /** {@inheritDoc} */
+                @Override
+                public void run() {
+                    fireTableRowsDeleted(startIndex, endIndex);
+                }
+            });
         }
 
         /** {@inheritDoc} */
         @Override
         public void onItemsChanged(final Object source, final int startIndex,
                 final int endIndex) {
-            fireTableRowsUpdated(startIndex, endIndex);
+            UIUtilities.invokeLater(new Runnable() {
+
+                /** {@inheritDoc} */
+                @Override
+                public void run() {
+                    fireTableRowsUpdated(startIndex, endIndex);
+                }
+            });
         }
     }
 

src/com/dmdirc/addons/ui_swing/components/menubar/ChannelMenu.java

@@ -29,6 +29,7 @@ import com.dmdirc.addons.ui_swing.MainFrame;
 import com.dmdirc.addons.ui_swing.SwingController;
 import com.dmdirc.addons.ui_swing.components.frames.TextFrame;
 import com.dmdirc.addons.ui_swing.dialogs.ChannelJoinDialog;
+import com.dmdirc.addons.ui_swing.dialogs.channellist.ChannelListDialog;
 
 import java.awt.Dialog.ModalityType;
 import java.awt.event.ActionEvent;
@@ -56,7 +57,7 @@ public class ChannelMenu extends JMenu implements ActionListener,
     /** Main frame. */
     private final MainFrame mainFrame;
     /** Menu items to be disabled/enabled. */
-    private JMenuItem csd, join;
+    private JMenuItem csd, join, list;
 
     /**
      * Creates a new channel menu.
@@ -92,6 +93,13 @@ public class ChannelMenu extends JMenu implements ActionListener,
         csd.setActionCommand("ChannelSettings");
         csd.addActionListener(this);
         add(csd);
+
+        list = new JMenuItem();
+        list.setText("List channels...");
+        list.setMnemonic('l');
+        list.setActionCommand("ListChannels");
+        list.addActionListener(this);
+        add(list);
     }
 
     /** {@inheritDoc} */
@@ -107,6 +115,8 @@ public class ChannelMenu extends JMenu implements ActionListener,
             if (activeWindow instanceof Channel) {
                 controller.showChannelSettingsDialog(((Channel) activeWindow));
             }
+        } else if (e.getActionCommand().equals("ListChannels")) {
+            new ChannelListDialog(controller).display();
         }
     }
 
@@ -123,6 +133,9 @@ public class ChannelMenu extends JMenu implements ActionListener,
         csd.setEnabled(activeWindow instanceof Channel && activeWindow
                 .getServer() != null && activeWindow.getServer().getState()
                 == ServerState.CONNECTED);
+        list.setEnabled(activeWindow instanceof Channel && activeWindow
+                .getServer() != null && activeWindow.getServer().getState()
+                == ServerState.CONNECTED);
     }
 
     /** {@inheritDoc} */

src/com/dmdirc/addons/ui_swing/dialogs/StandardDialog.java

@@ -68,6 +68,7 @@ public class StandardDialog extends JDialog {
             setIconImages(owner.getIconImages());
         }
         orderButtons(new JButton(), new JButton());
+        setDefaultCloseOperation(DISPOSE_ON_CLOSE);
     }
 
     /**
@@ -83,6 +84,7 @@ public class StandardDialog extends JDialog {
             setIconImages(owner.getIconImages());
         }
         orderButtons(new JButton(), new JButton());
+        setDefaultCloseOperation(DISPOSE_ON_CLOSE);
     }
 
     /**

src/com/dmdirc/addons/ui_swing/dialogs/channellist/ChannelListDialog.java

@@ -0,0 +1,70 @@
+/*
+ * Copyright (c) 2006-2011 DMDirc Developers
+ *
+ * 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.dialogs.channellist;
+
+import com.dmdirc.addons.ui_swing.SwingController;
+import com.dmdirc.addons.ui_swing.dialogs.StandardDialog;
+
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+
+import net.miginfocom.swing.MigLayout;
+
+/**
+ * Provides a UI to search for channels in DMDirc.
+ */
+public class ChannelListDialog extends StandardDialog implements
+        ActionListener {
+
+    /** Serial version UID. */
+    private static final long serialVersionUID = 1L;
+    /** List panel. */
+    private ChannelListPanel list;
+
+    public ChannelListDialog(final SwingController controller) {
+        super(controller.getMainFrame(), ModalityType.MODELESS);
+        setTitle("Channel List");
+        list = new ChannelListPanel(controller.getMainFrame().getActiveFrame().getContainer().getServer());
+        layoutComponents();
+        getCancelButton().setText("Close");
+        getCancelButton().addActionListener(this);
+    }
+
+    /** Lays out the components in this dialog. */
+    private void layoutComponents() {
+        setLayout(new MigLayout("fill, wmin 40%, hmin 40%, hidemode 3"));
+        add(list, "grow, push, wrap");
+        add(getCancelButton(), "split, right");
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * @param e Action event
+     */
+    @Override
+    public void actionPerformed(final ActionEvent e) {
+        dispose();
+    }
+
+}

src/com/dmdirc/addons/ui_swing/dialogs/channellist/ChannelListPanel.java

@@ -0,0 +1,64 @@
+/*
+ * Copyright (c) 2006-2011 DMDirc Developers
+ *
+ * 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.dialogs.channellist;
+
+import com.dmdirc.Server;
+import com.dmdirc.lists.GroupListManager;
+
+import javax.swing.JPanel;
+
+import net.miginfocom.swing.MigLayout;
+
+/**
+ * Panel to perform and display a group list search.
+ */
+public class ChannelListPanel extends JPanel {
+
+    /** Serial version UID. */
+    private static final long serialVersionUID = 1L;
+    /** Search terms. */
+    private SearchTermsPanel searchTerms;
+    /** Search results. */
+    private ResultsPanel results;
+    /** Group list manager to show results/perform searching. */
+    private GroupListManager manager;
+
+    /**
+     * Creates a new panel to perform a group list search on a server.
+     *
+     * @param server Server on which to perform search
+     */
+    public ChannelListPanel(final Server server) {
+        manager = new GroupListManager(server);
+        searchTerms = new SearchTermsPanel(manager);
+        results = new ResultsPanel(manager);
+        layoutComponents();
+    }
+
+    /** Lays out the components in the panel. */
+    private void layoutComponents() {
+        setLayout(new MigLayout("fill, hidemode 3, ins 0"));
+        add(searchTerms, "growx, wrap");
+        add(results, "grow, push");
+    }
+}

src/com/dmdirc/addons/ui_swing/dialogs/channellist/ResultsPanel.java

@@ -0,0 +1,62 @@
+/*
+ * Copyright (c) 2006-2011 DMDirc Developers
+ *
+ * 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.dialogs.channellist;
+
+import com.dmdirc.addons.ui_swing.components.PackingTable;
+import com.dmdirc.lists.GroupListManager;
+
+import javax.swing.JPanel;
+import javax.swing.JScrollPane;
+
+import net.miginfocom.swing.MigLayout;
+
+/**
+ * Displays the results of a group list search in a table.
+ */
+public class ResultsPanel extends JPanel {
+
+    /** Serial version UID. */
+    private static final long serialVersionUID = 1L;
+    /** Group list manager to perform searches on. */
+    private GroupListManager manager;
+
+    /**
+     * Creates a new panel to show group list results.
+     *
+     * @param manager Group manager to show results
+     */
+    public ResultsPanel(final GroupListManager manager) {
+        this.manager = manager;
+        layoutComponents();
+    }
+
+    /** Lays out the components in the panel. */
+    private void layoutComponents() {
+        final JScrollPane sp = new JScrollPane();
+        final PackingTable table = new PackingTable(
+                new ChannelListTableModel(manager), sp);
+        sp.setViewportView(table);
+        setLayout(new MigLayout("fill, hidemode 3, ins 0"));
+        add(sp, "grow, push");
+    }
+}

src/com/dmdirc/addons/ui_swing/dialogs/channellist/SearchTermsPanel.java

@@ -0,0 +1,79 @@
+/*
+ * Copyright (c) 2006-2011 DMDirc Developers
+ *
+ * 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.dialogs.channellist;
+
+import com.dmdirc.lists.GroupListManager;
+
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+
+import javax.swing.JButton;
+import javax.swing.JLabel;
+import javax.swing.JPanel;
+import javax.swing.JTextField;
+
+import net.miginfocom.swing.MigLayout;
+
+/**
+ * Gathers input for a group list search and begins the search.
+ */
+public class SearchTermsPanel extends JPanel implements ActionListener {
+
+    /** Serial version UID. */
+    private static final long serialVersionUID = 1L;
+    /** Group list manager to perform searches on. */
+    private GroupListManager manager;
+    /** Search terms input field. */
+    private JTextField searchTerms;
+
+    /**
+     * Creates a new panel to gather input for a group list search.
+     *
+     * @param manager Group list manager to perform search with
+     */
+    public SearchTermsPanel(final GroupListManager manager) {
+        this.manager = manager;
+        searchTerms = new JTextField();
+        layoutComponents();
+    }
+
+    /** Lays out the components in the panel. */
+    private void layoutComponents() {
+        final JButton search = new JButton("Search");
+        search.addActionListener(this);
+        setLayout(new MigLayout("fill, hidemode 3, ins 0"));
+        add(new JLabel("Search terms: "), "align label");
+        add(searchTerms, "growx, pushx");
+        add(search, "");
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * @param e Action event
+     */
+    @Override
+    public void actionPerformed(final ActionEvent e) {
+        manager.startSearch(searchTerms.getText());
+    }
+}