Просмотр исходного кода

Use TabCompleterUtils instance.

pull/101/head
Chris Smith 9 лет назад
Родитель
Сommit
592e9ddbc9

+ 8
- 3
activewindow/src/com/dmdirc/addons/activewindow/ActiveCommand.java Просмотреть файл

@@ -50,6 +50,8 @@ public class ActiveCommand extends Command implements IntelligentCommand {
50 50
             + "executed in the active window", CommandType.TYPE_GLOBAL);
51 51
     /** Active frame manager. */
52 52
     private final ActiveFrameManager activeFrameManager;
53
+    /** Tab-completer utilities. */
54
+    private final TabCompleterUtils tabUtils;
53 55
 
54 56
     /**
55 57
      * Creates a new active command.
@@ -58,11 +60,14 @@ public class ActiveCommand extends Command implements IntelligentCommand {
58 60
      * @param activeFrameManager The active window manager
59 61
      */
60 62
     @Inject
61
-    public ActiveCommand(final CommandController controller,
62
-            final ActiveFrameManager activeFrameManager) {
63
+    public ActiveCommand(
64
+            final CommandController controller,
65
+            final ActiveFrameManager activeFrameManager,
66
+            final TabCompleterUtils tabUtils) {
63 67
         super(controller);
64 68
 
65 69
         this.activeFrameManager = activeFrameManager;
70
+        this.tabUtils = tabUtils;
66 71
     }
67 72
 
68 73
     @Override
@@ -78,7 +83,7 @@ public class ActiveCommand extends Command implements IntelligentCommand {
78 83
     @Override
79 84
     public AdditionalTabTargets getSuggestions(final int arg,
80 85
             final IntelligentCommandContext context) {
81
-        return TabCompleterUtils.getIntelligentResults(arg, context, 0);
86
+        return tabUtils.getIntelligentResults(arg, context, 0);
82 87
     }
83 88
 
84 89
 }

+ 7
- 3
nowplaying/src/com/dmdirc/addons/nowplaying/NowPlayingCommand.java Просмотреть файл

@@ -55,6 +55,8 @@ public class NowPlayingCommand extends Command implements IntelligentCommand {
55 55
             CommandType.TYPE_CHAT);
56 56
     /** Now playing manager to get and handle sources. */
57 57
     private final NowPlayingManager manager;
58
+    /** Tab-completer utilities. */
59
+    private final TabCompleterUtils tabCompleterUtils;
58 60
     /** Global configuration to read settings from. */
59 61
     private final AggregateConfigProvider globalConfig;
60 62
     /** This plugin's settings domain. */
@@ -72,10 +74,12 @@ public class NowPlayingCommand extends Command implements IntelligentCommand {
72 74
     public NowPlayingCommand(
73 75
             final CommandController controller,
74 76
             final NowPlayingManager manager,
77
+            final TabCompleterUtils tabCompleterUtils,
75 78
             @GlobalConfig final AggregateConfigProvider globalConfig,
76 79
             @PluginDomain(NowPlayingPlugin.class) final String domain) {
77 80
         super(controller);
78 81
         this.manager = manager;
82
+        this.tabCompleterUtils = tabCompleterUtils;
79 83
         this.globalConfig = globalConfig;
80 84
         this.domain = domain;
81 85
     }
@@ -179,7 +183,7 @@ public class NowPlayingCommand extends Command implements IntelligentCommand {
179 183
                 "$bitrate", "$format", "$length", "$state", "$time");
180 184
 
181 185
         if (arg == 0) {
182
-            final AdditionalTabTargets res = TabCompleterUtils.
186
+            final AdditionalTabTargets res = tabCompleterUtils.
183 187
                     getIntelligentResults(arg, context, 0);
184 188
             res.add("--sources");
185 189
             res.add("--source");
@@ -195,12 +199,12 @@ public class NowPlayingCommand extends Command implements IntelligentCommand {
195 199
             }
196 200
             return res;
197 201
         } else if (arg > 1 && context.getPreviousArgs().get(0).equalsIgnoreCase("--source")) {
198
-            final AdditionalTabTargets res = TabCompleterUtils
202
+            final AdditionalTabTargets res = tabCompleterUtils
199 203
                     .getIntelligentResults(arg, context, 2);
200 204
             res.addAll(subsList);
201 205
             return res;
202 206
         } else {
203
-            final AdditionalTabTargets res = TabCompleterUtils
207
+            final AdditionalTabTargets res = tabCompleterUtils
204 208
                     .getIntelligentResults(arg, context,
205 209
                             context.getPreviousArgs().get(0).equalsIgnoreCase("--sources") ? 1 : 0);
206 210
             res.addAll(subsList);

+ 6
- 2
redirect/src/com/dmdirc/addons/redirect/RedirectCommand.java Просмотреть файл

@@ -59,6 +59,8 @@ public class RedirectCommand extends Command implements IntelligentCommand {
59 59
     /** The bus to dispatch events on. */
60 60
     private final DMDircMBassador eventBus;
61 61
     private final ColourManagerFactory colourManagerFactory;
62
+    /** Tab-completer utilities. */
63
+    private final TabCompleterUtils tabCompleterUtils;
62 64
 
63 65
     /**
64 66
      * Creates a new instance of this command.
@@ -74,12 +76,14 @@ public class RedirectCommand extends Command implements IntelligentCommand {
74 76
             final MessageSinkManager messageSinkManager,
75 77
             final URLBuilder urlBuilder,
76 78
             final DMDircMBassador eventBus,
77
-            final ColourManagerFactory colourManagerFactory) {
79
+            final ColourManagerFactory colourManagerFactory,
80
+            final TabCompleterUtils tabCompleterUtils) {
78 81
         super(controller);
79 82
         this.messageSinkManager = messageSinkManager;
80 83
         this.urlBuilder = urlBuilder;
81 84
         this.eventBus = eventBus;
82 85
         this.colourManagerFactory = colourManagerFactory;
86
+        this.tabCompleterUtils = tabCompleterUtils;
83 87
     }
84 88
 
85 89
     @Override
@@ -94,7 +98,7 @@ public class RedirectCommand extends Command implements IntelligentCommand {
94 98
     @Override
95 99
     public AdditionalTabTargets getSuggestions(final int arg,
96 100
             final IntelligentCommandContext context) {
97
-        return TabCompleterUtils.getIntelligentResults(arg, context, 0);
101
+        return tabCompleterUtils.getIntelligentResults(arg, context, 0);
98 102
     }
99 103
 
100 104
 }

+ 4
- 2
redirect/test/com/dmdirc/addons/redirect/RedirectCommandTest.java Просмотреть файл

@@ -34,6 +34,7 @@ import com.dmdirc.interfaces.ui.InputWindow;
34 34
 import com.dmdirc.messages.MessageSinkManager;
35 35
 import com.dmdirc.ui.WindowManager;
36 36
 import com.dmdirc.ui.input.TabCompleter;
37
+import com.dmdirc.ui.input.TabCompleterUtils;
37 38
 import com.dmdirc.ui.messages.ColourManagerFactory;
38 39
 import com.dmdirc.util.URLBuilder;
39 40
 
@@ -68,6 +69,7 @@ public class RedirectCommandTest {
68 69
     @Mock private URLBuilder urlBuilder;
69 70
     @Mock private DMDircMBassador eventBus;
70 71
     @Mock private ColourManagerFactory colourManagerFactory;
72
+    @Mock private TabCompleterUtils tabCompleterUtils;
71 73
 
72 74
     @Before
73 75
     public void setup() {
@@ -83,7 +85,7 @@ public class RedirectCommandTest {
83 85
             @Override
84 86
             public Void answer(final InvocationOnMock invocation) throws Throwable {
85 87
                 new Echo(commandController, windowManager).execute(
86
-                        ((FrameContainer) invocation.getArguments()[0]),
88
+                        (FrameContainer) invocation.getArguments()[0],
87 89
                         new CommandArguments(commandController, "/echo test"),
88 90
                         null);
89 91
                 return null;
@@ -94,7 +96,7 @@ public class RedirectCommandTest {
94 96
     @Test
95 97
     public void testExecute() {
96 98
         final RedirectCommand command = new RedirectCommand(commandController, messageSinkManager,
97
-                urlBuilder, eventBus, colourManagerFactory);
99
+                urlBuilder, eventBus, colourManagerFactory, tabCompleterUtils);
98 100
 
99 101
         command.execute(target, new CommandArguments(commandController, "/redirect /echo test"),
100 102
                 new ChatCommandContext(frameContainer, RedirectCommand.INFO, target));

+ 3
- 1
ui_swing/src/com/dmdirc/addons/ui_swing/components/TopicBar.java Просмотреть файл

@@ -37,6 +37,7 @@ import com.dmdirc.interfaces.config.AggregateConfigProvider;
37 37
 import com.dmdirc.interfaces.config.ConfigChangeListener;
38 38
 import com.dmdirc.plugins.PluginManager;
39 39
 import com.dmdirc.ui.IconManager;
40
+import com.dmdirc.ui.input.TabCompleterUtils;
40 41
 import com.dmdirc.ui.messages.ColourManager;
41 42
 import com.dmdirc.ui.messages.Styliser;
42 43
 
@@ -131,6 +132,7 @@ public class TopicBar extends JComponent implements ActionListener, ConfigChange
131 132
             final Channel channel,
132 133
             final ChannelFrame window,
133 134
             final IconManager iconManager,
135
+            final TabCompleterUtils tabCompleterUtils,
134 136
             final DMDircMBassador eventBus) {
135 137
         this.channel = channel;
136 138
         this.domain = domain;
@@ -155,7 +157,7 @@ public class TopicBar extends JComponent implements ActionListener, ConfigChange
155 157
 
156 158
         final SwingInputHandler handler = new SwingInputHandler(
157 159
                 pluginManager, topicText, commandController, channel.getCommandParser(),
158
-                channel, channel.getEventBus());
160
+                channel, tabCompleterUtils, channel.getEventBus());
159 161
         handler.setTypes(true, false, true, false);
160 162
         handler.setTabCompleter(channel.getTabCompleter());
161 163
 

+ 6
- 2
ui_swing/src/com/dmdirc/addons/ui_swing/components/TopicBarFactory.java Просмотреть файл

@@ -32,6 +32,7 @@ import com.dmdirc.interfaces.config.AggregateConfigProvider;
32 32
 import com.dmdirc.plugins.PluginDomain;
33 33
 import com.dmdirc.plugins.PluginManager;
34 34
 import com.dmdirc.ui.IconManager;
35
+import com.dmdirc.ui.input.TabCompleterUtils;
35 36
 import com.dmdirc.ui.messages.ColourManagerFactory;
36 37
 
37 38
 import java.awt.Window;
@@ -57,6 +58,7 @@ public class TopicBarFactory {
57 58
     private final Clipboard clipboard;
58 59
     private final CommandController commandController;
59 60
     private final DMDircMBassador eventBus;
61
+    private final TabCompleterUtils tabCompleterUtils;
60 62
 
61 63
     @Inject
62 64
     public TopicBarFactory(
@@ -67,7 +69,8 @@ public class TopicBarFactory {
67 69
             final PluginManager pluginManager,
68 70
             final Clipboard clipboard,
69 71
             final CommandController commandController,
70
-            final DMDircMBassador eventBus) {
72
+            final DMDircMBassador eventBus,
73
+            final TabCompleterUtils tabCompleterUtils) {
71 74
         this.parentWindow = parentWindow;
72 75
         this.globalConfig = globalConfig;
73 76
         this.domain = domain;
@@ -76,6 +79,7 @@ public class TopicBarFactory {
76 79
         this.clipboard = clipboard;
77 80
         this.commandController = commandController;
78 81
         this.eventBus = eventBus;
82
+        this.tabCompleterUtils = tabCompleterUtils;
79 83
     }
80 84
 
81 85
     public TopicBar getTopicBar(
@@ -85,7 +89,7 @@ public class TopicBarFactory {
85 89
         return new TopicBar(parentWindow.get(), globalConfig, domain,
86 90
                 colourManagerFactory.getColourManager(channel.getConfigManager()),
87 91
                 pluginManager, clipboard, commandController, channel, window, iconManager,
88
-                eventBus);
92
+                tabCompleterUtils, eventBus);
89 93
     }
90 94
 
91 95
 }

+ 5
- 3
ui_swing/src/com/dmdirc/addons/ui_swing/components/frames/InputTextFrame.java Просмотреть файл

@@ -40,6 +40,7 @@ import com.dmdirc.interfaces.ui.InputWindow;
40 40
 import com.dmdirc.logger.ErrorLevel;
41 41
 import com.dmdirc.plugins.PluginManager;
42 42
 import com.dmdirc.ui.input.InputHandler;
43
+import com.dmdirc.ui.input.TabCompleterUtils;
43 44
 
44 45
 import java.awt.BorderLayout;
45 46
 import java.awt.Point;
@@ -118,7 +119,7 @@ public abstract class InputTextFrame extends TextFrame implements InputWindow,
118 119
         commandController = deps.commandController;
119 120
         eventBus = deps.eventBus;
120 121
 
121
-        initComponents(inputFieldProvider);
122
+        initComponents(inputFieldProvider, deps.tabCompleterUtils);
122 123
 
123 124
         if (!UIUtilities.isGTKUI()) {
124 125
             //GTK users appear to dislike choice, ignore them if they want some.
@@ -157,10 +158,11 @@ public abstract class InputTextFrame extends TextFrame implements InputWindow,
157 158
      *
158 159
      * @param inputFieldProvider The provider to use to create a new input field.
159 160
      */
160
-    private void initComponents(final Provider<SwingInputField> inputFieldProvider) {
161
+    private void initComponents(final Provider<SwingInputField> inputFieldProvider,
162
+            final TabCompleterUtils tabCompleterUtils) {
161 163
         inputField = inputFieldProvider.get();
162 164
         inputHandler = new SwingInputHandler(pluginManager, inputField, commandController,
163
-                getContainer().getCommandParser(), getContainer(), eventBus);
165
+                getContainer().getCommandParser(), getContainer(), tabCompleterUtils, eventBus);
164 166
         inputHandler.addValidationListener(inputField);
165 167
         inputHandler.setTabCompleter(frameParent.getTabCompleter());
166 168
 

+ 5
- 1
ui_swing/src/com/dmdirc/addons/ui_swing/components/frames/TextFrame.java Просмотреть файл

@@ -61,6 +61,7 @@ import com.dmdirc.interfaces.config.AggregateConfigProvider;
61 61
 import com.dmdirc.interfaces.config.ConfigChangeListener;
62 62
 import com.dmdirc.plugins.PluginManager;
63 63
 import com.dmdirc.ui.IconManager;
64
+import com.dmdirc.ui.input.TabCompleterUtils;
64 65
 import com.dmdirc.ui.messages.ColourManager;
65 66
 import com.dmdirc.ui.messages.ColourManagerFactory;
66 67
 
@@ -567,6 +568,7 @@ public abstract class TextFrame extends JPanel implements com.dmdirc.interfaces.
567 568
         final CommandController commandController;
568 569
         final ColourManagerFactory colourManagerFactory;
569 570
         final SwingEventBus swingEventBus;
571
+        final TabCompleterUtils tabCompleterUtils;
570 572
 
571 573
         @Inject
572 574
         public TextFrameDependencies(
@@ -583,7 +585,8 @@ public abstract class TextFrame extends JPanel implements com.dmdirc.interfaces.
583 585
                 final Clipboard clipboard,
584 586
                 final CommandController commandController,
585 587
                 final ColourManagerFactory colourManagerFactory,
586
-                final SwingEventBus swingEventBus) {
588
+                final SwingEventBus swingEventBus,
589
+                final TabCompleterUtils tabCompleterUtils) {
587 590
             this.textPaneFactory = textPaneFactory;
588 591
             this.controller = controller;
589 592
             this.mainWindow = mainWindow;
@@ -598,6 +601,7 @@ public abstract class TextFrame extends JPanel implements com.dmdirc.interfaces.
598 601
             this.commandController = commandController;
599 602
             this.colourManagerFactory = colourManagerFactory;
600 603
             this.swingEventBus = swingEventBus;
604
+            this.tabCompleterUtils = tabCompleterUtils;
601 605
         }
602 606
 
603 607
     }

+ 4
- 1
ui_swing/src/com/dmdirc/addons/ui_swing/components/inputfields/SwingInputHandler.java Просмотреть файл

@@ -32,6 +32,7 @@ import com.dmdirc.interfaces.CommandController;
32 32
 import com.dmdirc.interfaces.ui.InputField;
33 33
 import com.dmdirc.plugins.ServiceManager;
34 34
 import com.dmdirc.ui.input.InputHandler;
35
+import com.dmdirc.ui.input.TabCompleterUtils;
35 36
 
36 37
 import java.awt.event.ActionEvent;
37 38
 import java.awt.event.KeyEvent;
@@ -66,8 +67,10 @@ public class SwingInputHandler extends InputHandler implements KeyListener {
66 67
             final CommandController commandController,
67 68
             final CommandParser commandParser,
68 69
             final FrameContainer parentWindow,
70
+            final TabCompleterUtils tabCompleterUtils,
69 71
             final DMDircMBassador eventBus) {
70
-        super(serviceManager, target, commandController, commandParser, parentWindow, eventBus);
72
+        super(serviceManager, target, commandController, commandParser, parentWindow,
73
+                tabCompleterUtils, eventBus);
71 74
         this.eventBus = eventBus;
72 75
     }
73 76
 

+ 8
- 6
ui_swing/src/com/dmdirc/addons/ui_swing/dialogs/channelsetting/ChannelSettingsDialog.java Просмотреть файл

@@ -36,6 +36,7 @@ import com.dmdirc.interfaces.config.ConfigProvider;
36 36
 import com.dmdirc.interfaces.config.IdentityFactory;
37 37
 import com.dmdirc.interfaces.ui.InputWindow;
38 38
 import com.dmdirc.plugins.ServiceManager;
39
+import com.dmdirc.ui.input.TabCompleterUtils;
39 40
 import com.dmdirc.ui.messages.ColourManagerFactory;
40 41
 
41 42
 import java.awt.Window;
@@ -119,7 +120,8 @@ public class ChannelSettingsDialog extends StandardDialog implements ActionListe
119 120
             final Clipboard clipboard,
120 121
             final CommandController commandController,
121 122
             final DMDircMBassador eventBus,
122
-            final ColourManagerFactory colourManagerFactory) {
123
+            final ColourManagerFactory colourManagerFactory,
124
+            final TabCompleterUtils tabCompleterUtils) {
123 125
         super(parentWindow, ModalityType.MODELESS);
124 126
 
125 127
         this.userConfig = checkNotNull(userConfig);
@@ -136,12 +138,12 @@ public class ChannelSettingsDialog extends StandardDialog implements ActionListe
136 138
                 channel.getChannelInfo().getName());
137 139
         channelWindow = (InputWindow) windowFactory.getSwingWindow(channel);
138 140
 
139
-        initComponents();
141
+        initComponents(tabCompleterUtils);
140 142
         initListeners();
141 143
     }
142 144
 
143 145
     /** Initialises the main UI components. */
144
-    private void initComponents() {
146
+    private void initComponents(final TabCompleterUtils tabCompleterUtils) {
145 147
         tabbedPane = new JTabbedPane();
146 148
 
147 149
         setDefaultCloseOperation(WindowConstants.DISPOSE_ON_CLOSE);
@@ -156,7 +158,7 @@ public class ChannelSettingsDialog extends StandardDialog implements ActionListe
156 158
         getContentPane().add(getLeftButton(), "split 3, right");
157 159
         getContentPane().add(getRightButton(), "right");
158 160
 
159
-        initTopicTab();
161
+        initTopicTab(tabCompleterUtils);
160 162
 
161 163
         initIrcTab();
162 164
 
@@ -169,10 +171,10 @@ public class ChannelSettingsDialog extends StandardDialog implements ActionListe
169 171
     }
170 172
 
171 173
     /** Initialises the Topic tab. */
172
-    private void initTopicTab() {
174
+    private void initTopicTab(final TabCompleterUtils tabCompleterUtils) {
173 175
         topicModesPane = new TopicPane(channel, channel.getIconManager(),
174 176
                 commandController, serviceManager,
175
-                this, channelWindow, clipboard, eventBus, colourManagerFactory);
177
+                this, channelWindow, clipboard, eventBus, colourManagerFactory, tabCompleterUtils);
176 178
         tabbedPane.addTab("Topic", topicModesPane);
177 179
     }
178 180
 

+ 7
- 4
ui_swing/src/com/dmdirc/addons/ui_swing/dialogs/channelsetting/TopicDisplayPane.java Просмотреть файл

@@ -35,6 +35,7 @@ import com.dmdirc.interfaces.config.AggregateConfigProvider;
35 35
 import com.dmdirc.interfaces.ui.InputWindow;
36 36
 import com.dmdirc.plugins.ServiceManager;
37 37
 import com.dmdirc.ui.IconManager;
38
+import com.dmdirc.ui.input.TabCompleterUtils;
38 39
 import com.dmdirc.ui.messages.ColourManagerFactory;
39 40
 
40 41
 import java.awt.Color;
@@ -95,7 +96,8 @@ public class TopicDisplayPane extends JPanel implements DocumentListener {
95 96
             final ServiceManager serviceManager, final ChannelSettingsDialog parent,
96 97
             final InputWindow channelWindow, final Clipboard clipboard,
97 98
             final CommandController commandController, final DMDircMBassador eventBus,
98
-            final ColourManagerFactory colourManagerFactory) {
99
+            final ColourManagerFactory colourManagerFactory,
100
+            final TabCompleterUtils tabCompleterUtils) {
99 101
         this.clipboard = clipboard;
100 102
         this.channel = channel;
101 103
         this.parent = parent;
@@ -104,7 +106,7 @@ public class TopicDisplayPane extends JPanel implements DocumentListener {
104 106
         this.eventBus = eventBus;
105 107
 
106 108
         initComponents(iconManager, channel.getConfigManager(), serviceManager, commandController,
107
-                colourManagerFactory);
109
+                colourManagerFactory, tabCompleterUtils);
108 110
         addListeners();
109 111
         layoutComponents();
110 112
 
@@ -116,7 +118,8 @@ public class TopicDisplayPane extends JPanel implements DocumentListener {
116 118
             final AggregateConfigProvider config,
117 119
             final ServiceManager serviceManager,
118 120
             final CommandController commandController,
119
-            final ColourManagerFactory colourManagerFactory) {
121
+            final ColourManagerFactory colourManagerFactory,
122
+            final TabCompleterUtils tabCompleterUtils) {
120 123
         topicLengthLabel = new JLabel();
121 124
         topicText = new TextAreaInputField(iconManager, colourManagerFactory, config, 100, 4);
122 125
         topicWho = new TextLabel();
@@ -128,7 +131,7 @@ public class TopicDisplayPane extends JPanel implements DocumentListener {
128 131
         topicText.setColumns(30);
129 132
         final SwingInputHandler handler = new SwingInputHandler(serviceManager, topicText,
130 133
                 commandController, channel.getCommandParser(), channelWindow.getContainer(),
131
-                channel.getEventBus());
134
+                tabCompleterUtils, channel.getEventBus());
132 135
         handler.setTypes(true, false, true, false);
133 136
         handler.setTabCompleter(channel.getTabCompleter());
134 137
 

+ 9
- 4
ui_swing/src/com/dmdirc/addons/ui_swing/dialogs/channelsetting/TopicPane.java Просмотреть файл

@@ -29,6 +29,7 @@ import com.dmdirc.interfaces.CommandController;
29 29
 import com.dmdirc.interfaces.ui.InputWindow;
30 30
 import com.dmdirc.plugins.ServiceManager;
31 31
 import com.dmdirc.ui.IconManager;
32
+import com.dmdirc.ui.input.TabCompleterUtils;
32 33
 import com.dmdirc.ui.messages.ColourManagerFactory;
33 34
 
34 35
 import java.awt.datatransfer.Clipboard;
@@ -75,7 +76,8 @@ public class TopicPane extends JPanel implements ActionListener {
75 76
             final ServiceManager serviceManager, final ChannelSettingsDialog parent,
76 77
             final InputWindow channelWindow, final Clipboard clipboard,
77 78
             final DMDircMBassador eventBus,
78
-            final ColourManagerFactory colourManagerFactory) {
79
+            final ColourManagerFactory colourManagerFactory,
80
+            final TabCompleterUtils tabCompleterUtils) {
79 81
         setOpaque(UIUtilities.getTabbedPaneOpaque());
80 82
         this.channel = channel;
81 83
         this.parent = parent;
@@ -85,7 +87,8 @@ public class TopicPane extends JPanel implements ActionListener {
85 87
         setVisible(false);
86 88
 
87 89
         removeAll();
88
-        initTopicsPanel(iconManager, serviceManager, commandController, eventBus, colourManagerFactory);
90
+        initTopicsPanel(iconManager, serviceManager, commandController, eventBus,
91
+                colourManagerFactory, tabCompleterUtils);
89 92
         layoutComponents();
90 93
 
91 94
         topicHistoryPane.addActionListener(this);
@@ -98,9 +101,11 @@ public class TopicPane extends JPanel implements ActionListener {
98 101
             final ServiceManager serviceManager,
99 102
             final CommandController commandController,
100 103
             final DMDircMBassador eventBus,
101
-            final ColourManagerFactory colourManagerFactory) {
104
+            final ColourManagerFactory colourManagerFactory,
105
+            final TabCompleterUtils tabCompleterUtils) {
102 106
         topicDisplayPane = new TopicDisplayPane(channel, iconManager, serviceManager, parent,
103
-                channelWindow, clipboard, commandController, eventBus, colourManagerFactory);
107
+                channelWindow, clipboard, commandController, eventBus, colourManagerFactory,
108
+                tabCompleterUtils);
104 109
         topicHistoryPane = new TopicHistoryPane(channel);
105 110
     }
106 111
 

+ 8
- 4
ui_swing/src/com/dmdirc/addons/ui_swing/dialogs/paste/PasteDialog.java Просмотреть файл

@@ -33,6 +33,7 @@ import com.dmdirc.interfaces.CommandController;
33 33
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
34 34
 import com.dmdirc.plugins.PluginManager;
35 35
 import com.dmdirc.ui.IconManager;
36
+import com.dmdirc.ui.input.TabCompleterUtils;
36 37
 import com.dmdirc.ui.messages.ColourManagerFactory;
37 38
 
38 39
 import java.awt.Window;
@@ -101,7 +102,8 @@ public final class PasteDialog extends StandardDialog implements ActionListener,
101 102
             final InputTextFrame newParent,
102 103
             final String text,
103 104
             final Window parentWindow,
104
-            final ColourManagerFactory colourManagerFactory) {
105
+            final ColourManagerFactory colourManagerFactory,
106
+            final TabCompleterUtils tabCompleterUtils) {
105 107
         super(parentWindow, ModalityType.MODELESS);
106 108
 
107 109
         parent = newParent;
@@ -111,7 +113,7 @@ public final class PasteDialog extends StandardDialog implements ActionListener,
111 113
         this.pluginManager = pluginManager;
112 114
         this.commandController = commandController;
113 115
 
114
-        initComponents(eventBus, text, colourManagerFactory);
116
+        initComponents(eventBus, text, colourManagerFactory, tabCompleterUtils);
115 117
         initListeners();
116 118
 
117 119
         setFocusTraversalPolicy(new PasteDialogFocusTraversalPolicy(
@@ -128,7 +130,8 @@ public final class PasteDialog extends StandardDialog implements ActionListener,
128 130
      * @param text text to show in the dialog
129 131
      */
130 132
     private void initComponents(final DMDircMBassador eventBus, final String text,
131
-            final ColourManagerFactory colourManagerFactory) {
133
+            final ColourManagerFactory colourManagerFactory,
134
+            final TabCompleterUtils tabCompleterUtils) {
132 135
         scrollPane = new JScrollPane();
133 136
         textField = new TextAreaInputField(iconManager, colourManagerFactory, config, text);
134 137
         editButton = new JButton("Edit");
@@ -152,7 +155,8 @@ public final class PasteDialog extends StandardDialog implements ActionListener,
152 155
 
153 156
         new SwingInputHandler(pluginManager, textField, commandController,
154 157
                 parent.getContainer().getCommandParser(),
155
-                parent.getContainer(), eventBus).setTypes(false, false, true, false);
158
+                parent.getContainer(), tabCompleterUtils, eventBus)
159
+                .setTypes(false, false, true,false);
156 160
 
157 161
         scrollPane.setViewportView(textField);
158 162
         scrollPane.setVisible(false);

+ 6
- 2
ui_swing/src/com/dmdirc/addons/ui_swing/dialogs/paste/PasteDialogFactory.java Просмотреть файл

@@ -29,6 +29,7 @@ import com.dmdirc.interfaces.CommandController;
29 29
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
30 30
 import com.dmdirc.plugins.PluginManager;
31 31
 import com.dmdirc.ui.IconManager;
32
+import com.dmdirc.ui.input.TabCompleterUtils;
32 33
 import com.dmdirc.ui.messages.ColourManagerFactory;
33 34
 
34 35
 import java.awt.Window;
@@ -48,6 +49,7 @@ public class PasteDialogFactory {
48 49
     private final CommandController commandController;
49 50
     private final DMDircMBassador eventBus;
50 51
     private final ColourManagerFactory colourManagerFactory;
52
+    private final TabCompleterUtils tabCompleterUtils;
51 53
 
52 54
     @Inject
53 55
     public PasteDialogFactory(
@@ -56,19 +58,21 @@ public class PasteDialogFactory {
56 58
             final PluginManager pluginManager,
57 59
             final CommandController commandController,
58 60
             final DMDircMBassador eventBus,
59
-            final ColourManagerFactory colourManagerFactory) {
61
+            final ColourManagerFactory colourManagerFactory,
62
+            final TabCompleterUtils tabCompleterUtils) {
60 63
         this.iconManager = iconManager;
61 64
         this.config = config;
62 65
         this.pluginManager = pluginManager;
63 66
         this.commandController = commandController;
64 67
         this.eventBus = eventBus;
65 68
         this.colourManagerFactory = colourManagerFactory;
69
+        this.tabCompleterUtils = tabCompleterUtils;
66 70
     }
67 71
 
68 72
     public PasteDialog getPasteDialog(final InputTextFrame newParent, final String text,
69 73
             final Window parentWindow) {
70 74
         return new PasteDialog(iconManager, config, pluginManager, commandController, eventBus,
71
-                newParent, text, parentWindow, colourManagerFactory);
75
+                newParent, text, parentWindow, colourManagerFactory, tabCompleterUtils);
72 76
     }
73 77
 
74 78
 }

+ 5
- 2
ui_swing/src/com/dmdirc/addons/ui_swing/injection/DialogModule.java Просмотреть файл

@@ -55,6 +55,7 @@ import com.dmdirc.plugins.ServiceManager;
55 55
 import com.dmdirc.ui.core.aliases.CoreAliasDialogModel;
56 56
 import com.dmdirc.ui.core.feedback.CoreFeedbackDialogModel;
57 57
 import com.dmdirc.ui.core.newserver.CoreNewServerDialogModel;
58
+import com.dmdirc.ui.input.TabCompleterUtils;
58 59
 import com.dmdirc.ui.messages.ColourManagerFactory;
59 60
 
60 61
 import java.awt.Window;
@@ -181,13 +182,15 @@ public class DialogModule {
181 182
             final Clipboard clipboard,
182 183
             final CommandController commandController,
183 184
             final DMDircMBassador eventBus,
184
-            final ColourManagerFactory colourManagerFactory) {
185
+            final ColourManagerFactory colourManagerFactory,
186
+            final TabCompleterUtils tabCompleterUtils) {
185 187
         return new KeyedDialogProvider<Channel, ChannelSettingsDialog>() {
186 188
             @Override
187 189
             protected ChannelSettingsDialog getInstance(final Channel key) {
188 190
                 return new ChannelSettingsDialog(identityFactory, windowFactory,
189 191
                         userConfig, serviceManager, preferencesManager, compFactory, key,
190
-                        parentWindow, clipboard, commandController, eventBus, colourManagerFactory);
192
+                        parentWindow, clipboard, commandController, eventBus,
193
+                        colourManagerFactory, tabCompleterUtils);
191 194
             }
192 195
         };
193 196
     }

Загрузка…
Отмена
Сохранить