Names -> Keywords

Replacing full type names with keywords when appropriate        Files affected: source.cs, source.cs, source.cs, source.cs, Form1.cs, Form1.cs, source.cs.        See dotnet#6920

Author: WhiteBlackGoose

samples/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData SqlParameterCollection.Parent Example/CS/source.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Data;
 using System.Data.SqlClient;
 class Program
@@ -43,7 +43,7 @@ static private string CreateSqlParameters(int documentID)
                 string parameterList = "";
                 for (int i = 0; i < paramCollection.Count; i++)
                 {
-                    parameterList += String.Format("  {0}, {1}, {2}\n",
+                    parameterList += string.Format("  {0}, {1}, {2}\n",
                         paramCollection[i], paramCollection[i].DbType,
                         paramCollection[i].Direction);
                 }
@@ -52,8 +52,8 @@ static private string CreateSqlParameters(int documentID)
                 // Execute the stored procedure; retrieve
                 // and display the output parameter value.
                 command.ExecuteNonQuery();
-                Console.WriteLine((String)(paramSummary.Value));
-                return (String)(paramSummary.Value);
+                Console.WriteLine((string)(paramSummary.Value));
+                return (string)(paramSummary.Value);
             }
             catch (Exception ex)
             {

samples/snippets/csharp/VS_Snippets_ADO.NET/DataWorks DataTableReader.GetBytes/CS/source.cs

@@ -1,4 +1,4 @@
-// <Snippet1>
+// <Snippet1>
 using System;
 using System.Data.SqlClient;
 using System.Data;
@@ -29,7 +29,7 @@ static private void TestGetBytes()
         {
             while (reader.Read())
             {
-                String productName = null;
+                string productName = null;
                 try
                 {
                     // Get the name of the file.
@@ -54,7 +54,7 @@ static private void TestGetBytes()
                         using (Bitmap productImage = new
                                    Bitmap(new MemoryStream(buffer)))
                         {
-                            String fileName = "C:\\" + productName;
+                            string fileName = "C:\\" + productName;
                             // Save in gif format.
                             productImage.Save(fileName, ImageFormat.Gif);
                             Console.WriteLine("Successfully created " + fileName);
@@ -71,12 +71,12 @@ static private void TestGetBytes()
         Console.ReadLine();
     }
 
-    static private SqlDataAdapter SetupDataAdapter(String sqlString)
+    static private SqlDataAdapter SetupDataAdapter(string sqlString)
     {
         // Assuming all the default settings, create a SqlDataAdapter
         // working with the AdventureWorks sample database that's
         // available with SQL Server.
-        String connectionString =
+        string connectionString =
             "Data Source=(local);Initial Catalog=AdventureWorks;" +
             "Integrated Security=true";
         return new SqlDataAdapter(sqlString, connectionString);

samples/snippets/csharp/VS_Snippets_ADO.NET/DataWorks DataTableReader.GetSchemaTable/CS/source.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Data;
 using System.Data.SqlClient;
 
@@ -59,13 +59,13 @@ private static void DisplaySchemaTableInfo(
         }
     }
 
-    private static SqlDataAdapter SetupDataAdapter(String sqlString)
+    private static SqlDataAdapter SetupDataAdapter(string sqlString)
     {
         // Assuming all the default settings, create a
         // SqlDataAdapter working with the AdventureWorks
         // sample database that's available with
         // SQL Server.
-        String connectionString =
+        string connectionString =
             "Data source=(local);initial catalog=AdventureWorks;" +
             "Integrated Security=True";
         return new SqlDataAdapter(sqlString, connectionString);

samples/snippets/csharp/VS_Snippets_ADO.NET/DataWorks IBinarySerialize Samples/CS/source.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.IO;
 using System.Data;
 using System.Data.SqlTypes;
@@ -30,7 +30,7 @@ static void Main(string [] args)
 
     temp.Read(r);
 
-    Console.WriteLine("String value: " + temp.StringValue);
+    Console.WriteLine("string value: " + temp.StringValue);
     Console.WriteLine("Double value: " + temp.DoubleValue);
 
     r.Close();
@@ -67,7 +67,7 @@ public void Read(System.IO.BinaryReader r)
     }
 
     // Build the string from the array of characters.
-    stringValue = new String(chars, 0, stringEnd);
+    stringValue = new string(chars, 0, stringEnd);
 
     // Read the double value from the binary stream.
     doubleValue = r.ReadDouble();

samples/snippets/csharp/VS_Snippets_ADO.NET/DataWorks SqlCommand.BeginExecuteNonQueryForm/CS/Form1.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.Data;
@@ -174,7 +174,7 @@ private void HandleCallback(IAsyncResult result)
                 // You can create the delegate instance as you
                 // invoke it, like this:
                 this.Invoke(new DisplayInfoDelegate(DisplayStatus),
-                    String.Format("Ready(last error: {0}", ex.Message));
+                    string.Format("Ready(last error: {0}", ex.Message));
             }
             finally
             {

samples/snippets/csharp/VS_Snippets_ADO.NET/DataWorks SqlCommand.BeginExecuteXmlReaderAsync/CS/Form1.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.Data;
@@ -62,7 +62,7 @@ private void DisplayProductInfo(XmlReader reader)
                 // Skip past items that are not from the correct table.
                 if (reader.LocalName.ToString() == "Production.Product")
                 {
-                    this.listBox1.Items.Add(String.Format("{0}: {1:C}",
+                    this.listBox1.Items.Add(string.Format("{0}: {1:C}",
                         reader["Name"], Convert.ToDecimal(reader["ListPrice"])));
                 }
             }
@@ -167,7 +167,7 @@ private void HandleCallback(IAsyncResult result)
                 // You can create the delegate instance as you
                 // invoke it, like this:
                 this.Invoke(new DisplayInfoDelegate(DisplayStatus),
-                String.Format("Ready(last error: {0}", ex.Message));
+                string.Format("Ready(last error: {0}", ex.Message));
             }
             finally
             {

samples/snippets/csharp/VS_Snippets_ADO.NET/system_data_isolationlevel/cs/source.cs

@@ -1,4 +1,4 @@
-// <Snippet1>
+// <Snippet1>
 using System;
 using System.Data.SqlClient;
 using System.Data;
@@ -8,14 +8,14 @@
 namespace CSDataIsolationLevel {
 
    // Use the delegate to call the different threads.
-   public delegate void AsyncAccessDatabase(String connString, IsolationLevel level);
+   public delegate void AsyncAccessDatabase(string connString, IsolationLevel level);
 
    static class DirtyReadThreads {
-      public static void DirtyReadFirstThread(String connStrig, IsolationLevel level) {
+      public static void DirtyReadFirstThread(string connStrig, IsolationLevel level) {
          Console.WriteLine("Begin the DirtyReadFirstThread.....");
 
          using (SqlConnection conn = new SqlConnection(connStrig)) {
-            String cmdText = @"Use DbDataIsolationLevel;
+            string cmdText = @"Use DbDataIsolationLevel;
 
                     Update dbo.Products set Quantity=Quantity+100 where ProductId=1;
                     WaitFor Delay '00:00:06';";
@@ -36,11 +36,11 @@ public static void DirtyReadFirstThread(String connStrig, IsolationLevel level)
          Console.WriteLine("Exit from the DirtyReadFirstThread.....");
       }
 
-      public static void DirtyReadSecondThread(String connStrig, IsolationLevel level) {
+      public static void DirtyReadSecondThread(string connStrig, IsolationLevel level) {
          Console.WriteLine("Begin the DirtyReadSecondThread.....");
 
          using (SqlConnection conn = new SqlConnection(connStrig)) {
-            String cmdText = @"Use DbDataIsolationLevel;
+            string cmdText = @"Use DbDataIsolationLevel;
 
                     WaitFor Delay '00:00:03';
 
@@ -65,11 +65,11 @@ public static void DirtyReadSecondThread(String connStrig, IsolationLevel level)
    }
 
    static class NonrepeatableReadThreads {
-      public static void NonrepeatableReadFirstThread(String connStrig, IsolationLevel level) {
+      public static void NonrepeatableReadFirstThread(string connStrig, IsolationLevel level) {
          Console.WriteLine("Begin the NonrepeatableReadFirstThread.....");
 
          using (SqlConnection conn = new SqlConnection(connStrig)) {
-            String cmdText = @"Use DbDataIsolationLevel;
+            string cmdText = @"Use DbDataIsolationLevel;
 
                     Select ProductId,ProductName,Quantity,Price
                     from dbo.Products
@@ -104,11 +104,11 @@ from dbo.Products
          Console.WriteLine("Exit from the NonrepeatableReadFirstThread.....");
       }
 
-      public static void NonrepeatableReadSecondThread(String connStrig, IsolationLevel level) {
+      public static void NonrepeatableReadSecondThread(string connStrig, IsolationLevel level) {
          Console.WriteLine("Begin the NonrepeatableReadSecondThread.....");
 
          using (SqlConnection conn = new SqlConnection(connStrig)) {
-            String cmdText = @"Use DbDataIsolationLevel;
+            string cmdText = @"Use DbDataIsolationLevel;
 
                     WaitFor Delay '00:00:03';
 
@@ -130,11 +130,11 @@ public static void NonrepeatableReadSecondThread(String connStrig, IsolationLeve
    }
 
    static class PhantomReadThreads {
-      public static void PhantomReadFirstThread(String connStrig, IsolationLevel level) {
+      public static void PhantomReadFirstThread(string connStrig, IsolationLevel level) {
          Console.WriteLine("Begin the PhantomReadFirstThread.....");
 
          using (SqlConnection conn = new SqlConnection(connStrig)) {
-            String cmdText = @"Use DbDataIsolationLevel;
+            string cmdText = @"Use DbDataIsolationLevel;
 
                     Select ProductId,ProductName,Quantity,Price
                     from dbo.Products
@@ -168,11 +168,11 @@ from dbo.Products
          Console.WriteLine("Exit from the PhantomReadFirstThread.....");
       }
 
-      public static void PhantomReadSecondThread(String connStrig, IsolationLevel level) {
+      public static void PhantomReadSecondThread(string connStrig, IsolationLevel level) {
          Console.WriteLine("Begin the PhantomReadSecondThread.....");
 
          using (SqlConnection conn = new SqlConnection(connStrig)) {
-            String cmdText = @"Use DbDataIsolationLevel;
+            string cmdText = @"Use DbDataIsolationLevel;
 
                     WaitFor Delay '00:00:03';
 
@@ -199,7 +199,7 @@ INSERT [dbo].[Products] ([ProductName], [Quantity], [Price])
    // 2. Non-repeatable reads;
    // 3. Phantoms.
    static class TransactionIsolationLevels {
-      public static void DemonstrateIsolationLevel(String connString, IsolationLevel level) {
+      public static void DemonstrateIsolationLevel(string connString, IsolationLevel level) {
          // Before connect the database, recreate the table.
          OperateDatabase.CreateTable(connString);
          DemonstrateIsolationLevel(connString, level, DirtyReadThreads.DirtyReadFirstThread, DirtyReadThreads.DirtyReadSecondThread);
@@ -216,7 +216,7 @@ public static void DemonstrateIsolationLevel(String connString, IsolationLevel l
       }
 
       // Demonstrates if the specific transaction allows the specific behaviors.
-      public static void DemonstrateIsolationLevel(String connString, IsolationLevel level,
+      public static void DemonstrateIsolationLevel(string connString, IsolationLevel level,
           AsyncAccessDatabase firstThread, AsyncAccessDatabase secondThread) {
          Task[] tasks ={
                             Task.Factory.StartNew(()=>firstThread(connString, level)),
@@ -227,11 +227,11 @@ public static void DemonstrateIsolationLevel(String connString, IsolationLevel l
       }
 
       static class ExchangeValuesThreads {
-         public static void ExchangeValuesFirstThread(String connStrig, IsolationLevel level) {
+         public static void ExchangeValuesFirstThread(string connStrig, IsolationLevel level) {
             Console.WriteLine("Begin the ExchangeValuesFirstThread.....");
 
             using (SqlConnection conn = new SqlConnection(connStrig)) {
-               String cmdText = @"Use DbDataIsolationLevel;
+               string cmdText = @"Use DbDataIsolationLevel;
 
                     Declare @price money;
                     select @price=Price from dbo.Products where ProductId=2;
@@ -255,11 +255,11 @@ public static void ExchangeValuesFirstThread(String connStrig, IsolationLevel le
             Console.WriteLine("Exit from the ExchangeValuesFirstThread.....");
          }
 
-         public static void ExchangeValuesSecondThread(String connStrig, IsolationLevel level) {
+         public static void ExchangeValuesSecondThread(string connStrig, IsolationLevel level) {
             Console.WriteLine("Begin the ExchangeValuesSecondThread.....");
 
             using (SqlConnection conn = new SqlConnection(connStrig)) {
-               String cmdText = @"Use DbDataIsolationLevel;
+               string cmdText = @"Use DbDataIsolationLevel;
 
                     WaitFor Delay '00:00:03';
 
@@ -284,7 +284,7 @@ public static void ExchangeValuesSecondThread(String connStrig, IsolationLevel l
       }
 
       // Demonstrates the difference between the Serializable and Snapshot transaction
-      public static void DemonstrateBetweenSnapshotAndSerializable(String connString) {
+      public static void DemonstrateBetweenSnapshotAndSerializable(string connString) {
          OperateDatabase.CreateTable(connString);
 
          Console.WriteLine("Exchange Vaules in the Snapshot transaction:");
@@ -302,9 +302,9 @@ public static void DemonstrateBetweenSnapshotAndSerializable(String connString)
          DisplayData(connString);
       }
 
-      public static void DisplayData(String connString) {
+      public static void DisplayData(string connString) {
          using (SqlConnection conn = new SqlConnection(connString)) {
-            String cmdText = @"Use DbDataIsolationLevel;
+            string cmdText = @"Use DbDataIsolationLevel;
 
                     Select ProductId,ProductName,Quantity,Price
                     from dbo.Products";
@@ -340,9 +340,9 @@ public static void DisplayData(SqlDataReader reader) {
 
    // This class includes database operations. If there's no database 'DbDataIsolationLevel', create the database.
    static class OperateDatabase {
-      public static Boolean CreateDatabase(String connString) {
+      public static Boolean CreateDatabase(string connString) {
          using (SqlConnection conn = new SqlConnection(connString)) {
-            String cmdText = @"Use Master;
+            string cmdText = @"Use Master;
 
                                      if Db_Id('DbDataIsolationLevel') is null
                                       create Database [DbDataIsolationLevel];";
@@ -359,9 +359,9 @@ public static Boolean CreateDatabase(String connString) {
       }
 
       // If there's no table [dbo].[Products] in DbDataIsolationLevel, create the table; or recreate it.
-      public static Boolean CreateTable(String connString) {
+      public static Boolean CreateTable(string connString) {
          using (SqlConnection conn = new SqlConnection(connString)) {
-            String cmdText = @"Use DbDataIsolationLevel
+            string cmdText = @"Use DbDataIsolationLevel
 
                                     if Object_ID('[dbo].[Products]') is not null
                                     drop table [dbo].[Products]
@@ -384,9 +384,9 @@ [Price] money null
       }
 
       // Insert some rows into [dbo].[Products] table.
-      public static Boolean InsertRows(String connString) {
+      public static Boolean InsertRows(string connString) {
          using (SqlConnection conn = new SqlConnection(connString)) {
-            String cmdText = @"Use DbDataIsolationLevel
+            string cmdText = @"Use DbDataIsolationLevel
 
                     INSERT [dbo].[Products] ([ProductName], [Quantity], [Price]) VALUES (N'Blue Bike', 365,1075.00)
                     INSERT [dbo].[Products] ([ProductName], [Quantity], [Price]) VALUES (N'Red Bike', 159, 1299.00)
@@ -401,9 +401,9 @@ INSERT [dbo].[Products] ([ProductName], [Quantity], [Price]) VALUES (N'Red Bike'
       }
 
       // Turn on or off 'ALLOW_SNAPSHOT_ISOLATION'
-      public static Boolean SetSnapshot(String connString, Boolean isOpen) {
+      public static Boolean SetSnapshot(string connString, Boolean isOpen) {
          using (SqlConnection conn = new SqlConnection(connString)) {
-            String cmdText = null;
+            string cmdText = null;
 
             if (isOpen)
                cmdText = @"ALTER DATABASE DbDataIsolationLevel SET ALLOW_SNAPSHOT_ISOLATION ON";
@@ -421,7 +421,7 @@ public static Boolean SetSnapshot(String connString, Boolean isOpen) {
    }
    class Program {
       static void Main(string[] args) {
-         String connString = "Data Source=(local);Initial Catalog=master;Integrated Security=True;Asynchronous Processing=true;";
+         string connString = "Data Source=(local);Initial Catalog=master;Integrated Security=True;Asynchronous Processing=true;";
 
          OperateDatabase.CreateDatabase(connString);
          Console.WriteLine();