Command and Silence chars are now accessible via the CommandManager

git-svn-id: http://svn.dmdirc.com/trunk@2260 00569f92-eb28-0410-84fd-f71c24880f

src/com/dmdirc/GlobalWindow.java

@@ -74,8 +74,7 @@ public class GlobalWindow extends WritableFrameContainer {
 
     public void sendLine(final String line) {
         GlobalCommandParser.getGlobalCommandParser().parseCommand(window, 
-                IdentityManager.getGlobalConfig().getOption("general", "commandchar")
-                + line);
+                CommandManager.getCommandChar() + line);
     }
 
     public int getMaxLineLength() {

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

@@ -27,7 +27,7 @@ import com.dmdirc.ServerManager;
 import com.dmdirc.actions.Action;
 import com.dmdirc.actions.ActionCondition;
 import com.dmdirc.actions.CoreActionType;
-import com.dmdirc.config.IdentityManager;
+import com.dmdirc.commandparser.CommandManager;
 import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.logger.Logger;
 
@@ -124,8 +124,7 @@ public final class AliasWrapper extends ActionWrapper {
     private String getCommandName(final Action action) {
         for (ActionCondition condition : action.getConditions()) {
             if (condition.getArg() == 1) {
-                return IdentityManager.getGlobalConfig()
-                        .getOption("general", "commandchar") + condition.getTarget();
+                return CommandManager.getCommandChar() + condition.getTarget();
             }
         }
         

src/com/dmdirc/commandparser/Command.java

@@ -126,8 +126,7 @@ public abstract class Command implements Comparable<Command> {
      */
     protected final void showUsage(final InputWindow target,
             final boolean isSilent, final String name, final String args) {
-        sendLine(target, isSilent, "commandUsage",
-                IdentityManager.getGlobalConfig().getOption("general", "commandchar"),
+        sendLine(target, isSilent, "commandUsage", CommandManager.getCommandChar(),
                 name, args);
     }    
     

src/com/dmdirc/commandparser/CommandManager.java

@@ -29,6 +29,7 @@ import com.dmdirc.commandparser.commands.chat.*;
 import com.dmdirc.commandparser.commands.global.*;
 //import com.dmdirc.commandparser.commands.query.*;
 import com.dmdirc.commandparser.commands.server.*;
+import com.dmdirc.config.ConfigChangeListener;
 import com.dmdirc.config.IdentityManager;
 import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.logger.Logger;
@@ -88,6 +89,14 @@ public final class CommandManager {
      */
     private static List<Command> channelPopupCommands = new ArrayList<Command>();
     
+    /** The command char we're using. */
+    private static char commandChar = IdentityManager.getGlobalConfig()
+            .getOption("general", "commandchar").charAt(0);
+    
+    /** The silence char we're using. */
+    private static char silenceChar = IdentityManager.getGlobalConfig()
+            .getOption("general", "silencechar").charAt(0);
+    
     /**
      * Prevents creation of a new command manager.
      */
@@ -95,6 +104,24 @@ public final class CommandManager {
         //do nothing
     }
     
+    /**
+     * Returns the current command character.
+     * 
+     * @return the current command char
+     */
+    public static char getCommandChar() {
+        return commandChar;
+    }
+
+    /**
+     * Returns the current silence character.
+     * 
+     * @return the current silence char
+     */    
+    public static char getSilenceChar() {
+        return silenceChar;
+    }
+    
     /**
      * Registers a command with the command manager.
      * @param command The command to be registered
@@ -179,8 +206,7 @@ public final class CommandManager {
     private static void registerCommandName(final Command command,
             final boolean register) {
         // Do tab completion
-        final String commandName = IdentityManager.getGlobalConfig()
-                .getOption("general", "commandchar") + command.getName();
+        final String commandName = getCommandChar() + command.getName();
         
         for (Server server : ServerManager.getServerManager().getServers()) {
             if (command instanceof ServerCommand || command instanceof GlobalCommand) {
@@ -303,6 +329,19 @@ public final class CommandManager {
         new SaveConfig();
         new SaveFormatter();
         new Set();
+        
+        // Set up a listener for config changes
+        final ConfigChangeListener listener = new ConfigChangeListener() {
+            public void configChanged(String domain, String key, String oldValue, String newValue) {
+                commandChar = IdentityManager.getGlobalConfig()
+                        .getOption("general", "commandchar").charAt(0);
+                silenceChar = IdentityManager.getGlobalConfig()
+                        .getOption("general", "silencechar").charAt(0);
+            }
+        };
+        
+        IdentityManager.getGlobalConfig().addChangeListener("general", "commandchar", listener);
+        IdentityManager.getGlobalConfig().addChangeListener("general", "silencechar", listener);
     }
     
     /**
@@ -627,7 +666,7 @@ public final class CommandManager {
         final List<String> res = new ArrayList<String>();
         
         for (Command command : source) {
-            res.add(IdentityManager.getGlobalConfig().getOption("general", "commandchar") + command.getName());
+            res.add(getCommandChar() + command.getName());
         }
         
         return res;

src/com/dmdirc/commandparser/CommandParser.java

@@ -97,14 +97,11 @@ public abstract class CommandParser implements Serializable {
             return;
         }
         
-        if (line.charAt(0) == IdentityManager.getGlobalConfig()
-                .getOption("general", "commandchar").charAt(0)) {
+        if (line.charAt(0) == CommandManager.getCommandChar()) {
             int offset = 1;
             boolean silent = false;
             
-            if (line.length() > offset
-                    && line.charAt(offset) == IdentityManager.getGlobalConfig()
-                    .getOption("general", "silencechar").charAt(0)) {
+            if (line.length() > offset && line.charAt(offset) == CommandManager.getSilenceChar()) {
                 silent = true;
                 offset++;
             }

src/com/dmdirc/commandparser/commands/global/Set.java

@@ -79,7 +79,7 @@ public final class Set extends GlobalCommand implements IntelligentCommand {
         final StringBuffer output = new StringBuffer(67);
         
         output.append("Valid domains (use ");
-        output.append(IdentityManager.getGlobalConfig().getOption("general", "commandchar"));
+        output.append(CommandManager.getCommandChar());
         output.append("set <domain> to see options within a domain): ");
         
         for (String domain : IdentityManager.getGlobalConfig().getDomains()) {

src/com/dmdirc/ui/input/InputHandler.java

@@ -290,9 +290,7 @@ public final class InputHandler implements KeyListener, ActionListener {
             end = start;
         }
         
-        if (start > 0
-                && text.charAt(0) == IdentityManager.getGlobalConfig()
-                .getOption("general", "commandchar").charAt(0)) {
+        if (start > 0 && text.charAt(0) == CommandManager.getCommandChar()) {
             doCommandTabCompletion(text, start, end);
         } else {
             doNormalTabCompletion(text, start, end, null);