|
@@ -25,17 +25,12 @@ package com.dmdirc.addons.ui_swing.components.frames;
|
25
|
25
|
import com.dmdirc.WritableFrameContainer;
|
26
|
26
|
import com.dmdirc.addons.ui_swing.SwingController;
|
27
|
27
|
import com.dmdirc.addons.ui_swing.UIUtilities;
|
28
|
|
-import com.dmdirc.addons.ui_swing.actions.CommandAction;
|
29
|
28
|
import com.dmdirc.addons.ui_swing.actions.CopyAction;
|
30
|
29
|
import com.dmdirc.addons.ui_swing.actions.CutAction;
|
31
|
30
|
import com.dmdirc.addons.ui_swing.actions.InputFieldCopyAction;
|
32
|
31
|
import com.dmdirc.addons.ui_swing.actions.InputTextFramePasteAction;
|
33
|
32
|
import com.dmdirc.addons.ui_swing.components.inputfields.SwingInputField;
|
34
|
33
|
import com.dmdirc.addons.ui_swing.dialogs.paste.PasteDialog;
|
35
|
|
-import com.dmdirc.commandparser.PopupManager;
|
36
|
|
-import com.dmdirc.commandparser.PopupMenu;
|
37
|
|
-import com.dmdirc.commandparser.PopupMenuItem;
|
38
|
|
-import com.dmdirc.commandparser.PopupType;
|
39
|
34
|
import com.dmdirc.config.ConfigManager;
|
40
|
35
|
import com.dmdirc.interfaces.AwayStateListener;
|
41
|
36
|
import com.dmdirc.logger.ErrorLevel;
|
|
@@ -53,13 +48,9 @@ import java.awt.event.MouseEvent;
|
53
|
48
|
import java.awt.event.MouseListener;
|
54
|
49
|
import java.io.IOException;
|
55
|
50
|
|
56
|
|
-import javax.swing.JComponent;
|
57
|
51
|
import javax.swing.JLabel;
|
58
|
|
-import javax.swing.JMenu;
|
59
|
|
-import javax.swing.JMenuItem;
|
60
|
52
|
import javax.swing.JPanel;
|
61
|
53
|
import javax.swing.JPopupMenu;
|
62
|
|
-import javax.swing.JSeparator;
|
63
|
54
|
import javax.swing.KeyStroke;
|
64
|
55
|
import javax.swing.event.InternalFrameEvent;
|
65
|
56
|
|
|
@@ -441,47 +432,6 @@ public abstract class InputTextFrame extends TextFrame implements InputWindow,
|
441
|
432
|
}
|
442
|
433
|
}
|
443
|
434
|
|
444
|
|
- /**
|
445
|
|
- * Popuplates the nicklist popup.
|
446
|
|
- *
|
447
|
|
- * @param nickname Nickname for the popup
|
448
|
|
- */
|
449
|
|
- protected final void popuplateNicklistPopup(final String nickname) {
|
450
|
|
- final PopupMenu popups = PopupManager.getMenu(PopupType.CHAN_NICK,
|
451
|
|
- getContainer().getConfigManager());
|
452
|
|
-
|
453
|
|
- nickPopup = (JPopupMenu) populatePopupMenu(new JPopupMenu(), popups,
|
454
|
|
- nickname);
|
455
|
|
- }
|
456
|
|
-
|
457
|
|
- /**
|
458
|
|
- * Populates the specified popupmenu
|
459
|
|
- *
|
460
|
|
- * @param menu Menu component
|
461
|
|
- * @param popup Popup to get info from
|
462
|
|
- * @param arguments Arguments for the command
|
463
|
|
- *
|
464
|
|
- * @return Populated popup
|
465
|
|
- */
|
466
|
|
- private JComponent populatePopupMenu(final JComponent menu,
|
467
|
|
- final PopupMenu popup, final Object... arguments) {
|
468
|
|
- for (PopupMenuItem menuItem : popup.getItems()) {
|
469
|
|
- if (menuItem.isDivider()) {
|
470
|
|
- menu.add(new JSeparator());
|
471
|
|
- } else if (menuItem.isSubMenu()) {
|
472
|
|
- menu.add(populatePopupMenu(new JMenu(menuItem.getName()),
|
473
|
|
- menuItem.getSubMenu(), arguments));
|
474
|
|
- } else {
|
475
|
|
- menu.add(
|
476
|
|
- new JMenuItem(
|
477
|
|
- new CommandAction(getContainer().getCommandParser(),
|
478
|
|
- this, menuItem.getName(), menuItem.getCommand(
|
479
|
|
- arguments))));
|
480
|
|
- }
|
481
|
|
- }
|
482
|
|
- return menu;
|
483
|
|
- }
|
484
|
|
-
|
485
|
435
|
/** Request input field focus. */
|
486
|
436
|
public void requestInputFieldFocus() {
|
487
|
437
|
if (inputField != null) {
|