Crazy caching!

Change-Id: Ibcb94ca616d3b6e9ed6a1b6c94698ab74cbd7872
Reviewed-on: http://gerrit.dmdirc.com/484
Tested-by: Gregory Holmes <greboid@dmdirc.com>
Reviewed-by: Shane Mc Cormack <shane@dmdirc.com>
Automatic-Compile: Shane Mc Cormack <shane@dmdirc.com>

src/com/dmdirc/addons/freedesktop_notifications/FDNotifyCommand.java

@@ -22,14 +22,11 @@
 
 package com.dmdirc.addons.freedesktop_notifications;
 
-import com.dmdirc.Server;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandManager;
 import com.dmdirc.commandparser.commands.GlobalCommand;
 import com.dmdirc.ui.interfaces.InputWindow;
 
-import java.util.List;
-
 /**
  * The FDNotify Command shows a nice popup on using the FreeDesktop
  * VisualNotifications.

src/com/dmdirc/addons/freedesktop_notifications/FreeDesktopNotificationsPlugin.java

@@ -22,44 +22,58 @@
 
 package com.dmdirc.addons.freedesktop_notifications;
 
+import com.dmdirc.Main;
+import com.dmdirc.addons.freedesktop_notifications.commons.StringEscapeUtils;
+import com.dmdirc.commandparser.CommandManager;
+import com.dmdirc.config.IdentityManager;
+import com.dmdirc.config.prefs.PreferencesCategory;
+import com.dmdirc.config.prefs.PreferencesManager;
+import com.dmdirc.config.prefs.PreferencesSetting;
+import com.dmdirc.config.prefs.PreferencesType;
+import com.dmdirc.installer.StreamReader;
+import com.dmdirc.interfaces.ConfigChangeListener;
+import com.dmdirc.logger.ErrorLevel;
+import com.dmdirc.logger.Logger;
 import com.dmdirc.plugins.Plugin;
 import com.dmdirc.plugins.PluginInfo;
 import com.dmdirc.plugins.PluginManager;
+import com.dmdirc.ui.messages.Styliser;
 import com.dmdirc.util.resourcemanager.ResourceManager;
-import com.dmdirc.logger.ErrorLevel;
-import com.dmdirc.logger.Logger;
-import com.dmdirc.Main;
+
 import java.io.File;
 import java.io.IOException;
 import java.util.ArrayList;
-import com.dmdirc.commandparser.CommandManager;
-import com.dmdirc.installer.StreamReader;
-import com.dmdirc.ui.messages.Styliser;
-import com.dmdirc.config.IdentityManager;
-import com.dmdirc.config.Identity;
-import com.dmdirc.config.prefs.PreferencesManager;
-import com.dmdirc.config.prefs.PreferencesCategory;
-import com.dmdirc.config.prefs.PreferencesSetting;
-import com.dmdirc.config.prefs.PreferencesType;
-import com.dmdirc.addons.freedesktop_notifications.commons.StringEscapeUtils;;
 
 /**
  * This plugin adds freedesktop Style Notifications to dmdirc.
  *
  * @author Shane 'Dataforce' McCormack
  */
-public final class FreeDesktopNotificationsPlugin extends Plugin {
+public final class FreeDesktopNotificationsPlugin extends Plugin implements
+        ConfigChangeListener{
     /** The DcopCommand we created */
     private FDNotifyCommand command = null;
-    
     /** Files dir */
     private static final String filesDir  = Main.getConfigDir() + "plugins/freedesktop_notifications_files/";
+    /** notification timeout. */
+    private int timeout;
+    /** notification icon. */
+    private String icon;
+    /** Escape HTML. */
+    private boolean escapehtml;
+    /** Strict escape. */
+    private boolean strictescape;
+    /** Strip codes. */
+    private boolean stripcodes;
     
     /**
      * Creates a new instance of the FreeDesktopNotifications Plugin.
      */
     public FreeDesktopNotificationsPlugin() {
         super();
+
+        IdentityManager.getGlobalConfig().addChangeListener(getDomain(), this);
+        setCachedSettings();
     }
 
     /**
@@ -70,8 +84,6 @@ public final class FreeDesktopNotificationsPlugin extends Plugin {
      * @return True if the notification was shown.
      */
     public boolean showNotification(final String title, final String message) {
-        final int seconds = IdentityManager.getGlobalConfig().getOptionInt(getDomain(), "general.timeout");
-        final String icon = IdentityManager.getGlobalConfig().getOption(getDomain(), "general.icon");
         final ArrayList<String> args = new ArrayList<String>();
         
         args.add("/usr/bin/env");
@@ -82,7 +94,7 @@ public final class FreeDesktopNotificationsPlugin extends Plugin {
         args.add("-i");
         args.add(icon);
         args.add("-t");
-        args.add(Integer.toString(seconds * 1000));
+        args.add(Integer.toString(timeout * 1000));
         args.add("-s");
 
         if (title != null && !title.isEmpty()) {
@@ -113,10 +125,6 @@ public final class FreeDesktopNotificationsPlugin extends Plugin {
      * @return Input string after being processed according to config settings.
      */
     public final String prepareString(final String input) {
-        final boolean escapehtml = IdentityManager.getGlobalConfig().getOptionBool(getDomain(), "advanced.escapehtml");
-	final boolean strictescape = IdentityManager.getGlobalConfig().getOptionBool(getDomain(), "advanced.strictescape");
-        final boolean stripcodes = IdentityManager.getGlobalConfig().getOptionBool(getDomain(), "advanced.stripcodes");
-
         String output = input;
         if (stripcodes) { output = Styliser.stipControlCodes(output); }
         if (escapehtml) {
@@ -178,8 +186,7 @@ public final class FreeDesktopNotificationsPlugin extends Plugin {
     /** {@inheritDoc} */
     @Override
     public void domainUpdated() {
-        final Identity defaults = IdentityManager.getAddonIdentity();
-        defaults.setOption(getDomain(), "general.icon", filesDir+"icon.png");
+        IdentityManager.getAddonIdentity().setOption(getDomain(), "general.icon", filesDir+"icon.png");
     }
     
     /** {@inheritDoc} */
@@ -195,5 +202,19 @@ public final class FreeDesktopNotificationsPlugin extends Plugin {
         
         manager.getCategory("Plugins").addSubCategory(general);
     }
+
+    private void setCachedSettings() {
+        timeout = IdentityManager.getGlobalConfig().getOptionInt(getDomain(), "general.timeout");
+        icon = IdentityManager.getGlobalConfig().getOption(getDomain(), "general.icon");
+        escapehtml = IdentityManager.getGlobalConfig().getOptionBool(getDomain(), "advanced.escapehtml");
+	strictescape = IdentityManager.getGlobalConfig().getOptionBool(getDomain(), "advanced.strictescape");
+        stripcodes = IdentityManager.getGlobalConfig().getOptionBool(getDomain(), "advanced.stripcodes");
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public void configChanged(final String domain, final String key) {
+        setCachedSettings();
+    }
 }
 

src/com/dmdirc/addons/nickcolours/ColourRenderer.java

@@ -25,6 +25,7 @@ package com.dmdirc.addons.nickcolours;
 import com.dmdirc.ui.messages.ColourManager;
 
 import java.awt.Color;
+
 import java.awt.Component;
 import javax.swing.JTable;
 import javax.swing.border.LineBorder;

src/com/dmdirc/addons/nickcolours/NickColourInputDialog.java

@@ -49,15 +49,12 @@ public class NickColourInputDialog extends StandardDialog
      * objects being unserialized with the new class).
      */
     private static final long serialVersionUID = 1;
-    
     /** Whether or not this is a new entry (as opposed to editing an old one). */
     private boolean isnew;
     /** The row we're editing, if this isn't a new entry. */
     private int row;
-    
     /** The NickColourPanel we're reporting to. */
     private final NickColourPanel panel;
-    
     /** nickname textfield. */
     private JTextField nickname;
     /** network textfield. */
@@ -167,17 +164,14 @@ public class NickColourInputDialog extends StandardDialog
     }
     
     /** Saves settings. */
-    public void saveSettings() {
-        final String myNetwork = network.getText().toLowerCase();
-        final String myNickname = nickname.getText().toLowerCase();
-        final String myTextColour = textColour.getColour();
-        final String myNickColour = nicklistColour.getColour();
-        
+    public void saveSettings() {        
         if (!isnew) {
             panel.removeRow(row);
         }
         
-        panel.addRow(myNetwork, myNickname, myTextColour, myNickColour);
+        panel.addRow(network.getText().toLowerCase(),
+                nickname.getText().toLowerCase(),
+                nickname.getText().toLowerCase(), nicklistColour.getColour());
     }
     
 }

src/com/dmdirc/addons/nickcolours/NickColourPlugin.java

@@ -33,6 +33,7 @@ import com.dmdirc.config.prefs.PreferencesManager;
 import com.dmdirc.config.prefs.PreferencesSetting;
 import com.dmdirc.config.prefs.PreferencesType;
 import com.dmdirc.interfaces.ActionListener;
+import com.dmdirc.interfaces.ConfigChangeListener;
 import com.dmdirc.parser.interfaces.ChannelClientInfo;
 import com.dmdirc.parser.interfaces.ChannelInfo;
 import com.dmdirc.parser.interfaces.ClientInfo;
@@ -49,13 +50,19 @@ import java.util.Map;
  *
  * @author chris
  */
-public final class NickColourPlugin extends Plugin implements ActionListener {
+public final class NickColourPlugin extends Plugin implements ActionListener,
+        ConfigChangeListener {
     
     /** "Random" colours to use to colour nicknames. */
     private String[] randColours = new String[] {
         "E90E7F", "8E55E9", "B30E0E", "18B33C",
         "58ADB3", "9E54B3", "B39875", "3176B3",
     };
+    private boolean useowncolour;
+    private String owncolour;
+    private boolean userandomcolour;
+    private boolean settext;
+    private boolean setnicklist;
     
     /** Creates a new instance of NickColourPlugin. */
     public NickColourPlugin() {
@@ -94,12 +101,10 @@ public final class NickColourPlugin extends Plugin implements ActionListener {
         final String nickOption2 = "color:"
                 + client.getClient().getParser().getStringConverter().toLowerCase("*:" + client.getClient().getNickname());
         
-        if (IdentityManager.getGlobalConfig().getOptionBool(getDomain(), "useowncolour")
-                && client.getClient().equals(myself)) {
-            final Color color = ColourManager.parseColour(
-                    IdentityManager.getGlobalConfig().getOption(getDomain(), "owncolour"));
+        if (useowncolour && client.getClient().equals(myself)) {
+            final Color color = ColourManager.parseColour(owncolour);
             putColour(map, color, color);
-        }  else if (IdentityManager.getGlobalConfig().getOptionBool(getDomain(), "userandomcolour")) {
+        }  else if (userandomcolour) {
             putColour(map, getColour(client.getClient().getNickname()), getColour(client.getClient().getNickname()));
         }
         
@@ -136,13 +141,11 @@ public final class NickColourPlugin extends Plugin implements ActionListener {
      */
     @SuppressWarnings("unchecked")
     private void putColour(final Map map, final Color textColour, final Color nickColour) {
-        if (IdentityManager.getGlobalConfig().getOptionBool(getDomain(), "settext")
-                && textColour != null) {
+        if (settext && textColour != null) {
             map.put(ChannelClientProperty.TEXT_FOREGROUND, textColour);
         }
         
-        if (IdentityManager.getGlobalConfig().getOptionBool(getDomain(), "setnicklist")
-                && nickColour != null) {
+        if (setnicklist && nickColour != null) {
             map.put(ChannelClientProperty.NICKLIST_FOREGROUND, nickColour);
         }
     }
@@ -218,10 +221,7 @@ public final class NickColourPlugin extends Plugin implements ActionListener {
     /** {@inheritDoc} */
     @Override
     public void onLoad() {
-        if (IdentityManager.getGlobalConfig().hasOptionString(getDomain(), "randomcolours")) {
-            randColours = IdentityManager.getGlobalConfig().getOptionList(getDomain(), "randomcolours").toArray(new String[0]);
-        }
-        
+        setCachedSettings();
         ActionManager.addListener(this, CoreActionType.CHANNEL_GOTNAMES,
                 CoreActionType.CHANNEL_JOIN);
     }
@@ -265,5 +265,22 @@ public final class NickColourPlugin extends Plugin implements ActionListener {
         general.addSubCategory(colours);
         manager.getCategory("Plugins").addSubCategory(general);
     }
+
+    private void setCachedSettings() {
+        useowncolour = IdentityManager.getGlobalConfig().getOptionBool(getDomain(), "useowncolour");
+        owncolour = IdentityManager.getGlobalConfig().getOption(getDomain(), "owncolour");
+        userandomcolour = IdentityManager.getGlobalConfig().getOptionBool(getDomain(), "userandomcolour");
+        settext = IdentityManager.getGlobalConfig().getOptionBool(getDomain(), "settext");
+        setnicklist = IdentityManager.getGlobalConfig().getOptionBool(getDomain(), "setnicklist");
+        if (IdentityManager.getGlobalConfig().hasOptionString(getDomain(), "randomcolours")) {
+            randColours = IdentityManager.getGlobalConfig().getOptionList(getDomain(), "randomcolours").toArray(new String[0]);
+        }
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public void configChanged(final String domain, final String key) {
+        setCachedSettings();
+    }
     
 }

src/com/dmdirc/addons/parser_twitter/Twitter.java

@@ -24,9 +24,15 @@ package com.dmdirc.addons.parser_twitter;
 
 import com.dmdirc.addons.parser_twitter.api.TwitterAPI;
 import com.dmdirc.addons.parser_twitter.api.TwitterErrorHandler;
+import com.dmdirc.addons.parser_twitter.api.TwitterException;
 import com.dmdirc.addons.parser_twitter.api.TwitterMessage;
+import com.dmdirc.addons.parser_twitter.api.TwitterRawHandler;
 import com.dmdirc.addons.parser_twitter.api.TwitterStatus;
 import com.dmdirc.addons.parser_twitter.api.TwitterUser;
+import com.dmdirc.config.ConfigManager;
+import com.dmdirc.config.IdentityManager;
+import com.dmdirc.interfaces.ConfigChangeListener;
+import com.dmdirc.logger.ErrorManager;
 import com.dmdirc.parser.common.CallbackManager;
 import com.dmdirc.parser.common.DefaultStringConverter;
 import com.dmdirc.parser.common.IgnoreList;
@@ -37,13 +43,18 @@ import com.dmdirc.parser.interfaces.ChannelInfo;
 import com.dmdirc.parser.interfaces.ClientInfo;
 import com.dmdirc.parser.interfaces.LocalClientInfo;
 import com.dmdirc.parser.interfaces.Parser;
-import com.dmdirc.parser.interfaces.callbacks.ChannelMessageListener;
 import com.dmdirc.parser.interfaces.StringConverter;
 import com.dmdirc.parser.interfaces.callbacks.AuthNoticeListener;
+import com.dmdirc.parser.interfaces.callbacks.ChannelJoinListener;
+import com.dmdirc.parser.interfaces.callbacks.ChannelKickListener;
+import com.dmdirc.parser.interfaces.callbacks.ChannelMessageListener;
 import com.dmdirc.parser.interfaces.callbacks.ChannelModeChangeListener;
 import com.dmdirc.parser.interfaces.callbacks.ChannelNamesListener;
 import com.dmdirc.parser.interfaces.callbacks.ChannelSelfJoinListener;
 import com.dmdirc.parser.interfaces.callbacks.ChannelTopicListener;
+import com.dmdirc.parser.interfaces.callbacks.DataInListener;
+import com.dmdirc.parser.interfaces.callbacks.DataOutListener;
+import com.dmdirc.parser.interfaces.callbacks.DebugInfoListener;
 import com.dmdirc.parser.interfaces.callbacks.MotdEndListener;
 import com.dmdirc.parser.interfaces.callbacks.MotdLineListener;
 import com.dmdirc.parser.interfaces.callbacks.MotdStartListener;
@@ -52,34 +63,21 @@ import com.dmdirc.parser.interfaces.callbacks.NickChangeListener;
 import com.dmdirc.parser.interfaces.callbacks.NumericListener;
 import com.dmdirc.parser.interfaces.callbacks.Post005Listener;
 import com.dmdirc.parser.interfaces.callbacks.PrivateMessageListener;
-import com.dmdirc.parser.interfaces.callbacks.UnknownMessageListener;
 import com.dmdirc.parser.interfaces.callbacks.PrivateNoticeListener;
 import com.dmdirc.parser.interfaces.callbacks.ServerReadyListener;
-import com.dmdirc.parser.interfaces.callbacks.UserModeDiscoveryListener;
 import com.dmdirc.parser.interfaces.callbacks.SocketCloseListener;
+import com.dmdirc.parser.interfaces.callbacks.UnknownMessageListener;
+import com.dmdirc.parser.interfaces.callbacks.UserModeDiscoveryListener;
 import com.dmdirc.ui.messages.Styliser;
-import java.lang.reflect.InvocationTargetException;
+
+import java.net.URI;
 import java.util.ArrayList;
+import java.util.Calendar;
 import java.util.Collection;
-
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import com.dmdirc.interfaces.ConfigChangeListener;
-import com.dmdirc.addons.parser_twitter.api.TwitterException;
-import com.dmdirc.addons.parser_twitter.api.TwitterRawHandler;
-import com.dmdirc.config.ConfigManager;
-import com.dmdirc.config.IdentityManager;
-import com.dmdirc.logger.ErrorManager;
-import com.dmdirc.parser.interfaces.callbacks.ChannelJoinListener;
-import com.dmdirc.parser.interfaces.callbacks.ChannelKickListener;
-import com.dmdirc.parser.interfaces.callbacks.DataInListener;
-import com.dmdirc.parser.interfaces.callbacks.DataOutListener;
-import com.dmdirc.parser.interfaces.callbacks.DebugInfoListener;
-import java.lang.reflect.Method;
-import java.net.URI;
-import java.util.Calendar;
 
 /**
  * Twitter Parser for DMDirc.
@@ -155,6 +153,20 @@ public class Twitter implements Parser, TwitterErrorHandler, TwitterRawHandler,
 
     /** Debug enabled. */
     private boolean debugEnabled;
+    /** Save last IDs */
+    private boolean saveLastIDs;
+    /** Status count. */
+    private int statusCount;
+    /** Get sent messages. */
+    private boolean getSentMessage;
+    /** Number of api calls to use. */
+    private int apicalls;
+    /** Auto append @ to nicknames. */
+    private boolean autoAt;
+    /** Replace opening nickname. */
+    private boolean replaceOpeningNickname;
+    /** hide 500 errors. */
+    private boolean hide500Errors;
 
     /**
      * Create a new Twitter Parser!
@@ -174,8 +186,7 @@ public class Twitter implements Parser, TwitterErrorHandler, TwitterRawHandler,
         this.myAddress = address;
         
         resetState(true);
-
-        debugEnabled = getConfigManager().getOptionBool(myPlugin.getDomain(), "debugEnabled");
+        
         if (getConfigManager().hasOptionString(myPlugin.getDomain(), "api.address."+myServerName)) {
             this.apiAddress = getConfigManager().getOption(myPlugin.getDomain(), "api.address."+myServerName);
         } else {
@@ -948,7 +959,7 @@ public class Twitter implements Parser, TwitterErrorHandler, TwitterRawHandler,
         long lastTimelineId = -1;
         long lastDirectMessageId = -1;
 
-        if (getConfigManager().getOptionBool(myPlugin.getDomain(), "saveLastIDs")) {
+        if (saveLastIDs) {
             if (getConfigManager().hasOptionString(myPlugin.getDomain(), "lastReplyId-"+myServerName+"-"+myUsername)) {
                 lastReplyId = TwitterAPI.parseLong(getConfigManager().getOption(myPlugin.getDomain(), "lastReplyId-"+myServerName+"-"+myUsername), -1);
             }
@@ -972,7 +983,7 @@ public class Twitter implements Parser, TwitterErrorHandler, TwitterRawHandler,
             if (!wantAuth && api.isAllowed()) {
                 lastQueryTime = System.currentTimeMillis();
 
-                final int statusesPerAttempt = Math.min(200, getConfigManager().getOptionInt(myPlugin.getDomain(), "statuscount"));
+                final int statusesPerAttempt = Math.min(200, statusCount);
 
                 final List<TwitterStatus> statuses = new ArrayList<TwitterStatus>();
                 for (TwitterStatus status : api.getReplies(lastReplyId, statusesPerAttempt)) {
@@ -1017,7 +1028,7 @@ public class Twitter implements Parser, TwitterErrorHandler, TwitterRawHandler,
                     if (directMessage.getID() > lastDirectMessageId) { lastDirectMessageId = directMessage.getID(); }
                 }
 
-                if (getConfigManager().getOptionBool(myPlugin.getDomain(), "getSentMessages")) {
+                if (getSentMessage) {
                     for (TwitterMessage directMessage : api.getSentDirectMessages(lastDirectMessageId)) {
                         directMessages.add(directMessage);
                         if (directMessage.getID() > lastDirectMessageId) { lastDirectMessageId = directMessage.getID(); }
@@ -1045,7 +1056,6 @@ public class Twitter implements Parser, TwitterErrorHandler, TwitterRawHandler,
             IdentityManager.getConfigIdentity().setOption(myPlugin.getDomain(), "lastTimelineId-"+myServerName+"-"+myUsername, Long.toString(lastTimelineId));
             IdentityManager.getConfigIdentity().setOption(myPlugin.getDomain(), "lastDirectMessageId-"+myServerName+"-"+myUsername, Long.toString(lastDirectMessageId));
 
-            final int apiLimit = getConfigManager().getOptionInt(myPlugin.getDomain(), "apicalls");
             final int endCalls = (wantAuth) ? 0 : api.getUsedCalls();
             final Long[] apiCalls = (wantAuth) ? new Long[]{0L, 0L, System.currentTimeMillis(), (long)api.getUsedCalls()} : api.getRemainingApiCalls();
             doDebug(Debug.apiCalls, "Twitter calls Remaining: "+apiCalls[0]);
@@ -1071,14 +1081,14 @@ public class Twitter implements Parser, TwitterErrorHandler, TwitterRawHandler,
                 sleepTime = 10 * 60 * 1000;
                 // Also alert the user.
                 twitterFail("Unable to communicate with twitter, or no API calls allowed at all, retrying in 10 minutes.");
-            } else if (api.getUsedCalls() > apiLimit) {
+            } else if (api.getUsedCalls() > apicalls) {
                 // Sleep for the rest of the hour, we have done too much!
                 sleepTime = timeLeft;
             } else {
                 // Else work out how many calls we have left.
                 // Whichever is less between the number of calls we want to make
                 // and the number of calls twitter is going to allow us to make.
-                final long callsLeft = Math.min(apiLimit - api.getUsedCalls(), apiCalls[0]);
+                final long callsLeft = Math.min(apicalls - api.getUsedCalls(), apiCalls[0]);
                 // How many calls do we make each time?
                 // If this is less than 0 (If there was a time reset between
                 // calculating the start and end calls used) then assume 3.
@@ -1129,11 +1139,12 @@ public class Twitter implements Parser, TwitterErrorHandler, TwitterRawHandler,
         }
         clients.clear();
 
-        if (!simpleMyself && getConfigManager().getOptionBool(myPlugin.getDomain(), "autoAt")) {
+        if (!simpleMyself && autoAt) {
             myself = new TwitterClientInfo("@" + myUsername, this);
         } else {
             myself = new TwitterClientInfo(myUsername, this);
         }
+        setCachedSettings();
     }
 
     /**
@@ -1184,7 +1195,7 @@ public class Twitter implements Parser, TwitterErrorHandler, TwitterRawHandler,
         final StringBuffer newStatus = new StringBuffer(message);
         final TwitterChannelInfo channel = (TwitterChannelInfo) this.getChannel(mainChannelName);
         
-        if (channel != null && getConfigManager().getOptionBool(myPlugin.getDomain(), "replaceOpeningNickname")) {
+        if (channel != null && replaceOpeningNickname) {
             final String[] bits = message.split(" ");
             if (bits[0].charAt(bits[0].length() - 1) == ':') {
                 final String name = bits[0].substring(0, bits[0].length() - 1);
@@ -1289,8 +1300,8 @@ public class Twitter implements Parser, TwitterErrorHandler, TwitterRawHandler,
     /** {@inheritDoc} */
     @Override
     public void handleTwitterError(final TwitterAPI api, final Throwable t, final String source, final String twitterInput, final String twitterOutput, final String message) {
-        final boolean hide500Errors = !debugEnabled && getConfigManager().getOptionBool(myPlugin.getDomain(), "hide500Errors");
-        if (hide500Errors && message.matches("^\\(50[0-9]\\).*")) { return; }
+        final boolean showError = !debugEnabled && hide500Errors;
+        if (showError && message.matches("^\\(50[0-9]\\).*")) { return; }
         try {
             if (!message.isEmpty()) {
                 twitterFail("Recieved an error from twitter: " + message + (debugEnabled ? " [" + source + "]" : ""));
@@ -1311,25 +1322,9 @@ public class Twitter implements Parser, TwitterErrorHandler, TwitterRawHandler,
             doDebug(Debug.twitterErrorMore, "");
             doDebug(Debug.twitterErrorMore, "Exception:");
 
-            // Hax the error manager to get a nice String[] representing the stack trace and output it.
-            try {
-                final Method gt = ErrorManager.class.getDeclaredMethod("getTrace", Throwable.class);
-                gt.setAccessible(true);
-                final String[] trace = (String[]) gt.invoke(ErrorManager.getErrorManager(), t);
-
-                for (String out : trace) {
-                    doDebug(Debug.twitterErrorMore, "                "+out);
-                }
-            } catch (NoSuchMethodException ex) {
-                doDebug(Debug.twitterErrorMore, "    ... Unable to get StackTrace (nsme: "+ex+")");
-            } catch (SecurityException ex) {
-                doDebug(Debug.twitterErrorMore, "    ... Unable to get StackTrace (se: "+ex+")");
-            } catch (IllegalAccessException ex) {
-                doDebug(Debug.twitterErrorMore, "    ... Unable to get StackTrace (iae: "+ex+")");
-            } catch (IllegalArgumentException ex) {
-                doDebug(Debug.twitterErrorMore, "    ... Unable to get StackTrace (iae2: "+ex+")");
-            } catch (InvocationTargetException ex) {
-                doDebug(Debug.twitterErrorMore, "    ... Unable to get StackTrace (ite: "+ex+")");
+            final String[] trace = ErrorManager.getTrace(t);
+            for (String out : trace) {
+                doDebug(Debug.twitterErrorMore, "                "+out);
             }
 
             doDebug(Debug.twitterErrorMore, "==================================");
@@ -1400,9 +1395,9 @@ public class Twitter implements Parser, TwitterErrorHandler, TwitterRawHandler,
     /** {@inheritDoc} */
     @Override
     public void configChanged(final String domain, final String key) {
+        setCachedSettings();
         if (domain.equalsIgnoreCase(myPlugin.getDomain())) {
             if (key.equalsIgnoreCase("debugEnabled")) {
-                debugEnabled = getConfigManager().getOptionBool(myPlugin.getDomain(), "debugEnabled");
                 api.setDebug(debugEnabled);
             } else if (key.equalsIgnoreCase("autoAt")) {
                 sendPrivateNotice("'autoAt' setting was changed, reconnect needed.");
@@ -1423,4 +1418,15 @@ public class Twitter implements Parser, TwitterErrorHandler, TwitterRawHandler,
 
         return myConfigManager;
     }
+
+    private void setCachedSettings() {
+        saveLastIDs = getConfigManager().getOptionBool(myPlugin.getDomain(), "saveLastIDs");
+        statusCount = getConfigManager().getOptionInt(myPlugin.getDomain(), "statusCount");
+        getSentMessage = getConfigManager().getOptionBool(myPlugin.getDomain(), "getSentMessage");
+        apicalls = getConfigManager().getOptionInt(myPlugin.getDomain(), "apicalls");
+        autoAt = getConfigManager().getOptionBool(myPlugin.getDomain(), "autoAt");
+        replaceOpeningNickname = getConfigManager().getOptionBool(myPlugin.getDomain(), "replaceOpeningNickname");
+        hide500Errors = getConfigManager().getOptionBool(myPlugin.getDomain(), "hide500Errors");
+        debugEnabled = getConfigManager().getOptionBool(myPlugin.getDomain(), "debugEnabled");
+    }
 }

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

@@ -57,8 +57,8 @@ import javax.swing.JPanel;
 import javax.swing.JPopupMenu;
 import javax.swing.JSeparator;
 import javax.swing.KeyStroke;
-
 import javax.swing.event.InternalFrameEvent;
+
 import net.miginfocom.layout.PlatformDefaults;
 
 /**
@@ -85,6 +85,8 @@ public abstract class InputTextFrame extends TextFrame implements InputWindow,
     private JPopupMenu inputFieldPopup;
     /** Nick popup menu. */
     protected JPopupMenu nickPopup;
+    /** Away indicator. */
+    private boolean useAwayIndicator;
 
     /**
      * Creates a new instance of InputFrame.
@@ -108,9 +110,11 @@ public abstract class InputTextFrame extends TextFrame implements InputWindow,
         getInputField().setCaretColor(config.getOptionColour(
                 "ui", "inputforegroundcolour",
                 "ui", "foregroundcolour"));
+        config.getOptionBool("ui", "awayindicator");
 
         config.addChangeListener("ui", "inputforegroundcolour", this);
         config.addChangeListener("ui", "inputbackgroundcolour", this);
+        config.addChangeListener("ui", "awayindicator", this);
         if (getContainer().getServer() != null) {
             getContainer().getServer().addAwayStateListener(this);
         }
@@ -125,7 +129,7 @@ public abstract class InputTextFrame extends TextFrame implements InputWindow,
             @Override
             public void run() {
                 InputTextFrame.super.open();
-                if (getConfigManager().getOptionBool("ui", "awayindicator") && getContainer().
+                if (useAwayIndicator && getContainer().
                     getServer() != null) {
                     awayLabel.setVisible(getContainer().getServer().isAway());
                 }
@@ -385,22 +389,26 @@ public abstract class InputTextFrame extends TextFrame implements InputWindow,
     public void configChanged(final String domain, final String key) {
         super.configChanged(domain, key);
 
-        if ("ui".equals(domain) && getInputField() != null &&
-                getConfigManager() != null) {
-            if ("inputbackgroundcolour".equals(key) ||
-                    "backgroundcolour".equals(key)) {
-                getInputField().setBackground(getConfigManager().getOptionColour(
-                        "ui", "inputbackgroundcolour",
-                        "ui", "backgroundcolour"));
-            } else if ("inputforegroundcolour".equals(key) ||
-                    "foregroundcolour".equals(key)) {
-                getInputField().setForeground(getConfigManager().getOptionColour(
-                        "ui", "inputforegroundcolour",
-                        "ui", "foregroundcolour"));
-                getInputField().setCaretColor(getConfigManager().getOptionColour(
-                        "ui", "inputforegroundcolour",
-                        "ui", "foregroundcolour"));
-
+        if ("ui".equals(domain) && getConfigManager() != null) {
+            if (getInputField() != null) {
+                if ("inputbackgroundcolour".equals(key) ||
+                        "backgroundcolour".equals(key)) {
+                    getInputField().setBackground(getConfigManager().getOptionColour(
+                            "ui", "inputbackgroundcolour",
+                            "ui", "backgroundcolour"));
+                } else if ("inputforegroundcolour".equals(key) ||
+                        "foregroundcolour".equals(key)) {
+                    getInputField().setForeground(getConfigManager().getOptionColour(
+                            "ui", "inputforegroundcolour",
+                            "ui", "foregroundcolour"));
+                    getInputField().setCaretColor(getConfigManager().getOptionColour(
+                            "ui", "inputforegroundcolour",
+                            "ui", "foregroundcolour"));
+                }
+            }
+            if ("awayindicator".equals(key)) {
+                useAwayIndicator = getConfigManager().getOptionBool("ui",
+                        "awayindicator");
             }
         }
     }

src/com/dmdirc/addons/ui_swing/components/statusbar/MessageLabel.java

@@ -24,6 +24,7 @@ package com.dmdirc.addons.ui_swing.components.statusbar;
 
 import com.dmdirc.addons.ui_swing.UIUtilities;
 import com.dmdirc.config.IdentityManager;
+import com.dmdirc.interfaces.ConfigChangeListener;
 import com.dmdirc.ui.IconManager;
 import com.dmdirc.ui.interfaces.StatusBarComponent;
 import com.dmdirc.ui.interfaces.StatusMessageNotifier;
@@ -43,7 +44,7 @@ import javax.swing.SwingUtilities;
  * Message label handles showing messages in the status bar.
  */
 public class MessageLabel extends JLabel implements StatusBarComponent, 
-        MouseListener {
+        MouseListener, ConfigChangeListener {
 
     /**
      * A version number for this class. It should be changed whenever the class
@@ -57,6 +58,8 @@ public class MessageLabel extends JLabel implements StatusBarComponent,
     private transient StatusMessageNotifier messageNotifier;
     /** Timer to clear the message. */
     private transient TimerTask messageTimer;
+    /** Message timeout. */
+    private int timeout;
 
     /**
      * Instantiates a new message label.
@@ -66,34 +69,73 @@ public class MessageLabel extends JLabel implements StatusBarComponent,
         setText(DEFAULT_MESSAGE);
         setBorder(BorderFactory.createEtchedBorder());
         addMouseListener(this);
+        setCachedSettings();
+        IdentityManager.getGlobalConfig().addChangeListener("ui",
+                "awayindicator", this);
     }
 
+    /**
+     * Sets the message for this message label.
+     *
+     * @param newMessage New message
+     */
     public void setMessage(final String newMessage) {
         setMessage(newMessage, (StatusMessageNotifier) null);
     }
 
+    /**
+     * Sets the message for this message label.
+     *
+     * @param newMessage New message
+     * @param newNotifier New notifier
+     */
     public void setMessage(final String newMessage,
             final StatusMessageNotifier newNotifier) {
         setMessage(null, newMessage, newNotifier);
     }
 
+    /**
+     * Sets the message for this message label.
+     *
+     * @param iconType Icon type
+     * @param newMessage New message
+     */
     public void setMessage(final String iconType, final String newMessage) {
         setMessage(iconType, newMessage, null);
     }
 
+    /**
+     * Sets the message for this message label.
+     *
+     * @param iconType Icon type
+     * @param newMessage New message
+     * @param newNotifier New notifier
+     */
     public void setMessage(final String iconType, final String newMessage,
             final StatusMessageNotifier newNotifier) {
-        final int timeout =
-                IdentityManager.getGlobalConfig().
-                getOptionInt("statusBar", "messageDisplayLength");
         setMessage(iconType, newMessage, newNotifier, timeout);
     }
 
+    /**
+     * Sets the message for this message label.
+     *
+     * @param newMessage New message
+     * @param newNotifier New notifier
+     * @param timeout New timeout
+     */
     public void setMessage(final String newMessage,
             final StatusMessageNotifier newNotifier, final int timeout) {
         setMessage(null, newMessage, newNotifier, timeout);
     }
 
+    /**
+     * Sets the message for this message label.
+     *
+     * @param iconType Icon type
+     * @param newMessage New message
+     * @param newNotifier New notifier
+     * @param timeout New timeout
+     */
     public synchronized void setMessage(final String iconType, final String newMessage,
             final StatusMessageNotifier newNotifier, final int timeout) {
         final Icon icon;
@@ -195,4 +237,16 @@ public class MessageLabel extends JLabel implements StatusBarComponent,
     public void mouseExited(final MouseEvent e) {
         //Ignore
     }
+
+    /** Set cached options. */
+    private void setCachedSettings() {
+        timeout = IdentityManager.getGlobalConfig().getOptionInt("statusBar",
+                "messageDisplayLength");
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public void configChanged(final String domain, final String key) {
+        setCachedSettings();
+    }
 }