Add YAML format store. Hook everything up.

src/com/dmdirc/ClientModule.java

@@ -45,6 +45,7 @@ import com.dmdirc.plugins.PluginModule;
 import com.dmdirc.ui.IconManager;
 import com.dmdirc.ui.messages.ColourManager;
 import com.dmdirc.ui.messages.ColourManagerFactory;
+import com.dmdirc.ui.messages.UiMessagesModule;
 import com.dmdirc.ui.themes.ThemeManager;
 import com.dmdirc.updater.UpdaterModule;
 import com.dmdirc.updater.manager.UpdateManager;
@@ -73,6 +74,7 @@ import dagger.Provides;
                 ConfigModule.class,
                 MessagesModule.class,
                 PluginModule.class,
+                UiMessagesModule.class,
                 UpdaterModule.class
         },
         library = true)

src/com/dmdirc/ui/messages/EventFormatter.java

@@ -26,6 +26,9 @@ import com.dmdirc.events.DisplayableEvent;
 
 import java.util.Optional;
 
+import javax.inject.Inject;
+import javax.inject.Singleton;
+
 /**
  * Formats an event into a text string, based on a user-defined template.
  *
@@ -38,6 +41,7 @@ import java.util.Optional;
  *
  * <p>Properties and functions are case-insensitive.
  */
+@Singleton
 public class EventFormatter {
 
     private static final String ERROR_STRING = "<FormatError>";
@@ -45,6 +49,7 @@ public class EventFormatter {
     private final EventPropertyManager propertyManager;
     private final EventTemplateProvider templateProvider;
 
+    @Inject
     public EventFormatter(final EventPropertyManager propertyManager,
             final EventTemplateProvider templateProvider) {
         this.propertyManager = propertyManager;

src/com/dmdirc/ui/messages/EventPropertyManager.java

@@ -33,7 +33,9 @@ import java.util.Optional;
 import java.util.function.Function;
 
 import javax.inject.Inject;
+import javax.inject.Singleton;
 
+@Singleton
 public class EventPropertyManager {
 
     private final DMDircMBassador eventBus;

src/com/dmdirc/ui/messages/UiMessagesModule.java

@@ -0,0 +1,53 @@
+/*
+ * 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.ui.messages;
+
+import com.dmdirc.DMDircMBassador;
+import com.dmdirc.commandline.CommandLineOptionsModule.Directory;
+
+import java.nio.file.Path;
+
+import javax.inject.Singleton;
+
+import dagger.Module;
+import dagger.Provides;
+
+import static com.dmdirc.commandline.CommandLineOptionsModule.DirectoryType.BASE;
+
+/**
+ * Dagger module for message related objects.
+ */
+@Module(library = true, complete = false)
+public class UiMessagesModule {
+
+    @Provides
+    @Singleton
+    public EventTemplateProvider getTemplateProvider(@Directory(BASE) final Path directory,
+            final DMDircMBassador eventBus) {
+        final YamlEventTemplateProvider provider =
+                new YamlEventTemplateProvider(directory.resolve("format.yml"), eventBus);
+        provider.load();
+        return provider;
+    }
+
+}

src/com/dmdirc/ui/messages/YamlEventTemplateProvider.java

@@ -0,0 +1,98 @@
+/*
+ * 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.ui.messages;
+
+import com.dmdirc.DMDircMBassador;
+import com.dmdirc.events.AppErrorEvent;
+import com.dmdirc.events.DisplayableEvent;
+import com.dmdirc.logger.ErrorLevel;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Optional;
+
+import com.esotericsoftware.yamlbeans.YamlReader;
+
+import static com.dmdirc.util.YamlReaderUtils.asMap;
+
+/**
+ * YAML-backed supplier of event templates.
+ */
+public class YamlEventTemplateProvider implements EventTemplateProvider {
+
+    /** The charset to use when reading and writing files. */
+    private static final String CHARSET = "UTF-8";
+
+    private final Path path;
+    private final DMDircMBassador eventBus;
+    private final Map<String, String> formats = new HashMap<>();
+
+    public YamlEventTemplateProvider(final Path path, final DMDircMBassador eventBus) {
+        this.path = path;
+        this.eventBus = eventBus;
+    }
+
+    public void load() {
+        formats.clear();
+
+        try (final InputStream stream = getClass().getResourceAsStream("format.yml")) {
+            load(stream);
+        } catch (IOException e) {
+            eventBus.publishAsync(new AppErrorEvent(ErrorLevel.LOW, e,
+                    "Unable to load default event templates", ""));
+        }
+
+        if (Files.exists(path)) {
+            try (final InputStream stream = Files.newInputStream(path)) {
+                load(stream);
+            } catch (IOException e) {
+                eventBus.publishAsync(new AppErrorEvent(ErrorLevel.LOW, e,
+                        "Unable to load event templates", ""));
+            }
+        }
+    }
+
+    private void load(final InputStream stream) {
+        try (final InputStreamReader reader = new InputStreamReader(stream, CHARSET)) {
+            final YamlReader yamlReader = new YamlReader(reader);
+            final Object root = yamlReader.read();
+            final Map<Object, Object> entries = asMap(root);
+            entries.forEach((k, v) -> formats.put(k.toString(), v.toString()));
+            yamlReader.close();
+        } catch (IOException e) {
+            eventBus.publishAsync(new AppErrorEvent(ErrorLevel.LOW, e,
+                    "Unable to load event templates", ""));
+        }
+    }
+
+    @Override
+    public Optional<String> getTemplate(final Class<? extends DisplayableEvent> eventType) {
+        return Optional.ofNullable(formats.get(eventType.getSimpleName()));
+    }
+
+}