From 6bcc23a5d06dabf6fb2c7684e80f1e939ae2a7a4 Mon Sep 17 00:00:00 2001
From: Mark van Renswoude <mark@x2software.net>
Date: Wed, 12 Jan 2022 20:57:30 +0100
Subject: [PATCH] Add prefix to CorrelationId to better indicate it's a reply

---
 PettingZoo/UI/Tab/Publisher/PublisherViewModel.cs        | 2 +-
 .../UI/Tab/Publisher/PublisherViewStrings.Designer.cs    | 9 +++++++++
 PettingZoo/UI/Tab/Publisher/PublisherViewStrings.resx    | 7 +++++--
 3 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/PettingZoo/UI/Tab/Publisher/PublisherViewModel.cs b/PettingZoo/UI/Tab/Publisher/PublisherViewModel.cs
index 303da36..d26b84f 100644
--- a/PettingZoo/UI/Tab/Publisher/PublisherViewModel.cs
+++ b/PettingZoo/UI/Tab/Publisher/PublisherViewModel.cs
@@ -283,7 +283,7 @@ namespace PettingZoo.UI.Tab.Publisher
             if (ReplyToSpecified)
                 return string.IsNullOrEmpty(ReplyTo) ? null : ReplyTo;
 
-            correlationId = SendToExchange ? RoutingKey : Queue;
+            correlationId = PublisherViewStrings.ReplyToCorrelationIdPrefix + (SendToExchange ? RoutingKey : Queue);
             return tabFactory.CreateReplySubscriberTab(connection);
         }
 
diff --git a/PettingZoo/UI/Tab/Publisher/PublisherViewStrings.Designer.cs b/PettingZoo/UI/Tab/Publisher/PublisherViewStrings.Designer.cs
index e26fe49..99ff390 100644
--- a/PettingZoo/UI/Tab/Publisher/PublisherViewStrings.Designer.cs
+++ b/PettingZoo/UI/Tab/Publisher/PublisherViewStrings.Designer.cs
@@ -168,6 +168,15 @@ namespace PettingZoo.UI.Tab.Publisher {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Re: .
+        /// </summary>
+        public static string ReplyToCorrelationIdPrefix {
+            get {
+                return ResourceManager.GetString("ReplyToCorrelationIdPrefix", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Publish: {0}.
         /// </summary>
diff --git a/PettingZoo/UI/Tab/Publisher/PublisherViewStrings.resx b/PettingZoo/UI/Tab/Publisher/PublisherViewStrings.resx
index d28e7b3..9c10050 100644
--- a/PettingZoo/UI/Tab/Publisher/PublisherViewStrings.resx
+++ b/PettingZoo/UI/Tab/Publisher/PublisherViewStrings.resx
@@ -112,10 +112,10 @@
     <value>2.0</value>
   </resheader>
   <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <data name="CommandPublish" xml:space="preserve">
     <value>Publish</value>
@@ -153,6 +153,9 @@
   <data name="OptionMessageTypeTapeti" xml:space="preserve">
     <value>Tapeti message</value>
   </data>
+  <data name="ReplyToCorrelationIdPrefix" xml:space="preserve">
+    <value>Re: </value>
+  </data>
   <data name="TabTitle" xml:space="preserve">
     <value>Publish: {0}</value>
   </data>