Use language keywords instead of BCL types (#102)

dotnet · Dec 7, 2018 · fdbbc61 · fdbbc61
1 parent 441665b
commit fdbbc61
Show file tree

Hide file tree

Showing 23 changed files with 74 additions and 74 deletions.
diff --git a/src/Microsoft.DotNet.Wpf/src/Shared/MS/Internal/SafeSecurityHelper.cs b/src/Microsoft.DotNet.Wpf/src/Shared/MS/Internal/SafeSecurityHelper.cs
@@ -89,7 +89,7 @@ internal static string GetAssemblyPartialName(Assembly assembly)
         {
             AssemblyName name = new AssemblyName(assembly.FullName);
             string partialName = name.Name;
-            return (partialName != null) ? partialName : String.Empty;
+            return (partialName != null) ? partialName : string.Empty;
         }
 #endif
 

diff --git a/src/Microsoft.DotNet.Wpf/src/Shared/System/Windows/Markup/XmlCompatibilityReader.cs b/src/Microsoft.DotNet.Wpf/src/Shared/System/Windows/Markup/XmlCompatibilityReader.cs
@@ -644,12 +644,12 @@ public override string Value
             get
             {
                 // Look for xmlns
-                if (String.Equals(XmlnsDeclaration, Reader.LocalName, StringComparison.Ordinal))
+                if (string.Equals(XmlnsDeclaration, Reader.LocalName, StringComparison.Ordinal))
                 {
-                    return LookupNamespace(String.Empty);
+                    return LookupNamespace(string.Empty);
                 }
                 // Look for xmlns: ...
-                else if (String.Equals(XmlnsDeclaration, Reader.Prefix, StringComparison.Ordinal))
+                else if (string.Equals(XmlnsDeclaration, Reader.Prefix, StringComparison.Ordinal))
                 {
                     return LookupNamespace(Reader.LocalName);
                 }

diff --git a/src/Microsoft.DotNet.Wpf/src/System.Xaml/System/Windows/Markup/ArrayExtension.cs b/src/Microsoft.DotNet.Wpf/src/System.Xaml/System/Windows/Markup/ArrayExtension.cs
@@ -67,7 +67,7 @@ public ArrayExtension(Array elements)
         ///<param name="value">
         /// Object to add to the end of the array.
         ///</param>
-        public void AddChild(Object value)
+        public void AddChild(object value)
         {
             _arrayList.Add(value);
         }

diff --git a/...osoft.DotNet.Wpf/src/System.Xaml/System/Windows/Markup/XamlSetMarkupExtensionEventArgs.cs b/...osoft.DotNet.Wpf/src/System.Xaml/System/Windows/Markup/XamlSetMarkupExtensionEventArgs.cs
@@ -22,14 +22,14 @@ public class XamlSetMarkupExtensionEventArgs : XamlSetValueEventArgs
         public IServiceProvider ServiceProvider { get; private set; }
 
         internal XamlSetMarkupExtensionEventArgs(XamlMember member,
-            System.Windows.Markup.MarkupExtension value, IServiceProvider serviceProvider, Object targetObject)
+            System.Windows.Markup.MarkupExtension value, IServiceProvider serviceProvider, object targetObject)
             : this(member, value, serviceProvider)
         {
             TargetObject = targetObject;
         }
 
         internal XamlType CurrentType { get; set; }
-        internal Object TargetObject { get; private set; }
+        internal object TargetObject { get; private set; }
 
         public override void CallBase()
         {

diff --git a/src/Microsoft.DotNet.Wpf/src/System.Xaml/System/Windows/NameScope.cs b/src/Microsoft.DotNet.Wpf/src/System.Xaml/System/Windows/NameScope.cs
@@ -39,7 +39,7 @@ public void RegisterName(string name, object scopedElement)
             if (scopedElement == null)
                 throw new ArgumentNullException("scopedElement");
 
-            if (name == String.Empty)
+            if (name == string.Empty)
                 throw new ArgumentException(SR.Get(SRID.NameScopeNameNotEmptyString));
 
             if (!NameValidationHelper.IsValidIdentifierName(name))
@@ -84,7 +84,7 @@ public void UnregisterName(string name)
             if (name == null)
                 throw new ArgumentNullException("name");
 
-            if (name == String.Empty)
+            if (name == string.Empty)
                 throw new ArgumentException(SR.Get(SRID.NameScopeNameNotEmptyString));
 
             if (_nameMap != null && _nameMap[name] != null)
@@ -110,7 +110,7 @@ public void UnregisterName(string name)
         /// <returns>corresponding Context if found, else null</returns>
         public object FindName(string name)
         {
-            if (_nameMap == null || name == null || name == String.Empty)
+            if (_nameMap == null || name == null || name == string.Empty)
                 return null;
 
             return _nameMap[name];

diff --git a/src/Microsoft.DotNet.Wpf/src/System.Xaml/System/Xaml/Context/NameFixupToken.cs b/src/Microsoft.DotNet.Wpf/src/System.Xaml/System/Xaml/Context/NameFixupToken.cs
@@ -24,12 +24,12 @@ internal enum FixupType
 
     internal class FixupTargetKeyHolder
     {
-        public FixupTargetKeyHolder(Object key)
+        public FixupTargetKeyHolder(object key)
         {
             Key = key;
         }
 
-        public Object Key { get; set; }
+        public object Key { get; set; }
     }
 
     internal class FixupTarget : IAddLineInfo
@@ -44,7 +44,7 @@ internal class FixupTarget : IAddLineInfo
         /// <summary>
         /// The Instance the Property is on.
         /// </summary>
-        public Object Instance { get; set; }
+        public object Instance { get; set; }
 
         /// <summary>
         /// The x:Name, if any, of Instance. May not be set yet if InstanceIsOnTheStack is still true.

diff --git a/src/Microsoft.DotNet.Wpf/src/System.Xaml/System/Xaml/Context/ObjectWriterContext.cs b/src/Microsoft.DotNet.Wpf/src/System.Xaml/System/Xaml/Context/ObjectWriterContext.cs
@@ -562,23 +562,23 @@ public XamlMember GrandParentProperty
             get { return _stack.PreviousPreviousFrame.Member; }
         }
 
-        public Object CurrentInstance
+        public object CurrentInstance
         {
             get { return _stack.CurrentFrame.Instance; }
             set { _stack.CurrentFrame.Instance = value; }
         }
 
-        public Object ParentInstance
+        public object ParentInstance
         {
             get { return _stack.PreviousFrame.Instance; }
         }
 
-        public Object GrandParentInstance
+        public object GrandParentInstance
         {
             get { return (_stack.PreviousPreviousFrame != null) ? _stack.PreviousPreviousFrame.Instance : null; }
         }
 
-        public Object CurrentCollection
+        public object CurrentCollection
         {
             get { return _stack.CurrentFrame.Collection; }
             set { _stack.CurrentFrame.Collection = value; }

diff --git a/src/Microsoft.DotNet.Wpf/src/System.Xaml/System/Xaml/Context/ObjectWriterFrame.cs b/src/Microsoft.DotNet.Wpf/src/System.Xaml/System/Xaml/Context/ObjectWriterFrame.cs
@@ -19,7 +19,7 @@ internal class ObjectWriterFrame : XamlCommonFrame
         private ObjectWriterFrameFlags _flags;
         private Dictionary<XamlMember, object> _preconstructionPropertyValues;
         private HashSet<XamlMember> _assignedProperties;
-        private Object _key;
+        private object _key;
 
         public ObjectWriterFrame()
             : base()
@@ -72,17 +72,17 @@ public override XamlFrame Clone()
 
         public override string ToString()
         {
-            string type = (this.XamlType == null) ? String.Empty : this.XamlType.Name;
+            string type = (this.XamlType == null) ? string.Empty : this.XamlType.Name;
             string prop = (this.Member == null) ? "-" : this.Member.Name;
-            string inst = (Instance == null) ? "-" : ((Instance is String) ? Instance.ToString() : "*");
+            string inst = (Instance == null) ? "-" : ((Instance is string) ? Instance.ToString() : "*");
             string coll = (Collection == null) ? "-" : "*";
             string res = KS.Fmt("{0}.{1} inst={2} coll={3}",
                                  type, prop, inst, coll);
             return res;
         }
 
-        public Object Instance { get; set; }
-        public Object Collection { get; set; }
+        public object Instance { get; set; }
+        public object Collection { get; set; }
 
         public bool WasAssignedAtCreation
         {

diff --git a/src/Microsoft.DotNet.Wpf/src/System.Xaml/System/Xaml/InfosetObjects/XamlObjectWriter.cs b/src/Microsoft.DotNet.Wpf/src/System.Xaml/System/Xaml/InfosetObjects/XamlObjectWriter.cs
@@ -154,7 +154,7 @@ private XamlRuntime CreateRuntime(XamlObjectWriterSettings settings, XamlSchemaC
             return result;
         }
 
-        protected virtual void OnAfterBeginInit(Object value)
+        protected virtual void OnAfterBeginInit(object value)
         {
             if (_afterBeginInitHandler != null)
             {
@@ -168,23 +168,23 @@ protected virtual void OnAfterBeginInit(Object value)
             }
         }
 
-        protected virtual void OnBeforeProperties(Object value)
+        protected virtual void OnBeforeProperties(object value)
         {
             if (_beforePropertiesHandler != null)
             {
                 _beforePropertiesHandler(this, new XamlObjectEventArgs(value));
             }
         }
 
-        protected virtual void OnAfterProperties(Object value)
+        protected virtual void OnAfterProperties(object value)
         {
             if (_afterPropertiesHandler != null)
             {
                 _afterPropertiesHandler(this, new XamlObjectEventArgs(value));
             }
         }
 
-        protected virtual void OnAfterEndInit(Object value)
+        protected virtual void OnAfterEndInit(object value)
         {
             if (_afterEndInitHandler != null)
             {
@@ -2197,7 +2197,7 @@ private void Logic_SetConnectionId(ObjectWriterContext ctx, int connectionId, ob
             Runtime.SetConnectionId(rootInstance, connectionId, instance);
         }
 
-        private void SetValue(Object inst, XamlMember property, object value)
+        private void SetValue(object inst, XamlMember property, object value)
         {
 #if !TARGETTING35SP1
             if (!property.IsDirective)

diff --git a/src/Microsoft.DotNet.Wpf/src/System.Xaml/System/Xaml/MS/Impl/KnownStrings.cs b/src/Microsoft.DotNet.Wpf/src/System.Xaml/System/Xaml/MS/Impl/KnownStrings.cs
@@ -78,7 +78,7 @@ internal static class KS
         // Standard String Compare operation.
         public static bool Eq(String a, String b)
         {
-            return String.Equals(a, b, StringComparison.Ordinal);
+            return string.Equals(a, b, StringComparison.Ordinal);
         }
 
         // Standard String Compare operation.  (ignore case)

diff --git a/src/Microsoft.DotNet.Wpf/src/System.Xaml/System/Xaml/NameScopeDictionary.cs b/src/Microsoft.DotNet.Wpf/src/System.Xaml/System/Xaml/NameScopeDictionary.cs
@@ -47,7 +47,7 @@ public void RegisterName(string name, object scopedElement)
             if (scopedElement == null)
                 throw new ArgumentNullException("scopedElement");
 
-            if (name == String.Empty)
+            if (name == string.Empty)
                 throw new ArgumentException(SR.Get(SRID.NameScopeNameNotEmptyString));
 
             if (!NameValidationHelper.IsValidIdentifierName(name))
@@ -88,7 +88,7 @@ public void UnregisterName(string name)
             if (name == null)
                 throw new ArgumentNullException("name");
 
-            if (name == String.Empty)
+            if (name == string.Empty)
                 throw new ArgumentException(SR.Get(SRID.NameScopeNameNotEmptyString));
 
             if (_underlyingNameScope != null)
@@ -114,7 +114,7 @@ public object FindName(string name)
             if (name == null)
                 throw new ArgumentNullException("name");
 
-            if (name == String.Empty)
+            if (name == string.Empty)
                 throw new ArgumentException(SR.Get(SRID.NameScopeNameNotEmptyString));
 
             if (_underlyingNameScope != null)

diff --git a/src/Microsoft.DotNet.Wpf/src/System.Xaml/System/Xaml/Parser/GenericTypeNameParser.cs b/src/Microsoft.DotNet.Wpf/src/System.Xaml/System/Xaml/Parser/GenericTypeNameParser.cs
@@ -43,14 +43,14 @@ public static XamlTypeName ParseIfTrivalName(string text, Func<string, string> p
             int bracketIdx = text.IndexOf('[');
             if (parenIdx != -1 || bracketIdx != -1)
             {
-                error = String.Empty;
+                error = string.Empty;
                 return null;
             }
 
             string prefix;
             string simpleName;
 
-            error = String.Empty;
+            error = string.Empty;
             if (!XamlQualifiedName.Parse(text, out prefix, out simpleName))
             {
                 error = SR.Get(SRID.InvalidTypeString, text);
@@ -69,7 +69,7 @@ public static XamlTypeName ParseIfTrivalName(string text, Func<string, string> p
 
         public XamlTypeName ParseName(string text, out string error)
         {
-            error = String.Empty;
+            error = string.Empty;
             _scanner = new GenericTypeNameScanner(text);
             _inputText = text;
 
@@ -103,7 +103,7 @@ public IList<XamlTypeName> ParseList(string text, out string error)
             _inputText = text;
             StartStack();
 
-            error = String.Empty;
+            error = string.Empty;
             try
             {
                 _scanner.Read();
@@ -167,7 +167,7 @@ private void P_SimpleTypeName()
             // caller checks this.
             Debug.Assert(_scanner.Token == GenericTypeNameScannerToken.NAME);
 
-            string prefix = String.Empty;
+            string prefix = string.Empty;
             string name = _scanner.MultiCharTokenText;
             _scanner.Read();
 

diff --git a/src/Microsoft.DotNet.Wpf/src/System.Xaml/System/Xaml/Parser/GenericTypeNameScanner.cs b/src/Microsoft.DotNet.Wpf/src/System.Xaml/System/Xaml/Parser/GenericTypeNameScanner.cs
@@ -56,7 +56,7 @@ public void Read()
             }
 
             _token = GenericTypeNameScannerToken.NONE;
-            _tokenText = String.Empty;
+            _tokenText = string.Empty;
             _multiCharTokenStartIdx = -1;
             _multiCharTokenLength = 0;
 

diff --git a/src/Microsoft.DotNet.Wpf/src/System.Xaml/System/Xaml/Parser/MeScanner.cs b/src/Microsoft.DotNet.Wpf/src/System.Xaml/System/Xaml/Parser/MeScanner.cs
@@ -140,7 +140,7 @@ public void Read()
             bool isQuotedMarkupExtension = false;
             bool readString = false;
 
-            _tokenText = String.Empty;
+            _tokenText = string.Empty;
             _tokenXamlType = null;
             _tokenProperty = null;
             _tokenNamespace = null;

diff --git a/src/Microsoft.DotNet.Wpf/src/System.Xaml/System/Xaml/Parser/XamlAttribute.cs b/src/Microsoft.DotNet.Wpf/src/System.Xaml/System/Xaml/Parser/XamlAttribute.cs
@@ -116,8 +116,8 @@ public string XmlNsUriDefined
 
         internal bool CheckIsXmlNamespaceDefinition(out string definingPrefix, out string uri)
         {
-            uri = String.Empty;
-            definingPrefix = String.Empty;
+            uri = string.Empty;
+            definingPrefix = string.Empty;
 
             // case where:  xmlns:pre="ValueUri"
             if (KS.Eq(Name.Prefix, KnownStrings.XmlNsPrefix))
@@ -132,7 +132,7 @@ internal bool CheckIsXmlNamespaceDefinition(out string definingPrefix, out strin
             if (String.IsNullOrEmpty(Name.Prefix) && KS.Eq(Name.Name, KnownStrings.XmlNsPrefix))
             {
                 uri = Value;
-                definingPrefix = String.Empty;
+                definingPrefix = string.Empty;
                 return true;
             }
             return false;

diff --git a/src/Microsoft.DotNet.Wpf/src/System.Xaml/System/Xaml/Parser/XamlPropertyName.cs b/src/Microsoft.DotNet.Wpf/src/System.Xaml/System/Xaml/Parser/XamlPropertyName.cs
@@ -17,10 +17,10 @@ private XamlPropertyName(XamlName owner, string prefix, string name)
             if (owner != null)
             {
                 this.Owner = owner;
-                this._prefix = owner.Prefix ?? String.Empty;
+                this._prefix = owner.Prefix ?? string.Empty;
             }
             else
-                this._prefix = prefix ?? String.Empty;
+                this._prefix = prefix ?? string.Empty;
         }
 
         public readonly XamlName Owner;
@@ -41,7 +41,7 @@ public static XamlPropertyName Parse(string longName)
             }
 
             int start = 0;
-            string owner = String.Empty;
+            string owner = string.Empty;
 
             int dotIdx = dottedName.IndexOf('.');
             if (dotIdx != -1)
@@ -91,7 +91,7 @@ public string OwnerName
             {
                 return IsDotted ?
                     Owner.Name :
-                    String.Empty;
+                    string.Empty;
             }
         }
 

diff --git a/src/Microsoft.DotNet.Wpf/src/System.Xaml/System/Xaml/Parser/XamlPullParser.cs b/src/Microsoft.DotNet.Wpf/src/System.Xaml/System/Xaml/Parser/XamlPullParser.cs
@@ -557,7 +557,7 @@ public IEnumerable<XamlNode> P_ElementContent()
                         yield return Logic_LineInfo();
                     }
 
-                    if (trimmed == String.Empty)
+                    if (trimmed == string.Empty)
                     {
                         break;
                     }
@@ -609,7 +609,7 @@ public IEnumerable<XamlNode> P_PropertyContent()
         {
             ScannerNodeType nodeType = _xamlScanner.NodeType;
             List<XamlNode> _savedPrefixDefinitions = null;
-            string trimmed = String.Empty;
+            string trimmed = string.Empty;
             bool isTextXML = false;
 
             switch (nodeType)
@@ -624,7 +624,7 @@ public IEnumerable<XamlNode> P_PropertyContent()
 
                     if (Logic_IsDiscardableWhitespace(text))
                     {
-                        trimmed = String.Empty;
+                        trimmed = string.Empty;
                     }
                     else
                     {
@@ -637,7 +637,7 @@ public IEnumerable<XamlNode> P_PropertyContent()
                     {
                         yield return Logic_LineInfo();
                     }
-                    if (trimmed == String.Empty)
+                    if (trimmed == string.Empty)
                     {
                         break;
                     }