|
@@ -17,20 +17,16 @@
|
17
|
17
|
|
18
|
18
|
package com.dmdirc.config;
|
19
|
19
|
|
20
|
|
-import com.dmdirc.Precondition;
|
21
|
20
|
import com.dmdirc.config.provider.AggregateConfigProvider;
|
22
|
21
|
import com.dmdirc.config.provider.ConfigProvider;
|
23
|
22
|
import com.dmdirc.config.provider.ConfigProviderMigrator;
|
24
|
23
|
import com.dmdirc.interfaces.config.IdentityController;
|
25
|
24
|
import com.dmdirc.interfaces.config.IdentityFactory;
|
26
|
|
-import com.dmdirc.util.ClientInfo;
|
27
|
25
|
import com.dmdirc.util.io.ConfigFile;
|
28
|
26
|
import com.dmdirc.util.io.FileUtils;
|
29
|
27
|
import com.dmdirc.util.io.InvalidConfigFileException;
|
30
|
|
-
|
31
|
28
|
import com.google.common.collect.ArrayListMultimap;
|
32
|
29
|
import com.google.common.collect.Multimap;
|
33
|
|
-
|
34
|
30
|
import java.io.IOException;
|
35
|
31
|
import java.lang.ref.WeakReference;
|
36
|
32
|
import java.net.URISyntaxException;
|
|
@@ -46,7 +42,6 @@ import java.util.Map;
|
46
|
42
|
import java.util.Objects;
|
47
|
43
|
import java.util.concurrent.ConcurrentHashMap;
|
48
|
44
|
import java.util.stream.Collectors;
|
49
|
|
-
|
50
|
45
|
import org.slf4j.Logger;
|
51
|
46
|
import org.slf4j.LoggerFactory;
|
52
|
47
|
|
|
@@ -86,8 +81,6 @@ public class IdentityManager implements IdentityFactory, IdentityController {
|
86
|
81
|
*/
|
87
|
82
|
private final Multimap<String, WeakReference<ConfigProviderListener>> listeners =
|
88
|
83
|
ArrayListMultimap.create();
|
89
|
|
- /** Client info objecty. */
|
90
|
|
- private final ClientInfo clientInfo;
|
91
|
84
|
/** The identity file used for the global config. */
|
92
|
85
|
private ConfigFileBackedConfigProvider config;
|
93
|
86
|
/** The identity file used for addon defaults. */
|
|
@@ -103,11 +96,9 @@ public class IdentityManager implements IdentityFactory, IdentityController {
|
103
|
96
|
* @param baseDirectory The BASE config directory.
|
104
|
97
|
* @param identitiesDirectory The directory to store identities in.
|
105
|
98
|
*/
|
106
|
|
- public IdentityManager(final Path baseDirectory, final Path identitiesDirectory,
|
107
|
|
- final ClientInfo clientInfo) {
|
|
99
|
+ public IdentityManager(final Path baseDirectory, final Path identitiesDirectory) {
|
108
|
100
|
this.configDirectory = baseDirectory;
|
109
|
101
|
this.identitiesDirectory = identitiesDirectory;
|
110
|
|
- this.clientInfo = clientInfo;
|
111
|
102
|
}
|
112
|
103
|
|
113
|
104
|
/**
|
|
@@ -203,10 +194,6 @@ public class IdentityManager implements IdentityFactory, IdentityController {
|
203
|
194
|
*
|
204
|
195
|
* @param dir The directory to be loaded
|
205
|
196
|
*/
|
206
|
|
- @Precondition({
|
207
|
|
- "The specified File is not null",
|
208
|
|
- "The specified File is a directory"
|
209
|
|
- })
|
210
|
197
|
private void loadUser(final Path dir) {
|
211
|
198
|
checkNotNull(dir);
|
212
|
199
|
checkArgument(Files.isDirectory(dir));
|
|
@@ -648,8 +635,7 @@ public class IdentityManager implements IdentityFactory, IdentityController {
|
648
|
635
|
@Override
|
649
|
636
|
public ConfigProviderMigrator createMigratableConfig(final String protocol,
|
650
|
637
|
final String ircd, final String network, final String server) {
|
651
|
|
- final ConfigManager configManager = new ConfigManager(clientInfo, this, protocol,
|
652
|
|
- ircd, network, server);
|
|
638
|
+ final ConfigManager configManager = new ConfigManager(this, protocol, ircd, network, server);
|
653
|
639
|
setUpConfigManager(configManager);
|
654
|
640
|
return new ConfigManagerMigrator(configManager);
|
655
|
641
|
}
|
|
@@ -657,8 +643,7 @@ public class IdentityManager implements IdentityFactory, IdentityController {
|
657
|
643
|
@Override
|
658
|
644
|
public ConfigProviderMigrator createMigratableConfig(final String protocol,
|
659
|
645
|
final String ircd, final String network, final String server, final String channel) {
|
660
|
|
- final ConfigManager configManager = new ConfigManager(clientInfo, this, protocol,
|
661
|
|
- ircd, network, server, channel);
|
|
646
|
+ final ConfigManager configManager = new ConfigManager(this, protocol, ircd, network, server, channel);
|
662
|
647
|
setUpConfigManager(configManager);
|
663
|
648
|
return new ConfigManagerMigrator(configManager);
|
664
|
649
|
}
|
|
@@ -666,8 +651,7 @@ public class IdentityManager implements IdentityFactory, IdentityController {
|
666
|
651
|
@Override
|
667
|
652
|
public AggregateConfigProvider createAggregateConfig(final String protocol, final String ircd,
|
668
|
653
|
final String network, final String server) {
|
669
|
|
- final ConfigManager configManager = new ConfigManager(clientInfo, this, protocol,
|
670
|
|
- ircd, network, server);
|
|
654
|
+ final ConfigManager configManager = new ConfigManager(this, protocol, ircd, network, server);
|
671
|
655
|
setUpConfigManager(configManager);
|
672
|
656
|
return configManager;
|
673
|
657
|
}
|
|
@@ -675,8 +659,7 @@ public class IdentityManager implements IdentityFactory, IdentityController {
|
675
|
659
|
@Override
|
676
|
660
|
public AggregateConfigProvider createAggregateConfig(final String protocol, final String ircd,
|
677
|
661
|
final String network, final String server, final String channel) {
|
678
|
|
- final ConfigManager configManager = new ConfigManager(clientInfo, this, protocol,
|
679
|
|
- ircd, network, server, channel);
|
|
662
|
+ final ConfigManager configManager = new ConfigManager(this, protocol, ircd, network, server, channel);
|
680
|
663
|
setUpConfigManager(configManager);
|
681
|
664
|
return configManager;
|
682
|
665
|
}
|