Various style fixes.

Change-Id: Ia75b28fcd34682079234e3ad8d6c83f84a616cf0
Reviewed-on: http://gerrit.dmdirc.com/3098
Reviewed-by: Greg Holmes <greg@dmdirc.com>
Automatic-Compile: DMDirc Build Manager

src/com/dmdirc/addons/lagdisplay/PingHistoryPanel.java

@@ -90,7 +90,8 @@ public class PingHistoryPanel extends JPanel {
         g.drawLine(1, getHeight() - 2, getWidth() - 1, getHeight() - 2);
         g.setFont(g.getFont().deriveFont(10f));
 
-        float lastX = -1, lastY = -1;
+        float lastX = -1;
+        float lastY = -1;
         final float pixelsperpointX = (getWidth() - 3)
                 / (float) (history.getList().size() == 1 ? 1
                 : history.getList().size() - 1);
@@ -100,7 +101,8 @@ public class PingHistoryPanel extends JPanel {
             g.drawString("No data", getWidth() / 2 - 25, getHeight() / 2 + 5);
         }
 
-        long last1 = -1, last2 = -1;
+        long last1 = -1;
+        long last2 = -1;
         final List<Long> list = history.getList();
         final List<Rectangle> rects = new ArrayList<>();
 

src/com/dmdirc/addons/lagdisplay/ServerInfoDialog.java

@@ -32,6 +32,7 @@ import com.dmdirc.util.annotations.factory.Factory;
 import com.dmdirc.util.annotations.factory.Unbound;
 
 import java.util.List;
+
 import javax.swing.JLabel;
 import javax.swing.JPanel;
 import javax.swing.JSeparator;

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

@@ -80,12 +80,25 @@ public class LoggingPlugin extends BaseCommandPlugin implements ActionListener,
         ConfigChangeListener {
 
     /** Cached boolean settings. */
-    private boolean networkfolders, filenamehash, addtime, stripcodes,
-            channelmodeprefix, autobackbuffer, backbufferTimestamp, usedate;
+    private boolean networkfolders;
+    private boolean filenamehash;
+    private boolean addtime;
+    private boolean stripcodes;
+    private boolean channelmodeprefix;
+    private boolean autobackbuffer;
+    private boolean backbufferTimestamp;
+    private boolean usedate;
+
     /** Cached string settings. */
-    private String timestamp, usedateformat, logDirectory, colour;
+    private String timestamp;
+    private String usedateformat;
+    private String logDirectory;
+    private String colour;
+
     /** Cached int settings. */
-    private int historyLines, backbufferLines;
+    private int historyLines;
+    private int backbufferLines;
+
     /** This plugin's plugin info. */
     private final PluginInfo pluginInfo;
     /** The action controller to use. */

src/com/dmdirc/addons/mediasource_vlc/VlcMediaSourcePlugin.java

@@ -30,8 +30,8 @@ import com.dmdirc.config.prefs.PreferencesDialogModel;
 import com.dmdirc.config.prefs.PreferencesSetting;
 import com.dmdirc.config.prefs.PreferencesType;
 import com.dmdirc.interfaces.config.IdentityController;
-import com.dmdirc.plugins.implementations.BasePlugin;
 import com.dmdirc.plugins.PluginInfo;
+import com.dmdirc.plugins.implementations.BasePlugin;
 import com.dmdirc.util.io.Downloader;
 
 import java.io.File;

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

@@ -62,8 +62,10 @@ public class NickColourPanel extends JPanel implements ActionListener,
     private final transient NickColourManager plugin;
     /** The identity to write settings to. */
     private final ConfigProvider configIdentity;
-    /** Edit and delete buttons. */
-    private final JButton editButton, deleteButton;
+    /** Edit button. */
+    private final JButton editButton;
+    /** Delete button. */
+    private final JButton deleteButton;
     /** Main frame instance to parent dialogs on. */
     private final MainFrame mainFrame;
     /** Icon manager to retrieve icons from. */

src/com/dmdirc/addons/notifications/NotificationsPlugin.java

@@ -29,8 +29,8 @@ import com.dmdirc.config.prefs.PreferencesCategory;
 import com.dmdirc.config.prefs.PreferencesDialogModel;
 import com.dmdirc.interfaces.ActionListener;
 import com.dmdirc.interfaces.CommandController;
-import com.dmdirc.interfaces.config.IdentityController;
 import com.dmdirc.interfaces.actions.ActionType;
+import com.dmdirc.interfaces.config.IdentityController;
 import com.dmdirc.plugins.PluginInfo;
 import com.dmdirc.plugins.implementations.BaseCommandPlugin;
 

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

@@ -30,8 +30,8 @@ import com.dmdirc.config.prefs.PreferencesDialogModel;
 import com.dmdirc.interfaces.ActionController;
 import com.dmdirc.interfaces.ActionListener;
 import com.dmdirc.interfaces.CommandController;
-import com.dmdirc.interfaces.config.IdentityController;
 import com.dmdirc.interfaces.actions.ActionType;
+import com.dmdirc.interfaces.config.IdentityController;
 import com.dmdirc.plugins.Plugin;
 import com.dmdirc.plugins.PluginInfo;
 import com.dmdirc.plugins.implementations.BaseCommandPlugin;

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

@@ -59,8 +59,12 @@ public class OsdPlugin extends BaseCommandPlugin implements
     /** Y-axis potion of OSD. */
     private int y;
     /** Setting objects with registered change listeners.*/
-    private PreferencesSetting fontSizeSetting, backgroundSetting,
-            foregroundSetting, widthSetting, timeoutSetting, maxWindowsSetting;
+    private PreferencesSetting fontSizeSetting;
+    private PreferencesSetting backgroundSetting;
+    private PreferencesSetting foregroundSetting;
+    private PreferencesSetting widthSetting;
+    private PreferencesSetting timeoutSetting;
+    private PreferencesSetting maxWindowsSetting;
     /** This plugin's plugin info. */
     private final PluginInfo pluginInfo;
     /** The controller to read/write settings with. */

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

@@ -73,10 +73,12 @@ public class OsdWindow extends JDialog implements MouseListener,
     private final JPanel panel;
 
     /** Starting positions of the mouse. */
-    private int startX, startY;
+    private int startX;
+    private int startY;
 
     /** Desired position. */
-    private volatile int desiredX, desiredY;
+    private volatile int desiredX;
+    private volatile int desiredY;
 
     /** Is this a config instance? */
     private final boolean config;

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

@@ -35,15 +35,15 @@ import com.dmdirc.config.prefs.PreferencesSetting;
 import com.dmdirc.config.prefs.PreferencesType;
 import com.dmdirc.interfaces.ActionListener;
 import com.dmdirc.interfaces.Connection;
+import com.dmdirc.interfaces.actions.ActionType;
 import com.dmdirc.interfaces.config.ConfigChangeListener;
 import com.dmdirc.interfaces.config.IdentityController;
-import com.dmdirc.interfaces.actions.ActionType;
 import com.dmdirc.parser.interfaces.ChannelClientInfo;
 import com.dmdirc.parser.interfaces.Parser;
 import com.dmdirc.parser.irc.IRCParser;
-import com.dmdirc.plugins.implementations.BasePlugin;
 import com.dmdirc.plugins.PluginInfo;
 import com.dmdirc.plugins.PluginManager;
+import com.dmdirc.plugins.implementations.BasePlugin;
 
 import java.util.ArrayList;
 import java.util.Date;

src/com/dmdirc/addons/serverlistdialog/Info.java

@@ -22,8 +22,8 @@
 
 package com.dmdirc.addons.serverlistdialog;
 
-import com.dmdirc.addons.ui_swing.UIUtilities;
 import com.dmdirc.addons.serverlists.ServerGroupItem;
+import com.dmdirc.addons.ui_swing.UIUtilities;
 import com.dmdirc.addons.ui_swing.components.text.TextLabel;
 import com.dmdirc.ui.core.util.URLHandler;
 

src/com/dmdirc/addons/serverlistdialog/ServerListController.java

@@ -26,6 +26,7 @@ import com.dmdirc.addons.ui_swing.components.menubar.MenuBar;
 
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
+
 import javax.inject.Inject;
 import javax.inject.Provider;
 import javax.swing.JMenuItem;

src/com/dmdirc/addons/serverlistdialog/ServerListModel.java

@@ -23,15 +23,15 @@
 package com.dmdirc.addons.serverlistdialog;
 
 import com.dmdirc.ServerManager;
-import com.dmdirc.actions.wrappers.PerformWrapper.PerformDescription;
 import com.dmdirc.actions.wrappers.PerformType;
-import com.dmdirc.logger.ErrorLevel;
-import com.dmdirc.logger.Logger;
+import com.dmdirc.actions.wrappers.PerformWrapper.PerformDescription;
 import com.dmdirc.addons.serverlists.ServerEntry;
 import com.dmdirc.addons.serverlists.ServerGroup;
 import com.dmdirc.addons.serverlists.ServerGroupItem;
 import com.dmdirc.addons.serverlists.ServerList;
 import com.dmdirc.interfaces.config.IdentityController;
+import com.dmdirc.logger.ErrorLevel;
+import com.dmdirc.logger.Logger;
 import com.dmdirc.util.collections.ListenerList;
 
 import java.io.IOException;

src/com/dmdirc/addons/serverlists/ServerGroup.java

@@ -23,6 +23,7 @@
 package com.dmdirc.addons.serverlists;
 
 import com.dmdirc.interfaces.config.IdentityController;
+
 import java.net.URI;
 import java.util.ArrayList;
 import java.util.Collections;

src/com/dmdirc/addons/serverlists/io/ServerGroupReader.java

@@ -117,7 +117,8 @@ public class ServerGroupReader {
                 } catch (URISyntaxException | IllegalArgumentException ex) {
                     // TODO: Raise an error about malformed server
                 }
-            }        }
+            }
+        }
 
         return group;
     }

src/com/dmdirc/addons/sessionlock/SessionLock.java

@@ -16,8 +16,8 @@
  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
  * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
  */
 
 package com.dmdirc.addons.sessionlock;

src/com/dmdirc/addons/sessionlock/SessionLockActionMetaType.java

@@ -16,8 +16,8 @@
  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
  * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
  */
 
 package com.dmdirc.addons.sessionlock;

src/com/dmdirc/addons/sessionlock/SessionLockActionType.java

@@ -16,8 +16,8 @@
  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
  * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
  */
 
 package com.dmdirc.addons.sessionlock;

src/com/dmdirc/addons/time/TimerCommand.java

@@ -126,7 +126,8 @@ public class TimerCommand extends Command implements IntelligentCommand {
                                 origin);
 
                         sendLine(origin, args.isSilent(), FORMAT_OUTPUT, "Command scheduled.");
-                    }   break;
+                    }
+                    break;
             }
         } else {
             doUsage(origin, args.isSilent());

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

@@ -22,7 +22,6 @@
 
 package com.dmdirc.addons.ui_swing.components.addonbrowser;
 
-import com.dmdirc.interfaces.actions.ActionType;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.updater.UpdateChannel;
 import com.dmdirc.updater.UpdateComponent;
@@ -63,7 +62,7 @@ public class AddonInfo {
     private final int rating;
     /** Full text description. */
     private final String description;
-    /** Addon type, {@link ActionType}. */
+    /** Addon type. */
     private final AddonType type;
     /** Has this addon been verified by the developers? */
     private final boolean verified;

src/com/dmdirc/addons/ui_swing/components/menubar/ChannelMenu.java

@@ -60,7 +60,9 @@ public class ChannelMenu extends JMenu implements ActionListener,
     /** Main frame. */
     private final MainFrame mainFrame;
     /** Menu items to be disabled/enabled. */
-    private JMenuItem csd, join, list;
+    private JMenuItem csd;
+    private JMenuItem join;
+    private JMenuItem list;
 
     /**
      * Creates a new channel menu.
@@ -120,7 +122,8 @@ public class ChannelMenu extends JMenu implements ActionListener,
                 final FrameContainer activeWindow = mainFrame.getActiveFrame().getContainer();
                 if (activeWindow instanceof Channel) {
                     controller.showChannelSettingsDialog(((Channel) activeWindow));
-                }   break;
+                }
+                break;
             case "ListChannels":
                 new ChannelListDialog(controller).display();
                 break;

src/com/dmdirc/addons/ui_swing/components/menubar/ServerMenu.java

@@ -60,7 +60,8 @@ public class ServerMenu extends JMenu implements ActionListener,
     /** Main frame. */
     private final MainFrame mainFrame;
     /** Menu items which can be enabled/disabled. */
-    private JMenuItem ssd, disconnect;
+    private JMenuItem ssd;
+    private JMenuItem disconnect;
     /** Provider to use to retrieve NSD instances. */
     private final DialogProvider<NewServerDialog> newServerProvider;
 

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

@@ -24,8 +24,8 @@ package com.dmdirc.addons.ui_swing.dialogs.actioneditor;
 
 import com.dmdirc.actions.ActionGroup;
 import com.dmdirc.actions.ActionManager;
-import com.dmdirc.addons.ui_swing.components.validating.ValidatingJTextField;
 import com.dmdirc.actions.validators.ActionNameValidator;
+import com.dmdirc.addons.ui_swing.components.validating.ValidatingJTextField;
 import com.dmdirc.ui.IconManager;
 import com.dmdirc.util.validators.FileNameValidator;
 import com.dmdirc.util.validators.ValidatorChain;
@@ -36,7 +36,6 @@ import java.beans.PropertyChangeListener;
 import javax.swing.BorderFactory;
 import javax.swing.JLabel;
 import javax.swing.JPanel;
-import javax.swing.JTextField;
 import javax.swing.UIManager;
 
 import net.miginfocom.swing.MigLayout;

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

@@ -38,7 +38,8 @@ public class WebInputField implements InputField {
 
     private String text;
 
-    private int selStart, selEnd;
+    private int selStart;
+    private int selEnd;
 
     public WebInputField() {
         super();

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

@@ -81,7 +81,8 @@ public class WebInputWindow extends WebWindow implements InputWindow {
 
     public WebInputHandler getInputHandler(final Client client,
             final String text, final String selStart, final String selEnd) {
-        int sel1, sel2;
+        int sel1;
+        int sel2;
 
         try {
             sel1 = Integer.parseInt(selStart);