Fixed method signature of dup() method in codec

Author: sjohnr

model/codec_java.gsl

@@ -564,30 +564,27 @@ public class $(ClassName)
     //  --------------------------------------------------------------------------
     //  Duplicate the $(ClassName) message
 
-    public $(ClassName) dup ($(ClassName) self)
+    public $(ClassName) dup ()
     {
-        if (self == null)
-            return null;
-
-        $(ClassName) copy = new $(ClassName) (self.id);
-        if (self.address != null)
-            copy.address = self.address.duplicate ();
-        switch (self.id) {
+        $(ClassName) copy = new $(ClassName) (this.id);
+        if (this.address != null)
+            copy.address = this.address.duplicate ();
+        switch (this.id) {
 .for class.message
         case $(MESSAGE.NAME):
 .   for field
 .       if type = "number"
-            copy.$(name) = self.$(name);
+            copy.$(name) = this.$(name);
 .       elsif type = "octets"
-            System.arraycopy (copy.$(name), 0, self.$(name), 0, $(size));
+            System.arraycopy (copy.$(name), 0, this.$(name), 0, $(size));
 .       elsif type = "string"
-            copy.$(name) = self.$(name);
+            copy.$(name) = this.$(name);
 .       elsif type = "strings"
-            copy.$(name) = new ArrayList <String> (self.$(name));
+            copy.$(name) = new ArrayList <String> (this.$(name));
 .       elsif type = "dictionary"
-            copy.$(name) = new HashMap <String, String> (self.$(name));
+            copy.$(name) = new HashMap <String, String> (this.$(name));
 .       elsif type = "frame"
-            copy.$(name) = self.$(name).duplicate ();
+            copy.$(name) = this.$(name).duplicate ();
 .       endif
 .   endfor
         break;

src/main/java/org/zyre/ZreGroup.java

@@ -80,7 +80,7 @@ public void leave (ZrePeer peer)
     public void send (ZreMsg msg)
     {
         for (ZrePeer peer: peers.values ())
-            peer.send (msg.dup (msg));
+            peer.send (msg.dup ());
 
         msg.destroy ();
     }

src/main/java/org/zyre/ZreLogMsg.java

@@ -368,22 +368,19 @@ public static void sendLog (
     //  --------------------------------------------------------------------------
     //  Duplicate the ZreLogMsg message
 
-    public ZreLogMsg dup (ZreLogMsg self)
+    public ZreLogMsg dup ()
     {
-        if (self == null)
-            return null;
-
-        ZreLogMsg copy = new ZreLogMsg (self.id);
-        if (self.address != null)
-            copy.address = self.address.duplicate ();
-        switch (self.id) {
+        ZreLogMsg copy = new ZreLogMsg (this.id);
+        if (this.address != null)
+            copy.address = this.address.duplicate ();
+        switch (this.id) {
         case LOG:
-            copy.level = self.level;
-            copy.event = self.event;
-            copy.node = self.node;
-            copy.peer = self.peer;
-            copy.time = self.time;
-            copy.data = self.data;
+            copy.level = this.level;
+            copy.event = this.event;
+            copy.node = this.node;
+            copy.peer = this.peer;
+            copy.time = this.time;
+            copy.data = this.data;
         break;
         }
         return copy;

src/main/java/org/zyre/ZreMsg.java

@@ -673,47 +673,44 @@ public static void sendPing_Ok (
     //  --------------------------------------------------------------------------
     //  Duplicate the ZreMsg message
 
-    public ZreMsg dup (ZreMsg self)
+    public ZreMsg dup ()
     {
-        if (self == null)
-            return null;
-
-        ZreMsg copy = new ZreMsg (self.id);
-        if (self.address != null)
-            copy.address = self.address.duplicate ();
-        switch (self.id) {
+        ZreMsg copy = new ZreMsg (this.id);
+        if (this.address != null)
+            copy.address = this.address.duplicate ();
+        switch (this.id) {
         case HELLO:
-            copy.sequence = self.sequence;
-            copy.ipaddress = self.ipaddress;
-            copy.mailbox = self.mailbox;
-            copy.groups = new ArrayList <String> (self.groups);
-            copy.status = self.status;
-            copy.headers = new HashMap <String, String> (self.headers);
+            copy.sequence = this.sequence;
+            copy.ipaddress = this.ipaddress;
+            copy.mailbox = this.mailbox;
+            copy.groups = new ArrayList <String> (this.groups);
+            copy.status = this.status;
+            copy.headers = new HashMap <String, String> (this.headers);
         break;
         case WHISPER:
-            copy.sequence = self.sequence;
-            copy.content = self.content.duplicate ();
+            copy.sequence = this.sequence;
+            copy.content = this.content.duplicate ();
         break;
         case SHOUT:
-            copy.sequence = self.sequence;
-            copy.group = self.group;
-            copy.content = self.content.duplicate ();
+            copy.sequence = this.sequence;
+            copy.group = this.group;
+            copy.content = this.content.duplicate ();
         break;
         case JOIN:
-            copy.sequence = self.sequence;
-            copy.group = self.group;
-            copy.status = self.status;
+            copy.sequence = this.sequence;
+            copy.group = this.group;
+            copy.status = this.status;
         break;
         case LEAVE:
-            copy.sequence = self.sequence;
-            copy.group = self.group;
-            copy.status = self.status;
+            copy.sequence = this.sequence;
+            copy.group = this.group;
+            copy.status = this.status;
         break;
         case PING:
-            copy.sequence = self.sequence;
+            copy.sequence = this.sequence;
         break;
         case PING_OK:
-            copy.sequence = self.sequence;
+            copy.sequence = this.sequence;
         break;
         }
         return copy;