Remove some deprecated methods/usages

Change-Id: I76bc17f1475105c02df8f917066bf043963776f5
Reviewed-on: http://gerrit.dmdirc.com/1517
Reviewed-by: Greg Holmes <greg@dmdirc.com>
Automatic-Compile: Greg Holmes <greg@dmdirc.com>

src/com/dmdirc/commandparser/CommandType.java

@@ -22,13 +22,6 @@
 
 package com.dmdirc.commandparser;
 
-import com.dmdirc.commandparser.commands.ChannelCommand;
-import com.dmdirc.commandparser.commands.ChatCommand;
-import com.dmdirc.commandparser.commands.Command;
-import com.dmdirc.commandparser.commands.GlobalCommand;
-import com.dmdirc.commandparser.commands.QueryCommand;
-import com.dmdirc.commandparser.commands.ServerCommand;
-
 /**
  * Defines the possible targets for commands.
  * 
@@ -46,31 +39,6 @@ public enum CommandType {
     TYPE_CHANNEL,
     /** A query command. */
     TYPE_QUERY;
-   
-    /**
-     * Looks up the command type for the specified command, by inspecting its
-     * class.
-     * 
-     * @param command The command to look up
-     * @return The type of the specified command
-     * @deprecated Shouldn't be required any longer
-     */
-    @Deprecated
-    public static CommandType fromCommand(final Command command) {
-        if (command instanceof GlobalCommand) {
-            return TYPE_GLOBAL;
-        } else if (command instanceof ServerCommand) {
-            return TYPE_SERVER;
-        } else if (command instanceof ChatCommand) {
-            return TYPE_CHAT;
-        } else if (command instanceof ChannelCommand) {
-            return TYPE_CHANNEL;
-        } else if (command instanceof QueryCommand) {
-            return TYPE_QUERY;
-        } else {
-            return null;
-        }
-    }
 
     /**
      * Retrieves an array of component types that make up this command type.

src/com/dmdirc/ui/input/TabCompleter.java

@@ -25,7 +25,7 @@ package com.dmdirc.ui.input;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandInfo;
 import com.dmdirc.commandparser.CommandManager;
-import com.dmdirc.commandparser.commands.ChannelCommand;
+import com.dmdirc.commandparser.CommandType;
 import com.dmdirc.commandparser.commands.Command;
 import com.dmdirc.commandparser.commands.IntelligentCommand;
 import com.dmdirc.commandparser.commands.IntelligentCommand.IntelligentCommandContext;
@@ -254,7 +254,7 @@ public class TabCompleter {
                         Arrays.asList(args.getArguments()), partial));
             }
 
-            if (command.getValue() instanceof ChannelCommand) {
+            if (command.getKey().getType().equals(CommandType.TYPE_CHANNEL)) {
                 if (targets == null) {
                     targets = new AdditionalTabTargets();
                 }

test/com/dmdirc/commandparser/CommandTypeTest.java

@@ -1,71 +0,0 @@
-/*
- * Copyright (c) 2006-2010 Chris Smith, Shane Mc Cormack, Gregory Holmes
- *
- * 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;
-
-import com.dmdirc.commandparser.commands.ChannelCommand;
-import com.dmdirc.commandparser.commands.ChatCommand;
-import com.dmdirc.commandparser.commands.Command;
-import com.dmdirc.commandparser.commands.GlobalCommand;
-import com.dmdirc.commandparser.commands.QueryCommand;
-import com.dmdirc.commandparser.commands.ServerCommand;
-import org.junit.Test;
-import static org.junit.Assert.*;
-import static org.mockito.Mockito.*;
-
-public class CommandTypeTest {
-
-    @Test
-    public void testGlobal() {
-        final Command command = mock(GlobalCommand.class);
-        assertEquals(CommandType.TYPE_GLOBAL, CommandType.fromCommand(command));
-    }
-    
-    @Test
-    public void testServer() {
-        final Command command = mock(ServerCommand.class);
-        assertEquals(CommandType.TYPE_SERVER, CommandType.fromCommand(command));
-    }
-    
-    @Test
-    public void testChat() {
-        final Command command = mock(ChatCommand.class);
-        assertEquals(CommandType.TYPE_CHAT, CommandType.fromCommand(command));
-    }    
-    
-    @Test
-    public void testChannel() {
-        final Command command = mock(ChannelCommand.class);
-        assertEquals(CommandType.TYPE_CHANNEL, CommandType.fromCommand(command));
-    }
-    
-    @Test
-    public void testQuery() {
-        final Command command = mock(QueryCommand.class);
-        assertEquals(CommandType.TYPE_QUERY, CommandType.fromCommand(command));
-    }
-    
-    @Test
-    public void testOther() {
-        assertNull(CommandType.fromCommand(null));
-    }
-
-}