Switch to Path for setting up config directory.

Also in this change ditch the resource manager for working out
the current working directory, the JVM provides this for us
(user.dir), much less can go wrong with this.

Change-Id: I5746ee043b5974df2b59eb9c586661ac815051d8
Reviewed-on: http://gerrit.dmdirc.com/4070
Automatic-Compile: DMDirc Build Manager
Reviewed-by: Chris Smith <chris@dmdirc.com>

src/com/dmdirc/commandline/CommandLineParser.java

@@ -29,11 +29,13 @@ import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.logger.Logger;
 import com.dmdirc.util.InvalidURIException;
 import com.dmdirc.util.URIParser;
-import com.dmdirc.util.resourcemanager.DMDircResourceManager;
 
 import java.io.File;
 import java.io.IOException;
 import java.net.URI;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
 import java.rmi.RemoteException;
 import java.util.ArrayList;
 import java.util.List;
@@ -221,7 +223,7 @@ public class CommandLineParser {
                 doConnect(param);
                 break;
             case 'd':
-                doDirectory(param);
+                doDirectory(Paths.get(param));
                 break;
             case 'e':
                 doExisting();
@@ -236,7 +238,7 @@ public class CommandLineParser {
                 launcherVersion = param;
                 break;
             case 'p':
-                doDirectory(DMDircResourceManager.getWorkingDirectory());
+                doDirectory(Paths.get(System.getProperty("user.dir")));
                 break;
             case 'r':
                 disablereporting = true;
@@ -318,17 +320,18 @@ public class CommandLineParser {
      *
      * @param dir The new config directory
      */
-    private void doDirectory(final String dir) {
-        try {
-            final File file = new File(dir);
-            if (!file.exists() && !file.mkdirs()) {
+    private void doDirectory(final Path dir) {
+        if (!Files.exists(dir)) {
+            try {
+                Files.createDirectories(dir);
+            } catch (IOException ex) {
                 System.err.println("Unable to create directory " + dir);
                 System.exit(1);
             }
-            configDirectory = file.getCanonicalPath() + File.separator;
-        } catch (IOException ex) {
-            System.err.println("Unable to resolve directory " + dir + ": ");
-            System.err.println("\t" + ex.getMessage());
+        }
+        configDirectory = dir.toAbsolutePath().toString() + File.separator;
+        if (!Files.exists(Paths.get(configDirectory))) {
+            System.err.println("Unable to resolve directory " + dir);
             System.exit(1);
         }
     }

src/com/dmdirc/util/resourcemanager/DMDircResourceManager.java

@@ -22,18 +22,15 @@
 
 package com.dmdirc.util.resourcemanager;
 
-import com.dmdirc.Main;
 import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.logger.Logger;
 
-import java.io.File;
 import java.io.UnsupportedEncodingException;
 import java.net.MalformedURLException;
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.net.URL;
 import java.net.URLDecoder;
-import java.security.CodeSource;
 
 /**
  * Provides utility methods for working with resources from the DMDirc distribution.
@@ -44,28 +41,6 @@ public final class DMDircResourceManager {
         //Prevent instantiation
     }
 
-    /**
-     * Returns the working directory for the application.
-     *
-     * @return Current working directory
-     */
-    public static synchronized String getWorkingDirectory() {
-        final CodeSource codeSource = Main.class.getProtectionDomain().getCodeSource();
-        try {
-            final File jarFile = new File(codeSource.getLocation().toURI().getPath());
-            final String jarDir;
-            if (isRunningFromJar()) {
-                jarDir = jarFile.getParentFile().getPath();
-            } else {
-                jarDir = jarFile.getPath();
-            }
-            return URLDecoder.decode(jarDir, "UTF-8");
-        } catch (URISyntaxException | UnsupportedEncodingException ex) {
-            Logger.appError(ErrorLevel.FATAL, "Unable to find working directory", ex);
-            return null;
-        }
-    }
-
     /**
      * Returns the working directory for the application or the jar name.
      *