Browse Source

Fix some unused imports/fields/etc.

pull/774/head
Chris Smith 7 years ago
parent
commit
99f60d43b0

+ 0
- 4
api/src/main/java/com/dmdirc/commandparser/commands/BaseCommand.java View File

22
 
22
 
23
 package com.dmdirc.commandparser.commands;
23
 package com.dmdirc.commandparser.commands;
24
 
24
 
25
-import com.dmdirc.commandparser.CommandArguments;
26
-import com.dmdirc.commandparser.commands.context.CommandContext;
27
 import com.dmdirc.events.CommandErrorEvent;
25
 import com.dmdirc.events.CommandErrorEvent;
28
 import com.dmdirc.events.CommandOutputEvent;
26
 import com.dmdirc.events.CommandOutputEvent;
29
 import com.dmdirc.interfaces.CommandController;
27
 import com.dmdirc.interfaces.CommandController;
30
 import com.dmdirc.interfaces.WindowModel;
28
 import com.dmdirc.interfaces.WindowModel;
31
 import com.dmdirc.ui.messages.IRCControlCodes;
29
 import com.dmdirc.ui.messages.IRCControlCodes;
32
-
33
-import javax.annotation.Nonnull;
34
 import javax.annotation.Nullable;
30
 import javax.annotation.Nullable;
35
 
31
 
36
 /**
32
 /**

+ 0
- 3
src/test/java/com/dmdirc/commandparser/commands/channel/NamesTest.java View File

28
 import com.dmdirc.config.InvalidIdentityFileException;
28
 import com.dmdirc.config.InvalidIdentityFileException;
29
 import com.dmdirc.interfaces.CommandController;
29
 import com.dmdirc.interfaces.CommandController;
30
 import com.dmdirc.interfaces.Connection;
30
 import com.dmdirc.interfaces.Connection;
31
-import com.dmdirc.parser.interfaces.ChannelInfo;
32
 import com.dmdirc.parser.interfaces.Parser;
31
 import com.dmdirc.parser.interfaces.Parser;
33
-
34
 import java.util.Optional;
32
 import java.util.Optional;
35
-
36
 import org.junit.Before;
33
 import org.junit.Before;
37
 import org.junit.Test;
34
 import org.junit.Test;
38
 import org.junit.runner.RunWith;
35
 import org.junit.runner.RunWith;

+ 1
- 5
src/test/java/com/dmdirc/commandparser/commands/server/ChangeServerTest.java View File

25
 import com.dmdirc.commandparser.commands.context.ServerCommandContext;
25
 import com.dmdirc.commandparser.commands.context.ServerCommandContext;
26
 import com.dmdirc.config.profiles.Profile;
26
 import com.dmdirc.config.profiles.Profile;
27
 import com.dmdirc.events.CommandErrorEvent;
27
 import com.dmdirc.events.CommandErrorEvent;
28
+import com.dmdirc.events.eventbus.EventBus;
28
 import com.dmdirc.interfaces.CommandController;
29
 import com.dmdirc.interfaces.CommandController;
29
 import com.dmdirc.interfaces.Connection;
30
 import com.dmdirc.interfaces.Connection;
30
-import com.dmdirc.events.eventbus.EventBus;
31
 import com.dmdirc.interfaces.WindowModel;
31
 import com.dmdirc.interfaces.WindowModel;
32
-import com.dmdirc.logger.ErrorManager;
33
 import com.dmdirc.util.URIParser;
32
 import com.dmdirc.util.URIParser;
34
-
35
 import java.net.URI;
33
 import java.net.URI;
36
 import java.net.URISyntaxException;
34
 import java.net.URISyntaxException;
37
-
38
 import org.junit.Before;
35
 import org.junit.Before;
39
 import org.junit.Test;
36
 import org.junit.Test;
40
 import org.junit.runner.RunWith;
37
 import org.junit.runner.RunWith;
51
 public class ChangeServerTest {
48
 public class ChangeServerTest {
52
 
49
 
53
     @Mock private EventBus eventBus;
50
     @Mock private EventBus eventBus;
54
-    @Mock private ErrorManager errorManager;
55
     @Mock private CommandController controller;
51
     @Mock private CommandController controller;
56
     @Mock private WindowModel tiw;
52
     @Mock private WindowModel tiw;
57
     @Mock private Profile profile;
53
     @Mock private Profile profile;

+ 2
- 2
src/test/java/com/dmdirc/logger/DiskLoggingErrorManagerTest.java View File

87
     public void testHandleErrorEvent() throws Exception {
87
     public void testHandleErrorEvent() throws Exception {
88
         instance.initialise(config);
88
         instance.initialise(config);
89
         instance.handleLoggingSetting(true);
89
         instance.handleLoggingSetting(true);
90
-        final String logName = error.getTimestamp() + "-" + error.getError().getLevel() + ".log";;
90
+        final String logName = error.getTimestamp() + "-" + error.getError().getLevel() + ".log";
91
         assertFalse(Files.exists(jimFsRule.getPath("/errors", logName)));
91
         assertFalse(Files.exists(jimFsRule.getPath("/errors", logName)));
92
         instance.handleErrorEvent(error);
92
         instance.handleErrorEvent(error);
93
         final Path errorPath = jimFsRule.getPath("/errors", logName);
93
         final Path errorPath = jimFsRule.getPath("/errors", logName);
99
     public void testHandleErrorEventNotLogging() throws Exception {
99
     public void testHandleErrorEventNotLogging() throws Exception {
100
         instance.initialise(config);
100
         instance.initialise(config);
101
         instance.handleLoggingSetting(false);
101
         instance.handleLoggingSetting(false);
102
-        final String logName = error.getTimestamp() + "-" + error.getError().getLevel() + ".log";;
102
+        final String logName = error.getTimestamp() + "-" + error.getError().getLevel() + ".log";
103
         assertFalse(Files.exists(jimFsRule.getPath("/errors", logName)));
103
         assertFalse(Files.exists(jimFsRule.getPath("/errors", logName)));
104
         instance.handleErrorEvent(error);
104
         instance.handleErrorEvent(error);
105
         assertFalse(Files.exists(jimFsRule.getPath("/errors", logName)));
105
         assertFalse(Files.exists(jimFsRule.getPath("/errors", logName)));

+ 1
- 6
src/test/java/com/dmdirc/ui/messages/IntelligentLinkingTest.java View File

21
  */
21
  */
22
 package com.dmdirc.ui.messages;
22
 package com.dmdirc.ui.messages;
23
 
23
 
24
+import com.dmdirc.config.provider.AggregateConfigProvider;
24
 import com.dmdirc.interfaces.Connection;
25
 import com.dmdirc.interfaces.Connection;
25
-import com.dmdirc.events.eventbus.EventBus;
26
 import com.dmdirc.interfaces.GroupChatManager;
26
 import com.dmdirc.interfaces.GroupChatManager;
27
-import com.dmdirc.config.provider.AggregateConfigProvider;
28
-
29
 import java.util.Arrays;
27
 import java.util.Arrays;
30
 import java.util.List;
28
 import java.util.List;
31
-
32
 import org.junit.Test;
29
 import org.junit.Test;
33
 import org.junit.runner.RunWith;
30
 import org.junit.runner.RunWith;
34
 import org.junit.runners.Parameterized;
31
 import org.junit.runners.Parameterized;
35
-import org.mockito.Mock;
36
 
32
 
37
 import static org.junit.Assert.assertEquals;
33
 import static org.junit.Assert.assertEquals;
38
 import static org.mockito.Mockito.mock;
34
 import static org.mockito.Mockito.mock;
41
 @RunWith(Parameterized.class)
37
 @RunWith(Parameterized.class)
42
 public class IntelligentLinkingTest {
38
 public class IntelligentLinkingTest {
43
 
39
 
44
-    @Mock private EventBus eventBus;
45
     private final String input, expected;
40
     private final String input, expected;
46
     private final Styliser styliser;
41
     private final Styliser styliser;
47
 
42
 

Loading…
Cancel
Save