Mostly cosmetic

Rename variables, better inline docs, remove redundancies

Author: Emile Joubert

projects/client/Apigen/src/apigen/AmqpField.cs

@@ -70,13 +70,5 @@ public string Domain {
                 return result;
             }
         }
-
-        public bool Reserved
-        {
-            get
-            {
-                return GetString("@reserved", "") == "1";
-            }
-        }
     }
 }

projects/client/Apigen/src/apigen/Apigen.cs

@@ -103,15 +103,19 @@ public static int GetInt(XmlNode n0, string path) {
             return int.Parse(GetString(n0, path));
         }
 
-        private static string xmlStringMapper(string name)
+        /// <summary>
+        /// Rename all instances of an entire string from the XML spec
+        /// </summary>
+        /// <param name="xmlString">input string from XML spec</param>
+        /// <returns>renamed string</returns>
+        private static string xmlStringMapper(string xmlString)
         {
-            switch (name)
+            switch (xmlString)
             {
                 case "no-wait":
                     return "nowait";
                 default:
-                    return name;
-
+                    return xmlString;
             }
         }
 
@@ -300,7 +304,6 @@ public void ParseSpec() {
                 {
                     m_revision = GetInt(m_spec, "/amqp/@revision");
                 }
-
             }
             foreach (XmlNode n in m_spec.SelectNodes("/amqp/constant")) {
                 m_constants.Add(new DictionaryEntry(GetString(n, "@name"), GetInt(n, "@value")));
@@ -440,7 +443,7 @@ public void EmitPublic() {
             EmitLine("    ///<summary>Protocol minor version (= "+m_minorVersion+")</summary>");
             EmitLine("    public override int MinorVersion { get { return " + m_minorVersion + "; } }");
             EmitLine("    ///<summary>Protocol revision (= " + m_revision + ")</summary>");
-            EmitLine("    public override int? Revision { get { return " + m_revision + "; } }");
+            EmitLine("    public override int Revision { get { return " + m_revision + "; } }");
             EmitLine("    ///<summary>Protocol API name (= "+m_apiName+")</summary>");
             EmitLine("    public override string ApiName { get { return \"" + m_apiName + "\"; } }");
             int port = GetInt(m_spec, "/amqp/@port");

projects/client/RabbitMQ.Client/src/client/api/IProtocol.cs

@@ -67,7 +67,7 @@ public interface IProtocol
         ///<summary>Retrieve the protocol's minor version number</summary>
         int MinorVersion { get; }
         ///<summary>Retrieve the protocol's revision (if specified)</summary>
-        int? Revision { get; }
+        int Revision { get; }
         ///<summary>Retrieve the protocol's API name, used for
         ///printing, configuration properties, IDE integration,
         ///Protocols.cs etc.</summary>

projects/client/RabbitMQ.Client/src/client/impl/AbstractProtocolBase.cs

@@ -62,7 +62,7 @@ namespace RabbitMQ.Client.Impl {
     public abstract class AbstractProtocolBase: IProtocol {
         public abstract int MajorVersion { get; }
         public abstract int MinorVersion { get; }
-        public abstract int? Revision { get; }
+        public abstract int Revision { get; }
         public abstract string ApiName { get; }
         public abstract int DefaultPort { get; }
         public abstract bool SupportsRedirect { get; }

projects/client/RabbitMQ.Client/src/client/impl/BasicProperties.cs

@@ -56,7 +56,6 @@
 //---------------------------------------------------------------------------
 using System;
 using System.Collections;
-using RabbitMQ.Client.Apigen.Attributes;
 
 namespace RabbitMQ.Client.Impl
 {