Merge pull request #1500 from criteo-forks/criteo

[mono.git] / mcs / class / System.Web / System.Web.UI / ToolboxDataAttribute.cs

diff --git a/mcs/class/System.Web/System.Web.UI/ToolboxDataAttribute.cs b/mcs/class/System.Web/System.Web.UI/ToolboxDataAttribute.cs
index bf7744c0f32ae3b4c0e0e46dedc8ede28c3a2fe5..3f328df289aaab55821a1b15836e58ad79439f15 100644 (file)
--- a/mcs/class/System.Web/System.Web.UI/ToolboxDataAttribute.cs
+++ b/mcs/class/System.Web/System.Web.UI/ToolboxDataAttribute.cs
@@ -24,18 +24,18 @@
 // Authors:
 //     Jackson Harper (jackson@ximian.com)
 //
-// Copyright (C) 2005 Novell, Inc (http://www.novell.com)
+// Copyright (C) 2005-2010 Novell, Inc (http://www.novell.com)
 
 using System.Security.Permissions;
 
-namespace System.Web.UI {
-
+namespace System.Web.UI
+{
        // CAS - no InheritanceDemand here as the class is sealed
        [AspNetHostingPermission (SecurityAction.LinkDemand, Level = AspNetHostingPermissionLevel.Minimal)]
        // attributes
        [AttributeUsage(AttributeTargets.Class)]
-       public sealed class ToolboxDataAttribute : Attribute {
-
+       public sealed class ToolboxDataAttribute : Attribute
+       {
                public static readonly ToolboxDataAttribute Default = new ToolboxDataAttribute (String.Empty);
 
                string data;
@@ -66,11 +66,7 @@ namespace System.Web.UI {
 
                public override bool IsDefaultAttribute ()
                {
-#if NET_2_0
                        return ((data == null) || (data.Length == 0));
-#else
-                       return ((data != null) && (data.Length == 0));
-#endif
                }
        }
 }