Browse Source

Remove some unused code.

pull/654/head
Chris Smith 8 years ago
parent
commit
b54efa3c82

+ 0
- 46
src/com/dmdirc/Channel.java View File

28
 import com.dmdirc.events.ChannelSelfJoinEvent;
28
 import com.dmdirc.events.ChannelSelfJoinEvent;
29
 import com.dmdirc.events.ChannelSelfMessageEvent;
29
 import com.dmdirc.events.ChannelSelfMessageEvent;
30
 import com.dmdirc.events.CommandErrorEvent;
30
 import com.dmdirc.events.CommandErrorEvent;
31
-import com.dmdirc.events.DisplayProperty;
32
 import com.dmdirc.events.NickListClientAddedEvent;
31
 import com.dmdirc.events.NickListClientAddedEvent;
33
 import com.dmdirc.events.NickListClientRemovedEvent;
32
 import com.dmdirc.events.NickListClientRemovedEvent;
34
 import com.dmdirc.events.NickListClientsChangedEvent;
33
 import com.dmdirc.events.NickListClientsChangedEvent;
47
 import com.dmdirc.ui.input.TabCompletionType;
46
 import com.dmdirc.ui.input.TabCompletionType;
48
 import com.dmdirc.ui.messages.BackBufferFactory;
47
 import com.dmdirc.ui.messages.BackBufferFactory;
49
 import com.dmdirc.ui.messages.Styliser;
48
 import com.dmdirc.ui.messages.Styliser;
50
-import com.dmdirc.util.colours.Colour;
51
-import com.dmdirc.util.colours.ColourUtils;
52
 
49
 
53
 import com.google.common.collect.EvictingQueue;
50
 import com.google.common.collect.EvictingQueue;
54
 
51
 
368
         }
365
         }
369
     }
366
     }
370
 
367
 
371
-    /**
372
-     * Returns a string[] containing the nickname/ident/host of a channel client.
373
-     *
374
-     *
375
-     *
376
-     * @param client The channel client to check
377
-     *
378
-     * @return  A string[] containing displayable components
379
-     *          0 - mode
380
-     *          1 - nickname
381
-     *          2 - ident
382
-     *          3 - hostname
383
-     */
384
-    private String[] getDetails(final GroupChatUser client) {
385
-        if (client == null) {
386
-            // WTF?
387
-            throw new UnsupportedOperationException("getDetails called with"
388
-                    + " null ChannelClientInfo");
389
-        }
390
-
391
-        final String[] res = {
392
-            getModes(client),
393
-            Styliser.CODE_NICKNAME + client.getNickname() + Styliser.CODE_NICKNAME,
394
-            client.getUsername().orElse(""),
395
-            client.getHostname().orElse(""),};
396
-
397
-        if (showColours) {
398
-            final Optional<Colour> foreground
399
-                    = client.getDisplayProperty(DisplayProperty.FOREGROUND_COLOUR);
400
-            final Optional<Colour> background
401
-                    = client.getDisplayProperty(DisplayProperty.BACKGROUND_COLOUR);
402
-            if (foreground.isPresent()) {
403
-                String prefix = Styliser.CODE_HEXCOLOUR + ColourUtils.getHex(foreground.get());
404
-                if (background.isPresent()) {
405
-                    prefix += ',' + ColourUtils.getHex(background.get());
406
-                }
407
-                res[1] = prefix + res[1] + Styliser.CODE_HEXCOLOUR;
408
-            }
409
-        }
410
-
411
-        return res;
412
-    }
413
-
414
     // ---------------------------------------------------- TOPIC HANDLING -----
368
     // ---------------------------------------------------- TOPIC HANDLING -----
415
     /**
369
     /**
416
      * Adds the specified topic to this channel's topic list.
370
      * Adds the specified topic to this channel's topic list.

+ 0
- 3
src/com/dmdirc/FrameContainer.java View File

38
 import com.dmdirc.ui.messages.BackBufferFactory;
38
 import com.dmdirc.ui.messages.BackBufferFactory;
39
 import com.dmdirc.ui.messages.UnreadStatusManager;
39
 import com.dmdirc.ui.messages.UnreadStatusManager;
40
 import com.dmdirc.util.ChildEventBusManager;
40
 import com.dmdirc.util.ChildEventBusManager;
41
-import com.dmdirc.util.collections.ListenerList;
42
 
41
 
43
 import java.util.Collection;
42
 import java.util.Collection;
44
 import java.util.Collections;
43
 import java.util.Collections;
54
  */
53
  */
55
 public class FrameContainer implements WindowModel {
54
 public class FrameContainer implements WindowModel {
56
 
55
 
57
-    /** Listeners not yet using ListenerSupport. */
58
-    protected final ListenerList listeners = new ListenerList();
59
     /** The name of the icon being used for this container's frame. */
56
     /** The name of the icon being used for this container's frame. */
60
     private String icon;
57
     private String icon;
61
     /** The name of this container. */
58
     /** The name of this container. */

+ 0
- 1
src/com/dmdirc/Main.java View File

71
  */
71
  */
72
 public class Main {
72
 public class Main {
73
 
73
 
74
-    private final Logger log = LoggerFactory.getLogger(Main.class);
75
     /** The UI to use for the client. */
74
     /** The UI to use for the client. */
76
     private final Collection<UIController> CONTROLLERS = new HashSet<>();
75
     private final Collection<UIController> CONTROLLERS = new HashSet<>();
77
     /** The identity manager the client will use. */
76
     /** The identity manager the client will use. */

+ 1
- 4
src/com/dmdirc/config/ConfigManager.java View File

22
 
22
 
23
 package com.dmdirc.config;
23
 package com.dmdirc.config;
24
 
24
 
25
-import com.dmdirc.DMDircMBassador;
26
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
25
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
27
 import com.dmdirc.interfaces.config.ConfigChangeListener;
26
 import com.dmdirc.interfaces.config.ConfigChangeListener;
28
 import com.dmdirc.interfaces.config.ConfigProvider;
27
 import com.dmdirc.interfaces.config.ConfigProvider;
93
     ConfigManager(
92
     ConfigManager(
94
             final ClientInfo clientInfo,
93
             final ClientInfo clientInfo,
95
             final IdentityManager manager,
94
             final IdentityManager manager,
96
-            final DMDircMBassador eventBus,
97
             final String protocol, final String ircd,
95
             final String protocol, final String ircd,
98
             final String network, final String server) {
96
             final String network, final String server) {
99
-        this(clientInfo, manager, eventBus, protocol, ircd, network, server, "<Unknown>");
97
+        this(clientInfo, manager, protocol, ircd, network, server, "<Unknown>");
100
     }
98
     }
101
 
99
 
102
     /**
100
     /**
114
     ConfigManager(
112
     ConfigManager(
115
             final ClientInfo clientInfo,
113
             final ClientInfo clientInfo,
116
             final IdentityManager manager,
114
             final IdentityManager manager,
117
-            final DMDircMBassador eventBus,
118
             final String protocol, final String ircd,
115
             final String protocol, final String ircd,
119
             final String network, final String server, final String channel) {
116
             final String network, final String server, final String channel) {
120
         final String chanName = channel + '@' + network;
117
         final String chanName = channel + '@' + network;

+ 1
- 3
src/com/dmdirc/config/ConfigModule.java View File

22
 
22
 
23
 package com.dmdirc.config;
23
 package com.dmdirc.config;
24
 
24
 
25
-import com.dmdirc.DMDircMBassador;
26
 import com.dmdirc.commandline.CommandLineParser;
25
 import com.dmdirc.commandline.CommandLineParser;
27
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
26
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
28
 import com.dmdirc.interfaces.config.ConfigProvider;
27
 import com.dmdirc.interfaces.config.ConfigProvider;
64
             @Directory(DirectoryType.IDENTITIES) final Path identitiesDirectory,
63
             @Directory(DirectoryType.IDENTITIES) final Path identitiesDirectory,
65
             @Directory(DirectoryType.ERRORS) final Path errorsDirectory,
64
             @Directory(DirectoryType.ERRORS) final Path errorsDirectory,
66
             final CommandLineParser commandLineParser,
65
             final CommandLineParser commandLineParser,
67
-            final DMDircMBassador eventBus,
68
             final ClientInfo clientInfo,
66
             final ClientInfo clientInfo,
69
             final ErrorManager errorManager) {
67
             final ErrorManager errorManager) {
70
         final IdentityManager identityManager = new IdentityManager(baseDirectory,
68
         final IdentityManager identityManager = new IdentityManager(baseDirectory,
71
-                identitiesDirectory, eventBus, clientInfo);
69
+                identitiesDirectory, clientInfo);
72
         errorManager.initialise(identityManager.getGlobalConfiguration());
70
         errorManager.initialise(identityManager.getGlobalConfiguration());
73
         identityManager.loadVersionIdentity();
71
         identityManager.loadVersionIdentity();
74
         try {
72
         try {

+ 8
- 14
src/com/dmdirc/config/IdentityManager.java View File

22
 
22
 
23
 package com.dmdirc.config;
23
 package com.dmdirc.config;
24
 
24
 
25
-import com.dmdirc.DMDircMBassador;
26
 import com.dmdirc.Precondition;
25
 import com.dmdirc.Precondition;
27
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
26
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
28
 import com.dmdirc.interfaces.config.ConfigProvider;
27
 import com.dmdirc.interfaces.config.ConfigProvider;
79
     /**
78
     /**
80
      * The identities that have been loaded into this manager.
79
      * The identities that have been loaded into this manager.
81
      *
80
      *
82
-     * Standard identities are inserted with a <code>null</code> key, custom identities use their
81
+     * Standard identities are inserted with a {@code null} key, custom identities use their
83
      * custom type as the key.
82
      * custom type as the key.
84
      */
83
      */
85
     private final Multimap<String, ConfigProvider> identities = ArrayListMultimap.create();
84
     private final Multimap<String, ConfigProvider> identities = ArrayListMultimap.create();
86
     /** Map of paths to corresponding config providers, to facilitate reloading. */
85
     /** Map of paths to corresponding config providers, to facilitate reloading. */
87
     private final Map<Path, ConfigProvider> configProvidersByPath = new ConcurrentHashMap<>();
86
     private final Map<Path, ConfigProvider> configProvidersByPath = new ConcurrentHashMap<>();
88
-    /** The event bus to post events to. */
89
-    private final DMDircMBassador eventBus;
90
     /**
87
     /**
91
      * The {@link ConfigProviderListener}s that have registered with this manager.
88
      * The {@link ConfigProviderListener}s that have registered with this manager.
92
      *
89
      *
93
-     * Listeners for standard identities are inserted with a <code>null</code> key, listeners for a
90
+     * Listeners for standard identities are inserted with a {@code null} key, listeners for a
94
      * specific custom type use their type as the key.
91
      * specific custom type use their type as the key.
95
      */
92
      */
96
     private final Multimap<String, WeakReference<ConfigProviderListener>> listeners =
93
     private final Multimap<String, WeakReference<ConfigProviderListener>> listeners =
111
      *
108
      *
112
      * @param baseDirectory       The BASE config directory.
109
      * @param baseDirectory       The BASE config directory.
113
      * @param identitiesDirectory The directory to store identities in.
110
      * @param identitiesDirectory The directory to store identities in.
114
-     * @param eventBus            The event bus to post events to
115
      */
111
      */
116
     public IdentityManager(final Path baseDirectory, final Path identitiesDirectory,
112
     public IdentityManager(final Path baseDirectory, final Path identitiesDirectory,
117
-            final DMDircMBassador eventBus, final ClientInfo clientInfo) {
113
+            final ClientInfo clientInfo) {
118
         this.configDirectory = baseDirectory;
114
         this.configDirectory = baseDirectory;
119
         this.identitiesDirectory = identitiesDirectory;
115
         this.identitiesDirectory = identitiesDirectory;
120
-        this.eventBus = eventBus;
121
         this.clientInfo = clientInfo;
116
         this.clientInfo = clientInfo;
122
     }
117
     }
123
 
118
 
661
     @Override
656
     @Override
662
     public ConfigProviderMigrator createMigratableConfig(final String protocol,
657
     public ConfigProviderMigrator createMigratableConfig(final String protocol,
663
             final String ircd, final String network, final String server) {
658
             final String ircd, final String network, final String server) {
664
-        final ConfigManager configManager = new ConfigManager(clientInfo, this, eventBus, protocol,
665
-                ircd,
666
-                network, server);
659
+        final ConfigManager configManager = new ConfigManager(clientInfo, this, protocol,
660
+                ircd, network, server);
667
         setUpConfigManager(configManager);
661
         setUpConfigManager(configManager);
668
         return new ConfigManagerMigrator(configManager);
662
         return new ConfigManagerMigrator(configManager);
669
     }
663
     }
671
     @Override
665
     @Override
672
     public ConfigProviderMigrator createMigratableConfig(final String protocol,
666
     public ConfigProviderMigrator createMigratableConfig(final String protocol,
673
             final String ircd, final String network, final String server, final String channel) {
667
             final String ircd, final String network, final String server, final String channel) {
674
-        final ConfigManager configManager = new ConfigManager(clientInfo, this, eventBus, protocol,
668
+        final ConfigManager configManager = new ConfigManager(clientInfo, this, protocol,
675
                 ircd, network, server, channel);
669
                 ircd, network, server, channel);
676
         setUpConfigManager(configManager);
670
         setUpConfigManager(configManager);
677
         return new ConfigManagerMigrator(configManager);
671
         return new ConfigManagerMigrator(configManager);
680
     @Override
674
     @Override
681
     public AggregateConfigProvider createAggregateConfig(final String protocol, final String ircd,
675
     public AggregateConfigProvider createAggregateConfig(final String protocol, final String ircd,
682
             final String network, final String server) {
676
             final String network, final String server) {
683
-        final ConfigManager configManager = new ConfigManager(clientInfo, this, eventBus, protocol,
677
+        final ConfigManager configManager = new ConfigManager(clientInfo, this, protocol,
684
                 ircd, network, server);
678
                 ircd, network, server);
685
         setUpConfigManager(configManager);
679
         setUpConfigManager(configManager);
686
         return configManager;
680
         return configManager;
689
     @Override
683
     @Override
690
     public AggregateConfigProvider createAggregateConfig(final String protocol, final String ircd,
684
     public AggregateConfigProvider createAggregateConfig(final String protocol, final String ircd,
691
             final String network, final String server, final String channel) {
685
             final String network, final String server, final String channel) {
692
-        final ConfigManager configManager = new ConfigManager(clientInfo, this, eventBus, protocol,
686
+        final ConfigManager configManager = new ConfigManager(clientInfo, this, protocol,
693
                 ircd, network, server, channel);
687
                 ircd, network, server, channel);
694
         setUpConfigManager(configManager);
688
         setUpConfigManager(configManager);
695
         return configManager;
689
         return configManager;

+ 1
- 1
src/com/dmdirc/config/prefs/reader/CategoryReader.java View File

75
         this.data = checkNotNull(data);
75
         this.data = checkNotNull(data);
76
     }
76
     }
77
 
77
 
78
-    public void read() throws PreferencesReaderException {
78
+    public void read() {
79
         title = requiredString(data, TITLE_KEY);
79
         title = requiredString(data, TITLE_KEY);
80
         description = optionalString(data, DESCRIPTION_KEY);
80
         description = optionalString(data, DESCRIPTION_KEY);
81
         icon = optionalString(data, ICON_KEY);
81
         icon = optionalString(data, ICON_KEY);

+ 1
- 1
src/com/dmdirc/ui/input/InputHandler.java View File

97
     protected int flags = HANDLE_TABCOMPLETION | HANDLE_BACKBUFFER
97
     protected int flags = HANDLE_TABCOMPLETION | HANDLE_BACKBUFFER
98
             | HANDLE_FORMATTING | HANDLE_RETURN;
98
             | HANDLE_FORMATTING | HANDLE_RETURN;
99
     /** The input buffer. */
99
     /** The input buffer. */
100
-    protected RollingList<String> buffer;
100
+    protected final RollingList<String> buffer;
101
     /** The textfield that we're handling input for. */
101
     /** The textfield that we're handling input for. */
102
     protected final InputField target;
102
     protected final InputField target;
103
     /** The TabCompleter to use for tab completion. */
103
     /** The TabCompleter to use for tab completion. */

+ 4
- 6
test/com/dmdirc/config/ConfigManagerTest.java View File

22
 
22
 
23
 package com.dmdirc.config;
23
 package com.dmdirc.config;
24
 
24
 
25
-import com.dmdirc.DMDircMBassador;
26
 import com.dmdirc.interfaces.config.ConfigChangeListener;
25
 import com.dmdirc.interfaces.config.ConfigChangeListener;
27
 import com.dmdirc.util.ClientInfo;
26
 import com.dmdirc.util.ClientInfo;
28
 import com.dmdirc.util.validators.PermissiveValidator;
27
 import com.dmdirc.util.validators.PermissiveValidator;
45
 
44
 
46
     @Mock private IdentityManager identityManager;
45
     @Mock private IdentityManager identityManager;
47
     @Mock private ClientInfo clientInfo;
46
     @Mock private ClientInfo clientInfo;
48
-    @Mock private DMDircMBassador eventBus;
49
 
47
 
50
     @Test
48
     @Test
51
     public void testNonExistantOption() {
49
     public void testNonExistantOption() {
52
-        assertNull(new ConfigManager(clientInfo, identityManager, eventBus, "", "", "", "")
50
+        assertNull(new ConfigManager(clientInfo, identityManager, "", "", "", "")
53
                 .getOption("unit-test123", "foobar"));
51
                 .getOption("unit-test123", "foobar"));
54
     }
52
     }
55
 
53
 
56
     @Test
54
     @Test
57
     public void testStats() {
55
     public void testStats() {
58
-        final ConfigManager cm = new ConfigManager(clientInfo, identityManager, eventBus, "", "", "", "");
56
+        final ConfigManager cm = new ConfigManager(clientInfo, identityManager, "", "", "", "");
59
         assertNull(ConfigManager.getStats().get("unit-test123.baz"));
57
         assertNull(ConfigManager.getStats().get("unit-test123.baz"));
60
         cm.hasOption("unit-test123", "baz", new PermissiveValidator<>());
58
         cm.hasOption("unit-test123", "baz", new PermissiveValidator<>());
61
         assertNotNull(ConfigManager.getStats().get("unit-test123.baz"));
59
         assertNotNull(ConfigManager.getStats().get("unit-test123.baz"));
65
     @Test
63
     @Test
66
     public void testDomainListener() {
64
     public void testDomainListener() {
67
         final ConfigChangeListener listener = mock(ConfigChangeListener.class);
65
         final ConfigChangeListener listener = mock(ConfigChangeListener.class);
68
-        final ConfigManager cm = new ConfigManager(clientInfo, identityManager, eventBus, "", "", "", "");
66
+        final ConfigManager cm = new ConfigManager(clientInfo, identityManager, "", "", "", "");
69
         cm.addChangeListener("unit-test", listener);
67
         cm.addChangeListener("unit-test", listener);
70
 
68
 
71
         cm.configChanged("foo", "bar");
69
         cm.configChanged("foo", "bar");
78
     @Test
76
     @Test
79
     public void testDomainKeyListener() {
77
     public void testDomainKeyListener() {
80
         final ConfigChangeListener listener = mock(ConfigChangeListener.class);
78
         final ConfigChangeListener listener = mock(ConfigChangeListener.class);
81
-        final ConfigManager cm = new ConfigManager(clientInfo, identityManager, eventBus, "", "", "", "");
79
+        final ConfigManager cm = new ConfigManager(clientInfo, identityManager, "", "", "", "");
82
         cm.addChangeListener("unit-test", "foo", listener);
80
         cm.addChangeListener("unit-test", "foo", listener);
83
 
81
 
84
         cm.configChanged("foo", "bar");
82
         cm.configChanged("foo", "bar");

+ 3
- 5
test/com/dmdirc/config/IdentityManagerTest.java View File

22
 
22
 
23
 package com.dmdirc.config;
23
 package com.dmdirc.config;
24
 
24
 
25
-import com.dmdirc.DMDircMBassador;
26
 import com.dmdirc.interfaces.config.ConfigProvider;
25
 import com.dmdirc.interfaces.config.ConfigProvider;
27
 import com.dmdirc.tests.JimFsRule;
26
 import com.dmdirc.tests.JimFsRule;
28
 import com.dmdirc.util.ClientInfo;
27
 import com.dmdirc.util.ClientInfo;
47
 
46
 
48
     @Rule public final JimFsRule jimFsRule = new JimFsRule();
47
     @Rule public final JimFsRule jimFsRule = new JimFsRule();
49
 
48
 
50
-    @Mock private DMDircMBassador eventBus;
51
     @Mock private ClientInfo clientInfo;
49
     @Mock private ClientInfo clientInfo;
52
 
50
 
53
     private Path baseDirectory;
51
     private Path baseDirectory;
62
     @Test
60
     @Test
63
     public void testLoadsVersionIdentity() throws InvalidIdentityFileException {
61
     public void testLoadsVersionIdentity() throws InvalidIdentityFileException {
64
         final IdentityManager identityManager = new IdentityManager(
62
         final IdentityManager identityManager = new IdentityManager(
65
-                baseDirectory, identitiesDirectory, eventBus, clientInfo);
63
+                baseDirectory, identitiesDirectory, clientInfo);
66
         identityManager.initialise();
64
         identityManager.initialise();
67
 
65
 
68
         final ConfigProvider versionSettings = identityManager.getVersionSettings();
66
         final ConfigProvider versionSettings = identityManager.getVersionSettings();
74
     @Test
72
     @Test
75
     public void testUsesSystemUsernameForProfileNickname() throws InvalidIdentityFileException {
73
     public void testUsesSystemUsernameForProfileNickname() throws InvalidIdentityFileException {
76
         final IdentityManager identityManager = new IdentityManager(
74
         final IdentityManager identityManager = new IdentityManager(
77
-                baseDirectory, identitiesDirectory, eventBus, clientInfo);
75
+                baseDirectory, identitiesDirectory, clientInfo);
78
         identityManager.initialise();
76
         identityManager.initialise();
79
 
77
 
80
         System.setProperty("user.name", "Awesome User");
78
         System.setProperty("user.name", "Awesome User");
90
                 identitiesDirectory.resolve("profile"));
88
                 identitiesDirectory.resolve("profile"));
91
 
89
 
92
         final IdentityManager identityManager = new IdentityManager(
90
         final IdentityManager identityManager = new IdentityManager(
93
-                baseDirectory, identitiesDirectory, eventBus, clientInfo);
91
+                baseDirectory, identitiesDirectory, clientInfo);
94
         identityManager.initialise();
92
         identityManager.initialise();
95
 
93
 
96
         final Collection<ConfigProvider> profiles = identityManager.getProvidersByType("profile");
94
         final Collection<ConfigProvider> profiles = identityManager.getProvidersByType("profile");

Loading…
Cancel
Save