merge

1 files changed, 0 insertions, 33 deletions

diff --git a/Software/Visual_Studio/Tango.PMR/MessageFactory.cs b/Software/Visual_Studio/Tango.PMR/MessageFactory.cs
index d23970e88..75f0bb0a5 100644
--- a/Software/Visual_Studio/Tango.PMR/MessageFactory.cs
+++ b/Software/Visual_Studio/Tango.PMR/MessageFactory.cs
@@ -1,13 +1,11 @@
 using Google.Protobuf;
 using System;
 using System.Collections.Generic;
-using System.IO;
 using System.Linq;
 using System.Reflection;
 using System.Text;
 using System.Threading.Tasks;
 using Tango.PMR.Common;
-using Tango.PMR.Integration;
 
 namespace Tango.PMR
 {
@@ -38,16 +36,6 @@ namespace Tango.PMR
         }
 
         /// <summary>
-        /// Returns the matching PMR type from the PMR message type.
-        /// </summary>
-        /// <param name="messageType">Type of the message.</param>
-        /// <returns></returns>
-        public static Type GetPMRTypeFromMessageType(MessageType messageType)
-        {
-            return _pmrTypes[messageType];
-        }
-
-        /// <summary>
         /// Creates a new <see cref="TangoMessage{T}"/>.
         /// </summary>
         /// <typeparam name="T"></typeparam>
@@ -216,26 +204,5 @@ namespace Tango.PMR
         {
             return typeof(MessageFactory).Assembly.GetTypes().Where(x => x.Namespace != null && x.Namespace.Contains("Stubs") && !x.Name.Contains("Reflection")).ToList();
         }
-
-        /// <summary>
-        /// Parses the proto message from the specified bytes. Requires the message type.
-        /// </summary>
-        /// <param name="data">The data.</param>
-        /// <param name="type">The type.</param>
-        /// <returns></returns>
-        public static IMessage ParseProtoMessage(byte[] data, Type type)
-        {
-            using (MemoryStream ms = new MemoryStream(data))
-            {
-                ms.Position = 0;
-
-                using (BinaryReader reader = new BinaryReader(ms))
-                {
-                    IMessage message = Activator.CreateInstance(type) as IMessage;
-                    MessageParser parser = type.GetProperty("Parser").GetValue(message) as MessageParser;
-                    return parser.ParseFrom(data);
-                }
-            }
-        }
     }
 }