Merge remote branch 'gimite/master' into hybi-08

Conflicts:
	WebSocketMain.swf
	WebSocketMainInsecure.zip

1 files changed, 33 insertions, 0 deletions

diff --git a/flash-src/net/gimite/websocket/WebSocketEvent.as b/flash-src/net/gimite/websocket/WebSocketEvent.as
new file mode 100644
index 0000000..aa17cac
--- /dev/null
+++ b/flash-src/net/gimite/websocket/WebSocketEvent.as
@@ -0,0 +1,33 @@
+package net.gimite.websocket {
+
+import flash.events.Event;
+
+/**
+ * This class represents a generic websocket event.  It contains the standard "type"
+ * parameter as well as a "message" parameter.
+ */
+public class WebSocketEvent extends Event {
+  
+  public static const OPEN:String = "open";
+  public static const CLOSE:String = "close";
+  public static const MESSAGE:String = "message";
+  public static const ERROR:String = "error";
+
+  public var message:String;
+  
+  public function WebSocketEvent(
+      type:String, message:String = null, bubbles:Boolean = false, cancelable:Boolean = false) {
+    super(type, bubbles, cancelable);
+    this.message = message;
+  }
+  
+  public override function clone():Event {
+    return new WebSocketEvent(this.type, this.message, this.bubbles, this.cancelable);
+  }
+  
+  public override function toString():String {
+    return "WebSocketEvent: " + this.type + ": " + this.message;
+  }
+}
+
+}