Browse Source

* System.Configuration.dll.sources, System.Configuration20.vmwcsproj: removed OrdinalComparer.cs
* ConfigurationSectionCollection.cs,
* ConfigurationSectionGroupCollection.cs,
* PropertyInformationCollection.cs,
* SectionGroupInfo.cs: used StringComparer.Ordinal instead of OrdinalComparer

svn path=/trunk/mcs/; revision=74612

Vladimir Krasnov 19 years ago
parent
commit
59ff83379d

+ 5 - 0
mcs/class/System.Configuration/ChangeLog

@@ -1,3 +1,8 @@
+2007-03-19  Vladimir Krasnov  <[email protected]>
+
+	* System.Configuration.dll.sources, System.Configuration20.vmwcsproj: 
+	removed OrdinalComparer.cs
+
 2007-03-15  Vladimir Krasnov  <[email protected]>
 
 	* System.Configuration.dll.sources, System.Configuration20.vmwcsproj: 

+ 0 - 1
mcs/class/System.Configuration/System.Configuration.dll.sources

@@ -84,7 +84,6 @@ System.Configuration/LongValidator.cs
 System.Configuration/LongValidatorAttribute.cs
 System.Configuration/NameValueConfigurationCollection.cs
 System.Configuration/NameValueConfigurationElement.cs
-System.Configuration/OrdinalComparer.cs
 System.Configuration/PositiveTimeSpanValidator.cs
 System.Configuration/PositiveTimeSpanValidatorAttribute.cs
 System.Configuration/PropertyInformation.cs

+ 8 - 0
mcs/class/System.Configuration/System.Configuration/ChangeLog

@@ -1,3 +1,11 @@
+2007-03-19  Vladimir Krasnov  <[email protected]>
+
+	* ConfigurationSectionCollection.cs,
+	* ConfigurationSectionGroupCollection.cs,
+	* PropertyInformationCollection.cs, 
+	* SectionGroupInfo.cs: used StringComparer.Ordinal instead of
+	OrdinalComparer
+
 2007-03-15  Vladimir Krasnov  <[email protected]>
 
 	* ConfigurationSectionCollection.cs,

+ 1 - 1
mcs/class/System.Configuration/System.Configuration/ConfigurationSectionCollection.cs

@@ -42,7 +42,7 @@ namespace System.Configuration
 		Configuration config;
 		
 		internal ConfigurationSectionCollection (Configuration config, SectionGroupInfo group)
-			: base (OrdinalComparer.Instance)
+			: base (StringComparer.Ordinal)
 		{
 			this.config = config;
 			this.group = group;

+ 1 - 1
mcs/class/System.Configuration/System.Configuration/ConfigurationSectionGroupCollection.cs

@@ -42,7 +42,7 @@ namespace System.Configuration {
 		Configuration config;
 		
 		internal ConfigurationSectionGroupCollection (Configuration config, SectionGroupInfo group)
-			: base (OrdinalComparer.Instance)
+			: base (StringComparer.Ordinal)
 		{
 			this.config = config;
 			this.group = group;

+ 0 - 52
mcs/class/System.Configuration/System.Configuration/OrdinalComparer.cs

@@ -1,52 +0,0 @@
-#if NET_2_0
-//
-// Authors:
-//   Vladimir Krasnov <[email protected]>
-//
-// Copyright (c) 2002-2007 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-// 
-
-using System;
-using System.Collections;
-
-namespace System.Configuration
-{
-	internal sealed class OrdinalComparer : IEqualityComparer
-	{
-		public static readonly OrdinalComparer Instance = new OrdinalComparer ();
-
-		OrdinalComparer ()
-		{
-		}
-
-		bool IEqualityComparer.Equals (object x, object y)
-		{
-			return string.CompareOrdinal ((string) x, (string) y) == 0;
-		}
-
-		int IEqualityComparer.GetHashCode (object obj)
-		{
-			return ((string) obj).GetHashCode ();
-		}
-	}
-}
-#endif

+ 1 - 1
mcs/class/System.Configuration/System.Configuration/PropertyInformationCollection.cs

@@ -37,7 +37,7 @@ namespace System.Configuration
 	public sealed class PropertyInformationCollection: NameObjectCollectionBase
 	{
 		internal PropertyInformationCollection ()
-			: base (OrdinalComparer.Instance)
+			: base (StringComparer.Ordinal)
 		{
 		}
 		

+ 1 - 1
mcs/class/System.Configuration/System.Configuration/SectionGroupInfo.cs

@@ -397,7 +397,7 @@ namespace System.Configuration
 	internal class ConfigInfoCollection : NameObjectCollectionBase
 	{
 		public ConfigInfoCollection ()
-			: base (OrdinalComparer.Instance)
+			: base (StringComparer.Ordinal)
 		{
 		}
 

+ 0 - 1
mcs/class/System.Configuration/System.Configuration20.csproj

@@ -196,7 +196,6 @@
     <Compile Include="System.Configuration\NameValueConfigurationCollection.cs" />
     <Compile Include="System.Configuration\NameValueConfigurationElement.cs" />
     <Compile Include="System.Configuration\NonEmptyStringFlags.cs" />
-    <Compile Include="System.Configuration\OrdinalComparer.cs" />
     <Compile Include="System.Configuration\PathLevel.cs" />
     <Compile Include="System.Configuration\PositiveTimeSpanValidator.cs" />
     <Compile Include="System.Configuration\PositiveTimeSpanValidatorAttribute.cs" />