Remove a load of deprecated methods.

Change-Id: I06531664f45d26298d989b9ac82d614c67da8c55
Depends-On: Ia4cf947dd33272021b10d2dc4093f383277eefd2
Reviewed-on: http://gerrit.dmdirc.com/2773
Automatic-Compile: DMDirc Build Manager
Reviewed-by: Greg Holmes <greg@dmdirc.com>

src/com/dmdirc/actions/Action.java

@@ -481,7 +481,7 @@ public class Action extends ActionModel implements ConfigChangeListener {
         } else {
             try {
                 component = new ActionComponentChain(triggers[0].getType().getArgTypes()[arg],
-                        componentName);
+                        componentName, ActionManager.getActionManager());
             } catch (IllegalArgumentException iae) {
                 error(ActionErrorType.CONDITIONS, iae.getMessage());
                 return null;

src/com/dmdirc/actions/ActionComponentChain.java

@@ -41,19 +41,6 @@ public class ActionComponentChain implements ActionComponent {
      */
     private final List<ActionComponent> components = new ArrayList<>();
 
-    /**
-     * Creates a new component chain from the specified text representation.
-     * Chains are separated with full stops (.).
-     *
-     * @param source The class that this chain needs to start with
-     * @param chain The textual representation of the chain
-     * @deprecated Should specify an action controller.
-     */
-    @Deprecated
-    public ActionComponentChain(final Class<?> source, final String chain) {
-        this(source, chain, ActionManager.getActionManager());
-    }
-
     /**
      * Creates a new component chain from the specified text representation.
      * Chains are separated with full stops (.).

src/com/dmdirc/actions/ActionModel.java

@@ -136,7 +136,7 @@ public class ActionModel {
             return false;
         }
 
-        final ActionSubstitutor sub = new ActionSubstitutor(triggers[0]);
+        final ActionSubstitutor sub = new ActionSubstitutor(ActionManager.getActionManager(), triggers[0]);
 
         if (!test(sub, arguments)) {
             return false;

src/com/dmdirc/actions/ActionSubstitutor.java

@@ -87,17 +87,6 @@ public class ActionSubstitutor {
         this.type = type;
     }
 
-    /**
-     * Creates a new substitutor for the specified action type.
-     *
-     * @param type The action type this substitutor is for
-     * @deprecated Should use {@link #ActionSubstitutor(ActionController, ActionType)}.
-     */
-    @Deprecated
-    public ActionSubstitutor(final ActionType type) {
-        this(ActionManager.getActionManager(), type);
-    }
-
     /**
      * Retrieves a list of global config variables that will be substituted.
      * Note: does not include initial $.

src/com/dmdirc/actions/wrappers/PerformWrapper.java

@@ -28,6 +28,7 @@ import com.dmdirc.actions.ActionComponentChain;
 import com.dmdirc.actions.ActionCondition;
 import com.dmdirc.actions.ActionFactory;
 import com.dmdirc.actions.ActionGroup;
+import com.dmdirc.actions.ActionManager;
 import com.dmdirc.actions.CoreActionComparison;
 import com.dmdirc.actions.CoreActionComponent;
 import com.dmdirc.actions.CoreActionType;
@@ -228,7 +229,7 @@ public class PerformWrapper extends ActionGroup {
 
         if (profile != null) {
             conditions.add(new ActionCondition(0,
-                    new ActionComponentChain(Server.class, PP_COMP_NAME),
+                    new ActionComponentChain(Server.class, PP_COMP_NAME, ActionManager.getActionManager()),
                     CoreActionComparison.STRING_EQUALS, profile));
         }
 

src/com/dmdirc/config/validators/URLProtocolValidator.java

@@ -22,7 +22,6 @@
 
 package com.dmdirc.config.validators;
 
-import com.dmdirc.config.IdentityManager;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.util.validators.ValidationResponse;
 import com.dmdirc.util.validators.Validator;
@@ -45,16 +44,6 @@ public class URLProtocolValidator implements Validator<String> {
         this.globalConfig = globalConfig;
     }
 
-    /**
-     * Creates a {@link URLProtocolValidator} with the default global config.
-     *
-     * @deprecated Specify a global config
-     */
-    @Deprecated
-    public URLProtocolValidator() {
-        this(IdentityManager.getIdentityManager().getGlobalConfiguration());
-    }
-
     /** {@inheritDoc} */
     @Override
     public ValidationResponse validate(final String object) {

src/com/dmdirc/ui/messages/ColourManager.java

@@ -166,19 +166,6 @@ public class ColourManager {
         return instance.getColourFromString(spec, Colour.WHITE);
     }
 
-    /**
-     * Returns a Colour object that corresponds to the specified 6-digit hex
-     * string. If the string is invalid, logs a warning and returns white.
-     *
-     * @param hex The hex string to convert into a Colour
-     * @return A Colour object corresponding to the hex input
-     * @deprecated Use non-static methods
-     */
-    @Deprecated
-    public static Colour getColour(final String hex) {
-        return getColourManager().getColourFromHex(hex);
-    }
-
     /**
      * Returns a Colour object that corresponds to the specified 6-digit hex
      * string. If the string is invalid, logs a warning and returns white.

src/com/dmdirc/util/URLBuilder.java

@@ -67,18 +67,6 @@ public class URLBuilder {
         this.themeManagerProvider = themeManagerProvider;
     }
 
-    /**
-     * Constructs an URL pointing to the specified resource on the file system.
-     *
-     * @param path The path that the URL is for
-     * @return An URL corresponding to the specified path, or null on failure
-     * @deprecated Use non-static methods
-     */
-    @Deprecated
-    public static URL buildFileURL(final String path) {
-        return instance.getUrlForFile(path);
-    }
-
     /**
      * Constructs an URL pointing to the specified resource on the file system.
      *
@@ -96,19 +84,6 @@ public class URLBuilder {
         }
     }
 
-    /**
-     * Constructs an URL pointing to the specified resource within a jar file.
-     *
-     * @param jarFile Path to the jar file (including scheme)
-     * @param path Path to the resource within the jar file
-     * @return An URL corresponding to the specified resource, or null on failure
-     * @deprecated Use non-static methods.
-     */
-    @Deprecated
-    public static URL buildJarURL(final String jarFile, final String path) {
-        return instance.getUrlForJarFile(jarFile, path);
-    }
-
     /**
      * Constructs an URL pointing to the specified resource within a jar file.
      *
@@ -129,19 +104,6 @@ public class URLBuilder {
         }
     }
 
-    /**
-     * Constructs an URL pointing to the specified resource within the DMDirc
-     * project.
-     *
-     * @param resource The path to the resource
-     * @return An URL corresponding to the specified resource
-     * @deprecated Use non-static methods
-     */
-    @Deprecated
-    public static URL buildDMDircURL(final String resource) {
-        return instance.getUrlForDMDircResource(resource);
-    }
-
     /**
      * Constructs an URL pointing to the specified resource within the DMDirc
      * project.
@@ -153,19 +115,6 @@ public class URLBuilder {
         return Thread.currentThread().getContextClassLoader().getResource(resource);
     }
 
-    /**
-     * Builds an URL pointing to a resource within a DMDirc theme.
-     *
-     * @param theme The theme which the resource is located in
-     * @param path The path within the theme of the resource
-     * @return An URL corresponding to the specified resource, or null on failure
-     * @deprecated Use non-static methods
-     */
-    @Deprecated
-    public static URL buildThemeURL(final String theme, final String path) {
-        return instance.getUrlForThemeResource(theme, path);
-    }
-
     /**
      * Builds an URL pointing to a resource within a DMDirc theme.
      *
@@ -178,19 +127,6 @@ public class URLBuilder {
                 + theme + ".zip", path);
     }
 
-    /**
-     * Builds an URL pointing to a resource within a DMDirc plugin.
-     *
-     * @param plugin The plugin which the resource is located in
-     * @param path The path within the theme of the resource
-     * @return An URL corresponding to the specified resource, or null on failure
-     * @deprecated Use non-static methods
-     */
-    @Deprecated
-    public static URL buildPluginURL(final String plugin, final String path) {
-        return instance.getUrlForPluginResource(plugin, path);
-    }
-
     /**
      * Builds an URL pointing to a resource within a DMDirc plugin.
      *

test/com/dmdirc/actions/ActionConditionTest.java

@@ -22,12 +22,20 @@
 
 package com.dmdirc.actions;
 
+import com.dmdirc.interfaces.ActionController;
+
 import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.runners.MockitoJUnitRunner;
 
 import static org.junit.Assert.*;
 
+@RunWith(MockitoJUnitRunner.class)
 public class ActionConditionTest {
 
+    @Mock private ActionController actionController;
+
     @Test
     public void testConstructor1() {
         final ActionCondition ac = new ActionCondition(1, CoreActionComponent.STRING_STRING,
@@ -51,14 +59,14 @@ public class ActionConditionTest {
     public void testTest1() {
         final ActionCondition ac = new ActionCondition(1, CoreActionComponent.STRING_STRING,
             CoreActionComparison.STRING_STARTSWITH, "foo");
-        assertTrue(ac.test(new ActionSubstitutor(CoreActionType.CLIENT_USER_INPUT), null, "foo bar"));
+        assertTrue(ac.test(new ActionSubstitutor(actionController, CoreActionType.CLIENT_USER_INPUT), null, "foo bar"));
     }
 
     @Test
     public void testTest2() {
         final ActionCondition ac = new ActionCondition("foobarbaz",
             CoreActionComparison.STRING_STARTSWITH, "foo");
-        assertTrue(ac.test(new ActionSubstitutor(CoreActionType.CLIENT_CLOSED)));
+        assertTrue(ac.test(new ActionSubstitutor(actionController, CoreActionType.CLIENT_CLOSED)));
     }
 
     @Test

test/com/dmdirc/actions/ActionModelTest.java

@@ -22,6 +22,7 @@
 
 package com.dmdirc.actions;
 
+import com.dmdirc.interfaces.ActionController;
 import com.dmdirc.interfaces.actions.ActionType;
 
 import java.util.ArrayList;
@@ -29,11 +30,17 @@ import java.util.Arrays;
 import java.util.List;
 
 import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.runners.MockitoJUnitRunner;
 
 import static org.junit.Assert.*;
 
+@RunWith(MockitoJUnitRunner.class)
 public class ActionModelTest {
 
+    @Mock private ActionController actionController;
+
     @Test
     public void testConditions() {
         final ActionModel model = new ActionModel("group", "name");
@@ -133,7 +140,7 @@ public class ActionModelTest {
                     new ActionCondition(2, CoreActionComponent.STRING_STRING,
                             CoreActionComparison.STRING_STARTSWITH, "abc"),
                 }), ConditionTree.parseString("0|1"), null);
-        final ActionSubstitutor sub = new ActionSubstitutor(CoreActionType.CHANNEL_ACTION);
+        final ActionSubstitutor sub = new ActionSubstitutor(actionController, CoreActionType.CHANNEL_ACTION);
 
         assertTrue("test must pass if one condition in disjunction passes (cond 1)",
                 model.test(sub, null, null, "abcdef"));
@@ -153,7 +160,7 @@ public class ActionModelTest {
                     new ActionCondition(2, CoreActionComponent.STRING_STRING,
                             CoreActionComparison.STRING_STARTSWITH, "abc"),
                 }), null, null);
-        final ActionSubstitutor sub = new ActionSubstitutor(CoreActionType.CHANNEL_ACTION);
+        final ActionSubstitutor sub = new ActionSubstitutor(actionController, CoreActionType.CHANNEL_ACTION);
 
         assertFalse("test must fail if one condition in conjunction fails (cond 1)",
                 model.test(sub, null, null, "abcdef"));