Remove a bunch of deprecated methods.

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

src/com/dmdirc/addons/ui_swing/UIUtilities.java

@@ -28,7 +28,6 @@ import com.dmdirc.addons.ui_swing.components.DMDircUndoableEditListener;
 import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.logger.Logger;
 import com.dmdirc.ui.Colour;
-import com.dmdirc.util.ReturnableThread;
 
 import java.awt.Color;
 import java.awt.Font;
@@ -250,7 +249,7 @@ public final class UIUtilities {
             if (SwingUtilities.isEventDispatchThread()) {
                 return returnable.call();
             } else {
-                final FutureTask<T> task = new FutureTask<T>(returnable);
+                final FutureTask<T> task = new FutureTask<>(returnable);
                 SwingUtilities.invokeAndWait(task);
                 return task.get();
             }
@@ -259,32 +258,6 @@ public final class UIUtilities {
         }
     }
 
-    /**
-     * Invokes and waits for the specified runnable, executed on the EDT.
-     *
-     * @param <T> The return type of the returnable thread
-     * @param returnable Thread to be executed
-     * @return Result from the compelted thread
-     *
-     * @deprecated In favour of {@link #invokeAndWait(java.util.concurrent.Callable) }
-     */
-    @Deprecated
-    public static <T> T invokeAndWait(final ReturnableThread<T> returnable) {
-        if (SwingUtilities.isEventDispatchThread()) {
-            returnable.run();
-        } else {
-            try {
-                SwingUtilities.invokeAndWait(returnable);
-            } catch (InterruptedException ex) {
-                //Ignore
-            } catch (InvocationTargetException ex) {
-                Logger.appError(ErrorLevel.HIGH, "Unable to execute thread.", ex);
-            }
-        }
-
-        return returnable.getObject();
-    }
-
     /**
      * Queues the runnable to be executed on the EDT.
      *

src/com/dmdirc/addons/ui_swing/dialogs/actioneditor/ActionSubstitutionsPanel.java

@@ -22,6 +22,7 @@
 
 package com.dmdirc.addons.ui_swing.dialogs.actioneditor;
 
+import com.dmdirc.actions.ActionManager;
 import com.dmdirc.actions.ActionSubstitutor;
 import com.dmdirc.interfaces.actions.ActionType;
 import com.dmdirc.addons.ui_swing.components.substitutions.Substitution;
@@ -71,10 +72,10 @@ public class ActionSubstitutionsPanel extends SubstitutionsPanel<ActionType> {
             /** {@inheritDoc} */
             @Override
             public void run() {
-                substitutions = new ArrayList<SubstitutionLabel>();
+                substitutions = new ArrayList<>();
 
                 if (type != null) {
-                    final ActionSubstitutor sub = new ActionSubstitutor(type);
+                    final ActionSubstitutor sub = new ActionSubstitutor(ActionManager.getActionManager(), type);
 
                     for (final Entry<String, String> entry : sub.getComponentSubstitutions().
                             entrySet()) {

src/com/dmdirc/addons/ui_swing/dialogs/aliases/AliasSubstitutionsPanel.java

@@ -22,6 +22,7 @@
 
 package com.dmdirc.addons.ui_swing.dialogs.aliases;
 
+import com.dmdirc.actions.ActionManager;
 import com.dmdirc.actions.ActionSubstitutor;
 import com.dmdirc.actions.CoreActionType;
 import com.dmdirc.interfaces.actions.ActionType;
@@ -66,10 +67,10 @@ public class AliasSubstitutionsPanel extends SubstitutionsPanel<ActionType>  {
             /** {@inheritDoc} */
             @Override
             public void run() {
-                substitutions = new ArrayList<SubstitutionLabel>();
+                substitutions = new ArrayList<>();
 
                 if (type != null) {
-                    final ActionSubstitutor sub = new ActionSubstitutor(type);
+                    final ActionSubstitutor sub = new ActionSubstitutor(ActionManager.getActionManager(), type);
 
                     for (final Entry<String, String> entry : sub.getComponentSubstitutions().
                             entrySet()) {

src/com/dmdirc/addons/ui_swing/dialogs/prefs/URLConfigPanel.java

@@ -265,7 +265,7 @@ public class URLConfigPanel extends JPanel implements
             new StandardInputDialog(controller, parentWindow,
                     ModalityType.MODELESS, "New URL handler",
                     "Please enter the name of the new protocol.",
-                    new URLProtocolValidator()) {
+                    new URLProtocolValidator(controller.getGlobalConfig())) {
 
                 /** Serial version UID. */
                 private static final long serialVersionUID = 1;