Browse Source

ConfigProviderListeners aren't public.

pull/709/head
Chris Smith 7 years ago
parent
commit
ad7868c5c2

src/main/java/com/dmdirc/interfaces/config/ConfigProvider.java → api/src/main/java/com/dmdirc/interfaces/config/ConfigProvider.java View File


+ 0
- 1
src/main/java/com/dmdirc/config/ConfigManager.java View File

25
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
25
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
26
 import com.dmdirc.interfaces.config.ConfigChangeListener;
26
 import com.dmdirc.interfaces.config.ConfigChangeListener;
27
 import com.dmdirc.interfaces.config.ConfigProvider;
27
 import com.dmdirc.interfaces.config.ConfigProvider;
28
-import com.dmdirc.interfaces.config.ConfigProviderListener;
29
 import com.dmdirc.interfaces.config.ConfigProviderMigrator;
28
 import com.dmdirc.interfaces.config.ConfigProviderMigrator;
30
 import com.dmdirc.util.ClientInfo;
29
 import com.dmdirc.util.ClientInfo;
31
 import com.dmdirc.util.validators.Validator;
30
 import com.dmdirc.util.validators.Validator;

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

20
  * SOFTWARE.
20
  * SOFTWARE.
21
  */
21
  */
22
 
22
 
23
-package com.dmdirc.interfaces.config;
23
+package com.dmdirc.config;
24
 
24
 
25
-import com.dmdirc.config.ConfigFileBackedConfigProvider;
25
+import com.dmdirc.interfaces.config.IdentityController;
26
 
26
 
27
 /**
27
 /**
28
  * An interface of objects which are interested in config providers being added and removed from the
28
  * An interface of objects which are interested in config providers being added and removed from the
30
  *
30
  *
31
  * @since 0.6.4
31
  * @since 0.6.4
32
  */
32
  */
33
-public interface ConfigProviderListener {
33
+interface ConfigProviderListener {
34
 
34
 
35
     /**
35
     /**
36
      * Called whenever a relevant new config provider is added to the associated
36
      * Called whenever a relevant new config provider is added to the associated

+ 5
- 8
src/main/java/com/dmdirc/config/IdentityManager.java View File

25
 import com.dmdirc.Precondition;
25
 import com.dmdirc.Precondition;
26
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
26
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
27
 import com.dmdirc.interfaces.config.ConfigProvider;
27
 import com.dmdirc.interfaces.config.ConfigProvider;
28
-import com.dmdirc.interfaces.config.ConfigProviderListener;
29
 import com.dmdirc.interfaces.config.ConfigProviderMigrator;
28
 import com.dmdirc.interfaces.config.ConfigProviderMigrator;
30
 import com.dmdirc.interfaces.config.IdentityController;
29
 import com.dmdirc.interfaces.config.IdentityController;
31
 import com.dmdirc.interfaces.config.IdentityFactory;
30
 import com.dmdirc.interfaces.config.IdentityFactory;
399
         }
398
         }
400
     }
399
     }
401
 
400
 
402
-    @Override
403
-    public void registerIdentityListener(final ConfigProviderListener listener) {
401
+    private void registerIdentityListener(final ConfigProviderListener listener) {
404
         registerIdentityListener(null, listener);
402
         registerIdentityListener(null, listener);
405
     }
403
     }
406
 
404
 
407
-    @Override
408
-    public void unregisterIdentityListener(final ConfigProviderListener listener) {
405
+    // TODO: It feels like this method should be called at some point...
406
+    private void unregisterIdentityListener(final ConfigProviderListener listener) {
409
         synchronized (listeners) {
407
         synchronized (listeners) {
410
             listeners.entries().stream().filter(e -> {
408
             listeners.entries().stream().filter(e -> {
411
                 final ConfigProviderListener value = e.getValue().get();
409
                 final ConfigProviderListener value = e.getValue().get();
414
         }
412
         }
415
     }
413
     }
416
 
414
 
417
-    @Override
418
-    public void registerIdentityListener(final String type, final ConfigProviderListener listener) {
415
+    private void registerIdentityListener(final String type, final ConfigProviderListener listener) {
419
         checkNotNull(listener);
416
         checkNotNull(listener);
420
 
417
 
421
         synchronized (listeners) {
418
         synchronized (listeners) {
603
      * @throws InvalidIdentityFileException If the settings are invalid
600
      * @throws InvalidIdentityFileException If the settings are invalid
604
      * @since 0.6.3m1
601
      * @since 0.6.3m1
605
      */
602
      */
606
-    protected ConfigFileBackedConfigProvider createIdentity(
603
+    private ConfigFileBackedConfigProvider createIdentity(
607
             final Map<String, Map<String, String>> settings)
604
             final Map<String, Map<String, String>> settings)
608
             throws IOException, InvalidIdentityFileException {
605
             throws IOException, InvalidIdentityFileException {
609
         if (!settings.containsKey(IDENTITY_DOMAIN)
606
         if (!settings.containsKey(IDENTITY_DOMAIN)

+ 0
- 28
src/main/java/com/dmdirc/interfaces/config/IdentityController.java View File

89
      */
89
      */
90
     void addConfigProvider(final ConfigFileBackedConfigProvider identity);
90
     void addConfigProvider(final ConfigFileBackedConfigProvider identity);
91
 
91
 
92
-    /**
93
-     * Adds a new identity listener which will be informed of all settings identities which are
94
-     * added to this manager.
95
-     *
96
-     * @param listener The listener to be added
97
-     *
98
-     * @since 0.6.4
99
-     */
100
-    void registerIdentityListener(ConfigProviderListener listener);
101
-
102
-    /**
103
-     * Adds a new identity listener which will be informed of all identities of the specified custom
104
-     * type which are added to this manager.
105
-     *
106
-     * @param type     The type of identities to listen for
107
-     * @param listener The listener to be added
108
-     *
109
-     * @since 0.6.4
110
-     */
111
-    void registerIdentityListener(String type, ConfigProviderListener listener);
112
-
113
-    /**
114
-     * Unregisters the given identity listener.
115
-     *
116
-     * @param listener The listener to be removed
117
-     */
118
-    void unregisterIdentityListener(ConfigProviderListener listener);
119
-
120
     /**
92
     /**
121
      * Saves all modified identity files to disk.
93
      * Saves all modified identity files to disk.
122
      */
94
      */

Loading…
Cancel
Save