Style fixes

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

src/com/dmdirc/addons/calc/TokenType.java

@@ -139,8 +139,7 @@ public enum TokenType {
             return new Float(Math.pow(token.getChildren().get(0).evaluate().doubleValue(),
                     token.getChildren().get(1).evaluate().doubleValue()));
         }
-    },
-    ;
+    };
 
     /** The string representation of tokens that may follow this one. */
     private final String[] strfollows;

src/com/dmdirc/addons/freedesktop_notifications/commons/Entities.java

@@ -5,9 +5,9 @@
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -28,13 +28,13 @@ import java.util.TreeMap;
  * <p>
  * Provides HTML and XML entity utilities.
  * </p>
- * 
+ *
  * @see <a href="http://hotwired.lycos.com/webmonkey/reference/special_characters/">ISO Entities</a>
  * @see <a href="http://www.w3.org/TR/REC-html32#latin1">HTML 3.2 Character Entities for ISO Latin-1</a>
  * @see <a href="http://www.w3.org/TR/REC-html40/sgml/entities.html">HTML 4.0 Character entity references</a>
  * @see <a href="http://www.w3.org/TR/html401/charset.html#h-5.3">HTML 4.01 Character References</a>
  * @see <a href="http://www.w3.org/TR/html401/charset.html#code-position">HTML 4.01 Code positions</a>
- * 
+ *
  * @author <a href="mailto:alex@purpletech.com">Alexander Day Chaffee</a>
  * @author <a href="mailto:ggregory@seagullsw.com">Gary Gregory</a>
  * @since 2.0
@@ -151,7 +151,7 @@ class Entities {
 
     // package scoped for testing
     static final int ISO8859_1_ARRAY_LENGTH = ISO8859_1_ARRAY.length;
-    
+
     static String getISO88591(int i, int j) {
         return ISO8859_1_ARRAY[i][j];
     }
@@ -353,10 +353,10 @@ class Entities {
         // <!-- rsaquo is proposed but not yet ISO standardized -->
         {"euro", "8364"}, // -- euro sign, U+20AC NEW -->
     };
-    
+
     // package scoped for testing
     static final int HTML40_ARRAY_LENGTH = HTML40_ARRAY.length;
-    
+
     static String getHTML40(int i, int j) {
         return HTML40_ARRAY[i][j];
     }
@@ -403,7 +403,7 @@ class Entities {
      * <p>
      * Fills the specified entities instance with HTML 40 entities.
      * </p>
-     * 
+     *
      * @param entities
      *            the instance to be filled.
      */
@@ -418,7 +418,7 @@ class Entities {
          * <p>
          * Add an entry to this entity map.
          * </p>
-         * 
+         *
          * @param name
          *            the entity name
          * @param value
@@ -430,7 +430,7 @@ class Entities {
          * <p>
          * Returns the name of the entity identified by the specified value.
          * </p>
-         * 
+         *
          * @param value
          *            the value to locate
          * @return entity name associated with the specified value
@@ -441,7 +441,7 @@ class Entities {
          * <p>
          * Returns the value of the entity identified by the specified name.
          * </p>
-         * 
+         *
          * @param name
          *            the name to locate
          * @return entity value associated with the specified name
@@ -458,7 +458,7 @@ class Entities {
          * {@inheritDoc}
          */
         public void add(String name, int value) {
-            mapNameToValue.put(name, new Integer(value));
+            mapNameToValue.put(name, value);
             mapValueToName.put(value, name);
         }
 
@@ -490,15 +490,15 @@ class Entities {
          * {@inheritDoc}
          */
         public void add(String name, int value) {
-            mapNameToValue.put(name, new Integer(value));
-            mapValueToName.put(new Integer(value), name);
+            mapNameToValue.put(name, value);
+            mapValueToName.put(value, name);
         }
 
         /**
          * {@inheritDoc}
          */
         public String name(int value) {
-            return mapValueToName.get(new Integer(value));
+            return mapValueToName.get(value);
         }
 
         /**
@@ -553,7 +553,7 @@ class Entities {
          * <p>
          * Returns the lookup table for this entity map. The lookup table is created if it has not been previously.
          * </p>
-         * 
+         *
          * @return the lookup table
          */
         private String[] lookupTable() {
@@ -596,7 +596,7 @@ class Entities {
         /**
          * Constructs a new instance of <code>ArrayEntityMap</code> specifying the size by which the array should
          * grow.
-         * 
+         *
          * @param growBy
          *            array will be initialized to and will grow by this amount
          */
@@ -618,7 +618,7 @@ class Entities {
 
         /**
          * Verifies the capacity of the entity array, adjusting the size if necessary.
-         * 
+         *
          * @param capacity
          *            size the array should be
          */
@@ -671,7 +671,7 @@ class Entities {
         /**
          * Constructs a new instance of <code>ArrayEntityMap</code> specifying the size by which the underlying array
          * should grow.
-         * 
+         *
          * @param growBy
          *            array will be initialized to and will grow by this amount
          */
@@ -682,7 +682,7 @@ class Entities {
         /**
          * Performs a binary search of the entity array for the specified key. This method is based on code in
          * {@link java.util.Arrays}.
-         * 
+         *
          * @param key
          *            the key to be found
          * @return the index of the entity array matching the specified key
@@ -744,7 +744,7 @@ class Entities {
      * <p>
      * Adds entities to this entity.
      * </p>
-     * 
+     *
      * @param entityArray
      *            array of entities to be added
      */
@@ -758,7 +758,7 @@ class Entities {
      * <p>
      * Add an entity to this entity.
      * </p>
-     * 
+     *
      * @param name
      *            name of the entity
      * @param value
@@ -772,7 +772,7 @@ class Entities {
      * <p>
      * Returns the name of the entity identified by the specified value.
      * </p>
-     * 
+     *
      * @param value
      *            the value to locate
      * @return entity name associated with the specified value
@@ -785,7 +785,7 @@ class Entities {
      * <p>
      * Returns the value of the entity identified by the specified name.
      * </p>
-     * 
+     *
      * @param name
      *            the name to locate
      * @return entity value associated with the specified name
@@ -798,12 +798,12 @@ class Entities {
      * <p>
      * Escapes the characters in a <code>String</code>.
      * </p>
-     * 
+     *
      * <p>
      * For example, if you have called addEntity(&quot;foo&quot;, 0xA1), escape(&quot;\u00A1&quot;) will return
      * &quot;&amp;foo;&quot;
      * </p>
-     * 
+     *
      * @param str
      *            The <code>String</code> to escape.
      * @return A new escaped <code>String</code>.
@@ -825,7 +825,7 @@ class Entities {
      * Escapes the characters in the <code>String</code> passed and writes the result to the <code>Writer</code>
      * passed.
      * </p>
-     * 
+     *
      * @param writer
      *            The <code>Writer</code> to write the results of the escaping to. Assumed to be a non-null value.
      * @param str
@@ -833,14 +833,14 @@ class Entities {
      * @throws IOException
      *             when <code>Writer</code> passed throws the exception from calls to the {@link Writer#write(int)}
      *             methods.
-     * 
+     *
      * @see #escape(String)
      * @see Writer
      */
     public void escape(Writer writer, String str) throws IOException {
         int len = str.length();
         for (int i = 0; i < len; i++) {
-            int c = Character.codePointAt(str, i); 
+            int c = Character.codePointAt(str, i);
             String entityName = this.entityName(c);
             if (entityName == null) {
                 if (c >= 0x010000 && i < len - 1) {
@@ -848,7 +848,7 @@ class Entities {
                     writer.write(Integer.toString(c, 10));
                     writer.write(';');
                     i++;
-                } else if (c > 0x7F) { 
+                } else if (c > 0x7F) {
                     writer.write("&#");
                     writer.write(Integer.toString(c, 10));
                     writer.write(';');
@@ -867,12 +867,12 @@ class Entities {
      * <p>
      * Unescapes the entities in a <code>String</code>.
      * </p>
-     * 
+     *
      * <p>
      * For example, if you have called addEntity(&quot;foo&quot;, 0xA1), unescape(&quot;&amp;foo;&quot;) will return
      * &quot;\u00A1&quot;
      * </p>
-     * 
+     *
      * @param str
      *            The <code>String</code> to escape.
      * @return A new escaped <code>String</code>.
@@ -886,7 +886,7 @@ class Entities {
             try {
                 this.doUnescape(stringWriter, str, firstAmp);
             } catch (IOException e) {
-                // This should never happen because ALL the StringWriter methods called by #escape(Writer, String) 
+                // This should never happen because ALL the StringWriter methods called by #escape(Writer, String)
                 // do not throw IOExceptions.
                 throw new UnhandledException(e);
             }
@@ -909,7 +909,7 @@ class Entities {
      * Unescapes the escaped entities in the <code>String</code> passed and writes the result to the
      * <code>Writer</code> passed.
      * </p>
-     * 
+     *
      * @param writer
      *            The <code>Writer</code> to write the results to; assumed to be non-null.
      * @param str
@@ -917,7 +917,7 @@ class Entities {
      * @throws IOException
      *             when <code>Writer</code> passed throws the exception from calls to the {@link Writer#write(int)}
      *             methods.
-     * 
+     *
      * @see #escape(String)
      * @see Writer
      */

src/com/dmdirc/addons/freedesktop_notifications/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) {
@@ -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) {

src/com/dmdirc/addons/logging/LoggingPlugin.java

@@ -86,7 +86,7 @@ public class LoggingPlugin extends Plugin implements ActionListener,
     private int historyLines, backbufferLines;
 
     /** Open File */
-    protected class OpenFile {
+    protected static class OpenFile {
 
         /** Last used time. */
         public long lastUsedTime = System.currentTimeMillis();
@@ -99,7 +99,7 @@ public class LoggingPlugin extends Plugin implements ActionListener,
          *
          * @param writer Writer that has file open
          */
-        public OpenFile(final BufferedWriter writer) {
+        protected OpenFile(final BufferedWriter writer) {
             this.writer = writer;
         }
 

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

@@ -42,7 +42,7 @@ import net.miginfocom.swing.MigLayout;
  */
 public class NickColourInputDialog extends StandardDialog
         implements ActionListener {
-    
+
     /**
      * A version number for this class. It should be changed whenever the class
      * structure is changed (or anything else that would prevent serialized
@@ -63,7 +63,7 @@ public class NickColourInputDialog extends StandardDialog
     private ColourChooser textColour;
     /** nicklist colour input. */
     private ColourChooser nicklistColour;
-    
+
     /**
      * Creates a new instance of NickColourInputDialog.
      *
@@ -79,20 +79,20 @@ public class NickColourInputDialog extends StandardDialog
             final String textcolour, final String nickcolour) {
         super(((SwingController) PluginManager.getPluginManager()
                 .getPluginInfoByName("ui_swing").getPlugin()).getMainFrame(), false);
-        
+
         this.panel = panel;
         this.row = row;
-        
+
         setDefaultCloseOperation(WindowConstants.DISPOSE_ON_CLOSE);
-        
+
         initComponents(nickname, network, textcolour, nickcolour);
         initListeners();
         layoutComponents();
-        
+
         setTitle("Nick colour editor");
         display();
     }
-    
+
     /**
      * Creates a new instance of NickColourInputDialog.
      *
@@ -100,10 +100,10 @@ public class NickColourInputDialog extends StandardDialog
      */
     public NickColourInputDialog(final NickColourPanel panel) {
         this(panel, -1, "", "", "", "");
-        
+
         isnew = true;
     }
-    
+
     /**
      * Initialises the components.
      *
@@ -114,46 +114,46 @@ public class NickColourInputDialog extends StandardDialog
      */
     private void initComponents(final String defaultNickname,
             final String defaultNetwork, final String defaultTextColour,
-            final String defaultNickColour) {        
+            final String defaultNickColour) {
         orderButtons(new JButton(), new JButton());
-        
+
         nickname = new JTextField(defaultNickname);
         network = new JTextField(defaultNetwork);
         textColour = new ColourChooser(defaultTextColour, true, true);
         nicklistColour = new ColourChooser(defaultNickColour, true, true);
     }
-    
+
     /** Initialises the listeners. */
     private void initListeners() {
         getOkButton().addActionListener(this);
         getCancelButton().addActionListener(this);
     }
-    
+
     /** Lays out the components. */
-    private void layoutComponents() {        
+    private void layoutComponents() {
         setLayout(new MigLayout("wrap 2"));
-        
+
         add(new JLabel("Nickname: "));
         add(nickname, "growx");
-        
+
         add(new JLabel("Network: "));
         add(network, "growx");
-        
+
         add(new JLabel("Text colour: "));
         add(textColour, "growx");
-        
+
         add(new JLabel("Nicklist colour: "));
         add(nicklistColour, "growx");
-        
+
         add(getLeftButton(), "right");
         add(getRightButton(), "right");
-        
+
         pack();
     }
-    
-    /** 
-     * {@inheritDoc} 
-     * 
+
+    /**
+     * {@inheritDoc}
+     *
      * @param e Action event
      */
     @Override
@@ -163,16 +163,16 @@ public class NickColourInputDialog extends StandardDialog
         }
         dispose();
     }
-    
+
     /** Saves settings. */
-    public void saveSettings() {        
+    public void saveSettings() {
         if (!isnew) {
             panel.removeRow(row);
         }
-        
+
         panel.addRow(network.getText().toLowerCase(),
                 nickname.getText().toLowerCase(),
                 nickname.getText().toLowerCase(), nicklistColour.getColour());
     }
-    
+
 }

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

@@ -59,7 +59,7 @@ public final class NickColourPlugin extends Plugin implements ActionListener,
     /** "Random" colours to use to colour nicknames. */
     private String[] randColours = new String[]{
         "E90E7F", "8E55E9", "B30E0E", "18B33C",
-        "58ADB3", "9E54B3", "B39875", "3176B3",};
+        "58ADB3", "9E54B3", "B39875", "3176B3", };
     private boolean useowncolour;
     private String owncolour;
     private boolean userandomcolour;

src/com/dmdirc/addons/nowplaying/NowPlayingCommand.java

@@ -44,12 +44,12 @@ import java.util.List;
  * variety of media players.
  * @author chris
  */
-public final class NowPlayingCommand extends Command implements 
+public final class NowPlayingCommand extends Command implements
         IntelligentCommand, CommandInfo {
-    
+
     /** The plugin that's using this command. */
     final NowPlayingPlugin parent;
-    
+
     /**
      * Creates a new instance of NowPlayingCommand.
      *
@@ -57,12 +57,12 @@ public final class NowPlayingCommand extends Command implements
      */
     public NowPlayingCommand(final NowPlayingPlugin parent) {
         super();
-        
+
         this.parent = parent;
-        
+
         CommandManager.registerCommand(this);
     }
-    
+
     /** {@inheritDoc} */
     @Override
     public void execute(final FrameContainer<?> origin,
@@ -76,7 +76,7 @@ public final class NowPlayingCommand extends Command implements
             if (args.getArguments().length > 1) {
                 final String sourceName = args.getArguments()[1];
                 final MediaSource source = parent.getSource(sourceName);
-                
+
                 if (source == null) {
                     sendLine(origin, args.isSilent(), FORMAT_ERROR, "Source not found.");
                 } else {
@@ -101,7 +101,7 @@ public final class NowPlayingCommand extends Command implements
             }
         }
     }
-    
+
     /**
      * Outputs a list of sources for the nowplaying command.
      *
@@ -112,17 +112,17 @@ public final class NowPlayingCommand extends Command implements
     private void doSourceList(final FrameContainer<?> origin, final boolean isSilent,
             final String format) {
         final List<MediaSource> sources = parent.getSources();
-        
+
         if (sources.isEmpty()) {
             sendLine(origin, isSilent, FORMAT_ERROR, "No media sources available.");
         } else {
             final String[] headers = {"Source", "Status", "Information"};
             final String[][] data = new String[sources.size()][3];
             int i = 0;
-            
+
             for (MediaSource source : sources) {
                 data[i][0] = source.getAppName();
-                
+
                 if (source.getState() != MediaSourceState.CLOSED) {
                     data[i][1] = source.getState().getNiceName().toLowerCase();
                     data[i][2] = getInformation(source, format);
@@ -130,14 +130,14 @@ public final class NowPlayingCommand extends Command implements
                     data[i][1] = "not running";
                     data[i][2] = "-";
                 }
-                
+
                 i++;
             }
-            
+
             sendLine(origin, isSilent, FORMAT_OUTPUT, doTable(headers, data));
         }
     }
-       
+
     /**
      * Returns a formatted information string from the requested soruce.
      *
@@ -155,19 +155,19 @@ public final class NowPlayingCommand extends Command implements
             return parent.doSubstitution(format, source);
         }
     }
-    
+
     /** {@inheritDoc}. */
     @Override
     public String getName() {
         return "nowplaying";
     }
-    
+
     /** {@inheritDoc}. */
     @Override
     public boolean showInHelp() {
         return true;
     }
-    
+
     /** {@inheritDoc}. */
     @Override
     public String getHelp() {
@@ -180,7 +180,7 @@ public final class NowPlayingCommand extends Command implements
     public CommandType getType() {
         return CommandType.TYPE_CHAT;
     }
-    
+
     /** {@inheritDoc} */
     @Override
     public AdditionalTabTargets getSuggestions(final int arg,

src/com/dmdirc/addons/nowplaying/NowPlayingPlugin.java

@@ -44,61 +44,61 @@ import java.util.List;
 /**
  * Plugin that allows users to advertise what they're currently playing or
  * listening to.
- * 
+ *
  * @author chris
  */
 public class NowPlayingPlugin extends Plugin implements ActionListener  {
-    
+
     /** The sources that we know of. */
     private final List<MediaSource> sources = new ArrayList<MediaSource>();
 
     /** The managers that we know of. */
     private final List<MediaSourceManager> managers = new ArrayList<MediaSourceManager>();
-    
+
     /** The now playing command we're registering. */
     private NowPlayingCommand command;
-    
+
     /** The user's preferred order for source usage. */
     private List<String> order;
-    
+
     /**
      * Creates a new instance of NowPlayingPlugin.
      */
     public NowPlayingPlugin() {
         super();
     }
-    
+
     /** {@inheritDoc} */
     @Override
     public void onLoad() {
         sources.clear();
         managers.clear();
-        
+
         loadSettings();
-        
+
         ActionManager.addListener(this, CoreActionType.PLUGIN_LOADED,
                 CoreActionType.PLUGIN_UNLOADED);
-        
+
         for (PluginInfo target : PluginManager.getPluginManager().getPluginInfos()) {
             if (target.isLoaded()) {
                 addPlugin(target);
             }
         }
-        
+
         command = new NowPlayingCommand(this);
     }
-    
+
     /** {@inheritDoc} */
     @Override
     public void onUnload() {
         sources.clear();
         managers.clear();
-        
+
         ActionManager.removeListener(this);
-        
+
         CommandManager.unregisterCommand(command);
     }
-    
+
     /** {@inheritDoc} */
     @Override
     public void showConfig(final PreferencesManager manager) {
@@ -110,23 +110,23 @@ public class NowPlayingPlugin extends Plugin implements ActionListener  {
                 setObject(new ConfigPanel(NowPlayingPlugin.this, order));
             }
         });
-        
+
         final PreferencesCategory category = new PluginPreferencesCategory(
                 getPluginInfo(), "Now Playing",
                 "", "category-nowplaying", configPanel);
         manager.getCategory("Plugins").addSubCategory(category);
     }
-    
+
     /**
      * Saves the plugins settings.
-     * 
+     *
      * @param newOrder The new order for sources
      */
     protected void saveSettings(final List<String> newOrder) {
         order = newOrder;
         IdentityManager.getConfigIdentity().setOption(getDomain(), "sourceOrder", order);
     }
-    
+
     /** Loads the plugins settings. */
     private void loadSettings() {
         if (IdentityManager.getGlobalConfig().hasOptionString(getDomain(), "sourceOrder")) {
@@ -135,7 +135,7 @@ public class NowPlayingPlugin extends Plugin implements ActionListener  {
             order = new ArrayList<String>();
         }
     }
-    
+
     /** {@inheritDoc} */
     @Override
     public void processEvent(final ActionType type, final StringBuffer format,
@@ -146,7 +146,7 @@ public class NowPlayingPlugin extends Plugin implements ActionListener  {
             removePlugin((PluginInfo) arguments[0]);
         }
     }
-    
+
     /**
      * Checks to see if a plugin implements one of the Media Source interfaces
      * and if it does, adds the source(s) to our list.
@@ -159,7 +159,7 @@ public class NowPlayingPlugin extends Plugin implements ActionListener  {
             sources.add((MediaSource) targetPlugin);
             addSourceToOrder((MediaSource) targetPlugin);
         }
-        
+
         if (targetPlugin instanceof MediaSourceManager) {
             managers.add((MediaSourceManager) targetPlugin);
 
@@ -170,7 +170,7 @@ public class NowPlayingPlugin extends Plugin implements ActionListener  {
             }
         }
     }
-    
+
     /**
      * Checks to see if the specified media source needs to be added to our
      * order list, and adds it if neccessary.
@@ -182,7 +182,7 @@ public class NowPlayingPlugin extends Plugin implements ActionListener  {
             order.add(source.getAppName());
         }
     }
-    
+
     /**
      * Checks to see if a plugin implements one of the Media Source interfaces
      * and if it does, removes the source(s) from our list.
@@ -194,12 +194,12 @@ public class NowPlayingPlugin extends Plugin implements ActionListener  {
         if (targetPlugin instanceof MediaSource) {
             sources.remove((MediaSource) targetPlugin);
         }
-        
+
         if (targetPlugin instanceof MediaSourceManager) {
             managers.remove((MediaSourceManager) targetPlugin);
         }
     }
-    
+
     /**
      * Determines if there are any valid sources (paused or not).
      *
@@ -211,10 +211,10 @@ public class NowPlayingPlugin extends Plugin implements ActionListener  {
                 return true;
             }
         }
-        
+
         return false;
     }
-    
+
     /**
      * Retrieves the "best" source to use for displaying media information.
      * The best source is defined as the earliest in the list that is running
@@ -227,9 +227,9 @@ public class NowPlayingPlugin extends Plugin implements ActionListener  {
     public MediaSource getBestSource() {
         MediaSource paused = null;
         final List<MediaSource> possibleSources = getSources();
-        
+
         Collections.sort(possibleSources, new MediaSourceComparator(order));
-        
+
         for (final MediaSource source : possibleSources) {
             if (source.getState() != MediaSourceState.CLOSED) {
                 if (source.getState() == MediaSourceState.PLAYING) {
@@ -239,14 +239,14 @@ public class NowPlayingPlugin extends Plugin implements ActionListener  {
                 }
             }
         }
-        
+
         return paused;
     }
-    
+
     /**
      * Substitutes the keywords in the specified format with the values with
      * values from the specified source.
-     * 
+     *
      * @param format The format to be substituted
      * @param source The source whose values should be used
      * @return The substituted string
@@ -261,7 +261,7 @@ public class NowPlayingPlugin extends Plugin implements ActionListener  {
         final String length = source.getLength();
         final String time = source.getTime();
         final String state = source.getState().getNiceName();
-        
+
         return format.replace("$artist", sanitise(artist))
                      .replace("$title", sanitise(title))
                      .replace("$album", sanitise(album))
@@ -286,7 +286,7 @@ public class NowPlayingPlugin extends Plugin implements ActionListener  {
     protected static String sanitise(final String input) {
         return input == null ? "" : input;
     }
-    
+
     /**
      * Retrieves a source based on its name.
      *
@@ -299,10 +299,10 @@ public class NowPlayingPlugin extends Plugin implements ActionListener  {
                 return source;
             }
         }
-        
+
         return null;
     }
-    
+
     /**
      * Retrieves all the sources registered with this plugin.
      *

src/com/dmdirc/addons/osd/OsdWindow.java

@@ -52,29 +52,29 @@ import net.miginfocom.swing.MigLayout;
  */
 public class OsdWindow extends JDialog implements MouseListener,
         MouseMotionListener {
-    
+
     /**
      * A version number for this class. It should be changed whenever the class
      * structure is changed (or anything else that would prevent serialized
      * objects being unserialized with the new class).
      */
     private static final long serialVersionUID = 2;
-    
+
     /** The OSD Manager that owns this window. */
     private final OsdManager osdManager;
-    
+
     /** OSD Label. */
     private final JLabel label;
-    
+
     /** OSD Panel. */
     private final JPanel panel;
-    
+
     /** Starting positions of the mouse. */
     private int startX, startY;
 
     /** Desired position. */
     private volatile int desiredX, desiredY;
-    
+
     /** Is this a config instance? */
     private final boolean config;
 
@@ -93,7 +93,7 @@ public class OsdWindow extends JDialog implements MouseListener,
             final int y, final OsdPlugin plugin, final OsdManager osdManager) {
         super(((SwingController) PluginManager.getPluginManager()
                 .getPluginInfoByName("ui_swing").getPlugin()).getMainFrame(), false);
-        
+
         this.config = config;
         this.osdManager = osdManager;
 
@@ -137,7 +137,7 @@ public class OsdWindow extends JDialog implements MouseListener,
         } else {
             addMouseListener(this);
             new Timer("OSD Display Timer").schedule(new TimerTask() {
-                
+
                 /** {@inheritDoc} */
                 @Override
                 public void run() {
@@ -147,11 +147,11 @@ public class OsdWindow extends JDialog implements MouseListener,
                     "timeout") * 1000);
         }
     }
-    
-   
-    /** 
+
+
+    /**
      * {@inheritDoc}
-     * 
+     *
      * @param e Mouse event
      */
     @Override
@@ -160,10 +160,10 @@ public class OsdWindow extends JDialog implements MouseListener,
             osdManager.closeWindow(this);
         }
     }
-    
-    /** 
+
+    /**
      * {@inheritDoc}
-     * 
+     *
      * @param e Mouse event
      */
     @Override
@@ -173,40 +173,40 @@ public class OsdWindow extends JDialog implements MouseListener,
             startY = e.getPoint().y;
         }
     }
-    
-    /** 
+
+    /**
      * {@inheritDoc}
-     * 
+     *
      * @param e Mouse event
      */
     @Override
     public void mouseReleased(final MouseEvent e) {
         // Do nothing
     }
-    
-    /** 
+
+    /**
      * {@inheritDoc}
-     * 
+     *
      * @param e Mouse event
      */
     @Override
     public void mouseEntered(final MouseEvent e) {
         // Do nothing
     }
-    
-    /** 
+
+    /**
      * {@inheritDoc}
-     * 
+     *
      * @param e Mouse event
      */
     @Override
     public void mouseExited(final MouseEvent e) {
         // Do nothing
     }
-    
-    /** 
+
+    /**
      * {@inheritDoc}
-     * 
+     *
      * @param e Mouse event
      */
     @Override
@@ -215,20 +215,20 @@ public class OsdWindow extends JDialog implements MouseListener,
         p.translate(-1 * startX, -1 * startY);
         setLocation(p);
     }
-    
-    /** 
+
+    /**
      * {@inheritDoc}
-     * 
+     *
      * @param e Mouse event
      */
     @Override
     public void mouseMoved(final MouseEvent e) {
         // Do nothing
     }
-    
+
     /**
      * Sets the font size that this OSD uses.
-     * 
+     *
      * @param size The new size of the font
      */
     public void setFontSize(final int size) {
@@ -237,7 +237,7 @@ public class OsdWindow extends JDialog implements MouseListener,
 
     /**
      * Sets the background colour for this OSD.
-     * 
+     *
      * @param colour The background colour to use
      */
     public void setBackgroundColour(final String colour) {
@@ -246,7 +246,7 @@ public class OsdWindow extends JDialog implements MouseListener,
 
     /**
      * Sets the foreground colour for this OSD.
-     * 
+     *
      * @param colour The foreground colour to use
      */
     public void setForegroundColour(final String colour) {
@@ -257,7 +257,7 @@ public class OsdWindow extends JDialog implements MouseListener,
     @Override
     public void setVisible(final boolean b) {
         super.setVisible(b);
-        
+
         if (b) {
             transferFocusBackward();
         }

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

@@ -1,16 +1,16 @@
 /*
  * Copyright (c) 2006-2009 Chris Smith, Shane Mc Cormack, Gregory Holmes
- * 
+ *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
  * in the Software without restriction, including without limitation the rights
  * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  * copies of the Software, and to permit persons to whom the Software is
  * furnished to do so, subject to the following conditions:
- * 
+ *
  * The above copyright notice and this permission notice shall be included in
  * all copies or substantial portions of the Software.
- * 
+ *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -61,7 +61,7 @@ import java.util.Map;
 
 /**
  * Twitter Parser for DMDirc.
- * 
+ *
  * @author shane
  */
 public class Twitter implements Parser, TwitterErrorHandler, TwitterRawHandler,
@@ -104,7 +104,7 @@ public class Twitter implements Parser, TwitterErrorHandler, TwitterRawHandler,
     private TwitterClientInfo myself = null;
 
     /** List of currently active twitter parsers. */
-    protected static List<Twitter> currentParsers = new ArrayList<Twitter>();
+    protected static final List<Twitter> PARSERS = new ArrayList<Twitter>();
 
     /** Are we waiting for authentication? */
     private boolean wantAuth = false;
@@ -152,7 +152,7 @@ public class Twitter implements Parser, TwitterErrorHandler, TwitterRawHandler,
 
     /**
      * Create a new Twitter Parser!
-     * 
+     *
      * @param myInfo
      *            The client information to use
      * @param address
@@ -204,7 +204,7 @@ public class Twitter implements Parser, TwitterErrorHandler, TwitterRawHandler,
     @Override
     public void disconnect(final String message) {
         connected = false;
-        currentParsers.remove(this);
+        PARSERS.remove(this);
         api = new TwitterAPI("", "", "", false, -1, false);
 
         getCallbackManager().getCallbackType(SocketCloseListener.class).call();
@@ -288,7 +288,7 @@ public class Twitter implements Parser, TwitterErrorHandler, TwitterRawHandler,
 
     /**
      * Remove a channel from the known channels list.
-     * 
+     *
      * @param channel
      */
     protected void partChannel(final TwitterChannelInfo channel) {
@@ -343,7 +343,7 @@ public class Twitter implements Parser, TwitterErrorHandler, TwitterRawHandler,
      * Tokenise a line.
      * splits by " " up to the first " :" everything after this is a single
      * token
-     * 
+     *
      * @param line
      *            Line to tokenise
      * @return Array of tokens
@@ -941,7 +941,7 @@ public class Twitter implements Parser, TwitterErrorHandler, TwitterRawHandler,
 
     /**
      * Send a notice to the client.
-     * 
+     *
      * @param message
      *            Message to send.
      */
@@ -952,29 +952,7 @@ public class Twitter implements Parser, TwitterErrorHandler, TwitterRawHandler,
 
     /**
      * Send a PM to the client.
-     * 
-     * @param message
-     *            Message to send.
-     */
-    private void sendPrivateMessage(final String message) {
-        sendPrivateMessage(message, myServerName);
-    }
-
-    /**
-     * Send a PM to the client.
-     * 
-     * @param message
-     *            Message to send.
-     * @param hostname
-     *            Who is the message from?
-     */
-    private void sendPrivateMessage(final String message, final String hostname) {
-        sendPrivateMessage(message, hostname, myUsername);
-    }
-
-    /**
-     * Send a PM to the client.
-     * 
+     *
      * @param message
      *            Message to send.
      * @param hostname
@@ -995,7 +973,7 @@ public class Twitter implements Parser, TwitterErrorHandler, TwitterRawHandler,
 
     /**
      * Send a message to the given channel.
-     * 
+     *
      * @param channel
      *            Channel to send message to
      * @param message
@@ -1008,7 +986,7 @@ public class Twitter implements Parser, TwitterErrorHandler, TwitterRawHandler,
 
     /**
      * Send a message to the given channel.
-     * 
+     *
      * @param channel
      *            Channel to send message to
      * @param message
@@ -1023,7 +1001,7 @@ public class Twitter implements Parser, TwitterErrorHandler, TwitterRawHandler,
 
     /**
      * Send a message to the given channel.
-     * 
+     *
      * @param channel
      *            Channel to send message to
      * @param date
@@ -1094,7 +1072,7 @@ public class Twitter implements Parser, TwitterErrorHandler, TwitterRawHandler,
     /**
      * Check if the given user is known on the channel, and add them if they
      * are not.
-     * 
+     *
      * @param user
      *            User to check
      * @return true if user was already on the channel, false if they were
@@ -1128,7 +1106,7 @@ public class Twitter implements Parser, TwitterErrorHandler, TwitterRawHandler,
 
     /**
      * Send a Debug Message using the parser debug api.
-     * 
+     *
      * @param code
      *            Debug Code for the message.
      * @param message
@@ -1198,7 +1176,7 @@ public class Twitter implements Parser, TwitterErrorHandler, TwitterRawHandler,
                 apiVersion, getConfigManager().getOptionBool(
                         myPlugin.getDomain(), "autoAt"));
         api.setSource("DMDirc");
-        currentParsers.add(this);
+        PARSERS.add(this);
         api.addErrorHandler(this);
         api.addRawHandler(this);
         api.setDebug(debugEnabled);
@@ -1557,7 +1535,7 @@ public class Twitter implements Parser, TwitterErrorHandler, TwitterRawHandler,
 
     /**
      * Reset the state of the parser.
-     * 
+     *
      * @param simpleMyself
      *            Don't check the config when setting myself if true.
      */
@@ -1578,7 +1556,7 @@ public class Twitter implements Parser, TwitterErrorHandler, TwitterRawHandler,
 
     /**
      * Get the Twitter API Object
-     * 
+     *
      * @return The Twitter API Object
      */
     public TwitterAPI getApi() {
@@ -1605,7 +1583,7 @@ public class Twitter implements Parser, TwitterErrorHandler, TwitterRawHandler,
 
     /**
      * Set the twitter status.
-     * 
+     *
      * @param message
      *            Status to use.
      * @return True if status was updated, else false.
@@ -1616,7 +1594,7 @@ public class Twitter implements Parser, TwitterErrorHandler, TwitterRawHandler,
 
     /**
      * Set the twitter status.
-     * 
+     *
      * @param message
      *            Status to use.
      * @param id
@@ -1660,7 +1638,7 @@ public class Twitter implements Parser, TwitterErrorHandler, TwitterRawHandler,
 
     /**
      * Rename the given client from the given name.
-     * 
+     *
      * @param client
      *            Client to rename
      * @param old
@@ -1681,7 +1659,7 @@ public class Twitter implements Parser, TwitterErrorHandler, TwitterRawHandler,
 
     /**
      * Make the core think a channel was joined.
-     * 
+     *
      * @param channel
      *            Channel to join.
      */
@@ -1724,7 +1702,7 @@ public class Twitter implements Parser, TwitterErrorHandler, TwitterRawHandler,
     /**
      * Check if the topic in the given channel has been changed, and if it has
      * fire the callback.
-     * 
+     *
      * @param channel
      *            channel to check.
      * @param status
@@ -1795,7 +1773,7 @@ public class Twitter implements Parser, TwitterErrorHandler, TwitterRawHandler,
 
     /**
      * This method will send data to the NumericListener and the DataInListener
-     * 
+     *
      * @param numeric
      *            Numeric
      * @param token
@@ -1841,7 +1819,7 @@ public class Twitter implements Parser, TwitterErrorHandler, TwitterRawHandler,
 
     /**
      * Let the user know twitter failed in some way.
-     * 
+     *
      * @param message
      *            Message to send to the user
      */
@@ -1855,7 +1833,7 @@ public class Twitter implements Parser, TwitterErrorHandler, TwitterRawHandler,
 
     /**
      * Returns the TwitterPlugin that owns us.
-     * 
+     *
      * @return The TwitterPlugin that owns us.
      */
     public TwitterPlugin getMyPlugin() {
@@ -1878,7 +1856,7 @@ public class Twitter implements Parser, TwitterErrorHandler, TwitterRawHandler,
 
     /**
      * Get the config manager for this parser instance.
-     * 
+     *
      * @return the ConfigManager for this parser.
      */
     protected ConfigManager getConfigManager() {

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

@@ -132,7 +132,7 @@ public class TwitterChannelClientInfo implements ChannelClientInfo {
     /** {@inheritDoc} */
     @Override
     public void kick(final String message) {
-        ((Twitter)myClient.getParser()).getApi().delFriend(myClient.getUser().getScreenName());
+        ((Twitter) myClient.getParser()).getApi().delFriend(myClient.getUser().getScreenName());
         myChannel.delChannelClient(this);
         myClient.delChannelClient(this);
     }

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

@@ -180,7 +180,7 @@ public class TwitterChannelInfo implements ChannelInfo {
     public ChannelClientInfo getChannelClient(final String client, final boolean create) {
         ChannelClientInfo cci = getChannelClient(client);
         if (create && cci == null) {
-            cci = new TwitterChannelClientInfo(this, (TwitterClientInfo)myParser.getClient(client));
+            cci = new TwitterChannelClientInfo(this, (TwitterClientInfo) myParser.getClient(client));
         }
         return cci;
     }

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

@@ -59,7 +59,7 @@ public class TwitterPlugin extends Plugin  {
     @Override
     public void onUnload() {
         unloading = true;
-        for (Twitter parser : new ArrayList<Twitter>(Twitter.currentParsers)) {
+        for (Twitter parser : new ArrayList<Twitter>(Twitter.PARSERS)) {
             parser.disconnect("");
         }
     }

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

@@ -1061,9 +1061,9 @@ public class TwitterAPI {
         synchronized (statusCache) {
             final Map<Long, TwitterStatus> current = new HashMap<Long, TwitterStatus>(statusCache);
 
-            for (Long item : current.keySet()) {
-                if (current.get(item).getTime() < time) {
-                    statusCache.remove(item);
+            for (Map.Entry<Long, TwitterStatus> item : current.entrySet()) {
+                if (item.getValue().getTime() < time) {
+                    statusCache.remove(item.getKey());
                 }
             }
         }
@@ -1243,7 +1243,7 @@ public class TwitterAPI {
             if (doc.isGood()) {
                 final NodeList nodes = doc.getElementsByTagName("id");
                 for (int i = 0; i < nodes.getLength(); i++) {
-                    final Element element = (Element)nodes.item(i);
+                    final Element element = (Element) nodes.item(i);
                     final Long id = parseLong(element.getTextContent(), -1);
                     result.add(id);
 
@@ -1490,9 +1490,9 @@ public class TwitterAPI {
             final String resetTimeString = getElementContents(element, "reset-time-in-seconds", getElementContents(element, "reset_time_in_seconds", "0"));
             resetTime = 1000 * parseLong(resetTimeString, -1);
 
-            return new Long[]{remaining, total, resetTime, (long)usedCalls};
+            return new Long[]{remaining, total, resetTime, (long) usedCalls};
         } else {
-            return new Long[]{0L, 0L, System.currentTimeMillis(), (long)usedCalls};
+            return new Long[]{0L, 0L, System.currentTimeMillis(), (long) usedCalls};
         }
     }
 

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

@@ -190,7 +190,7 @@ public class TwitterMessage implements Comparable<TwitterMessage> {
     @Override
     public boolean equals(final Object message) {
         if (message instanceof TwitterMessage) {
-            return ((TwitterMessage)message).getID() == this.id;
+            return ((TwitterMessage) message).getID() == this.id;
         } else {
             return false;
         }

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

@@ -261,7 +261,7 @@ public class TwitterStatus implements Comparable<TwitterStatus> {
     @Override
     public boolean equals(final Object status) {
         if (status instanceof TwitterStatus) {
-            return ((TwitterStatus)status).getID() == this.id;
+            return ((TwitterStatus) status).getID() == this.id;
         } else {
             return false;
         }

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

@@ -458,7 +458,7 @@ class Entities {
          * {@inheritDoc}
          */
         public void add(String name, int value) {
-            mapNameToValue.put(name, new Integer(value));
+            mapNameToValue.put(name, value);
             mapValueToName.put(value, name);
         }
 
@@ -490,15 +490,15 @@ class Entities {
          * {@inheritDoc}
          */
         public void add(String name, int value) {
-            mapNameToValue.put(name, new Integer(value));
-            mapValueToName.put(new Integer(value), name);
+            mapNameToValue.put(name, value);
+            mapValueToName.put(value, name);
         }
 
         /**
          * {@inheritDoc}
          */
         public String name(int value) {
-            return mapValueToName.get(new Integer(value));
+            return mapValueToName.get(value);
         }
 
         /**

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) {
@@ -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) {

src/com/dmdirc/addons/parserdebug/DebugPlugin.java

@@ -47,8 +47,8 @@ public final class DebugPlugin extends Plugin implements DebugInfoListener, Acti
     private ParserDebugCommand command = null;
 
     /** Map of parsers registered. */
-    protected final HashMap<Parser,DebugWindow> registeredParsers
-            = new HashMap<Parser,DebugWindow>();
+    protected final HashMap<Parser, DebugWindow> registeredParsers
+            = new HashMap<Parser, DebugWindow>();
 
     /**
      * Creates a new instance of the Debug Plugin.
@@ -93,7 +93,7 @@ public final class DebugPlugin extends Plugin implements DebugInfoListener, Acti
     @Override
     public void processEvent(final ActionType type, final StringBuffer format, final Object... arguments) {
         if (type == CoreActionType.SERVER_DISCONNECTED) {
-            final Server thisServer = (Server)arguments[0];
+            final Server thisServer = (Server) arguments[0];
             final Parser parser = thisServer.getParser();
             if (registeredParsers.containsKey(parser)) {
                 try {

src/com/dmdirc/addons/parserdebug/ParserDebugCommand.java

@@ -70,7 +70,6 @@ public final class ParserDebugCommand extends Command implements CommandInfo {
      */
     @Override
     public void execute(final FrameContainer<?> origin, final CommandArguments commandArgs, final CommandContext context) {
-        final String[] args = commandArgs.getArguments();
         final boolean isSilent = commandArgs.isSilent();
   
         Parser parser = ((ServerCommandContext) context).getServer().getParser();
@@ -84,7 +83,7 @@ public final class ParserDebugCommand extends Command implements CommandInfo {
                 parser.getCallbackManager().delCallback(DebugInfoListener.class, myPlugin);
                 DebugWindow window = myPlugin.registeredParsers.get(parser);
                 window.addLine("======================", true);
-                window.addLine("No Longer Monitoring: "+parser+" (User Requested)", true);
+                window.addLine("No Longer Monitoring: " + parser + " (User Requested)", true);
                 window.addLine("======================", true);
                 myPlugin.registeredParsers.remove(parser);
                 sendLine(origin, isSilent, FORMAT_OUTPUT, "Removing callback ok");
@@ -98,7 +97,7 @@ public final class ParserDebugCommand extends Command implements CommandInfo {
                 myPlugin.registeredParsers.put(parser, window);
                 sendLine(origin, isSilent, FORMAT_OUTPUT, "Adding callback ok");
                 window.addLine("======================", true);
-                window.addLine("Started Monitoring: "+parser, true);
+                window.addLine("Started Monitoring: " + parser, true);
                 window.addLine("======================", true);
             } catch (Exception e) {
                 sendLine(origin, isSilent, FORMAT_ERROR, "Adding callback failed");

src/com/dmdirc/addons/relaybot/RelayBotPlugin.java

@@ -71,7 +71,7 @@ public class RelayBotPlugin extends Plugin implements ActionListener, ConfigChan
         for (Server server : ServerManager.getServerManager().getServers()) {
             final Parser parser = server.getParser();
             if (parser instanceof IRCParser && !(parser.getCallbackManager() instanceof RelayCallbackManager)) {
-                new RelayCallbackManager(this, (IRCParser)parser);
+                new RelayCallbackManager(this, (IRCParser) parser);
             }
             for (String channel : server.getChannels()) {
                 final Channel chan = server.getChannel(channel);
@@ -113,17 +113,17 @@ public class RelayBotPlugin extends Plugin implements ActionListener, ConfigChan
     @Override
     public void processEvent(final ActionType type, final StringBuffer format, final Object... arguments) {
         if (type == CoreActionType.CHANNEL_OPENED) {
-            final Channel chan = (Channel)arguments[0];
+            final Channel chan = (Channel) arguments[0];
             
             final String channelName = chan.getServer().getParser().getStringConverter().toLowerCase(chan.getName());
             getHandler(chan);
         } else if (type == CoreActionType.CHANNEL_CLOSED) {
-            final Channel chan = (Channel)arguments[0];
+            final Channel chan = (Channel) arguments[0];
             removeHandler(chan);
         } else if (type == CoreActionType.CHANNEL_QUIT) {
-            final Channel chan = (Channel)arguments[0];
+            final Channel chan = (Channel) arguments[0];
             final Parser parser = chan.getServer().getParser();
-            final ChannelClientInfo cci = (ChannelClientInfo)arguments[1];
+            final ChannelClientInfo cci = (ChannelClientInfo) arguments[1];
             final String channelName = parser.getStringConverter().toLowerCase(chan.getName());
 
             if (IdentityManager.getGlobalConfig().hasOptionString(getDomain(), channelName)) {
@@ -137,14 +137,14 @@ public class RelayBotPlugin extends Plugin implements ActionListener, ConfigChan
                 }
             }
         } else if (type == CoreActionType.SERVER_CONNECTED) {
-            final Server server = (Server)arguments[0];
+            final Server server = (Server) arguments[0];
 
             final Parser parser = server.getParser();
             if (parser instanceof IRCParser && !(parser.getCallbackManager() instanceof RelayCallbackManager)) {
-                new RelayCallbackManager(this, (IRCParser)parser);
+                new RelayCallbackManager(this, (IRCParser) parser);
             }
         } else if (type == CoreActionType.SERVER_DISCONNECTED) {
-            final Server server = (Server)arguments[0];
+            final Server server = (Server) arguments[0];
 
             // RelayCallbackManager will revert itself when this happens.
 

src/com/dmdirc/addons/relaybot/RelayChannelHandler.java

@@ -112,7 +112,7 @@ public class RelayChannelHandler implements ChannelMessageListener {
         synchronized (channelClients) {
             if (!channelClients.containsKey(storeName)) {
                 final RelayClientInfo client = new RelayClientInfo(channel.getParser(), nick);
-                final IRCChannelClientInfo newChannelClient = new IRCChannelClientInfo((IRCParser)channel.getParser(), client, channel);
+                final IRCChannelClientInfo newChannelClient = new IRCChannelClientInfo((IRCParser) channel.getParser(), client, channel);
                 colourClient(newChannelClient);
 
                 channelClients.put(storeName, newChannelClient);
@@ -157,7 +157,7 @@ public class RelayChannelHandler implements ChannelMessageListener {
         synchronized (channelClients) {
             channelClients.remove(channelClient.getClient().toString());
             ((RelayClientInfo) channelClient.getClient()).changeNickname(newNick);
-            channelClients.put(storeName,channelClient);
+            channelClients.put(storeName, channelClient);
         }
     }
 
@@ -196,7 +196,7 @@ public class RelayChannelHandler implements ChannelMessageListener {
         final PluginInfo nickColour = PluginManager.getPluginManager().getPluginInfoByName("nickcolour");
 
         final boolean fullColour = IdentityManager.getGlobalConfig().getOptionBool(myPlugin.getDomain(), "colourFullName");
-        final RelayClientInfo client = (RelayClientInfo)channelClient.getClient();
+        final RelayClientInfo client = (RelayClientInfo) channelClient.getClient();
         final boolean oldValue = client.getShowFullNickname();
         client.setShowFullNickname(fullColour);
 

src/com/dmdirc/addons/relaybot/RelayClientInfo.java

@@ -41,7 +41,7 @@ public class RelayClientInfo extends IRCClientInfo {
      * @param host Host of client.
      */
     public RelayClientInfo(final Parser parser, final String host) {
-        super((IRCParser)parser, host);
+        super((IRCParser) parser, host);
         super.setFake(true);
     }
 

src/com/dmdirc/addons/scriptplugin/JavaScriptHelper.java

@@ -38,7 +38,7 @@ public class JavaScriptHelper {
     private static final int VERSION = 2;
 
     /** Hashtable for storing stuff. */
-    private static final Map<String,Object> SETTINGS = new HashMap<String,Object>();
+    private static final Map<String, Object> SETTINGS = new HashMap<String, Object>();
     
     /**
      * Method to set Stuff.
@@ -50,7 +50,7 @@ public class JavaScriptHelper {
         if (setting.equals("")) { return; }
         setting = setting.toLowerCase();
         if (SETTINGS.containsKey(setting)) { SETTINGS.remove(setting); }
-        if (value != null) { SETTINGS.put(setting,value); }
+        if (value != null) { SETTINGS.put(setting, value); }
     }
     
     /**

src/com/dmdirc/addons/scriptplugin/TypedProperties.java

@@ -1,16 +1,16 @@
 /*
  * Copyright (c) 2006-2010 Shane Mc Cormack
- * 
+ *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
  * in the Software without restriction, including without limitation the rights
  * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  * copies of the Software, and to permit persons to whom the Software is
  * furnished to do so, subject to the following conditions:
- * 
+ *
  * The above copyright notice and this permission notice shall be included in
  * all copies or substantial portions of the Software.
- * 
+ *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -30,7 +30,7 @@ import java.util.Properties;
 
 /**
  * Properties file that allows for getting/setting of typed properties
- * 
+ *
  * @author Shane 'Dataforce' McCormack
  */
 public class TypedProperties extends Properties {
@@ -55,7 +55,7 @@ public class TypedProperties extends Properties {
 
     /**
      * Creates an empty property list with the specified defaults.
-     * 
+     *
      * @param defaults
      *            The Defaults
      */
@@ -65,7 +65,7 @@ public class TypedProperties extends Properties {
 
     /**
      * Set case sensitivity of this properties file.
-     * 
+     *
      * @param value
      *            True/False for the case sensitivity of this file
      */
@@ -91,7 +91,7 @@ public class TypedProperties extends Properties {
      * After loading, setCaseSensitivity(caseSensitive) is called.
      * If this properties file is ment to be case Insensitive, all non-lowercase
      * property names will be lowercased.
-     * 
+     *
      * @param inStream
      *            InputStream to load from.
      * @throws IOException
@@ -108,7 +108,7 @@ public class TypedProperties extends Properties {
      * After loading, setCaseSensitivity(caseSensitive) is called.
      * If this properties file is ment to be case Insensitive, all non-lowercase
      * property names will be lowercased.
-     * 
+     *
      * @param reader
      *            Reader to load from.
      * @throws IOException
@@ -125,7 +125,7 @@ public class TypedProperties extends Properties {
      * After loading, setCaseSensitivity(caseSensitive) is called.
      * If this properties file is ment to be case Insensitive, all non-lowercase
      * property names will be lowercased.
-     * 
+     *
      * @param in
      *            InputStream to load from.
      * @throws java.io.IOException
@@ -138,7 +138,7 @@ public class TypedProperties extends Properties {
 
     /**
      * Get a property from the config
-     * 
+     *
      * @param key
      *            key for property
      * @return the requested property, or null if not defined
@@ -154,7 +154,7 @@ public class TypedProperties extends Properties {
 
     /**
      * Get a property from the config
-     * 
+     *
      * @param key
      *            key for property
      * @param fallback
@@ -172,7 +172,7 @@ public class TypedProperties extends Properties {
 
     /**
      * Set a property in the config
-     * 
+     *
      * @param key
      *            key for property
      * @param value
@@ -190,7 +190,7 @@ public class TypedProperties extends Properties {
 
     /**
      * Check if a property exists
-     * 
+     *
      * @param key
      *            key for property
      * @return True if the property exists, else false
@@ -201,7 +201,7 @@ public class TypedProperties extends Properties {
 
     /**
      * Get a Byte property from the config
-     * 
+     *
      * @param key
      *            key for property
      * @param fallback
@@ -218,7 +218,7 @@ public class TypedProperties extends Properties {
 
     /**
      * Set a Byte property in the config
-     * 
+     *
      * @param key
      *            key for property
      * @param value
@@ -230,7 +230,7 @@ public class TypedProperties extends Properties {
 
     /**
      * Get a Short property from the config
-     * 
+     *
      * @param key
      *            key for property
      * @param fallback
@@ -247,7 +247,7 @@ public class TypedProperties extends Properties {
 
     /**
      * Set a Short property in the config
-     * 
+     *
      * @param key
      *            key for property
      * @param value
@@ -259,7 +259,7 @@ public class TypedProperties extends Properties {
 
     /**
      * Get an integer property from the config
-     * 
+     *
      * @param key
      *            key for property
      * @param fallback
@@ -277,7 +277,7 @@ public class TypedProperties extends Properties {
 
     /**
      * Set an integer property in the config
-     * 
+     *
      * @param key
      *            key for property
      * @param value
@@ -289,7 +289,7 @@ public class TypedProperties extends Properties {
 
     /**
      * Get a Long property from the config
-     * 
+     *
      * @param key
      *            key for property
      * @param fallback
@@ -306,7 +306,7 @@ public class TypedProperties extends Properties {
 
     /**
      * Set a Long property in the config
-     * 
+     *
      * @param key
      *            key for property
      * @param value
@@ -318,7 +318,7 @@ public class TypedProperties extends Properties {
 
     /**
      * Get a float property from the config
-     * 
+     *
      * @param key
      *            key for property
      * @param fallback
@@ -335,7 +335,7 @@ public class TypedProperties extends Properties {
 
     /**
      * Set a float property in the config
-     * 
+     *
      * @param key
      *            key for property
      * @param value
@@ -347,7 +347,7 @@ public class TypedProperties extends Properties {
 
     /**
      * Get a double property from the config
-     * 
+     *
      * @param key
      *            key for property
      * @param fallback
@@ -365,7 +365,7 @@ public class TypedProperties extends Properties {
 
     /**
      * Set a double property in the config
-     * 
+     *
      * @param key
      *            key for property
      * @param value
@@ -377,7 +377,7 @@ public class TypedProperties extends Properties {
 
     /**
      * Get a boolean property from the config
-     * 
+     *
      * @param key
      *            key for property
      * @param fallback
@@ -391,7 +391,7 @@ public class TypedProperties extends Properties {
 
     /**
      * Set a Boolean property in the config
-     * 
+     *
      * @param key
      *            key for property
      * @param value
@@ -403,7 +403,7 @@ public class TypedProperties extends Properties {
 
     /**
      * Get a Char property from the config
-     * 
+     *
      * @param key
      *            key for property
      * @param fallback
@@ -421,7 +421,7 @@ public class TypedProperties extends Properties {
 
     /**
      * Set a Char property in the config
-     * 
+     *
      * @param key
      *            key for property
      * @param value
@@ -433,7 +433,7 @@ public class TypedProperties extends Properties {
 
     /**
      * Get a List property from the config.
-     * 
+     *
      * @param key
      *            key for property
      * @param fallback
@@ -457,7 +457,7 @@ public class TypedProperties extends Properties {
 
     /**
      * Set a List property in the config
-     * 
+     *
      * @param key
      *            key for property
      * @param value

src/com/dmdirc/addons/systray/SystrayPlugin.java

@@ -56,32 +56,32 @@ import java.awt.event.MouseListener;
  */
 public final class SystrayPlugin extends Plugin implements ActionListener,
         MouseListener, com.dmdirc.interfaces.ActionListener {
-    
+
     /** The command we registered. */
     private PopupCommand command;
-    
+
     /** The tray icon we're currently using. */
     private final TrayIcon icon;
-    
+
     /** Creates a new system tray plugin. */
     public SystrayPlugin() {
         super();
         final MenuItem show = new MenuItem("Show/hide");
         final MenuItem quit = new MenuItem("Quit");
-        
+
         final PopupMenu menu = new PopupMenu();
         menu.add(show);
         menu.add(quit);
-        
+
         show.addActionListener(this);
         quit.addActionListener(this);
-        
-        icon = new TrayIcon(IconManager.getIconManager().getImage("logo"), 
+
+        icon = new TrayIcon(IconManager.getIconManager().getImage("logo"),
                 "DMDirc", menu);
         icon.setImageAutoSize(true);
         icon.addMouseListener(this);
     }
-    
+
     /**
      * Sends a notification via the system tray icon.
      * @param title The title of the notification
@@ -91,7 +91,7 @@ public final class SystrayPlugin extends Plugin implements ActionListener,
     public void notify(final String title, final String message, final TrayIcon.MessageType type) {
         icon.displayMessage(title, Styliser.stipControlCodes(message), type);
     }
-    
+
     /**
      * Sends a notification via the system tray icon.
      * @param title The title of the notification
@@ -100,10 +100,10 @@ public final class SystrayPlugin extends Plugin implements ActionListener,
     public void notify(final String title, final String message) {
         notify(title, message, TrayIcon.MessageType.NONE);
     }
-    
+
     /**
      * {@inheritDoc}
-     * 
+     *
      * @param e Action event
      */
     @Override
@@ -114,7 +114,7 @@ public final class SystrayPlugin extends Plugin implements ActionListener,
             Main.quit();
         }
     }
-    
+
     /** {@inheritDoc} */
     @Override
     public ValidationResponse checkPrerequisites() {
@@ -124,7 +124,7 @@ public final class SystrayPlugin extends Plugin implements ActionListener,
             return new ValidationResponse("System tray is not supported on this platform.");
         }
     }
-    
+
     /** {@inheritDoc} */
     @Override
     public void onLoad() {
@@ -134,16 +134,16 @@ public final class SystrayPlugin extends Plugin implements ActionListener,
         } catch (AWTException ex) {
             // Should probably unload ourself here?
         }
-        
+
         ActionManager.addListener(this, CoreActionType.CLIENT_MINIMISED);
     }
-    
+
     /** {@inheritDoc} */
     @Override
     public void onUnload() {
         SystemTray.getSystemTray().remove(icon);
         command.unregister();
-        
+
         ActionManager.removeListener(this);
     }
 
@@ -153,25 +153,25 @@ public final class SystrayPlugin extends Plugin implements ActionListener,
         final PreferencesCategory category = new PluginPreferencesCategory(
                 getPluginInfo(), "System Tray",
                 "General configuration settings");
-        
+
         category.addSetting(new PreferencesSetting(PreferencesType.BOOLEAN,
                 getDomain(), "autominimise", "Auto-hide DMDirc " +
                 "when minimised", "If this option is enabled, the systray " +
                 "plugin will hide DMDirc to the system tray whenever DMDirc is" +
                 " minimised"));
-        
+
         manager.getCategory("Plugins").addSubCategory(category);
     }
-    
-    /** 
+
+    /**
      * {@inheritDoc}
-     * 
+     *
      * @param e Mouse event
      */
     @Override
     public void mouseClicked(final MouseEvent e) {
         if (e.getButton() == MouseEvent.BUTTON1) {
-            if (Main.getUI().getMainWindow().isVisible()) {               
+            if (Main.getUI().getMainWindow().isVisible()) {
                 Main.getUI().getMainWindow().setVisible(false);
             } else {
                 Main.getUI().getMainWindow().setVisible(true);
@@ -180,47 +180,47 @@ public final class SystrayPlugin extends Plugin implements ActionListener,
             }
         }
     }
-    
-    /** 
+
+    /**
      * {@inheritDoc}
-     * 
+     *
      * @param e Mouse event
      */
     @Override
     public void mousePressed(final MouseEvent e) {
         //Ignore
     }
-    
-    /** 
+
+    /**
      * {@inheritDoc}
-     * 
+     *
      * @param e Mouse event
      */
     @Override
     public void mouseReleased(final MouseEvent e) {
         //Ignore
     }
-    
-    /** 
+
+    /**
      * {@inheritDoc}
-     * 
+     *
      * @param e Mouse event
      */
     @Override
     public void mouseEntered(final MouseEvent e) {
         //Ignore
     }
-    
-    /** 
+
+    /**
      * {@inheritDoc}
-     * 
+     *
      * @param e Mouse event
      */
     @Override
     public void mouseExited(final MouseEvent e) {
         //Ignore
     }
-    
+
     /** {@inheritDoc} */
     @Override
     public void processEvent(final ActionType type, final StringBuffer format,
@@ -231,5 +231,5 @@ public final class SystrayPlugin extends Plugin implements ActionListener,
             Main.getUI().getMainWindow().setVisible(false);
         }
     }
-    
+
 }

src/com/dmdirc/addons/ui_dummy/DummyInputWindow.java

@@ -37,7 +37,7 @@ import java.nio.charset.Charset;
  * Dummy input window, used for testing.
  */
 public class DummyInputWindow implements InputWindow {
-    
+
     /** Window title. */
     private String title;
     /** Are we visible? */
@@ -48,10 +48,10 @@ public class DummyInputWindow implements InputWindow {
     private final WritableFrameContainer<? extends InputWindow> container;
     /** Our command parser. */
     private final CommandParser commandParser;
-    
-    /** 
+
+    /**
      * Instantiates a new DummyInputWindow.
-     * 
+     *
      * @param owner Parent window
      * @param commandParser Parent command parser
      */
@@ -60,114 +60,114 @@ public class DummyInputWindow implements InputWindow {
         this.container = owner;
         this.commandParser = commandParser;
     }
-    
+
     /** {@inheritDoc} */
     @Override
     public CommandParser getCommandParser() {
         return commandParser;
     }
-    
+
     /** {@inheritDoc} */
     @Override
     public InputHandler getInputHandler() {
         return new DummyInputHandler(new DummyInputField(), null, this);
     }
-    
+
     /** {@inheritDoc} */
     @Override
     @Deprecated
     public void setAwayIndicator(final boolean isAway) {
         // Do nothing
     }
-    
+
     /** {@inheritDoc} */
     @Override
     @Deprecated
     public void addLine(final String messageType, final Object... args) {
         getContainer().addLine(messageType, args);
     }
-    
+
     /** {@inheritDoc} */
     @Override
     @Deprecated
     public void addLine(final StringBuffer messageType, final Object... args) {
         getContainer().addLine(messageType, args);
     }
-    
+
     /** {@inheritDoc} */
     @Override
     @Deprecated
     public void addLine(final String line, final boolean timestamp) {
         getContainer().addLine(line, timestamp);
     }
-    
+
     /** {@inheritDoc} */
     @Override
     @Deprecated
     public void clear() {
         throw new UnsupportedOperationException("Not supported yet.");
     }
-    
+
     /** {@inheritDoc} */
     @Override
     @Deprecated
     public ConfigManager getConfigManager() {
         return IdentityManager.getGlobalConfig();
     }
-    
+
     /** {@inheritDoc} */
     @Override
     public WritableFrameContainer<? extends InputWindow> getContainer() {
         return container;
     }
-    
+
     /** {@inheritDoc} */
     @Override
     public boolean isVisible() {
         return visible;
     }
-    
+
     /** {@inheritDoc} */
     @Override
     public void setVisible(final boolean isVisible) {
         visible = isVisible;
     }
-    
+
     /** {@inheritDoc} */
     @Override
     @Deprecated
     public String getTitle() {
         return title;
     }
-    
+
     /** {@inheritDoc} */
     @Override
     public boolean isMaximum() {
         return maximised;
     }
-    
-    /** 
-     * {@inheritDoc} 
-     * 
+
+    /**
+     * {@inheritDoc}
+     *
      * @param b maximised or not
      */
     public void setMaximum(final boolean b) {
         maximised = b;
     }
-    
+
     /** {@inheritDoc} */
     @Override
     @Deprecated
     public void setTitle(final String title) {
         this.title = title;
     }
-    
+
     /** {@inheritDoc} */
     @Override
     public void open() {
         // Do nothing
     }
-    
+
     /** {@inheritDoc} */
     @Override
     @Deprecated
@@ -216,5 +216,5 @@ public class DummyInputWindow implements InputWindow {
     public UIController getController() {
         return new DummyController();
     }
-    
+
 }

src/com/dmdirc/addons/ui_dummy/DummyMainWindow.java

@@ -30,59 +30,59 @@ import javax.swing.ImageIcon;
  * Dummy main window, used for testing.
  */
 public final class DummyMainWindow implements MainWindow {
-    
+
     /** Are the windows maximised? */
     private boolean maximised;
     /** Are we visible? */
     private boolean visible = true;
-    
+
     /**
      * Creates a new instance of DummyMainWindow.
      */
     public DummyMainWindow() {
         //Do nothing.
     }
-    
+
     /** {@inheritDoc} */
     @Override
     public ImageIcon getIcon() {
         return null;
     }
-    
+
     /** {@inheritDoc} */
     @Override
     public void quit() {
         // Do nothing
     }
-    
+
     /** {@inheritDoc} */
     @Override
     public void setMaximised(final boolean max) {
         maximised = max;
     }
-    
+
     /** {@inheritDoc} */
     @Override
     public boolean getMaximised() {
         return maximised;
     }
-    
+
     /** {@inheritDoc} */
     @Override
     public String getTitlePrefix() {
         return "DMDirc: Dummy UI: ";
     }
-    
+
     /** {@inheritDoc} */
     @Override
     public void setVisible(final boolean visible) {
         this.visible = visible;
     }
-    
+
     /** {@inheritDoc} */
     @Override
     public boolean isVisible() {
         return visible;
     }
-    
+
 }

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

@@ -69,7 +69,7 @@ public final class UIUtilities {
     /**
      * Adds an undo manager and associated key bindings to the specified text
      * component.
-     * 
+     *
      * @param component component Text component to add an undo manager to
      */
     public static void addUndoManager(final JTextComponent component) {
@@ -168,7 +168,7 @@ public final class UIUtilities {
 
     /**
      * Invokes and waits for the specified runnable, executed on the EDT.
-     * 
+     *
      * @param runnable Thread to be executed
      */
     public static void invokeAndWait(final Runnable runnable) {
@@ -187,7 +187,7 @@ public final class UIUtilities {
 
     /**
      * Invokes and waits for the specified runnable, executed on the EDT.
-     * 
+     *
      * @param <T> The return type of the returnable thread
      * @param returnable Thread to be executed
      * @return Result from the compelted thread
@@ -210,7 +210,7 @@ public final class UIUtilities {
 
     /**
      * Queues the runnable to be executed on the EDT.
-     * 
+     *
      * @param runnable Runnable to be executed.
      */
     public static void invokeLater(final Runnable runnable) {
@@ -223,7 +223,7 @@ public final class UIUtilities {
 
     /**
      * Check if we are using one of the Windows Look and Feels
-     * 
+     *
      * @return True iff the current LAF is "Windows" or "Windows Classic"
      */
     public static boolean isWindowsUI() {
@@ -238,7 +238,7 @@ public final class UIUtilities {
 
     /**
      * Get the value to pass to set Opaque on items being added to a JTabbedPane
-     * 
+     *
      * @return True iff the current LAF is not Windows or OS X.
      * @since 0.6
      */
@@ -254,7 +254,7 @@ public final class UIUtilities {
 
     /**
      * Get the DOWN_MASK for the command/ctrl key.
-     * 
+     *
      * @return on OSX this returns META_DOWN_MASK, else CTRL_DOWN_MASK
      * @since 0.6
      */
@@ -264,7 +264,7 @@ public final class UIUtilities {
 
     /**
      * Get the MASK for the command/ctrl key.
-     * 
+     *
      * @return on OSX this returns META_MASK, else CTRL_MASK
      * @since 0.6
      */
@@ -274,7 +274,7 @@ public final class UIUtilities {
 
     /**
      * Check if the command/ctrl key is pressed down.
-     * 
+     *
      * @param e The KeyEvent to check
      * @return on OSX this returns e.isMetaDown(), else e.isControlDown()
      * @since 0.6
@@ -285,11 +285,11 @@ public final class UIUtilities {
 
     /**
      * Clips a string if its longer than the specified width.
-     * 
+     *
      * @param component Component containing string
      * @param string String to check
      * @param avaiableWidth Available Width
-     * 
+     *
      * @return String (clipped if required)
      */
     public static String clipStringifNeeded(final JComponent component,
@@ -307,11 +307,11 @@ public final class UIUtilities {
 
     /**
      * Clips the passed string .
-     * 
+     *
      * @param component Component containing string
      * @param string String to check
      * @param avaiableWidth Available Width
-     * 
+     *
      * @return String (clipped if required)
      */
     public static String clipString(final JComponent component,

src/com/dmdirc/addons/ui_swing/actions/CopyAction.java

@@ -31,44 +31,44 @@ import javax.swing.text.JTextComponent;
 /**
  * Copy action.
  */
-public final class CopyAction extends AbstractAction { 
-    
+public final class CopyAction extends AbstractAction {
+
     /**
      * A version number for this class. It should be changed whenever the class
      * structure is changed (or anything else that would prevent serialized
      * objects being unserialized with the new class).
      */
     private static final long serialVersionUID = 1;
-    
+
     /** Text component to be acted upon. */
-    private final JTextComponent comp; 
- 
-    /** 
+    private final JTextComponent comp;
+
+    /**
      * Instantiates a new copy action.
-     * 
+     *
      * @param comp Component to be acted upon
      */
-    public CopyAction(final JTextComponent comp) { 
-        super("Copy"); 
-        
-        this.comp = comp; 
-    } 
- 
+    public CopyAction(final JTextComponent comp) {
+        super("Copy");
+
+        this.comp = comp;
+    }
+
     /**
      * {@inheritDoc}
      *
      * @param e Action event
      */
     @Override
-    public void actionPerformed(final ActionEvent e) { 
-        comp.copy(); 
-    } 
- 
+    public void actionPerformed(final ActionEvent e) {
+        comp.copy();
+    }
+
     /** {@inheritDoc} */
     @Override
-    public boolean isEnabled() { 
-        return comp.isEnabled() 
+    public boolean isEnabled() {
+        return comp.isEnabled()
                 && comp.getSelectedText() != null
-                && !(comp instanceof JPasswordField); 
-    } 
-} 
+                && !(comp instanceof JPasswordField);
+    }
+}

src/com/dmdirc/addons/ui_swing/actions/CutAction.java

@@ -31,45 +31,45 @@ import javax.swing.text.JTextComponent;
 /**
  * Cut action.
  */
-public final class CutAction extends AbstractAction { 
-    
+public final class CutAction extends AbstractAction {
+
     /**
      * A version number for this class. It should be changed whenever the class
      * structure is changed (or anything else that would prevent serialized
      * objects being unserialized with the new class).
      */
     private static final long serialVersionUID = 1;
-    
+
     /** Text component to be acted upon. */
-    private final JTextComponent comp; 
- 
-    /** 
+    private final JTextComponent comp;
+
+    /**
      * Instantiates a new cut action.
-     * 
+     *
      * @param comp Component to be acted upon
      */
-    public CutAction(final JTextComponent comp) { 
-        super("Cut"); 
-        
-        this.comp = comp; 
-    } 
- 
+    public CutAction(final JTextComponent comp) {
+        super("Cut");
+
+        this.comp = comp;
+    }
+
     /**
      * {@inheritDoc}
      *
      * @param e Action event
      */
     @Override
-    public void actionPerformed(final ActionEvent e) { 
-        comp.cut(); 
-    } 
- 
+    public void actionPerformed(final ActionEvent e) {
+        comp.cut();
+    }
+
     /** {@inheritDoc} */
     @Override
-    public boolean isEnabled() { 
-        return comp.isEditable() 
-                && comp.isEnabled() 
+    public boolean isEnabled() {
+        return comp.isEditable()
+                && comp.isEnabled()
                 && comp.getSelectedText() != null
-                && !(comp instanceof JPasswordField); 
+                && !(comp instanceof JPasswordField);
     }
-} 
+}

src/com/dmdirc/addons/ui_swing/components/MenuScroller.java

@@ -1,5 +1,5 @@
 /**
- * @(#)MenuScroller.java	1.3.0 05/04/09
+ * @(#)MenuScroller.java 1.3.0 05/04/09
  */
 package com.dmdirc.addons.ui_swing.components;
 

src/com/dmdirc/addons/ui_swing/components/NicklistListModel.java

@@ -72,13 +72,13 @@ public final class NicklistListModel extends AbstractListModel implements
         super();
 
         this.config = config;
-        
+
         sortByMode = config.getOptionBool("nicklist", "sortByMode");
         sortByCase = config.getOptionBool("nicklist", "sortByCase");
         config.addChangeListener("nicklist", "sortByMode", this);
         config.addChangeListener("nicklist", "sortByCase", this);
         nicknames = Collections.synchronizedList(newNicknames);
-        
+
         sort();
     }
 
@@ -93,9 +93,9 @@ public final class NicklistListModel extends AbstractListModel implements
 
     /**
      * Returns the element at the specified place in the nicklist.
-     * 
+     *
      * @param index index of nick required
-     * 
+     *
      * @return nicklist entry requested
      */
     @Override
@@ -116,9 +116,9 @@ public final class NicklistListModel extends AbstractListModel implements
 
     /**
      * Replaces the entire nicklist with the arraylist specified.
-     * 
+     *
      * @param clients replacement nicklist
-     * 
+     *
      * @return boolean success
      */
     public boolean replace(final Collection<ChannelClientInfo> clients) {
@@ -133,9 +133,9 @@ public final class NicklistListModel extends AbstractListModel implements
 
     /**
      * Adds the specified client to the nicklist.
-     * 
+     *
      * @param client client to add to the nicklist
-     * 
+     *
      * @return boolean success
      */
     public boolean add(final ChannelClientInfo client) {
@@ -149,38 +149,38 @@ public final class NicklistListModel extends AbstractListModel implements
 
     /**
      * Removes the specified client from the nicklist.
-     * 
+     *
      * @param client client to remove
-     * 
+     *
      * @return boolean success
      */
     public boolean remove(final ChannelClientInfo client) {
         boolean returnValue;
-        
+
         returnValue = nicknames.remove(client);
         rerender();
-        
+
         return returnValue;
     }
 
     /**
      * Removes the specified index from the nicklist.
-     * 
+     *
      * @param index index to remove
-     * 
+     *
      * @return ChannelClientInfo client removed
      */
     public ChannelClientInfo remove(final int index) {
         ChannelClientInfo returnValue;
-        
+
         returnValue = nicknames.remove(index);
         rerender();
-        
+
         return returnValue;
     }
 
-    /** 
-     * Fires the model changed event forcing the model to re-render. 
+    /**
+     * Fires the model changed event forcing the model to re-render.
      */
     public void rerender() {
         fireContentsChanged(this, 0, nicknames.size());
@@ -194,7 +194,7 @@ public final class NicklistListModel extends AbstractListModel implements
         } else if ("sortByCase".equals(key)) {
             sortByCase = config.getOptionBool("nicklist", "sortByCase");
         }
-        
+
         sort();
     }
 }

src/com/dmdirc/addons/ui_swing/components/SplitPane.java

@@ -1,16 +1,16 @@
 /*
  * Copyright (c) 2006-2010 Chris Smith, Shane Mc Cormack, Gregory Holmes
- * 
+ *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
  * in the Software without restriction, including without limitation the rights
  * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  * copies of the Software, and to permit persons to whom the Software is
  * furnished to do so, subject to the following conditions:
- * 
+ *
  * The above copyright notice and this permission notice shall be included in
  * all copies or substantial portions of the Software.
- * 
+ *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -62,7 +62,7 @@ public class SplitPane extends JSplitPane implements ConfigChangeListener {
     }
 
     /**
-     * Instantiates a new snapping split pane. Defaults to using a horizontal 
+     * Instantiates a new snapping split pane. Defaults to using a horizontal
      * split, two null components and snapping to the left component.
      */
     public SplitPane() {
@@ -70,9 +70,9 @@ public class SplitPane extends JSplitPane implements ConfigChangeListener {
     }
 
     /**
-     * Instantiates a new snapping split pane. Defaults to using a horizontal 
+     * Instantiates a new snapping split pane. Defaults to using a horizontal
      * split, two null components and snapping to the left component.
-     * 
+     *
      * @param snapDistance Distance to around the preferred size
      */
     public SplitPane(final int snapDistance) {
@@ -80,9 +80,9 @@ public class SplitPane extends JSplitPane implements ConfigChangeListener {
     }
 
     /**
-     * Instantiates a new snapping split pane. Defaults to using a horizontal 
+     * Instantiates a new snapping split pane. Defaults to using a horizontal
      * split and two null components.
-     * 
+     *
      * @param leftComponentSnap Snap to the preferred size of the left component?
      */
     public SplitPane(final boolean leftComponentSnap) {
@@ -90,9 +90,9 @@ public class SplitPane extends JSplitPane implements ConfigChangeListener {
     }
 
     /**
-     * Instantiates a new snapping split pane. Defaults to using a horizontal 
+     * Instantiates a new snapping split pane. Defaults to using a horizontal
      * split and two null components.
-     * 
+     *
      * @param leftComponentSnap Snap to the preferred size of the left component?
      * @param snapDistance Distance to around the preferred size
      */
@@ -102,11 +102,11 @@ public class SplitPane extends JSplitPane implements ConfigChangeListener {
     }
 
     /**
-     * Instantiates a new snapping split pane. Defaults to using two null 
+     * Instantiates a new snapping split pane. Defaults to using two null
      * components and snapping to the left component.
-     * 
-     * @param orientation Split pane orientation 
-     * <code>JSplitPane.HORIZONTAL_SPLIT</code> or 
+     *
+     * @param orientation Split pane orientation
+     * <code>JSplitPane.HORIZONTAL_SPLIT</code> or
      * <code>JSplitPane.VERTICAL_SPLIT</code>
      */
     public SplitPane(final Orientation orientation) {
@@ -114,11 +114,11 @@ public class SplitPane extends JSplitPane implements ConfigChangeListener {
     }
 
     /**
-     * Instantiates a new snapping split pane. Defaults to using two null 
+     * Instantiates a new snapping split pane. Defaults to using two null
      * components and snapping to the left component.
-     * 
-     * @param orientation Split pane orientation 
-     * <code>JSplitPane.HORIZONTAL_SPLIT</code> or 
+     *
+     * @param orientation Split pane orientation
+     * <code>JSplitPane.HORIZONTAL_SPLIT</code> or
      * <code>JSplitPane.VERTICAL_SPLIT</code>
      * @param snapDistance Distance to around the preferred size
      */
@@ -128,11 +128,11 @@ public class SplitPane extends JSplitPane implements ConfigChangeListener {
     }
 
     /**
-     * Instantiates a new snapping split pane. Defaults to using two null 
+     * Instantiates a new snapping split pane. Defaults to using two null
      * components.
-     * 
-     * @param orientation Split pane orientation 
-     * <code>JSplitPane.HORIZONTAL_SPLIT</code> or 
+     *
+     * @param orientation Split pane orientation
+     * <code>JSplitPane.HORIZONTAL_SPLIT</code> or
      * <code>JSplitPane.VERTICAL_SPLIT</code>
      * @param leftComponentSnap Snap to the preferred size of the left component?
      */
@@ -142,11 +142,11 @@ public class SplitPane extends JSplitPane implements ConfigChangeListener {
     }
 
     /**
-     * Instantiates a new snapping split pane. Defaults to using two null 
+     * Instantiates a new snapping split pane. Defaults to using two null
      * components.
-     * 
-     * @param orientation Split pane orientation 
-     * <code>JSplitPane.HORIZONTAL_SPLIT</code> or 
+     *
+     * @param orientation Split pane orientation
+     * <code>JSplitPane.HORIZONTAL_SPLIT</code> or
      * <code>JSplitPane.VERTICAL_SPLIT</code>
      * @param leftComponentSnap Snap to the preferred size of the left component?
      * @param snapDistance Distance to around the preferred size
@@ -157,11 +157,11 @@ public class SplitPane extends JSplitPane implements ConfigChangeListener {
     }
 
     /**
-     * Instantiates a new snapping split pane. Defaults to using two null 
+     * Instantiates a new snapping split pane. Defaults to using two null
      * components and snapping to the left component.
-     * 
-     * @param orientation Split pane orientation 
-     * <code>JSplitPane.HORIZONTAL_SPLIT</code> or 
+     *
+     * @param orientation Split pane orientation
+     * <code>JSplitPane.HORIZONTAL_SPLIT</code> or
      * <code>JSplitPane.VERTICAL_SPLIT</code>
      * @param leftComponent left component
      * @param rightComponent right component
@@ -172,11 +172,11 @@ public class SplitPane extends JSplitPane implements ConfigChangeListener {
     }
 
     /**
-     * Instantiates a new snapping split pane. Defaults to using two null 
+     * Instantiates a new snapping split pane. Defaults to using two null
      * components and snapping to the left component.
-     * 
-     * @param orientation Split pane orientation 
-     * <code>JSplitPane.HORIZONTAL_SPLIT</code> or 
+     *
+     * @param orientation Split pane orientation
+     * <code>JSplitPane.HORIZONTAL_SPLIT</code> or
      * <code>JSplitPane.VERTICAL_SPLIT</code>
      * @param leftComponent left component
      * @param rightComponent right component
@@ -189,11 +189,11 @@ public class SplitPane extends JSplitPane implements ConfigChangeListener {
     }
 
     /**
-     * Instantiates a new snapping split pane. Defaults to using two null 
+     * Instantiates a new snapping split pane. Defaults to using two null
      * components.
-     * 
-     * @param orientation Split pane orientation 
-     * <code>JSplitPane.HORIZONTAL_SPLIT</code> or 
+     *
+     * @param orientation Split pane orientation
+     * <code>JSplitPane.HORIZONTAL_SPLIT</code> or
      * <code>JSplitPane.VERTICAL_SPLIT</code>
      * @param leftComponent left component
      * @param rightComponent right component
@@ -206,11 +206,11 @@ public class SplitPane extends JSplitPane implements ConfigChangeListener {
     }
 
     /**
-     * Instantiates a new snapping split pane. Defaults to using two null 
+     * Instantiates a new snapping split pane. Defaults to using two null
      * components.
-     * 
-     * @param orientation Split pane orientation 
-     * <code>JSplitPane.HORIZONTAL_SPLIT</code> or 
+     *
+     * @param orientation Split pane orientation
+     * <code>JSplitPane.HORIZONTAL_SPLIT</code> or
      * <code>JSplitPane.VERTICAL_SPLIT</code>
      * @param leftComponent left component
      * @param rightComponent right component
@@ -231,7 +231,7 @@ public class SplitPane extends JSplitPane implements ConfigChangeListener {
 
         setOneTouchExpandable(useOneTouchExpandable);
         setContinuousLayout(true);
-        
+
         getActionMap().setParent(null);
         getActionMap().clear();
 
@@ -253,4 +253,4 @@ public class SplitPane extends JSplitPane implements ConfigChangeListener {
         });
     }
 }
-    
+

src/com/dmdirc/addons/ui_swing/components/SwingInputField.java

@@ -122,7 +122,7 @@ public class SwingInputField extends JComponent implements InputField,
             }
         });
     }
-    
+
     /** {@inheritDoc} */
     @Override
     public boolean requestFocusInWindow() {
@@ -190,7 +190,7 @@ public class SwingInputField extends JComponent implements InputField,
 
     /**
      * Returns the textfield for this inputfield.
-     * 
+     *
      * @return JTextField
      */
     public JTextField getTextField() {
@@ -349,7 +349,7 @@ public class SwingInputField extends JComponent implements InputField,
 
     /**
      * Replaces the selection with the specified text.
-     * 
+     *
      * @param clipboard Text to replace selection with
      */
     public void replaceSelection(final String clipboard) {
@@ -365,7 +365,7 @@ public class SwingInputField extends JComponent implements InputField,
 
     /**
      * Sets the caret colour to the specified coloour.
-     * 
+     *
      * @param optionColour Colour for the caret
      */
     public void setCaretColor(final Color optionColour) {
@@ -381,7 +381,7 @@ public class SwingInputField extends JComponent implements InputField,
 
     /**
      * Sets the foreground colour to the specified coloour.
-     * 
+     *
      * @param optionColour Colour for the caret
      */
     @Override
@@ -398,7 +398,7 @@ public class SwingInputField extends JComponent implements InputField,
 
     /**
      * Sets the background colour to the specified coloour.
-     * 
+     *
      * @param optionColour Colour for the caret
      */
     @Override
@@ -469,9 +469,9 @@ public class SwingInputField extends JComponent implements InputField,
         });
     }
 
-    /** 
+    /**
      * {@inheritDoc}
-     * 
+     *
      * @param e Key event
      */
     @Override
@@ -481,9 +481,9 @@ public class SwingInputField extends JComponent implements InputField,
         }
     }
 
-    /** 
+    /**
      * {@inheritDoc}
-     * 
+     *
      * @param e Key event
      */
     @Override
@@ -493,9 +493,9 @@ public class SwingInputField extends JComponent implements InputField,
         }
     }
 
-    /** 
+    /**
      * {@inheritDoc}
-     * 
+     *
      * @param e Key event
      */
     @Override

src/com/dmdirc/addons/ui_swing/components/TopicBar.java

@@ -214,7 +214,7 @@ public class TopicBar extends JComponent implements ActionListener,
                             new String[]{Styliser.CODE_HEXCOLOUR + ColourManager.
                                 getHex(
                                 foregroundColour) + channel.getCurrentTopic().
-                                getTopic(),},
+                                getTopic(), },
                             as);
                 }
                 if (channel.getConfigManager().getOptionBool(controller.

src/com/dmdirc/addons/ui_swing/components/addonbrowser/AddonInfo.java

@@ -74,7 +74,7 @@ public class AddonInfo {
             this.screenshot = new ImageIcon(URLBuilder.buildURL(
                     "http://addons.dmdirc.com/addonimg/" + id));
             this.screenshot.setImage(this.screenshot.getImage().
-                   getScaledInstance(150, 150,Image.SCALE_SMOOTH));
+                   getScaledInstance(150, 150, Image.SCALE_SMOOTH));
         } else {
             this.screenshot = new ImageIcon(URLBuilder.buildURL(
                     "dmdirc://com/dmdirc/res/logo.png"));

src/com/dmdirc/addons/ui_swing/components/addonbrowser/AddonInfoCellEditor.java

@@ -1,17 +1,16 @@
 /*
- * 
  * Copyright (c) 2006-2010 Chris Smith, Shane Mc Cormack, Gregory Holmes
- * 
+ *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
  * in the Software without restriction, including without limitation the rights
  * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  * copies of the Software, and to permit persons to whom the Software is
  * furnished to do so, subject to the following conditions:
- * 
+ *
  * The above copyright notice and this permission notice shall be included in
  * all copies or substantial portions of the Software.
- * 
+ *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -54,7 +53,7 @@ public class AddonInfoCellEditor extends AbstractCellEditor implements
         if (value instanceof AddonInfoLabel) {
             final AddonInfoLabel label = (AddonInfoLabel) value;
 
-            label.setBackground(row % 2 == 1 ? new Color(0xEE, 0xEE, 0xFF)
+            label.setBackground((row & 1) == 1 ? new Color(0xEE, 0xEE, 0xFF)
                     : Color.WHITE);
             
             table.setRowHeight(row, label.getPreferredSize().height);

src/com/dmdirc/addons/ui_swing/components/addonbrowser/AddonInfoCellRenderer.java

@@ -54,7 +54,7 @@ public class AddonInfoCellRenderer implements TableCellRenderer {
         if (value instanceof AddonInfoLabel) {
             final AddonInfoLabel label = (AddonInfoLabel) value;
 
-            final Color colour = row % 2 == 1 ? new Color(0xEE, 0xEE, 0xFF) : Color.WHITE;
+            final Color colour = (row & 1) == 1 ? new Color(0xEE, 0xEE, 0xFF) : Color.WHITE;
             if (!label.getBackground().equals(colour)) {
                 label.setBackground(colour);
             }

src/com/dmdirc/addons/ui_swing/components/addonbrowser/BrowserWindow.java

@@ -48,7 +48,7 @@ import net.miginfocom.swing.MigLayout;
 
 /**
  * The main window that allows users to browse addons.
- * 
+ *
  * @author chris
  */
 public class BrowserWindow extends JDialog implements ActionListener {
@@ -211,7 +211,7 @@ public class BrowserWindow extends JDialog implements ActionListener {
 
         for (Map<String, String> entry : data.getKeyDomains().values()) {
             final AddonInfo info = new AddonInfo(entry);
-            list.getModel().addRow(new Object[]{new AddonInfoLabel(info, this),});
+            list.getModel().addRow(new Object[]{new AddonInfoLabel(info, this), });
         }
     }
 

src/com/dmdirc/addons/ui_swing/components/durationeditor/DurationDisplay.java

@@ -1,16 +1,16 @@
 /*
  * Copyright (c) 2006-2010 Chris Smith, Shane Mc Cormack, Gregory Holmes
- * 
+ *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
  * in the Software without restriction, including without limitation the rights
  * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  * copies of the Software, and to permit persons to whom the Software is
  * furnished to do so, subject to the following conditions:
- * 
+ *
  * The above copyright notice and this permission notice shall be included in
  * all copies or substantial portions of the Software.
- * 
+ *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -66,21 +66,21 @@ public class DurationDisplay extends JPanel implements ActionListener,
     public DurationDisplay() {
         this(0);
     }
-    
+
     /**
      * Instantiates a new duration display.
-     * 
+     *
      * @param window Parent window.
-     * 
+     *
      * @since 0.6
      */
     public DurationDisplay(final Window window) {
         this(window, 0);
     }
-    
+
     /**
      * Instantiates a new duration display.
-     * 
+     *
      * @param duration Starting duration
      */
     public DurationDisplay(final long duration) {
@@ -89,10 +89,10 @@ public class DurationDisplay extends JPanel implements ActionListener,
 
     /**
      * Initialises a new duration display showing the specified millisecond duration.
-     * 
+     *
      * @param window Parent window.
      * @param duration Duration to display in milliseconds
-     * 
+     *
      * @since 0.6
      */
     public DurationDisplay(final Window window, final long duration) {
@@ -141,9 +141,9 @@ public class DurationDisplay extends JPanel implements ActionListener,
         add(button, "");
     }
 
-    /** 
+    /**
      * {@inheritDoc}
-     * 
+     *
      * @param e Action event
      */
     @Override
@@ -153,7 +153,7 @@ public class DurationDisplay extends JPanel implements ActionListener,
         editor.addDurationListener(this);
     }
 
-    /** 
+    /**
      * {@inheritDoc}
      */
     @Override
@@ -169,7 +169,7 @@ public class DurationDisplay extends JPanel implements ActionListener,
 
     /**
      * Returns the duration of this display in milliseconds.
-     * 
+     *
      * @return Displayed duration in milliseconds
      */
     public long getDuration() {
@@ -200,7 +200,7 @@ public class DurationDisplay extends JPanel implements ActionListener,
 
     /**
      * Fires the duration updated method on all listeners.
-     * 
+     *
      * @param newDuration New duration
      */
     protected void fireDurationListener(final int newDuration) {
@@ -208,10 +208,10 @@ public class DurationDisplay extends JPanel implements ActionListener,
             listener.durationUpdated(newDuration);
         }
     }
-    
+
     /**
      * Sets the Parent window.
-     * 
+     *
      * @param window Parent window
      */
     public void setWindow(final Window window) {

src/com/dmdirc/addons/ui_swing/components/expandingsettings/AddOptionPanel.java

@@ -52,17 +52,17 @@ import net.miginfocom.swing.MigLayout;
  * Add option panel.
  */
 public class AddOptionPanel extends JPanel implements ActionListener {
-    
+
     /**
      * A version number for this class. It should be changed whenever the class
      * structure is changed (or anything else that would prevent serialized
      * objects being unserialized with the new class).
      */
     private static final long serialVersionUID = 2;
-    
+
     /** Parent settings panel. */
     private final SettingsPanel parent;
-    
+
     /** Add options combobox. */
     private JComboBox addOptionComboBox;
     /** Add option button. */
@@ -83,7 +83,7 @@ public class AddOptionPanel extends JPanel implements ActionListener {
     private JComboBox addInputComboBox;
     /** Add option checkbox. */
     private JLabel addInputNone;
-    
+
     /**
      * Creates a new instance of AddOptionPanel.
      *
@@ -91,23 +91,23 @@ public class AddOptionPanel extends JPanel implements ActionListener {
      */
     protected AddOptionPanel(final SettingsPanel parent) {
         super();
-        
+
         this.parent = parent;
-        
+
         this.setOpaque(UIUtilities.getTabbedPaneOpaque());
         initComponents();
         initListeners();
         setLayout(new MigLayout("ins 0"));
         layoutComponents();
     }
-    
+
     /** Initialises the components. */
     private void initComponents() {
         addOptionComboBox = new JComboBox(new DefaultComboBoxModel());
         addOptionButton = new JButton("Add");
-        
+
         addOptionComboBox.setRenderer(new AddOptionCellRenderer(parent));
-        
+
         addInputColourChooser = new ColourChooser();
         addInputText = new JTextField();
         addInputCheckbox = new JCheckBox();
@@ -116,13 +116,13 @@ public class AddOptionPanel extends JPanel implements ActionListener {
         addInputNone = new JLabel("");
         addInputFontPicker = new FontPicker("Dialog");
         addInputComboBox = new JComboBox(new DefaultComboBoxModel());
-        
+
         addInputCurrent = addInputNone;
-        
+
         addOptionComboBox.setEnabled(false);
         addOptionButton.setEnabled(false);
     }
-    
+
     /** Initialises listeners. */
     private void initListeners() {
         //Only fire events on selection not on highlight
@@ -131,7 +131,7 @@ public class AddOptionPanel extends JPanel implements ActionListener {
         addOptionButton.addActionListener(this);
 
         addInputText.getActionMap().put("enter", new AbstractAction() {
-            
+
             private static final long serialVersionUID = 2;
 
             /** {@inheritDoc} */
@@ -142,20 +142,20 @@ public class AddOptionPanel extends JPanel implements ActionListener {
         });
         addInputText.getInputMap().put(KeyStroke.getKeyStroke("ENTER"), "enter");
     }
-    
+
     /** Lays out the components. */
     private void layoutComponents() {
         setVisible(false);
-        
+
         removeAll();
-        
+
         add(addOptionComboBox, "left, aligny top");
         add(addInputCurrent, "growx, pushx, aligny top");
         add(addOptionButton, "right, aligny top");
-        
+
         setVisible(true);
     }
-    
+
     /**
      * Adds an addable option.
      *
@@ -173,7 +173,7 @@ public class AddOptionPanel extends JPanel implements ActionListener {
         addOptionButton.setEnabled(true);
         addOptionComboBox.setEnabled(true);
     }
-    
+
     /**
      * Removes an addable option.
      *
@@ -187,14 +187,14 @@ public class AddOptionPanel extends JPanel implements ActionListener {
             addOptionButton.setEnabled(false);
         }
     }
-    
+
     /** Clears the options. */
     protected void clearOptions() {
         addOptionComboBox.removeAllItems();
         addInputCurrent = addInputNone;
         layoutComponents();
     }
-    
+
     /**
      * Swaps the input field type to the appropriate type.
      *
@@ -232,12 +232,12 @@ public class AddOptionPanel extends JPanel implements ActionListener {
                     break;
             }
         }
-        
+
         layoutComponents();
-        
+
         addOptionComboBox.requestFocusInWindow();
     }
-    
+
     /**
      * {@inheritDoc}
      *
@@ -255,7 +255,7 @@ public class AddOptionPanel extends JPanel implements ActionListener {
         } else if (e.getSource() == addOptionButton) {
             final OptionType type = parent.getOptionType(
                     (String) addOptionComboBox.getSelectedItem());
-            
+
             switch (type) {
                 case TEXTFIELD:
                     parent.addCurrentOption(
@@ -295,9 +295,9 @@ public class AddOptionPanel extends JPanel implements ActionListener {
                 default:
                     break;
             }
-            
+
             delOption((String) addOptionComboBox.getSelectedItem());
         }
     }
-    
+
 }

src/com/dmdirc/addons/ui_swing/components/expandingsettings/CurrentOptionsPanel.java

@@ -53,17 +53,17 @@ import net.miginfocom.swing.MigLayout;
  * Current options panel.
  */
 public final class CurrentOptionsPanel extends JPanel implements ActionListener {
-    
+
     /**
      * A version number for this class. It should be changed whenever the class
      * structure is changed (or anything else that would prevent serialized
      * objects being unserialized with the new class).
      */
     private static final long serialVersionUID = 2;
-    
+
     /** Parent settings panel. */
     private final SettingsPanel parent;
-    
+
     /** config option -> text fields. */
     private Map<String, JTextField> textFields;
     /** config option -> checkboxes. */
@@ -76,7 +76,7 @@ public final class CurrentOptionsPanel extends JPanel implements ActionListener
     private Map<String, FontPicker> fonts;
     /** config option -> comboboxes. */
     private Map<String, JComboBox> comboboxes;
-    
+
     /**
      * Creates a new instance of CurrentOptionsPanel.
      *
@@ -84,13 +84,13 @@ public final class CurrentOptionsPanel extends JPanel implements ActionListener
      */
     protected CurrentOptionsPanel(final SettingsPanel parent) {
         super();
-        
+
         this.parent = parent;
-        
+
         this.setOpaque(UIUtilities.getTabbedPaneOpaque());
         initComponents();
     }
-    
+
     /** Initialises the components. */
     private void initComponents() {
         textFields = new HashMap<String, JTextField>();
@@ -100,7 +100,7 @@ public final class CurrentOptionsPanel extends JPanel implements ActionListener
         fonts = new HashMap<String, FontPicker>();
         comboboxes = new HashMap<String, JComboBox>();
     }
-    
+
     /** Clears all the current options. */
     protected void clearOptions() {
         textFields.clear();
@@ -111,7 +111,7 @@ public final class CurrentOptionsPanel extends JPanel implements ActionListener
         comboboxes.clear();
         populateCurrentSettings();
     }
-    
+
     /**
      * Adds a current option.
      *
@@ -149,10 +149,10 @@ public final class CurrentOptionsPanel extends JPanel implements ActionListener
             default:
                 throw new IllegalArgumentException("Illegal Type: " + type);
         }
-        
+
         populateCurrentSettings();
     }
-    
+
     /**
      * Deletes a current option.
      *
@@ -183,10 +183,10 @@ public final class CurrentOptionsPanel extends JPanel implements ActionListener
             default:
                 throw new IllegalArgumentException("Illegal Type: " + type);
         }
-        
+
         populateCurrentSettings();
     }
-    
+
     /**
      * Retrives an options value.
      *
@@ -237,7 +237,7 @@ public final class CurrentOptionsPanel extends JPanel implements ActionListener
         }
         return returnValue;
     }
-    
+
     /**
      * Adds an option to the current options pane.
      * @param configName config option name
@@ -251,44 +251,44 @@ public final class CurrentOptionsPanel extends JPanel implements ActionListener
         final ImageButton button = new ImageButton(configName,
                 IconManager.getIconManager().getIcon("close-inactive"),
                 IconManager.getIconManager().getIcon("close-active"));
-        
+
         label.setText(displayName + ": ");
         label.setLabelFor(component);
-        
+
         button.addActionListener(this);
-        
+
         panel.add(label);
         panel.add(component, "growx, pushx");
         panel.add(button, "wrap");
     }
-    
-    
+
+
     /** Populates the current settings. */
     protected void populateCurrentSettings() {
         setVisible(false);
-        
+
         setLayout(new MigLayout("fillx, aligny top"));
-        
+
         removeAll();
-        
+
         for (Entry<String, JTextField> entry : textFields.entrySet()) {
             addCurrentOption(entry.getKey(),
                     parent.getOptionName(entry.getKey()),
                     this, entry.getValue());
         }
-        
+
         for (Entry<String, JCheckBox> entry : checkBoxes.entrySet()) {
             addCurrentOption(entry.getKey(),
                     parent.getOptionName(entry.getKey()),
                     this, entry.getValue());
         }
-        
+
         for (Entry<String, ColourChooser> entry : colours.entrySet()) {
             addCurrentOption(entry.getKey(),
                     parent.getOptionName(entry.getKey()),
                     this, entry.getValue());
         }
-        
+
         for (Entry<String, JSpinner> entry : spinners.entrySet()) {
             addCurrentOption(entry.getKey(),
                     parent.getOptionName(entry.getKey()),
@@ -306,13 +306,13 @@ public final class CurrentOptionsPanel extends JPanel implements ActionListener
                     parent.getOptionName(entry.getKey()),
                     this, entry.getValue());
         }
-        
+
         setVisible(true);
     }
-    
-    /** 
+
+    /**
      * {@inheritDoc}
-     * 
+     *
      * @param e Action performed
      */
     @Override
@@ -320,5 +320,5 @@ public final class CurrentOptionsPanel extends JPanel implements ActionListener
         delOption(e.getActionCommand(), parent.getOptionType(e.getActionCommand()));
         parent.addAddableOption(e.getActionCommand());
     }
-    
+
 }

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

@@ -83,7 +83,7 @@ public final class ChannelFrame extends InputTextFrame implements ActionListener
     /**
      * Creates a new instance of ChannelFrame. Sets up callbacks and handlers,
      * and default options for the form.
-     * 
+     *
      * @param owner The Channel object that owns this frame
      * @param controller Swing controller
      */
@@ -117,7 +117,7 @@ public final class ChannelFrame extends InputTextFrame implements ActionListener
 
     /**
      * Retrieves the command Parser for this command window.
-     * 
+     *
      * @return This window's command Parser
      */
     @Override
@@ -151,7 +151,7 @@ public final class ChannelFrame extends InputTextFrame implements ActionListener
 
     /**
      * Retrieves this channel frame's nicklist component.
-     * 
+     *
      * @return This channel's nicklist
      */
     public NickList getNickList() {
@@ -160,7 +160,7 @@ public final class ChannelFrame extends InputTextFrame implements ActionListener
 
     /**
      * {@inheritDoc}
-     * 
+     *
      * @deprecated @deprecated Use {@link #getContainer()}
      */
     @Override
@@ -216,7 +216,7 @@ public final class ChannelFrame extends InputTextFrame implements ActionListener
 
     /**
      * {@inheritDoc}.
-     * 
+     *
      * @param actionEvent Action event
      */
     @Override
@@ -241,7 +241,7 @@ public final class ChannelFrame extends InputTextFrame implements ActionListener
     @Override
     public void configChanged(final String domain, final String key) {
         super.configChanged(domain, key);
-        
+
         if ("channelSplitPanePosition".equals(key)) {
             final int splitPanePosition = getContainer().getConfigManager()
                     .getOptionInt("ui", "channelSplitPanePosition");

src/com/dmdirc/addons/ui_swing/components/renderers/ActionSubstititionRenderer.java

@@ -34,31 +34,31 @@ import javax.swing.JList;
  * Displays actions using getName not toString.
  */
 public final class ActionSubstititionRenderer extends DefaultListCellRenderer {
-    
+
     /**
      * A version number for this class. It should be changed whenever the class
      * structure is changed (or anything else that would prevent serialized
      * objects being unserialized with the new class).
      */
     private static final long serialVersionUID = 1;
-    
+
     /**
      * Creates a new instance of ActionSubstititionRenderer.
      */
     public ActionSubstititionRenderer() {
         super();
     }
-    
+
     /** {@inheritDoc} */
     @Override
     public Component getListCellRendererComponent(final JList list,
             final Object value, final int index, final boolean isSelected,
             final boolean cellHasFocus) {
         super.getListCellRendererComponent(list, value, index, isSelected, cellHasFocus);
-        
+
         setText(((Substitution) value).getValue());
-        
+
         return this;
     }
-    
+
 }

src/com/dmdirc/addons/ui_swing/components/renderers/AddonCellRenderer.java

@@ -45,34 +45,34 @@ import net.miginfocom.swing.MigLayout;
  * @author chris
  */
 public final class AddonCellRenderer extends JPanel implements ListCellRenderer {
-    
+
     /**
      * A version number for this class. It should be changed whenever the class
      * structure is changed (or anything else that would prevent serialized
      * objects being unserialized with the new class).
      */
     private static final long serialVersionUID = 1;
-    
+
     /** Creates a new instance of AddonCellRenderer. */
     public AddonCellRenderer() {
         super();
     }
-    
+
     /** {@inheritDoc} */
     @Override
     public Component getListCellRendererComponent(final JList list,
             final Object value, final int index, final boolean isSelected,
             final boolean cellHasFocus) {
-       
+
         removeAll();
-        setLayout(new MigLayout("fill, ins 3 0 0 0"));        
-        
+        setLayout(new MigLayout("fill, ins 3 0 0 0"));
+
         if (isSelected) {
             setBackground(list.getSelectionBackground());
         } else {
             setBackground(list.getBackground());
         }
-        
+
         Color foreground = Color.BLACK;
         final JLabel name = new JLabel(), version = new JLabel(),
                 author = new JLabel(), desc = new JLabel();
@@ -90,17 +90,17 @@ public final class AddonCellRenderer extends JPanel implements ListCellRenderer
             desc.setText(plugin.getPluginInfo().getDescription());
         } else if (value instanceof ThemeToggle) {
             final ThemeToggle theme = (ThemeToggle) value;
-            
+
             if (!theme.getState()) {
                 foreground = Color.GRAY;
             }
-            
+
             name.setText(theme.getTheme().getName());
             version.setText(theme.getTheme().getVersion());
             author.setText(theme.getTheme().getAuthor());
             desc.setText(theme.getTheme().getDescription());
         }
-        
+
         name.setForeground(foreground);
         name.setFont(name.getFont().deriveFont(Font.BOLD));
         version.setForeground(foreground);
@@ -108,14 +108,14 @@ public final class AddonCellRenderer extends JPanel implements ListCellRenderer
         author.setForeground(foreground);
         desc.setForeground(foreground);
         desc.setBorder(BorderFactory.createEmptyBorder(SMALL_BORDER, 0, 0, 0));
-        
+
         add(name, "gapleft 3");
         add(version, "pushx");
         add(author, "wrap, gapright 3");
         add(desc, "span 3, growx, pushx, wrap, gapleft 3, gapright 3");
         add(new JSeparator(), "span 3, growx, pushx");
-        
+
         return this;
     }
-    
+
 }

src/com/dmdirc/addons/ui_swing/components/renderers/ReorderableJListCellRenderer.java

@@ -39,17 +39,17 @@ import net.miginfocom.swing.MigLayout;
  * Renderer for the reorderable JList, procides visual clues to DnD.
  */
 public class ReorderableJListCellRenderer implements ListCellRenderer {
-    
+
     /**
      * A version number for this class. It should be changed whenever the class
      * structure is changed (or anything else that would prevent serialized
      * objects being unserialized with the new class).
      */
     private static final long serialVersionUID = 1;
-    
+
     /** Parent list. */
     private final ReorderableJList parent;
-    
+
     /**
      * Instantiates a new ReorderableJListCellRenderer.
      *
@@ -57,10 +57,10 @@ public class ReorderableJListCellRenderer implements ListCellRenderer {
      */
     public ReorderableJListCellRenderer(final ReorderableJList parent) {
         super();
-        
+
         this.parent = parent;
     }
-    
+
     /** {@inheritDoc} */
     @Override
     public Component getListCellRendererComponent(final JList list,
@@ -69,11 +69,11 @@ public class ReorderableJListCellRenderer implements ListCellRenderer {
         final JPanel panel = new JPanel();
         panel.setLayout(new MigLayout("fill, ins 0"));
         final boolean isTargetCell = value == parent.getTargetCell();
-        
+
         final boolean showSelected = isSelected & (parent.getTargetCell() == null);
-        
+
         panel.add(new JLabel(value.toString()), "dock center");
-        
+
         if (showSelected) {
             panel.setForeground(UIManager.getColor("List.selectionForeground"));
             panel.setBackground(UIManager.getColor("List.selectionBackground"));
@@ -86,8 +86,8 @@ public class ReorderableJListCellRenderer implements ListCellRenderer {
                 panel.setBackground(UIManager.getColor("List.background"));
             }
         }
-        
-        
+
+
         if (isTargetCell) {
             if (parent.getBelowTarget()) {
                 panel.add(new JSeparator(), "dock south");
@@ -95,7 +95,7 @@ public class ReorderableJListCellRenderer implements ListCellRenderer {
                 panel.add(new JSeparator(), "dock north");
             }
         }
-        
+
         return panel;
     }
 }

src/com/dmdirc/addons/ui_swing/components/reorderablelist/ListReorderButtonPanel.java

@@ -1,17 +1,17 @@
 /*
- * 
+ *
  * Copyright (c) 2006-2010 Chris Smith, Shane Mc Cormack, Gregory Holmes
- * 
+ *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
  * in the Software without restriction, including without limitation the rights
  * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  * copies of the Software, and to permit persons to whom the Software is
  * furnished to do so, subject to the following conditions:
- * 
+ *
  * The above copyright notice and this permission notice shall be included in
  * all copies or substantial portions of the Software.
- * 
+ *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -58,7 +58,7 @@ public class ListReorderButtonPanel extends JPanel implements
 
     /**
      * Creates a panel to reoder a jlist.
-     * 
+     *
      * @param list JList
      */
     public ListReorderButtonPanel(final ReorderableJList list) {
@@ -89,7 +89,7 @@ public class ListReorderButtonPanel extends JPanel implements
 
     /**
      * {@inheritDoc}
-     * 
+     *
      * @param e Action event
      */
     @Override

src/com/dmdirc/addons/ui_swing/components/reorderablelist/ReorderableJList.java

@@ -58,14 +58,14 @@ import javax.swing.ListSelectionModel;
  */
 public final class ReorderableJList extends JList implements DragSourceListener,
         DropTargetListener, DragGestureListener {
-    
+
     /**
      * A version number for this class. It should be changed whenever the class
      * structure is changed (or anything else that would prevent serialized
      * objects being unserialized with the new class).
      */
     private static final long serialVersionUID = 1;
-    
+
     /** Drag source. */
     private final DragSource dragSource;
     /** Drag target. */
@@ -78,7 +78,7 @@ public final class ReorderableJList extends JList implements DragSourceListener,
     private DataFlavor dataFlavor;
     /** Below drop target. */
     private boolean belowTarget;
-    
+
     /** Instantiate new ReorderableJList. */
     public ReorderableJList() {
         this(new DefaultListModel());
@@ -91,18 +91,18 @@ public final class ReorderableJList extends JList implements DragSourceListener,
      */
     public ReorderableJList(final DefaultListModel model) {
         super(model);
-        
+
         setCellRenderer(new ReorderableJListCellRenderer(this));
         setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
         setTransferHandler(new ArrayListTransferHandler());
-        
+
         dragSource = DragSource.getDefaultDragSource();
         dropTarget = new DropTarget(this, this);
-        
+
         dragSource.createDefaultDragGestureRecognizer(this,
                 DnDConstants.ACTION_MOVE, this);
         try {
-            
+
             dataFlavor = new DataFlavor(DataFlavor.javaJVMLocalObjectMimeType
                     + ";class=java.util.ArrayList");
         } catch (ClassNotFoundException e) {
@@ -111,14 +111,14 @@ public final class ReorderableJList extends JList implements DragSourceListener,
             dataFlavor = null;
         }
     }
-    
+
     /** {@inheritDoc} */
     @Override
     public DefaultListModel getModel() {
         return (DefaultListModel) super.getModel();
     }
-    
-    /** 
+
+    /**
      * Sets the model for the list.
      *
      * @param model Model for the list
@@ -126,7 +126,7 @@ public final class ReorderableJList extends JList implements DragSourceListener,
     public void setModel(final DefaultListModel model) { //NOPMD stupid
         super.setModel(model);
     }
-    
+
     /**
      * Returns the target drop item.
      *
@@ -135,7 +135,7 @@ public final class ReorderableJList extends JList implements DragSourceListener,
     public Object getTargetCell() {
         return dropTargetCell;
     }
-    
+
     /**
      * Returns whether the target is below the drop cell.
      *
@@ -144,31 +144,31 @@ public final class ReorderableJList extends JList implements DragSourceListener,
     public boolean getBelowTarget() {
         return belowTarget;
     }
-    
+
     /** {@inheritDoc} */
     @Override
     public void dragEnter(final DragSourceDragEvent dsde) {
         //Ignore
     }
-    
+
     /** {@inheritDoc} */
     @Override
     public void dragOver(final DragSourceDragEvent dsde) {
         //Ignore
     }
-    
+
     /** {@inheritDoc} */
     @Override
     public void dropActionChanged(final DragSourceDragEvent dsde) {
         //Ignore
     }
-    
+
     /** {@inheritDoc} */
     @Override
     public void dragExit(final DragSourceEvent dse) {
         //Ignore
     }
-    
+
     /** {@inheritDoc} */
     @Override
     public void dragDropEnd(final DragSourceDropEvent dsde) {
@@ -177,7 +177,7 @@ public final class ReorderableJList extends JList implements DragSourceListener,
         draggedIndex = -1;
         repaint();
     }
-    
+
     /** {@inheritDoc} */
     @Override
     public void dragEnter(final DropTargetDragEvent dtde) {
@@ -188,7 +188,7 @@ public final class ReorderableJList extends JList implements DragSourceListener,
             dtde.rejectDrag();
         }
     }
-    
+
     /** {@inheritDoc} */
     @Override
     public void dragOver(final DropTargetDragEvent dtde) {
@@ -196,11 +196,11 @@ public final class ReorderableJList extends JList implements DragSourceListener,
         if (dtde.getSource() != dropTarget) {
             dtde.rejectDrag();
         }
-        
+
         //get location and index
         final Point dragPoint = dtde.getLocation();
         final int index = locationToIndex(dragPoint);
-        
+
         //set drag variables and repaint
         if (index == -1) {
             dropTargetCell = null;
@@ -208,29 +208,29 @@ public final class ReorderableJList extends JList implements DragSourceListener,
             dropTargetCell = getModel().getElementAt(index);
             //check whether the drop point is after the last index
             final Rectangle bounds = getCellBounds(index, index);
-            if (index == getModel().getSize() - 1 
+            if (index == getModel().getSize() - 1
                     && dragPoint.y > bounds.y + bounds.height) {
                 belowTarget = true;
             } else {
                 belowTarget = false;
             }
         }
-        
+
         repaint();
     }
-    
+
     /** {@inheritDoc} */
     @Override
     public void dropActionChanged(final DropTargetDragEvent dtde) {
         //Ignore
     }
-    
+
     /** {@inheritDoc} */
     @Override
     public void dragExit(final DropTargetEvent dte) {
         //Ignore
     }
-    
+
     /** {@inheritDoc} */
     @Override
     public void drop(final DropTargetDropEvent dtde) {
@@ -245,16 +245,16 @@ public final class ReorderableJList extends JList implements DragSourceListener,
         if (belowTarget) {
             index++;
         }
-        
+
         //reject invalid drops
         if ((index == -1) || (index == draggedIndex)) {
             dtde.rejectDrop();
             return;
         }
-        
+
         //accept drop as a move
         dtde.acceptDrop(DnDConstants.ACTION_MOVE);
-        
+
         //get dropped item
         Object dragged;
         try {
@@ -264,7 +264,7 @@ public final class ReorderableJList extends JList implements DragSourceListener,
         } catch (IOException e) {
             return;
         }
-        
+
         //move items
         final boolean sourceBeforeTarget = draggedIndex < index;
         final DefaultListModel mod = getModel();
@@ -273,24 +273,24 @@ public final class ReorderableJList extends JList implements DragSourceListener,
         for (Object item : (ArrayList<?>) dragged) {
             mod.add(newIndex, item);
         }
-        
+
         getSelectionModel().setSelectionInterval(newIndex, newIndex);
-        
+
         //drop complete
         dtde.dropComplete(true);
     }
-    
+
     /** {@inheritDoc} */
     @Override
     public void dragGestureRecognized(final DragGestureEvent dge) {
         //find the objects location and index
         final Point clickPoint = dge.getDragOrigin();
         final int index = locationToIndex(clickPoint);
-        
+
         if (index == -1) {
             return;
         }
-        
+
         //get the list object
         final Object target = getModel().getElementAt(index);
         //create the trasnferable object

src/com/dmdirc/addons/ui_swing/components/substitutions/SubstitutionLabel.java

@@ -1,16 +1,16 @@
 /*
  * Copyright (c) 2006-2010 Chris Smith, Shane Mc Cormack, Gregory Holmes
- * 
+ *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
  * in the Software without restriction, including without limitation the rights
  * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  * copies of the Software, and to permit persons to whom the Software is
  * furnished to do so, subject to the following conditions:
- * 
+ *
  * The above copyright notice and this permission notice shall be included in
  * all copies or substantial portions of the Software.
- * 
+ *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -62,9 +62,9 @@ public class SubstitutionLabel extends JButton implements MouseListener,
     /** Previously selected component. */
     private Component previousComponent;
 
-    /** 
+    /**
      * Instantiates the panel.
-     * 
+     *
      * @param substitution Action substitition
      */
     public SubstitutionLabel(final Substitution substitution) {
@@ -85,7 +85,7 @@ public class SubstitutionLabel extends JButton implements MouseListener,
 
         setText(substitution.getName());
         setFont(getFont().deriveFont(getFont().getSize() - 2f));
-        
+
         setBorder(
                 BorderFactory.createCompoundBorder(
                 BorderFactory.createLineBorder(Color.GRAY),
@@ -106,9 +106,9 @@ public class SubstitutionLabel extends JButton implements MouseListener,
     private void layoutComponents() {
     }
 
-    /** 
+    /**
      * {@inheritDoc}
-     * 
+     *
      * @param e Mouse event
      */
     @Override
@@ -116,9 +116,9 @@ public class SubstitutionLabel extends JButton implements MouseListener,
     //Ignore
     }
 
-    /** 
+    /**
      * {@inheritDoc}
-     * 
+     *
      * @param e Mouse event
      */
     @Override
@@ -126,9 +126,9 @@ public class SubstitutionLabel extends JButton implements MouseListener,
     //Ignore
     }
 
-    /** 
+    /**
      * {@inheritDoc}
-     * 
+     *
      * @param e Mouse event
      */
     @Override
@@ -136,9 +136,9 @@ public class SubstitutionLabel extends JButton implements MouseListener,
     //Ignore
     }
 
-    /** 
+    /**
      * {@inheritDoc}
-     * 
+     *
      * @param e Mouse event
      */
     @Override
@@ -146,9 +146,9 @@ public class SubstitutionLabel extends JButton implements MouseListener,
         setCursor(Cursor.getPredefinedCursor(Cursor.MOVE_CURSOR));
     }
 
-    /** 
+    /**
      * {@inheritDoc}
-     * 
+     *
      * @param e Mouse event
      */
     @Override
@@ -163,9 +163,9 @@ public class SubstitutionLabel extends JButton implements MouseListener,
                 new StringTransferable(substitution.toString()), null);
     }
 
-    /** 
+    /**
      * {@inheritDoc}
-     * 
+     *
      * @param e Action event
      */
     @Override
@@ -175,9 +175,9 @@ public class SubstitutionLabel extends JButton implements MouseListener,
         }
     }
 
-    /** 
+    /**
      * {@inheritDoc}
-     * 
+     *
      * @param e Focus event
      */
     @Override
@@ -185,9 +185,9 @@ public class SubstitutionLabel extends JButton implements MouseListener,
         previousComponent = e.getOppositeComponent();
     }
 
-    /** 
+    /**
      * {@inheritDoc}
-     * 
+     *
      * @param e Focus event
      */
     @Override

src/com/dmdirc/addons/ui_swing/components/substitutions/SubstitutionsPanel.java

@@ -1,16 +1,16 @@
 /*
  * Copyright (c) 2006-2010 Chris Smith, Shane Mc Cormack, Gregory Holmes
- * 
+ *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
  * in the Software without restriction, including without limitation the rights
  * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  * copies of the Software, and to permit persons to whom the Software is
  * furnished to do so, subject to the following conditions:
- * 
+ *
  * The above copyright notice and this permission notice shall be included in
  * all copies or substantial portions of the Software.
- * 
+ *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -36,7 +36,7 @@ import net.miginfocom.swing.MigLayout;
 
 /**
  * Generic substitutions panel
- * 
+ *
  * @param <T> Type of substitution
  */
 public abstract class SubstitutionsPanel<T> extends JPanel {
@@ -63,18 +63,18 @@ public abstract class SubstitutionsPanel<T> extends JPanel {
         VERTICAL;
     }
 
-    /** 
+    /**
      * Instantiates the panel.
-     * 
+     *
      * @param description Description
      */
     public SubstitutionsPanel(final String description) {
         this(description, Alignment.VERTICAL, null);
     }
 
-    /** 
+    /**
      * Instantiates the panel.
-     * 
+     *
      * @param description Description
      * @param type Action type
      */
@@ -82,9 +82,9 @@ public abstract class SubstitutionsPanel<T> extends JPanel {
         this(description, Alignment.VERTICAL, type);
     }
 
-    /** 
+    /**
      * Instantiates the panel.
-     * 
+     *
      * @param description Description
      * @param alignment Alignment of the separator
      */
@@ -93,9 +93,9 @@ public abstract class SubstitutionsPanel<T> extends JPanel {
         this(description, alignment, null);
     }
 
-    /** 
+    /**
      * Instantiates the panel.
-     * 
+     *
      * @param description Description
      * @param alignment Alignment of the separator
      * @param type Action type
@@ -158,7 +158,7 @@ public abstract class SubstitutionsPanel<T> extends JPanel {
 
     /**
      * Sets the type for this substitution panel.
-     * 
+     *
      * @param type New action type
      */
     public abstract void setType(final T type);

src/com/dmdirc/addons/ui_swing/components/validating/ValidatingJTextField.java

@@ -1,16 +1,16 @@
 /*
  * Copyright (c) 2006-2010 Chris Smith, Shane Mc Cormack, Gregory Holmes
- * 
+ *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
  * in the Software without restriction, including without limitation the rights
  * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  * copies of the Software, and to permit persons to whom the Software is
  * furnished to do so, subject to the following conditions:
- * 
+ *
  * The above copyright notice and this permission notice shall be included in
  * all copies or substantial portions of the Software.
- * 
+ *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -63,7 +63,7 @@ public class ValidatingJTextField extends JComponent implements DocumentListener
 
     /**
      * Instantiates a new Validating text field.
-     * 
+     *
      * @param validator Validator instance
      */
     public ValidatingJTextField(final Validator<String> validator) {
@@ -72,7 +72,7 @@ public class ValidatingJTextField extends JComponent implements DocumentListener
 
     /**
      * Instantiates a new Validating text field.
-     * 
+     *
      * @param textField JTextField to wrap
      * @param validator Validator instance
      */
@@ -121,9 +121,9 @@ public class ValidatingJTextField extends JComponent implements DocumentListener
 
     /**
      * Checks if the text validates.
-     * 
+     *
      * @see com.dmdirc.ui.swing.components.validating.Validator#validate(Object)
-     * 
+     *
      * @return true iif the text validates
      */
     public boolean validateText() {
@@ -164,7 +164,7 @@ public class ValidatingJTextField extends JComponent implements DocumentListener
         textField.setEnabled(enabled);
         checkError();
     }
-    
+
     /** {@inheritDoc} */
     @Override
     public void requestFocus() {
@@ -179,9 +179,9 @@ public class ValidatingJTextField extends JComponent implements DocumentListener
 
     /**
      * Sets the text in the textfield.
-     * 
+     *
      * @see javax.swing.JTextField#setText(String)
-     * 
+     *
      * @param t Text to set
      */
     public void setText(final String t) {
@@ -190,9 +190,9 @@ public class ValidatingJTextField extends JComponent implements DocumentListener
 
     /**
      * Sets the selection start.
-     * 
+     *
      * @see javax.swing.JTextField#setSelectionStart(int)
-     * 
+     *
      * @param selectionStart Start of the selection
      */
     public void setSelectionStart(final int selectionStart) {
@@ -201,9 +201,9 @@ public class ValidatingJTextField extends JComponent implements DocumentListener
 
     /**
      * Sets the selection end.
-     * 
+     *
      * @see javax.swing.JTextField#setSelectionEnd(int)
-     * 
+     *
      * @param selectionEnd End of the selection
      */
     public void setSelectionEnd(final int selectionEnd) {
@@ -212,9 +212,9 @@ public class ValidatingJTextField extends JComponent implements DocumentListener
 
     /**
      * Sets whether the component is editable.
-     * 
+     *
      * @see javax.swing.JTextField#setEditable(boolean)
-     * 
+     *
      * @param b editable state for the component
      */
     public void setEditable(final boolean b) {
@@ -223,7 +223,7 @@ public class ValidatingJTextField extends JComponent implements DocumentListener
 
     /**
      * Selects all text in the textfield.
-     * 
+     *
      * @see javax.swing.JTextField#selectAll()
      */
     public void selectAll() {
@@ -232,9 +232,9 @@ public class ValidatingJTextField extends JComponent implements DocumentListener
 
     /**
      * Selects the specified text in the textfield.
-     * 
+     *
      * @see javax.swing.JTextField#select(int, int)
-     * 
+     *
      * @param selectionStart Selection start
      * @param selectionEnd Selection end
      */
@@ -244,9 +244,9 @@ public class ValidatingJTextField extends JComponent implements DocumentListener
 
     /**
      * Replaces the textfields selection with the specified content.
-     * 
+     *
      * @see javax.swing.JTextField#replaceSelection(String)
-     * 
+     *
      * @param content Text to replace selection with
      */
     public void replaceSelection(final String content) {
@@ -255,7 +255,7 @@ public class ValidatingJTextField extends JComponent implements DocumentListener
 
     /**
      * Paste's the system clipboard into the textfield.
-     * 
+     *
      * @see javax.swing.JTextField#paste()
      */
     public void paste() {
@@ -264,9 +264,9 @@ public class ValidatingJTextField extends JComponent implements DocumentListener
 
     /**
      * Checks if the textfield is editable.
-     * 
+     *
      * @see javax.swing.JTextField#isEditable()
-     * 
+     *
      * @return true iif the textfield is editable
      */
     public boolean isEditable() {
@@ -275,9 +275,9 @@ public class ValidatingJTextField extends JComponent implements DocumentListener
 
     /**
      * Returns the text in the textfield.
-     * 
+     *
      * @see javax.swing.JTextField#getText()
-     * 
+     *
      * @return Textfield content
      */
     public String getText() {
@@ -286,14 +286,14 @@ public class ValidatingJTextField extends JComponent implements DocumentListener
 
     /**
      * Returns the specified section of text in the textfield.
-     * 
+     *
      * @see javax.swing.JTextField#getText(int, int)
-     * 
+     *
      * @param offs Start offset
      * @param len section length
-     * 
+     *
      * @return Specified textfield content
-     * 
+     *
      * @throws javax.swing.text.BadLocationException
      */
     public String getText(final int offs, final int len) throws BadLocationException {
@@ -302,9 +302,9 @@ public class ValidatingJTextField extends JComponent implements DocumentListener
 
     /**
      * Returns the start of the selection in the textfield.
-     * 
+     *
      * @see javax.swing.JTextField#getSelectionStart()
-     * 
+     *
      * @return Selection start
      */
     public int getSelectionStart() {
@@ -313,9 +313,9 @@ public class ValidatingJTextField extends JComponent implements DocumentListener
 
     /**
      * Returns the end of the textfield selection.
-     * 
+     *
      * @see javax.swing.JTextField#getSelectionEnd()
-     * 
+     *
      * @return Selection end
      */
     public int getSelectionEnd() {
@@ -324,9 +324,9 @@ public class ValidatingJTextField extends JComponent implements DocumentListener
 
     /**
      * Returns the selected text in the textfield.
-     * 
+     *
      * @see javax.swing.JTextField#getSelectedText()
-     * 
+     *
      * @return Selected text
      */
     public String getSelectedText() {
@@ -335,9 +335,9 @@ public class ValidatingJTextField extends JComponent implements DocumentListener
 
     /**
      * Returns the textfield's document.
-     * 
+     *
      * @see javax.swing.JTextField#getDocument()
-     * 
+     *
      * @return Textfield's document
      */
     public Document getDocument() {
@@ -346,7 +346,7 @@ public class ValidatingJTextField extends JComponent implements DocumentListener
 
     /**
      * Cuts the selected text from the textfield into the clipboard.
-     * 
+     *
      * @see javax.swing.JTextField#cut()
      */
     public void cut() {
@@ -355,7 +355,7 @@ public class ValidatingJTextField extends JComponent implements DocumentListener
 
     /**
      * Copies the selected text from the textfield into the clipboard.
-     * 
+     *
      * @see javax.swing.JTextField#copy()
      */
     public void copy() {
@@ -364,7 +364,7 @@ public class ValidatingJTextField extends JComponent implements DocumentListener
 
     /**
      * Returns the font for the textfield.
-     * 
+     *
      * @see javax.swing.JTextField#copy()
      */
     @Override
@@ -395,16 +395,16 @@ public class ValidatingJTextField extends JComponent implements DocumentListener
     public synchronized void removeMouseListener(final MouseListener l) {
         textField.removeMouseListener(l);
     }
-    
+
     /**
      * Sets the drag enabled property on the textfield.
-     * 
+     *
      * @param enabled Enabled?
      */
     public void setDragEnabled(final boolean enabled) {
         textField.setDragEnabled(enabled);
     }
-    
+
     /** {@inheritDoc} */
     @Override
     public void setTransferHandler(final TransferHandler newHandler) {
@@ -413,9 +413,9 @@ public class ValidatingJTextField extends JComponent implements DocumentListener
 
     /**
      * Returns the validator used by this text field.
-     * 
+     *
      * @since 0.6.3m1
-     * 
+     *
      * @return This field's validator
      */
     public Validator<String> getValidator() {

src/com/dmdirc/addons/ui_swing/dialogs/about/AboutDialog.java

@@ -57,9 +57,9 @@ public final class AboutDialog extends StandardDialog implements
     /** Tab history. */
     private int history = 0;
 
-    /** 
-     * Creates a new instance of AboutDialog. 
-     * 
+    /**
+     * Creates a new instance of AboutDialog.
+     *
      * @param parentWindow Parent window
      */
     private AboutDialog(final Window parentWindow) {
@@ -67,9 +67,9 @@ public final class AboutDialog extends StandardDialog implements
         initComponents();
     }
 
-    /** 
-     * Creates the dialog if one doesn't exist, and displays it. 
-     * 
+    /**
+     * Creates the dialog if one doesn't exist, and displays it.
+     *
      * @param parentWindow Parent window*/
     public static void showAboutDialog(final Window parentWindow) {
         me = getAboutDialog(parentWindow);
@@ -80,7 +80,7 @@ public final class AboutDialog extends StandardDialog implements
 
     /**
      * Returns the current instance of the AboutDialog.
-     * 
+     *
      * @param parentWindow Parent window
      *
      * @return The current AboutDialog instance
@@ -122,9 +122,9 @@ public final class AboutDialog extends StandardDialog implements
         getContentPane().add(getOkButton(), "right");
     }
 
-    /** 
+    /**
      * {@inheritDoc}.
-     * 
+     *
      * @param e Action event
      */
     @Override

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

@@ -39,44 +39,44 @@ import javax.swing.SwingUtilities;
  * and ensures they can't be selected.
  */
 public final class ActionTypeModel extends DefaultComboBoxModel {
-    
+
     /**
      * A version number for this class. It should be changed whenever the class
      * structure is changed (or anything else that would prevent serialized
      * objects being unserialized with the new class).
      */
-    private static final long serialVersionUID = 1;    
+    private static final long serialVersionUID = 1;
     /** Max Width. */
     private int maxWidth = -1;
     /** Font metrics. */
     private FontMetrics fm;
-    
+
     /**
      * Creates a new instance of ActionTypeModel.
-     * 
+     *
      * @param fm Font metrics
      * @param typeGroups The action type groups to use
      */
     public ActionTypeModel(final FontMetrics fm, final MapList<String, ActionType> typeGroups) {
         super();
-        
+
         this.fm = fm;
-        
+
         for (Map.Entry<String, List<ActionType>> entry : typeGroups.entrySet()) {
             addElement(entry.getKey());
-            
+
             final List<ActionType> types = entry.getValue();
             Collections.sort(types, new ActionTypeComparator());
-            
+
             for (ActionType type : types) {
                 addElement(type);
             }
         }
     }
 
-    /** 
+    /**
      * {@inheritDoc}
-     * 
+     *
      * @param anObject Objerct to add
      */
     @Override
@@ -98,30 +98,30 @@ public final class ActionTypeModel extends DefaultComboBoxModel {
             super.setSelectedItem(anObject);
         }
     }
-    
+
     /**
      * Sets the type group for this model.
-     * 
+     *
      * @param typeGroup New type group
      */
     public void setTypeGroup(final MapList<String, ActionType> typeGroup) {
         removeAllElements();
-        
+
         for (Map.Entry<String, List<ActionType>> entry : typeGroup.entrySet()) {
             addElement(entry.getKey());
-            
+
             final List<ActionType> types = entry.getValue();
             Collections.sort(types, new ActionTypeComparator());
-            
+
             for (ActionType type : types) {
                 addElement(type);
             }
         }
     }
-    
+
     /**
      * Returns the maximum width of a string in this model.
-     * 
+     *
      * @return String max width
      */
     public int getMaxWidth() {

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

@@ -65,7 +65,7 @@ public class StringTransferable implements Transferable {
     /** {@inheritDoc} */
     @Override
     public DataFlavor[] getTransferDataFlavors() {
-        return new DataFlavor[]{localStringFlavor, serialStringFlavor,};
+        return new DataFlavor[]{localStringFlavor, serialStringFlavor, };
     }
 
     /** {@inheritDoc} */

src/com/dmdirc/addons/ui_swing/dialogs/channelsetting/TopicHistoryPane.java

@@ -76,7 +76,7 @@ public class TopicHistoryPane extends JPanel implements ListSelectionListener {
         scrollPane.getVerticalScrollBar().setUnitIncrement(15);
 
         for (Topic topic : topics) {
-            topicHistory.getModel().addRow(new Object[]{new TopicLabel(channel, topic),});
+            topicHistory.getModel().addRow(new Object[]{new TopicLabel(channel, topic), });
         }
         topicHistory.getSelectionModel().setSelectionInterval(0, 0);
         topicHistory.setShowGrid(false);

src/com/dmdirc/addons/ui_swing/dialogs/channelsetting/TopicLabel.java

@@ -117,7 +117,7 @@ public class TopicLabel extends JPanel {
 
         if (!topic.getTopic().isEmpty()) {
             channel.getStyliser().addStyledString((StyledDocument) pane.getDocument(),
-                    new String[]{topic.getTopic(),},
+                    new String[]{topic.getTopic(), },
                     as);
             add(pane, "wmax 450, grow, push, wrap, gapleft 5, gapleft 5");
         }

src/com/dmdirc/addons/ui_swing/dialogs/error/ErrorDetailPanel.java

@@ -41,43 +41,43 @@ import net.miginfocom.swing.MigLayout;
  * Shows information about an error.
  */
 public final class ErrorDetailPanel extends JPanel implements ErrorListener {
-    
+
     /**
      * A version number for this class. It should be changed whenever the class
      * structure is changed (or anything else that would prevent serialized
      * objects being unserialized with the new class).
      */
     private static final long serialVersionUID = 3;
-    
+
     /** Error to show. */
     private ProgramError error;
-    
+
     /** ID field. */
     private JTextField id;
-    
+
     /** Date field. */
     private JTextField date;
-    
+
     /** Severity field. */
     private JTextField level;
-    
+
     /** Report Status field. */
     private JTextField reportStatus;
-    
+
     /** Error status field. */
     private JTextField errorStatus;
-    
+
     /** Details field. */
     private JTextArea details;
-    
+
     /** Details scrollpane. */
     private JScrollPane scrollPane;
-    
+
     /** Creates a new instance of ErrorDetailPanel. */
     public ErrorDetailPanel() {
         this(null);
     }
-    
+
     /**
      * Creates a new instance of ErrorDetailPanel.
      *
@@ -85,16 +85,16 @@ public final class ErrorDetailPanel extends JPanel implements ErrorListener {
      */
     public ErrorDetailPanel(final ProgramError error) {
         super();
-        
+
         this.error = error;
-        
+
         initComponents();
-        
+
         updateDetails();
-        
+
         layoutComponents();
     }
-    
+
     /**
      * Sets the error used for this panel.
      *
@@ -104,7 +104,7 @@ public final class ErrorDetailPanel extends JPanel implements ErrorListener {
         error = newError;
         updateDetails();
     }
-    
+
     /** Initialises the components. */
     private void initComponents() {
         id = new JTextField();
@@ -123,10 +123,10 @@ public final class ErrorDetailPanel extends JPanel implements ErrorListener {
         details.setEditable(false);
         details.setRows(5);
         details.setWrapStyleWord(true);
-        
+
         ErrorManager.getErrorManager().addErrorListener(this);
     }
-    
+
     /** Updates the panels details. */
     private void updateDetails() {
         SwingUtilities.invokeLater(new Runnable() {
@@ -139,16 +139,16 @@ public final class ErrorDetailPanel extends JPanel implements ErrorListener {
                     level.setText("");
                     reportStatus.setText("");
                     errorStatus.setText("");
-                    
+
                     return;
                 }
-                
+
                 id.setText(String.valueOf(error.getID()));
                 date.setText(error.occurrencesString());
                 level.setText(error.getLevel().toString());
                 reportStatus.setText(error.getReportStatus().toString());
                 errorStatus.setText(error.getFixedStatus().toString());
-                
+
                 details.append(error.getMessage() + '\n');
                 final String[] trace = error.getTrace();
                 if (trace.length > 0) {
@@ -162,31 +162,31 @@ public final class ErrorDetailPanel extends JPanel implements ErrorListener {
                 } catch (BadLocationException ex) {
                     //Ignore
                 }
-                
+
                 UIUtilities.resetScrollPane(scrollPane);
             }
         });
     }
-    
+
     /** Lays out the components. */
     private void layoutComponents() {
         setLayout(new MigLayout("fill, wrap 2", "[right]rel[grow,fill]", ""));
-        
+
         add(new JLabel("ID: "));
         add(id);
-        
+
         add(new JLabel("Date: "));
         add(date);
-        
+
         add(new JLabel("Severity: "));
         add(level);
-        
+
         add(new JLabel("Report status: "));
         add(reportStatus);
-        
+
         add(new JLabel("Error status: "));
         add(errorStatus);
-        
+
         add(new JLabel("Details: "));
         add(scrollPane, "grow, push");
     }
@@ -215,5 +215,5 @@ public final class ErrorDetailPanel extends JPanel implements ErrorListener {
     public boolean isReady() {
         return isVisible();
     }
-    
+
 }

src/com/dmdirc/addons/ui_swing/framemanager/buttonbar/ButtonBar.java

@@ -125,7 +125,7 @@ public final class ButtonBar implements FrameManager, ActionListener,
                 .HORIZONTAL_SCROLLBAR_NEVER);
         scrollPane.setVerticalScrollBarPolicy(ScrollPaneConstants
                 .VERTICAL_SCROLLBAR_AS_NEEDED);
-        scrollPane.setMinimumSize(new Dimension(0,buttonHeight
+        scrollPane.setMinimumSize(new Dimension(0, buttonHeight
                 + ((int) PlatformDefaults.getUnitValueX("related").getValue()) * 2));
 
         buttons = Collections.synchronizedMap(new HashMap<Window, FrameToggleButton>());
@@ -311,7 +311,7 @@ public final class ButtonBar implements FrameManager, ActionListener,
         button.addActionListener(this);
         button.addMouseListener(this);
         button.setHorizontalAlignment(SwingConstants.LEFT);
-        button.setMinimumSize(new Dimension(0,buttonHeight));
+        button.setMinimumSize(new Dimension(0, buttonHeight));
         button.setMargin(new Insets(0, 0, 0, 0));
         buttons.put(source, button);
     }

src/com/dmdirc/addons/ui_swing/wizard/StepLayout.java

@@ -59,19 +59,19 @@ public class StepLayout implements LayoutManager2, Serializable {
     public StepLayout() {
         this(0, 0);
     }
-    
+
     /**
      * Instantiates a new step layout.
-     * 
+     *
      * @param parent Parent component
      */
     public StepLayout(final Container parent) {
         this(0, 0, parent);
     }
-    
+
     /**
      * Instantiates a new step layout with the specified gaps.
-     * 
+     *
      * @param hGap Horizontal gap
      * @param vGap Vertical gap
      */
@@ -84,7 +84,7 @@ public class StepLayout implements LayoutManager2, Serializable {
 
     /**
      * Instantiates a new step layout with the specified gaps.
-     * 
+     *
      * @param hGap Horizontal gap
      * @param vGap Vertical gap
      * @param parent Parent component
@@ -99,7 +99,7 @@ public class StepLayout implements LayoutManager2, Serializable {
 
     /**
      * Returns the number of steps in the layout.
-     * 
+     *
      * @return number of steps >= 0
      */
     public int size() {
@@ -108,7 +108,7 @@ public class StepLayout implements LayoutManager2, Serializable {
 
     /**
      * Checks if the layout is empty
-     * 
+     *
      * @return true iif the layout has no steps
      */
     public boolean isEmpty() {
@@ -117,9 +117,9 @@ public class StepLayout implements LayoutManager2, Serializable {
 
     /**
      * Returns the specified step from the layout.
-     * 
+     *
      * @param index Step to retrieve
-     * 
+     *
      * @return Step
      */
     public Step getStep(final int index) {
@@ -128,7 +128,7 @@ public class StepLayout implements LayoutManager2, Serializable {
 
     /**
      * Returns the step list.
-     * 
+     *
      * @return List of steps
      */
     public List getSteps() {
@@ -137,7 +137,7 @@ public class StepLayout implements LayoutManager2, Serializable {
 
     /**
      * Show the first step.
-     * 
+     *
      * @param parent Parent container
      */
     public void first(final Container parent) {
@@ -146,7 +146,7 @@ public class StepLayout implements LayoutManager2, Serializable {
 
     /**
      * Show the last step.
-     * 
+     *
      * @param parent Parent container
      */
     public void last(final Container parent) {
@@ -155,16 +155,16 @@ public class StepLayout implements LayoutManager2, Serializable {
 
     /**
      * Show the next step.
-     * 
+     *
      * @param parent Parent container
      */
     public void next(final Container parent) {
         show(currentStep + 1, parent);
     }
 
-    /** 
+    /**
      * Show the previous step.
-     * 
+     *
      * @param parent Parent container
      */
     public void previous(final Container parent) {
@@ -173,7 +173,7 @@ public class StepLayout implements LayoutManager2, Serializable {
 
     /**
      * Show the specified step.
-     * 
+     *
      * @param step Step to show
      * @param parent Parent container
      */
@@ -183,7 +183,7 @@ public class StepLayout implements LayoutManager2, Serializable {
 
     /**
      * Show the step at the specified index.
-     * 
+     *
      * @param step Step to show
      * @param parent Parent container
      */
@@ -223,12 +223,12 @@ public class StepLayout implements LayoutManager2, Serializable {
         addLayoutComponent((Step) comp);
     }
 
-    /** 
+    /**
      * {@inheritDoc}
-     * 
-     * @deprecated Use addLayoutComponent(Component, Object) or 
+     *
+     * @deprecated Use addLayoutComponent(Component, Object) or
      * addLayoutComponent(Component)
-     * 
+     *
      * @see addLayoutComponent(Component)
      * @see addLayoutComponent(Component, Object)
      */
@@ -243,7 +243,7 @@ public class StepLayout implements LayoutManager2, Serializable {
 
     /**
      * Adds a component to the layout.
-     * 
+     *
      * @param step Component to add
      */
     public void addLayoutComponent(final Step step) {
@@ -267,9 +267,9 @@ public class StepLayout implements LayoutManager2, Serializable {
         }
     }
 
-    /** 
+    /**
      * {@inheritDoc}
-     * 
+     *
      * @return Returns the preferred size of the container
      */
     @Override
@@ -295,9 +295,9 @@ public class StepLayout implements LayoutManager2, Serializable {
         }
     }
 
-    /** 
+    /**
      * {@inheritDoc}
-     * 
+     *
      * @return Returns the minimum size of the container
      */
     @Override
@@ -323,11 +323,11 @@ public class StepLayout implements LayoutManager2, Serializable {
         }
     }
 
-    /** 
+    /**
      * {@inheritDoc}
-     * 
+     *
      * @param parent Container to get the size for
-     * 
+     *
      * @return Returns the maximum size of the container
      */
     @Override
@@ -335,11 +335,11 @@ public class StepLayout implements LayoutManager2, Serializable {
         return new Dimension(Integer.MAX_VALUE, Integer.MAX_VALUE);
     }
 
-    /** 
+    /**
      * {@inheritDoc}
-     * 
+     *
      * @param target Container to get the alignment from
-     * 
+     *
      * @return Alignment
      */
     @Override
@@ -347,11 +347,11 @@ public class StepLayout implements LayoutManager2, Serializable {
         return 0.5f;
     }
 
-    /** 
+    /**
      * {@inheritDoc}
-     * 
+     *
      * @param target Container to get the alignment from
-     * 
+     *
      * @return Alignment
      */
     @Override
@@ -359,9 +359,9 @@ public class StepLayout implements LayoutManager2, Serializable {
         return 0.5f;
     }
 
-    /** 
+    /**
      * {@inheritDoc}
-     * 
+     *
      * @param target  Container to invalidate
      */
     @Override

src/com/dmdirc/addons/ui_swing/wizard/firstrun/MigrationExtrationStep.java

@@ -31,40 +31,40 @@ import net.miginfocom.swing.MigLayout;
  * Queries the user for which core actions they wish to extract.
  */
 public final class MigrationExtrationStep extends ExtractionStep {
-    
+
     /**
      * A version number for this class. It should be changed whenever the class
      * structure is changed (or anything else that would prevent serialized
      * objects being unserialized with the new class).
      */
     private static final long serialVersionUID = 2;
-    
+
     /**
      * Creates a new instance of StepOne.
      */
     public MigrationExtrationStep() {
         super();
     }
-    
+
     /** {@inheritDoc} */
     @Override
     protected void initComponents() {
         setLayout(new MigLayout("fillx, wrap 1"));
-        
+
         TextLabel infoLabel;
-        
+
         infoLabel = new TextLabel("This version of DMDirc contains an update to "
                 + " the core plugins and actions.\n\nWould you like to extract the"
                 + " core plugins to update them? Note that older plugins may not"
                 + " function correctly with this version of DMDirc.");
         add(infoLabel, "growx, pushx");
         add(plugins, "");
-        
+
         infoLabel = new TextLabel("Would you like to extract the default actions"
                 + " to update them? Any changes you have made to the default"
                 + " actions will be lost.");
         add(infoLabel, "growx, pushx");
         add(actions, "");
     }
-    
+
 }

src/com/dmdirc/addons/ui_web/Client.java

@@ -35,27 +35,27 @@ import org.mortbay.util.ajax.Continuation;
  * @author chris
  */
 public class Client {
-    
+
     private long lastSeenTime = System.currentTimeMillis();
 
     private Continuation continuation;
-    
+
     private final String ip;
-    
+
     private final List<Event> events = new LinkedList<Event>();
 
     public Client(final String ip) {
         events.add(new Event("statusbar", "Welcome to the DMDirc web interface"));
-        
+
         this.ip = ip;
-        
+
         final List<Window> added = new LinkedList<Window>();
         final List<Window> queued = new LinkedList<Window>(WebWindow.getWindows());
 
         while (!queued.isEmpty()) {
             final Window window = queued.remove(0);
             final Window parent = window.getContainer().getParent().getFrame();
-            
+
             if (parent == null) {
                 events.add(new Event("newwindow", window));
                 added.add(window);
@@ -67,11 +67,11 @@ public class Client {
             }
         }
     }
-    
+
     public String getIp() {
         return ip;
     }
-    
+
     public long getTime() {
         return System.currentTimeMillis() - lastSeenTime;
     }
@@ -83,11 +83,11 @@ public class Client {
     public void setContinuation(Continuation continuation) {
         this.continuation = continuation;
     }
-    
+
     public void touch() {
         lastSeenTime = System.currentTimeMillis();
     }
-    
+
     public void addEvent(final Event event) {
         synchronized (events) {
             events.add(event);
@@ -97,7 +97,7 @@ public class Client {
             }
         }
     }
-    
+
     public List<Event> retrieveEvents() {
         synchronized (events) {
             final List<Event> res = new LinkedList<Event>(events);
@@ -105,7 +105,7 @@ public class Client {
             return res;
         }
     }
-    
+
     public int getEventCount() {
         return events.size();
     }

src/com/dmdirc/addons/ui_web/uicomponents/WebWindow.java

@@ -53,35 +53,35 @@ import org.apache.commons.lang.StringEscapeUtils;
  * @author chris
  */
 public class WebWindow implements Window {
-    
+
     protected static int counter = 0;
-    
-    protected static Map<String, WebWindow> windows = new HashMap<String, WebWindow>();
-    
+
+    protected static final Map<String, WebWindow> WINDOWS = new HashMap<String, WebWindow>();
+
     protected int myID = ++counter;
-    
+
     private final FrameContainer<?> parent;
-    
+
     private List<String> messages = new ArrayList<String>();
-    
+
     private String title;
-    
+
     public WebWindow(final FrameContainer<?> parent) {
         super();
-        
+
         this.parent = parent;
-        
-        windows.put(getId(), this);
+
+        WINDOWS.put(getId(), this);
     }
-    
+
     public static Collection<WebWindow> getWindows() {
-        return windows.values();
+        return WINDOWS.values();
     }
-    
+
     public static WebWindow getWindow(final String id) {
-        return windows.get(id);
+        return WINDOWS.get(id);
     }
-    
+
     public List<String> getMessages() {
         return messages;
     }
@@ -109,7 +109,7 @@ public class WebWindow implements Window {
     @Deprecated
     public void addLine(String line, boolean timestamp) {
         for (String linepart : line.split("\n")) {
-            final String message = 
+            final String message =
                     style(Formatter.formatMessage(parent.getConfigManager(), "timestamp",
                     new Date()), getConfigManager()) + style(linepart, getConfigManager());
             messages.add(message);
@@ -155,7 +155,7 @@ public class WebWindow implements Window {
     public String getTitle() {
         return title;
     }
-    
+
     public String getName() {
         return parent.toString();
     }
@@ -195,7 +195,7 @@ public class WebWindow implements Window {
     public void close() {
         throw new UnsupportedOperationException("Not supported yet.");
     }
-    
+
     public String getType() {
         if (this instanceof WebServerWindow) {
             return "server";
@@ -207,44 +207,44 @@ public class WebWindow implements Window {
             return "window";
         }
     }
-    
+
     public String getId() {
         return String.valueOf(myID);
     }
-    
+
     protected String style(final String input, final ConfigManager config) {
         final StringBuilder builder = new StringBuilder();
         final AttributedCharacterIterator aci = Utils.getAttributedString(parent.getStyliser(),
                 new String[]{input}, "dialog", 12).getAttributedString().getIterator();
-         
+
         Map<AttributedCharacterIterator.Attribute, Object> map = null;
         char chr = aci.current();
-        
+
         while (aci.getIndex() < aci.getEndIndex()) {
-            if (!aci.getAttributes().equals(map)) {                
+            if (!aci.getAttributes().equals(map)) {
                 style(aci.getAttributes(), builder);
                 map = aci.getAttributes();
             }
-            
+
             builder.append(StringEscapeUtils.escapeHtml(String.valueOf(chr)));
             chr = aci.next();
         }
-        
+
         return builder.toString();
     }
-    
+
     protected static void style(final Map<AttributedCharacterIterator.Attribute, Object> map,
             final StringBuilder builder) {
         if (builder.length() > 0) {
             builder.append("</span>");
         }
-        
+
         String link = null;
-                
+
         builder.append("<span style=\"");
-        
+
         for (Map.Entry<AttributedCharacterIterator.Attribute, Object> entry : map.entrySet()) {
-        
+
             if (entry.getKey().equals(TextAttribute.FOREGROUND)) {
                 builder.append("color: ");
                 builder.append(toColour(entry.getValue()));
@@ -253,7 +253,7 @@ public class WebWindow implements Window {
                 builder.append("background-color: ");
                 builder.append(toColour(entry.getValue()));
                 builder.append("; ");
-            } else if (entry.getKey().equals(TextAttribute.WEIGHT)) { 
+            } else if (entry.getKey().equals(TextAttribute.WEIGHT)) {
                 builder.append("font-weight: bold; ");
             } else if (entry.getKey().equals(TextAttribute.FAMILY)) {
                 builder.append("font-family: monospace; ");
@@ -281,21 +281,21 @@ public class WebWindow implements Window {
                         + "');";
             }
         }
-        
+
         builder.append('"');
-        
+
         if (link != null) {
             builder.append(" onClick=\"");
             builder.append(link);
             builder.append('"');
         }
-        
+
         builder.append('>');
     }
-    
+
     protected static String toColour(final Object object) {
         final Color colour = (Color) object;
-        
+
         return "rgb(" + colour.getRed() + ", " + colour.getGreen() + ", "
                 + colour.getBlue() + ")";
     }

test/com/dmdirc/addons/identd/IdentClientTest.java

@@ -39,9 +39,9 @@ public class IdentClientTest {
 
     protected IdentClient getClient() {
         IdentdPlugin plugin = mock(IdentdPlugin.class);
-        
+
         when(plugin.getDomain()).thenReturn("plugin-Identd");
-        
+
         return new IdentClient(null, null, plugin);
     }
 
@@ -49,44 +49,44 @@ public class IdentClientTest {
     public void testInvalidIdent() {
         final String response = getClient().getIdentResponse("invalid request!",
                 IdentityManager.getGlobalConfig());
-        
+
         assertContains("Illegal requests must result in an ERROR response",
                 response, "ERROR");
     }
-    
+
     @Test
     public void testQuoting() {
         final String response = getClient().getIdentResponse("in\\valid:invalid",
                 IdentityManager.getGlobalConfig());
-        
+
         assertStartsWith("Special chars in illegal requests must be quoted",
                 response, "in\\\\valid\\:invalid");
     }
-    
+
     @Test
     public void testQuoting2() {
         final String response = getClient().getIdentResponse("in\\\\valid\\ inv\\:alid",
                 IdentityManager.getGlobalConfig());
-        
+
         assertStartsWith("Escaped characters in illegal requests shouldn't be doubly-escaped",
                 response, "in\\\\valid\\ inv\\:alid");
-    }    
-    
+    }
+
     @Test
     public void testNonNumericPort() {
         final String response = getClient().getIdentResponse("abc, def",
                 IdentityManager.getGlobalConfig());
-        
+
         assertContains("Non-numeric ports must result in an ERROR response",
                 response, "ERROR");
         assertStartsWith("Specified ports must be returned in the response",
                 response.replaceAll("\\s+", ""), "abc,def:");
     }
-    
+
     private void doPortTest(final String ports) {
         final String response = getClient().getIdentResponse(ports,
                 IdentityManager.getGlobalConfig());
-        
+
         assertContains("Illegal ports must result in an ERROR response",
                 response, "ERROR");
         assertContains("Illegal ports must result in an INVALID-PORT response",
@@ -94,7 +94,7 @@ public class IdentClientTest {
         assertStartsWith("Port numbers must be returned as part of the response",
                 response.replaceAll("\\s+", ""), ports.replaceAll("\\s+", ""));
     }
-    
+
     @Test
     public void testOutOfRangePorts() {
         doPortTest("0, 50");
@@ -102,32 +102,32 @@ public class IdentClientTest {
         doPortTest("50, 0");
         doPortTest("50, 65536");
     }
-    
+
     @Test
     public void testAlwaysOn() {
         final TestConfigManagerMap tcm = new TestConfigManagerMap();
         tcm.settings.put("plugin-Identd.advanced.alwaysOn", "false");
-        
+
         final String response = getClient().getIdentResponse("50, 50", tcm);
         assertContains("Unknown port requests must return an ERROR response",
                 response, "ERROR");
         assertContains("Unknown port requests must return a NO-USER response",
                 response, "NO-USER");
     }
-    
+
     @Test
     public void testHidden() {
         final TestConfigManagerMap tcm = new TestConfigManagerMap();
         tcm.settings.put("plugin-Identd.advanced.alwaysOn", "true");
         tcm.settings.put("plugin-Identd.advanced.isHiddenUser", "true");
-        
+
         final String response = getClient().getIdentResponse("50, 50", tcm);
         assertContains("Hidden requests must return an ERROR response",
                 response, "ERROR");
         assertContains("Hidden requests must return a HIDDEN-USER response",
                 response, "HIDDEN-USER");
     }
-    
+
     @Test
     public void testSystemNameQuoting() {
         final TestConfigManagerMap tcm = new TestConfigManagerMap();
@@ -137,12 +137,12 @@ public class IdentClientTest {
         tcm.settings.put("plugin-Identd.advanced.customSystem", "a:b\\c,d");
         tcm.settings.put("plugin-Identd.general.useCustomName", "false");
         tcm.settings.put("plugin-Identd.general.customName", "");
-        
+
         final String response = getClient().getIdentResponse("50, 50", tcm);
         assertContains("Special characters must be quoted in system names",
-                response, "a\\:b\\\\c\\,d");        
+                response, "a\\:b\\\\c\\,d");
     }
-    
+
     @Test
     public void testCustomNameQuoting() {
         final TestConfigManagerMap tcm = new TestConfigManagerMap();
@@ -152,12 +152,12 @@ public class IdentClientTest {
         tcm.settings.put("plugin-Identd.advanced.customSystem", "");
         tcm.settings.put("plugin-Identd.general.useCustomName", "true");
         tcm.settings.put("plugin-Identd.general.customName", "a:b\\c,d");
-        
+
         final String response = getClient().getIdentResponse("50, 50", tcm);
         assertContains("Special characters must be quoted in custom names",
-                response, "a\\:b\\\\c\\,d");        
+                response, "a\\:b\\\\c\\,d");
     }
-    
+
     @Test
     public void testCustomNames() {
         final TestConfigManagerMap tcm = new TestConfigManagerMap();
@@ -167,26 +167,26 @@ public class IdentClientTest {
         tcm.settings.put("plugin-Identd.advanced.customSystem", "system");
         tcm.settings.put("plugin-Identd.general.useCustomName", "true");
         tcm.settings.put("plugin-Identd.general.customName", "name");
-        
+
         final String response = getClient().getIdentResponse("50, 60", tcm);
         final String[] bits = response.split(":");
-        
+
         assertTrue("Responses must include port pair",
                 bits[0].matches("\\s*50\\s*,\\s*60\\s*"));
         assertEquals("Positive response must include USERID",
                 "USERID", bits[1].trim());
         assertEquals("Must use custom system name", "system", bits[2].trim());
         assertEquals("Must use custom name", "name", bits[3].trim());
-    }    
-    
+    }
+
     private static void assertContains(final String msg, final String haystack,
             final String needle) {
         assertTrue(msg, haystack.indexOf(needle) > -1);
     }
-    
+
     private static void assertStartsWith(final String msg, final String haystack,
             final String needle) {
         assertTrue(msg, haystack.startsWith(needle));
-    }    
+    }
 
 }

test/com/dmdirc/addons/ui_swing/components/reorderablelist/ArrayListTransferHandlerTest.java

@@ -41,36 +41,36 @@ public class ArrayListTransferHandlerTest {
         test.add("abc");
         test.add("def");
         test.add(null);
-        
+
         final JList list = new JList(test.toArray());
         list.setSelectedIndex(0);
-        
+
         final ArrayListTransferHandler handler = new ArrayListTransferHandler();
         final Transferable transferable = handler.createTransferable(list);
-        
+
         assertNotNull(transferable);
         final Object data = transferable.getTransferData(transferable.getTransferDataFlavors()[0]);
-        
+
         assertTrue(data instanceof ArrayList<?>);
         assertEquals(1, ((ArrayList<?>) data).size());
         assertEquals("abc", ((ArrayList<?>) data).get(0));
     }
-    
+
     @Test
     public void testCreateTransferrable2() throws IOException, UnsupportedFlavorException {
         final ArrayList<String> test = new ArrayList<String>();
         test.add("abc");
         test.add("def");
         test.add(null);
-        
+
         final JList list = new JList(test.toArray());
-        
+
         final ArrayListTransferHandler handler = new ArrayListTransferHandler();
         final Transferable transferable = handler.createTransferable(list);
-        
+
         assertNull(transferable);
-    }    
-    
+    }
+
     @Test
     public void testCreateTransferrable3() throws IOException, UnsupportedFlavorException {
         final ArrayList<Object> test = new ArrayList<Object>();
@@ -80,64 +80,64 @@ public class ArrayListTransferHandlerTest {
             public String toString() {
                 return null;
             }
-            
+
         });
         test.add("def");
         test.add(null);
-        
+
         final JList list = new JList(test.toArray());
         list.setSelectedIndex(0);
-        
+
         final ArrayListTransferHandler handler = new ArrayListTransferHandler();
         final Transferable transferable = handler.createTransferable(list);
-        
+
         assertNotNull(transferable);
         final Object data = transferable.getTransferData(transferable.getTransferDataFlavors()[0]);
-        
+
         assertTrue(data instanceof ArrayList<?>);
         assertEquals(1, ((ArrayList<?>) data).size());
         assertEquals("", ((ArrayList<?>) data).get(0));
-    }    
-    
+    }
+
     @Test
     public void testCreateTransferrable4() throws IOException, UnsupportedFlavorException {
         final ArrayListTransferHandler handler = new ArrayListTransferHandler();
         final Transferable transferable = handler.createTransferable(null);
-        
+
         assertNull(transferable);
     }
-    
+
     @Test
     public void testCanImport() {
         final ArrayListTransferHandler handler = new ArrayListTransferHandler();
         final ArrayListTransferable transferable = new ArrayListTransferable(null);
         final JList list = new JList(new DefaultListModel());
-        
+
         for (DataFlavor df : transferable.getTransferDataFlavors()) {
             assertTrue(handler.canImport(list, new DataFlavor[]{df}));
             assertFalse(handler.canImport(null, new DataFlavor[]{df}));
         }
-        
+
         assertFalse(handler.canImport(list, new DataFlavor[]{}));
     }
-    
+
     @Test
     public void testImportData() {
         final ArrayList<String> test = new ArrayList<String>();
         test.add("abc");
         test.add("def");
         test.add(null);
-        
+
         final JList list = new JList(new DefaultListModel());
         ((DefaultListModel) list.getModel()).addElement("123");
         ((DefaultListModel) list.getModel()).addElement("456");
         list.setSelectedIndex(0);
-        
+
         final ArrayListTransferHandler handler = new ArrayListTransferHandler();
         final ArrayListTransferable alt = new ArrayListTransferable(test);
-        
+
         handler.createTransferable(new JList(new DefaultListModel()));
-        
+
         assertTrue(handler.importData(list, alt));
         assertEquals(5, list.getModel().getSize());
         assertEquals("123", list.getModel().getElementAt(0));
@@ -145,63 +145,63 @@ public class ArrayListTransferHandlerTest {
         assertEquals(null, list.getModel().getElementAt(3));
         assertEquals("456", list.getModel().getElementAt(4));
     }
-    
+
     @Test
     public void testImportData2() {
         final ArrayListTransferHandler handler = new ArrayListTransferHandler();
         final ArrayListTransferable alt = new ArrayListTransferable(null);
         assertFalse(handler.importData(null, alt));
     }
-    
+
     @Test
     public void testExportDone() {
         final ArrayList<String> test = new ArrayList<String>();
         test.add("123");
         test.add("456");
-        
+
         final JList list = new JList(new DefaultListModel());
         ((DefaultListModel) list.getModel()).addElement("123");
         ((DefaultListModel) list.getModel()).addElement("456");
         list.setSelectedIndex(0);
-        
+
         final ArrayListTransferHandler handler = new ArrayListTransferHandler();
         final ArrayListTransferable alt = new ArrayListTransferable(test);
-        
+
         handler.createTransferable(list);
-        
+
         final JList list2 = new JList(new DefaultListModel());
         list2.setSelectedIndex(0);
         assertTrue(handler.importData(list2, alt));
-        
+
         handler.exportDone(list, alt, TransferHandler.MOVE);
         assertEquals(1, list.getModel().getSize());
         assertEquals("456", list.getModel().getElementAt(0));
     }
-    
+
     @Test
     public void testExportDone2() {
         final ArrayList<String> test = new ArrayList<String>();
         test.add("123");
         test.add("456");
-        
+
         final JList list = new JList(new DefaultListModel());
         ((DefaultListModel) list.getModel()).addElement("123");
         ((DefaultListModel) list.getModel()).addElement("456");
         list.setSelectedIndex(0);
-        
+
         final ArrayListTransferHandler handler = new ArrayListTransferHandler();
         final ArrayListTransferable alt = new ArrayListTransferable(test);
-        
+
         handler.createTransferable(list);
-        
+
         final JList list2 = new JList(new DefaultListModel());
         list2.setSelectedIndex(0);
         assertTrue(handler.importData(list2, alt));
-        
+
         handler.exportDone(list, alt, TransferHandler.COPY);
         assertEquals(2, list.getModel().getSize());
         assertEquals("123", list.getModel().getElementAt(0));
         assertEquals("456", list.getModel().getElementAt(1));
-    }        
+    }
 
 }