Issue 661

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

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

@@ -22,6 +22,8 @@
 
 package com.dmdirc.addons.dcc;
 
+import com.dmdirc.actions.ActionManager;
+import com.dmdirc.addons.dcc.actions.DCCActions;
 import com.dmdirc.Main;
 
 /**
@@ -72,7 +74,7 @@ public class DCCChatWindow extends DCCFrame implements DCCChatInterface {
 	public void sendLine(final String line) {
 		if (dcc.isWriteable()) {
 			final StringBuffer buff = new StringBuffer("DCCChatSelfMessage");
-			//ActionManager.processEvent(DCCActionType.DCC_CHAT_SELFMESSAGE, buff, this, line);
+			ActionManager.processEvent(DCCActions.DCC_CHAT_SELFMESSAGE, buff, this, line);
 			addLine(buff, nickname, myWindow.getTranscoder().encode(line));
 			dcc.sendLine(line);
 		} else {
@@ -90,7 +92,7 @@ public class DCCChatWindow extends DCCFrame implements DCCChatInterface {
     @Override
 	public void handleChatMessage(final DCCChat dcc, final String message) {
 		final StringBuffer buff = new StringBuffer("DCCChatMessage");
-		//ActionManager.processEvent(DCCActionType.DCC_CHAT_MESSAGE, buff, this, otherNickname, message);
+		ActionManager.processEvent(DCCActions.DCC_CHAT_MESSAGE, buff, this, otherNickname, message);
 		addLine(buff, otherNickname, myWindow.getTranscoder().encode(message));
 	}
 	
@@ -102,7 +104,7 @@ public class DCCChatWindow extends DCCFrame implements DCCChatInterface {
     @Override
 	public void socketClosed(final DCCChat dcc) {
 		final StringBuffer buff = new StringBuffer("DCCChatInfo");
-		//ActionManager.processEvent(DCCActionType.DCC_CHAT_SOCKETCLOSED, buff, this);
+		ActionManager.processEvent(DCCActions.DCC_CHAT_SOCKETCLOSED, buff, this);
 		addLine(buff, "Socket closed");
 	}
 	
@@ -114,7 +116,7 @@ public class DCCChatWindow extends DCCFrame implements DCCChatInterface {
     @Override
 	public void socketOpened(final DCCChat dcc) {
 		final StringBuffer buff = new StringBuffer("DCCChatInfo");
-		//ActionManager.processEvent(DCCActionType.DCC_CHAT_SOCKETOPENED, buff, this);
+		ActionManager.processEvent(DCCActions.DCC_CHAT_SOCKETOPENED, buff, this);
 		addLine(buff, "Socket opened");
 	}
 	

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

@@ -23,12 +23,16 @@
 package com.dmdirc.addons.dcc;
 
 import com.dmdirc.Main;
+import com.dmdirc.Server;
 import com.dmdirc.parser.IRCParser;
 import com.dmdirc.config.IdentityManager;
 import com.dmdirc.commandparser.CommandManager;
 import com.dmdirc.commandparser.commands.GlobalCommand;
 import com.dmdirc.ui.interfaces.InputWindow;
 
+import com.dmdirc.actions.ActionManager;
+import com.dmdirc.addons.dcc.actions.DCCActions;
+
 import javax.swing.JFileChooser;
 import javax.swing.JFrame;
 
@@ -67,13 +71,16 @@ public final class DCCCommand extends GlobalCommand {
 			final String type = args[0];
 			final String target = args[1];
 			if (type.equalsIgnoreCase("chat")) {
-				final IRCParser parser = origin.getContainer().getServer().getParser();
+				final Server server = origin.getContainer().getServer();
+				final IRCParser parser = server.getParser();
 				final String myNickname = parser.getMyNickname();
 				final DCCChat chat = new DCCChat();
 				chat.listen();
 				final DCCChatWindow window = new DCCChatWindow(myPlugin, chat, "*Chat: "+target, myNickname, target);
 				parser.sendCTCP(target, "DCC", "CHAT chat "+DCC.ipToLong(chat.getHost())+" "+chat.getPort());
 				
+				ActionManager.processEvent(DCCActions.DCC_CHAT_REQUEST_SENT, null, server, target);
+				
 				sendLine(origin, isSilent, "DCCChatStarting", target, chat.getHost(), chat.getPort());
 				window.getFrame().addLine("DCCChatStarting", target, chat.getHost(), chat.getPort());
 			} else if (type.equalsIgnoreCase("send")) {

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

@@ -44,6 +44,8 @@ import com.dmdirc.ui.WindowManager;
 import com.dmdirc.ui.swing.components.JWrappingLabel;
 import com.dmdirc.ui.swing.components.TextFrame;
 
+import com.dmdirc.addons.dcc.actions.DCCActions;
+
 import java.io.File;
 import java.io.IOException;
 
@@ -226,6 +228,7 @@ public final class DCCPlugin extends Plugin implements ActionListener {
 						f.getFrame().addLine("DCCChatStarting", nickname, chat.getHost(), chat.getPort());
 						chat.connect();
 					} else {
+						ActionManager.processEvent(DCCActions.DCC_CHAT_REQUEST, null, ((Server)arguments[0]), nickname);
 						askQuestion("User "+nickname+" on "+((Server)arguments[0]).toString()+" would like to start a DCC Chat with you.\n\nDo you want to continue?", "DCC Chat Request", JOptionPane.YES_OPTION, type, format, arguments);
 						return;
 					}
@@ -428,6 +431,7 @@ public final class DCCPlugin extends Plugin implements ActionListener {
 		}
 
 		command = new DCCCommand(this);
+		ActionManager.registerActionTypes(DCCActions.values());
 		ActionManager.addListener(this, CoreActionType.SERVER_CTCP);
 	}
 

src/com/dmdirc/addons/dcc/actions/DccActions.java → src/com/dmdirc/addons/dcc/actions/DCCActions.java

@@ -27,41 +27,49 @@ import com.dmdirc.actions.interfaces.ActionType;
 
 /**
  * DCC actions.
- * 
+ *
  * @author chris
  */
-public enum DccActions implements ActionType {
-    
-    /** Chat request. */
-    DCC_CHAT_REQUEST(DccEvents.DCC_CHAT_REQUEST, "Chat request"),
-    /** File offered. */
-    DCC_FILE_OFFERED(DccEvents.DCC_FILE_REQUEST, "File offered");
-    
-    /** The type of this action. */
-    private final ActionMetaType type;
-    
-    /** The name of this action. */
-    private final String name;
-    
-    /**
-     * Constructs a new core action.
-     * @param type The type of this action
-     * @param name The name of this action
-     */
-    DccActions(final ActionMetaType type, final String name) {
-        this.type = type;
-        this.name = name;
-    }
-    
-    /** {@inheritDoc} */
-    @Override
-    public ActionMetaType getType() {
-        return type;
-    }
-    
-    /** {@inheritDoc} */
-    @Override
-    public String getName() {
-        return name;
-    }
+public enum DCCActions implements ActionType {
+	
+	/** DCC Chat Request. */
+	DCC_CHAT_REQUEST(DCCEvents.DCC_CHAT_REQUEST, "DCC Chat Requested"),
+	/** DCC Chat Request Sent. */
+	DCC_CHAT_REQUEST_SENT(DCCEvents.DCC_CHAT_REQUEST_SENT, "DCC Chat Request Sent"),
+	/** DCC Message from another person. */
+	DCC_CHAT_MESSAGE(DCCEvents.DCC_CHAT_MESSAGE, "DCC Chat Message Recieved"),
+	/** DCC Message to another person. */
+	DCC_CHAT_SELFMESSAGE(DCCEvents.DCC_CHAT_SELFMESSAGE, "DCC Chat Message Sent"),
+	/** DCC Chat Socket Opened. */
+	DCC_CHAT_SOCKETCLOSED(DCCEvents.DCC_CHAT_SOCKETCLOSED, "DCC Chat Socket Closed"),
+	/** DCC Chat Socket Closed. */
+	DCC_CHAT_SOCKETOPENED(DCCEvents.DCC_CHAT_SOCKETOPENED, "DCC Chat Socket Opened");
+	
+	/** The type of this action. */
+	private final ActionMetaType type;
+	
+	/** The name of this action. */
+	private final String name;
+	
+	/**
+	 * Constructs a new core action.
+	 * @param type The type of this action
+	 * @param name The name of this action
+	 */
+	DCCActions(final ActionMetaType type, final String name) {
+		this.type = type;
+		this.name = name;
+	}
+	
+	/** {@inheritDoc} */
+	@Override
+	public ActionMetaType getType() {
+		return type;
+	}
+	
+	/** {@inheritDoc} */
+	@Override
+	public String getName() {
+		return name;
+	}
 }

src/com/dmdirc/addons/dcc/actions/DCCEvents.java

@@ -0,0 +1,86 @@
+/*
+ * Copyright (c) 2006-2008 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.addons.dcc.actions;
+
+import com.dmdirc.Server;
+import com.dmdirc.actions.interfaces.ActionMetaType;
+import com.dmdirc.parser.ClientInfo;
+
+import com.dmdirc.addons.dcc.DCCChatWindow;
+
+/**
+ * Defines DCC-related events.
+ *
+ * @author Chris
+ */
+public enum DCCEvents implements ActionMetaType {
+	/** DCC Chat Request. */
+	DCC_CHAT_REQUEST(new String[]{"server", "client"}, Server.class, String.class),
+	/** DCC Chat Request Sent. */
+	DCC_CHAT_REQUEST_SENT(new String[]{"server", "client"}, Server.class, String.class),
+	/** DCC Message from another person. */
+	DCC_CHAT_MESSAGE(new String[]{"DCCChatWindow", "Nickname", "Message"}, DCCChatWindow.class, String.class, String.class),
+	/** DCC Message to another person. */
+	DCC_CHAT_SELFMESSAGE(new String[]{"DCCChatWindow", "Message"}, DCCChatWindow.class, String.class),
+	/** DCC Chat Socket Opened. */
+	DCC_CHAT_SOCKETCLOSED(new String[]{"DCCChatWindow"}, DCCChatWindow.class),
+	/** DCC Chat Socket Closed. */
+	DCC_CHAT_SOCKETOPENED(new String[]{"DCCChatWindow"}, DCCChatWindow.class);
+    
+	/** The names of the arguments for this meta type. */
+	private String[] argNames;
+	/** The classes of the arguments for this meta type. */
+	private Class[] argTypes;
+	
+	/**
+	 * Creates a new instance of this meta-type.
+	 *
+	 * @param argNames The names of the meta-type's arguments
+	 * @param argTypes The types of the meta-type's arguments
+	 */
+	DCCEvents(final String[] argNames, final Class ... argTypes) {
+		this.argNames = argNames;
+		this.argTypes = argTypes;
+	}
+	
+	/** {@inheritDoc} */
+	public int getArity() {
+		return argNames.length;
+	}
+	
+	/** {@inheritDoc} */
+	public Class[] getArgTypes() {
+		return argTypes;
+	}
+	
+	/** {@inheritDoc} */
+	public String[] getArgNames() {
+		return argNames;
+	}
+	
+	/** {@inheritDoc} */
+	public String getGroup() {
+		return "DCC Events";
+	}
+	
+}

src/com/dmdirc/addons/dcc/actions/DccEvents.java

@@ -1,77 +0,0 @@
-/*
- * Copyright (c) 2006-2008 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.addons.dcc.actions;
-
-import com.dmdirc.Server;
-import com.dmdirc.actions.interfaces.ActionMetaType;
-import com.dmdirc.parser.ClientInfo;
-
-/**
- * Defines DCC-related events.
- *
- * @author Chris
- */
-public enum DccEvents implements ActionMetaType {
-
-    /** Chat request. */
-    DCC_CHAT_REQUEST(new String[]{"server", "client"}, Server.class, ClientInfo.class),
-    /** File transfer request. */
-    DCC_FILE_REQUEST(new String[]{"server", "client", "file name"}, Server.class, ClientInfo.class, String.class);
-    
-    /** The names of the arguments for this meta type. */
-    private String[] argNames;
-    /** The classes of the arguments for this meta type. */
-    private Class[] argTypes;
-    
-    /**
-     * Creates a new instance of this meta-type.
-     *
-     * @param argNames The names of the meta-type's arguments
-     * @param argTypes The types of the meta-type's arguments
-     */
-    DccEvents(final String[] argNames, final Class ... argTypes) {
-        this.argNames = argNames;
-        this.argTypes = argTypes;
-    }
-    
-    /** {@inheritDoc} */
-    public int getArity() {
-        return argNames.length;
-    }
-    
-    /** {@inheritDoc} */
-    public Class[] getArgTypes() {
-        return argTypes;
-    }
-    
-    /** {@inheritDoc} */
-    public String[] getArgNames() {
-        return argNames;
-    }
-    
-    /** {@inheritDoc} */
-    public String getGroup() {
-        return "DCC Events";
-    }    
-    
-}

src/com/dmdirc/addons/dcc/plugin.info

@@ -5,4 +5,6 @@ description=Adds DCC Support to dmdirc
 name=dcc
 nicename=DCC Plugin
 minversion=0
-require-ui=com.dmdirc.ui.swing
+require-ui=com.dmdirc.ui.swing
+persistant-com.dmdirc.addons.dcc.actions.DCCActions=true
+persistant-com.dmdirc.addons.dcc.actions.DCCEvents=true