Author: spouliot
Date: 2005-06-23 13:12:20 -0400 (Thu, 23 Jun 2005)
New Revision: 46438
Modified:
trunk/mcs/class/corlib/System.Security.Policy/ApplicationDirectory.cs
trunk/mcs/class/corlib/System.Security.Policy/ChangeLog
trunk/mcs/class/corlib/System.Security.Policy/CodeConnectAccess.cs
trunk/mcs/class/corlib/System.Security.Policy/Hash.cs
trunk/mcs/class/corlib/System.Security.Policy/NetCodeGroup.cs
trunk/mcs/class/corlib/System.Security.Policy/PermissionRequestEvidence.cs
trunk/mcs/class/corlib/System.Security.Policy/PolicyLevel.cs
trunk/mcs/class/corlib/System.Security.Policy/Publisher.cs
trunk/mcs/class/corlib/System.Security.Policy/Site.cs
trunk/mcs/class/corlib/System.Security.Policy/StrongName.cs
trunk/mcs/class/corlib/System.Security.Policy/TrustManagerContext.cs
trunk/mcs/class/corlib/System.Security.Policy/Url.cs
Log:
2005-06-23 Sebastien Pouliot <[EMAIL PROTECTED]>
* ApplicationDirectory.cs, CodeConnectAccess.cs, Hash.cs,
NetCodeGroup.cs, PermissionRequestEvidence.cs, PolicyLevel.cs,
Publisher.cs. Site.cs, StrongName.cs, TrustManagerContext.cs. Url.cs:
better comments on remaining TODO (all 2.0 related) to ease grepping.
Reduced the number of casts in some Equals methods.
Modified: trunk/mcs/class/corlib/System.Security.Policy/ApplicationDirectory.cs
===================================================================
--- trunk/mcs/class/corlib/System.Security.Policy/ApplicationDirectory.cs
2005-06-23 16:53:59 UTC (rev 46437)
+++ trunk/mcs/class/corlib/System.Security.Policy/ApplicationDirectory.cs
2005-06-23 17:12:20 UTC (rev 46438)
@@ -146,13 +146,13 @@
return ((verbose) ? 3 : 1) + directory.Length;
}
- [MonoTODO]
+ [MonoTODO ("IBuiltInEvidence")]
int IBuiltInEvidence.InitFromBuffer (char [] buffer, int
position)
{
return 0;
}
- [MonoTODO]
+ [MonoTODO ("IBuiltInEvidence")]
int IBuiltInEvidence.OutputToBuffer (char [] buffer, int
position, bool verbose)
{
return 0;
Modified: trunk/mcs/class/corlib/System.Security.Policy/ChangeLog
===================================================================
--- trunk/mcs/class/corlib/System.Security.Policy/ChangeLog 2005-06-23
16:53:59 UTC (rev 46437)
+++ trunk/mcs/class/corlib/System.Security.Policy/ChangeLog 2005-06-23
17:12:20 UTC (rev 46438)
@@ -1,3 +1,11 @@
+2005-06-23 Sebastien Pouliot <[EMAIL PROTECTED]>
+
+ * ApplicationDirectory.cs, CodeConnectAccess.cs, Hash.cs,
+ NetCodeGroup.cs, PermissionRequestEvidence.cs, PolicyLevel.cs,
+ Publisher.cs. Site.cs, StrongName.cs, TrustManagerContext.cs. Url.cs:
+ better comments on remaining TODO (all 2.0 related) to ease grepping.
+ Reduced the number of casts in some Equals methods.
+
2005-06-16 Sebastien Pouliot <[EMAIL PROTECTED]>
* StrongName.cs: Empty names are only verified in NET_2_0.
Modified: trunk/mcs/class/corlib/System.Security.Policy/CodeConnectAccess.cs
===================================================================
--- trunk/mcs/class/corlib/System.Security.Policy/CodeConnectAccess.cs
2005-06-23 16:53:59 UTC (rev 46437)
+++ trunk/mcs/class/corlib/System.Security.Policy/CodeConnectAccess.cs
2005-06-23 17:12:20 UTC (rev 46438)
@@ -45,7 +45,7 @@
private string _scheme;
private int _port;
- [MonoTODO ("validations incomplete")]
+ [MonoTODO ("(2.0) validations incomplete")]
public CodeConnectAccess (string allowScheme, int allowPort)
{
// LAME but as documented
@@ -70,10 +70,8 @@
public override bool Equals (object o)
{
- if (o == null)
- return false;
CodeConnectAccess cca = (o as CodeConnectAccess);
- if (o == null)
+ if (cca == null)
return false;
return ((_scheme == cca._scheme) && (_port ==
cca._port));
}
Modified: trunk/mcs/class/corlib/System.Security.Policy/Hash.cs
===================================================================
--- trunk/mcs/class/corlib/System.Security.Policy/Hash.cs 2005-06-23
16:53:59 UTC (rev 46437)
+++ trunk/mcs/class/corlib/System.Security.Policy/Hash.cs 2005-06-23
17:12:20 UTC (rev 46438)
@@ -43,8 +43,8 @@
#if NET_2_0
[ComVisible (true)]
#else
-[MonoTODO("This doesn't match the MS version perfectly.")]
-// but it does seems to works exactly like Fx 2.0 beta 1 !?!?!
+[MonoTODO ("(1.x) This doesn't match the MS version perfectly.")]
+// but it does seems to works exactly like Fx 2.0 beta 1 (and beta2 too) !?!?!
#endif
public sealed class Hash : ISerializable, IBuiltInEvidence {
@@ -184,13 +184,13 @@
return (verbose ? 5 : 0); // as documented
}
- [MonoTODO]
+ [MonoTODO ("IBuiltInEvidence")]
int IBuiltInEvidence.InitFromBuffer (char [] buffer, int position)
{
return 0;
}
- [MonoTODO]
+ [MonoTODO ("IBuiltInEvidence")]
int IBuiltInEvidence.OutputToBuffer (char [] buffer, int position, bool
verbose)
{
return 0;
Modified: trunk/mcs/class/corlib/System.Security.Policy/NetCodeGroup.cs
===================================================================
--- trunk/mcs/class/corlib/System.Security.Policy/NetCodeGroup.cs
2005-06-23 16:53:59 UTC (rev 46437)
+++ trunk/mcs/class/corlib/System.Security.Policy/NetCodeGroup.cs
2005-06-23 17:12:20 UTC (rev 46438)
@@ -86,13 +86,13 @@
//
#if NET_2_0
- [MonoTODO ("missing validations")]
+ [MonoTODO ("(2.0) missing validations")]
public void AddConnectAccess (string originScheme,
CodeConnectAccess connectAccess)
{
if (originScheme == null)
throw new ArgumentException ("originScheme");
- // TODO - invalid characters in originScheme
+ // TODO (2.0) - invalid characters in originScheme
if ((originScheme == AbsentOriginScheme) &&
(connectAccess.Scheme == CodeConnectAccess.OriginScheme)) {
throw new ArgumentOutOfRangeException
("connectAccess", Locale.GetText (
"Schema ==
CodeConnectAccess.OriginScheme"));
@@ -251,13 +251,13 @@
}
#if NET_2_0
- [MonoTODO]
+ [MonoTODO ("(2.0) Add new stuff (CodeConnectAccess) into XML")]
protected override void CreateXml (SecurityElement element,
PolicyLevel level)
{
base.CreateXml (element, level);
}
- [MonoTODO]
+ [MonoTODO ("(2.0) Parse new stuff (CodeConnectAccess) from
XML")]
protected override void ParseXml (SecurityElement e,
PolicyLevel level)
{
base.ParseXml (e, level);
Modified:
trunk/mcs/class/corlib/System.Security.Policy/PermissionRequestEvidence.cs
===================================================================
--- trunk/mcs/class/corlib/System.Security.Policy/PermissionRequestEvidence.cs
2005-06-23 16:53:59 UTC (rev 46437)
+++ trunk/mcs/class/corlib/System.Security.Policy/PermissionRequestEvidence.cs
2005-06-23 17:12:20 UTC (rev 46438)
@@ -110,13 +110,13 @@
return size;
}
- [MonoTODO]
+ [MonoTODO ("IBuiltInEvidence")]
int IBuiltInEvidence.InitFromBuffer (char [] buffer, int
position)
{
return 0;
}
- [MonoTODO]
+ [MonoTODO ("IBuiltInEvidence")]
int IBuiltInEvidence.OutputToBuffer (char [] buffer, int
position, bool verbose)
{
return 0;
Modified: trunk/mcs/class/corlib/System.Security.Policy/PolicyLevel.cs
===================================================================
--- trunk/mcs/class/corlib/System.Security.Policy/PolicyLevel.cs
2005-06-23 16:53:59 UTC (rev 46437)
+++ trunk/mcs/class/corlib/System.Security.Policy/PolicyLevel.cs
2005-06-23 17:12:20 UTC (rev 46438)
@@ -405,7 +405,6 @@
throw new ArgumentNullException ("evidence");
CodeGroup cg =
root_code_group.ResolveMatchingCodeGroups (evidence);
- // TODO
return ((cg != null) ? cg : null);
}
Modified: trunk/mcs/class/corlib/System.Security.Policy/Publisher.cs
===================================================================
--- trunk/mcs/class/corlib/System.Security.Policy/Publisher.cs 2005-06-23
16:53:59 UTC (rev 46437)
+++ trunk/mcs/class/corlib/System.Security.Policy/Publisher.cs 2005-06-23
17:12:20 UTC (rev 46438)
@@ -79,7 +79,7 @@
{
Publisher p = (o as Publisher);
if (p == null)
- throw new ArgumentException ("not a Publisher");
+ throw new ArgumentException ("o",
Locale.GetText ("not a Publisher instance."));
return m_cert.Equals (p.Certificate);
}
@@ -102,19 +102,18 @@
// interface IBuiltInEvidence
- [MonoTODO]
int IBuiltInEvidence.GetRequiredSize (bool verbose)
{
return (verbose ? 3 : 1) + m_cert.GetRawCertData
().Length;
}
- [MonoTODO]
+ [MonoTODO ("IBuiltInEvidence")]
int IBuiltInEvidence.InitFromBuffer (char [] buffer, int
position)
{
return 0;
}
- [MonoTODO]
+ [MonoTODO ("IBuiltInEvidence")]
int IBuiltInEvidence.OutputToBuffer (char [] buffer, int
position, bool verbose)
{
return 0;
Modified: trunk/mcs/class/corlib/System.Security.Policy/Site.cs
===================================================================
--- trunk/mcs/class/corlib/System.Security.Policy/Site.cs 2005-06-23
16:53:59 UTC (rev 46437)
+++ trunk/mcs/class/corlib/System.Security.Policy/Site.cs 2005-06-23
17:12:20 UTC (rev 46438)
@@ -83,10 +83,10 @@
public override bool Equals (object o)
{
- if (o is System.Security.Policy.Site) {
- return (String.Compare (((Site) o).Name,
origin_site, true, CultureInfo.InvariantCulture) == 0);
- }
- return false;
+ Site s = (o as System.Security.Policy.Site);
+ if (s == null)
+ return false;
+ return (String.Compare (s.Name, origin_site, true,
CultureInfo.InvariantCulture) == 0);
}
public override int GetHashCode ()
@@ -115,13 +115,13 @@
return (verbose ? 3 : 1) + origin_site.Length;
}
- [MonoTODO]
+ [MonoTODO ("IBuiltInEvidence")]
int IBuiltInEvidence.InitFromBuffer (char [] buffer, int
position)
{
return 0;
}
- [MonoTODO]
+ [MonoTODO ("IBuiltInEvidence")]
int IBuiltInEvidence.OutputToBuffer (char [] buffer, int
position, bool verbose)
{
return 0;
Modified: trunk/mcs/class/corlib/System.Security.Policy/StrongName.cs
===================================================================
--- trunk/mcs/class/corlib/System.Security.Policy/StrongName.cs 2005-06-23
16:53:59 UTC (rev 46437)
+++ trunk/mcs/class/corlib/System.Security.Policy/StrongName.cs 2005-06-23
17:12:20 UTC (rev 46438)
@@ -83,9 +83,9 @@
public override bool Equals (object o)
{
- if (!(o is StrongName))
- return false;
StrongName sn = (o as StrongName);
+ if (sn == null)
+ return false;
if (name != sn.Name)
return false;
if (!Version.Equals (sn.Version))
@@ -110,19 +110,18 @@
// interface IBuiltInEvidence
- [MonoTODO]
int IBuiltInEvidence.GetRequiredSize (bool verbose)
{
return (verbose ? 5 : 1) + name.Length;
}
- [MonoTODO]
+ [MonoTODO ("IBuiltInEvidence")]
int IBuiltInEvidence.InitFromBuffer (char [] buffer, int position)
{
return 0;
}
- [MonoTODO]
+ [MonoTODO ("IBuiltInEvidence")]
int IBuiltInEvidence.OutputToBuffer (char [] buffer, int position, bool
verbose)
{
return 0;
Modified: trunk/mcs/class/corlib/System.Security.Policy/TrustManagerContext.cs
===================================================================
--- trunk/mcs/class/corlib/System.Security.Policy/TrustManagerContext.cs
2005-06-23 16:53:59 UTC (rev 46437)
+++ trunk/mcs/class/corlib/System.Security.Policy/TrustManagerContext.cs
2005-06-23 17:12:20 UTC (rev 46438)
@@ -43,7 +43,6 @@
private ApplicationIdentity _previousId;
private TrustManagerUIContext _ui;
- [MonoTODO]
public TrustManagerContext ()
: this (TrustManagerUIContext.Run)
{
Modified: trunk/mcs/class/corlib/System.Security.Policy/Url.cs
===================================================================
--- trunk/mcs/class/corlib/System.Security.Policy/Url.cs 2005-06-23
16:53:59 UTC (rev 46437)
+++ trunk/mcs/class/corlib/System.Security.Policy/Url.cs 2005-06-23
17:12:20 UTC (rev 46438)
@@ -114,13 +114,13 @@
return (verbose ? 3 : 1) + origin_url.Length;
}
- [MonoTODO]
+ [MonoTODO ("IBuiltInEvidence")]
int IBuiltInEvidence.InitFromBuffer (char [] buffer, int
position)
{
return 0;
}
- [MonoTODO]
+ [MonoTODO ("IBuiltInEvidence")]
int IBuiltInEvidence.OutputToBuffer (char [] buffer, int
position, bool verbose)
{
return 0;
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches