Merge pull request #775 from ShaneMcC/master

Add /reloadformat command.

src/main/java/com/dmdirc/commandparser/commands/CommandModule.java

@@ -38,6 +38,7 @@ import com.dmdirc.commandparser.commands.global.Ifplugin;
 import com.dmdirc.commandparser.commands.global.LoadPlugin;
 import com.dmdirc.commandparser.commands.global.NewServer;
 import com.dmdirc.commandparser.commands.global.OpenWindow;
+import com.dmdirc.commandparser.commands.global.ReloadFormat;
 import com.dmdirc.commandparser.commands.global.ReloadIdentities;
 import com.dmdirc.commandparser.commands.global.ReloadPlugin;
 import com.dmdirc.commandparser.commands.global.SaveConfig;
@@ -285,6 +286,11 @@ public class CommandModule {
         return new SimpleCommandDetails(command, SaveConfig.INFO);
     }
 
+    @Provides(type = Provides.Type.SET)
+    public CommandDetails getReloadFormatCommand(final ReloadFormat command) {
+        return new SimpleCommandDetails(command, ReloadFormat.INFO);
+    }
+
     @Provides(type = Provides.Type.SET)
     public CommandDetails getSetCommand(final SetCommand command) {
         return new SimpleCommandDetails(command, SetCommand.INFO);

src/main/java/com/dmdirc/commandparser/commands/global/ReloadFormat.java

@@ -0,0 +1,76 @@
+/*
+ * Copyright (c) 2006-2017 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.commandparser.commands.global;
+
+import com.dmdirc.commandparser.BaseCommandInfo;
+import com.dmdirc.commandparser.CommandArguments;
+import com.dmdirc.commandparser.CommandInfo;
+import com.dmdirc.commandparser.CommandType;
+import com.dmdirc.commandparser.commands.BaseCommand;
+import com.dmdirc.commandparser.commands.IntelligentCommand;
+import com.dmdirc.commandparser.commands.context.CommandContext;
+import com.dmdirc.interfaces.CommandController;
+import com.dmdirc.interfaces.WindowModel;
+import com.dmdirc.ui.input.AdditionalTabTargets;
+import com.dmdirc.ui.messages.EventFormatProvider;
+
+import javax.annotation.Nonnull;
+import javax.inject.Inject;
+
+/**
+ * Allows the user to save the config file.
+ */
+public final class ReloadFormat extends BaseCommand implements IntelligentCommand {
+
+    /**
+     * A command info object for this command.
+     */
+    public static final CommandInfo INFO = new BaseCommandInfo("reloadformat",
+            "reloadformat - force the client to reload the format.yml file",
+            CommandType.TYPE_GLOBAL);
+    /**
+     * Format provider for events.
+     */
+    private final EventFormatProvider formatProvider;
+
+    /**
+     * Creates a new instance of the {@link ReloadFormat} command.
+     *
+     * @param controller         The controller to use for command information.
+     */
+    @Inject
+    public ReloadFormat(final CommandController controller,
+                        final EventFormatProvider formatProvider) {
+        super(controller);
+        this.formatProvider = formatProvider;
+    }
+
+    @Override
+    public void execute(@Nonnull final WindowModel origin,
+                        final CommandArguments args, final CommandContext context) {
+        formatProvider.reload();
+        showOutput(origin, args.isSilent(), "Format file reloaded.");
+    }
+
+    @Override
+    public AdditionalTabTargets getSuggestions(final int arg,
+                                               final IntelligentCommandContext context) {
+        return new AdditionalTabTargets().excludeAll();
+    }
+
+}

src/main/java/com/dmdirc/ui/messages/EventFormatProvider.java

@@ -34,4 +34,8 @@ public interface EventFormatProvider {
      */
     Optional<EventFormat> getFormat(final Class<? extends DisplayableEvent> eventType);
 
+    /**
+     * Reload the formats for this provider.
+     */
+    void reload();
 }

src/main/java/com/dmdirc/ui/messages/MultiEventFormatProvider.java

@@ -53,4 +53,8 @@ public class MultiEventFormatProvider implements EventFormatProvider {
                 .map(Optional::get);
     }
 
+    @Override
+    public void reload() {
+        for (final EventFormatProvider evp : providers) { evp.reload(); }
+    }
 }

src/main/java/com/dmdirc/ui/messages/YamlEventFormatProvider.java

@@ -128,4 +128,8 @@ public class YamlEventFormatProvider implements EventFormatProvider {
         return Optional.ofNullable(formats.get(eventType.getSimpleName()));
     }
 
+    @Override
+    public void reload() {
+        load();
+    }
 }