UI support for multiple selection in popups

Fixes CLIENT-87

Change-Id: I7684eb14f330ee46ed57fd764f5794b1c948672b
Depends-On: Id9d28d2db1f9f972b841f372f322a0968132600d
Reviewed-on: http://gerrit.dmdirc.com/1608
Automatic-Compile: DMDirc Local Commits <dmdirc@googlemail.com>
Reviewed-by: Greg Holmes <greg@dmdirc.com>

src/com/dmdirc/addons/ui_swing/actions/CommandAction.java

@@ -74,7 +74,9 @@ public class CommandAction extends AbstractAction {
      */
     @Override
     public void actionPerformed(final ActionEvent e) {
-        parser.parseCommand(window.getContainer(), window, command);
+        for (String line : command.split("\n")) {
+            parser.parseCommand(window.getContainer(), window, line);
+        }
     }
     
 }

src/com/dmdirc/addons/ui_swing/components/NickList.java

@@ -1,17 +1,17 @@
 /*
- * 
+ *
  * Copyright (c) 2006-2010 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
@@ -165,10 +165,20 @@ public class NickList extends JScrollPane implements ConfigChangeListener,
                 getMousePosition() != null) {
             if (checkCursorInSelectedCell() || selectNickUnderCursor()) {
                 if (e.isPopupTrigger()) {
+                    final Object[] values = nickList.getSelectedValues();
+                    final StringBuilder builder = new StringBuilder();
+
+                    for (Object value : values) {
+                        if (builder.length() > 0) {
+                            builder.append("\n");
+                        }
+
+                        builder.append(((ChannelClientInfo) value).getClient().getNickname());
+                    }
+
                     frame.showPopupMenu(new ClickTypeValue(ClickType.NICKNAME,
-                            ((ChannelClientInfo) nickList.getSelectedValue())
-                            .getClient().getNickname()), new Point(e
-                            .getXOnScreen(), e.getYOnScreen()));
+                            builder.toString()), new Point(e.getXOnScreen(),
+                            e.getYOnScreen()));
                 }
             } else {
                 nickList.clearSelection();

src/com/dmdirc/addons/ui_swing/components/frames/TextFrame.java

@@ -901,10 +901,17 @@ public abstract class TextFrame extends JInternalFrame implements Window,
             final Point point) {
         final JPopupMenu popupMenu;
 
+        final String[] parts = type.getValue().split("\n");
+        final Object[][] arguments = new Object[parts.length][1];
+
+        int i = 0;
+        for (String part : parts) {
+            arguments[i++][0] = part;
+        }
+
         switch (type.getType()) {
             case CHANNEL:
-                popupMenu = getPopupMenu(getChannelPopupType(),
-                        type.getValue());
+                popupMenu = getPopupMenu(getChannelPopupType(), arguments);
                 popupMenu.add(new ChannelCopyAction(type.getValue()));
                 if (popupMenu.getComponentCount() > 1) {
                     popupMenu.addSeparator();
@@ -912,8 +919,7 @@ public abstract class TextFrame extends JInternalFrame implements Window,
 
                 break;
             case HYPERLINK:
-                popupMenu = getPopupMenu(getHyperlinkPopupType(),
-                        type.getValue());
+                popupMenu = getPopupMenu(getHyperlinkPopupType(), arguments);
                 popupMenu.add(new HyperlinkCopyAction(type.getValue()));
                 if (popupMenu.getComponentCount() > 1) {
                     popupMenu.addSeparator();
@@ -921,8 +927,7 @@ public abstract class TextFrame extends JInternalFrame implements Window,
 
                 break;
             case NICKNAME:
-                popupMenu = getPopupMenu(getNicknamePopupType(),
-                        type.getValue());
+                popupMenu = getPopupMenu(getNicknamePopupType(), arguments);
                 if (popupMenu.getComponentCount() > 0) {
                     popupMenu.addSeparator();
                 }
@@ -930,7 +935,7 @@ public abstract class TextFrame extends JInternalFrame implements Window,
                 popupMenu.add(new NicknameCopyAction(type.getValue()));
                 break;
             default:
-                popupMenu = getPopupMenu(null, type.getValue());
+                popupMenu = getPopupMenu(null, arguments);
                 break;
         }
 
@@ -962,9 +967,8 @@ public abstract class TextFrame extends JInternalFrame implements Window,
      *
      * @return PopupMenu
      */
-    public JPopupMenu getPopupMenu(
-            final PopupType type,
-            final Object... arguments) {
+    public JPopupMenu getPopupMenu(final PopupType type,
+            final Object[][] arguments) {
         JPopupMenu popupMenu = new JPopupMenu();
 
         if (type != null) {
@@ -987,7 +991,7 @@ public abstract class TextFrame extends JInternalFrame implements Window,
      */
     private JComponent populatePopupMenu(final JComponent menu,
             final PopupMenu popup,
-            final Object... arguments) {
+            final Object[][] arguments) {
         for (PopupMenuItem menuItem : popup.getItems()) {
             if (menuItem.isDivider()) {
                 menu.add(new JSeparator());

src/com/dmdirc/addons/ui_swing/framemanager/buttonbar/ButtonBar.java

@@ -528,7 +528,8 @@ public final class ButtonBar implements FrameManager, ActionListener,
             if (frame == null) {
                 return;
             }
-            final JPopupMenu popupMenu = frame.getPopupMenu(null, "");
+            final JPopupMenu popupMenu = frame.getPopupMenu(null,
+                    new Object[][] { new Object[] { "" } });
             frame.addCustomPopupItems(popupMenu);
             popupMenu.add(new JMenuItem(new CloseFrameContainerAction(frame.
                         getContainer())));

src/com/dmdirc/addons/ui_swing/framemanager/tree/Tree.java

@@ -277,7 +277,8 @@ public class Tree extends JTree implements MouseMotionListener,
                 return;
             }
 
-            final JPopupMenu popupMenu = frame.getPopupMenu(null, "");
+            final JPopupMenu popupMenu = frame.getPopupMenu(null,
+                    new Object[][] { new Object[] { "" } });
             frame.addCustomPopupItems(popupMenu);
             if (popupMenu.getComponentCount() > 0) {
                 popupMenu.addSeparator();