Few more Identity references.

Change-Id: I120bda4c85a31339180146761791fd341d6d4740
Reviewed-on: http://gerrit.dmdirc.com/2778
Reviewed-by: Greg Holmes <greg@dmdirc.com>
Automatic-Compile: DMDirc Build Manager

src/com/dmdirc/config/ConfigManager.java

@@ -469,13 +469,13 @@ public class ConfigManager extends ConfigSource implements ConfigChangeListener,
     /** {@inheritDoc} */
     @Override
     public void configProviderAdded(final ConfigProvider configProvider) {
-        checkIdentity((Identity) configProvider);
+        checkIdentity(configProvider);
     }
 
     /** {@inheritDoc} */
     @Override
     public void configProviderRemoved(final ConfigProvider configProvider) {
-        removeIdentity((Identity) configProvider);
+        removeIdentity(configProvider);
     }
 
 }

src/com/dmdirc/config/Identity.java

@@ -52,7 +52,7 @@ import lombok.extern.slf4j.Slf4j;
  * Note: this class has a natural ordering that is inconsistent with equals.
  */
 @Slf4j
-public class Identity extends ConfigSource implements Comparable<Identity>, ConfigProvider {
+public class Identity extends ConfigSource implements ConfigProvider {
 
     /** The domain used for identity settings. */
     private static final String DOMAIN = "identity";
@@ -551,17 +551,4 @@ public class Identity extends ConfigSource implements Comparable<Identity>, Conf
                 && getTarget() == ((Identity) obj).getTarget();
     }
 
-    /**
-     * Compares this identity to another config source to determine which
-     * is more specific.
-     *
-     * @param target The Identity to compare to
-     * @return -1 if this config source is less specific, 0 if they're equal,
-     * +1 if this config is more specific.
-     */
-    @Override
-    public int compareTo(final Identity target) {
-        return target.getTarget().compareTo(myTarget);
-    }
-
 }

src/com/dmdirc/config/IdentityManager.java

@@ -87,13 +87,13 @@ public class IdentityManager implements IdentityFactory, IdentityController {
     private final MapList<String, ConfigProviderListener> listeners = new WeakMapList<>();
 
     /** The identity file used for the global config. */
-    private Identity config;
+    private ConfigProvider config;
 
     /** The identity file used for addon defaults. */
-    private Identity addonConfig;
+    private ConfigProvider addonConfig;
 
     /** The identity file bundled with the client containing version info. */
-    private Identity versionConfig;
+    private ConfigProvider versionConfig;
 
     /** The config manager used for global settings. */
     private ConfigManager globalconfig;
@@ -390,19 +390,19 @@ public class IdentityManager implements IdentityFactory, IdentityController {
 
     /** {@inheritDoc} */
     @Override
-    public Identity getUserSettings() {
+    public ConfigProvider getUserSettings() {
         return config;
     }
 
     /** {@inheritDoc} */
     @Override
-    public Identity getAddonSettings() {
+    public ConfigProvider getAddonSettings() {
         return addonConfig;
     }
 
     /** {@inheritDoc} */
     @Override
-    public Identity getVersionSettings() {
+    public ConfigProvider getVersionSettings() {
         return versionConfig;
     }