Names -> Keywords (#6930)

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, action.cs, Action3.cs, Anon.cs, Delegate.cs, Lambda.cs, Action4.cs.

See #6920

Author: WhiteBlackGoose

samples/snippets/csharp/VS_Snippets_CLR_Classic/classic SortedList.Contains Example/CS/source.cs

@@ -1,4 +1,4 @@
-// <Snippet1>
+// <Snippet1>
  using System;
  using System.Collections;
 
@@ -25,7 +25,7 @@ public static void Main()  {
        Console.WriteLine( "The key \"{0}\" is {1}.", myKey, mySL.ContainsKey( myKey ) ? "in the SortedList" : "NOT in the SortedList" );
 
        // Searches for a specific value.
-       String myValue = "three";
+       string myValue = "three";
        Console.WriteLine( "The value \"{0}\" is {1}.", myValue, mySL.ContainsValue( myValue ) ? "in the SortedList" : "NOT in the SortedList" );
        myValue = "nine";
        Console.WriteLine( "The value \"{0}\" is {1}.", myValue, mySL.ContainsValue( myValue ) ? "in the SortedList" : "NOT in the SortedList" );

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

@@ -1,4 +1,4 @@
-// <Snippet1>
+// <Snippet1>
  using System;
  using System.Collections;
  public class SamplesSortedList  {
@@ -18,7 +18,7 @@ public static void Main()  {
        String[] tempArray = new String[] { "The", "quick", "brown", "fox", "jumps", "over", "the", "lazy", "dog" };
        DictionaryEntry[] myTargetArray = new DictionaryEntry[15];
        int i = 0;
-       foreach ( String s in tempArray )  {
+       foreach ( string s in tempArray )  {
           myTargetArray[i].Key = i;
           myTargetArray[i].Value = s;
           i++;

samples/snippets/csharp/VS_Snippets_CLR_Classic/classic SortedList.IndexOfKey Example/CS/source.cs

@@ -1,4 +1,4 @@
-// <Snippet1>
+// <Snippet1>
  using System;
  using System.Collections;
  public class SamplesSortedList  {
@@ -22,7 +22,7 @@ public static void Main()  {
        Console.WriteLine( "The key \"{0}\" is at index {1}.", myKey, mySL.IndexOfKey( myKey ) );
 
        // Searches for a specific value.
-       String myValue = "three";
+       string myValue = "three";
        Console.WriteLine( "The value \"{0}\" is at index {1}.", myValue, mySL.IndexOfValue( myValue ) );
     }
 

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

@@ -1,4 +1,4 @@
-// <Snippet1>
+// <Snippet1>
  using System;
  using System.Collections;
  public class SamplesStack  {
@@ -15,7 +15,7 @@ public static void Main()  {
        mySourceQ.Push( "three" );
 
        // Creates and initializes the one-dimensional target Array.
-       Array myTargetArray=Array.CreateInstance( typeof(String), 15 );
+       Array myTargetArray=Array.CreateInstance( typeof(string), 15 );
        myTargetArray.SetValue( "The", 0 );
        myTargetArray.SetValue( "quick", 1 );
        myTargetArray.SetValue( "brown", 2 );

samples/snippets/csharp/VS_Snippets_CLR_Classic/classic String.Substring1 Example/CS/source.cs

@@ -1,14 +1,14 @@
-using System;
+using System;
 
 public class Sample
 {
    public static void Main()
    {
       // <Snippet1>
-      String myString = "abc";
+      string myString = "abc";
       bool test1 = myString.Substring(2, 1).Equals("c"); // This is true.
       Console.WriteLine(test1);
-      bool test2 = String.IsNullOrEmpty(myString.Substring(3, 0)); // This is true.
+      bool test2 = string.IsNullOrEmpty(myString.Substring(3, 0)); // This is true.
       Console.WriteLine(test2);
       try
       {

samples/snippets/csharp/VS_Snippets_CLR_Classic/classic TextWriterTraceListener.Close Example/CS/source.cs

@@ -1,4 +1,4 @@
-// <Snippet1>
+// <Snippet1>
 #define TRACE
 
 using System;
@@ -12,7 +12,7 @@ public static void Main()
         TextWriterTraceListener myTextListener = null;
 
         // Create a file for output named TestFile.txt.
-        String myFileName = "TestFile.txt";
+        string myFileName = "TestFile.txt";
         StreamWriter myOutputWriter = new StreamWriter(myFileName, true);
 
         // Add a TextWriterTraceListener for the file.

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

@@ -1,4 +1,4 @@
-// <Snippet1>
+// <Snippet1>
 using System;
 using System.Threading;
 using System.Windows.Forms;
@@ -57,7 +57,7 @@ private static DialogResult ShowThreadExceptionDialog(Exception e)
     {
        string errorMsg = "An error occurred.  Please contact the adminstrator " +
             "with the following information:\n\n";
-       errorMsg += String.Format("Exception Type: {0}\n\n", e.GetType().Name);
+       errorMsg += string.Format("Exception Type: {0}\n\n", e.GetType().Name);
        errorMsg += "\n\nStack Trace:\n" + e.StackTrace;
        return MessageBox.Show(errorMsg, "Application Error",
             MessageBoxButtons.AbortRetryIgnore, MessageBoxIcon.Stop);

samples/snippets/csharp/VS_Snippets_CLR_Classic/classic Trace.Fail1 Example/CS/source.cs

@@ -1,4 +1,4 @@
-#define TRACE
+#define TRACE
 
 using System;
 using System.Data;
@@ -16,7 +16,7 @@ public void Method(Option option, string userInput)
         int value = 0;
         int newValue = 1;
         try {
-            value = Int32.Parse(userInput);
+            value = int.Parse(userInput);
         }
         // <Snippet1>
         catch (Exception) {

samples/snippets/csharp/VS_Snippets_CLR_Classic/classic Trace.Write2 Example/CS/source.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Data;
 using System.Diagnostics;
 using System.Windows.Forms;
@@ -10,7 +10,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.
     if(generalSwitch.TraceVerbose)
        Trace.Write(myObject.ToString() + " is not a valid object for category: ",

samples/snippets/csharp/VS_Snippets_CLR_Classic/classic Trace.Write3 Example/CS/source.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Data;
 using System.Diagnostics;
 using System.Windows.Forms;
@@ -10,7 +10,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.
     if(generalSwitch.TraceVerbose)
        Trace.Write(myObject, category);

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

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Data;
 using System.Diagnostics;
 using System.Windows.Forms;
@@ -10,7 +10,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.
     Trace.WriteIf(generalSwitch.TraceVerbose, myObject.ToString() +
        " is not a valid object for category: ", category);

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

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Data;
 using System.Diagnostics;
 using System.Windows.Forms;
@@ -10,7 +10,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.
     Trace.WriteIf(generalSwitch.TraceVerbose, myObject, category);
 

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

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Data;
 using System.Diagnostics;
 using System.Windows.Forms;
@@ -10,7 +10,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)
        Trace.Write("My error message. ");

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

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Data;
 using System.Diagnostics;
 using System.Windows.Forms;
@@ -10,7 +10,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)
        Trace.Write("Invalid object for category. ");

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

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Data;
 using System.Diagnostics;
 using System.Windows.Forms;
@@ -10,7 +10,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.
     Trace.WriteIf(generalSwitch.TraceError, "My error message. ");
 

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

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Data;
 using System.Diagnostics;
 using System.Windows.Forms;
@@ -10,7 +10,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.
     Trace.WriteIf(generalSwitch.TraceError, "Invalid object for category. ");
 

samples/snippets/csharp/VS_Snippets_CLR_Classic/classic TripleDESCryptoServiceProvider 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[] tdesKey, byte[] tdesIV)
+ private static void EncryptData(string inName, string outName, byte[] tdesKey, byte[] tdesIV)
  {
      //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 WindowsPrincipal.Identity Example/CS/source.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Data;
 using System.Security.Principal;
 using System.Windows.Forms;
@@ -9,7 +9,7 @@ protected void Method()
  {
 // <Snippet1>
  WindowsPrincipal wp = new WindowsPrincipal(WindowsIdentity.GetCurrent());
- String username = wp.Identity.Name;
+ string username = wp.Identity.Name;
 
 // </Snippet1>
  }

samples/snippets/csharp/VS_Snippets_CLR_System/system.Action_PrintExample/cs/action.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 
 class Program

samples/snippets/csharp/VS_Snippets_CLR_System/system.Action~3/cs/Action3.cs

@@ -1,4 +1,4 @@
-// <Snippet2>
+// <Snippet2>
 using System;
 
 public class TestAction3

samples/snippets/csharp/VS_Snippets_CLR_System/system.Action~3/cs/Anon.cs

@@ -1,4 +1,4 @@
-// <Snippet3>
+// <Snippet3>
 using System;
 
 public class TestAnon

samples/snippets/csharp/VS_Snippets_CLR_System/system.Action~3/cs/Delegate.cs

@@ -1,4 +1,4 @@
-// <Snippet1>
+// <Snippet1>
 using System;
 
 delegate void StringCopy(string[] stringArray1,

samples/snippets/csharp/VS_Snippets_CLR_System/system.Action~3/cs/Lambda.cs

@@ -1,4 +1,4 @@
-// <Snippet4>
+// <Snippet4>
 using System;
 
 public class TestLambda

samples/snippets/csharp/VS_Snippets_CLR_System/system.Action~4/cs/Action4.cs

@@ -1,4 +1,4 @@
-// <Snippet2>
+// <Snippet2>
 using System;
 
 public class TestAction4