1 files changed, 3 insertions, 19 deletions

diff --git a/src/main/java/cuchaz/enigma/Main.java b/src/main/java/cuchaz/enigma/Main.java
index 1d63ec1..7c87669 100644
--- a/src/main/java/cuchaz/enigma/Main.java
+++ b/src/main/java/cuchaz/enigma/Main.java
@@ -17,10 +17,7 @@ import cuchaz.enigma.translation.mapping.serde.MappingFormat;
 
 import joptsimple.*;
 
-import java.io.BufferedReader;
 import java.io.IOException;
-import java.io.InputStreamReader;
-import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
@@ -54,20 +51,7 @@ public class Main {
                                 return;
                         }
 
-                        EnigmaProfile parsedProfile;
-                        if (options.has(profile)) {
-                                Path profilePath = options.valueOf(profile);
-                                try (BufferedReader reader = Files.newBufferedReader(profilePath)) {
-                                        parsedProfile = EnigmaProfile.parse(reader);
-                                }
-                        } else {
-                                try (BufferedReader reader = new BufferedReader(new InputStreamReader(Main.class.getResourceAsStream("/profile.json"), StandardCharsets.UTF_8))){
-                                        parsedProfile = EnigmaProfile.parse(reader);
-                                } catch (IOException ex) {
-                                        System.out.println("Failed to load default profile, will use empty profile: " + ex.getMessage());
-                                        parsedProfile = EnigmaProfile.EMPTY;
-                                }
-                        }
+                        EnigmaProfile parsedProfile = EnigmaProfile.read(options.valueOf(profile));
 
                         Gui gui = new Gui(parsedProfile);
                         GuiController controller = gui.getController();
@@ -95,8 +79,8 @@ public class Main {
                 }
         }
 
-        private static class PathConverter implements ValueConverter<Path> {
-                static final ValueConverter<Path> INSTANCE = new PathConverter();
+        public static class PathConverter implements ValueConverter<Path> {
+                public static final ValueConverter<Path> INSTANCE = new PathConverter();
 
                 PathConverter() {
                 }