diff options
Diffstat (limited to 'src/ProtocolBuffers/FieldSet.cs')
| -rw-r--r-- | src/ProtocolBuffers/FieldSet.cs | 57 |
1 files changed, 22 insertions, 35 deletions
diff --git a/src/ProtocolBuffers/FieldSet.cs b/src/ProtocolBuffers/FieldSet.cs index 18e57662..f3c08cf5 100644 --- a/src/ProtocolBuffers/FieldSet.cs +++ b/src/ProtocolBuffers/FieldSet.cs @@ -144,17 +144,19 @@ namespace Google.ProtocolBuffers }
#if !LITE
- /// <summary>
- /// Force coercion to full descriptor dictionary.
- /// </summary>
- internal IDictionary<Descriptors.FieldDescriptor, object> AllFieldDescriptors
+ /// <summary>
+ /// Force coercion to full descriptor dictionary.
+ /// </summary>
+ internal IDictionary<FieldDescriptor, object> AllFieldDescriptors
{
get
{
- SortedList<Descriptors.FieldDescriptor, object> copy =
- new SortedList<Google.ProtocolBuffers.Descriptors.FieldDescriptor, object>();
+ SortedList<FieldDescriptor, object> copy =
+ new SortedList<FieldDescriptor, object>();
foreach (KeyValuePair<IFieldDescriptorLite, object> fd in fields)
- copy.Add((Descriptors.FieldDescriptor) fd.Key, fd.Value);
+ {
+ copy.Add((FieldDescriptor) fd.Key, fd.Value);
+ }
return Dictionaries.AsReadOnly(copy);
}
}
@@ -390,13 +392,15 @@ namespace Google.ProtocolBuffers }
#if !LITE
- /// <summary>
- /// See <see cref="IBuilder{TMessage, TBuilder}.MergeFrom(IMessageLite)" />
- /// </summary>
+ /// <summary>
+ /// See <see cref="IBuilder{TMessage, TBuilder}.MergeFrom(IMessageLite)" />
+ /// </summary>
public void MergeFrom(IMessage other)
{
- foreach (KeyValuePair<Descriptors.FieldDescriptor, object> fd in other.AllFields)
+ foreach (KeyValuePair<FieldDescriptor, object> fd in other.AllFields)
+ {
MergeField(fd.Key, fd.Value);
+ }
}
#endif
@@ -470,7 +474,7 @@ namespace Google.ProtocolBuffers {
if (field.IsExtension && field.MessageSetWireFormat)
{
- output.WriteMessageSetExtension(field.FieldNumber, field.Name, (IMessageLite)value);
+ output.WriteMessageSetExtension(field.FieldNumber, field.Name, (IMessageLite) value);
}
else
{
@@ -478,30 +482,13 @@ namespace Google.ProtocolBuffers {
IEnumerable valueList = (IEnumerable) value;
if (field.IsPacked)
+ {
output.WritePackedArray(field.FieldType, field.FieldNumber, field.Name, valueList);
- //{
- // output.WriteTag(field.FieldNumber, WireFormat.WireType.LengthDelimited);
- // // Compute the total data size so the length can be written.
- // int dataSize = 0;
- // foreach (object element in valueList)
- // {
- // dataSize += CodedOutputStream.ComputeFieldSizeNoTag(field.FieldType, element);
- // }
- // output.WriteRawVarint32((uint) dataSize);
- // // Write the data itself, without any tags.
- // foreach (object element in valueList)
- // {
- // output.WriteFieldNoTag(field.FieldType, element);
- // }
- //}
+ }
else
+ {
output.WriteArray(field.FieldType, field.FieldNumber, field.Name, valueList);
- //{
- // foreach (object element in valueList)
- // {
- // output.WriteField(field.FieldType, field.FieldNumber, field.Name, element);
- // }
- //}
+ }
}
else
{
@@ -629,8 +616,8 @@ namespace Google.ProtocolBuffers // field name and other useful info in the exception.
string message = "Wrong object type used with protocol message reflection.";
#if !LITE
- Google.ProtocolBuffers.Descriptors.FieldDescriptor fieldinfo =
- field as Google.ProtocolBuffers.Descriptors.FieldDescriptor;
+ FieldDescriptor fieldinfo =
+ field as FieldDescriptor;
if (fieldinfo != null)
{
message += "Message type \"" + fieldinfo.ContainingType.FullName;
|