More random code tidying

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

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

@@ -32,10 +32,10 @@ import java.util.ArrayList;
 public class KDialogProcess {
 
     /** Is kdialog in /bin? */
-    private static final boolean IS_BIN = (new File("/bin/kdialog")).exists();
+    private static final boolean IS_BIN = new File("/bin/kdialog").exists();
 
     /** Does KDialog exist? */
-    private static final boolean HAS_KDIALOG = (new File("/usr/bin/kdialog")).exists() || IS_BIN;
+    private static final boolean HAS_KDIALOG = IS_BIN || new File("/usr/bin/kdialog").exists();
 
     /** Stream for the stdout stream for this process */
     private final StreamReader stdOutputStream;
@@ -50,11 +50,12 @@ public class KDialogProcess {
      * Execute kdialog with the Parameters in params
      *
      * @param params Parameters to pass to kdialog
+     * @throws IOException if an I/O error occurs
      */
     public KDialogProcess(final String[] params) throws IOException {
         final String[] exec = new String[params.length + 1];
         System.arraycopy(params, 0, exec, 1, params.length);
-        exec[0] = (IS_BIN) ? "/bin/kdialog" : "/usr/bin/kdialog";
+        exec[0] = IS_BIN ? "/bin/kdialog" : "/usr/bin/kdialog";
         process = Runtime.getRuntime().exec(exec);
         stdOutputStream = new StreamReader(process.getInputStream(), new ArrayList<String>());
         stdErrorStream = new StreamReader(process.getErrorStream(), new ArrayList<String>());
@@ -100,6 +101,9 @@ public class KDialogProcess {
 
     /**
      * Wait for the process to finish.
+     *
+     * @throws InterruptedException if the current thread is interrupted by
+     * another thread while it is waiting
      */
     public void waitFor() throws InterruptedException {
         process.waitFor();

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

@@ -23,7 +23,6 @@
 package com.dmdirc.addons.dcc.kde;
 
 import com.dmdirc.addons.dcc.DCCPlugin;
-
 import com.dmdirc.config.IdentityManager;
 
 import java.awt.Component;
@@ -70,155 +69,155 @@ public final class KFileChooser extends JFileChooser {
     /** The plugin that this file chooser is for. */
     private final DCCPlugin plugin;
 
-    /**
-     * Should a KFileChooser be used rather than a JFileChooser?
-     *
-     * @param plugin The DCC Plugin that is requesting a chooser
-     * @return return true if getFileChooser() will return a KFileChooser not a
-     *         JFileChooser
-     */
-    public static boolean useKFileChooser(final DCCPlugin plugin) {
-        return KDialogProcess.hasKDialog() && IdentityManager.getGlobalConfig().getOptionBool(plugin.getDomain(), "general.useKFileChooser");
-    }
-
     /**
      * Constructs a FileChooser pointing to the user's default directory.
      *
-     * @param plugin The DCC Plugin that is requesting a chooser
-     * @return The relevant FileChooser
+     * @param plugin The plugin that owns this KFileChooser
      */
-    public static JFileChooser getFileChooser(final DCCPlugin plugin) {
-        return useKFileChooser(plugin) ? new KFileChooser(plugin) : new JFileChooser();
+    private KFileChooser(final DCCPlugin plugin) {
+        super();
+
+        this.plugin = plugin;
     }
 
     /**
      * Constructs a FileChooser using the given File as the path.
      *
-     * @param plugin The DCC Plugin that is requesting a chooser
+     * @param plugin The plugin that owns this KFileChooser
      * @param currentDirectory Directory to use as the base directory
-     * @return The relevant FileChooser
      */
-    public static JFileChooser getFileChooser(final DCCPlugin plugin, final File currentDirectory) {
-        return useKFileChooser(plugin) ? new KFileChooser(plugin, currentDirectory) : new JFileChooser(currentDirectory);
+    private KFileChooser(final DCCPlugin plugin, final File currentDirectory) {
+        super(currentDirectory);
+
+        this.plugin = plugin;
     }
 
     /**
      * Constructs a FileChooser using the given current directory and FileSystemView.
      *
-     * @param plugin The DCC Plugin that is requesting a chooser
+     * @param plugin The plugin that owns this KFileChooser
      * @param currentDirectory Directory to use as the base directory
      * @param fsv The FileSystemView to use
-     * @return The relevant FileChooser
      */
-    public static JFileChooser getFileChooser(final DCCPlugin plugin, final File currentDirectory, final FileSystemView fsv) {
-        return useKFileChooser(plugin) ? new KFileChooser(plugin, currentDirectory, fsv) : new JFileChooser(currentDirectory, fsv);
+    private KFileChooser(final DCCPlugin plugin, final File currentDirectory, final FileSystemView fsv) {
+        super(currentDirectory, fsv);
+
+        this.plugin = plugin;
     }
 
     /**
      * Constructs a FileChooser using the given FileSystemView.
      *
-     * @param plugin The DCC Plugin that is requesting a chooser
+     * @param plugin The plugin that owns this KFileChooser
      * @param fsv The FileSystemView to use
-     * @return The relevant FileChooser
      */
-    public static JFileChooser getFileChooser(final DCCPlugin plugin, final FileSystemView fsv) {
-        return useKFileChooser(plugin) ? new KFileChooser(plugin, fsv) : new JFileChooser(fsv);
+    private KFileChooser(final DCCPlugin plugin, final FileSystemView fsv) {
+        super(fsv);
+
+        this.plugin = plugin;
     }
 
     /**
      * Constructs a FileChooser using the given path.
      *
-     * @param plugin The DCC Plugin that is requesting a chooser
+     * @param plugin The plugin that owns this KFileChooser
      * @param currentDirectoryPath Directory to use as the base directory
-     * @return The relevant FileChooser
      */
-    public static JFileChooser getFileChooser(final DCCPlugin plugin, final String currentDirectoryPath) {
-        return useKFileChooser(plugin) ? new KFileChooser(plugin, currentDirectoryPath) : new JFileChooser(currentDirectoryPath);
+    private KFileChooser(final DCCPlugin plugin, final String currentDirectoryPath) {
+        super(currentDirectoryPath);
+
+        this.plugin = plugin;
     }
 
     /**
      * Constructs a FileChooser using the given current directory path and FileSystemView.
      *
-     * @param plugin The DCC Plugin that is requesting a chooser
+     * @param plugin The plugin that owns this KFileChooser
      * @param currentDirectoryPath Directory to use as the base directory
      * @param fsv The FileSystemView to use
-     * @return The relevant FileChooser
      */
-    public static JFileChooser getFileChooser(final DCCPlugin plugin, final String currentDirectoryPath, final FileSystemView fsv) {
-        return useKFileChooser(plugin) ? new KFileChooser(plugin, currentDirectoryPath, fsv) : new JFileChooser(currentDirectoryPath, fsv);
+    private KFileChooser(final DCCPlugin plugin, final String currentDirectoryPath, final FileSystemView fsv) {
+        super(currentDirectoryPath, fsv);
+
+        this.plugin = plugin;
     }
 
     /**
-     * Constructs a FileChooser pointing to the user's default directory.
+     * Should a KFileChooser be used rather than a JFileChooser?
      *
-     * @param plugin The plugin that owns this KFileChooser
+     * @param plugin The DCC Plugin that is requesting a chooser
+     * @return return true if getFileChooser() will return a KFileChooser not a
+     *         JFileChooser
      */
-    private KFileChooser(final DCCPlugin plugin) {
-        super();
+    public static boolean useKFileChooser(final DCCPlugin plugin) {
+        return KDialogProcess.hasKDialog() && IdentityManager.getGlobalConfig().getOptionBool(plugin.getDomain(), "general.useKFileChooser");
+    }
 
-        this.plugin = plugin;
+    /**
+     * Constructs a FileChooser pointing to the user's default directory.
+     *
+     * @param plugin The DCC Plugin that is requesting a chooser
+     * @return The relevant FileChooser
+     */
+    public static JFileChooser getFileChooser(final DCCPlugin plugin) {
+        return useKFileChooser(plugin) ? new KFileChooser(plugin) : new JFileChooser();
     }
 
     /**
      * Constructs a FileChooser using the given File as the path.
      *
-     * @param plugin The plugin that owns this KFileChooser
+     * @param plugin The DCC Plugin that is requesting a chooser
      * @param currentDirectory Directory to use as the base directory
+     * @return The relevant FileChooser
      */
-    private KFileChooser(final DCCPlugin plugin, final File currentDirectory) {
-        super(currentDirectory);
-
-        this.plugin = plugin;
+    public static JFileChooser getFileChooser(final DCCPlugin plugin, final File currentDirectory) {
+        return useKFileChooser(plugin) ? new KFileChooser(plugin, currentDirectory) : new JFileChooser(currentDirectory);
     }
 
     /**
      * Constructs a FileChooser using the given current directory and FileSystemView.
      *
-     * @param plugin The plugin that owns this KFileChooser
+     * @param plugin The DCC Plugin that is requesting a chooser
      * @param currentDirectory Directory to use as the base directory
      * @param fsv The FileSystemView to use
+     * @return The relevant FileChooser
      */
-    private KFileChooser(final DCCPlugin plugin, final File currentDirectory, final FileSystemView fsv) {
-        super(currentDirectory, fsv);
-
-        this.plugin = plugin;
+    public static JFileChooser getFileChooser(final DCCPlugin plugin, final File currentDirectory, final FileSystemView fsv) {
+        return useKFileChooser(plugin) ? new KFileChooser(plugin, currentDirectory, fsv) : new JFileChooser(currentDirectory, fsv);
     }
 
     /**
      * Constructs a FileChooser using the given FileSystemView.
      *
-     * @param plugin The plugin that owns this KFileChooser
+     * @param plugin The DCC Plugin that is requesting a chooser
      * @param fsv The FileSystemView to use
+     * @return The relevant FileChooser
      */
-    private KFileChooser(final DCCPlugin plugin, final FileSystemView fsv) {
-        super(fsv);
-
-        this.plugin = plugin;
+    public static JFileChooser getFileChooser(final DCCPlugin plugin, final FileSystemView fsv) {
+        return useKFileChooser(plugin) ? new KFileChooser(plugin, fsv) : new JFileChooser(fsv);
     }
 
     /**
      * Constructs a FileChooser using the given path.
      *
-     * @param plugin The plugin that owns this KFileChooser
+     * @param plugin The DCC Plugin that is requesting a chooser
      * @param currentDirectoryPath Directory to use as the base directory
+     * @return The relevant FileChooser
      */
-    private KFileChooser(final DCCPlugin plugin, final String currentDirectoryPath) {
-        super(currentDirectoryPath);
-
-        this.plugin = plugin;
+    public static JFileChooser getFileChooser(final DCCPlugin plugin, final String currentDirectoryPath) {
+        return useKFileChooser(plugin) ? new KFileChooser(plugin, currentDirectoryPath) : new JFileChooser(currentDirectoryPath);
     }
 
     /**
      * Constructs a FileChooser using the given current directory path and FileSystemView.
      *
-     * @param plugin The plugin that owns this KFileChooser
+     * @param plugin The DCC Plugin that is requesting a chooser
      * @param currentDirectoryPath Directory to use as the base directory
      * @param fsv The FileSystemView to use
+     * @return The relevant FileChooser
      */
-    private KFileChooser(final DCCPlugin plugin, final String currentDirectoryPath, final FileSystemView fsv) {
-        super(currentDirectoryPath, fsv);
-
-        this.plugin = plugin;
+    public static JFileChooser getFileChooser(final DCCPlugin plugin, final String currentDirectoryPath, final FileSystemView fsv) {
+        return useKFileChooser(plugin) ? new KFileChooser(plugin, currentDirectoryPath, fsv) : new JFileChooser(currentDirectoryPath, fsv);
     }
 
     /**
@@ -245,20 +244,24 @@ public final class KFileChooser extends JFileChooser {
         if (!useKFileChooser(plugin)) {
             return super.showOpenDialog(parent);
         }
+
         final ArrayList<String> params = new ArrayList<String>();
         if (isMultiSelectionEnabled()) {
             params.add("--multiple");
             params.add("--separate-output");
         }
+
         if (getDialogTitle() != null && !getDialogTitle().isEmpty()) {
             params.add("--caption");
             params.add(getDialogTitle());
         }
+
         if (getFileSelectionMode() == DIRECTORIES_ONLY) {
             params.add("--getexistingdirectory");
         } else {
             params.add("--getopenfilename");
         }
+
         if (getSelectedFile() != null && getFileSelectionMode() != DIRECTORIES_ONLY && !getSelectedFile().getPath().isEmpty()) {
             if (getSelectedFile().getPath().charAt(0) != '/') {
                 params.add(getCurrentDirectory().getPath() + File.separator + getSelectedFile().getPath());
@@ -268,9 +271,11 @@ public final class KFileChooser extends JFileChooser {
         } else if (getCurrentDirectory() != null) {
             params.add(getCurrentDirectory().getPath());
         }
+
         if (getFileSelectionMode() != DIRECTORIES_ONLY && fileFilter != null && !fileFilter.isEmpty()) {
             params.add(fileFilter);
         }
+
         KDialogProcess kdp;
         try {
             kdp = new KDialogProcess(params.toArray(new String[0]));
@@ -302,11 +307,13 @@ public final class KFileChooser extends JFileChooser {
         if (!useKFileChooser(plugin)) {
             return super.showSaveDialog(parent);
         }
+
         final ArrayList<String> params = new ArrayList<String>();
         if (getDialogTitle() != null && !getDialogTitle().isEmpty()) {
             params.add("--caption");
             params.add(getDialogTitle());
         }
+
         params.add("--getsavefilename");
         if (getSelectedFile() != null && !getSelectedFile().getPath().isEmpty()) {
             if (getSelectedFile().getPath().charAt(0) != '/') {
@@ -317,6 +324,7 @@ public final class KFileChooser extends JFileChooser {
         } else if (getCurrentDirectory() != null) {
             params.add(getCurrentDirectory().getPath());
         }
+
         KDialogProcess kdp;
         try {
             kdp = new KDialogProcess(params.toArray(new String[0]));