only Channel has packet accessors

cloudshift · Mar 12, 2012 · a2cad5b · a2cad5b
1 parent 2020726
commit a2cad5b
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 44 deletions.
diff --git a/cloudshift/channel/Flow.hx b/cloudshift/channel/Flow.hx
@@ -108,44 +108,6 @@ class Flow {
 
   #end
 
-  public static function
-  chanID(pkt:Pkt<Dynamic>) {
-    return pkt.m.ch;
-  }
-
-  public static function
-  operation(pkt:Pkt<Dynamic>) {
-    return pkt.m.op;
-  }
-
-  public static function
-  payload(pkt:Pkt<Dynamic>) {
-    return pkt.p;
-  }
-
-
-  public static function
-  setPayload(pkt:Pkt<Dynamic>,pl:Dynamic) {
-    pkt.p = pl;
-  }
-
-  public static function
-  sessID(pkt:Pkt<Dynamic>) {
-    return pkt.s;
-  }
-
-  public static function oldmeta(pkt:Pkt<Dynamic>) {
-    return pkt.m;
-  }
-
-  public static function meta(pkt:Pkt<Dynamic>):Dynamic {
-    return pkt.m.um;
-  }
-
-  public static function
-  createPkt<T>(userData:T,sessID:String,chan:String,op="m",meta:Dynamic=null):Pkt<T> {
-    return { p:userData,s:sessID,m:{ch:chan,op:op,um:meta} };
-  }
 
 
 }
diff --git a/cloudshift/channel/PipeImpl.hx b/cloudshift/channel/PipeImpl.hx
@@ -6,7 +6,7 @@ using cloudshift.Mixin;
 import cloudshift.Channel;
 import cloudshift.channel.Flow;
 
-using cloudshift.channel.Flow;
+using cloudshift.Channel;
 
 class PipeImpl<T> implements Chan<T> {
 

diff --git a/cloudshift/channel/PushClientImpl.hx b/cloudshift/channel/PushClientImpl.hx
@@ -66,7 +66,7 @@ class PushClientImpl implements Conduit {
   public function
   pump(sessID:String,userData:Dynamic,chanID:String,meta:Dynamic) {
     var
-      ud = Flow.createPkt(userData,_sessID,chanID,"m",meta),
+      ud = Channel.createPkt(userData,_sessID,chanID,"m",meta),
       pl = haxe.Serializer.run(ud),
       req = new haxe.Http(_url+Flow.PUSH);
 
@@ -137,7 +137,7 @@ class PushClientImpl implements Conduit {
   function
   client(cmd:String,userData:Dynamic,chanID:String,cb:Dynamic->Void) {
     var
-      ud = Flow.createPkt(userData,_sessID,chanID,cmd),
+      ud = Channel.createPkt(userData,_sessID,chanID,cmd),
       pl = haxe.Serializer.run(ud),
       req = new haxe.Http(_url+Flow.PUSH);
 

diff --git a/cloudshift/channel/PushListenerImpl.hx b/cloudshift/channel/PushListenerImpl.hx
@@ -11,7 +11,7 @@ import cloudshift.Http;
 import cloudshift.http.HttpImpl;
 import cloudshift.core.ObservableImpl;
 
-using cloudshift.channel.Flow;
+using cloudshift.Channel;
 using cloudshift.Mixin;
 
 import js.Node;

diff --git a/cloudshift/channel/ServerSinkImpl.hx b/cloudshift/channel/ServerSinkImpl.hx
@@ -67,7 +67,7 @@ class ServerSinkImpl extends SinkImpl {
      world */
 
   function myfill(payload,chanID,meta) {
-    _chans.get(chanID)._defaultFill(Flow.createPkt(payload,"server",chanID,meta),chanID,null);
+    _chans.get(chanID)._defaultFill(Channel.createPkt(payload,"server",chanID,meta),chanID,null);
   }
 
 }

diff --git a/cloudshift/channel/SinkImpl.hx b/cloudshift/channel/SinkImpl.hx
@@ -7,7 +7,7 @@ import cloudshift.channel.Flow;
 import cloudshift.core.ObservableImpl;
 using cloudshift.Mixin;
 
-using cloudshift.channel.Flow;
+using cloudshift.Channel;
 
 class SinkImpl implements Sink {
   public var part_:Part_<Conduit,String,Sink,SinkEvent>;