From bf70109eeeb1515ffdf34deb0551700b3b6d203f Mon Sep 17 00:00:00 2001
From: Florian Dold <florian.dold@gmail.com>
Date: Wed, 9 Apr 2014 14:24:05 +0000
Subject: resolve message type clash

---
 src/main/java/org/gnunet/ext/GreetingRequestMessage.java  | 2 +-
 src/main/java/org/gnunet/ext/GreetingResponseMessage.java | 2 +-
 src/main/resources/org/gnunet/construct/MsgMap.txt        | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/main/java/org/gnunet/ext/GreetingRequestMessage.java b/src/main/java/org/gnunet/ext/GreetingRequestMessage.java
index eac18d5..2356639 100644
--- a/src/main/java/org/gnunet/ext/GreetingRequestMessage.java
+++ b/src/main/java/org/gnunet/ext/GreetingRequestMessage.java
@@ -10,7 +10,7 @@ import org.gnunet.util.GnunetMessage;
  *
  * @author Florian Dold
  */
-@UnionCase(42001)
+@UnionCase(43001)
 public class GreetingRequestMessage implements GnunetMessage.Body {
     @ZeroTerminatedString
     public String name;
diff --git a/src/main/java/org/gnunet/ext/GreetingResponseMessage.java b/src/main/java/org/gnunet/ext/GreetingResponseMessage.java
index 89c463d..837fef9 100644
--- a/src/main/java/org/gnunet/ext/GreetingResponseMessage.java
+++ b/src/main/java/org/gnunet/ext/GreetingResponseMessage.java
@@ -9,7 +9,7 @@ import org.gnunet.util.GnunetMessage;
  *
  * @author Florian Dold
  */
-@UnionCase(42002)
+@UnionCase(43002)
 public class GreetingResponseMessage implements GnunetMessage.Body {
     @ZeroTerminatedString
     public String greeting;
diff --git a/src/main/resources/org/gnunet/construct/MsgMap.txt b/src/main/resources/org/gnunet/construct/MsgMap.txt
index 9bd0911..3c7b423 100644
--- a/src/main/resources/org/gnunet/construct/MsgMap.txt
+++ b/src/main/resources/org/gnunet/construct/MsgMap.txt
@@ -1,4 +1,4 @@
-org.gnunet.util.GnunetMessage$Body|42001=org.gnunet.ext.GreetingRequestMessage
+org.gnunet.util.GnunetMessage$Body|43002=org.gnunet.ext.GreetingResponseMessage
 org.gnunet.util.GnunetMessage$Body|42003=org.gnunet.ext.GreetingBannedMessage
-org.gnunet.util.GnunetMessage$Body|42002=org.gnunet.ext.GreetingResponseMessage
-# generated 2014/04/09 16:18:53
+org.gnunet.util.GnunetMessage$Body|43001=org.gnunet.ext.GreetingRequestMessage
+# generated 2014/04/09 16:23:55
-- 
cgit v1.2.3