2005-04-23 Sebastien Pouliot <sebastien@ximian.com>

	* CryptographicAttribute.cs: Renamed class to CryptographicAttribute
	Object to match beta2.
	* CryptographicAttributeCollection.cs: Renamed class to Cryptographic
	AttributeObjectCollection to match beta2.
	* CryptographicAttributeEnumerator.cs: Renamed class to Cryptographic
	AttributeObjectEnumerator to match beta2.

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

diff --git a/mcs/class/System.Security/System.Security.Cryptography/ChangeLog b/mcs/class/System.Security/System.Security.Cryptography/ChangeLog
index 72cc0858008cbab66fe836734954ef1b4f832157..f1995824065f1003e7b5bfe02caf28a41990d0cd 100755 (executable)
--- a/mcs/class/System.Security/System.Security.Cryptography/ChangeLog
+++ b/mcs/class/System.Security/System.Security.Cryptography/ChangeLog
@@ -1,3 +1,12 @@
+2005-04-23  Sebastien Pouliot  <sebastien@ximian.com>
+
+       * CryptographicAttribute.cs: Renamed class to CryptographicAttribute
+       Object to match beta2.
+       * CryptographicAttributeCollection.cs: Renamed class to Cryptographic
+       AttributeObjectCollection to match beta2.
+       * CryptographicAttributeEnumerator.cs: Renamed class to Cryptographic
+       AttributeObjectEnumerator to match beta2.
+
 2005-01-20  Sebastien Pouliot  <sebastien@ximian.com>
 
        * AsnEncodedData.cs: Added "internal" support for SubjectAltName 

diff --git a/mcs/class/System.Security/System.Security.Cryptography/CryptographicAttribute.cs b/mcs/class/System.Security/System.Security.Cryptography/CryptographicAttribute.cs
index aaf92b967c1f1f80a2c1316e7a44143d18d76de0..7b3fa91f1e175c03689b3763e27700bea679deea 100755 (executable)
--- a/mcs/class/System.Security/System.Security.Cryptography/CryptographicAttribute.cs
+++ b/mcs/class/System.Security/System.Security.Cryptography/CryptographicAttribute.cs
@@ -1,5 +1,5 @@
 //
-// CryptographicAttribute.cs - System.Security.Cryptography.CryptographicAttribute
+// System.Security.Cryptography.CryptographicAttributeObject class
 //
 // Author:
 //     Sebastien Pouliot  <sebastien@ximian.com>
@@ -33,14 +33,14 @@ using System.Collections;
 
 namespace System.Security.Cryptography {
 
-       public sealed class CryptographicAttribute {
+       public sealed class CryptographicAttributeObject {
 
                private Oid _oid;
                private AsnEncodedDataCollection _list;
 
                // constructors
 
-               public CryptographicAttribute (Oid oid) 
+               public CryptographicAttributeObject (Oid oid) 
                {
                        if (oid == null)
                                throw new ArgumentNullException ("oid");
@@ -49,7 +49,7 @@ namespace System.Security.Cryptography {
                        _list = new AsnEncodedDataCollection ();
                }
 
-               public CryptographicAttribute (Oid oid, AsnEncodedDataCollection values)
+               public CryptographicAttributeObject (Oid oid,   AsnEncodedDataCollection values)
                {
                        if (oid == null)
                                throw new ArgumentNullException ("oid");

diff --git a/mcs/class/System.Security/System.Security.Cryptography/CryptographicAttributeCollection.cs b/mcs/class/System.Security/System.Security.Cryptography/CryptographicAttributeCollection.cs
index cab57ad545a19de6391cc2bd5abb12019f42e109..1ebe0597ec079d35efc5a4de23576a37cdb203d4 100755 (executable)
--- a/mcs/class/System.Security/System.Security.Cryptography/CryptographicAttributeCollection.cs
+++ b/mcs/class/System.Security/System.Security.Cryptography/CryptographicAttributeCollection.cs
@@ -1,11 +1,11 @@
 //
-// System.Security.Cryptography.CryptographicAttributeCollection
+// System.Security.Cryptography.CryptographicAttributeObjectCollection class
 //
 // Author:
 //     Sebastien Pouliot  <sebastien@ximian.com>
 //
 // (C) 2003 Motus Technologies Inc. (http://www.motus.com)
-// Copyright (C) 2004 Novell, Inc (http://www.novell.com)
+// Copyright (C) 2004-2005 Novell, Inc (http://www.novell.com)
 //
 // Permission is hereby granted, free of charge, to any person obtaining
 // a copy of this software and associated documentation files (the
@@ -29,21 +29,20 @@
 
 #if NET_2_0
 
-using System;
 using System.Collections;
 
 namespace System.Security.Cryptography {
 
-       public sealed class CryptographicAttributeCollection : ICollection, IEnumerable {
+       public sealed class CryptographicAttributeObjectCollection : ICollection, IEnumerable {
 
                private ArrayList _list;
 
-               public CryptographicAttributeCollection () 
+               public CryptographicAttributeObjectCollection () 
                {
                        _list = new ArrayList ();
                }
 
-               public CryptographicAttributeCollection (CryptographicAttribute attribute)
+               public CryptographicAttributeObjectCollection (CryptographicAttributeObject attribute)
                        : this ()
                {
                        _list.Add (attribute);
@@ -59,8 +58,8 @@ namespace System.Security.Cryptography {
                        get { return _list.IsSynchronized; }
                }
 
-               public CryptographicAttribute this [int index] {
-                       get { return (CryptographicAttribute) _list [index]; }
+               public CryptographicAttributeObject this [int index] {
+                       get { return (CryptographicAttributeObject) _list [index]; }
                }
 
                public object SyncRoot {
@@ -77,7 +76,7 @@ namespace System.Security.Cryptography {
                        return _list.Add (asnEncodedData);
                }
 
-               public int Add (CryptographicAttribute attribute)
+               public int Add (CryptographicAttributeObject attribute)
                {
                        if (attribute == null)
                                throw new ArgumentNullException ("attribute");
@@ -85,7 +84,7 @@ namespace System.Security.Cryptography {
                        return _list.Add (attribute);
                }
 
-               public void CopyTo (CryptographicAttribute[] array, int index)
+               public void CopyTo (CryptographicAttributeObject[] array, int index)
                {
                        _list.CopyTo (array, index);
                }
@@ -95,17 +94,17 @@ namespace System.Security.Cryptography {
                        _list.CopyTo (array, index);
                }
 
-               public CryptographicAttributeEnumerator GetEnumerator () 
+               public CryptographicAttributeObjectEnumerator GetEnumerator () 
                {
-                       return new CryptographicAttributeEnumerator (_list);
+                       return new CryptographicAttributeObjectEnumerator (_list);
                }
 
                IEnumerator IEnumerable.GetEnumerator () 
                {
-                       return new CryptographicAttributeEnumerator (_list);
+                       return new CryptographicAttributeObjectEnumerator (_list);
                }
 
-               public void Remove (CryptographicAttribute attribute) 
+               public void Remove (CryptographicAttributeObject attribute) 
                {
                        _list.Remove (attribute);
                }

diff --git a/mcs/class/System.Security/System.Security.Cryptography/CryptographicAttributeEnumerator.cs b/mcs/class/System.Security/System.Security.Cryptography/CryptographicAttributeEnumerator.cs
index ec4bc81ed567367c068fabcac0d05029aad6cafe..c8d70f7cf91683f7f191d88f45f0dd0f809495df 100755 (executable)
--- a/mcs/class/System.Security/System.Security.Cryptography/CryptographicAttributeEnumerator.cs
+++ b/mcs/class/System.Security/System.Security.Cryptography/CryptographicAttributeEnumerator.cs
@@ -1,11 +1,11 @@
 //
-// System.Security.Cryptography.CryptographicAttributeEnumerator
+// System.Security.Cryptography.CryptographicAttributeObjectEnumerator class
 //
 // Author:
 //     Sebastien Pouliot  <sebastien@ximian.com>
 //
 // (C) 2003 Motus Technologies Inc. (http://www.motus.com)
-// Copyright (C) 2004 Novell, Inc (http://www.novell.com)
+// Copyright (C) 2004-2005 Novell, Inc (http://www.novell.com)
 //
 // Permission is hereby granted, free of charge, to any person obtaining
 // a copy of this software and associated documentation files (the
@@ -29,26 +29,25 @@
 
 #if NET_2_0
 
-using System;
 using System.Collections;
 
 namespace System.Security.Cryptography {
 
-       public sealed class CryptographicAttributeEnumerator : IEnumerator {
+       public sealed class CryptographicAttributeObjectEnumerator : IEnumerator {
 
                private IEnumerator enumerator;
 
                // constructors
 
-               internal CryptographicAttributeEnumerator (IEnumerable enumerable) 
+               internal CryptographicAttributeObjectEnumerator (IEnumerable enumerable) 
                {
                        enumerator = enumerable.GetEnumerator ();
                }
 
                // properties
 
-               public CryptographicAttribute Current {
-                       get { return (CryptographicAttribute) enumerator.Current; }
+               public CryptographicAttributeObject Current {
+                       get { return (CryptographicAttributeObject) enumerator.Current; }
                }
 
                object IEnumerator.Current {