Use new FileUtils methods for in the client.

Change-Id: I8dd7ba2f57c43ca64d7ea978a34e00749396a035
Depends-On: I20d3a7b908bbeae833ffffe0598b99bde47021c7
Reviewed-on: http://gerrit.dmdirc.com/4074
Automatic-Compile: DMDirc Build Manager
Reviewed-by: Chris Smith <chris@dmdirc.com>

src/com/dmdirc/updater/components/ClientComponent.java

@@ -22,16 +22,15 @@
 
 package com.dmdirc.updater.components;
 
+import com.dmdirc.Main;
 import com.dmdirc.interfaces.config.IdentityController;
 import com.dmdirc.ui.StatusMessage;
 import com.dmdirc.ui.core.components.StatusBarManager;
 import com.dmdirc.updater.UpdateComponent;
 import com.dmdirc.updater.Version;
+import com.dmdirc.util.io.FileUtils;
 
 import java.io.File;
-import java.net.URISyntaxException;
-import java.nio.file.Path;
-import java.nio.file.Paths;
 
 import javax.inject.Inject;
 
@@ -90,23 +89,14 @@ public class ClientComponent implements UpdateComponent {
                 + File.separator + ".DMDirc.jar");
 
         if (requiresManualInstall()) {
-            Path appPath;
-            String appDir;
-            try {
-                appPath = Paths.get(getClass().getProtectionDomain().getCodeSource()
-                        .getLocation().toURI());
-                appDir = appPath.toAbsolutePath().toString();
-            } catch (URISyntaxException e) {
-                appPath = null;
-                appDir = "[Error getting path]";
-            }
-            if (appPath != null && appPath.getFileName().endsWith(".jar")) {
+            if (FileUtils.isRunningFromJar(Main.class)) {
                 return "A new version of DMDirc has been downloaded, but as you\n"
                         + "do not seem to be using the DMDirc launcher, it will\n"
                         + "not be installed automatically.\n\n"
                         + "To install this update manually, please replace the\n"
                         + "existing DMDirc.jar file, located at:\n"
-                        + " " + appDir + "\n with the following file:\n "
+                        + " " + FileUtils.getApplicationPath(Main.class)
+                        + "\n with the following file:\n "
                         + targetFile.getAbsolutePath();
             } else {
                 return "A new version of DMDirc has been downloaded, but as you\n"
@@ -116,7 +106,7 @@ public class ClientComponent implements UpdateComponent {
                         + "new DMDirc.jar file, located at:\n"
                         + " " + targetFile.getAbsolutePath() + "\n"
                         + "over your existing DMDirc install located in:\n"
-                        + "  " + appDir;
+                        + "  " + FileUtils.getApplicationPath(Main.class);
             }
         }
         return "";

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

@@ -25,16 +25,14 @@ package com.dmdirc.util.resourcemanager;
 import com.dmdirc.Main;
 import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.logger.Logger;
+import com.dmdirc.util.io.FileUtils;
 
 import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.net.MalformedURLException;
-import java.net.URISyntaxException;
 import java.net.URL;
-import java.nio.file.Path;
-import java.nio.file.Paths;
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
@@ -55,15 +53,15 @@ public abstract class ResourceManager {
     public static synchronized ResourceManager getResourceManager() {
         if (me == null) {
             try {
-                final Path path = Paths.get(
-                        Main.class.getProtectionDomain().getCodeSource().getLocation().toURI());
-                if (path.getFileName().endsWith(".jar")) {
-                    me = new ZipResourceManager(path.toAbsolutePath().toString());
+                if (FileUtils.isRunningFromJar(Main.class)) {
+                    me = new ZipResourceManager(FileUtils.getApplicationPath(Main.class)
+                            .toAbsolutePath().toString());
                 } else {
-                    me = new FileResourceManager(path.toAbsolutePath().toString());
+                    me = new FileResourceManager(FileUtils.getApplicationPath(Main.class)
+                            .toAbsolutePath().toString());
 
                 }
-            } catch (URISyntaxException | IOException ex) {
+            } catch (IllegalStateException | IOException ex) {
                 Logger.appError(ErrorLevel.MEDIUM,
                         "Unable to determine how DMDirc has been executed", ex);
             }