Style fixes

Change-Id: Ia02568300be35a94ed7ae338dfe02343de10fff2
Reviewed-on: http://gerrit.dmdirc.com/822
Reviewed-by: Gregory Holmes <greg@dmdirc.com>
Automatic-Compile: Shane Mc Cormack <shane@dmdirc.com>

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

@@ -82,6 +82,7 @@ import java.awt.Font;
 import java.awt.GraphicsEnvironment;
 import java.awt.KeyboardFocusManager;
 import java.awt.Toolkit;
+import java.io.Serializable;
 import java.net.URI;
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -100,7 +101,15 @@ import net.miginfocom.layout.PlatformDefaults;
 /**
  * Controls the main swing UI.
  */
-public final class SwingController extends Plugin implements UIController {
+public final class SwingController extends Plugin implements Serializable,
+        UIController {
+
+    /**
+     * 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;
 
     /** Logger to use. */
     private static final java.util.logging.Logger LOGGER =

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

@@ -68,7 +68,7 @@ public class ErrorPanel extends StatusbarPopupPanel implements ErrorListener, Ac
     /** Swing status bar. */
     private SwingStatusBar statusBar;
     /** Error manager. */
-    private final ErrorManager errorManager = ErrorManager.getErrorManager();
+    private transient final ErrorManager errorManager = ErrorManager.getErrorManager();
     /** Dismiss menu. */
     private final JPopupMenu menu;
     /** Dismiss menu item. */

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

@@ -23,6 +23,7 @@
 package com.dmdirc.addons.ui_swing.components.substitutions;
 
 import com.dmdirc.addons.ui_swing.dialogs.actioneditor.StringTransferable;
+
 import java.awt.Color;
 import java.awt.Component;
 import java.awt.Cursor;
@@ -57,19 +58,19 @@ public class SubstitutionLabel extends JButton implements MouseListener,
     /** Drag source. */
     private DragSource dragSource;
     /** Substitution. */
-    private Substitution substition;
+    private transient final Substitution substitution;
     /** Previously selected component. */
     private Component previousComponent;
 
     /** 
      * Instantiates the panel.
      * 
-     * @param substition Action substitition
+     * @param substitution Action substitition
      */
-    public SubstitutionLabel(final Substitution substition) {
+    public SubstitutionLabel(final Substitution substitution) {
         super();
 
-        this.substition = substition;
+        this.substitution = substitution;
 
         initComponents();
         addListeners();
@@ -82,7 +83,7 @@ public class SubstitutionLabel extends JButton implements MouseListener,
         dragSource.createDefaultDragGestureRecognizer(this,
                 DnDConstants.ACTION_COPY, this);
 
-        setText(substition.getName());
+        setText(substitution.getName());
         setFont(getFont().deriveFont(getFont().getSize() - 2f));
         
         setBorder(
@@ -159,7 +160,7 @@ public class SubstitutionLabel extends JButton implements MouseListener,
     @Override
     public void dragGestureRecognized(final DragGestureEvent dge) {
         dragSource.startDrag(dge, Cursor.getPredefinedCursor(Cursor.HAND_CURSOR),
-                new StringTransferable(substition.toString()), null);
+                new StringTransferable(substitution.toString()), null);
     }
 
     /** 
@@ -170,7 +171,7 @@ public class SubstitutionLabel extends JButton implements MouseListener,
     @Override
     public void actionPerformed(ActionEvent e) {
         if (previousComponent instanceof JTextComponent) {
-            ((JTextComponent) previousComponent).replaceSelection(substition.toString());
+            ((JTextComponent) previousComponent).replaceSelection(substitution.toString());
         }
     }
 

src/com/dmdirc/addons/ui_swing/dialogs/profiles/ProfileListModel.java

@@ -62,7 +62,7 @@ public class ProfileListModel extends DefaultListModel implements Iterable<Profi
 
     /** {@inheritDoc} */
     @Override
-    public Profile getElementAt(int index) {
+    public Profile getElementAt(final int index) {
         return profiles.get(index);
     }
 
@@ -74,7 +74,7 @@ public class ProfileListModel extends DefaultListModel implements Iterable<Profi
      * @return the profile that was removed
      */
     @Override
-    public Profile remove(int index) {
+    public Profile remove(final int index) {
         final Profile returnValue = profiles.remove(index);
 
         fireIntervalRemoved(this, index, index);
@@ -89,7 +89,7 @@ public class ProfileListModel extends DefaultListModel implements Iterable<Profi
      *
      * @return true if the object was removed
      */
-    public boolean remove(Profile p) {
+    public boolean remove(final Profile p) {
         final int index = profiles.indexOf(p);
         final boolean returnValue = profiles.remove(p);
 
@@ -115,7 +115,7 @@ public class ProfileListModel extends DefaultListModel implements Iterable<Profi
      *
      * @return index of the specified object
      */
-    public int indexOf(Profile p) {
+    public int indexOf(final Profile p) {
         return profiles.indexOf(p);
     }
 
@@ -127,7 +127,7 @@ public class ProfileListModel extends DefaultListModel implements Iterable<Profi
      * @return the profile that was removed
      */
     @Override
-    public Profile get(int index) {
+    public Profile get(final int index) {
         return profiles.get(index);
     }
     
@@ -148,7 +148,7 @@ public class ProfileListModel extends DefaultListModel implements Iterable<Profi
      *
      * @return true if the model contains the profile
      */
-    public boolean contains(Profile p) {
+    public boolean contains(final Profile p) {
         return profiles.contains(p);
     }
 
@@ -160,7 +160,7 @@ public class ProfileListModel extends DefaultListModel implements Iterable<Profi
      *
      * @return true if the model contains a profile with the specified name
      */
-    public boolean contains(String name) {
+    public boolean contains(final String name) {
         synchronized (profiles) {
             for (Profile profile : profiles) {
                 if (profile.getName().equals(name)) {
@@ -188,7 +188,7 @@ public class ProfileListModel extends DefaultListModel implements Iterable<Profi
      * @param index index to add the profile
      * @param element profile to add
      */
-    public void add(int index, Profile element) {
+    public void add(final int index, final Profile element) {
         profiles.add(index, element);
 
         fireIntervalAdded(this, index, index);
@@ -201,7 +201,7 @@ public class ProfileListModel extends DefaultListModel implements Iterable<Profi
      *
      * @return true if the item was added
      */
-    public boolean add(Profile p) {
+    public boolean add(final Profile p) {
         final boolean returnValue = profiles.add(p);
         final int index = profiles.indexOf(p);
 
@@ -222,8 +222,9 @@ public class ProfileListModel extends DefaultListModel implements Iterable<Profi
 
     /** {@inheritDoc} */
     @Override
-    public boolean equals(Object obj) {
-        return profiles.equals(obj);
+    public boolean equals(final Object obj) {
+        return obj instanceof ProfileListModel
+                && profiles.equals(((ProfileListModel) obj).getProfiles());
     }
 
     /** {@inheritDoc} */

src/com/dmdirc/addons/ui_swing/textpane/IRCDocument.java

@@ -52,9 +52,9 @@ public final class IRCDocument implements Serializable, ConfigChangeListener {
     /** Listener list. */
     private final EventListenerList listeners;
     /** Cached lines. */
-    private RollingList<Line> cachedLines;
+    private transient RollingList<Line> cachedLines;
     /** Cached attributed strings. */
-    private RollingList<AttributedString> cachedStrings;
+    private transient RollingList<AttributedString> cachedStrings;
     /** Container that owns this document. */
     private final FrameContainer container;
     /** Font size. */