Remove some deprecated methods

git-svn-id: http://svn.dmdirc.com/trunk@3120 00569f92-eb28-0410-84fd-f71c24880f

src/com/dmdirc/commandparser/CommandManager.java

@@ -65,12 +65,6 @@ public final class CommandManager {
     /** A list of command parsers that have been instansiated. */
     private static final MapList<CommandType, CommandParser> parsers
             = new MapList<CommandType, CommandParser>();
-           
-    /**
-     * Channel commands that have been registered to appear in the nicklist
-     * popup.
-     */
-    private static List<Command> channelPopupCommands = new WeakList<Command>();
     
     /** The command char we're using. */
     private static char commandChar = IdentityManager.getGlobalConfig()
@@ -229,29 +223,7 @@ public final class CommandManager {
             completer.removeEntry(name);
         }
     }
-    
-    /**
-     * Registers a command for use in the nicklist popup.
-     * 
-     * @param command The command to be registered
-     * @deprecated Should be done via the new popup config instead
-     */
-    @Deprecated
-    public static void registerPopupCommand(final Command command) {
-        channelPopupCommands.add(command);
-    }
-    
-    /**
-     * Retrieves the commands for use in the nicklist popup.
-     * 
-     * @return A list of commands suitable for use in the nicklist popup
-     * @deprecated Should be done via the new popup config instead
-     */
-    @Deprecated
-    public static List<Command> getNicklistCommands() {
-        return channelPopupCommands;
-    }
-    
+        
     /**
      * Instansiates the default commands.
      */
@@ -293,7 +265,7 @@ public final class CommandManager {
         new RawServerCommand("map");
         new RawServerCommand("motd");
         new RawServerCommand("oper");
-        registerPopupCommand(new RawServerCommand("whois"));
+        new RawServerCommand("whois");
         new RawServerCommand("who");
         
         // Query commands

src/com/dmdirc/commandparser/PopupManager.java

@@ -45,53 +45,6 @@ public class PopupManager {
         // Shouldn't be instansiated.
     }
     
-    /**
-     * Retrieves a map of the menu items that should be in a certain menu type.
-     * If the command is equal to "-", the entry should be treated as a divider.
-     *
-     * @param menuType The type of menu that is being built
-     * @param configManager The config manager for the current context
-     * @param arguments Any arguments appropriate for the menuType
-     * @deprecated in favour of getMenu
-     * 
-     * @return A map of "friendly names" to commands (without command characters)
-     */
-    @Precondition({
-        "The specified PopupType is not null",
-        "The specified ConfigManager is not null"
-    })
-    @Deprecated
-    public static Map<String, String> getMenuItems(final PopupType menuType,
-            final ConfigManager configManager, final Object ... arguments) {
-        assert(menuType != null);
-        assert(configManager != null);
-        
-        final Map<String, String> res = new LinkedHashMap<String, String>();
-        
-        int dividerCount = 0;
-        
-        for (String domain : menuType.getDomains()) {
-            final List<String> commands = configManager.getOptionList("popups", domain);
-            
-            for (String command : commands) {
-                if ("-".equals(command)) {
-                    res.put("divider" + (++dividerCount), "-");
-                } else if (command.indexOf(':') > 0) {
-                    final String name = command.substring(0, command.indexOf(':'));
-                    final String value = command.substring(command.indexOf(':') + 1);
-                    
-                    res.put(name, String.format(value, arguments));
-                } else if (!command.isEmpty()) {
-                    Logger.userError(ErrorLevel.LOW, "Invalid command in "
-                            + "popup menu configuration. Menu: " + domain
-                            + ", Command: " + command);
-                }
-            }
-        }
-        
-        return res;
-    }
-    
     /**
      * Returns the popup menu that should be used for the specified type.
      * Configuration data is read from the specified config manager.

src/com/dmdirc/commandparser/commands/channel/Ban.java

@@ -31,6 +31,7 @@ import com.dmdirc.ui.interfaces.InputWindow;
 
 /**
  * The kick command bans a specified user or host from the channel.
+ * 
  * @author chris
  */
 public final class Ban extends ChannelCommand {
@@ -40,17 +41,10 @@ public final class Ban extends ChannelCommand {
         super();
         
         CommandManager.registerCommand(this);
-        CommandManager.registerPopupCommand(this);
     }
     
-    /**
-     * Executes this command.
-     * @param origin The frame in which this command was issued
-     * @param server The server object that this command is associated with
-     * @param channel The channel object that this command is associated with
-     * @param isSilent Whether this command is silenced or not
-     * @param args The user supplied arguments
-     */
+    /** {@inheritDoc} */
+    @Override
     public void execute(final InputWindow origin, final Server server,
             final Channel channel, final boolean isSilent, final String... args) {
         if (args.length == 0) {
@@ -68,17 +62,20 @@ public final class Ban extends ChannelCommand {
         server.getParser().sendLine("MODE " + channel + " +b " + host);
     }
     
-    /** {@inheritDoc}. */
+    /** {@inheritDoc} */
+    @Override
     public String getName() {
         return "ban";
     }
     
-    /** {@inheritDoc}. */
+    /** {@inheritDoc} */
+    @Override
     public boolean showInHelp() {
         return true;
     }
     
-    /** {@inheritDoc}. */
+    /** {@inheritDoc} */
+    @Override
     public String getHelp() {
         return "ban <user|host> - bans the specified user or host from the channel.";
     }

src/com/dmdirc/commandparser/commands/server/OpenQuery.java

@@ -40,7 +40,6 @@ public final class OpenQuery extends ServerCommand {
         super();
         
         CommandManager.registerCommand(this);
-        CommandManager.registerPopupCommand(this);
     }
     
     /** {@inheritDoc} */

src/com/dmdirc/plugins/PluginManager.java

@@ -159,8 +159,8 @@ public class PluginManager {
 	 * Reload all plugins.
 	 */
 	public void reloadAllPlugins() {
-		for (String pluginName : getFilenames()) {
-			reloadPlugin(pluginName);
+		for (PluginInfo pluginInfo : getPluginInfos()) {
+			reloadPlugin(pluginInfo.getFilename());
 		}
 	}
 
@@ -198,22 +198,6 @@ public class PluginManager {
 		return myDir;
 	}
 
-	/**
-	 * Get string[] of known plugin file names.
-	 *
-	 * @return string[] of known plugin file names.
-	 * @deprecated Pointless method. Iterate getPluginInfos instead.
-	 */
-	@Deprecated
-	public String[] getFilenames() {
-		final String[] result = new String[knownPlugins.size()];
-		int i = 0;
-		for (String name : knownPlugins.keySet()) {
-			result[i++] = knownPlugins.get(name).getFilename();
-		}
-		return result;
-	}
-
 	/**
 	 * Retrieves a list of all installed plugins.
 	 * Any file under the main plugin directory (~/.DMDirc/plugins or similar)