From 0dabc77f7f5e835705cf452a4cbe81148a7d0b73 Mon Sep 17 00:00:00 2001 From: Jon Skeet Date: Thu, 4 Sep 2008 14:41:09 +0100 Subject: Renamed GeneratedRepeatException to GeneratedRepeatExtension --- csharp/ProtocolBuffers/GeneratedRepeatException.cs | 57 ---------------------- csharp/ProtocolBuffers/GeneratedRepeatExtension.cs | 57 ++++++++++++++++++++++ csharp/ProtocolBuffers/ProtocolBuffers.csproj | 2 +- 3 files changed, 58 insertions(+), 58 deletions(-) delete mode 100644 csharp/ProtocolBuffers/GeneratedRepeatException.cs create mode 100644 csharp/ProtocolBuffers/GeneratedRepeatExtension.cs (limited to 'csharp') diff --git a/csharp/ProtocolBuffers/GeneratedRepeatException.cs b/csharp/ProtocolBuffers/GeneratedRepeatException.cs deleted file mode 100644 index ae711bd2..00000000 --- a/csharp/ProtocolBuffers/GeneratedRepeatException.cs +++ /dev/null @@ -1,57 +0,0 @@ -// Protocol Buffers - Google's data interchange format -// Copyright 2008 Google Inc. -// http://code.google.com/p/protobuf/ -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. -using System; -using System.Collections.Generic; -using Google.ProtocolBuffers.Descriptors; -using System.Collections; - -namespace Google.ProtocolBuffers { - /// - /// Class used to represent repeat extensions in generated classes. - /// - public sealed class GeneratedRepeatExtension : GeneratedExtensionBase> { - private GeneratedRepeatExtension(FieldDescriptor field) : base(field, typeof(TExtensionElement)) { - } - - public static GeneratedExtensionBase> CreateInstance(FieldDescriptor descriptor) { - if (!descriptor.IsRepeated) { - throw new ArgumentException("Must call GeneratedRepeatExtension.CreateInstance() for repeated types."); - } - return new GeneratedRepeatExtension(descriptor); - } - - /// - /// Converts the list to the right type. - /// TODO(jonskeet): Check where this is used, and whether we need to convert - /// for primitive types. - /// - /// - /// - public override object FromReflectionType(object value) { - if (Descriptor.MappedType == MappedType.Message || - Descriptor.MappedType == MappedType.Enum) { - // Must convert the whole list. - List result = new List(); - foreach (object element in (IEnumerable) value) { - result.Add((TExtensionElement) SingularFromReflectionType(element)); - } - return result; - } else { - return value; - } - } - } -} diff --git a/csharp/ProtocolBuffers/GeneratedRepeatExtension.cs b/csharp/ProtocolBuffers/GeneratedRepeatExtension.cs new file mode 100644 index 00000000..ae711bd2 --- /dev/null +++ b/csharp/ProtocolBuffers/GeneratedRepeatExtension.cs @@ -0,0 +1,57 @@ +// Protocol Buffers - Google's data interchange format +// Copyright 2008 Google Inc. +// http://code.google.com/p/protobuf/ +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. +using System; +using System.Collections.Generic; +using Google.ProtocolBuffers.Descriptors; +using System.Collections; + +namespace Google.ProtocolBuffers { + /// + /// Class used to represent repeat extensions in generated classes. + /// + public sealed class GeneratedRepeatExtension : GeneratedExtensionBase> { + private GeneratedRepeatExtension(FieldDescriptor field) : base(field, typeof(TExtensionElement)) { + } + + public static GeneratedExtensionBase> CreateInstance(FieldDescriptor descriptor) { + if (!descriptor.IsRepeated) { + throw new ArgumentException("Must call GeneratedRepeatExtension.CreateInstance() for repeated types."); + } + return new GeneratedRepeatExtension(descriptor); + } + + /// + /// Converts the list to the right type. + /// TODO(jonskeet): Check where this is used, and whether we need to convert + /// for primitive types. + /// + /// + /// + public override object FromReflectionType(object value) { + if (Descriptor.MappedType == MappedType.Message || + Descriptor.MappedType == MappedType.Enum) { + // Must convert the whole list. + List result = new List(); + foreach (object element in (IEnumerable) value) { + result.Add((TExtensionElement) SingularFromReflectionType(element)); + } + return result; + } else { + return value; + } + } + } +} diff --git a/csharp/ProtocolBuffers/ProtocolBuffers.csproj b/csharp/ProtocolBuffers/ProtocolBuffers.csproj index 70a4691d..f68e761a 100644 --- a/csharp/ProtocolBuffers/ProtocolBuffers.csproj +++ b/csharp/ProtocolBuffers/ProtocolBuffers.csproj @@ -84,9 +84,9 @@ + - -- cgit v1.2.3