ConfigProviderListeners aren't public.

src/main/java/com/dmdirc/config/ConfigManager.java

@@ -25,7 +25,6 @@ package com.dmdirc.config;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.interfaces.config.ConfigChangeListener;
 import com.dmdirc.interfaces.config.ConfigProvider;
-import com.dmdirc.interfaces.config.ConfigProviderListener;
 import com.dmdirc.interfaces.config.ConfigProviderMigrator;
 import com.dmdirc.util.ClientInfo;
 import com.dmdirc.util.validators.Validator;

src/main/java/com/dmdirc/interfaces/config/ConfigProviderListener.java → src/main/java/com/dmdirc/config/ConfigProviderListener.java

@@ -20,9 +20,9 @@
  * SOFTWARE.
  */
 
-package com.dmdirc.interfaces.config;
+package com.dmdirc.config;
 
-import com.dmdirc.config.ConfigFileBackedConfigProvider;
+import com.dmdirc.interfaces.config.IdentityController;
 
 /**
  * An interface of objects which are interested in config providers being added and removed from the
@@ -30,7 +30,7 @@ import com.dmdirc.config.ConfigFileBackedConfigProvider;
  *
  * @since 0.6.4
  */
-public interface ConfigProviderListener {
+interface ConfigProviderListener {
 
     /**
      * Called whenever a relevant new config provider is added to the associated

src/main/java/com/dmdirc/config/IdentityManager.java

@@ -25,7 +25,6 @@ package com.dmdirc.config;
 import com.dmdirc.Precondition;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.interfaces.config.ConfigProvider;
-import com.dmdirc.interfaces.config.ConfigProviderListener;
 import com.dmdirc.interfaces.config.ConfigProviderMigrator;
 import com.dmdirc.interfaces.config.IdentityController;
 import com.dmdirc.interfaces.config.IdentityFactory;
@@ -399,13 +398,12 @@ public class IdentityManager implements IdentityFactory, IdentityController {
         }
     }
 
-    @Override
-    public void registerIdentityListener(final ConfigProviderListener listener) {
+    private void registerIdentityListener(final ConfigProviderListener listener) {
         registerIdentityListener(null, listener);
     }
 
-    @Override
-    public void unregisterIdentityListener(final ConfigProviderListener listener) {
+    // TODO: It feels like this method should be called at some point...
+    private void unregisterIdentityListener(final ConfigProviderListener listener) {
         synchronized (listeners) {
             listeners.entries().stream().filter(e -> {
                 final ConfigProviderListener value = e.getValue().get();
@@ -414,8 +412,7 @@ public class IdentityManager implements IdentityFactory, IdentityController {
         }
     }
 
-    @Override
-    public void registerIdentityListener(final String type, final ConfigProviderListener listener) {
+    private void registerIdentityListener(final String type, final ConfigProviderListener listener) {
         checkNotNull(listener);
 
         synchronized (listeners) {
@@ -603,7 +600,7 @@ public class IdentityManager implements IdentityFactory, IdentityController {
      * @throws InvalidIdentityFileException If the settings are invalid
      * @since 0.6.3m1
      */
-    protected ConfigFileBackedConfigProvider createIdentity(
+    private ConfigFileBackedConfigProvider createIdentity(
             final Map<String, Map<String, String>> settings)
             throws IOException, InvalidIdentityFileException {
         if (!settings.containsKey(IDENTITY_DOMAIN)

src/main/java/com/dmdirc/interfaces/config/IdentityController.java

@@ -89,34 +89,6 @@ public interface IdentityController {
      */
     void addConfigProvider(final ConfigFileBackedConfigProvider identity);
 
-    /**
-     * Adds a new identity listener which will be informed of all settings identities which are
-     * added to this manager.
-     *
-     * @param listener The listener to be added
-     *
-     * @since 0.6.4
-     */
-    void registerIdentityListener(ConfigProviderListener listener);
-
-    /**
-     * Adds a new identity listener which will be informed of all identities of the specified custom
-     * type which are added to this manager.
-     *
-     * @param type     The type of identities to listen for
-     * @param listener The listener to be added
-     *
-     * @since 0.6.4
-     */
-    void registerIdentityListener(String type, ConfigProviderListener listener);
-
-    /**
-     * Unregisters the given identity listener.
-     *
-     * @param listener The listener to be removed
-     */
-    void unregisterIdentityListener(ConfigProviderListener listener);
-
     /**
      * Saves all modified identity files to disk.
      */