Merge pull request #789 from csmith/master

Fix some unused code issues.

src/main/java/com/dmdirc/config/prefs/PreferencesSetting.java

@@ -326,7 +326,7 @@ public class PreferencesSetting {
      * @return true iif the setting will be changed if saved
      */
     public boolean needsSaving() {
-        return (!Objects.equals(value, original))
+        return !Objects.equals(value, original)
                 && (value != null || original != null)
                 && (validator == null || !validator.validate(value).isFailure());
     }

src/test/java/com/dmdirc/logger/ProgramErrorTest.java

@@ -24,10 +24,7 @@ package com.dmdirc.logger;
 
 import com.dmdirc.events.ProgramErrorStatusEvent;
 import com.dmdirc.events.eventbus.EventBus;
-import com.dmdirc.util.ClientInfo;
-
 import java.time.LocalDateTime;
-
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.ArgumentCaptor;
@@ -44,9 +41,7 @@ import static org.mockito.Mockito.verify;
 @RunWith(MockitoJUnitRunner.class)
 public class ProgramErrorTest {
 
-    @Mock private ErrorManager errorManager;
     @Mock private EventBus eventBus;
-    @Mock private ClientInfo clientInfo;
     @Captor private ArgumentCaptor<ProgramErrorStatusEvent> event;
 
     @Test(expected = NullPointerException.class)

src/test/java/com/dmdirc/ui/messages/ColourManagerTest.java

@@ -22,14 +22,11 @@
 
 package com.dmdirc.ui.messages;
 
-import com.dmdirc.events.eventbus.EventBus;
 import com.dmdirc.config.provider.AggregateConfigProvider;
 import com.dmdirc.config.provider.ConfigChangeListener;
-import com.dmdirc.logger.ErrorManager;
 import com.dmdirc.util.colours.Colour;
 import com.dmdirc.util.colours.ColourUtils;
 import com.dmdirc.util.validators.ColourValidator;
-
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -49,10 +46,8 @@ import static org.mockito.Mockito.when;
 @RunWith(MockitoJUnitRunner.class)
 public class ColourManagerTest {
 
-    @Mock private ErrorManager errorManager;
     @Mock private AggregateConfigProvider configManager;
     @Captor private ArgumentCaptor<ConfigChangeListener> configListener;
-    @Mock private EventBus eventBus;
     private ColourManager manager;
 
     @Before

src/test/java/com/dmdirc/ui/messages/EventPropertyManagerTest.java

@@ -24,9 +24,7 @@ package com.dmdirc.ui.messages;
 
 import com.dmdirc.Channel;
 import com.dmdirc.events.ChannelMessageEvent;
-import com.dmdirc.events.eventbus.EventBus;
 import com.dmdirc.interfaces.GroupChatUser;
-
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -42,7 +40,6 @@ public class EventPropertyManagerTest {
 
     private EventPropertyManager manager;
 
-    @Mock private EventBus eventBus;
     @Mock private Channel channel;
     @Mock private GroupChatUser client;
 

src/test/java/com/dmdirc/ui/messages/StyliserTest.java

@@ -22,23 +22,15 @@
 
 package com.dmdirc.ui.messages;
 
-import com.dmdirc.events.eventbus.EventBus;
 import com.dmdirc.config.provider.AggregateConfigProvider;
-
 import org.junit.Ignore;
 import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.runners.MockitoJUnitRunner;
 
 import static org.junit.Assert.assertEquals;
 import static org.mockito.Mockito.mock;
 
-@RunWith(MockitoJUnitRunner.class)
 public class StyliserTest {
 
-    @Mock private EventBus eventBus;
-
     @Test
     public void testReadUntilControl1() {
         final String input = "This"+ (char) 2 +" is "+ (char) 17 +"a test";

src/test/java/com/dmdirc/util/URLBuilderTest.java

@@ -22,18 +22,14 @@
 
 package com.dmdirc.util;
 
-import com.dmdirc.events.eventbus.EventBus;
 import com.dmdirc.plugins.PluginInfo;
 import com.dmdirc.plugins.PluginManager;
 import com.dmdirc.plugins.PluginMetaData;
 import com.dmdirc.tests.JimFsRule;
 import com.dmdirc.ui.themes.ThemeManager;
-
 import java.net.MalformedURLException;
 import java.net.URL;
-
 import javax.inject.Provider;
-
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Rule;
@@ -56,7 +52,6 @@ public class URLBuilderTest {
     @Mock private ThemeManager themeManager;
     @Mock private PluginInfo pluginInfo;
     @Mock private PluginMetaData pluginMetaData;
-    @Mock private EventBus eventBus;
 
     @Before
     public void setup() throws MalformedURLException {