reformatted all code to .NET standard formatting

5 files changed, 410 insertions, 368 deletions

diff --git a/src/AddressBook/AddPerson.cs b/src/AddressBook/AddPerson.cs
index 9d2eaa2a..462b0c56 100644
--- a/src/AddressBook/AddPerson.cs
+++ b/src/AddressBook/AddPerson.cs
@@ -1,121 +1,136 @@
-#region Copyright notice and license
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// http://github.com/jskeet/dotnet-protobufs/
-// Original C++/Java/Python code:
-// http://code.google.com/p/protobuf/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#endregion
-using System;
-using System.IO;
-
-namespace Google.ProtocolBuffers.Examples.AddressBook
-{
-  class AddPerson {
-    
-    /// <summary>
-    /// Builds a person based on user input
-    /// </summary>
-    static Person PromptForAddress(TextReader input, TextWriter output) {
-      Person.Builder person = Person.CreateBuilder();
-
-      output.Write("Enter person ID: ");
-      person.Id = int.Parse(input.ReadLine());
-
-      output.Write("Enter name: ");
-      person.Name = input.ReadLine();
-
-      output.Write("Enter email address (blank for none): ");
-      string email = input.ReadLine();
-      if (email.Length > 0) {
-        person.Email = email;
-      }
-
-      while (true) {
-        output.Write("Enter a phone number (or leave blank to finish): ");
-        string number = input.ReadLine();
-        if (number.Length == 0) {
-          break;
-        }
-
-        Person.Types.PhoneNumber.Builder phoneNumber =
-            Person.Types.PhoneNumber.CreateBuilder().SetNumber(number);
-
-        output.Write("Is this a mobile, home, or work phone? ");
-        String type = input.ReadLine();
-        switch (type) {
-          case "mobile":
-            phoneNumber.Type = Person.Types.PhoneType.MOBILE;
-            break;
-          case "home":
-            phoneNumber.Type = Person.Types.PhoneType.HOME;
-            break;
-          case "work":
-            phoneNumber.Type = Person.Types.PhoneType.WORK;
-            break;
-          default:
-            output.Write("Unknown phone type. Using default.");
-            break;
-        }
-
-        person.AddPhone(phoneNumber);
-      }
-      return person.Build();
-    }
-
-    /// <summary>
-    /// Entry point - loads an existing addressbook or creates a new one,
-    /// then writes it back to the file.
-    /// </summary>
-    public static int Main(string[] args) {
-      if (args.Length != 1) {
-        Console.Error.WriteLine("Usage:  AddPerson ADDRESS_BOOK_FILE");
-        return -1;
-      }
-
-      AddressBook.Builder addressBook = AddressBook.CreateBuilder();
-
-      if (File.Exists(args[0])) {
-        using (Stream file = File.OpenRead(args[0])) {
-          addressBook.MergeFrom(file);
-        }
-      } else {
-        Console.WriteLine("{0}: File not found. Creating a new file.", args[0]);
-      }
-
-      // Add an address.
-      addressBook.AddPerson(PromptForAddress(Console.In, Console.Out));
-
-      // Write the new address book back to disk.
-      using (Stream output = File.OpenWrite(args[0])) {
-        addressBook.Build().WriteTo(output);
-      }
-      return 0;
-    }
-  }
+#region Copyright notice and license

+

+// Protocol Buffers - Google's data interchange format

+// Copyright 2008 Google Inc.  All rights reserved.

+// http://github.com/jskeet/dotnet-protobufs/

+// Original C++/Java/Python code:

+// http://code.google.com/p/protobuf/

+//

+// Redistribution and use in source and binary forms, with or without

+// modification, are permitted provided that the following conditions are

+// met:

+//

+//     * Redistributions of source code must retain the above copyright

+// notice, this list of conditions and the following disclaimer.

+//     * Redistributions in binary form must reproduce the above

+// copyright notice, this list of conditions and the following disclaimer

+// in the documentation and/or other materials provided with the

+// distribution.

+//     * Neither the name of Google Inc. nor the names of its

+// contributors may be used to endorse or promote products derived from

+// this software without specific prior written permission.

+//

+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS

+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT

+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR

+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT

+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,

+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT

+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,

+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY

+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT

+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE

+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

+

+#endregion

+

+using System;

+using System.IO;

+

+namespace Google.ProtocolBuffers.Examples.AddressBook

+{

+    internal class AddPerson

+    {

+        /// <summary>

+        /// Builds a person based on user input

+        /// </summary>

+        private static Person PromptForAddress(TextReader input, TextWriter output)

+        {

+            Person.Builder person = Person.CreateBuilder();

+

+            output.Write("Enter person ID: ");

+            person.Id = int.Parse(input.ReadLine());

+

+            output.Write("Enter name: ");

+            person.Name = input.ReadLine();

+

+            output.Write("Enter email address (blank for none): ");

+            string email = input.ReadLine();

+            if (email.Length > 0)

+            {

+                person.Email = email;

+            }

+

+            while (true)

+            {

+                output.Write("Enter a phone number (or leave blank to finish): ");

+                string number = input.ReadLine();

+                if (number.Length == 0)

+                {

+                    break;

+                }

+

+                Person.Types.PhoneNumber.Builder phoneNumber =

+                    Person.Types.PhoneNumber.CreateBuilder().SetNumber(number);

+

+                output.Write("Is this a mobile, home, or work phone? ");

+                String type = input.ReadLine();

+                switch (type)

+                {

+                    case "mobile":

+                        phoneNumber.Type = Person.Types.PhoneType.MOBILE;

+                        break;

+                    case "home":

+                        phoneNumber.Type = Person.Types.PhoneType.HOME;

+                        break;

+                    case "work":

+                        phoneNumber.Type = Person.Types.PhoneType.WORK;

+                        break;

+                    default:

+                        output.Write("Unknown phone type. Using default.");

+                        break;

+                }

+

+                person.AddPhone(phoneNumber);

+            }

+            return person.Build();

+        }

+

+        /// <summary>

+        /// Entry point - loads an existing addressbook or creates a new one,

+        /// then writes it back to the file.

+        /// </summary>

+        public static int Main(string[] args)

+        {

+            if (args.Length != 1)

+            {

+                Console.Error.WriteLine("Usage:  AddPerson ADDRESS_BOOK_FILE");

+                return -1;

+            }

+

+            AddressBook.Builder addressBook = AddressBook.CreateBuilder();

+

+            if (File.Exists(args[0]))

+            {

+                using (Stream file = File.OpenRead(args[0]))

+                {

+                    addressBook.MergeFrom(file);

+                }

+            }

+            else

+            {

+                Console.WriteLine("{0}: File not found. Creating a new file.", args[0]);

+            }

+

+            // Add an address.

+            addressBook.AddPerson(PromptForAddress(Console.In, Console.Out));

+

+            // Write the new address book back to disk.

+            using (Stream output = File.OpenWrite(args[0]))

+            {

+                addressBook.Build().WriteTo(output);

+            }

+            return 0;

+        }

+    }

 }
\ No newline at end of file
diff --git a/src/AddressBook/ListPeople.cs b/src/AddressBook/ListPeople.cs
index 6c8111df..fe6f52d8 100644
--- a/src/AddressBook/ListPeople.cs
+++ b/src/AddressBook/ListPeople.cs
@@ -1,90 +1,103 @@
-#region Copyright notice and license
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// http://github.com/jskeet/dotnet-protobufs/
-// Original C++/Java/Python code:
-// http://code.google.com/p/protobuf/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#endregion
-
-using System;
-using System.IO;
-
-namespace Google.ProtocolBuffers.Examples.AddressBook {
-  class ListPeople {
-    /// <summary>
-    /// Iterates though all people in the AddressBook and prints info about them.
-    /// </summary>
-    static void Print(AddressBook addressBook) {
-      foreach (Person person in addressBook.PersonList) {
-        Console.WriteLine("Person ID: {0}", person.Id);
-        Console.WriteLine("  Name: {0}", person.Name);
-        if (person.HasEmail) {
-          Console.WriteLine("  E-mail address: {0}", person.Email);
-        }
-
-        foreach (Person.Types.PhoneNumber phoneNumber in person.PhoneList) {
-          switch (phoneNumber.Type) {
-            case Person.Types.PhoneType.MOBILE:
-              Console.Write("  Mobile phone #: ");
-              break;
-            case Person.Types.PhoneType.HOME:
-              Console.Write("  Home phone #: ");
-              break;
-            case Person.Types.PhoneType.WORK:
-              Console.Write("  Work phone #: ");
-              break;
-          }
-          Console.WriteLine(phoneNumber.Number);
-        }
-      }
-    }
-
-    /// <summary>
-    /// Entry point - loads the addressbook and then displays it.
-    /// </summary>
-    public static int Main(string[] args) {
-      if (args.Length != 1) {
-        Console.Error.WriteLine("Usage:  ListPeople ADDRESS_BOOK_FILE");
-        return 1;
-      }
-
-      if (!File.Exists(args[0])) {
-        Console.WriteLine("{0} doesn't exist. Add a person to create the file first.", args[0]);
-        return 0;
-      }
-
-      // Read the existing address book.
-      using (Stream stream = File.OpenRead(args[0])) {
-        AddressBook addressBook = AddressBook.ParseFrom(stream);
-        Print(addressBook);
-      }
-      return 0;
-    }
-  }
-}
+#region Copyright notice and license

+

+// Protocol Buffers - Google's data interchange format

+// Copyright 2008 Google Inc.  All rights reserved.

+// http://github.com/jskeet/dotnet-protobufs/

+// Original C++/Java/Python code:

+// http://code.google.com/p/protobuf/

+//

+// Redistribution and use in source and binary forms, with or without

+// modification, are permitted provided that the following conditions are

+// met:

+//

+//     * Redistributions of source code must retain the above copyright

+// notice, this list of conditions and the following disclaimer.

+//     * Redistributions in binary form must reproduce the above

+// copyright notice, this list of conditions and the following disclaimer

+// in the documentation and/or other materials provided with the

+// distribution.

+//     * Neither the name of Google Inc. nor the names of its

+// contributors may be used to endorse or promote products derived from

+// this software without specific prior written permission.

+//

+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS

+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT

+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR

+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT

+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,

+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT

+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,

+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY

+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT

+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE

+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

+

+#endregion

+

+using System;

+using System.IO;

+

+namespace Google.ProtocolBuffers.Examples.AddressBook

+{

+    internal class ListPeople

+    {

+        /// <summary>

+        /// Iterates though all people in the AddressBook and prints info about them.

+        /// </summary>

+        private static void Print(AddressBook addressBook)

+        {

+            foreach (Person person in addressBook.PersonList)

+            {

+                Console.WriteLine("Person ID: {0}", person.Id);

+                Console.WriteLine("  Name: {0}", person.Name);

+                if (person.HasEmail)

+                {

+                    Console.WriteLine("  E-mail address: {0}", person.Email);

+                }

+

+                foreach (Person.Types.PhoneNumber phoneNumber in person.PhoneList)

+                {

+                    switch (phoneNumber.Type)

+                    {

+                        case Person.Types.PhoneType.MOBILE:

+                            Console.Write("  Mobile phone #: ");

+                            break;

+                        case Person.Types.PhoneType.HOME:

+                            Console.Write("  Home phone #: ");

+                            break;

+                        case Person.Types.PhoneType.WORK:

+                            Console.Write("  Work phone #: ");

+                            break;

+                    }

+                    Console.WriteLine(phoneNumber.Number);

+                }

+            }

+        }

+

+        /// <summary>

+        /// Entry point - loads the addressbook and then displays it.

+        /// </summary>

+        public static int Main(string[] args)

+        {

+            if (args.Length != 1)

+            {

+                Console.Error.WriteLine("Usage:  ListPeople ADDRESS_BOOK_FILE");

+                return 1;

+            }

+

+            if (!File.Exists(args[0]))

+            {

+                Console.WriteLine("{0} doesn't exist. Add a person to create the file first.", args[0]);

+                return 0;

+            }

+

+            // Read the existing address book.

+            using (Stream stream = File.OpenRead(args[0]))

+            {

+                AddressBook addressBook = AddressBook.ParseFrom(stream);

+                Print(addressBook);

+            }

+            return 0;

+        }

+    }

+}
\ No newline at end of file
diff --git a/src/AddressBook/Program.cs b/src/AddressBook/Program.cs
index dd6e148c..e0d6d49b 100644
--- a/src/AddressBook/Program.cs
+++ b/src/AddressBook/Program.cs
@@ -1,89 +1,99 @@
-#region Copyright notice and license
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// http://github.com/jskeet/dotnet-protobufs/
-// Original C++/Java/Python code:
-// http://code.google.com/p/protobuf/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#endregion
-
-using System;
-
-namespace Google.ProtocolBuffers.Examples.AddressBook
-{
-  /// <summary>
-  /// Entry point. Repeatedly prompts user for an action to take, delegating actual behaviour
-  /// to individual actions. Each action has its own Main method, so that it can be used as an
-  /// invidual complete program.
-  /// </summary>
-  class Program {
-    static int Main(string[] args) {
-      if (args.Length > 1) {
-        Console.Error.WriteLine("Usage: AddressBook [file]");
-        Console.Error.WriteLine("If the filename isn't specified, \"addressbook.data\" is used instead.");
-        return 1;
-      }
-      string addressBookFile = args.Length > 0 ? args[0] : "addressbook.data";
-
-      bool stopping = false;
-      while (!stopping) {
-        Console.WriteLine("Options:");
-        Console.WriteLine("  L: List contents");
-        Console.WriteLine("  A: Add new person");
-        Console.WriteLine("  Q: Quit");
-        Console.Write("Action? ");
-        Console.Out.Flush();
-        char choice = Console.ReadKey().KeyChar;
-        Console.WriteLine();
-        try {
-          switch (choice) {
-            case 'A':
-            case 'a':
-              AddPerson.Main(new string[] { addressBookFile });
-              break;
-            case 'L':
-            case 'l':
-              ListPeople.Main(new string[] { addressBookFile });
-              break;
-            case 'Q':
-            case 'q':
-              stopping = true;
-              break;
-            default:
-              Console.WriteLine("Unknown option: {0}", choice);
-              break;
-          }
-        } catch (Exception e) {
-          Console.WriteLine("Exception executing action: {0}", e);
-        }
-        Console.WriteLine();
-      } 
-      return 0;
-    }
-  }
+#region Copyright notice and license

+

+// Protocol Buffers - Google's data interchange format

+// Copyright 2008 Google Inc.  All rights reserved.

+// http://github.com/jskeet/dotnet-protobufs/

+// Original C++/Java/Python code:

+// http://code.google.com/p/protobuf/

+//

+// Redistribution and use in source and binary forms, with or without

+// modification, are permitted provided that the following conditions are

+// met:

+//

+//     * Redistributions of source code must retain the above copyright

+// notice, this list of conditions and the following disclaimer.

+//     * Redistributions in binary form must reproduce the above

+// copyright notice, this list of conditions and the following disclaimer

+// in the documentation and/or other materials provided with the

+// distribution.

+//     * Neither the name of Google Inc. nor the names of its

+// contributors may be used to endorse or promote products derived from

+// this software without specific prior written permission.

+//

+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS

+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT

+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR

+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT

+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,

+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT

+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,

+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY

+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT

+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE

+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

+

+#endregion

+

+using System;

+

+namespace Google.ProtocolBuffers.Examples.AddressBook

+{

+    /// <summary>

+    /// Entry point. Repeatedly prompts user for an action to take, delegating actual behaviour

+    /// to individual actions. Each action has its own Main method, so that it can be used as an

+    /// invidual complete program.

+    /// </summary>

+    internal class Program

+    {

+        private static int Main(string[] args)

+        {

+            if (args.Length > 1)

+            {

+                Console.Error.WriteLine("Usage: AddressBook [file]");

+                Console.Error.WriteLine("If the filename isn't specified, \"addressbook.data\" is used instead.");

+                return 1;

+            }

+            string addressBookFile = args.Length > 0 ? args[0] : "addressbook.data";

+

+            bool stopping = false;

+            while (!stopping)

+            {

+                Console.WriteLine("Options:");

+                Console.WriteLine("  L: List contents");

+                Console.WriteLine("  A: Add new person");

+                Console.WriteLine("  Q: Quit");

+                Console.Write("Action? ");

+                Console.Out.Flush();

+                char choice = Console.ReadKey().KeyChar;

+                Console.WriteLine();

+                try

+                {

+                    switch (choice)

+                    {

+                        case 'A':

+                        case 'a':

+                            AddPerson.Main(new string[] {addressBookFile});

+                            break;

+                        case 'L':

+                        case 'l':

+                            ListPeople.Main(new string[] {addressBookFile});

+                            break;

+                        case 'Q':

+                        case 'q':

+                            stopping = true;

+                            break;

+                        default:

+                            Console.WriteLine("Unknown option: {0}", choice);

+                            break;

+                    }

+                }

+                catch (Exception e)

+                {

+                    Console.WriteLine("Exception executing action: {0}", e);

+                }

+                Console.WriteLine();

+            }

+            return 0;

+        }

+    }

 }
\ No newline at end of file
diff --git a/src/AddressBook/Properties/AssemblyInfo.cs b/src/AddressBook/Properties/AssemblyInfo.cs
index 118595fc..614e1b48 100644
--- a/src/AddressBook/Properties/AssemblyInfo.cs
+++ b/src/AddressBook/Properties/AssemblyInfo.cs
@@ -1,35 +1,39 @@
-using System.Reflection;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("AddressBook")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("AddressBook")]
-[assembly: AssemblyCopyright("Copyright ©  2008")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("57123e6e-28d1-4b9e-80a5-5e720df8035a")]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("2.3.0.277")]
-[assembly: AssemblyVersion("2.3.0.277")]
-[assembly: AssemblyFileVersion("2.3.0.277")]
+using System.Reflection;

+using System.Runtime.InteropServices;

+

+// General Information about an assembly is controlled through the following 

+// set of attributes. Change these attribute values to modify the information

+// associated with an assembly.

+

+[assembly: AssemblyTitle("AddressBook")]

+[assembly: AssemblyDescription("")]

+[assembly: AssemblyConfiguration("")]

+[assembly: AssemblyCompany("")]

+[assembly: AssemblyProduct("AddressBook")]

+[assembly: AssemblyCopyright("Copyright ©  2008")]

+[assembly: AssemblyTrademark("")]

+[assembly: AssemblyCulture("")]

+

+// Setting ComVisible to false makes the types in this assembly not visible 

+// to COM components.  If you need to access a type in this assembly from 

+// COM, set the ComVisible attribute to true on that type.

+

+[assembly: ComVisible(false)]

+

+// The following GUID is for the ID of the typelib if this project is exposed to COM

+

+[assembly: Guid("57123e6e-28d1-4b9e-80a5-5e720df8035a")]

+

+// Version information for an assembly consists of the following four values:

+//

+//      Major Version

+//      Minor Version 

+//      Build Number

+//      Revision

+//

+// You can specify all the values or you can default the Build and Revision Numbers 

+// by using the '*' as shown below:

+// [assembly: AssemblyVersion("2.3.0.277")]

+

+[assembly: AssemblyVersion("2.3.0.277")]

+[assembly: AssemblyFileVersion("2.3.0.277")]
\ No newline at end of file
diff --git a/src/AddressBook/SampleUsage.cs b/src/AddressBook/SampleUsage.cs
index ae7b6802..084b1655 100644
--- a/src/AddressBook/SampleUsage.cs
+++ b/src/AddressBook/SampleUsage.cs
@@ -3,42 +3,42 @@ using System.IO;
 

 namespace Google.ProtocolBuffers.Examples.AddressBook

 {

-    class SampleUsage

-{

-    static void Main()

+    internal class SampleUsage

     {

-        byte[] bytes;

-        //Create a builder to start building a message

-        Person.Builder newContact = Person.CreateBuilder();

-        //Set the primitive properties

-        newContact.SetId(1)

-                  .SetName("Foo")

-                  .SetEmail("foo@bar");

-        //Now add an item to a list (repeating) field

-        newContact.AddPhone(

-            //Create the child message inline

-            Person.Types.PhoneNumber.CreateBuilder().SetNumber("555-1212").Build()

-            );

-        //Now build the final message:

-        Person person = newContact.Build();

-        //The builder is no longer valid (at least not now, scheduled for 2.4):

-        newContact = null;

-        using(MemoryStream stream = new MemoryStream())

+        private static void Main()

         {

-            //Save the person to a stream

-            person.WriteTo(stream);

-            bytes = stream.ToArray();

-        }

-        //Create another builder, merge the byte[], and build the message:

-        Person copy = Person.CreateBuilder().MergeFrom(bytes).Build();

+            byte[] bytes;

+            //Create a builder to start building a message

+            Person.Builder newContact = Person.CreateBuilder();

+            //Set the primitive properties

+            newContact.SetId(1)

+                .SetName("Foo")

+                .SetEmail("foo@bar");

+            //Now add an item to a list (repeating) field

+            newContact.AddPhone(

+                //Create the child message inline

+                Person.Types.PhoneNumber.CreateBuilder().SetNumber("555-1212").Build()

+                );

+            //Now build the final message:

+            Person person = newContact.Build();

+            //The builder is no longer valid (at least not now, scheduled for 2.4):

+            newContact = null;

+            using (MemoryStream stream = new MemoryStream())

+            {

+                //Save the person to a stream

+                person.WriteTo(stream);

+                bytes = stream.ToArray();

+            }

+            //Create another builder, merge the byte[], and build the message:

+            Person copy = Person.CreateBuilder().MergeFrom(bytes).Build();

 

-        //A more streamlined approach might look like this:

-        bytes = AddressBook.CreateBuilder().AddPerson(copy).Build().ToByteArray();

-        //And read the address book back again

-        AddressBook restored = AddressBook.CreateBuilder().MergeFrom(bytes).Build();

-        //The message performs a deep-comparison on equality:

-        if(restored.PersonCount != 1 || !person.Equals(restored.PersonList[0]))

-            throw new ApplicationException("There is a bad person in here!");

+            //A more streamlined approach might look like this:

+            bytes = AddressBook.CreateBuilder().AddPerson(copy).Build().ToByteArray();

+            //And read the address book back again

+            AddressBook restored = AddressBook.CreateBuilder().MergeFrom(bytes).Build();

+            //The message performs a deep-comparison on equality:

+            if (restored.PersonCount != 1 || !person.Equals(restored.PersonList[0]))

+                throw new ApplicationException("There is a bad person in here!");

+        }

     }

-}

-}

+}
\ No newline at end of file