Names -> Keywords (#6928)

Replacing full type names with keywords when appropriate

Files affected: source.cs, source.cs, source.cs, source.cs, source.cs, source.cs, source.cs, source.cs, source.cs, source.cs, source.cs, source.cs, source.cs, source.cs, source.cs, source.cs, source.cs, source.cs, source.cs, source.cs.

See #6920

Author: WhiteBlackGoose

samples/snippets/csharp/VS_Snippets_CLR_Classic/classic ArrayList.BinarySearch1 Example/CS/source.cs

@@ -1,4 +1,4 @@
-// <Snippet1>
+// <Snippet1>
  using System;
  using System.Collections;
  public class SamplesArrayList  {
@@ -12,7 +12,7 @@ public static void Main()  {
           myAL.Add( i*2 );
 
        // Displays the ArrayList.
-       Console.WriteLine( "The Int32 ArrayList contains the following:" );
+       Console.WriteLine( "The int ArrayList contains the following:" );
        PrintValues( myAL );
 
        // Locates a specific object that does not exist in the ArrayList.
@@ -41,7 +41,7 @@ public static void PrintValues( IEnumerable myList )  {
  /*
  This code produces the following output.
 
- The Int32 ArrayList contains the following:
+ The int ArrayList contains the following:
     0   2   4   6   8
  The object to search for (3) is not found. The next larger object is at index 2.
  The object to search for (6) is at index 3.

samples/snippets/csharp/VS_Snippets_CLR_Classic/classic ArrayList.IndexOf Example/CS/source.cs

@@ -1,4 +1,4 @@
-// <Snippet1>
+// <Snippet1>
 using System;
 using System.Collections;
 public class SamplesArrayList
@@ -27,7 +27,7 @@ public static void Main()
         PrintIndexAndValues( myAL );
 
         // Search for the first occurrence of the duplicated value.
-        String myString = "the";
+        string myString = "the";
         int myIndex = myAL.IndexOf( myString );
         Console.WriteLine( "The first occurrence of \"{0}\" is at index {1}.", myString, myIndex );
 

samples/snippets/csharp/VS_Snippets_CLR_Classic/classic ArrayList.Insert Example/CS/source.cs

@@ -1,4 +1,4 @@
-// <Snippet1>
+// <Snippet1>
  using System;
  using System.Collections;
  public class SamplesArrayList  {
@@ -75,7 +75,7 @@ The   quick   brown   fox   jumps   over   the   lazy   dog
     The   quick   brown   fox   jumps   over   the   lazy   dog   !!!
  Exception: System.ArgumentOutOfRangeException: Insertion index was out of range.  Must be non-negative and less than or equal to size.
  Parameter name: index
-    at System.Collections.ArrayList.Insert(Int32 index, Object value)
+    at System.Collections.ArrayList.Insert(int index, Object value)
     at SamplesArrayList.Main()
  */
 

samples/snippets/csharp/VS_Snippets_CLR_Classic/classic ArrayList.IsFixedSize Example/CS/source.cs

@@ -1,4 +1,4 @@
-// <Snippet1>
+// <Snippet1>
  using System;
  using System.Collections;
  public class SamplesArrayList  {
@@ -105,7 +105,7 @@ This code produces the following output.
     at System.Collections.FixedSizeArrayList.Add(Object obj)
     at SamplesArrayList.Main()
  Exception: System.NotSupportedException: Collection was of a fixed size.
-    at System.Collections.FixedSizeArrayList.Insert(Int32 index, Object obj)
+    at System.Collections.FixedSizeArrayList.Insert(int index, Object obj)
     at SamplesArrayList.Main()
 
  */

samples/snippets/csharp/VS_Snippets_CLR_Classic/classic ArrayList.LastIndexOf Example/CS/source.cs

@@ -1,4 +1,4 @@
-// <Snippet1>
+// <Snippet1>
  using System;
  using System.Collections;
  public class SamplesArrayList  {
@@ -25,7 +25,7 @@ public static void Main()  {
        PrintIndexAndValues( myAL );
 
        // Searches for the last occurrence of the duplicated value.
-       String myString = "the";
+       string myString = "the";
        int myIndex = myAL.LastIndexOf( myString );
        Console.WriteLine( "The last occurrence of \"{0}\" is at index {1}.", myString, myIndex );
 

samples/snippets/csharp/VS_Snippets_CLR_Classic/classic ArrayList.ReadOnly1 Example/CS/source.cs

@@ -1,4 +1,4 @@
-// <Snippet1>
+// <Snippet1>
  using System;
  using System.Collections;
  public class SamplesArrayList  {
@@ -21,10 +21,10 @@ public static void Main()  {
        // Displays the contents of both collections.
        Console.WriteLine( "\nInitially," );
        Console.WriteLine( "The original ArrayList myAL contains:" );
-       foreach ( String myStr in myAL )
+       foreach ( string myStr in myAL )
           Console.WriteLine( "   {0}", myStr );
        Console.WriteLine( "The read-only ArrayList myReadOnlyAL contains:" );
-       foreach ( String myStr in myReadOnlyAL )
+       foreach ( string myStr in myReadOnlyAL )
           Console.WriteLine( "   {0}", myStr );
 
        // Adding an element to a read-only ArrayList throws an exception.
@@ -41,10 +41,10 @@ public static void Main()  {
        // Displays the contents of both collections again.
        Console.WriteLine( "\nAfter adding a new element to the original ArrayList," );
        Console.WriteLine( "The original ArrayList myAL contains:" );
-       foreach ( String myStr in myAL )
+       foreach ( string myStr in myAL )
           Console.WriteLine( "   {0}", myStr );
        Console.WriteLine( "The read-only ArrayList myReadOnlyAL contains:" );
-       foreach ( String myStr in myReadOnlyAL )
+       foreach ( string myStr in myReadOnlyAL )
           Console.WriteLine( "   {0}", myStr );
     }
  }

samples/snippets/csharp/VS_Snippets_CLR_Classic/classic BitArray.CopyTo Example/CS/source.cs

@@ -1,4 +1,4 @@
-// <Snippet1>
+// <Snippet1>
  using System;
  using System.Collections;
  public class SamplesBitArray  {
@@ -56,7 +56,7 @@ public static void Main()  {
 
        // Returns an exception if the array is not of type Boolean, integer or byte.
        try  {
-          Array myStringArray=Array.CreateInstance( typeof(String), 8 );
+          Array myStringArray=Array.CreateInstance( typeof(string), 8 );
           myStringArray.SetValue( "Hello", 0 );
           myStringArray.SetValue( "World", 1 );
           myBA.CopyTo( myStringArray, 3 );
@@ -87,7 +87,7 @@ The target byte Array contains the following (before and after copying):
        10      11       0       0       0       0       0       0
        10      11       0      15       0       0       0       0
  Exception: System.ArgumentException: Only supported array types for CopyTo on BitArrays are Boolean[], Int32[] and Byte[].
-    at System.Collections.BitArray.CopyTo(Array array, Int32 index)
+    at System.Collections.BitArray.CopyTo(Array array, int index)
     at SamplesBitArray.Main()
 
  */

samples/snippets/csharp/VS_Snippets_CLR_Classic/classic Console Example/CS/source.cs

@@ -1,4 +1,4 @@
-// <Snippet1>
+// <Snippet1>
 using System;
 
 public class Example {
@@ -7,7 +7,7 @@ public static void Main()
         Console.Write("Hello ");
         Console.WriteLine("World!");
         Console.Write("Enter your name: ");
-        String name = Console.ReadLine();
+        string name = Console.ReadLine();
         Console.Write("Good day, ");
         Console.Write(name);
         Console.WriteLine("!");

samples/snippets/csharp/VS_Snippets_CLR_Classic/classic CryptoStream Example/CS/source.cs

@@ -1,12 +1,12 @@
-using System;
+using System;
 using System.IO;
 using System.ComponentModel;
 using System.Security.Cryptography;
 
 public class Sample
 {
 // <Snippet1>
-private static void EncryptData(String inName, String outName, byte[] aesKey, byte[] aesIV)
+private static void EncryptData(string inName, string outName, byte[] aesKey, byte[] aesIV)
  {
      //Create the file streams to handle the input and output files.
      FileStream fin = new FileStream(inName, FileMode.Open, FileAccess.Read);

samples/snippets/csharp/VS_Snippets_CLR_Classic/classic DES Example/CS/source.cs

@@ -1,12 +1,12 @@
-using System;
+using System;
 using System.IO;
 using System.Windows.Forms;
 using System.Security.Cryptography;
 
 public class Form1: Form
 {
 // <Snippet1>
-private static void EncryptData(String inName, String outName, byte[] desKey, byte[] desIV)
+private static void EncryptData(string inName, string outName, byte[] desKey, byte[] desIV)
  {
      //Create the file streams to handle the input and output files.
      FileStream fin = new FileStream(inName, FileMode.Open, FileAccess.Read);

samples/snippets/csharp/VS_Snippets_CLR_Classic/classic DateTime.ToString2 Example/CS/source.cs

@@ -1,4 +1,4 @@
-// <Snippet1>
+// <Snippet1>
  using System;
  using System.Globalization;
 
@@ -21,10 +21,10 @@ public static void Main(string[] args)  {
             "M/yy",
             "dd-MM-yy",
         };
-        String date;
+        string date;
         for (int i = 0; i < format.Length; i++) {
             date = dt.ToString(format[i], DateTimeFormatInfo.InvariantInfo);
-            Console.WriteLine(String.Concat(format[i], " :" , date));
+            Console.WriteLine(string.Concat(format[i], " :" , date));
         }
 
    /** Output.

samples/snippets/csharp/VS_Snippets_CLR_Classic/classic DateTimeFormatInfo.GetAllDateTimePatterns Example/CS/source.cs

@@ -1,4 +1,4 @@
-// <Snippet1>
+// <Snippet1>
  using System;
  using System.Globalization;
  public class SamplesDateTimeFormatInfo  {
@@ -41,7 +41,7 @@ public static void Main()  {
 
     public static void PrintIndexAndValues( String[] myArray )  {
        int i = 0;
-       foreach ( String s in myArray )
+       foreach ( string s in myArray )
           Console.WriteLine( "\t[{0}]:\t{1}", i++, s );
        Console.WriteLine();
     }

samples/snippets/csharp/VS_Snippets_CLR_Classic/classic Debug.Write Example/CS/source.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Data;
 using System.Diagnostics;
 using System.Windows.Forms;
@@ -11,7 +11,7 @@ public class Form1: Form
  // Create a TraceSwitch.
  static TraceSwitch generalSwitch = new TraceSwitch("General", "Entire Application");
 
- static public void MyErrorMethod(Object myObject, String category) {
+ static public void MyErrorMethod(Object myObject, string category) {
     // Write the message if the TraceSwitch level is set to Error or higher.
     if(generalSwitch.TraceError)
        Debug.Write(myObject, category);

samples/snippets/csharp/VS_Snippets_CLR_Classic/classic Debug.WriteIf2 Example/CS/source.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Data;
 using System.Diagnostics;
 using System.Windows.Forms;
@@ -11,7 +11,7 @@ public class Form1: Form
  // Create a TraceSwitch.
  static TraceSwitch generalSwitch = new TraceSwitch("General", "Entire Application");
 
- static public void MyErrorMethod(Object myObject, String category) {
+ static public void MyErrorMethod(Object myObject, string category) {
     // Write the message if the TraceSwitch level is set to Verbose.
     Debug.WriteIf(generalSwitch.TraceVerbose, myObject.ToString() +
        " is not a valid object for category: ", category);

samples/snippets/csharp/VS_Snippets_CLR_Classic/classic Debug.WriteIf3 Example/CS/source.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Data;
 using System.Diagnostics;
 using System.Windows.Forms;
@@ -11,7 +11,7 @@ public class Form1: Form
  // Create a TraceSwitch.
  static TraceSwitch generalSwitch = new TraceSwitch("General", "Entire Application");
 
- static public void MyErrorMethod(Object myObject, String category) {
+ static public void MyErrorMethod(Object myObject, string category) {
     // Write the message if the TraceSwitch level is set to Verbose.
     Debug.WriteIf(generalSwitch.TraceVerbose, myObject, category);
 

samples/snippets/csharp/VS_Snippets_CLR_Classic/classic Debug.WriteLine2 Example/CS/source.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Data;
 using System.Diagnostics;
 using System.Windows.Forms;
@@ -11,7 +11,7 @@ public class Form1: Form
  // Create a TraceSwitch.
  static TraceSwitch generalSwitch = new TraceSwitch("General", "Entire Application");
 
- static public void MyErrorMethod(String category) {
+ static public void MyErrorMethod(string category) {
     // Write the message if the TraceSwitch level is set to Error or higher.
     if(generalSwitch.TraceError)
        Debug.Write("My error message. ");

samples/snippets/csharp/VS_Snippets_CLR_Classic/classic Debug.WriteLine3 Example/CS/source.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Data;
 using System.Diagnostics;
 using System.Windows.Forms;
@@ -11,7 +11,7 @@ public class Form1: Form
  // Create a TraceSwitch.
  static TraceSwitch generalSwitch = new TraceSwitch("General", "Entire Application");
 
- static public void MyErrorMethod(Object myObject, String category) {
+ static public void MyErrorMethod(Object myObject, string category) {
     // Write the message if the TraceSwitch level is set to Error or higher.
     if(generalSwitch.TraceError)
        Debug.Write("Invalid object for category. ");

samples/snippets/csharp/VS_Snippets_CLR_Classic/classic Debug.WriteLineIf2 Example/CS/source.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Data;
 using System.Diagnostics;
 using System.Windows.Forms;
@@ -11,7 +11,7 @@ public class Form1: Form
  // Create a TraceSwitch.
  static TraceSwitch generalSwitch = new TraceSwitch("General", "Entire Application");
 
- static public void MyErrorMethod(String category) {
+ static public void MyErrorMethod(string category) {
     // Write the message if the TraceSwitch level is set to Error or higher.
     Debug.WriteIf(generalSwitch.TraceError, "My error message. ");
 

samples/snippets/csharp/VS_Snippets_CLR_Classic/classic Debug.WriteLineIf3 Example/CS/source.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Data;
 using System.Diagnostics;
 using System.Windows.Forms;
@@ -11,7 +11,7 @@ public class Form1: Form
  // Create a TraceSwitch.
  static TraceSwitch generalSwitch = new TraceSwitch("General", "Entire Application");
 
- static public void MyErrorMethod(Object myObject, String category) {
+ static public void MyErrorMethod(Object myObject, string category) {
     // Write the message if the TraceSwitch level is set to Error or higher.
     Debug.WriteIf(generalSwitch.TraceError, "Invalid object for category. ");
 

samples/snippets/csharp/VS_Snippets_CLR_Classic/classic Delegate Example/CS/source.cs

@@ -1,15 +1,15 @@
-// <Snippet1>
+// <Snippet1>
 using System;
 public class SamplesDelegate  {
 
-   // Declares a delegate for a method that takes in an int and returns a String.
-   public delegate String myMethodDelegate( int myInt );
+   // Declares a delegate for a method that takes in an int and returns a string.
+   public delegate string myMethodDelegate( int myInt );
 
    // Defines some methods to which the delegate can point.
    public class mySampleClass  {
 
       // Defines an instance method.
-      public String myStringMethod ( int myInt )  {
+      public string myStringMethod ( int myInt )  {
          if ( myInt > 0 )
             return( "positive" );
          if ( myInt < 0 )
@@ -18,7 +18,7 @@ public String myStringMethod ( int myInt )  {
       }
 
       // Defines a static method.
-      public static String mySignMethod ( int myInt )  {
+      public static string mySignMethod ( int myInt )  {
          if ( myInt > 0 )
             return( "+" );
          if ( myInt < 0 )