Style fixes.

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

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

@@ -65,8 +65,9 @@ public class FDManager implements ConfigChangeListener {
     private boolean stripcodes;
 
     @Inject
-    public FDManager(@GlobalConfig final AggregateConfigProvider config,
-            @UserConfig ConfigProvider userConfig,
+    public FDManager(
+            @GlobalConfig final AggregateConfigProvider config,
+            @UserConfig final ConfigProvider userConfig,
             @PluginDomain(FreeDesktopNotificationsPlugin.class) final String domain,
             final PluginFilesHelper filesHelper) {
         this.domain = domain;

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

@@ -60,7 +60,7 @@ public class ScriptCommand extends Command implements IntelligentCommand {
     /** Plugin settings domain. */
     private final String domain;
     /** Manager used to retrieve script engines. */
-    private final ScriptEngineManager ScriptEngineManager;
+    private final ScriptEngineManager scriptEngineManager;
     /** Script directory. */
     private final String scriptDirectory;
     /** Script manager to handle scripts. */
@@ -86,7 +86,7 @@ public class ScriptCommand extends Command implements IntelligentCommand {
         super(commandController);
         this.globalConfig = globalConfig;
         this.domain = domain;
-        this.ScriptEngineManager = scriptEngineManager;
+        this.scriptEngineManager = scriptEngineManager;
         this.scriptDirectory = scriptDirectory;
         this.scriptManager = scriptManager;
     }
@@ -127,12 +127,12 @@ public class ScriptCommand extends Command implements IntelligentCommand {
                         final String baseFile = scriptDirectory + '/'
                                 + globalConfig.getOption(domain, "eval.baseFile");
                         if (new File(baseFile).exists()) {
-                            wrapper = new ScriptEngineWrapper(ScriptEngineManager, baseFile);
+                            wrapper = new ScriptEngineWrapper(scriptEngineManager, baseFile);
                         } else {
-                            wrapper = new ScriptEngineWrapper(ScriptEngineManager, null);
+                            wrapper = new ScriptEngineWrapper(scriptEngineManager, null);
                         }
                     } else {
-                        wrapper = new ScriptEngineWrapper(ScriptEngineManager, null);
+                        wrapper = new ScriptEngineWrapper(scriptEngineManager, null);
                     }
                     wrapper.getScriptEngine().put("cmd_origin", origin);
                     wrapper.getScriptEngine().put("cmd_isSilent", args.isSilent());

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

@@ -64,8 +64,6 @@ import javax.swing.WindowConstants;
 
 import net.miginfocom.swing.MigLayout;
 
-import org.slf4j.LoggerFactory;
-
 import static com.dmdirc.addons.ui_swing.SwingPreconditions.checkOnEDT;
 
 /**
@@ -75,12 +73,7 @@ public class MainFrame extends JFrame implements WindowListener,
         ConfigChangeListener, SwingWindowListener, FrameInfoListener,
         NotificationListener {
 
-    private static final org.slf4j.Logger log = LoggerFactory.getLogger(MainFrame.class);
-    /**
-     * 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).
-     */
+    /** A version number for this class. */
     private static final long serialVersionUID = 9;
     /** Focus queue. */
     private final QueuedLinkedHashSet<TextFrame> focusOrder;

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

@@ -68,8 +68,6 @@ import javax.swing.UnsupportedLookAndFeelException;
 
 import net.miginfocom.layout.PlatformDefaults;
 
-import org.slf4j.LoggerFactory;
-
 import dagger.ObjectGraph;
 
 /**
@@ -77,7 +75,6 @@ import dagger.ObjectGraph;
  */
 public class SwingController extends BaseCommandPlugin implements UIController {
 
-    private static final org.slf4j.Logger log = LoggerFactory.getLogger(MainFrame.class);
     /** Error dialog. */
     private ErrorListDialog errorDialog;
     /** This plugin's plugin info object. */
@@ -126,11 +123,21 @@ public class SwingController extends BaseCommandPlugin implements UIController {
         setAntiAlias();
     }
 
+    /**
+     * @return Global config object.
+     *
+     * @deprecated Should be injected.
+     */
     @Deprecated
     public AggregateConfigProvider getGlobalConfig() {
         return globalConfig;
     }
 
+    /**
+     * @return Global icon manager object.
+     *
+     * @deprecated Should be injected.
+     */
     @Deprecated
     public IconManager getIconManager() {
         return iconManager;

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

@@ -189,11 +189,21 @@ public class SwingManager {
         return firstRunExecutor.get();
     }
 
+    /**
+     * @return Feedback nag provider.
+     *
+     * @deprecated Should be injected.
+     */
     @Deprecated
     public Provider<FeedbackNag> getFeedbackNagProvider() {
         return feedbackNagProvider;
     }
 
+    /**
+     * @return URL dialog factory.
+     *
+     * @deprecated Should be injected.
+     */
     @Deprecated
     public URLDialogFactory getUrlDialogFactory() {
         return urlDialogFactory;

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

@@ -39,6 +39,8 @@ import javax.swing.JComponent;
 
 /**
  * Utility class to create frame components.
+ *
+ * @deprecated Not really compatible with dependency injection. Replace.... somehow.
  */
 @Deprecated
 public class ComponentCreator {
@@ -52,6 +54,8 @@ public class ComponentCreator {
      * @param owner      container
      *
      * @return Set of initialised components
+     *
+     * @deprecated Not really compatible with dependency injection. Replace.... somehow.
      */
     @Deprecated
     public Set<JComponent> initFrameComponents(

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

@@ -53,7 +53,7 @@ import org.slf4j.LoggerFactory;
 public class MessageLabel extends JPanel implements StatusBarComponent,
         MouseListener {
 
-    private static final org.slf4j.Logger log = LoggerFactory.getLogger(MessageLabel.class);
+    private static final org.slf4j.Logger LOG = LoggerFactory.getLogger(MessageLabel.class);
     /** Serial version UID. */
     private static final long serialVersionUID = 1;
     /** Default status bar message. */
@@ -104,11 +104,11 @@ public class MessageLabel extends JPanel implements StatusBarComponent,
      * @param message Message object to show
      */
     public void setMessage(final StatusMessage message) {
-        log.info("Adding message to queue {}", message);
+        LOG.info("Adding message to queue {}", message);
         queue.add(message);
-        log.debug("Queue size: {}", queue.size());
+        LOG.debug("Queue size: {}", queue.size());
         if (queue.size() == 1) {
-            log.info("Showing only messsage {}", message);
+            LOG.info("Showing only messsage {}", message);
             currentMessage = message;
             updateCurrentMessage();
         }
@@ -122,7 +122,7 @@ public class MessageLabel extends JPanel implements StatusBarComponent,
 
             @Override
             public void run() {
-                log.info("Updating current message: {}", currentMessage);
+                LOG.info("Updating current message: {}", currentMessage);
                 if (currentMessage.getIconType() == null) {
                     label.setIcon(null);
                 } else {
@@ -132,11 +132,11 @@ public class MessageLabel extends JPanel implements StatusBarComponent,
                         currentMessage.getMessage(), getWidth()));
                 if (messageTimer != null && (System.currentTimeMillis()
                         - messageTimer.scheduledExecutionTime()) <= 0) {
-                    log.debug("Cancelling message timer.");
+                    LOG.debug("Cancelling message timer.");
                     messageTimer.cancel();
                 }
                 if (!defaultMessage.equals(currentMessage)) {
-                    log.debug("Starting new message timer.");
+                    LOG.debug("Starting new message timer.");
                     messageTimer = new MessageTimerTask(MessageLabel.this);
                     new Timer("SwingStatusBar messageTimer").schedule(
                             messageTimer, new Date(System.currentTimeMillis()
@@ -150,16 +150,16 @@ public class MessageLabel extends JPanel implements StatusBarComponent,
      * Removes the message from the status bar.
      */
     public void clearMessage() {
-        log.info("Adding message to history {}", currentMessage);
+        LOG.info("Adding message to history {}", currentMessage);
         historyLabel.addMessage(currentMessage);
-        log.debug("Queue size: {}", queue.size());
+        LOG.debug("Queue size: {}", queue.size());
         if (queue.size() <= 1) {
             queue.remove();
-            log.info("Reverting to default message.");
+            LOG.info("Reverting to default message.");
             currentMessage = defaultMessage;
         } else {
             currentMessage = queue.poll();
-            log.info("Showing next message in queue: {}", currentMessage);
+            LOG.info("Showing next message in queue: {}", currentMessage);
         }
         updateCurrentMessage();
     }

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

@@ -22,8 +22,8 @@
 
 package com.dmdirc.addons.ui_swing.dialogs.profiles;
 
-import com.dmdirc.actions.wrappers.Profile;
 import com.dmdirc.ClientModule.GlobalConfig;
+import com.dmdirc.actions.wrappers.Profile;
 import com.dmdirc.addons.ui_swing.MainFrame;
 import com.dmdirc.addons.ui_swing.components.renderers.PropertyListCellRenderer;
 import com.dmdirc.addons.ui_swing.components.text.TextLabel;