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

* More error corrections....

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

diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/AdRotator.cs b/mcs/class/System.Web/System.Web.UI.WebControls/AdRotator.cs
index 37ecaf88e6510a3fe7721cf7d2f25fbc8a1a4bc1..a536218b2fa3e0cf65ed9a2d982011e0701a31c9 100755 (executable)
--- a/mcs/class/System.Web/System.Web.UI.WebControls/AdRotator.cs
+++ b/mcs/class/System.Web/System.Web.UI.WebControls/AdRotator.cs
@@ -27,7 +27,7 @@ namespace System.Web.UI.WebControls
        [DefaultEvent("AdCreated")]\r
        [DefaultProperty("AdvertisementFile")]\r
        //TODO: [Designer("??")]\r
-       [ToolboxData("<{0}:AdRotator runat=\"server\" Height=\"60px\""\r
+       [ToolboxData("<{0}:AdRotator runat=\"server\" Height=\"60px\" "\r
                     + "Width=\"468\"></{0}:AdRotator>")]\r
        public class AdRotator: WebControl\r
        {\r
@@ -42,7 +42,7 @@ namespace System.Web.UI.WebControls
 \r
                private string fileDirectory;\r
 \r
-               private class AdRecord\r
+               class AdRecord\r
                {\r
                        public IDictionary adProps;\r
                        public int         hits; // or impressions or clicks\r

diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/CalendarDay.cs b/mcs/class/System.Web/System.Web.UI.WebControls/CalendarDay.cs
index 4d60dc1c54487043c078961bab915def5dcb80f5..bcd835c45e3998751e9835ad6747f0821ff939b9 100644 (file)
--- a/mcs/class/System.Web/System.Web.UI.WebControls/CalendarDay.cs
+++ b/mcs/class/System.Web/System.Web.UI.WebControls/CalendarDay.cs
@@ -1,13 +1,13 @@
 /**\r
  * Namespace: System.Web.UI.WebControls\r
  * Class:     CalendarDay\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 (2001)\r
  */\r
 \r
@@ -36,7 +36,7 @@ namespace System.Web.UI.WebControls
                        this.isOtherMonth = isOtherMonth;\r
                        this.dayNumberText = dayNumberText;\r
                }\r
-               \r
+\r
                public DateTime Date\r
                {\r
                        get\r
@@ -44,7 +44,7 @@ namespace System.Web.UI.WebControls
                                return date;\r
                        }\r
                }\r
-               \r
+\r
                public string DayNumberText\r
                {\r
                        get\r
@@ -52,7 +52,7 @@ namespace System.Web.UI.WebControls
                                return dayNumberText;\r
                        }\r
                }\r
-               \r
+\r
                public bool IsOtherMonth\r
                {\r
                        get\r
@@ -60,7 +60,7 @@ namespace System.Web.UI.WebControls
                                return isOtherMonth;\r
                        }\r
                }\r
-               \r
+\r
                public bool IsSelectable\r
                {\r
                        get\r
@@ -72,41 +72,29 @@ namespace System.Web.UI.WebControls
                                isSelectable = value;\r
                        }\r
                }\r
-               \r
+\r
                public bool IsSelected\r
                {\r
                        get\r
                        {\r
                                return isSelected;\r
                        }\r
-                       set\r
-                       {\r
-                               isSelected = value;\r
-                       }\r
                }\r
-               \r
+\r
                public bool IsToday\r
                {\r
                        get\r
                        {\r
                                return isToday;\r
                        }\r
-                       set\r
-                       {\r
-                               isToday = value;\r
-                       }\r
                }\r
-               \r
+\r
                public bool IsWeekend\r
                {\r
                        get\r
                        {\r
                                return isWeekend;\r
                        }\r
-                       set\r
-                       {\r
-                               isWeekend = value;\r
-                       }\r
                }\r
        }\r
 }\r

diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/ChangeLog b/mcs/class/System.Web/System.Web.UI.WebControls/ChangeLog
index 18ca2c29752a1327ff7cb5830feea55e63e6292e..2a132acf3d78b90c2290ad5c6673d0bcdbf365cd 100644 (file)
--- a/mcs/class/System.Web/System.Web.UI.WebControls/ChangeLog
+++ b/mcs/class/System.Web/System.Web.UI.WebControls/ChangeLog
@@ -1,3 +1,8 @@
+2002-03-27      Gaurav Vaish <gvaish@iitk.ac.in>
+
+       * Removed extra methods, corrected access modifiers to several
+         methods.
+
 2002-03-26      Gaurav Vaish <gvaish@iitk.ac.in>
 
        * <SeveralFiles>.cs        - Added some attributes

diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/DataGrid.cs b/mcs/class/System.Web/System.Web.UI.WebControls/DataGrid.cs
index 0caabfe7872c81fb26c9855fd66ac0693a8617db..c9da59e129ac81d03a85665d79cba327731e00a1 100644 (file)
--- a/mcs/class/System.Web/System.Web.UI.WebControls/DataGrid.cs
+++ b/mcs/class/System.Web/System.Web.UI.WebControls/DataGrid.cs
@@ -23,15 +23,15 @@ namespace System.Web.UI.WebControls
        //TODO: [Editor("??")]\r
        public class DataGrid : BaseDataList, INamingContainer\r
        {\r
-               public const string CancelCommandName   = "Cancel";\r
-               public const string DeleteCommandName   = "Delete";\r
-               public const string EditCommandName     = "Edit";\r
-               public const string NextPageCommandName = "Next";\r
-               public const string PageCommandName     = "Page";\r
-               public const string PrevPageCommandName = "Prev";\r
-               public const string SelectCommandName   = "Select";\r
-               public const string SortCommandName     = "Sort";\r
-               public const string UpdateCommandName   = "Update";\r
+               public const string CancelCommandName       = "Cancel";\r
+               public const string DeleteCommandName       = "Delete";\r
+               public const string EditCommandName         = "Edit";\r
+               public const string NextPageCommandArgument = "Next";\r
+               public const string PageCommandName         = "Page";\r
+               public const string PrevPageCommandArgument = "Prev";\r
+               public const string SelectCommandName       = "Select";\r
+               public const string SortCommandName         = "Sort";\r
+               public const string UpdateCommandName       = "Update";\r
 \r
                private TableItemStyle alternatingItemStyle;\r
                private TableItemStyle editItemStyle;\r

diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/DataGridPagerStyle.cs b/mcs/class/System.Web/System.Web.UI.WebControls/DataGridPagerStyle.cs
index f3a001123f0d239a5354aa7590d75fcae4d6a113..8e15bb77b79bd237748f15ee63a387e91b556f1e 100644 (file)
--- a/mcs/class/System.Web/System.Web.UI.WebControls/DataGridPagerStyle.cs
+++ b/mcs/class/System.Web/System.Web.UI.WebControls/DataGridPagerStyle.cs
@@ -21,12 +21,12 @@ namespace System.Web.UI.WebControls
        {\r
                DataGrid owner;\r
 \r
-               public static int MODE         = (0x01 << 19);\r
-               public static int NEXT_PG_TEXT = (0x01 << 20);\r
-               public static int PG_BTN_COUNT = (0x01 << 21);\r
-               public static int POSITION     = (0x01 << 22);\r
-               public static int VISIBLE      = (0x01 << 23);\r
-               public static int PREV_PG_TEXT = (0x01 << 24);\r
+               private static int MODE         = (0x01 << 19);\r
+               private static int NEXT_PG_TEXT = (0x01 << 20);\r
+               private static int PG_BTN_COUNT = (0x01 << 21);\r
+               private static int POSITION     = (0x01 << 22);\r
+               private static int VISIBLE      = (0x01 << 23);\r
+               private static int PREV_PG_TEXT = (0x01 << 24);\r
 \r
                internal DataGridPagerStyle(DataGrid owner): base()\r
                {\r

diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/DataList.cs b/mcs/class/System.Web/System.Web.UI.WebControls/DataList.cs
index 5ebc158807fa9dd02be5565b1312919fe701588e..1cfda979874398b17c0b75995fb7252525a599aa 100755 (executable)
--- a/mcs/class/System.Web/System.Web.UI.WebControls/DataList.cs
+++ b/mcs/class/System.Web/System.Web.UI.WebControls/DataList.cs
@@ -669,21 +669,21 @@ namespace System.Web.UI.WebControls
                        }\r
                }\r
 \r
-               protected virtual void OnItemCreated(DataListCommandEventArgs e)\r
+               protected virtual void OnItemCreated(DataListItemEventArgs e)\r
                {\r
                        if(Events != null)\r
                        {\r
-                               DataListCommandEventHandler dlceh = (DataListCommandEventHandler)(Events[ItemCreatedEvent]);\r
+                               DataListItemEventHandler dlceh = (DataListItemEventHandler)(Events[ItemCreatedEvent]);\r
                                if(dlceh != null)\r
                                        dlceh(this, e);\r
                        }\r
                }\r
 \r
-               protected virtual void OnItemDataBound(DataListCommandEventArgs e)\r
+               protected virtual void OnItemDataBound(DataListItemEventArgs e)\r
                {\r
                        if(Events != null)\r
                        {\r
-                               DataListCommandEventHandler dlceh = (DataListCommandEventHandler)(Events[ItemDataBoundEvent]);\r
+                               DataListItemEventHandler dlceh = (DataListItemEventHandler)(Events[ItemDataBoundEvent]);\r
                                if(dlceh != null)\r
                                        dlceh(this, e);\r
                        }\r
@@ -747,11 +747,8 @@ namespace System.Web.UI.WebControls
                        throw new NotImplementedException();\r
                }\r
 \r
-               /// <summary>\r
-               /// Undocumented\r
-               /// </summary>\r
                [MonoTODO]\r
-               protected DataListItem CreateItem(int itemIndex, ListItemType itemType, bool dataBind, object dataItem)\r
+               private DataListItem CreateItem(int itemIndex, ListItemType itemType, bool dataBind, object dataItem)\r
                {\r
                        throw new NotImplementedException();\r
                }\r

diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/ImageAlign.cs b/mcs/class/System.Web/System.Web.UI.WebControls/ImageAlign.cs
index ef096f576cb48b7824e9c363d9c0140abd4c91c4..5a5fa02db58766e56cc6bf44d19633d5b18bf24e 100755 (executable)
--- a/mcs/class/System.Web/System.Web.UI.WebControls/ImageAlign.cs
+++ b/mcs/class/System.Web/System.Web.UI.WebControls/ImageAlign.cs
@@ -1,13 +1,13 @@
 /**\r
  * Namespace: System.Web.UI.WebControls\r
  * Enumeration:     ImageAlign\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 (2001)\r
  */\r
 \r
@@ -18,7 +18,7 @@ namespace System.Web.UI.WebControls
                NotSet,\r
                Left,\r
                Right,\r
-               BaseLine,\r
+               Baseline,\r
                Top,\r
                Middle,\r
                Bottom,\r

diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/ListItem.cs b/mcs/class/System.Web/System.Web.UI.WebControls/ListItem.cs
index 5f13325607ff451e9a6ae485ef71b3bfbe15d6cd..e58a1917835fe8efdb6f7cc3483dc4bc9d251416 100644 (file)
--- a/mcs/class/System.Web/System.Web.UI.WebControls/ListItem.cs
+++ b/mcs/class/System.Web/System.Web.UI.WebControls/ListItem.cs
@@ -176,7 +176,7 @@ namespace System.Web.UI.WebControls
                        throw new HttpException(HttpRuntime.FormatResourceString("Cannot_Have_Children_Of_Type", "ListItem", obj.GetType().ToString()));\r
                }\r
 \r
-               internal bool IsTrackingViewState\r
+               bool IsTrackingViewState\r
                {\r
                        get\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 d45afcba779221afab36d9b156978352365337da..41546a4c814016d28de446528b61b6fbe16f05fa 100644 (file)
--- a/mcs/class/System.Web/System.Web.UI.WebControls/PagedDataSource.cs
+++ b/mcs/class/System.Web/System.Web.UI.WebControls/PagedDataSource.cs
@@ -276,7 +276,7 @@ namespace System.Web.UI.WebControls
                        return dataSource.GetEnumerator();\r
                }\r
 \r
-               private class PrivateIEnumeratorEnumerator : IEnumerator\r
+               class PrivateIEnumeratorEnumerator : IEnumerator\r
                {\r
                        private int index;\r
                        private int max;\r
@@ -312,7 +312,7 @@ namespace System.Web.UI.WebControls
                        }\r
                }\r
 \r
-               private class PrivateICollectionEnumerator : IEnumerator\r
+               class PrivateICollectionEnumerator : IEnumerator\r
                {\r
                        private int index;\r
                        private int start;\r
@@ -364,7 +364,7 @@ namespace System.Web.UI.WebControls
                        }\r
                }\r
 \r
-               private class PrivateArrayEnumerator : IEnumerator\r
+               class PrivateArrayEnumerator : IEnumerator\r
                {\r
                        private int index;\r
                        private int start;\r
@@ -407,7 +407,7 @@ namespace System.Web.UI.WebControls
                        }\r
                }\r
 \r
-               private class PrivateListEnumerator : IEnumerator\r
+               class PrivateListEnumerator : IEnumerator\r
                {\r
                        private int   index;\r
                        private int   start;\r

diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/Repeater.cs b/mcs/class/System.Web/System.Web.UI.WebControls/Repeater.cs
index f043939d59caf56a1b8c9bd27642f3479fec33cb..61c91e686c9390bb9ba10c66a77a4a341042f242 100644 (file)
--- a/mcs/class/System.Web/System.Web.UI.WebControls/Repeater.cs
+++ b/mcs/class/System.Web/System.Web.UI.WebControls/Repeater.cs
@@ -256,11 +256,11 @@ namespace System.Web.UI.WebControls
                        }\r
                }\r
 \r
-               protected virtual void OnItemCreated(RepeaterCommandEventArgs e)\r
+               protected virtual void OnItemCreated(RepeaterItemEventArgs e)\r
                {\r
                        if(Events != null)\r
                        {\r
-                               RepeaterCommandEventHandler rceh = (RepeaterCommandEventHandler)(ViewState[ItemCreatedEvent]);\r
+                               RepeaterItemEventHandler rceh = (RepeaterItemEventHandler)(ViewState[ItemCreatedEvent]);\r
                                if(rceh != null)\r
                                {\r
                                        rceh(this, e);\r
@@ -268,11 +268,11 @@ namespace System.Web.UI.WebControls
                        }\r
                }\r
 \r
-               protected virtual void OnItemDataBound(RepeaterCommandEventArgs e)\r
+               protected virtual void OnItemDataBound(RepeaterItemEventArgs e)\r
                {\r
                        if(Events != null)\r
                        {\r
-                               RepeaterCommandEventHandler rceh = (RepeaterCommandEventHandler)(ViewState[ItemDataBoundEvent]);\r
+                               RepeaterItemEventHandler rceh = (RepeaterItemEventHandler)(ViewState[ItemDataBoundEvent]);\r
                                if(rceh != null)\r
                                {\r
                                        rceh(this, e);\r
@@ -280,4 +280,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/RepeaterItem.cs b/mcs/class/System.Web/System.Web.UI.WebControls/RepeaterItem.cs
index c3e13e8ffbe00fc024ea7da68db841f0996269e5..69adc3bb36907f4cec6f5c48bcafa326c0dbb1bf 100644 (file)
--- a/mcs/class/System.Web/System.Web.UI.WebControls/RepeaterItem.cs
+++ b/mcs/class/System.Web/System.Web.UI.WebControls/RepeaterItem.cs
@@ -69,4 +69,4 @@ namespace System.Web.UI.WebControls
                        return false;\r
                }\r
        }\r
-}\r
+}
\ No newline at end of file