Fix errors when identity manager loads defaults in the wrong order

Output a valid identity during the build process
IdentityManager now loads the version information

build-versioning.xml

@@ -14,9 +14,15 @@
 # the build process.
 
 keysections:
+   identity
    version
    updater
 
+identity:
+   name=DMDirc version information
+   globaldefault=true
+   order=95000
+
 version:
    version=</echo>
     </target>

src/com/dmdirc/Main.java

@@ -116,8 +116,6 @@ public final class Main {
         final CommandLineParser clp = new CommandLineParser(args);
         
         IdentityManager.load();
-        IdentityManager.getConfigIdentity().setOption("updater", "channel",
-                UPDATE_CHANNEL.name()); // Hack until we set it decently
 
         final PluginManager pm = PluginManager.getPluginManager();
         

src/com/dmdirc/config/IdentityManager.java

@@ -33,6 +33,7 @@ import com.dmdirc.util.resourcemanager.ResourceManager;
 
 import java.io.File;
 import java.io.IOException;
+import java.net.URISyntaxException;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
@@ -70,8 +71,9 @@ public final class IdentityManager {
     public static void load() {
         identities.clear();
         managers.clear();
-        
+
         loadDefaults();
+        loadVersion();
         loadUser();
         loadConfig();
         
@@ -223,6 +225,15 @@ public final class IdentityManager {
                     + file.getAbsolutePath());
         }
     }
+
+    /** Loads the version information. */
+    private static void loadVersion() {
+        try {
+            loadIdentity(new File(Main.class.getResource("version.config").toURI()));
+        } catch (URISyntaxException ex) {
+            Logger.appError(ErrorLevel.FATAL, "Unable to read version information", ex);
+        }
+    }
     
     /** Loads the config identity. */
     private static void loadConfig() {

src/com/dmdirc/logger/ErrorManager.java

@@ -87,18 +87,11 @@ public final class ErrorManager implements Serializable, ConfigChangeListener {
 
         final ConfigManager config = IdentityManager.getGlobalConfig();
 
-        try {
-            sendReports = config.getOptionBool("general", "submitErrors")
-                    && !config.getOptionBool("temp", "noerrorreporting");
-            logReports = config.getOptionBool("general", "logerrors");
-        } catch (IllegalArgumentException ex) {
-            sendReports = false;
-            logReports = true;
-        }
-
         config.addChangeListener("general", "logerrors", this);
         config.addChangeListener("general", "submitErrors", this);
         config.addChangeListener("temp", "noerrorreporting", this);
+
+        updateSettings();
     }
 
     /**
@@ -448,11 +441,21 @@ public final class ErrorManager implements Serializable, ConfigChangeListener {
     /** {@inheritDoc} */
     @Override
     public void configChanged(final String domain, final String key) {
+        updateSettings();
+    }
+
+    /** Updates the settings used by this error manager. */
+    protected void updateSettings() {
         final ConfigManager config = IdentityManager.getGlobalConfig();
-        
-        sendReports = config.getOptionBool("general", "submitErrors")
-                && !config.getOptionBool("temp", "noerrorreporting");
-        logReports = config.getOptionBool("general", "logerrors");
+
+        try {
+            sendReports = config.getOptionBool("general", "submitErrors")
+                    && !config.getOptionBool("temp", "noerrorreporting");
+            logReports = config.getOptionBool("general", "logerrors");
+        } catch (IllegalArgumentException ex) {
+            sendReports = false;
+            logReports = true;
+        }
     }
 
 }