Browse Source

Make ConfigBinder ctors package private.

These should really only be accessed through a ConfigManager.

Remove some pointless setup from WritableFrameContainerTest.
pull/153/head
Chris Smith 9 years ago
parent
commit
d9bac0fe77

+ 2
- 2
src/com/dmdirc/config/ConfigBinder.java View File

@@ -53,12 +53,12 @@ public class ConfigBinder {
53 53
     /** The configuration manager to use to retrieve settings. */
54 54
     private final AggregateConfigProvider manager;
55 55
 
56
-    public ConfigBinder(final AggregateConfigProvider manager) {
56
+    ConfigBinder(final AggregateConfigProvider manager) {
57 57
         this.manager = manager;
58 58
         this.defaultDomain = Optional.empty();
59 59
     }
60 60
 
61
-    public ConfigBinder(final AggregateConfigProvider manager, @Nonnull final String domain) {
61
+    ConfigBinder(final AggregateConfigProvider manager, @Nonnull final String domain) {
62 62
         this.manager = manager;
63 63
         this.defaultDomain = Optional.of(domain);
64 64
     }

+ 1
- 5
test/com/dmdirc/WritableFrameContainerTest.java View File

@@ -23,12 +23,11 @@
23 23
 package com.dmdirc;
24 24
 
25 25
 import com.dmdirc.commandparser.CommandManager;
26
-import com.dmdirc.config.ConfigBinder;
27 26
 import com.dmdirc.harness.TestWritableFrameContainer;
28 27
 import com.dmdirc.interfaces.ConnectionManager;
29 28
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
30
-import com.dmdirc.ui.messages.sink.MessageSinkManager;
31 29
 import com.dmdirc.ui.messages.ColourManagerFactory;
30
+import com.dmdirc.ui.messages.sink.MessageSinkManager;
32 31
 import com.dmdirc.util.URLBuilder;
33 32
 
34 33
 import java.util.Arrays;
@@ -60,10 +59,7 @@ public class WritableFrameContainerTest {
60 59
         MockitoAnnotations.initMocks(this);
61 60
         when(acp.getOption("general", "silencechar")).thenReturn(".");
62 61
         when(acp.getOption("general", "commandchar")).thenReturn("/");
63
-        final ConfigBinder binder = new ConfigBinder(acp);
64
-        when(acp.getBinder()).thenReturn(binder);
65 62
         commands = new CommandManager(connectionManager, globalWindowProvider);
66
-        commands.initialise(acp);
67 63
     }
68 64
 
69 65
     @Test

Loading…
Cancel
Save