Issue 1703: Move exception handling out from Identity

git-svn-id: http://svn.dmdirc.com/trunk@4830 00569f92-eb28-0410-84fd-f71c24880f

src/com/dmdirc/config/Identity.java

@@ -543,14 +543,15 @@ public class Identity extends ConfigSource implements Serializable,
      *
      * @param settings The settings to populate the identity with
      * @return A new identity containing the specified properties
+     * @throws IOException If the file cannot be created
+     * @throws InvalidIdentityFileException If the settings are invalid
      * @since 0.6.3
      */
-    protected static Identity createIdentity(final Map<String, Map<String, String>> settings) {
+    protected static Identity createIdentity(final Map<String, Map<String, String>> settings)
+            throws IOException, InvalidIdentityFileException {
         if (!settings.containsKey(DOMAIN) || !settings.get(DOMAIN).containsKey("name")
                 || settings.get(DOMAIN).get("name").isEmpty()) {
-            Logger.appError(ErrorLevel.LOW, "createIdentity called with invalid identity",
-                    new InvalidIdentityFileException("identity.name is not set"));
-            return null;
+            throw new InvalidIdentityFileException("identity.name is not set");
         }
 
         final String fs = System.getProperty("file.separator");
@@ -570,32 +571,12 @@ public class Identity extends ConfigSource implements Serializable,
             configFile.addDomain(entry.getKey(), entry.getValue());
         }
 
-        try {
-            configFile.write();
-        } catch (IOException ex) {
-            Logger.userError(ErrorLevel.MEDIUM,
-                    "Unable to write new identity file: " + ex.getMessage());
-            return null;
-        }
+        configFile.write();
 
-        try {
-            final Identity identity = new Identity(file, false);
-            IdentityManager.addIdentity(identity);
+        final Identity identity = new Identity(file, false);
+        IdentityManager.addIdentity(identity);
 
-            return identity;
-        } catch (MalformedURLException ex) {
-            Logger.userError(ErrorLevel.MEDIUM,
-                    "Unable to open new identity file: " + ex.getMessage());
-            return null;
-        } catch (InvalidIdentityFileException ex) {
-            Logger.userError(ErrorLevel.MEDIUM,
-                    "Unable to open new identity file: " + ex.getMessage());
-            return null;
-        } catch (IOException ex) {
-            Logger.userError(ErrorLevel.MEDIUM,
-                    "Unable to open new identity file: " + ex.getMessage());
-            return null;
-        }
+        return identity;
     }
 
     /**
@@ -603,15 +584,23 @@ public class Identity extends ConfigSource implements Serializable,
      *
      * @param target The target for the new identity
      * @return An empty identity for the specified target
+     * @throws IOException if the file can't be written
+     * @see #createIdentity(java.util.Map)
      */
-    public static Identity buildIdentity(final ConfigTarget target) {
+    public static Identity buildIdentity(final ConfigTarget target)
+            throws IOException {
         final Map<String, Map<String, String>> settings
                 = new HashMap<String, Map<String, String>>();
         settings.put(DOMAIN, new HashMap<String, String>(2));
         settings.get(DOMAIN).put("name", target.getData());
         settings.get(DOMAIN).put(target.getTypeName(), target.getData());
 
-        return createIdentity(settings);
+        try {
+            return createIdentity(settings);
+        } catch (InvalidIdentityFileException ex) {
+            Logger.appError(ErrorLevel.MEDIUM, "Unable to create identity", ex);
+            return null;
+        }
     }
 
     /**
@@ -620,8 +609,10 @@ public class Identity extends ConfigSource implements Serializable,
      *
      * @param name The name of the profile to create
      * @return A new profile with the specified name
+     * @throws IOException If the file can't be written
+     * @see #createIdentity(java.util.Map)
      */
-    public static Identity buildProfile(final String name) {
+    public static Identity buildProfile(final String name) throws IOException {
         final Map<String, Map<String, String>> settings
                 = new HashMap<String, Map<String, String>>();
         settings.put(DOMAIN, new HashMap<String, String>(1));
@@ -633,7 +624,12 @@ public class Identity extends ConfigSource implements Serializable,
         settings.get("profile").put("nickname", nick);
         settings.get("profile").put("realname", nick);
 
-        return createIdentity(settings);
+        try {
+            return createIdentity(settings);
+        } catch (InvalidIdentityFileException ex) {
+            Logger.appError(ErrorLevel.MEDIUM, "Unable to create identity", ex);
+            return null;
+        }
     }
 
 }

src/com/dmdirc/config/IdentityManager.java

@@ -76,7 +76,11 @@ public final class IdentityManager {
         loadConfig();
         
         if (getProfiles().size() == 0) {
-            Identity.buildProfile("Default Profile");
+            try {
+                Identity.buildProfile("Default Profile");
+            } catch (IOException ex) {
+                Logger.userError(ErrorLevel.FATAL, "Unable to write default profile", ex);
+            }
         }
         
         // Set up the identity used for the addons defaults
@@ -387,6 +391,7 @@ public final class IdentityManager {
     /**
      * Retrieves the config for the specified channel@network. The config is
      * created if it doesn't exist.
+     *
      * @param network The name of the network
      * @param channel The name of the channel
      * @return A config source for the channel
@@ -395,8 +400,7 @@ public final class IdentityManager {
         "The specified network is non-null and not empty",
         "The specified channel is non-null and not empty"
     })
-    public static Identity getChannelConfig(final String network,
-            final String channel) {
+    public static Identity getChannelConfig(final String network, final String channel) {
         if (network == null || network.isEmpty()) {
             throw new IllegalArgumentException("getChannelConfig called "
                     + "with null or empty network\n\nNetwork: " + network);
@@ -421,13 +425,19 @@ public final class IdentityManager {
         // We need to create one
         final ConfigTarget target = new ConfigTarget();
         target.setChannel(myTarget);
-        
-        return Identity.buildIdentity(target);
+
+        try {
+            return Identity.buildIdentity(target);
+        } catch (IOException ex) {
+            Logger.userError(ErrorLevel.HIGH, "Unable to create channel identity", ex);
+            return null;
+        }
     }
     
     /**
      * Retrieves the config for the specified network. The config is
      * created if it doesn't exist.
+     *
      * @param network The name of the network
      * @return A config source for the network
      */
@@ -453,7 +463,12 @@ public final class IdentityManager {
         final ConfigTarget target = new ConfigTarget();
         target.setNetwork(myTarget);
         
-        return Identity.buildIdentity(target);
+        try {
+            return Identity.buildIdentity(target);
+        } catch (IOException ex) {
+            Logger.userError(ErrorLevel.HIGH, "Unable to create network identity", ex);
+            return null;
+        }
     }
     
     /**
@@ -485,7 +500,12 @@ public final class IdentityManager {
         final ConfigTarget target = new ConfigTarget();
         target.setServer(myTarget);
         
-        return Identity.buildIdentity(target);
+        try {
+            return Identity.buildIdentity(target);
+        } catch (IOException ex) {
+            Logger.userError(ErrorLevel.HIGH, "Unable to create network identity", ex);
+            return null;
+        }
     }    
     
 }

src/com/dmdirc/ui/swing/dialogs/profiles/Profile.java

@@ -25,6 +25,7 @@ package com.dmdirc.ui.swing.dialogs.profiles;
 import com.dmdirc.config.Identity;
 import com.dmdirc.config.IdentityManager;
 
+import java.io.IOException;
 import java.util.Arrays;
 import java.util.List;
 
@@ -291,7 +292,11 @@ public class Profile {
             }
 
             if (profile == null) {
-                profile = Identity.buildProfile(name);
+                try {
+                    profile = Identity.buildProfile(name);
+                } catch (IOException ex) {
+                    // TODO: ??
+                }
             }
 
             profile.setOption("identity", "name", name);