Tidy up Theme a bit.

Remove singleton IdentityManager references.

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

src/com/dmdirc/ui/themes/Theme.java

@@ -22,8 +22,8 @@
 
 package com.dmdirc.ui.themes;
 
-import com.dmdirc.config.IdentityManager;
 import com.dmdirc.config.InvalidIdentityFileException;
+import com.dmdirc.interfaces.IdentityController;
 import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.logger.Logger;
 import com.dmdirc.util.io.ConfigFile;
@@ -34,11 +34,17 @@ import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
 
+import lombok.RequiredArgsConstructor;
+
 /**
  * Represents one theme file.
  */
+@RequiredArgsConstructor
 public class Theme implements Comparable<Theme> {
 
+    /** The controller to add theme identities to. */
+    private final IdentityController identityController;
+
     /** The file to load the theme from. */
     private final File file;
 
@@ -54,15 +60,6 @@ public class Theme implements Comparable<Theme> {
     /** The Identity we've registered. */
     private ThemeIdentity identity;
 
-    /**
-     * Creates a new instance of Theme.
-     *
-     * @param file The file to load the theme from
-     */
-    public Theme(final File file) {
-        this.file = file;
-    }
-
     /**
      * Determines if this theme is valid or not (i.e., it is a valid zip file,
      * and it contains one file).
@@ -85,9 +82,7 @@ public class Theme implements Comparable<Theme> {
 
                 try {
                     metadata.read();
-                } catch (IOException ex) {
-                    metadata = null;
-                } catch (InvalidConfigFileException ex) {
+                } catch (IOException | InvalidConfigFileException ex) {
                     metadata = null;
                 }
             }
@@ -111,11 +106,8 @@ public class Theme implements Comparable<Theme> {
         if (stream != null) {
             try {
                 identity = new ThemeIdentity(stream, this);
-                IdentityManager.getIdentityManager().registerIdentity(identity);
-            } catch (InvalidIdentityFileException ex) {
-                Logger.userError(ErrorLevel.MEDIUM, "Error loading theme identity file: "
-                        + ex.getMessage());
-            } catch (IOException ex) {
+                identityController.registerIdentity(identity);
+            } catch (InvalidIdentityFileException | IOException ex) {
                 Logger.userError(ErrorLevel.MEDIUM, "Error loading theme identity file: "
                         + ex.getMessage());
             }
@@ -131,8 +123,7 @@ public class Theme implements Comparable<Theme> {
         }
 
         enabled = false;
-
-        IdentityManager.getIdentityManager().unregisterIdentity(identity);
+        identityController.unregisterIdentity(identity);
     }
 
     /**

src/com/dmdirc/ui/themes/ThemeManager.java

@@ -110,7 +110,7 @@ public final class ThemeManager {
         if (themes.containsKey(file.getName())) {
             theme = themes.get(file.getName());
         } else {
-            theme = new Theme(file);
+            theme = new Theme(identityController, file);
 
             if (theme.isValidTheme()) {
                 themes.put(file.getName(), theme);