PopupManager: now non-stupid

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

src/com/dmdirc/commandparser/PopupManager.java

@@ -24,6 +24,7 @@ package com.dmdirc.commandparser;
 
 import com.dmdirc.config.ConfigManager;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -42,20 +43,31 @@ public class PopupManager {
     
     /**
      * 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
+     * 
      * @return A map of "friendly names" to commands (without command characters)
      */
     public static Map<String, String> getMenuItems(final PopupType menuType,
-            final ConfigManager configManager) {
+            final ConfigManager configManager, final Object ... arguments) {
         final Map<String, String> res = new HashMap<String, String>();
         
+        int dividerCount = 0;
+        
         for (String domain : menuType.getDomains()) {
-            for (String option : configManager.getOptions(domain)) {
-                final String command = configManager.getOption(domain, option);
-                if (!command.isEmpty()) {
-                    res.put(option, command);
+            final List<String> commands = configManager.getOptionList("popups", domain);
+            
+            for (String command : commands) {
+                if ("-".equals(command)) {
+                    res.put("divider" + (++dividerCount), "-");
+                } else {
+                    final String name = command.substring(0, command.indexOf(':'));
+                    final String value = command.substring(command.indexOf(':'));
+                    
+                    res.put(name, String.format(value, arguments));
                 }
             }
         }

src/com/dmdirc/commandparser/PopupType.java

@@ -30,14 +30,33 @@ package com.dmdirc.commandparser;
  */
 public enum PopupType {
     
-    /** The menu that appears when right clicking in a channel's nicklist. */
-    CHAN_NICKLIST("chan-nick-list", "chan-nick", "nick"),
-    /** The menu that appears when right clicking on a nickname in normal channel text. */
-    CHAN_NICKTEXT("chan-nick-text", "chan-nick", "nick", "chan"),
-    /** The menu that appears when right clicking in a channel window. */
+    /**
+     * The menu that appears when right clicking in a channel's nicklist.
+     * 
+     * Expected arguments: the nickname of the user who was clicked on.
+     */
+    CHAN_NICKLIST("nick", "chan-nick", "chan-nick-list"),
+    
+    /**
+     * The menu that appears when right clicking on a nickname in normal channel text.
+     * 
+     * Expected arguments: the nickname of the user who was clicked on.
+     */
+    CHAN_NICKTEXT("nick", "chan-nick", "chan-nick-text"),
+    
+    /**
+     * The menu that appears when right clicking in a channel window.
+     * 
+     * Expected arguments: none.
+     */
     CHAN_CHAN("chan"),
-    /** The menu that appears when right clicking in a query window. */
-    QUERY_QUERY("query", "nick");
+    
+    /**
+     * The menu that appears when right clicking in a query window.
+     * 
+     * Expected arguments: the nickname of the user who the query is with.
+     */
+    QUERY_QUERY("nick", "query");
     
     private final String[] domains;
     

src/com/dmdirc/config/ConfigManager.java

@@ -242,7 +242,8 @@ public final class ConfigManager implements Serializable, ConfigChangeListener {
     }
     
     /**
-     * Returns the name of all the options in the specified domain.
+     * Returns the name of all the options in the specified domain. If the
+     * domain doesn't exist, an empty list is returned.
      *
      * @param domain The domain to search
      * @return A list of options in the specified domain

src/com/dmdirc/config/defaults/defaults

@@ -105,4 +105,7 @@ updater.lastcheck=0
         
 actions.textcolour=12
 actions.eventcolour=3
-actions.highlightcolour=4
+actions.highlightcolour=4
+
+popups.nick=Query:query %1$s\nWhois:whois %1$s
+popups.chan-nick=\n-\nBan:ban %1$s\nKick:kick %1$s