Initial work on a profile manager.

src/com/dmdirc/ClientModule.java

@@ -33,6 +33,7 @@ import com.dmdirc.commandparser.aliases.AliasesModule;
 import com.dmdirc.commandparser.auto.AutoCommandModule;
 import com.dmdirc.commandparser.commands.CommandModule;
 import com.dmdirc.config.ConfigModule;
+import com.dmdirc.config.profiles.ProfilesModule;
 import com.dmdirc.interfaces.ActionController;
 import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.interfaces.ConnectionFactory;
@@ -73,6 +74,7 @@ import dagger.Provides;
                 ConfigModule.class,
                 MessagesModule.class,
                 PluginModule.class,
+                ProfilesModule.class,
                 UpdaterModule.class
         },
         library = true)

src/com/dmdirc/config/profiles/Profile.java

@@ -210,6 +210,10 @@ public class Profile {
         return hash;
     }
 
+    public boolean equalsConfigProvider(final ConfigProvider configProvider) {
+        return this.configProvider != null && configProvider.equals(configProvider);
+    }
+
     @Override
     public boolean equals(final Object obj) {
         if (obj == null) {

src/com/dmdirc/config/profiles/ProfileManager.java

@@ -0,0 +1,113 @@
+/*
+ * Copyright (c) 2006-2014 DMDirc Developers
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package com.dmdirc.config.profiles;
+
+import com.dmdirc.interfaces.config.ConfigProvider;
+import com.dmdirc.interfaces.config.ConfigProviderListener;
+import com.dmdirc.interfaces.config.IdentityController;
+import com.dmdirc.interfaces.config.IdentityFactory;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import java.util.stream.Collectors;
+
+import javax.inject.Inject;
+
+/**
+ * Manager for {@link Profile}s.
+ */
+public class ProfileManager implements ConfigProviderListener {
+
+    private final IdentityFactory identityFactory;
+    private final IdentityController identityController;
+    private final Collection<Profile> profiles;
+
+    @Inject
+    public ProfileManager(final IdentityController identityController,
+            final IdentityFactory identityFactory) {
+        this.identityFactory = identityFactory;
+        this.identityController = identityController;
+        profiles = new ArrayList<>();
+        final List<ConfigProvider> identities = identityController.getProvidersByType("profile");
+        profiles.addAll(identities.stream()
+                .map(identity -> new Profile(identityFactory, identity))
+                .collect(Collectors.toList()));
+    }
+
+    /**
+     * Starts this manager, registering listeners.
+     */
+    public void start() {
+        identityController.registerIdentityListener(this);
+    }
+
+    /**
+     * Stops this manager, unregistering listeners.
+     */
+    public void stop() {
+        identityController.unregisterIdentityListener(this);
+    }
+
+    /**
+     * Adds a profile to the manager.
+     *
+     * @param profile New profile to add
+     */
+    public void addProfile(final Profile profile) {
+        profiles.add(profile);
+    }
+
+    /**
+     * Removes a profile from the manager.
+     *
+     * @param profile Profile to be removed
+     */
+    public void deleteProfile(final Profile profile) {
+        profiles.remove(profile);
+    }
+
+    /**
+     * Returns the available profiles in the client.
+     *
+     * @return Unmodifiable collection of profiles
+     */
+    public Collection<Profile> getProfiles() {
+        return Collections.unmodifiableCollection(profiles);
+    }
+
+    @Override
+    public void configProviderAdded(final ConfigProvider configProvider) {
+        if (configProvider.isProfile()) {
+            profiles.removeIf(p-> p.equalsConfigProvider(configProvider));
+        }
+    }
+
+    @Override
+    public void configProviderRemoved(final ConfigProvider configProvider) {
+        if (configProvider.isProfile()) {
+            profiles.add(new Profile(identityFactory, configProvider));
+        }
+    }
+}

src/com/dmdirc/config/profiles/ProfileManagerLifeCycleManager.java

@@ -0,0 +1,52 @@
+/*
+ * Copyright (c) 2006-2014 DMDirc Developers
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package com.dmdirc.config.profiles;
+
+import com.dmdirc.interfaces.SystemLifecycleComponent;
+
+import javax.inject.Inject;
+import javax.inject.Singleton;
+
+/**
+ * Life cycle manager for the profile manager.
+ */
+@Singleton
+public class ProfileManagerLifeCycleManager implements SystemLifecycleComponent {
+
+    private final ProfileManager profileManager;
+
+    @Inject
+    public ProfileManagerLifeCycleManager(final ProfileManager profileManager) {
+        this.profileManager = profileManager;
+    }
+
+    @Override
+    public void startUp() {
+        profileManager.start();
+    }
+
+    @Override
+    public void shutDown() {
+        profileManager.stop();
+    }
+}

src/com/dmdirc/config/profiles/ProfilesModule.java

@@ -0,0 +1,41 @@
+/*
+ * Copyright (c) 2006-2014 DMDirc Developers
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package com.dmdirc.config.profiles;
+
+import com.dmdirc.interfaces.SystemLifecycleComponent;
+
+import dagger.Module;
+import dagger.Provides;
+
+/**
+ * Dagger module for profiles.
+ */
+@Module(library = true, complete = false)
+public class ProfilesModule {
+
+    @Provides(type = Provides.Type.SET)
+    public SystemLifecycleComponent getLifecycleComponent(
+            final ProfileManagerLifeCycleManager manager) {
+        return manager;
+    }
+}