2002-03-05 Gaurav Vaish <gvaish@iitk.ac.in>

* Don't bother much right now. I am busy making a build. Hopefully, I will
  succeed..

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

diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/Calendar.cs b/mcs/class/System.Web/System.Web.UI.WebControls/Calendar.cs
index 3e8fc6ce7f2e535830e65d7d1a08660288bb317b..ccff144af1bd3064e221eabf31b3c6de7bd5ecfe 100755 (executable)
--- a/mcs/class/System.Web/System.Web.UI.WebControls/Calendar.cs
+++ b/mcs/class/System.Web/System.Web.UI.WebControls/Calendar.cs
@@ -599,7 +599,7 @@ namespace System.Web.UI.WebControls
                        globCal = DateTimeFormatInfo.CurrentInfo.Calendar;\r
                        DateTime visDate   = GetEffectiveVisibleDate()\r
                        DateTime firstDate = GetFirstCalendarDay(visDate);\r
-                       \r
+\r
                        bool isEnabled = false;\r
                        bool isHtmlTextWriter = false;\r
                        if(Page == null || Site == null || Site.DesignMode == null )\r
@@ -614,7 +614,7 @@ namespace System.Web.UI.WebControls
                        defaultTextColor = ForeColor;\r
                        if(defaultTextColor == Color.Empty)\r
                                defaultTextColor = Color.Black;\r
-                       \r
+\r
                        Table calTable = new Table();\r
                        calTable.ID = ID;\r
                        calTable.CopyBaseAttributes(this);\r
@@ -624,7 +624,7 @@ namespace System.Web.UI.WebControls
                        calTable.Height = Height;\r
                        calTable.CellSpacing = CellSpacing;\r
                        calTable.CellPadding = CellPadding;\r
-                       \r
+\r
                        if(ControlStyleCreated && ControlStyle.IsSet(Style.BORDERWIDTH) && BorderWidth != Unit.Empty)\r
                        {\r
                                calTable.BorderWidth = BorderWidth;\r
@@ -632,19 +632,19 @@ namespace System.Web.UI.WebControls
                        {\r
                                calTable.BorderWidth = Unit.Pixel(1);\r
                        }\r
-                       \r
+\r
                        if(ShowGridLines)\r
                                calTable.GridLines = GridLines.Both;\r
                        else\r
                                calTable.GridLines = GridLines.None;\r
-                       \r
+\r
                        calTable.RenderBeginTag(writer);\r
                        if(ShowTitle)\r
                                RenderTitle(writer, visDate, SelectionMode, isEnabled);\r
                        if(ShowDayHeader)\r
                                RenderHeader(writer, firstDate, SelectionMode, isEnabled, isHtmlTextWriter);\r
                        RenderAllDays(writer, firstDate, visDate, SelectionMode, isEnabled, isHtmlTextWriter);\r
-                       \r
+\r
                        calTable.RenderEndTag(writer);\r
                }\r
 \r
@@ -706,8 +706,9 @@ namespace System.Web.UI.WebControls
                        return null;\r
                }\r
 \r
-               protected override void TrackViewState(): TrackViewState()\r
+               protected override void TrackViewState()\r
                {\r
+                       TrackViewState();\r
                        if(titleStyle!=null)\r
                        {\r
                                titleStyle.TrackViewState();\r
@@ -781,7 +782,7 @@ namespace System.Web.UI.WebControls
                        {\r
                                selectDayBool = true;\r
                        }\r
-                       \r
+\r
                        for(int crr = 0; crr < 6; crr++)\r
                        {\r
                                writer.Write("<tr>");\r
@@ -812,7 +813,7 @@ namespace System.Web.UI.WebControls
 \r
                        throw new NotImplementedException();\r
                }\r
-               \r
+\r
                private int GetMask(CalendarDay day)\r
                {\r
                        int retVal = MASK_DAY;\r
@@ -847,7 +848,7 @@ namespace System.Web.UI.WebControls
                                headerCell.ApplyStyle(DayHeaderStyle);\r
                        }\r
                        RenderCalendarCell(writer, headerCell, selMthText);\r
-                       \r
+\r
                        TableCell dayHeaderCell = new TableCell();\r
                        dayHeaderCell.HorizontalAlign = HorizontalAlign.Center;\r
                        string content = null;\r
@@ -891,15 +892,15 @@ namespace System.Web.UI.WebControls
                        bool isWeekMode = (mode == CalendarSelectionMode.DayWeek || mode == CalendarSelectionMode.DayWeekMonth);\r
                        titleCell.ColumnSpan = (isWeekMode ? 8 : 7);\r
                        titleCell.BackColor = "Silver";\r
-                       \r
+\r
                        innerTable.GridLines = GridLine.None;\r
                        innerTable.Width = Unit.Percentage(100);\r
                        innerTable.CellSpacing = 0;\r
                        ApplyTitleStyle(innerTable, titleCell, TitleStyle);\r
-                       \r
+\r
                        innerTable.RenderBeginTag(writer);\r
                        titleCell.RenderBeginTag(writer);\r
-                       \r
+\r
                        writer.Write("<tr>");\r
                        string prevContent = String.Empty;\r
                        if(ShowNextPrevMonth)\r
@@ -961,11 +962,11 @@ namespace System.Web.UI.WebControls
                                nextCell.ApplyStyle(NextPrevStyle);\r
                                RenderCalendarCell(writer, nextCell, GetCalendarLinkText("nextMonth", nextContent, isActive, NextPrevStyle.ForeColor));\r
                        }\r
-                       \r
+\r
                        writer.Write("</tr>");\r
                        titleCell.RenderEndTag(writer);\r
                        innerTable.RenderEndTag(writer);\r
-                       \r
+\r
                        writer.Write("</tr>");\r
                }\r
 \r
@@ -995,7 +996,7 @@ namespace System.Web.UI.WebControls
                        {\r
                                cell.VerticalAlign = style.VerticalAlign;\r
                        }\r
-                       \r
+\r
                        if(style.ForeColor != Color.Empty)\r
                        {\r
                                table.ForeColor = style.ForeColor;\r
@@ -1003,7 +1004,7 @@ namespace System.Web.UI.WebControls
                        {\r
                                table.ForeColor = ForeColor;\r
                        }\r
-                       \r
+\r
                        table.Font.CopyFrom(style.Font);\r
                        table.Font.MergeWith(Font);\r
                }\r

diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/FontUnit.cs b/mcs/class/System.Web/System.Web.UI.WebControls/FontUnit.cs
index 901839a04c39a6af3e8e7e126d6dd3f88d4fb70d..e7aea6839a1357f286655c1f394f379f48423130 100644 (file)
--- a/mcs/class/System.Web/System.Web.UI.WebControls/FontUnit.cs
+++ b/mcs/class/System.Web/System.Web.UI.WebControls/FontUnit.cs
@@ -30,10 +30,10 @@ namespace System.Web.UI.WebControls
                public static readonly FontUnit XSmall  = new FontUnit(FontSize.XSmall);\r
                public static readonly FontUnit XXLarge = new FontUnit(FontSize.XXLarge);\r
                public static readonly FontUnit XXSmall = new FontUnit(FontSize.XXSmall);\r
-               \r
+\r
                private FontSize type;\r
                private Unit     val;\r
-               \r
+\r
                public FontUnit(FontSize type)\r
                {\r
                        if(!Enum.IsDefined(typeof(FontSize), type))\r
@@ -47,17 +47,17 @@ namespace System.Web.UI.WebControls
                                val = Unit.Empty;\r
                        }\r
                }\r
-               \r
+\r
                public FontUnit(int value)\r
                {\r
                        type = FontSize.AsUnit;\r
                        val = Unit.Point(value);\r
                }\r
-               \r
+\r
                public FontUnit(string value): this(value, CultureInfo.CurrentCulture)\r
                {\r
                }\r
-               \r
+\r
                public FontUnit(Unit value)\r
                {\r
                        if(val.IsEmpty)\r
@@ -70,7 +70,7 @@ namespace System.Web.UI.WebControls
                                val  = value;\r
                        }\r
                }\r
-               \r
+\r
                public FontUnit(string value, CultureInfo culture)\r
                {\r
                        type = FontSize.NotSet;\r
@@ -90,7 +90,7 @@ namespace System.Web.UI.WebControls
                                }\r
                        }\r
                }\r
-               \r
+\r
                private int GetTypeFromString(string strVal)\r
                {\r
                        string[] values = {\r
@@ -115,36 +115,37 @@ namespace System.Web.UI.WebControls
                        }\r
                        return -1;\r
                }\r
-               \r
-               public static FontUnit Parse(string s): Parse(s, CultureInfo.CurrentCulture)\r
+\r
+               public static FontUnit Parse(string s)\r
                {\r
+                       Parse(s, CultureInfo.CurrentCulture);\r
                }\r
-               \r
+\r
                public static FontUnit Parse(string s, CultureInfo culture)\r
                {\r
                        return new FontUnit(s, culture);\r
                }\r
-               \r
+\r
                public static FontUnit Point(int n)\r
                {\r
                        return new FontUnit(n);\r
                }\r
-               \r
+\r
                public static bool operator ==(FontUnit left, FontUnit right)\r
                {\r
                        return (left.type == right.type && left.val == right.val);\r
                }\r
-               \r
+\r
                public static bool operator !=(FontUnit left, FontUnit right)\r
                {\r
                        return !(left == right);\r
                }\r
-               \r
+\r
                public static implicit operator FontUnit(int n)\r
                {\r
                        return FontUnit.Point(n);\r
                }\r
-               \r
+\r
                public override bool Equals(object obj)\r
                {\r
                        if(obj!= null && obj is FontUnit)\r
@@ -154,16 +155,17 @@ namespace System.Web.UI.WebControls
                        }\r
                        return false;\r
                }\r
-               \r
+\r
                public override int GetHashCode()\r
                {\r
                        return ( (type.GetHashCode() << 2) | val.GetHashCode() );\r
                }\r
-               \r
-               public override string ToString(): ToString(CultureInfo.CurrentCulture)\r
+\r
+               public override string ToString()\r
                {\r
+                       ToString(CultureInfo.CurrentCulture);\r
                }\r
-               \r
+\r
                public override string ToString(CultureInfo culture)\r
                {\r
                        if(IsEmpty)\r
@@ -181,7 +183,7 @@ namespace System.Web.UI.WebControls
                                default:               return PropertyConverter.EnumToString(typeof(FontSize), type);\r
                        }\r
                }\r
-               \r
+\r
                public bool IsEmpty\r
                {\r
                        get\r
@@ -189,7 +191,7 @@ namespace System.Web.UI.WebControls
                                return (type == FontSize.NotSet);\r
                        }\r
                }\r
-               \r
+\r
                public FontSize Type\r
                {\r
                        get\r
@@ -197,7 +199,7 @@ namespace System.Web.UI.WebControls
                                return type;\r
                        }\r
                }\r
-               \r
+\r
                public Unit Unit\r
                {\r
                        get\r

diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/HyperLink.cs b/mcs/class/System.Web/System.Web.UI.WebControls/HyperLink.cs
index 43866b2ef7ffc22bdd07e91e3b7a9e9e1140e2fa..7ab088c2847a366c0141ebab8a659b2bb42f4cfa 100755 (executable)
--- a/mcs/class/System.Web/System.Web.UI.WebControls/HyperLink.cs
+++ b/mcs/class/System.Web/System.Web.UI.WebControls/HyperLink.cs
@@ -1,13 +1,13 @@
 /**\r
  * Namespace: System.Web.UI.WebControls\r
  * Class:     HyperLink\r
- * \r
+ *\r
  * Author:  Gaurav Vaish\r
  * Maintainer: gvaish@iitk.ac.in\r
  * Contact: gvaish@iitk.ac.in, myscripts_2001@yahoo.com\r
  * Implementation: yes\r
  * Status:  100%\r
- * \r
+ *\r
  * (C) Gaurav Vaish (2001)\r
  */\r
 \r
@@ -18,7 +18,7 @@ namespace System.Web.UI.WebControls
                public HyperLink(): base()\r
                {\r
                }\r
-               \r
+\r
                public virtual string ImageUrl\r
                {\r
                        get\r
@@ -33,7 +33,7 @@ namespace System.Web.UI.WebControls
                                ViewState["ImageUrl"] = value;\r
                        }\r
                }\r
-               \r
+\r
                public string NavigateUrl\r
                {\r
                        get\r
@@ -48,7 +48,7 @@ namespace System.Web.UI.WebControls
                                ViewState["NavigateUrl"] = value;\r
                        }\r
                }\r
-               \r
+\r
                public string Target\r
                {\r
                        get\r
@@ -63,7 +63,7 @@ namespace System.Web.UI.WebControls
                                ViewState["Target"] = value;\r
                        }\r
                }\r
-               \r
+\r
                public virtual string Text\r
                {\r
                        get\r
@@ -78,9 +78,10 @@ namespace System.Web.UI.WebControls
                                ViewState["Text"] = value;\r
                        }\r
                }\r
-               \r
-               protected override void AddAttributesToRender(HtmlTextWriter writer) : AddAttributesToRender(writer)\r
+\r
+               protected override void AddAttributesToRender(HtmlTextWriter writer)\r
                {\r
+                       AddAttributesToRender(writer);\r
                        if(NavigateUrl.Length > 0)\r
                        {\r
                                writer.AddAttribute(HtmlTextWriterAttribute.Href, NavigateUrl);\r
@@ -90,7 +91,7 @@ namespace System.Web.UI.WebControls
                                writer.AddAttribute(HtmlTextWriterAttribute.Target, Target);\r
                        }\r
                }\r
-               \r
+\r
                protected override void AddParsedSubObject(object obj)\r
                {\r
                        if(HasControls())\r
@@ -110,7 +111,7 @@ namespace System.Web.UI.WebControls
                        }\r
                        AddParsedSubObject(obj);\r
                }\r
-               \r
+\r
                protected override void LoadViewState(object savedState)\r
                {\r
                        if(savedState != null)\r
@@ -121,7 +122,7 @@ namespace System.Web.UI.WebControls
                                        Text = (string)o;\r
                        }\r
                }\r
-               \r
+\r
                protected override void RenderContents(HtmlTextWriter writer)\r
                {\r
                        if(ImageUrl.Length > 0)\r

diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/HyperLinkColumn.cs b/mcs/class/System.Web/System.Web.UI.WebControls/HyperLinkColumn.cs
index a74409bac97be06fc2d4799a915db79824ce8c97..e276e6d12359fde0af05258992aec31a842ce64c 100644 (file)
--- a/mcs/class/System.Web/System.Web.UI.WebControls/HyperLinkColumn.cs
+++ b/mcs/class/System.Web/System.Web.UI.WebControls/HyperLinkColumn.cs
@@ -22,11 +22,11 @@ namespace System.Web.UI.WebControls
        {\r
                PropertyDescriptor textFieldDescriptor;\r
                PropertyDescriptor urlFieldDescriptor;\r
-               \r
+\r
                public HyperLinkColumn(): base()\r
                {\r
                }\r
-               \r
+\r
                public virtual string DataNavigateUrlField\r
                {\r
                        get\r
@@ -41,7 +41,7 @@ namespace System.Web.UI.WebControls
                                ViewState["DataNavigateUrlField"] = value;\r
                        }\r
                }\r
-               \r
+\r
                public virtual string DataNavigateUrlFormatString\r
                {\r
                        get\r
@@ -56,7 +56,7 @@ namespace System.Web.UI.WebControls
                                ViewState["DataNavigateUrlFormatString"] = value;\r
                        }\r
                }\r
-               \r
+\r
                public virtual string DataTextField\r
                {\r
                        get\r
@@ -71,7 +71,7 @@ namespace System.Web.UI.WebControls
                                ViewState["DataTextField"] = value;\r
                        }\r
                }\r
-               \r
+\r
                public virtual string DataTextFormatString\r
                {\r
                        get\r
@@ -86,7 +86,7 @@ namespace System.Web.UI.WebControls
                                ViewState["DataTextFormatString"] = value;\r
                        }\r
                }\r
-               \r
+\r
                public virtual string NavigateUrl\r
                {\r
                        get\r
@@ -101,7 +101,7 @@ namespace System.Web.UI.WebControls
                                ViewState["NavigateUrl"] = value;\r
                        }\r
                }\r
-               \r
+\r
                public virtual string Target\r
                {\r
                        get\r
@@ -116,7 +116,7 @@ namespace System.Web.UI.WebControls
                                ViewState["Target"] = value;\r
                        }\r
                }\r
-               \r
+\r
                public virtual string Text\r
                {\r
                        get\r
@@ -131,16 +131,16 @@ namespace System.Web.UI.WebControls
                                ViewState["Text"] = value;\r
                        }\r
                }\r
-               \r
+\r
                public override void Initialize()\r
                {\r
                        textFieldDescriptor = null;\r
                        urlFieldDescriptor  = null;\r
                }\r
-               \r
-               public override void InitializeCell(TableCell cell, int columnIndex, ListItemType itemType):\r
-                       InitializeCell(cell, columnIndex, itemType)\r
+\r
+               public override void InitializeCell(TableCell cell, int columnIndex, ListItemType itemType)\r
                {\r
+                       InitializeCell(cell, columnIndex, itemType);\r
                        if(Enum.IsDefined(ListItemType, itemType) && itemType != ListItemType.Footer)\r
                        {\r
                                HyperLink toDisplay = new HyperLink();\r
@@ -155,7 +155,7 @@ namespace System.Web.UI.WebControls
                                cell.Controls.Add(toDisplay);\r
                        }\r
                }\r
-               \r
+\r
                private void OnDataBindHyperLinkColumn(object sender, EventArgs e)\r
                {\r
                        HyperLink link = (HyperLink)sender;\r
@@ -169,7 +169,7 @@ namespace System.Web.UI.WebControls
                                if(urlFieldDescriptor == null && !DesignMode)\r
                                        throw new HttpException(HttpRuntime.FormatResourceString("Field_Not_Found", DataNavigateUrlField));\r
                        }\r
-                       \r
+\r
                        if(textFieldDescritor != null)\r
                        {\r
                                link.Text = FormatDataTextValue(textFieldDescritor.GetValue(item));\r
@@ -177,7 +177,7 @@ namespace System.Web.UI.WebControls
                        {\r
                                link.Text = "Sample_DataBound_Text";\r
                        }\r
-                       \r
+\r
                        if(urlFieldDescriptor != null)\r
                        {\r
                                link.NavigateUrl = FormatDataNavigateUrlValue(urlFieldDescriptor.GetValue(item));\r
@@ -186,7 +186,7 @@ namespace System.Web.UI.WebControls
                                link.NavigateUrl = "url";\r
                        }\r
                }\r
-               \r
+\r
                protected virtual string FormatDataNavigateUrlValue(object dataUrlValue)\r
                {\r
                        string retVal = String.Empty;\r
@@ -202,7 +202,7 @@ namespace System.Web.UI.WebControls
                        }\r
                        return retVal;\r
                }\r
-               \r
+\r
                protected virtual string FormatDataTextValue(object dataTextValue)\r
                {\r
                        string retVal = String.Empty;\r

diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/Image.cs b/mcs/class/System.Web/System.Web.UI.WebControls/Image.cs
index e3eafde6514c1fef85bca9bd5f5b5ee51d13a7f5..35523331505bbf9f1c526318af6eee65a35ffe77 100644 (file)
--- a/mcs/class/System.Web/System.Web.UI.WebControls/Image.cs
+++ b/mcs/class/System.Web/System.Web.UI.WebControls/Image.cs
@@ -88,8 +88,9 @@ namespace System.Web.UI.WebControls
                        }\r
                }\r
 \r
-               protected override void AddAttributesToRender(HtmlTextWriter writer): AddAttributesToRender(writer)\r
+               protected override void AddAttributesToRender(HtmlTextWriter writer)\r
                {\r
+                       AddAttributesToRender(writer);\r
                        if(ImageUrl.Length > 0)\r
                        {\r
                                writer.AddAttribute(HtmlTextWriterAttribute.Src, ResolveUrl(ImageUrl));\r
@@ -107,8 +108,8 @@ namespace System.Web.UI.WebControls
                                writer.AddAttribute(HtmlTextWriterAttribute.Align, Enum.Format(typeof(ImageAlign), ImageAling, "G"));\r
                        }\r
                }\r
-               \r
-               protected override void RenderContents(HtmlTextWriterAttribute)\r
+\r
+               protected override void RenderContents(HtmlTextWriterAttribute attribute)\r
                {\r
                }\r
        }\r

diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/PagedDataSource.cs b/mcs/class/System.Web/System.Web.UI.WebControls/PagedDataSource.cs
index 4996916c0871d00f630a6a2d1f253cc68d788a60..fc17cd8379f2961b35772eacda7b6b43355571f9 100644 (file)
--- a/mcs/class/System.Web/System.Web.UI.WebControls/PagedDataSource.cs
+++ b/mcs/class/System.Web/System.Web.UI.WebControls/PagedDataSource.cs
@@ -1,13 +1,13 @@
 /**\r
  * Namespace: System.Web.UI.WebControls\r
  * Class:     PagedDataSource\r
- * \r
+ *\r
  * Author:  Gaurav Vaish\r
  * Maintainer: gvaish@iitk.ac.in\r
  * Contact: <my_scripts2001@yahoo.com>, <gvaish@iitk.ac.in>\r
  * Implementation: yes\r
  * Status:  100%\r
- * \r
+ *\r
  * (C) Gaurav Vaish (2002)\r
  */\r
 \r
@@ -33,7 +33,7 @@ namespace System.Web.UI.WebControls
                {\r
                        Initialize();\r
                }\r
-               \r
+\r
                private void Initialize()\r
                {\r
                        pageSize          = 10;\r
@@ -42,7 +42,7 @@ namespace System.Web.UI.WebControls
                        allowCustomPaging = false;\r
                        virtualCount      = 0;\r
                }\r
-               \r
+\r
                public bool AllowCustomPaging\r
                {\r
                        get\r
@@ -54,7 +54,7 @@ namespace System.Web.UI.WebControls
                                allowCustomPaging = value;\r
                        }\r
                }\r
-               \r
+\r
                public bool AllowPaging\r
                {\r
                        get\r
@@ -66,7 +66,7 @@ namespace System.Web.UI.WebControls
                                allowPaging = value;\r
                        }\r
                }\r
-               \r
+\r
                public int Count\r
                {\r
                        get\r
@@ -90,7 +90,7 @@ namespace System.Web.UI.WebControls
                                return 0;\r
                        }\r
                }\r
-               \r
+\r
                public int CurrentPageIndex\r
                {\r
                        get\r
@@ -98,7 +98,7 @@ namespace System.Web.UI.WebControls
                                return currentPageIndex;\r
                        }\r
                }\r
-               \r
+\r
                public IEnumerable DataSource\r
                {\r
                        get\r
@@ -110,7 +110,7 @@ namespace System.Web.UI.WebControls
                                dataSource = value;\r
                        }\r
                }\r
-               \r
+\r
                public int DataSourceCount\r
                {\r
                        get\r
@@ -130,7 +130,7 @@ namespace System.Web.UI.WebControls
                                return 0;\r
                        }\r
                }\r
-               \r
+\r
                public int FirstIndexInPage\r
                {\r
                        get\r
@@ -142,7 +142,7 @@ namespace System.Web.UI.WebControls
                                return 0;\r
                        }\r
                }\r
-               \r
+\r
                public bool IsCustomPagingEnabled\r
                {\r
                        get\r
@@ -150,7 +150,7 @@ namespace System.Web.UI.WebControls
                                return (IsPagingEnable && allowCustomPaging);\r
                        }\r
                }\r
-               \r
+\r
                public bool IsFirstPage\r
                {\r
                        get\r
@@ -158,7 +158,7 @@ namespace System.Web.UI.WebControls
                                return (!IsPagingEnabled || (CurrentPageIndex == 0));\r
                        }\r
                }\r
-               \r
+\r
                public bool IsLastPage\r
                {\r
                        get\r
@@ -166,7 +166,7 @@ namespace System.Web.UI.WebControls
                                return (!IsPagingEnabled || (CurrentPageIndex == PageCount));\r
                        }\r
                }\r
-               \r
+\r
                public bool IsPagingEnabled\r
                {\r
                        get\r
@@ -174,7 +174,7 @@ namespace System.Web.UI.WebControls
                                return (allowPaging && pageSize != 0);\r
                        }\r
                }\r
-               \r
+\r
                public bool IsReadOnly\r
                {\r
                        get\r
@@ -182,7 +182,7 @@ namespace System.Web.UI.WebControls
                                return false;\r
                        }\r
                }\r
-               \r
+\r
                public bool IsSynchronized\r
                {\r
                        get\r
@@ -190,7 +190,7 @@ namespace System.Web.UI.WebControls
                                return false;\r
                        }\r
                }\r
-               \r
+\r
                public int PageCount\r
                {\r
                        get\r
@@ -207,7 +207,7 @@ namespace System.Web.UI.WebControls
                                return 0;\r
                        }\r
                }\r
-               \r
+\r
                public int PageSize\r
                {\r
                        get\r
@@ -219,7 +219,7 @@ namespace System.Web.UI.WebControls
                                pageCount = value;\r
                        }\r
                }\r
-               \r
+\r
                public object SyncRoot\r
                {\r
                        get\r
@@ -227,7 +227,7 @@ namespace System.Web.UI.WebControls
                                return this;\r
                        }\r
                }\r
-               \r
+\r
                public int VirtualCount\r
                {\r
                        get\r
@@ -239,7 +239,7 @@ namespace System.Web.UI.WebControls
                                virtualCount = value;\r
                        }\r
                }\r
-               \r
+\r
                public void CopyTo(Array array, int index)\r
                {\r
                        foreach(object current in this)\r
@@ -247,49 +247,52 @@ namespace System.Web.UI.WebControls
                                array.SetValue(array, index++);\r
                        }\r
                }\r
-               \r
+\r
                public IEnumerator GetEnumerator\r
                {\r
-                       int fInd = FirstIndexInPage;\r
-                       int count = -1;\r
-                       if(dataSource is ICollection)\r
+                       get\r
                        {\r
-                               count = dataSource.Count;\r
-                       }\r
+                               int fInd = FirstIndexInPage;\r
+                               int count = -1;\r
+                               if(dataSource is ICollection)\r
+                               {\r
+                                       count = dataSource.Count;\r
+                               }\r
 \r
-                       if(dataSource is IList)\r
-                       {\r
-                               return (new PrivateListEnumerator((IList)dataSource, fInd, count));\r
-                       }\r
-                       if(dataSource is Array)\r
-                       {\r
-                               return (new PrivateArrayEnumerator((object[])dataSource, fInd, count));\r
-                       }\r
-                       if(dataSource is ICollection)\r
-                       {\r
-                               return (new PrivateICollectionEnumerator((ICollection)dataSource, fInd, count));\r
-                       }\r
-                       if(allowCustomPaging)\r
-                       {\r
-                               return (new PrivateIEnumeratorEnumerator(dataSource, Count));\r
+                               if(dataSource is IList)\r
+                               {\r
+                                       return (new PrivateListEnumerator((IList)dataSource, fInd, count));\r
+                               }\r
+                               if(dataSource is Array)\r
+                               {\r
+                                       return (new PrivateArrayEnumerator((object[])dataSource, fInd, count));\r
+                               }\r
+                               if(dataSource is ICollection)\r
+                               {\r
+                                       return (new PrivateICollectionEnumerator((ICollection)dataSource, fInd, count));\r
+                               }\r
+                               if(allowCustomPaging)\r
+                               {\r
+                                       return (new PrivateIEnumeratorEnumerator(dataSource, Count));\r
+                               }\r
+                               return dataSource.GetEnumerator();\r
                        }\r
-                       return dataSource.GetEnumerator();\r
                }\r
-               \r
+\r
                private class PrivateIEnumeratorEnumerator\r
                {\r
                        private int index;\r
                        private int max;\r
 \r
                        private IEnumerator enumerator;\r
-                       \r
+\r
                        public PrivateIEnumeratorEnumerator(IEnumerator enumerator, int count)\r
                        {\r
                                this.enumerator = enumerator;\r
                                index = -1;\r
                                max   = count;\r
                        }\r
-                       \r
+\r
                        public bool MoveNext()\r
                        {\r
                                enumerator.MoveNext();\r
@@ -311,7 +314,7 @@ namespace System.Web.UI.WebControls
                                }\r
                        }\r
                }\r
-               \r
+\r
                private class PrivateICollectionEnumerator\r
                {\r
                        private int index;\r
@@ -320,7 +323,7 @@ namespace System.Web.UI.WebControls
 \r
                        private ICollection collection;\r
                        private IEnumerator collEnum;\r
-                       \r
+\r
                        public PrivateICollectionEnumerator(ICollection collection, int start, int count)\r
                        {\r
                                this.collection = collection;\r
@@ -332,7 +335,7 @@ namespace System.Web.UI.WebControls
                                        max = collection.Count;\r
                                }\r
                        }\r
-                       \r
+\r
                        public bool MoveNext()\r
                        {\r
                                if(collEnum == null)\r
@@ -363,14 +366,14 @@ namespace System.Web.UI.WebControls
                                }\r
                        }\r
                }\r
-               \r
+\r
                private class PrivateArrayEnumerator\r
                {\r
                        private int index;\r
                        private int start;\r
                        private int max;\r
                        private object[] values;\r
-                       \r
+\r
                        public PrivateArrayEnumerator(object[] values, int start, int count)\r
                        {\r
                                this.values = values;\r
@@ -382,7 +385,7 @@ namespace System.Web.UI.WebControls
                                        max = this.values.Length;\r
                                }\r
                        }\r
-                       \r
+\r
                        public bool MoveNext()\r
                        {\r
                                index++;\r
@@ -406,7 +409,7 @@ namespace System.Web.UI.WebControls
                                }\r
                        }\r
                }\r
-               \r
+\r
                private class PrivateListEnumerator : IEnumerator\r
                {\r
                        private int   index;\r
@@ -425,18 +428,18 @@ namespace System.Web.UI.WebControls
                                        max = list.Count;\r
                                }\r
                        }\r
-                       \r
+\r
                        public bool MoveNext()\r
                        {\r
                                index++;\r
                                return (index + start < max);\r
                        }\r
-                       \r
+\r
                        public void Reset()\r
                        {\r
                                index = -1;\r
                        }\r
-                       \r
+\r
                        public object Current\r
                        {\r
                                get\r

diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/RadioButtonList.cs b/mcs/class/System.Web/System.Web.UI.WebControls/RadioButtonList.cs
index 8eef69a546858d31a0e2837a9063e3a5818eea19..9279b5e09cfd735db66d1a5038d83f50ffec13f7 100644 (file)
--- a/mcs/class/System.Web/System.Web.UI.WebControls/RadioButtonList.cs
+++ b/mcs/class/System.Web/System.Web.UI.WebControls/RadioButtonList.cs
@@ -1,13 +1,13 @@
 /**\r
  * Namespace: System.Web.UI.WebControls\r
  * Class:     RadioButtonList\r
- * \r
+ *\r
  * Author:  Gaurav Vaish\r
  * Maintainer: gvaish@iitk.ac.in\r
  * Contact: <my_scripts2001@yahoo.com>, <gvaish@iitk.ac.in>\r
  * Implementation: yes\r
  * Status:  95%\r
- * \r
+ *\r
  * (C) Gaurav Vaish (2002)\r
  */\r
 \r
@@ -22,12 +22,12 @@ namespace System.Web.UI.WebControls
        {\r
                private bool selectionIndexChanged;\r
                private int  tabIndex;\r
-               \r
+\r
                public RadioButtonList(): base()\r
                {\r
                        selectionIndexChanged = false;\r
                }\r
-               \r
+\r
                public virtual int CellPadding\r
                {\r
                        get\r
@@ -40,7 +40,7 @@ namespace System.Web.UI.WebControls
                                ((TableStyle)ControlStyle).CellPadding = value;\r
                        }\r
                }\r
-               \r
+\r
                public virtual int CellSpacing\r
                {\r
                        get\r
@@ -53,7 +53,7 @@ namespace System.Web.UI.WebControls
                                ((TableStyle)ControlStyle).CellSpacing = value;\r
                        }\r
                }\r
-               \r
+\r
                public virtual int RepeatColumns\r
                {\r
                        get\r
@@ -70,7 +70,7 @@ namespace System.Web.UI.WebControls
                                ViewState["RepeatColumns"] = value;\r
                        }\r
                }\r
-               \r
+\r
                public virtual RepeatDirection RepeatDirection\r
                {\r
                        get\r
@@ -87,7 +87,7 @@ namespace System.Web.UI.WebControls
                                ViewState["RepeatDirection"] = value;\r
                        }\r
                }\r
-               \r
+\r
                public virtual RepeatLayout RepeatLayout\r
                {\r
                        get\r
@@ -104,7 +104,7 @@ namespace System.Web.UI.WebControls
                                ViewState["RepeatLayout"] = value;\r
                        }\r
                }\r
-               \r
+\r
                public virtual TextAlign TextAlign\r
                {\r
                        get\r
@@ -121,12 +121,12 @@ namespace System.Web.UI.WebControls
                                ViewState["TextAlign"] = value;\r
                        }\r
                }\r
-               \r
+\r
                protected override Style CreateControlStyle()\r
                {\r
                        return new TableStyle(ViewState);\r
                }\r
-               \r
+\r
                protected override void Render(HtmlTextWriter writer)\r
                {\r
                        RepeatInfo info = new RepeatInfo();\r
@@ -150,7 +150,7 @@ namespace System.Web.UI.WebControls
                                ViewState.SetItemDirty("TabIndex", false);\r
                        }\r
                }\r
-               \r
+\r
                bool IPostBackDataHandler.LoadPostData(string postDataKey, NameValueCollection postCollection)\r
                {\r
                        string value = postCollection[postDataKey];\r
@@ -167,24 +167,24 @@ namespace System.Web.UI.WebControls
                        }\r
                        return false;\r
                }\r
-               \r
+\r
                void IPostBackDataHandler.RaisePostDataChangedEvent()\r
                {\r
                        if(selectionIndexChanged)\r
                                OnSelectedIndexChanged(EventArgs.Empty);\r
                }\r
-               \r
-               Style IRepeatInfoUser.GetItemStyle(valuetype System.Web.UI.WebControls.ListItemType itemType, int repeatIndex)\r
+\r
+               Style IRepeatInfoUser.GetItemStyle(System.Web.UI.WebControls.ListItemType itemType, int repeatIndex)\r
                {\r
                        return null;\r
                }\r
-               \r
+\r
                [MonoTODO("RadioButtonList_RenderItem")]\r
-               void IRepeatInfoUser.RenderItem(valuetype System.Web.UI.WebControls.ListItemType itemType, int repeatIndex, RepeatInfo repeatInfo, HtmlTextWriter writer)\r
+               void IRepeatInfoUser.RenderItem(System.Web.UI.WebControls.ListItemType itemType, int repeatIndex, RepeatInfo repeatInfo, HtmlTextWriter writer)\r
                {\r
                        throw new NotImplementedException();\r
                }\r
-               \r
+\r
                bool IRepeatInfoUser.HasFooter\r
                {\r
                        get\r
@@ -192,7 +192,7 @@ namespace System.Web.UI.WebControls
                                return false;\r
                        }\r
                }\r
-               \r
+\r
                bool IRepeatInfoUser.HasHeader\r
                {\r
                        get\r
@@ -200,7 +200,7 @@ namespace System.Web.UI.WebControls
                                return false;\r
                        }\r
                }\r
-               \r
+\r
                bool IRepeatInfoUser.HasSeparators\r
                {\r
                        get\r
@@ -208,7 +208,7 @@ namespace System.Web.UI.WebControls
                                return false;\r
                        }\r
                }\r
-               \r
+\r
                int IRepeatInfoUser.RepeatedItemCount\r
                {\r
                        get\r

diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/Table.cs b/mcs/class/System.Web/System.Web.UI.WebControls/Table.cs
index c391f655c4dc1f931e6bcc168931c1cba131666a..7da23b6f5919211f51b2503d68aabf442e685c25 100644 (file)
--- a/mcs/class/System.Web/System.Web.UI.WebControls/Table.cs
+++ b/mcs/class/System.Web/System.Web.UI.WebControls/Table.cs
@@ -22,13 +22,13 @@ namespace System.Web.UI.WebControls
        public class Table: WebControl\r
        {\r
                private TableRowCollection rows;\r
-               \r
+\r
                private class TableRowControlCollection : ControlCollection\r
                {\r
                        public TableRowControlCollection(Control owner): base(owner)\r
                        {\r
                        }\r
-                       \r
+\r
                        public override void Add(Control child)\r
                        {\r
                                if(child is TableRow)\r
@@ -38,7 +38,7 @@ namespace System.Web.UI.WebControls
                                }\r
                                throw new ArgumentException(HttpRuntime.FormatResourceString("Cannot_Have_Children_Of_Type", "Table", child.GetType().Name.ToString()));\r
                        }\r
-                       \r
+\r
                        public override void AddAt(int index, Control child)\r
                        {\r
                                if(child is TableRow)\r
@@ -49,11 +49,11 @@ namespace System.Web.UI.WebControls
                                throw new ArgumentException(HttpRuntime.FormatResourceString("Cannot_Have_Children_Of_Type", "Table", child.GetType().Name.ToString()));\r
                        }\r
                }\r
-               \r
+\r
                public Table(): base(HtmlTextWriterTag.Table)\r
                {\r
                }\r
-               \r
+\r
                public virtual string BackImageUrl\r
                {\r
                        get\r
@@ -66,7 +66,7 @@ namespace System.Web.UI.WebControls
                                ((TableStyle)ControlStyle).BackImageUrl = value;\r
                        }\r
                }\r
-               \r
+\r
                public virtual int CellPadding\r
                {\r
                        get\r
@@ -79,7 +79,7 @@ namespace System.Web.UI.WebControls
                                ((TableStyle)ControlStyle).CellPadding = value;\r
                        }\r
                }\r
-               \r
+\r
                public virtual int CellSpacing\r
                {\r
                        get\r
@@ -92,7 +92,7 @@ namespace System.Web.UI.WebControls
                                ((TableStyle)ControlStyle).CellSpacing = value;\r
                        }\r
                }\r
-               \r
+\r
                public virtual GridLines GridLines\r
                {\r
                        get\r
@@ -105,7 +105,7 @@ namespace System.Web.UI.WebControls
                                ((TableStyle)ControlStyle).GridLines = value;\r
                        }\r
                }\r
-               \r
+\r
                public virtual HorizontalAlign HorizontalAlign\r
                {\r
                        get\r
@@ -118,7 +118,7 @@ namespace System.Web.UI.WebControls
                                ((TableStyle)ControlStyle).HorizontalAlign = value;\r
                        }\r
                }\r
-               \r
+\r
                public virtual TableRowCollection Rows\r
                {\r
                        get\r
@@ -130,14 +130,15 @@ namespace System.Web.UI.WebControls
                                return rows;\r
                        }\r
                }\r
-               \r
-               protected override void AddAttributesToRender(HtmlTextWriter writer): AddAttributesToRender(writer)\r
+\r
+               protected override void AddAttributesToRender(HtmlTextWriter writer)\r
                {\r
+                       AddAttributesToRender(writer);\r
                        if(!BorderColor.IsEmpty)\r
                        {\r
                                writer.AddAttribute(HtmlTextWriterAttribute.Bordercolor, ColorTranslator.ToHtml(BorderColor));\r
                        }\r
-                       \r
+\r
                        Unit bw = BorderWidth;\r
                        if(GridLines == GridLines.None)\r
                        {\r
@@ -148,17 +149,17 @@ namespace System.Web.UI.WebControls
                        }\r
                        writer.AddAttribute(HtmlTextWriterAttribute.Border, ((int)bw.Value).ToString(NumberFormatInfo.InvariantInfo));\r
                }\r
-               \r
+\r
                protected override ControlCollection CreateControlCollection()\r
                {\r
                        return new TableRowControlCollection(this);\r
                }\r
-               \r
+\r
                protected override Style CreateControlStyle()\r
                {\r
                        return new TableStyle(ViewState);\r
                }\r
-               \r
+\r
                protected override void RenderContents(HtmlTextWriter writer)\r
                {\r
                        foreach(object current in Rows)\r
@@ -167,4 +168,4 @@ namespace System.Web.UI.WebControls
                        }\r
                }\r
        }\r
-}\r
+}
\ No newline at end of file

diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/TableCell.cs b/mcs/class/System.Web/System.Web.UI.WebControls/TableCell.cs
index fa978e0fb6e9708453c7ff9918fa3edda13b8461..5158a49bba30ba85cfaf359047322648df0e41bf 100644 (file)
--- a/mcs/class/System.Web/System.Web.UI.WebControls/TableCell.cs
+++ b/mcs/class/System.Web/System.Web.UI.WebControls/TableCell.cs
@@ -25,13 +25,13 @@ namespace System.Web.UI.WebControls
                {\r
                        //TODO: What's the function to prevent Control to give _auto_generated_id\r
                }\r
-               \r
+\r
                [MonoTODO]\r
                internal TableCell(HtmlTextWriterTag tag): base(tag)\r
                {\r
                        //TODO: What's the function to prevent Control to give _auto_generated_id\r
                }\r
-               \r
+\r
                public virtual int ColumnSpan\r
                {\r
                        get\r
@@ -46,7 +46,7 @@ namespace System.Web.UI.WebControls
                                ViewState["ColumnSpan"] = value;\r
                        }\r
                }\r
-               \r
+\r
                public virtual int RowSpan\r
                {\r
                        get\r
@@ -61,7 +61,7 @@ namespace System.Web.UI.WebControls
                                ViewState["RowSpan"] = value;\r
                        }\r
                }\r
-               \r
+\r
                public virtual string Text\r
                {\r
                        get\r
@@ -76,7 +76,7 @@ namespace System.Web.UI.WebControls
                                ViewState["Text"] = value;\r
                        }\r
                }\r
-               \r
+\r
                public virtual HorizontalAlign HorizontalAlign\r
                {\r
                        get\r
@@ -90,7 +90,7 @@ namespace System.Web.UI.WebControls
                                ((TableItemStyle)ControlStyle).HorizontalAlign = value;\r
                        }\r
                }\r
-               \r
+\r
                public virtual VerticalAlign VerticalAlign\r
                {\r
                        get\r
@@ -104,7 +104,7 @@ namespace System.Web.UI.WebControls
                                ((TableItemStyle)ControlStyle).VerticalAlign = value;\r
                        }\r
                }\r
-               \r
+\r
                public virtual bool Wrap\r
                {\r
                        get\r
@@ -118,15 +118,16 @@ namespace System.Web.UI.WebControls
                                ((TableItemStyle)ControlStyle).Wrap = value;\r
                        }\r
                }\r
-               \r
-               protected override void AddAttributesToRender(HtmlTextWriter writer): AddAttributesToRender(writer)\r
+\r
+               protected override void AddAttributesToRender(HtmlTextWriter writer)\r
                {\r
+                       AddAttributesToRender(writer);\r
                        if(ColumnSpan > 0)\r
                                writer.AddAttribute(HtmlTextWriterAttribute.Colspan, Colspan.ToString(NumberFormatInfo.InvariantInfo));\r
                        if(RowSpan > 0)\r
                                writer.AddAttribute(HtmlTextWriterAttribute.Rowspan, Rowspan.ToString(NumberFormatInfo.InvariantInfo));\r
                }\r
-               \r
+\r
                protected override void AddParsedSubObject(object obj)\r
                {\r
                        if(HasControls())\r
@@ -147,12 +148,12 @@ namespace System.Web.UI.WebControls
                        }\r
                        AddParsedSubObject(obj);\r
                }\r
-               \r
+\r
                protected override Style CreateControlStyle()\r
                {\r
                        return new TableItemStyle(ViewState);\r
                }\r
-               \r
+\r
                protected override void RenderContents(HtmlTextWriter writer)\r
                {\r
                        if(HasControls())\r

diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/ValidationSummary.cs b/mcs/class/System.Web/System.Web.UI.WebControls/ValidationSummary.cs
index 2c8199763e4cb2d627066d2dc4a8bc25684252a0..817edaabdf1cb42e35880326ff5b00bd856daa2c 100644 (file)
--- a/mcs/class/System.Web/System.Web.UI.WebControls/ValidationSummary.cs
+++ b/mcs/class/System.Web/System.Web.UI.WebControls/ValidationSummary.cs
@@ -1,13 +1,13 @@
 /**\r
  * Namespace: System.Web.UI.WebControls\r
  * Class:     ValidationSummary\r
- * \r
+ *\r
  * Author:  Gaurav Vaish\r
  * Maintainer: gvaish@iitk.ac.in\r
  * Contact: <my_scripts2001@yahoo.com>, <gvaish@iitk.ac.in>\r
  * Implementation: yes\r
  * Status:  ??%\r
- * \r
+ *\r
  * (C) Gaurav Vaish (2002)\r
  */\r
 \r
@@ -21,13 +21,13 @@ namespace System.Web.UI.WebControls
        public class ValidationSummary : WebControl\r
        {\r
                private bool uplevelRender;\r
-               \r
+\r
                public ValidationSummary(): base(HtmlTextWriterTag.Div)\r
                {\r
                        uplevelRender = false;\r
                        ForeColor     = Color.Red;\r
                }\r
-               \r
+\r
                public ValidationSummaryDisplayMode DisplayMode\r
                {\r
                        get\r
@@ -44,7 +44,7 @@ namespace System.Web.UI.WebControls
                                ViewState["DisplayMode"] = value;\r
                        }\r
                }\r
-               \r
+\r
                public bool EnableClientScript\r
                {\r
                        get\r
@@ -59,7 +59,7 @@ namespace System.Web.UI.WebControls
                                ViewState["EnableClientScript"] = value;\r
                        }\r
                }\r
-               \r
+\r
                public override Color ForeColor\r
                {\r
                        get\r
@@ -71,7 +71,7 @@ namespace System.Web.UI.WebControls
                                ForeColor = value;\r
                        }\r
                }\r
-               \r
+\r
                public bool ShowMessageBox\r
                {\r
                        get\r
@@ -86,7 +86,7 @@ namespace System.Web.UI.WebControls
                                ViewState["ShowMessageBox"] = value;\r
                        }\r
                }\r
-               \r
+\r
                public bool ShowSummary\r
                {\r
                        get\r
@@ -101,7 +101,7 @@ namespace System.Web.UI.WebControls
                                ViewState["ShowSummary"] = value;\r
                        }\r
                }\r
-               \r
+\r
                public string HeaderText\r
                {\r
                        get\r
@@ -116,8 +116,8 @@ namespace System.Web.UI.WebControls
                                ViewState["HeaderText"] = value;\r
                        }\r
                }\r
-               \r
-               [MonoTODO("FIXME_See_Comments"}]\r
+\r
+               [MonoTODO("FIXME_See_Comments")]\r
                protected override void AddAttributesToRender(HtmlTextWriter writer)\r
                {\r
                        AddAttributesToRender(writer);\r