Switch some file usages to paths.

src/com/dmdirc/commandparser/aliases/AliasesModule.java

@@ -27,7 +27,7 @@ import com.dmdirc.commandline.CommandLineOptionsModule.DirectoryType;
 import com.dmdirc.interfaces.Migrator;
 import com.dmdirc.interfaces.SystemLifecycleComponent;
 
-import java.nio.file.Paths;
+import java.nio.file.Path;
 
 import javax.inject.Singleton;
 
@@ -43,9 +43,9 @@ public class AliasesModule {
     @Provides
     @Singleton
     public AliasStore getAliasStore(
-            @Directory(DirectoryType.BASE) final String directory,
+            @Directory(DirectoryType.BASE) final Path directory,
             final AliasFactory factory) {
-        return new YamlAliasStore(Paths.get(directory, "aliases.yml"), factory);
+        return new YamlAliasStore(directory.resolve("aliases.yml"), factory);
     }
 
     @Provides(type = Provides.Type.SET)
@@ -59,8 +59,8 @@ public class AliasesModule {
     }
 
     @Provides(type = Provides.Type.SET)
-    public Migrator getDefaultsMigrator(@Directory(DirectoryType.BASE) final String directory) {
-        return new DefaultAliasInstaller(Paths.get(directory, "aliases.yml"));
+    public Migrator getDefaultsMigrator(@Directory(DirectoryType.BASE) final Path directory) {
+        return new DefaultAliasInstaller(directory.resolve("aliases.yml"));
     }
 
 }

src/com/dmdirc/commandparser/auto/AutoCommandModule.java

@@ -25,7 +25,7 @@ package com.dmdirc.commandparser.auto;
 import com.dmdirc.interfaces.Migrator;
 import com.dmdirc.interfaces.SystemLifecycleComponent;
 
-import java.nio.file.Paths;
+import java.nio.file.Path;
 
 import javax.inject.Singleton;
 
@@ -44,8 +44,8 @@ public class AutoCommandModule {
     @Provides
     @Singleton
     public AutoCommandStore getAutoCommandStore(
-            @Directory(DirectoryType.BASE) final String directory) {
-        return new YamlAutoCommandStore(Paths.get(directory, "auto-commands.yml"));
+            @Directory(DirectoryType.BASE) final Path directory) {
+        return new YamlAutoCommandStore(directory.resolve("auto-commands.yml"));
     }
 
     @Provides(type = Provides.Type.SET)

src/com/dmdirc/config/ConfigModule.java

@@ -63,7 +63,7 @@ public class ConfigModule {
     public IdentityManager getIdentityManager(
             @Directory(DirectoryType.BASE) final Path baseDirectory,
             @Directory(DirectoryType.IDENTITIES) final Path identitiesDirectory,
-            @Directory(DirectoryType.ERRORS) final String errorsDirectory,
+            @Directory(DirectoryType.ERRORS) final Path errorsDirectory,
             final CommandLineParser commandLineParser,
             final DMDircMBassador eventBus) {
         final IdentityManager identityManager = new IdentityManager(baseDirectory,

src/com/dmdirc/logger/ErrorManager.java

@@ -31,6 +31,7 @@ import com.dmdirc.ui.FatalErrorDialog;
 import com.dmdirc.util.collections.ListenerList;
 
 import java.awt.GraphicsEnvironment;
+import java.nio.file.Path;
 import java.util.Date;
 import java.util.LinkedList;
 import java.util.List;
@@ -72,7 +73,7 @@ public class ErrorManager implements ConfigChangeListener {
     /** Config to read settings from. */
     private AggregateConfigProvider config;
     /** Directory to store errors in. */
-    private String errorsDirectory;
+    private Path errorsDirectory;
 
     /** Creates a new instance of ErrorListDialog. */
     public ErrorManager() {
@@ -87,7 +88,7 @@ public class ErrorManager implements ConfigChangeListener {
      * @param directory    The directory to store errors in, if enabled.
      * @param eventBus     The event bus to listen for error events on.
      */
-    public void initialise(final AggregateConfigProvider globalConfig, final String directory,
+    public void initialise(final AggregateConfigProvider globalConfig, final Path directory,
             final DMDircMBassador eventBus) {
         eventBus.subscribe(this);
         RavenFactory.registerFactory(new DefaultRavenFactory());

src/com/dmdirc/logger/ProgramError.java

@@ -22,12 +22,12 @@
 
 package com.dmdirc.logger;
 
-import java.io.File;
-import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.OutputStream;
 import java.io.PrintWriter;
 import java.io.Serializable;
+import java.nio.file.Files;
+import java.nio.file.Path;
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
 import java.util.Date;
@@ -45,7 +45,7 @@ public final class ProgramError implements Serializable {
     /** A version number for this class. */
     private static final long serialVersionUID = 3;
     /** Directory used to store errors. */
-    private static File errorDir;
+    private static Path errorDir;
     /** Semaphore used to serialise write access. */
     private static final Semaphore WRITING_SEM = new Semaphore(1);
     /** The reporter to use to send this error. */
@@ -208,7 +208,7 @@ public final class ProgramError implements Serializable {
      *
      * @param directory The directory to save the error in.
      */
-    public void save(final String directory) {
+    public void save(final Path directory) {
         try (PrintWriter out = new PrintWriter(getErrorFile(directory), true)) {
             out.println("Date:" + getDate());
             out.println("Level: " + getLevel());
@@ -229,30 +229,39 @@ public final class ProgramError implements Serializable {
      * @return BufferedOutputStream to write to the error file
      */
     @SuppressWarnings("PMD.SystemPrintln")
-    private OutputStream getErrorFile(final String directory) {
+    private OutputStream getErrorFile(final Path directory) {
         WRITING_SEM.acquireUninterruptibly();
 
-        if (errorDir == null || !errorDir.exists()) {
-            errorDir = new File(directory);
-            if (!errorDir.exists()) {
-                errorDir.mkdirs();
+        try {
+            if (errorDir == null || !Files.exists(errorDir)) {
+                errorDir = directory;
+                if (!Files.exists(errorDir)) {
+                    Files.createDirectories(errorDir);
+                }
             }
-        }
-
-        final String logName = getDate().getTime() + "-" + getLevel();
 
-        final File errorFile = new File(errorDir, logName + ".log");
-
-        if (errorFile.exists()) {
-            boolean rename = false;
-            for (int i = 0; !rename; i++) {
-                rename = errorFile.renameTo(new File(errorDir, logName + '-' + i + ".log"));
+            final String logName = getDate().getTime() + "-" + getLevel();
+
+            final Path errorFile = errorDir.resolve(logName + ".log");
+
+            if (Files.exists(errorFile)) {
+                boolean rename = false;
+                for (int i = 0; !rename; i++) {
+                    try {
+                        Files.move(errorFile, errorDir.resolve(logName + '-' + i + ".log"));
+                        rename = true;
+                    } catch (IOException ex) {
+                        rename = false;
+                        if (i > 20) {
+                            // Something's probably catestrophically wrong. Give up.
+                            throw ex;
+                        }
+                    }
+                }
             }
-        }
 
-        try {
-            errorFile.createNewFile();
-            return new FileOutputStream(errorFile);
+            Files.createFile(errorFile);
+            return Files.newOutputStream(errorFile);
         } catch (IOException ex) {
             System.err.println("Error creating new file: ");
             ex.printStackTrace();