Browse Source

Update plugins for core FrameContainer changes.

Change-Id: I15ab9677fdbcb510ab87a69a07ce8ecb3a994f7f
Depends-On: Ifa80de021c22d2e302d4b66514923cd08c91cac4
Reviewed-on: http://gerrit.dmdirc.com/3421
Automatic-Compile: DMDirc Build Manager
Reviewed-by: Greg Holmes <greg@dmdirc.com>
changes/21/3421/2
Chris Smith 10 years ago
parent
commit
48daeb0fbe

+ 3
- 10
src/com/dmdirc/addons/dcc/DCCFrameContainer.java View File

@@ -27,7 +27,6 @@ import com.dmdirc.commandparser.parsers.CommandParser;
27 27
 import com.dmdirc.interfaces.Connection;
28 28
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
29 29
 import com.dmdirc.messages.MessageSinkManager;
30
-import com.dmdirc.ui.input.TabCompleter;
31 30
 import com.dmdirc.ui.input.TabCompleterFactory;
32 31
 import com.dmdirc.util.URLBuilder;
33 32
 
@@ -38,8 +37,6 @@ import java.util.Collection;
38 37
  */
39 38
 public abstract class DCCFrameContainer extends WritableFrameContainer {
40 39
 
41
-    /** The factory to use to create tab completers. */
42
-    private final TabCompleterFactory tabCompleterFactory;
43 40
     /** The Window we're using. */
44 41
     private boolean windowClosing = false;
45 42
 
@@ -64,9 +61,10 @@ public abstract class DCCFrameContainer extends WritableFrameContainer {
64 61
             final TabCompleterFactory tabCompleterFactory,
65 62
             final URLBuilder urlBuilder,
66 63
             final Collection<String> components) {
67
-        super(icon, title, title, configManager, parser, messageSinkManager, urlBuilder,
64
+        super(icon, title, title, configManager, parser,
65
+                tabCompleterFactory.getTabCompleter(configManager),
66
+                messageSinkManager, urlBuilder,
68 67
                 components);
69
-        this.tabCompleterFactory = tabCompleterFactory;
70 68
     }
71 69
 
72 70
     @Override
@@ -79,11 +77,6 @@ public abstract class DCCFrameContainer extends WritableFrameContainer {
79 77
         return null;
80 78
     }
81 79
 
82
-    @Override
83
-    public TabCompleter getTabCompleter() {
84
-        return tabCompleterFactory.getTabCompleter(getConfigManager());
85
-    }
86
-
87 80
     /**
88 81
      * Is the window closing?
89 82
      *

+ 2
- 7
src/com/dmdirc/addons/redirect/FakeWriteableFrameContainer.java View File

@@ -26,7 +26,6 @@ import com.dmdirc.MessageTarget;
26 26
 import com.dmdirc.WritableFrameContainer;
27 27
 import com.dmdirc.interfaces.Connection;
28 28
 import com.dmdirc.messages.MessageSinkManager;
29
-import com.dmdirc.ui.input.TabCompleter;
30 29
 import com.dmdirc.ui.messages.Formatter;
31 30
 import com.dmdirc.util.URLBuilder;
32 31
 
@@ -53,7 +52,8 @@ public class FakeWriteableFrameContainer extends WritableFrameContainer {
53 52
             final MessageSinkManager messageSinkManager,
54 53
             final URLBuilder urlBuilder) {
55 54
         super(target.getIcon(), target.getName(), target.getTitle(),
56
-                target.getConfigManager(), target.getCommandParser(), messageSinkManager,
55
+                target.getConfigManager(), target.getCommandParser(),
56
+                target.getTabCompleter(), messageSinkManager,
57 57
                 urlBuilder, Collections.<String>emptyList());
58 58
         this.target = target;
59 59
     }
@@ -93,11 +93,6 @@ public class FakeWriteableFrameContainer extends WritableFrameContainer {
93 93
         addLine(line);
94 94
     }
95 95
 
96
-    @Override
97
-    public TabCompleter getTabCompleter() {
98
-        return target.getTabCompleter();
99
-    }
100
-
101 96
     @Override
102 97
     public int getMaxLineLength() {
103 98
         return target.getMaxLineLength();

Loading…
Cancel
Save