Lots of twitter-related changes.

Revert the worst attempt at "style fixing" I have every seen in my life, and reapply some of the non-awful ones.
Fixes issue 0004205: twitter parser can't cope with trailing space left by the join command
Fixes issue 0004143: Command to force twitter parser to get new tweets
(/ctcp <channel> <refresh|update>)
Fixes issue 0004119: twitter parser renaming, leaves old client
Fixes issue 0003980: Kicking people with twitter parser should give some kind of feedback
(/KICK Command changed from raw to non-raw which broke this)
Fixes issue 0003932: twitter parser should auto-rejoin when parting &twitter
Fixes issue 0003809: Typo in twitter plugin prefs: prepend *nickanmes* with @
Fixes issue 0003761: Twitter now allows 350 api calls per hour (Soon 1500)
Fixes issue 0003760: Option to auto-part &channels on twitter after status has been set

Change FreeDesktop Notifications plugin to use a new thread rather than blocking.

Change-Id: I4df6553024608074b2f1ab8eec99f13f7da2ad3a
Reviewed-on: http://gerrit.dmdirc.com/1338
Reviewed-by: Gregory Holmes <greg@dmdirc.com>
Automatic-Compile: DMDirc Local Commits <dmdirc@googlemail.com>

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

@@ -53,9 +53,14 @@ public final class FDNotifyCommand extends Command implements CommandInfo {
 
     /** {@inheritDoc} */
     @Override
-    public void execute(final FrameContainer<?> origin,
-            final CommandArguments args, final CommandContext context) {
-        myPlugin.showNotification("", args.getArgumentsAsString());
+    public void execute(final FrameContainer<?> origin, final CommandArguments args, final CommandContext context) {
+        new Thread() {
+            /** {@inheritDoc} */
+            @Override
+            public void run() {
+                myPlugin.showNotification("", args.getArgumentsAsString());
+            }
+        }.start();
     }
     
     

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

@@ -28,6 +28,7 @@ package com.dmdirc.addons.parser_twitter;
  * @author shane
  */
 enum Debug {
+
     /** Debug information related to api calls. */
     apiCalls,
     /** Debug information related to sleeping. */
@@ -41,5 +42,8 @@ enum Debug {
     /** General error info from the twitter parser. */
     twitterError,
     /** More debuggy error info from the twitter parser. */
-    twitterErrorMore;
+    twitterErrorMore,
+    /** General debuggy stuff. */
+    twitterGeneralDebug;
+
 }

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

@@ -33,6 +33,7 @@ import com.dmdirc.parser.interfaces.callbacks.CallbackInterface;
  * @author chris
  */
 public class TwitterCallbackManager extends CallbackManager<Twitter> {
+
     /**
      * Create a new TwitterCallbackManager
      * 
@@ -50,10 +51,8 @@ public class TwitterCallbackManager extends CallbackManager<Twitter> {
 
     /** {@inheritDoc} */
     @Override
-    protected CallbackObjectSpecific getSpecificCallbackObject(final Twitter parser,
-            final Class<?> type) {
-        return new TwitterCallbackObjectSpecific(parser, this,
-                type.asSubclass(CallbackInterface.class));
+    protected CallbackObjectSpecific getSpecificCallbackObject(final Twitter parser, final Class<?> type) {
+        return new TwitterCallbackObjectSpecific(parser, this, type.asSubclass(CallbackInterface.class));
     }
 
 }

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

@@ -58,8 +58,7 @@ public class TwitterCallbackObject extends CallbackObject {
      * @param manager Callback Manager that owns this object.
      * @param type Type of callback.
      */
-    public TwitterCallbackObject(final Parser parser, final CallbackManager<?> manager,
-            final Class<? extends CallbackInterface> type) {
+    public TwitterCallbackObject(final Parser parser, final CallbackManager<?> manager, final Class<? extends CallbackInterface> type) {
         super(parser, manager, type);
     }
 

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

@@ -59,8 +59,7 @@ public class TwitterCallbackObjectSpecific extends CallbackObjectSpecific {
      * @param manager Callback Manager that owns this object.
      * @param type Type of callback.
      */
-    public TwitterCallbackObjectSpecific(final Parser parser,
-            final CallbackManager<?> manager, final Class<? extends CallbackInterface> type) {
+    public TwitterCallbackObjectSpecific(final Parser parser, final CallbackManager<?> manager, final Class<? extends CallbackInterface> type) {
         super(parser, manager, type);
     }
 

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

@@ -25,6 +25,7 @@ package com.dmdirc.addons.parser_twitter;
 import com.dmdirc.parser.interfaces.ChannelClientInfo;
 import com.dmdirc.parser.interfaces.ChannelInfo;
 import com.dmdirc.parser.interfaces.ClientInfo;
+import com.dmdirc.parser.interfaces.callbacks.ChannelKickListener;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -35,9 +36,10 @@ import java.util.Map;
  * @author shane
  */
 public class TwitterChannelClientInfo implements ChannelClientInfo {
+
     /** My ChannelInfo.  */
     private TwitterChannelInfo myChannel;
-    
+
     /** My ClientInfo. */
     private TwitterClientInfo myClient;
 
@@ -102,9 +104,11 @@ public class TwitterChannelClientInfo implements ChannelClientInfo {
      * @return Value for this clients modes.
      */
     public int getImportantModeValue() {
-        if (myClient == null || myClient.isFake()) { return 0; }
+        if (myClient == null || myClient.isFake()) {
+            return 0;
+        }
         final String ourNickname = ((Twitter) myClient.getParser()).getApi().getDisplayUsername();
-        
+
         if (ourNickname.equalsIgnoreCase(myClient.getNickname())) {
             // Show ourselves as half-op
             return 2;
@@ -132,6 +136,10 @@ public class TwitterChannelClientInfo implements ChannelClientInfo {
     /** {@inheritDoc} */
     @Override
     public void kick(final String message) {
+        final Twitter parser = (Twitter) myChannel.getParser();
+        final ClientInfo ci = parser.getLocalClient();
+        parser.getCallbackManager().getCallbackType(ChannelKickListener.class).call(myChannel, this, myChannel.getChannelClient(ci), message, ci.getHostname());
+
         ((Twitter) myClient.getParser()).getApi().delFriend(myClient.getUser().getScreenName());
         myChannel.delChannelClient(this);
         myClient.delChannelClient(this);
@@ -162,4 +170,5 @@ public class TwitterChannelClientInfo implements ChannelClientInfo {
     public String toString() {
         return getImportantModePrefix() + myClient.getNickname();
     }
+
 }

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

@@ -39,12 +39,13 @@ import java.util.Map;
  * @author shane
  */
 public class TwitterChannelInfo implements ChannelInfo {
+
     /** Name of this channel. */
     private final String myName;
 
     /** The Parser that owns this object. */
     private final Twitter myParser;
-    
+
     /** Topic of this channel. */
     private String myTopic = "";
 
@@ -60,6 +61,9 @@ public class TwitterChannelInfo implements ChannelInfo {
     /** Map to store misc stuff in. */
     private Map<Object, Object> myMap = new HashMap<Object, Object>();
 
+    /** Known blocked users. */
+    private Collection<ChannelListModeItem> bannedList = new ArrayList<ChannelListModeItem>();
+
     /**
      * Create a new TwitterChannelInfo.
      *
@@ -233,23 +237,31 @@ public class TwitterChannelInfo implements ChannelInfo {
     /** {@inheritDoc} */
     @Override
     public void requestListModes() {
-        throw new UnsupportedOperationException("Not supported yet.");
+        new Thread() {
+
+            /** {@inheritDoc} */
+            @Override
+            public void run() {
+                final ArrayList<ChannelListModeItem> items = new ArrayList<ChannelListModeItem>();
+
+                final long time = System.currentTimeMillis() / 1000;
+                for (final TwitterUser user : myParser.getApi().getBlocked()) {
+                    items.add(new ChannelListModeItem(user.getScreenName(), myParser.getApi().getDisplayUsername(), time));
+                }
+                bannedList = items;
+            }
+
+        }.start();
     }
 
     /** {@inheritDoc} */
     @Override
     public Collection<ChannelListModeItem> getListMode(final char mode) {
-        final ArrayList<ChannelListModeItem> items = new ArrayList<ChannelListModeItem>();
-
-        // Ideally this should be cached somewhere, but for now this will do.
         if (mode == 'b') {
-            final long time = System.currentTimeMillis() / 1000;
-            for (TwitterUser user : myParser.getApi().getBlocked()) {
-                items.add(new ChannelListModeItem(user.getScreenName(), myParser.getApi().getDisplayUsername(), time));
-            }
+            return bannedList;
+        } else {
+            return new ArrayList<ChannelListModeItem>();
         }
-
-        return items;
     }
 
     /**
@@ -284,4 +296,5 @@ public class TwitterChannelInfo implements ChannelInfo {
     public Map<Object, Object> getMap() {
         return myMap;
     }
+
 }

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

@@ -27,7 +27,6 @@ import com.dmdirc.parser.interfaces.ChannelClientInfo;
 import com.dmdirc.parser.interfaces.LocalClientInfo;
 import com.dmdirc.parser.interfaces.Parser;
 import com.dmdirc.plugins.Plugin;
-
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -39,9 +38,13 @@ import java.util.Map;
  * @author shane
  */
 public class TwitterClientInfo implements LocalClientInfo {
+
     /** This Clients User */
     private String myUser;
 
+    /** This Clients User Id. */
+    private long myUserId;
+
     /** My Parser */
     private Twitter myParser;
 
@@ -82,11 +85,21 @@ public class TwitterClientInfo implements LocalClientInfo {
 
         String[] temp = null;
         final String[] result = new String[3];
-        if (!hostname.isEmpty() && hostname.charAt(0) == ':') { hostname = hostname.substring(1); }
+        if (!hostname.isEmpty() && hostname.charAt(0) == ':') {
+            hostname = hostname.substring(1);
+        }
         temp = hostname.split("@", 2);
-        if (temp.length == 1) { result[2] = ""; } else { result[2] = temp[1]; }
+        if (temp.length == 1) {
+            result[2] = "";
+        } else {
+            result[2] = temp[1];
+        }
         temp = temp[0].split("!", 2);
-        if (temp.length == 1) { result[1] = ""; } else { result[1] = temp[1]; }
+        if (temp.length == 1) {
+            result[1] = "";
+        } else {
+            result[1] = temp[1];
+        }
         result[0] = (hadAt ? "@" : "") + temp[0];
 
         return result;
@@ -109,8 +122,32 @@ public class TwitterClientInfo implements LocalClientInfo {
      * @param parser Parser that owns this client.
      */
     public TwitterClientInfo(final String user, final Twitter parser) {
-        this.myUser = user;
         this.myParser = parser;
+        setUser(user);
+    }
+
+    /**
+     * Set the user for this TwitterClientInfo
+     *
+     * @param user Name of user.
+     */
+    public void setUser(final String user) {
+        this.myUser = user;
+        final TwitterUser tu = myParser.getApi().getCachedUser(myUser);
+        this.myUserId = tu == null ? -1 : tu.getID();
+    }
+
+    /**
+     * Set the user for this TwitterClientInfo.
+     *
+     * @param user User object
+     */
+    public void setUser(final TwitterUser user) {
+        if (user == null) {
+            return;
+        }
+        this.myUser = user.getScreenName();
+        this.myUserId = user.getID();
     }
 
     /** {@inheritDoc} */
@@ -133,26 +170,39 @@ public class TwitterClientInfo implements LocalClientInfo {
     }
 
     /**
-    * Check if this is a fake client.
-    *
-    * @return True if this is a fake client, else false
-    */
-    public boolean isFake() { return isFake; }
-    
+     * Get the user ID this client.
+     *
+     * @return User ID for this client.
+     */
+    public long getUserID() {
+        return myUserId;
+    }
+
+    /**
+     * Check if this is a fake client.
+     *
+     * @return True if this is a fake client, else false
+     */
+    public boolean isFake() {
+        return isFake;
+    }
+
     /**
-    * Check if this client is actually a server.
-    *
-    * @return True if this client is actually a server.
-    */
-    public boolean isServer() { return !(myUser.indexOf(':') == -1); }
-    
+     * Check if this client is actually a server.
+     *
+     * @return True if this client is actually a server.
+     */
+    public boolean isServer() {
+        return !(myUser.indexOf(':') == -1);
+    }
+
     /**
-    * Set if this is a fake client.
-    * This returns "this" and thus can be used in the construction line.
-    *
-    * @param newValue new value for isFake - True if this is a fake client, else false
-    * @return this Object
-    */
+     * Set if this is a fake client.
+     * This returns "this" and thus can be used in the construction line.
+     *
+     * @param newValue new value for isFake - True if this is a fake client, else false
+     * @return this Object
+     */
     public TwitterClientInfo setFake(final boolean newValue) {
         isFake = newValue;
         return this;

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

@@ -40,14 +40,16 @@ import java.util.ArrayList;
  *
  * @author shane
  */
-public class TwitterPlugin extends Plugin  {
+public class TwitterPlugin extends Plugin {
+
     /** Are we currently unloading? */
     private static boolean unloading = false;
 
     /**
      * Create a TwitterPlugin
      */
-    public TwitterPlugin() { }
+    public TwitterPlugin() {
+    }
 
     /** {@inheritDoc} */
     @Override
@@ -59,7 +61,7 @@ public class TwitterPlugin extends Plugin  {
     @Override
     public void onUnload() {
         unloading = true;
-        for (Twitter parser : new ArrayList<Twitter>(Twitter.PARSERS)) {
+        for (final Twitter parser : new ArrayList<Twitter>(Twitter.currentParsers)) {
             parser.disconnect("");
         }
     }
@@ -88,25 +90,23 @@ public class TwitterPlugin extends Plugin  {
     /** {@inheritDoc} */
     @Override
     public void showConfig(final PreferencesManager manager) {
-        final PreferencesCategory category = new PluginPreferencesCategory(
-                getPluginInfo(), "Twitter Plugin", "Settings related to the twitter plugin",
-                "category-twitter");
-        final PreferencesCategory advanced = new PluginPreferencesCategory(
-                getPluginInfo(), "Advanced", "Advanced Settings related to the twitter plugin",
-                "category-twitter");
+        final PreferencesCategory category = new PluginPreferencesCategory(getPluginInfo(), "Twitter Plugin", "Settings related to the twitter plugin", "category-twitter");
+        final PreferencesCategory advanced = new PluginPreferencesCategory(getPluginInfo(), "Advanced", "Advanced Settings related to the twitter plugin", "category-twitter");
 
         category.addSetting(new PreferencesSetting(PreferencesType.INTEGER, getDomain(), "statuscount", "Statuses to request", "How many statuses to request at a time?"));
-        category.addSetting(new PreferencesSetting(PreferencesType.INTEGER, getDomain(), "apicalls", "API Calls", "Aim to only use how many API Calls per hour? (Twitter has a max of 150)"));
+        category.addSetting(new PreferencesSetting(PreferencesType.INTEGER, getDomain(), "apicalls", "API Calls", "Aim to only use how many API Calls per hour? (Twitter has a max of 350)"));
         category.addSetting(new PreferencesSetting(PreferencesType.BOOLEAN, getDomain(), "saveLastIDs", "Remember shown items", "Should previously shown items not be shown again next time?"));
         category.addSetting(new PreferencesSetting(PreferencesType.BOOLEAN, getDomain(), "getSentMessages", "Show own Direct Messages", "Should we try to show our own direct messages to people not just ones to us?"));
 
-        advanced.addSetting(new PreferencesSetting(PreferencesType.BOOLEAN, getDomain(), "autoAt", "Prepend nickanmes with @", "Should all nicknmaes be shown with an @ infront of them? (Makes tab competion easier)"));
+        advanced.addSetting(new PreferencesSetting(PreferencesType.BOOLEAN, getDomain(), "autoAt", "Prepend nicknames with @", "Should all nicknmaes be shown with an @ infront of them? (Makes tab competion easier)"));
         advanced.addSetting(new PreferencesSetting(PreferencesType.BOOLEAN, getDomain(), "replaceOpeningNickname", "Replace opening nickame?", "Should nicknames at the start of the message be replaced? (eg Replace foo: with @foo)"));
         advanced.addSetting(new PreferencesSetting(PreferencesType.BOOLEAN, getDomain(), "debugEnabled", "Debugging Enabled?", "Should more debugging be enabled on the twitter plugin?"));
         advanced.addSetting(new PreferencesSetting(PreferencesType.BOOLEAN, getDomain(), "hide500Errors", "Hide HTTP 50x Errors", "At times twitter gives a lot of 502/503 errors. Should this be hidden from you?"));
+        advanced.addSetting(new PreferencesSetting(PreferencesType.BOOLEAN, getDomain(), "autoLeaveMessageChannel", "Leave & channels automatically?", "Should you automatically be parted from & channels after sending a message?"));
 
         category.addSubCategory(advanced);
 
         manager.getCategory("Plugins").addSubCategory(category);
     }
-}
+
+}

src/com/dmdirc/addons/parser_twitter/api/APIAllowed.java

@@ -27,6 +27,7 @@ package com.dmdirc.addons.parser_twitter.api;
  * @author shane
  */
 public enum APIAllowed {
+
     /** It is not known if we are allowed or not. */
     UNKNOWN(false),
     /** We are not allowed. */
@@ -54,4 +55,5 @@ public enum APIAllowed {
     public boolean getBooleanValue() {
         return value;
     }
+
 }

src/com/dmdirc/addons/parser_twitter/api/TwitterAPI.java

@@ -61,13 +61,13 @@ import org.w3c.dom.Element;
 import org.w3c.dom.NodeList;
 import org.xml.sax.SAXException;
 
-
 /**
  * Implementation of the twitter API for DMDirc.
  * 
  * @author shane
  */
 public class TwitterAPI {
+
     /** OAuth Consumer */
     private OAuthConsumer consumer;
 
@@ -100,10 +100,10 @@ public class TwitterAPI {
 
     /** API Allowed status */
     private APIAllowed allowed = APIAllowed.UNKNOWN;
-    
+
     /** How many API calls have we made since the last reset? */
     private int usedCalls = 0;
-    
+
     /** API reset time. */
     private long resetTime = 0;
 
@@ -133,7 +133,7 @@ public class TwitterAPI {
 
     /** Should we use ssl? */
     private boolean useSSL = false;
-    
+
     /** Should we enable debug? */
     private boolean debug = false;
 
@@ -190,20 +190,22 @@ public class TwitterAPI {
         this.autoAt = autoAt;
         this.myDisplayUsername = (autoAt ? "@" : "") + myLoginUsername;
 
-        if (this.apiAddress.isEmpty() && myLoginUsername.isEmpty()) { return; }
+        if (this.apiAddress.isEmpty() && myLoginUsername.isEmpty()) {
+            return;
+        }
 
         if (!consumerKey.isEmpty() && !consumerSecret.isEmpty()) {
             consumer = new DefaultOAuthConsumer(consumerKey, consumerSecret, SignatureMethod.HMAC_SHA1);
             final String thisOauthAddress = ((useSSL) ? "https" : "http") + "://" + ((oauthAddress == null || oauthAddress.isEmpty()) ? apiAddress.replaceAll("/+$", "") + "/oauth" : oauthAddress.replaceAll("/+$", ""));
-            
-            provider = new DefaultOAuthProvider(consumer, thisOauthAddress+"/request_token", thisOauthAddress+"/access_token", thisOauthAddress+"/authorize");
+
+            provider = new DefaultOAuthProvider(consumer, thisOauthAddress + "/request_token", thisOauthAddress + "/access_token", thisOauthAddress + "/authorize");
 
             this.token = token;
             this.tokenSecret = tokenSecret;
 
             try {
                 useOAuth = !(getOAuthURL().isEmpty());
-            } catch (TwitterRuntimeException tre) {
+            } catch (final TwitterRuntimeException tre) {
                 useOAuth = false;
             }
         } else {
@@ -278,7 +280,7 @@ public class TwitterAPI {
             errorHandlers.add(handler);
         }
     }
-    
+
     /**
      * Remove an error handler.
      *
@@ -289,7 +291,7 @@ public class TwitterAPI {
             errorHandlers.remove(handler);
         }
     }
-    
+
     /**
      * Clear error handlers.
      */
@@ -322,7 +324,7 @@ public class TwitterAPI {
      */
     private void handleError(final Throwable t, final String source, final String twitterInput, final String twitterOutput, final String message) {
         synchronized (errorHandlers) {
-            for (TwitterErrorHandler eh : errorHandlers) {
+            for (final TwitterErrorHandler eh : errorHandlers) {
                 eh.handleTwitterError(this, t, source, twitterInput, twitterOutput, message);
             }
         }
@@ -366,7 +368,7 @@ public class TwitterAPI {
      */
     private void handleRawInput(final String raw) {
         synchronized (rawHandlers) {
-            for (TwitterRawHandler rh : rawHandlers) {
+            for (final TwitterRawHandler rh : rawHandlers) {
                 rh.handleRawTwitterInput(this, raw);
             }
         }
@@ -379,7 +381,7 @@ public class TwitterAPI {
      */
     private void handleRawOutput(final String raw) {
         synchronized (rawHandlers) {
-            for (TwitterRawHandler rh : rawHandlers) {
+            for (final TwitterRawHandler rh : rawHandlers) {
                 rh.handleRawTwitterOutput(this, raw);
             }
         }
@@ -400,9 +402,8 @@ public class TwitterAPI {
      * @param autoAt Should we use autoAt?
      */
     /* public void setAutoAt(final boolean autoAt) {
-        this.autoAt = autoAt;
+    this.autoAt = autoAt;
     } */
-
     /**
      * Is debugging enabled?
      *
@@ -539,18 +540,18 @@ public class TwitterAPI {
             }
             try {
                 consumer.sign(connection);
-            } catch (OAuthMessageSignerException ex) {
+            } catch (final OAuthMessageSignerException ex) {
                 handleError(ex, "(1) signURL", apiInput, apiOutput, "Unable to sign URL, are we authorised to use this account?");
-            } catch (OAuthExpectationFailedException ex) {
+            } catch (final OAuthExpectationFailedException ex) {
                 handleError(ex, "(2) signURL", apiInput, apiOutput, "Unable to sign URL, are we authorised to use this account?");
             }
         } else {
-          // final String userpassword = myUsername + ":" + myPassword;
-          // sun.misc.BASE64Encoder enc = new sun.misc.BASE64Encoder();
-          // String encodedAuthorization = enc.encode(userpassword.getBytes());
+            // final String userpassword = myUsername + ":" + myPassword;
+            // sun.misc.BASE64Encoder enc = new sun.misc.BASE64Encoder();
+            // String encodedAuthorization = enc.encode(userpassword.getBytes());
 
-          final String encodedAuthorization = b64encode(myLoginUsername + ":" + myPassword);
-          connection.setRequestProperty("Authorization", "Basic "+ encodedAuthorization);
+            final String encodedAuthorization = b64encode(myLoginUsername + ":" + myPassword);
+            connection.setRequestProperty("Authorization", "Basic " + encodedAuthorization);
         }
     }
 
@@ -567,7 +568,7 @@ public class TwitterAPI {
         byte[] stringArray;
         try {
             stringArray = string.getBytes("UTF-8");
-        } catch (UnsupportedEncodingException ex) {
+        } catch (final UnsupportedEncodingException ex) {
             stringArray = string.getBytes();
         }
 
@@ -602,7 +603,7 @@ public class TwitterAPI {
     public static Long parseLong(final String string, final long fallback) {
         try {
             return Long.parseLong(string);
-        } catch (NumberFormatException nfe) {
+        } catch (final NumberFormatException nfe) {
             return fallback;
         }
     }
@@ -618,7 +619,7 @@ public class TwitterAPI {
     public static Long timeStringToLong(final String string, final long fallback) {
         try {
             return (new SimpleDateFormat("EEE MMM dd HH:mm:ss zzzz yyyy").parse(string)).getTime();
-        } catch (ParseException ex) {
+        } catch (final ParseException ex) {
             return fallback;
         }
     }
@@ -662,13 +663,13 @@ public class TwitterAPI {
         try {
             final URL url = new URL(address);
             return getXML((HttpURLConnection) url.openConnection());
-        } catch (MalformedURLException ex) {
+        } catch (final MalformedURLException ex) {
             if (isDebug()) {
-                handleError(ex, "* (1) getXML: "+address, apiInput, apiOutput);
+                handleError(ex, "* (1) getXML: " + address, apiInput, apiOutput);
             }
-        } catch (IOException ex) {
+        } catch (final IOException ex) {
             if (isDebug()) {
-                handleError(ex, "* (2) getXML: "+address, apiInput, apiOutput);
+                handleError(ex, "* (2) getXML: " + address, apiInput, apiOutput);
             }
         }
 
@@ -696,13 +697,13 @@ public class TwitterAPI {
         try {
             final URL url = new URL(address + (params.isEmpty() ? "" : "?" + params));
             return postXML((HttpURLConnection) url.openConnection());
-        } catch (MalformedURLException ex) {
+        } catch (final MalformedURLException ex) {
             if (isDebug()) {
-                handleError(ex, "* (1) postXML: "+address+" | "+params, apiInput, apiOutput);
+                handleError(ex, "* (1) postXML: " + address + " | " + params, apiInput, apiOutput);
             }
-        } catch (IOException ex) {
+        } catch (final IOException ex) {
             if (isDebug()) {
-                handleError(ex, "* (2) postXML: "+address+" | "+params, apiInput, apiOutput);
+                handleError(ex, "* (2) postXML: " + address + " | " + params, apiInput, apiOutput);
             }
         }
 
@@ -721,9 +722,9 @@ public class TwitterAPI {
             request.setRequestMethod("POST");
             request.setRequestProperty("Content-Length", "0");
             request.setUseCaches(false);
-        } catch (ProtocolException ex) {
+        } catch (final ProtocolException ex) {
             if (isDebug()) {
-                handleError(ex, "* (3) postXML: "+request.getURL(), apiInput, apiOutput);
+                handleError(ex, "* (3) postXML: " + request.getURL(), apiInput, apiOutput);
             }
         }
         return getXML(request);
@@ -750,11 +751,11 @@ public class TwitterAPI {
             signURL(request);
             request.connect();
             return true;
-        } catch (MalformedURLException ex) {
+        } catch (final MalformedURLException ex) {
             return false;
-        } catch (NoRouteToHostException ex) {
+        } catch (final NoRouteToHostException ex) {
             return false;
-        } catch (IOException ex) {
+        } catch (final IOException ex) {
             if (isDebug()) {
                 handleError(ex, "* (1) checkConnection", "", "");
             }
@@ -777,7 +778,7 @@ public class TwitterAPI {
             resetTime = System.currentTimeMillis() + 3600000;
         }
         usedCalls++;
-        
+
         apiInput = request.getURL().toString();
         handleRawOutput(apiInput);
         BufferedReader in = null;
@@ -788,9 +789,9 @@ public class TwitterAPI {
             request.setReadTimeout(5000);
             request.connect();
             in = new BufferedReader(new InputStreamReader(request.getInputStream()));
-        } catch (IOException ex) {
+        } catch (final IOException ex) {
             if (isDebug()) {
-                handleError(ex, "* (4) getXML: "+request.getURL(), apiInput, apiOutput);
+                handleError(ex, "* (4) getXML: " + request.getURL(), apiInput, apiOutput);
             }
             if (request.getErrorStream() != null) {
                 in = new BufferedReader(new InputStreamReader(request.getErrorStream()));
@@ -814,14 +815,17 @@ public class TwitterAPI {
                 } while (line != null);
 
                 apiOutput = xml.toString().trim();
-            } catch (IOException ex) {
+            } catch (final IOException ex) {
                 apiOutput = xml.toString().trim() + "\n ... Incomplete!";
                 incomplete = true;
                 if (isDebug()) {
                     handleError(ex, "* (5) getXML", apiInput, apiOutput);
                 }
             } finally {
-                try { in.close(); } catch (IOException ex) { }
+                try {
+                    in.close();
+                } catch (final IOException ex) {
+                }
             }
         }
 
@@ -833,12 +837,12 @@ public class TwitterAPI {
             responseCode = request.getResponseCode();
             if (responseCode != 200) {
                 if (isDebug()) {
-                    handleError(null, "* (6) getXML", apiInput, apiOutput, "("+request.getResponseCode()+") "+request.getResponseMessage());
+                    handleError(null, "* (6) getXML", apiInput, apiOutput, "(" + request.getResponseCode() + ") " + request.getResponseMessage());
                 } else if (responseCode >= 500 && responseCode < 600) {
-                    handleError(null, "(6) getXML", apiInput, apiOutput, "("+request.getResponseCode()+") "+request.getResponseMessage());
+                    handleError(null, "(6) getXML", apiInput, apiOutput, "(" + request.getResponseCode() + ") " + request.getResponseMessage());
                 }
             }
-        } catch (IOException ioe) {
+        } catch (final IOException ioe) {
             responseCode = 0;
             if (isDebug()) {
                 handleError(ioe, "* (7) getXML", apiInput, apiOutput, "Unable to get response code.");
@@ -847,7 +851,7 @@ public class TwitterAPI {
 
         try {
             final DocumentBuilder db = DocumentBuilderFactory.newInstance().newDocumentBuilder();
-            
+
             final Document doc = db.parse(new ByteArrayInputStream(apiOutput.getBytes()));
 
             final XMLResponse response = new XMLResponse(request, doc);
@@ -856,15 +860,15 @@ public class TwitterAPI {
             }
 
             return response;
-        } catch (SAXException ex) {
+        } catch (final SAXException ex) {
             if (isDebug()) {
                 handleError(ex, "* (9) getXML", apiInput, apiOutput);
             }
-        } catch (ParserConfigurationException ex) {
+        } catch (final ParserConfigurationException ex) {
             if (isDebug()) {
                 handleError(ex, "* (10) getXML", apiInput, apiOutput);
             }
-        } catch (IOException ex) {
+        } catch (final IOException ex) {
             if (isDebug()) {
                 handleError(ex, "* (11) getXML", apiInput, apiOutput);
             }
@@ -879,7 +883,9 @@ public class TwitterAPI {
      * @param status
      */
     protected void uncacheStatus(final TwitterStatus status) {
-        if (status == null) { return; }
+        if (status == null) {
+            return;
+        }
         synchronized (statusCache) {
             statusCache.remove(status.getID());
         }
@@ -891,7 +897,9 @@ public class TwitterAPI {
      * @param user
      */
     protected void uncacheUser(final TwitterUser user) {
-        if (user == null) { return; }
+        if (user == null) {
+            return;
+        }
         synchronized (userCache) {
             userCache.remove(user.getScreenName().toLowerCase());
             userIDMap.remove(user.getID());
@@ -920,7 +928,9 @@ public class TwitterAPI {
      * @param user
      */
     protected void updateUser(final String username, final TwitterUser user) {
-        if (user == null) { return; }
+        if (user == null) {
+            return;
+        }
         synchronized (userCache) {
             if (!username.equalsIgnoreCase(user.getScreenName())) {
                 userCache.remove(username.toLowerCase());
@@ -971,9 +981,9 @@ public class TwitterAPI {
         TwitterUser user = getCachedUser(username);
         if (user == null || force) {
             if (username.equalsIgnoreCase(myDisplayUsername) && !isAllowed()) {
-                 user = new TwitterUser(this, myLoginUsername, -1, "", true);
+                user = new TwitterUser(this, myLoginUsername, -1, "", true);
             } else {
-                final XMLResponse doc = getXML(getURL("users/show")+"?screen_name="+username);
+                final XMLResponse doc = getXML(getURL("users/show") + "?screen_name=" + username);
 
                 if (doc.isGood()) {
                     user = new TwitterUser(this, doc.getDocumentElement());
@@ -982,7 +992,9 @@ public class TwitterAPI {
                 }
             }
 
-            if (user != null) { updateUser(user); }
+            if (user != null) {
+                updateUser(user);
+            }
         }
 
         return user;
@@ -995,7 +1007,9 @@ public class TwitterAPI {
      * @param status
      */
     protected void updateStatus(final TwitterStatus status) {
-        if (status == null) { return; }
+        if (status == null) {
+            return;
+        }
         synchronized (statusCache) {
             statusCache.put(status.getID(), status);
         }
@@ -1037,7 +1051,7 @@ public class TwitterAPI {
     public TwitterStatus getStatus(final long id, final boolean force) {
         TwitterStatus status = getCachedStatus(id);
         if (status == null || force) {
-            final XMLResponse doc = getXML(getURL("statuses/show/"+id));
+            final XMLResponse doc = getXML(getURL("statuses/show/" + id));
 
             if (doc.isGood()) {
                 status = new TwitterStatus(this, doc.getDocumentElement());
@@ -1061,7 +1075,7 @@ public class TwitterAPI {
         synchronized (statusCache) {
             final Map<Long, TwitterStatus> current = new HashMap<Long, TwitterStatus>(statusCache);
 
-            for (Map.Entry<Long, TwitterStatus> item : current.entrySet()) {
+            for (final Map.Entry<Long, TwitterStatus> item : current.entrySet()) {
                 if (item.getValue().getTime() < time) {
                     statusCache.remove(item.getKey());
                 }
@@ -1084,12 +1098,12 @@ public class TwitterAPI {
                 new TwitterMessage(this, doc.getDocumentElement());
                 return true;
             }
-        } catch (UnsupportedEncodingException ex) {
+        } catch (final UnsupportedEncodingException ex) {
             if (isDebug()) {
-                handleError(ex, "* (1) newDirectMessage: "+target+" | "+message, apiInput, apiOutput);
+                handleError(ex, "* (1) newDirectMessage: " + target + " | " + message, apiInput, apiOutput);
             }
         }
-        
+
         return false;
     }
 
@@ -1111,7 +1125,7 @@ public class TwitterAPI {
     public List<TwitterStatus> getUserTimeline(final long lastUserTimelineId) {
         final List<TwitterStatus> result = new ArrayList<TwitterStatus>();
 
-        final XMLResponse doc = getXML(getURL("statuses/user_timeline")+"?since_id="+lastUserTimelineId+"&count=20");
+        final XMLResponse doc = getXML(getURL("statuses/user_timeline") + "?since_id=" + lastUserTimelineId + "&count=20");
 
         if (doc.isGood()) {
             final NodeList nodes = doc.getElementsByTagName("status");
@@ -1145,8 +1159,7 @@ public class TwitterAPI {
         final List<TwitterStatus> result = new ArrayList<TwitterStatus>();
 
         try {
-            final XMLResponse doc = getXML("http://search.twitter.com/search.atom?since_id="
-                    +lastStatusId + "&rpp=100&q=" + URLEncoder.encode(term, "utf-8"));
+            final XMLResponse doc = getXML("http://search.twitter.com/search.atom?since_id=" + lastStatusId + "&rpp=100&q=" + URLEncoder.encode(term, "utf-8"));
 
             if (doc.isGood()) {
                 final NodeList nodes = doc.getElementsByTagName("entry");
@@ -1161,13 +1174,13 @@ public class TwitterAPI {
                     result.add(0, new TwitterStatus(this, message, -1, id, user, time));
                 }
             }
-        } catch (UnsupportedEncodingException ex) {
+        } catch (final UnsupportedEncodingException ex) {
             if (isDebug()) {
-                handleError(ex, "* (1) getSearchResults: "+term+" | "+lastStatusId, apiInput, apiOutput);
+                handleError(ex, "* (1) getSearchResults: " + term + " | " + lastStatusId, apiInput, apiOutput);
             }
-        } catch (ParseException ex) {
+        } catch (final ParseException ex) {
             if (isDebug()) {
-                handleError(ex, "* (2) getSearchResults: "+term+" | "+lastStatusId, apiInput, apiOutput);
+                handleError(ex, "* (2) getSearchResults: " + term + " | " + lastStatusId, apiInput, apiOutput);
             }
         }
 
@@ -1283,7 +1296,7 @@ public class TwitterAPI {
     public List<TwitterStatus> getReplies(final long lastReplyId, final int count) {
         final List<TwitterStatus> result = new ArrayList<TwitterStatus>();
 
-        final XMLResponse doc = getXML(getURL("statuses/mentions")+"?since_id="+lastReplyId+"&count="+count);
+        final XMLResponse doc = getXML(getURL("statuses/mentions") + "?since_id=" + lastReplyId + "&count=" + count);
         if (doc.isGood()) {
             final NodeList nodes = doc.getElementsByTagName("status");
 
@@ -1304,7 +1317,7 @@ public class TwitterAPI {
     public List<TwitterStatus> getFriendsTimeline(final long lastTimelineId) {
         return getFriendsTimeline(lastTimelineId, 20);
     }
-    
+
     /**
      * Get the messages sent by friends that are later than the given ID.
      *
@@ -1315,7 +1328,7 @@ public class TwitterAPI {
     public List<TwitterStatus> getFriendsTimeline(final long lastTimelineId, final int count) {
         final List<TwitterStatus> result = new ArrayList<TwitterStatus>();
 
-        final XMLResponse doc = getXML(getURL("statuses/home_timeline")+"?since_id="+lastTimelineId+"&count="+count);
+        final XMLResponse doc = getXML(getURL("statuses/home_timeline") + "?since_id=" + lastTimelineId + "&count=" + count);
         if (doc.isGood()) {
             final NodeList nodes = doc.getElementsByTagName("status");
             for (int i = 0; i < nodes.getLength(); i++) {
@@ -1346,7 +1359,7 @@ public class TwitterAPI {
     public List<TwitterMessage> getDirectMessages(final long lastDirectMessageId, final int count) {
         final List<TwitterMessage> result = new ArrayList<TwitterMessage>();
 
-        final XMLResponse doc = getXML(getURL("direct_messages")+"?since_id="+lastDirectMessageId+"&count="+count);
+        final XMLResponse doc = getXML(getURL("direct_messages") + "?since_id=" + lastDirectMessageId + "&count=" + count);
         if (doc.isGood()) {
             final NodeList nodes = doc.getElementsByTagName("direct_message");
             for (int i = 0; i < nodes.getLength(); i++) {
@@ -1377,7 +1390,7 @@ public class TwitterAPI {
     public List<TwitterMessage> getSentDirectMessages(final long lastDirectMessageId, final int count) {
         final List<TwitterMessage> result = new ArrayList<TwitterMessage>();
 
-        final XMLResponse doc = getXML(getURL("direct_messages/sent")+"?since_id="+lastDirectMessageId+"&count="+count);
+        final XMLResponse doc = getXML(getURL("direct_messages/sent") + "?since_id=" + lastDirectMessageId + "&count=" + count);
         if (doc.isGood()) {
             final NodeList nodes = doc.getElementsByTagName("direct_message");
             for (int i = 0; i < nodes.getLength(); i++) {
@@ -1400,10 +1413,10 @@ public class TwitterAPI {
             final StringBuilder params = new StringBuilder("status=");
             params.append(URLEncoder.encode(status, "utf-8"));
             if (id >= 0) {
-                params.append("&in_reply_to_status_id="+Long.toString(id));
+                params.append("&in_reply_to_status_id=" + Long.toString(id));
             }
             if (!useOAuth) {
-                params.append("&source="+URLEncoder.encode(mySource, "utf-8"));
+                params.append("&source=" + URLEncoder.encode(mySource, "utf-8"));
             }
 
             final XMLResponse doc = postXML(getURL("statuses/update"), params.toString());
@@ -1413,13 +1426,13 @@ public class TwitterAPI {
                 }
                 return true;
             }
-        } catch (UnsupportedEncodingException ex) {
+        } catch (final UnsupportedEncodingException ex) {
             if (isDebug()) {
-                handleError(ex, "* (1) setStatus: "+status+" | "+id, apiInput, apiOutput);
+                handleError(ex, "* (1) setStatus: " + status + " | " + id, apiInput, apiOutput);
             }
-        } catch (IOException ex) {
+        } catch (final IOException ex) {
             if (isDebug()) {
-                handleError(ex, "* (2) setStatus: "+status+" | "+id, apiInput, apiOutput);
+                handleError(ex, "* (2) setStatus: " + status + " | " + id, apiInput, apiOutput);
             }
         }
 
@@ -1433,7 +1446,7 @@ public class TwitterAPI {
      * @return True if status was retweeted ok.
      */
     public boolean retweetStatus(final TwitterStatus status) {
-        final XMLResponse doc = postXML(getURL("statuses/retweet/"+status.getID()));
+        final XMLResponse doc = postXML(getURL("statuses/retweet/" + status.getID()));
         if (doc.getResponseCode() == 200) {
             if (doc.isGood()) {
                 new TwitterStatus(this, doc.getDocumentElement());
@@ -1451,7 +1464,7 @@ public class TwitterAPI {
      * @return True if status was deleted ok.
      */
     public boolean deleteStatus(final TwitterStatus status) {
-        final XMLResponse doc = postXML(getURL("statuses/destroy/"+status.getID()));
+        final XMLResponse doc = postXML(getURL("statuses/destroy/" + status.getID()));
         if (doc.getResponseCode() == 200) {
             if (doc.isGood()) {
                 final TwitterStatus deletedStatus = new TwitterStatus(this, doc.getDocumentElement());
@@ -1485,7 +1498,7 @@ public class TwitterAPI {
 
             final long remaining = parseLong(getElementContents(element, "remaining-hits", ""), -1);
             final long total = parseLong(getElementContents(element, "hourly-limit", ""), -1);
-            
+
             // laconica does this wrong :( so support both.
             final String resetTimeString = getElementContents(element, "reset-time-in-seconds", getElementContents(element, "reset_time_in_seconds", "0"));
             resetTime = 1000 * parseLong(resetTimeString, -1);
@@ -1514,28 +1527,28 @@ public class TwitterAPI {
     public String getOAuthURL() throws TwitterRuntimeException {
         try {
             return provider.retrieveRequestToken(OAuth.OUT_OF_BAND);
-        } catch (OAuthMessageSignerException ex) {
+        } catch (final OAuthMessageSignerException ex) {
             if (myPassword.isEmpty()) {
                 if (isDebug()) {
                     handleError(ex, "* (1) getOAuthURL", apiInput, apiOutput);
                 }
                 throw new TwitterRuntimeException(ex.getMessage(), ex);
             }
-        } catch (OAuthNotAuthorizedException ex) {
+        } catch (final OAuthNotAuthorizedException ex) {
             if (myPassword.isEmpty()) {
                 if (isDebug()) {
                     handleError(ex, "* (2) getOAuthURL", apiInput, apiOutput);
                 }
                 throw new TwitterRuntimeException(ex.getMessage(), ex);
             }
-        } catch (OAuthExpectationFailedException ex) {
+        } catch (final OAuthExpectationFailedException ex) {
             if (myPassword.isEmpty()) {
                 if (isDebug()) {
                     handleError(ex, "* (3) getOAuthURL", apiInput, apiOutput);
                 }
                 throw new TwitterRuntimeException(ex.getMessage(), ex);
             }
-        } catch (OAuthCommunicationException ex) {
+        } catch (final OAuthCommunicationException ex) {
             if (myPassword.isEmpty()) {
                 if (isDebug()) {
                     handleError(ex, "* (4) getOAuthURL", apiInput, apiOutput);
@@ -1555,29 +1568,31 @@ public class TwitterAPI {
      * @throws TwitterException  if there is a problem with OAuth.
      */
     public void setAccessPin(final String pin) throws TwitterException {
-        if (!useOAuth) { return; }
+        if (!useOAuth) {
+            return;
+        }
         try {
             provider.retrieveAccessToken(pin);
             token = consumer.getToken();
             tokenSecret = consumer.getTokenSecret();
-        } catch (OAuthMessageSignerException ex) {
+        } catch (final OAuthMessageSignerException ex) {
             if (isDebug()) {
-                handleError(ex, "* (1) setAccessPin: "+pin, apiInput, apiOutput);
+                handleError(ex, "* (1) setAccessPin: " + pin, apiInput, apiOutput);
             }
             throw new TwitterException(ex.getMessage(), ex);
-        } catch (OAuthNotAuthorizedException ex) {
+        } catch (final OAuthNotAuthorizedException ex) {
             if (isDebug()) {
-                handleError(ex, "* (2) setAccessPin: "+pin, apiInput, apiOutput);
+                handleError(ex, "* (2) setAccessPin: " + pin, apiInput, apiOutput);
             }
             throw new TwitterException(ex.getMessage(), ex);
-        } catch (OAuthExpectationFailedException ex) {
+        } catch (final OAuthExpectationFailedException ex) {
             if (isDebug()) {
-                handleError(ex, "* (3) setAccessPin: "+pin, apiInput, apiOutput);
+                handleError(ex, "* (3) setAccessPin: " + pin, apiInput, apiOutput);
             }
             throw new TwitterException(ex.getMessage(), ex);
-        } catch (OAuthCommunicationException ex) {
+        } catch (final OAuthCommunicationException ex) {
             if (isDebug()) {
-                handleError(ex, "* (4) setAccessPin: "+pin, apiInput, apiOutput);
+                handleError(ex, "* (4) setAccessPin: " + pin, apiInput, apiOutput);
             }
             throw new TwitterException(ex.getMessage(), ex);
         }
@@ -1618,7 +1633,9 @@ public class TwitterAPI {
      * @return true if we have been authorised, else false.
      */
     public boolean isAllowed(final boolean forceRecheck) {
-        if (myLoginUsername.isEmpty()) { return false; }
+        if (myLoginUsername.isEmpty()) {
+            return false;
+        }
 
         if ((useOAuth && (getToken().isEmpty() || getTokenSecret().isEmpty())) || (!useOAuth && myPassword.isEmpty())) {
             return false;
@@ -1635,7 +1652,7 @@ public class TwitterAPI {
                     updateUser(user);
                     getRemainingApiCalls();
                 }
-            } catch (IOException ex) {
+            } catch (final IOException ex) {
                 if (isDebug()) {
                     handleError(ex, "* (1) isAllowed", apiInput, apiOutput);
                 }
@@ -1660,9 +1677,9 @@ public class TwitterAPI {
                 updateUser(user);
                 return user;
             }
-        } catch (UnsupportedEncodingException ex) {
+        } catch (final UnsupportedEncodingException ex) {
             if (isDebug()) {
-                handleError(ex, "* (1) addFriend: "+name, apiInput, apiOutput);
+                handleError(ex, "* (1) addFriend: " + name, apiInput, apiOutput);
             }
         }
 
@@ -1684,9 +1701,9 @@ public class TwitterAPI {
 
                 return user;
             }
-        } catch (UnsupportedEncodingException ex) {
+        } catch (final UnsupportedEncodingException ex) {
             if (isDebug()) {
-                handleError(ex, "* (1) delFriend: "+name, apiInput, apiOutput);
+                handleError(ex, "* (1) delFriend: " + name, apiInput, apiOutput);
             }
         }
 
@@ -1708,9 +1725,9 @@ public class TwitterAPI {
 
                 return user;
             }
-        } catch (UnsupportedEncodingException ex) {
+        } catch (final UnsupportedEncodingException ex) {
             if (isDebug()) {
-                handleError(ex, "*(1) blockUser: "+name, apiInput, apiOutput);
+                handleError(ex, "*(1) blockUser: " + name, apiInput, apiOutput);
             }
         }
 
@@ -1732,12 +1749,13 @@ public class TwitterAPI {
 
                 return user;
             }
-        } catch (UnsupportedEncodingException ex) {
+        } catch (final UnsupportedEncodingException ex) {
             if (isDebug()) {
-                handleError(ex, "* (1) unblockUser: "+name, apiInput, apiOutput);
+                handleError(ex, "* (1) unblockUser: " + name, apiInput, apiOutput);
             }
         }
 
         return null;
     }
+
 }

src/com/dmdirc/addons/parser_twitter/api/TwitterErrorHandler.java

@@ -28,6 +28,7 @@ package com.dmdirc.addons.parser_twitter.api;
  * @author shane
  */
 public interface TwitterErrorHandler {
+
     /**
      * Handle an error from the Twitter API.
      *
@@ -38,5 +39,6 @@ public interface TwitterErrorHandler {
      * @param twitterOutput The output from the API that caused this error.
      * @param message If more information should be relayed to the user, it comes here
      */
-     void handleTwitterError(final TwitterAPI api, final Throwable t, final String source, final String twitterInput, final String twitterOutput, final String message);
+    void handleTwitterError(final TwitterAPI api, final Throwable t, final String source, final String twitterInput, final String twitterOutput, final String message);
+
 }

src/com/dmdirc/addons/parser_twitter/api/TwitterMessage.java

@@ -32,6 +32,7 @@ import org.w3c.dom.NodeList;
  * @author shane
  */
 public class TwitterMessage implements Comparable<TwitterMessage> {
+
     /** ID of this message. */
     final long id;
 
@@ -40,7 +41,7 @@ public class TwitterMessage implements Comparable<TwitterMessage> {
 
     /** Owner of this message. */
     final String sender;
-    
+
     /** Target of this message. */
     final String target;
 
@@ -86,7 +87,9 @@ public class TwitterMessage implements Comparable<TwitterMessage> {
      * @param node Node to use.
      */
     protected TwitterMessage(final TwitterAPI api, final Node node) {
-        if (!(node instanceof Element)) { throw new TwitterRuntimeException("Can only use Element type nodes for message creation."); }
+        if (!(node instanceof Element)) {
+            throw new TwitterRuntimeException("Can only use Element type nodes for message creation.");
+        }
         this.myAPI = api;
         final Element element = (Element) node;
 
@@ -154,7 +157,7 @@ public class TwitterMessage implements Comparable<TwitterMessage> {
     public TwitterUser getTarget() {
         return myAPI.getCachedUser(target);
     }
-    
+
     /**
      * Get the ID of this message.
      *
@@ -223,4 +226,5 @@ public class TwitterMessage implements Comparable<TwitterMessage> {
             return 0;
         }
     }
+
 }

src/com/dmdirc/addons/parser_twitter/api/TwitterRawHandler.java

@@ -28,13 +28,14 @@ package com.dmdirc.addons.parser_twitter.api;
  * @author shane
  */
 public interface TwitterRawHandler {
+
     /**
      * Handle input from twitter.
      *
      * @param api the TwitterAPI that recieved this input.
      * @param data The raw data to handle.
      */
-     void handleRawTwitterInput(final TwitterAPI api, final String data);
+    void handleRawTwitterInput(final TwitterAPI api, final String data);
 
     /**
      * Handle an output to twitter.
@@ -42,5 +43,6 @@ public interface TwitterRawHandler {
      * @param api the TwitterAPI that sent this output.
      * @param data The raw data to handle.
      */
-     void handleRawTwitterOutput(final TwitterAPI api, final String data);
+    void handleRawTwitterOutput(final TwitterAPI api, final String data);
+
 }

src/com/dmdirc/addons/parser_twitter/api/TwitterStatus.java

@@ -34,6 +34,7 @@ import org.w3c.dom.NodeList;
  * @author shane
  */
 public class TwitterStatus implements Comparable<TwitterStatus> {
+
     /** The ID this message was in reply to. */
     private long replyID;
 
@@ -116,7 +117,9 @@ public class TwitterStatus implements Comparable<TwitterStatus> {
      * @param user User who this status belongs to.
      */
     protected TwitterStatus(final TwitterAPI api, final Node node, final String user) {
-        if (!(node instanceof Element)) { throw new TwitterRuntimeException("Can only use Element type nodes for status creation."); }
+        if (!(node instanceof Element)) {
+            throw new TwitterRuntimeException("Can only use Element type nodes for status creation.");
+        }
         this.myAPI = api;
         final Element element = (Element) node;
 
@@ -135,7 +138,7 @@ public class TwitterStatus implements Comparable<TwitterStatus> {
 
         this.id = TwitterAPI.parseLong(TwitterAPI.getElementContents(element, "id", ""), -1);
         this.replyID = TwitterAPI.parseLong(TwitterAPI.getElementContents(element, "in_reply_to_status_id", ""), -1);
-        
+
         this.time = TwitterAPI.timeStringToLong(TwitterAPI.getElementContents(element, "created_at", ""), 0);
 
         final TwitterUser userUser;
@@ -156,7 +159,6 @@ public class TwitterStatus implements Comparable<TwitterStatus> {
         api.updateStatus(this);
     }
 
-
     /**
      * Get the ID of this message
      *
@@ -294,4 +296,5 @@ public class TwitterStatus implements Comparable<TwitterStatus> {
             return 0;
         }
     }
+
 }

src/com/dmdirc/addons/parser_twitter/api/TwitterUser.java

@@ -31,12 +31,13 @@ import org.w3c.dom.NodeList;
  * @author shane
  */
 public class TwitterUser {
+
     /** What is the screen name of this user? */
     private final String screenName;
 
     /** What is the user id of this user? */
     private final long userID;
-    
+
     /** What is the real name of this user? */
     private final String realName;
 
@@ -118,14 +119,16 @@ public class TwitterUser {
      * @param status Status to use
      */
     protected TwitterUser(final TwitterAPI api, final Node node, final TwitterStatus status) {
-        if (!(node instanceof Element)) { throw new TwitterRuntimeException("Can only use Element type nodes for user creation."); }
+        if (!(node instanceof Element)) {
+            throw new TwitterRuntimeException("Can only use Element type nodes for user creation.");
+        }
 
         final Element element = (Element) node;
         this.myAPI = api;
 
         this.realName = TwitterAPI.getElementContents(element, "name", "");
         this.screenName = (api.autoAt() ? "@" : "") + TwitterAPI.getElementContents(element, "screen_name", "");
-        
+
         this.myProfilePicture = TwitterAPI.getElementContents(element, "profile_image_url", "");
         this.myURL = TwitterAPI.getElementContents(element, "url", "");
         this.myLocation = TwitterAPI.getElementContents(element, "location", "");
@@ -179,7 +182,6 @@ public class TwitterUser {
         this.lastStatus = newStatus;
     }
 
-
     /**
      * Get the screen name for this user.
      *
@@ -188,7 +190,7 @@ public class TwitterUser {
     public String getScreenName() {
         return screenName;
     }
-    
+
     /**
      * Get the id for this user.
      * 
@@ -288,5 +290,4 @@ public class TwitterUser {
         return myRegisteredTime;
     }
 
-
 }

src/com/dmdirc/addons/parser_twitter/api/XMLResponse.java

@@ -98,8 +98,8 @@ public class XMLResponse {
                     if (request.getResponseCode() != 200) {
                         return "(" + request.getResponseCode() + ") " + request.getResponseMessage();
                     }
-                } catch (IOException ex) {
-                    return "Error obtaining response code: "+ex;
+                } catch (final IOException ex) {
+                    return "Error obtaining response code: " + ex;
                 }
             } else {
                 return error;
@@ -137,7 +137,8 @@ public class XMLResponse {
         if (request != null) {
             try {
                 return request.getResponseCode();
-            } catch (IOException ex) { }
+            } catch (final IOException ex) {
+            }
         }
 
         return 0;
@@ -153,4 +154,5 @@ public class XMLResponse {
     public boolean isGood() {
         return getResponseCode() == 200 && getDocument() != null && !isError();
     }
+
 }

src/com/dmdirc/addons/parser_twitter/api/commons/Entities.java

@@ -150,9 +150,9 @@ class Entities {
     };
 
     // package scoped for testing
-    static final int ISO8859_1_ARRAY_LENGTH = ISO8859_1_ARRAY.length;
+    static int ISO8859_1_ARRAY_LENGTH = ISO8859_1_ARRAY.length;
     
-    static String getISO88591(int i, int j) {
+    static String getISO8859_1(int i, int j) {
         return ISO8859_1_ARRAY[i][j];
     }
 
@@ -355,7 +355,7 @@ class Entities {
     };
     
     // package scoped for testing
-    static final int HTML40_ARRAY_LENGTH = HTML40_ARRAY.length;
+    static int HTML40_ARRAY_LENGTH = HTML40_ARRAY.length;
     
     static String getHTML40(int i, int j) {
         return HTML40_ARRAY[i][j];
@@ -458,7 +458,7 @@ class Entities {
          * {@inheritDoc}
          */
         public void add(String name, int value) {
-            mapNameToValue.put(name, value);
+            mapNameToValue.put(name, new Integer(value));
             mapValueToName.put(value, name);
         }
 
@@ -481,7 +481,7 @@ class Entities {
         }
     }
 
-    abstract static class MapIntMap implements Entities.EntityMap {
+    static abstract class MapIntMap implements Entities.EntityMap {
         protected Map<String, Integer> mapNameToValue;
 
         protected Map<Integer, String> mapValueToName;
@@ -490,15 +490,15 @@ class Entities {
          * {@inheritDoc}
          */
         public void add(String name, int value) {
-            mapNameToValue.put(name, value);
-            mapValueToName.put(value, name);
+            mapNameToValue.put(name, new Integer(value));
+            mapValueToName.put(new Integer(value), name);
         }
 
         /**
          * {@inheritDoc}
          */
         public String name(int value) {
-            return mapValueToName.get(value);
+            return mapValueToName.get(new Integer(value));
         }
 
         /**
@@ -536,7 +536,7 @@ class Entities {
     static class LookupEntityMap extends PrimitiveEntityMap {
         private String[] lookupTable;
 
-        private static final int LOOKUP_TABLE_SIZE = 256;
+        private int LOOKUP_TABLE_SIZE = 256;
 
         /**
          * {@inheritDoc}
@@ -972,13 +972,14 @@ class Entities {
                             char isHexChar = entityContent.charAt(1);
                             try {
                                 switch (isHexChar) {
-                                    case 'X':
-                                    case 'x':
+                                    case 'X' :
+                                    case 'x' : {
                                         entityValue = Integer.parseInt(entityContent.substring(2), 16);
                                         break;
-                                    default:
+                                    }
+                                    default : {
                                         entityValue = Integer.parseInt(entityContent.substring(1), 10);
-                                        break;
+                                    }
                                 }
                                 if (entityValue > 0xFFFF) {
                                     entityValue = -1;

src/com/dmdirc/addons/parser_twitter/api/commons/IntHashMap.java

@@ -40,7 +40,7 @@ class IntHashMap {
     /**
      * The hash table data.
      */
-    private transient Entry[] table;
+    private transient Entry table[];
 
     /**
      * The total number of entries in the hash table.
@@ -176,7 +176,7 @@ class IntHashMap {
             throw new NullPointerException();
         }
 
-        Entry[] tab = table;
+        Entry tab[] = table;
         for (int i = tab.length; i-- > 0;) {
             for (Entry e = tab[i]; e != null; e = e.next) {
                 if (e.value.equals(value)) {
@@ -213,7 +213,7 @@ class IntHashMap {
      * @see #contains(Object)
      */
     public boolean containsKey(int key) {
-        Entry[] tab = table;
+        Entry tab[] = table;
         int hash = key;
         int index = (hash & 0x7FFFFFFF) % tab.length;
         for (Entry e = tab[index]; e != null; e = e.next) {
@@ -234,7 +234,7 @@ class IntHashMap {
      * @see     #put(int, Object)
      */
     public Object get(int key) {
-        Entry[] tab = table;
+        Entry tab[] = table;
         int hash = key;
         int index = (hash & 0x7FFFFFFF) % tab.length;
         for (Entry e = tab[index]; e != null; e = e.next) {
@@ -256,10 +256,10 @@ class IntHashMap {
      */
     protected void rehash() {
         int oldCapacity = table.length;
-        Entry[] oldMap = table;
+        Entry oldMap[] = table;
 
         int newCapacity = oldCapacity * 2 + 1;
-        Entry[] newMap = new Entry[newCapacity];
+        Entry newMap[] = new Entry[newCapacity];
 
         threshold = (int) (newCapacity * loadFactor);
         table = newMap;
@@ -293,7 +293,7 @@ class IntHashMap {
      */
     public Object put(int key, Object value) {
         // Makes sure the key is not already in the hashtable.
-        Entry[] tab = table;
+        Entry tab[] = table;
         int hash = key;
         int index = (hash & 0x7FFFFFFF) % tab.length;
         for (Entry e = tab[index]; e != null; e = e.next) {
@@ -331,7 +331,7 @@ class IntHashMap {
      *          or <code>null</code> if the key did not have a mapping.
      */
     public Object remove(int key) {
-        Entry[] tab = table;
+        Entry tab[] = table;
         int hash = key;
         int index = (hash & 0x7FFFFFFF) % tab.length;
         for (Entry e = tab[index], prev = null; e != null; prev = e, e = e.next) {
@@ -354,7 +354,7 @@ class IntHashMap {
      * <p>Clears this hashtable so that it contains no keys.</p>
      */
     public synchronized void clear() {
-        Entry[] tab = table;
+        Entry tab[] = table;
         for (int index = tab.length; --index >= 0;) {
             tab[index] = null;
         }

src/com/dmdirc/addons/parser_twitter/api/commons/StringEscapeUtils.java

@@ -70,7 +70,7 @@ public class StringEscapeUtils {
             return null;
         }
         try {
-            StringWriter writer = new StringWriter((int) (str.length() * 1.5));
+            StringWriter writer = new StringWriter ((int)(str.length() * 1.5));
             escapeHtml(writer, str);
             return writer.toString();
         } catch (IOException ioe) {
@@ -109,8 +109,8 @@ public class StringEscapeUtils {
      * @see <a href="http://www.w3.org/TR/html401/charset.html#code-position">HTML 4.01 Code positions</a>
      */
     public static void escapeHtml(Writer writer, String string) throws IOException {
-        if (writer == null) {
-            throw new IllegalArgumentException("The Writer must not be null.");
+        if (writer == null ) {
+            throw new IllegalArgumentException ("The Writer must not be null.");
         }
         if (string == null) {
             return;
@@ -140,7 +140,7 @@ public class StringEscapeUtils {
             return null;
         }
         try {
-            StringWriter writer = new StringWriter((int) (str.length() * 1.5));
+            StringWriter writer = new StringWriter ((int)(str.length() * 1.5));
             unescapeHtml(writer, str);
             return writer.toString();
         } catch (IOException ioe) {
@@ -168,8 +168,8 @@ public class StringEscapeUtils {
      * @see #escapeHtml(String)
      */
     public static void unescapeHtml(Writer writer, String string) throws IOException {
-        if (writer == null) {
-            throw new IllegalArgumentException("The Writer must not be null.");
+        if (writer == null ) {
+            throw new IllegalArgumentException ("The Writer must not be null.");
         }
         if (string == null) {
             return;

src/com/dmdirc/addons/parser_twitter/plugin.config

@@ -21,18 +21,19 @@ updates:
   id=49
 
 version:
-  number=27
-  friendly=2.7
+  number=28
+  friendly=2.8
 
 defaults:
   statuscount=20
-  apicalls=60
+  apicalls=175
   debugEnabled=false
   hide500Errors=true
   saveLastIDs=false
   getSentMessages=false
   replaceOpeningNickname=false
   autoAt=false
+  autoLeaveMessageChannel=false
   # Pre-configured support for twitter api
   api.address.twitter.com=api.twitter.com
   api.versioned.twitter.com=true