PMD Fixes.

Change-Id: Ib0eb65bdf8a076e3a45c116aa6d493de43cf7a2d
Reviewed-on: http://gerrit.dmdirc.com/1744
Reviewed-by: Chris Smith <chris@dmdirc.com>
Automatic-Compile: DMDirc Local Commits <dmdirc@googlemail.com>

src/com/dmdirc/addons/dcc/DCCPlugin.java

@@ -416,7 +416,7 @@ public final class DCCPlugin extends Plugin implements ActionListener {
             tmpFilename = tmpFilename.replace('/', File.separatorChar);
         }
         // Then get just the name of the file.
-        filename = (new File(tmpFilename)).getName();
+        filename = new File(tmpFilename).getName();
 
         final String ip = ctcpData[++i];
         final String port = ctcpData[++i];

src/com/dmdirc/addons/dcc/kde/KDialogProcess.java

@@ -27,7 +27,7 @@ import java.io.IOException;
 import java.util.ArrayList;
 
 /**
- * Hold a Process and stream readers for a KDialog Process
+ * Hold a Process and stream readers for a KDialog Process.
  */
 public class KDialogProcess {
 
@@ -37,17 +37,17 @@ public class KDialogProcess {
     /** Does KDialog exist? */
     private static final boolean HAS_KDIALOG = IS_BIN || new File("/usr/bin/kdialog").exists();
 
-    /** Stream for the stdout stream for this process */
+    /** Stream for the stdout stream for this process. */
     private final StreamReader stdOutputStream;
 
-    /** Stream for the stderr stream for this process */
+    /** Stream for the stderr stream for this process. */
     private final StreamReader stdErrorStream;
 
-    /** The actual process for this process */
+    /** The actual process for this process. */
     private final Process process;
 
     /**
-     * Execute kdialog with the Parameters in params
+     * Execute kdialog with the Parameters in params.
      *
      * @param params Parameters to pass to kdialog
      * @throws IOException if an I/O error occurs
@@ -73,7 +73,7 @@ public class KDialogProcess {
     }
 
     /**
-     * Get the process object for this KDialogProcess
+     * Get the process object for this KDialogProcess.
      *
      * @return The process object for this KDialogProcess
      */
@@ -82,7 +82,7 @@ public class KDialogProcess {
     }
 
     /**
-     * Get the StreamReader for this KDialogProcess's stdout stream
+     * Get the StreamReader for this KDialogProcess's stdout stream.
      *
      * @return The StreamReader for this KDialogProcess's stdout stream
      */
@@ -91,7 +91,7 @@ public class KDialogProcess {
     }
 
     /**
-     * Get the StreamReader for this KDialogProcess's stderr stream
+     * Get the StreamReader for this KDialogProcess's stderr stream.
      *
      * @return The StreamReader for this KDialogProcess's stderr stream
      */

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

@@ -88,7 +88,7 @@ public class LoggingPlugin extends Plugin implements ActionListener,
     /** Cached int settings. */
     private int historyLines, backbufferLines;
 
-    /** Open File */
+    /** Open File. */
     protected static class OpenFile {
 
         /** Last used time. */
@@ -108,7 +108,7 @@ public class LoggingPlugin extends Plugin implements ActionListener,
 
     }
 
-    /** Timer used to close idle files */
+    /** Timer used to close idle files. */
     protected Timer idleFileTimer;
 
     /** Map of open files. */
@@ -257,7 +257,7 @@ public class LoggingPlugin extends Plugin implements ActionListener,
     }
 
     /**
-     * Log a query-related event
+     * Log a query-related event.
      *
      * @param type The type of the event to process
      * @param format Format of messages that are about to be sent. (May be null)
@@ -320,7 +320,7 @@ public class LoggingPlugin extends Plugin implements ActionListener,
     }
 
     /**
-     * Log a channel-related event
+     * Log a channel-related event.
      *
      * @param type The type of the event to process
      * @param format Format of messages that are about to be sent. (May be null)
@@ -642,7 +642,7 @@ public class LoggingPlugin extends Plugin implements ActionListener,
 
         if (usedate) {
             final String dateFormat = usedateformat;
-            final String dateDir = (new SimpleDateFormat(dateFormat)).format(new Date());
+            final String dateDir = new SimpleDateFormat(dateFormat).format(new Date());
             directory.append(dateDir);
             if (directory.charAt(directory.length() - 1) != File.separatorChar) {
                 directory.append(File.separatorChar);

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

@@ -1530,7 +1530,7 @@ public class Twitter implements Parser, TwitterErrorHandler, TwitterRawHandler,
         getCallbackManager().getCallbackType(NumericListener.class).call(numeric, token);
         final StringBuffer output = new StringBuffer();
         for (final String bit : token) {
-            output.append(" ");
+            output.append(' ');
             output.append(bit);
         }
         getCallbackManager().getCallbackType(DataInListener.class).call(output.toString().trim());

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

@@ -87,7 +87,7 @@ public class RelayBotPlugin extends Plugin implements ActionListener, ConfigChan
             }
         }
     }
-    
+
     /** {@inheritDoc} */
     @Override
     public void onUnload() {
@@ -153,9 +153,7 @@ public class RelayBotPlugin extends Plugin implements ActionListener, ConfigChan
 
             // Unset any listeners for channels of this server
             for (String channel : server.getChannels()) {
-                final Channel chan = server.getChannel(channel);
-                final String channelName = chan.getServer().getParser().getStringConverter().toLowerCase(chan.getName());
-                removeHandler(chan);
+                removeHandler(server.getChannel(channel));
             }
         }
     }
@@ -163,7 +161,7 @@ public class RelayBotPlugin extends Plugin implements ActionListener, ConfigChan
     /** {@inheritDoc} */
     @Override
     public void configChanged(final String domain, final String key) {
-        final boolean wasUnset = !(IdentityManager.getGlobalConfig().hasOptionString(domain, key));
+        final boolean wasUnset = !IdentityManager.getGlobalConfig().hasOptionString(domain, key);
 
         for (Server server : ServerManager.getServerManager().getServers()) {
             if (server.hasChannel(key)) {
@@ -182,8 +180,8 @@ public class RelayBotPlugin extends Plugin implements ActionListener, ConfigChan
      * If we have one, we will return true.
      * If we should have one (as determined by checking the config) we will add
      * one and return true.
-     * 
-     * @param channel
+     *
+     * @param channel Channel to check
      * @return true or false
      */
     public boolean isListening(final Channel channel) {

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

@@ -47,7 +47,7 @@ import java.util.Map;
  */
 public final class ScriptCommand extends Command implements IntelligentCommand,
         CommandInfo {
-    /** My Plugin */
+    /** My Plugin. */
     final ScriptPlugin myPlugin;
 
     /**
@@ -91,7 +91,7 @@ public final class ScriptCommand extends Command implements IntelligentCommand,
                     ScriptEngineWrapper wrapper;
                     if (IdentityManager.getGlobalConfig().hasOptionString(myPlugin.getDomain(), "eval.baseFile")) {
                         final String baseFile = myPlugin.getScriptDir()+'/'+IdentityManager.getGlobalConfig().getOption(myPlugin.getDomain(), "eval.baseFile");
-                        if ((new File(baseFile)).exists()) {
+                        if (new File(baseFile).exists()) {
                             wrapper = new ScriptEngineWrapper(myPlugin, baseFile);
                         } else {
                             wrapper = new ScriptEngineWrapper(myPlugin, null);

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

@@ -166,7 +166,7 @@ public class AddOptionPanel extends JPanel implements ActionListener {
                 optionName);
         if ("channel.encoding".equals(optionName)) {
             ((DefaultComboBoxModel) addInputComboBox.getModel()).removeAllElements();
-            for (Object argument: Charset.availableCharsets().keySet()) {
+            for (Object argument : Charset.availableCharsets().keySet()) {
                 ((DefaultComboBoxModel) addInputComboBox.getModel()).addElement(argument);
             }
         }

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

@@ -140,10 +140,10 @@ public final class CurrentOptionsPanel extends JPanel implements ActionListener
                 break;
             case MULTICHOICE:
                 if ("channel.encoding".equals(optionName)) {
-                    comboboxes.put(optionName, new JComboBox(new DefaultComboBoxModel(Charset.availableCharsets().keySet().toArray())));
+                    comboboxes.put(optionName, new JComboBox(
+                            new DefaultComboBoxModel(Charset.availableCharsets()
+                            .keySet().toArray())));
                     comboboxes.get(optionName).setSelectedItem(value);
-                } else {
-                    //Ignore
                 }
                 break;
             default:

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

@@ -84,11 +84,11 @@ public final class ButtonBar implements FrameManager, ActionListener,
      */
     private static final long serialVersionUID = 3;
     /** The default number of buttons per row or column. */
-    private static final int cells = 1;
+    private static final int NUM_CELLS = 1;
     /** The default number of buttons to render per {cell,row}. */
-    private static final int maxButtons = Integer.MAX_VALUE;
+    private static final int MAX_BUTTONS = Integer.MAX_VALUE;
     /** The default height of buttons. */
-    private static final int buttonHeight = 25;
+    private static final int BUTTON_HEIGHT = 25;
     /** A map of windows to the buttons we're using for them. */
     private final Map<Window, FrameToggleButton> buttons;
     /** The scrolling panel for our ButtonBar. */
@@ -124,7 +124,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, BUTTON_HEIGHT
                 + ((int) PlatformDefaults.getUnitValueX("related")
                 .getValue()) * 2));
 
@@ -157,7 +157,7 @@ public final class ButtonBar implements FrameManager, ActionListener,
      * @since 0.6.4
      */
     public int getButtonHeight() {
-        return buttonHeight;
+        return BUTTON_HEIGHT;
     }
 
     /**
@@ -185,7 +185,7 @@ public final class ButtonBar implements FrameManager, ActionListener,
                 parent.add(scrollPane);
                 parent.addComponentListener(ButtonBar.this);
                 ButtonBar.this.buttonWidth = position.isHorizontal()
-                        ? 150 : (parent.getWidth() / cells);
+                        ? 150 : (parent.getWidth() / NUM_CELLS);
                 initButtons(WindowManager.getRootWindows());
                 if (controller.getMainFrame().getActiveFrame() != null) {
                     selectionChanged(controller.getMainFrame()
@@ -271,7 +271,7 @@ public final class ButtonBar implements FrameManager, ActionListener,
             button = getButton(window);
             if (button != null) {
                 button.setPreferredSize(
-                        new Dimension(buttonWidth, buttonHeight));
+                        new Dimension(buttonWidth, BUTTON_HEIGHT));
                 buttonPanel.add(button);
                 if (!window.getChildren().isEmpty()) {
                     final ArrayList<FrameContainer<?>> childList = new ArrayList
@@ -316,7 +316,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, BUTTON_HEIGHT));
         button.setMargin(new Insets(0, 0, 0, 0));
         buttons.put(source, button);
     }
@@ -396,7 +396,7 @@ public final class ButtonBar implements FrameManager, ActionListener,
     @Override
     public void componentResized(final ComponentEvent e) {
         buttonWidth = position.isHorizontal() ? 150
-                : (parent.getWidth() / cells);
+                : (parent.getWidth() / NUM_CELLS);
         relayout();
     }