|
@@ -37,17 +37,24 @@ import static com.dmdirc.commandline.CommandLineOptionsModule.DirectoryType.BASE
|
37
|
37
|
/**
|
38
|
38
|
* Dagger module for message related objects.
|
39
|
39
|
*/
|
|
40
|
+@SuppressWarnings("TypeMayBeWeakened")
|
40
|
41
|
@Module(library = true, complete = false)
|
41
|
42
|
public class UiMessagesModule {
|
42
|
43
|
|
43
|
44
|
@Provides
|
44
|
45
|
@Singleton
|
45
|
|
- public EventFormatProvider getTemplateProvider(
|
|
46
|
+ public MultiEventFormatProvider getTemplateProvider(
|
46
|
47
|
@Directory(BASE) final Path directory,
|
47
|
48
|
@GlobalConfig final ColourManager colourManager) {
|
48
|
|
- final YamlEventFormatProvider provider =
|
|
49
|
+ final YamlEventFormatProvider yamlProvider =
|
49
|
50
|
new YamlEventFormatProvider(directory.resolve("format.yml"), colourManager);
|
50
|
|
- provider.load();
|
|
51
|
+ yamlProvider.load();
|
|
52
|
+ return new MultiEventFormatProvider(yamlProvider);
|
|
53
|
+ }
|
|
54
|
+
|
|
55
|
+ @Provides
|
|
56
|
+ @Singleton
|
|
57
|
+ public EventFormatProvider getTemplateProvider(final MultiEventFormatProvider provider) {
|
51
|
58
|
return provider;
|
52
|
59
|
}
|
53
|
60
|
|