FrameContainer.getConfigManager is now abstract, fix imports DF decided not to bother adding, add initial popup menu work

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

src/com/dmdirc/FrameContainer.java

@@ -100,16 +100,7 @@ public abstract class FrameContainer {
      *
      * @return the associated config manager
      */
-    public ConfigManager getConfigManager() {
-        if (getServer() == null) {
-            Logger.appError(ErrorLevel.LOW, "getConfigManager() called when" +
-                    "getServer() = null", new UnsupportedOperationException(
-                    "My name: " + toString()));
-            return IdentityManager.getGlobalConfig();
-        } else {
-            return getServer().getConfigManager();
-        }
-    }
+    public abstract ConfigManager getConfigManager();
 
     /**
      * Requests that this object's frame be activated.

src/com/dmdirc/Query.java

@@ -26,6 +26,7 @@ import com.dmdirc.actions.ActionManager;
 import com.dmdirc.actions.CoreActionType;
 import com.dmdirc.commandparser.CommandManager;
 import com.dmdirc.commandparser.CommandType;
+import com.dmdirc.config.ConfigManager;
 import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.logger.Logger;
 import com.dmdirc.parser.ClientInfo;
@@ -385,4 +386,10 @@ public final class Query extends MessageTarget implements
         Main.getUI().getMainWindow().setActiveFrame(window);
     }
     
+    /** {@inheritDoc} */
+    @Override
+    public ConfigManager getConfigManager() {
+        return server.getConfigManager();
+    }    
+    
 }

src/com/dmdirc/Raw.java

@@ -22,6 +22,7 @@
 
 package com.dmdirc;
 
+import com.dmdirc.config.ConfigManager;
 import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.logger.Logger;
 import com.dmdirc.parser.IRCParser;
@@ -139,4 +140,11 @@ public final class Raw extends WritableFrameContainer implements IDataIn,
     public int getMaxLineLength() {
         return server.getMaxLineLength();
     }
+
+    /** {@inheritDoc} */
+    @Override
+    public ConfigManager getConfigManager() {
+        return server.getConfigManager();
+    }
+    
 }

src/com/dmdirc/addons/dcc/DCCFrame.java

@@ -35,6 +35,8 @@ import com.dmdirc.commandparser.commands.GlobalCommand;
 
 import com.dmdirc.IconManager;
 import com.dmdirc.Server;
+import com.dmdirc.config.ConfigManager;
+import com.dmdirc.config.IdentityManager;
 import com.dmdirc.ui.WindowManager;
 import com.dmdirc.ui.interfaces.InputWindow;
 
@@ -234,5 +236,5 @@ public abstract class DCCFrame extends WritableFrameContainer {
 		myWindow.setVisible(false);
 		Main.getUI().getMainWindow().delChild(myWindow);
 		WindowManager.removeWindow(myWindow);
-	}
+	}   
 }

src/com/dmdirc/addons/logging/HistoryWindow.java

@@ -26,6 +26,7 @@ import com.dmdirc.FrameContainer;
 import com.dmdirc.IconManager;
 import com.dmdirc.Main;
 import com.dmdirc.Server;
+import com.dmdirc.config.ConfigManager;
 import com.dmdirc.config.IdentityManager;
 import com.dmdirc.ui.WindowManager;
 import com.dmdirc.ui.interfaces.Window;
@@ -99,4 +100,10 @@ public class HistoryWindow extends FrameContainer {
     public Server getServer() {
         return parent.getContainer().getServer();
     }
+    
+    /** {@inheritDoc} */
+    @Override
+    public ConfigManager getConfigManager() {
+        return parent.getConfigManager();
+    }    
 }

src/com/dmdirc/commandparser/PopupMenu.java

@@ -0,0 +1,49 @@
+/*
+ * Copyright (c) 2006-2007 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 java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+
+/**
+ *
+ * @author chris
+ */
+public class PopupMenu {
+    
+    private final List<PopupMenuItem> items = new ArrayList<PopupMenuItem>();
+    
+    public List<PopupMenuItem> getItems() {
+        return items;
+    }
+
+    public boolean add(final PopupMenuItem e) {
+        return items.add(e);
+    }
+
+    public boolean addAll(final Collection<? extends PopupMenuItem> c) {
+        return items.addAll(c);
+    }    
+
+}

src/com/dmdirc/commandparser/PopupMenuItem.java

@@ -0,0 +1,70 @@
+/*
+ * Copyright (c) 2006-2007 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;
+
+/**
+ *
+ * @author chris
+ */
+public class PopupMenuItem {
+    
+    private boolean divider = false;
+    private PopupMenu submenu = null;
+    private String name;
+    private String command;
+    
+    public PopupMenuItem() {
+        divider = true;
+    }
+    
+    public PopupMenuItem(final String name) {
+        this.name = name;
+        this.submenu = new PopupMenu();
+    }
+    
+    public PopupMenuItem(final String name, final String command) {
+        this.name = name;
+        this.command = command;
+    }
+    
+    public boolean isDivider() {
+        return divider;
+    }
+    
+    public boolean isSubMenu() {
+        return submenu != null;
+    }
+    
+    public PopupMenu getSubMenu() {
+        return submenu;
+    }
+    
+    public String getName() {
+        return name;
+    }
+    
+    public String getCommand(final Object... arguments) {
+        return CommandManager.getCommandChar() + String.format(command, arguments);
+    }
+
+}