X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=mcs%2Fclass%2Fcorlib%2FSystem.Security.Policy%2FUrlMembershipCondition.cs;h=2098239bcb87b73000db0b68cab9cc916dc503aa;hb=2d23bfcbce7a3f7e54dcd5911adb88b244baca35;hp=1d2a415f7475f9e28b03eef8c8431c0c736fbdfb;hpb=b2262f41726a89c8209facb3ea9e4be9582422b5;p=mono.git

diff --git a/mcs/class/corlib/System.Security.Policy/UrlMembershipCondition.cs b/mcs/class/corlib/System.Security.Policy/UrlMembershipCondition.cs
index 1d2a415f747..2098239bcb8 100644
--- a/mcs/class/corlib/System.Security.Policy/UrlMembershipCondition.cs
+++ b/mcs/class/corlib/System.Security.Policy/UrlMembershipCondition.cs
@@ -38,9 +38,7 @@ using Mono.Security;
 namespace System.Security.Policy {
 
 	[Serializable]
-#if NET_2_0
 	[ComVisible (true)]
-#endif
 	public sealed class UrlMembershipCondition : IMembershipCondition, IConstantMembershipCondition {
 
 		private readonly int version = 1;
@@ -52,14 +50,9 @@ namespace System.Security.Policy {
                 {
 			if (url == null)
 				throw new ArgumentNullException ("url");
-#if NET_2_0
 			CheckUrl (url);
 			userUrl = url;
                         this.url = new Url (url);
-#else
-                        this.url = new Url (url);
-			userUrl = this.url.Value;
-#endif
                 }
 
 		internal UrlMembershipCondition (Url url, string userUrl)
@@ -132,26 +125,22 @@ namespace System.Security.Policy {
 			return (String.Compare (u, 0, umc.Url, 0, length, true, CultureInfo.InvariantCulture) == 0);
 		}
 
-                public void FromXml (SecurityElement element)
+                public void FromXml (SecurityElement e)
                 {
-                        FromXml (element, null);
+                        FromXml (e, null);
                 }
 
-		public void FromXml (SecurityElement element, PolicyLevel level)
+		public void FromXml (SecurityElement e, PolicyLevel level)
 		{
-			MembershipConditionHelper.CheckSecurityElement (element, "element", version, version);
+			MembershipConditionHelper.CheckSecurityElement (e, "e", version, version);
 			
-			string u = element.Attribute ("Url");
-#if NET_2_0
+			string u = e.Attribute ("Url");
 			if (u != null) {
 				CheckUrl (u);
 				url = new Url (u);
 			} else {
 				url = null;
 			}
-#else
-			url = (u == null) ? null : new Url (u);
-#endif
 			userUrl = u;
 		}
 
@@ -180,7 +169,6 @@ namespace System.Security.Policy {
 
 		// internal stuff
 
-#if NET_2_0
 		internal void CheckUrl (string url)
 		{
 			// In .NET 1.x Url class checked the validity of the 
@@ -196,6 +184,5 @@ namespace System.Security.Policy {
 				throw new ArgumentException (msg, "name");
 			}
 		}
-#endif
         }
 }