X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=mcs%2Fclass%2FSystem.Web%2FSystem.Web.UI%2FPropertyConverter.cs;h=fbd974056ddba8685493a155040c4f925e5c1cd5;hb=a9e3b263440ad85c40dd7c4b9aef71bfd9dd8b66;hp=0a47030dfe824a6a659caad4a658ad7b7f917655;hpb=9530c5256847039bb3af8aa7e5cb10d4ea5f5051;p=mono.git diff --git a/mcs/class/System.Web/System.Web.UI/PropertyConverter.cs b/mcs/class/System.Web/System.Web.UI/PropertyConverter.cs index 0a47030dfe8..fbd974056dd 100644 --- a/mcs/class/System.Web/System.Web.UI/PropertyConverter.cs +++ b/mcs/class/System.Web/System.Web.UI/PropertyConverter.cs @@ -24,7 +24,7 @@ // 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.Reflection; using System.ComponentModel; @@ -34,16 +34,8 @@ namespace System.Web.UI { // CAS - no InheritanceDemand here as the class is sealed [AspNetHostingPermission (SecurityAction.LinkDemand, Level = AspNetHostingPermissionLevel.Minimal)] -#if NET_2_0 - public static class PropertyConverter { -#else - public sealed class PropertyConverter { - - PropertyConverter () - { - // no instantiation for you - } -#endif + public static class PropertyConverter + { public static object EnumFromString (Type enumType, string value) { object res = null;