fix commends from Jon Skeet

3 files changed, 9 insertions, 20 deletions

diff --git a/csharp/src/ProtocolBuffers/Descriptors/FileDescriptor.cs b/csharp/src/ProtocolBuffers/Descriptors/FileDescriptor.cs
index 8a3e26fa..307e9dd7 100644
--- a/csharp/src/ProtocolBuffers/Descriptors/FileDescriptor.cs
+++ b/csharp/src/ProtocolBuffers/Descriptors/FileDescriptor.cs
@@ -54,20 +54,15 @@ namespace Google.ProtocolBuffers.Descriptors
         private readonly IList<FileDescriptor> publicDependencies;

         private readonly DescriptorPool pool;

 

-        public enum Syntax

+        public enum ProtoSyntax

         {

-            UNKNOWN,

             PROTO2,

             PROTO3

         }

 

-        public Syntax GetSyntax()

+        public ProtoSyntax Syntax

         {

-            if (proto.Syntax == "proto3")

-            {

-                return Syntax.PROTO3;

-            }

-            return Syntax.PROTO2;

+            get { return proto.Syntax == "proto3" ? ProtoSyntax.PROTO3 : ProtoSyntax.PROTO2; }

         }

 

         private FileDescriptor(FileDescriptorProto proto, FileDescriptor[] dependencies, DescriptorPool pool, bool allowUnknownDependencies)

diff --git a/csharp/src/ProtocolBuffers/FieldAccess/FieldAccessorTable.cs b/csharp/src/ProtocolBuffers/FieldAccess/FieldAccessorTable.cs
index 60b032e2..d5c6c9cf 100644
--- a/csharp/src/ProtocolBuffers/FieldAccess/FieldAccessorTable.cs
+++ b/csharp/src/ProtocolBuffers/FieldAccess/FieldAccessorTable.cs
@@ -68,11 +68,7 @@ namespace Google.ProtocolBuffers.FieldAccess
         {

             this.descriptor = descriptor;

             accessors = new IFieldAccessor<TMessage, TBuilder>[descriptor.Fields.Count];

-            bool supportFieldPresence = false;

-            if (descriptor.File.GetSyntax() == FileDescriptor.Syntax.PROTO2)

-            {

-                supportFieldPresence = true;

-            }

+            bool supportFieldPresence = descriptor.File.Syntax == FileDescriptor.ProtoSyntax.PROTO2;

             for (int i = 0; i < accessors.Length; i++)

             {

                 accessors[i] = CreateAccessor(descriptor.Fields[i], propertyNames[i], supportFieldPresence);

diff --git a/csharp/src/ProtocolBuffers/FieldAccess/SinglePrimitiveAccessor.cs b/csharp/src/ProtocolBuffers/FieldAccess/SinglePrimitiveAccessor.cs
index b964066d..df9dedaf 100644
--- a/csharp/src/ProtocolBuffers/FieldAccess/SinglePrimitiveAccessor.cs
+++ b/csharp/src/ProtocolBuffers/FieldAccess/SinglePrimitiveAccessor.cs
@@ -58,9 +58,8 @@ namespace Google.ProtocolBuffers.FieldAccess
             get { return clrType; }

         }

 

-        internal SinglePrimitiveAccessor(FieldDescriptor fieldDesriptor, string name, bool supportFieldPresence)

+        internal SinglePrimitiveAccessor(FieldDescriptor fieldDescriptor, string name, bool supportFieldPresence)

         {

-            field = fieldDesriptor;

             PropertyInfo messageProperty = typeof(TMessage).GetProperty(name, null, ReflectionUtil.EmptyTypes);

             PropertyInfo builderProperty = typeof(TBuilder).GetProperty(name, null, ReflectionUtil.EmptyTypes);

             MethodInfo clearMethod = typeof(TBuilder).GetMethod("Clear" + name);

@@ -77,8 +76,11 @@ namespace Google.ProtocolBuffers.FieldAccess
                     throw new ArgumentException("Has properties not available");

                 }

                 hasDelegate = ReflectionUtil.CreateDelegateFunc<TMessage, bool>(hasProperty.GetGetMethod());

+            } else

+            {

+                hasDelegate = message => !GetValue(message).Equals(fieldDescriptor.DefaultValue);

             }

-            

+

             clrType = messageProperty.PropertyType;

             clearDelegate = ReflectionUtil.CreateDelegateFunc<TBuilder, IBuilder>(clearMethod);

             getValueDelegate = ReflectionUtil.CreateUpcastDelegate<TMessage>(messageProperty.GetGetMethod());

@@ -87,10 +89,6 @@ namespace Google.ProtocolBuffers.FieldAccess
 

         public bool Has(TMessage message)

         {

-            if (hasDelegate == null)

-            {

-                return !GetValue(message).Equals(field.DefaultValue);

-            }

             return hasDelegate(message);

         }