Associated changes from core commit

Change-Id: I17790a0e71a6c004a088a6eb51332293b23062a4
Depends-On: Iadcf92d4390034828d005a9c9e92d9a8ba189c99
Reviewed-on: http://gerrit.dmdirc.com/2454
Automatic-Compile: DMDirc Build Manager
Reviewed-by: Chris Smith <chris@dmdirc.com>

src/com/dmdirc/addons/dcc/ChatContainer.java

@@ -57,7 +57,7 @@ public class ChatContainer extends DCCFrameContainer implements DCCChatHandler {
             final ConfigManager configManager, final String title,
             final String nick, final String targetNick) {
         super(title, "dcc-chat-inactive", configManager,
-                DCCCommandParser.getDCCCommandParser(),
+                DCCCommandParser.getDCCCommandParser(configManager),
                 Arrays.asList(WindowComponent.TEXTAREA.getIdentifier(),
                 WindowComponent.INPUTFIELD.getIdentifier()));
         dccChat = dcc;

src/com/dmdirc/addons/dcc/DCCCommandParser.java

@@ -27,6 +27,7 @@ import com.dmdirc.WritableFrameContainer;
 import com.dmdirc.commandparser.CommandManager;
 import com.dmdirc.commandparser.CommandType;
 import com.dmdirc.commandparser.parsers.GlobalCommandParser;
+import com.dmdirc.config.ConfigManager;
 
 /**
  * DCC CommandParser.
@@ -41,9 +42,11 @@ public final class DCCCommandParser extends GlobalCommandParser {
 
     /**
      * Creates a new instance of the GlobalCommandParser.
+     *
+     * @param configManager Config manager
      */
-    private DCCCommandParser() {
-        super();
+    private DCCCommandParser(final ConfigManager configManager) {
+        super(configManager, CommandManager.getCommandManager());
     }
 
     /**
@@ -51,9 +54,9 @@ public final class DCCCommandParser extends GlobalCommandParser {
      *
      * @return The singleton DCCCommandParser
      */
-    public static synchronized DCCCommandParser getDCCCommandParser() {
+    public static synchronized DCCCommandParser getDCCCommandParser(final ConfigManager configManager) {
         if (me == null) {
-            me = new DCCCommandParser();
+            me = new DCCCommandParser(configManager);
         }
 
         return me;

src/com/dmdirc/addons/time/TimedCommand.java

@@ -24,6 +24,7 @@ package com.dmdirc.addons.time;
 
 import com.dmdirc.FrameContainer;
 import com.dmdirc.WritableFrameContainer;
+import com.dmdirc.commandparser.CommandManager;
 import com.dmdirc.commandparser.parsers.CommandParser;
 import com.dmdirc.commandparser.parsers.GlobalCommandParser;
 
@@ -102,7 +103,8 @@ public final class TimedCommand extends TimerTask {
     public void run() {
         CommandParser parser;
         if (origin == null) {
-            parser = GlobalCommandParser.getGlobalCommandParser();
+            parser = new GlobalCommandParser(origin.getConfigManager(),
+                    CommandManager.getCommandManager());
         } else {
             parser = ((WritableFrameContainer) origin).getCommandParser();
         }

src/com/dmdirc/addons/ui_swing/components/frames/TextFrame.java

@@ -44,6 +44,7 @@ import com.dmdirc.addons.ui_swing.textpane.TextPaneHomeAction;
 import com.dmdirc.addons.ui_swing.textpane.TextPaneListener;
 import com.dmdirc.addons.ui_swing.textpane.TextPanePageDownAction;
 import com.dmdirc.addons.ui_swing.textpane.TextPanePageUpAction;
+import com.dmdirc.commandparser.CommandManager;
 import com.dmdirc.commandparser.PopupManager;
 import com.dmdirc.commandparser.PopupMenu;
 import com.dmdirc.commandparser.PopupMenuItem;
@@ -156,7 +157,8 @@ public abstract class TextFrame extends JPanel implements Window,
         }
 
         if (localParser == null) {
-            localParser = GlobalCommandParser.getGlobalCommandParser();
+            localParser = new GlobalCommandParser(frameParent.getConfigManager(),
+                    CommandManager.getCommandManager());
         }
 
         return localParser;