Merge pull request #499 from csmith/master

Remove Server State debug command.

debug/src/main/java/com/dmdirc/addons/debug/DebugModule.java

@@ -37,7 +37,6 @@ import com.dmdirc.addons.debug.commands.MemInfo;
 import com.dmdirc.addons.debug.commands.Notify;
 import com.dmdirc.addons.debug.commands.RunGC;
 import com.dmdirc.addons.debug.commands.ServerInfo;
-import com.dmdirc.addons.debug.commands.ServerState;
 import com.dmdirc.addons.debug.commands.Services;
 import com.dmdirc.addons.debug.commands.ShowRaw;
 import com.dmdirc.addons.debug.commands.StatusbarMessage;
@@ -118,11 +117,6 @@ public class DebugModule {
         return command;
     }
 
-    @Provides(type = Provides.Type.SET)
-    public DebugCommand getCommand(final ServerState command) {
-        return command;
-    }
-
     @Provides(type = Provides.Type.SET)
     public DebugCommand getCommand(final Services command) {
         return command;

debug/src/main/java/com/dmdirc/addons/debug/commands/ServerState.java

@@ -1,75 +0,0 @@
-/*
- * Copyright (c) 2006-2015 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.addons.debug.commands;
-
-import com.dmdirc.addons.debug.Debug;
-import com.dmdirc.addons.debug.DebugCommand;
-import com.dmdirc.commandparser.CommandArguments;
-import com.dmdirc.commandparser.commands.context.CommandContext;
-import com.dmdirc.interfaces.Connection;
-import com.dmdirc.interfaces.WindowModel;
-
-import java.util.Optional;
-
-import javax.annotation.Nonnull;
-import javax.inject.Inject;
-import javax.inject.Provider;
-
-/**
- * Outputs server state information.
- */
-public class ServerState extends DebugCommand {
-
-    /**
-     * Creates a new instance of the command.
-     *
-     * @param commandProvider The provider to use to access the main debug command.
-     */
-    @Inject
-    public ServerState(final Provider<Debug> commandProvider) {
-        super(commandProvider);
-    }
-
-    @Override
-    public String getName() {
-        return "serverstate";
-    }
-
-    @Override
-    public String getUsage() {
-        return " - Outputs server state information";
-    }
-
-    @Override
-    public void execute(@Nonnull final WindowModel origin,
-            final CommandArguments args, final CommandContext context) {
-        final Optional<Connection> optionalConnection = origin.getConnection();
-        if (optionalConnection.isPresent()) {
-            showOutput(origin, args.isSilent(),
-                    optionalConnection.get().getStatus().getTransitionHistory());
-        } else {
-            showError(origin, args.isSilent(), "This window isn't connected to a server");
-        }
-    }
-
-}