2001-12-18 Gaurav Vaish <gvaish@iitk.ac.in>

* System.Web.UI/*.cs
* System.Web.UI.WebControls.cs  -- trying to make build. A nightmare!!

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

diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/AdCreatedEventArgs.cs b/mcs/class/System.Web/System.Web.UI.WebControls/AdCreatedEventArgs.cs
index fa74e0c6eefe39cfaeb38829553b29d59af62f69..d0e94b87f8833a8020f1574f76d3b3a59e2f6f19 100755 (executable)
--- a/mcs/class/System.Web/System.Web.UI.WebControls/AdCreatedEventArgs.cs
+++ b/mcs/class/System.Web/System.Web.UI.WebControls/AdCreatedEventArgs.cs
@@ -26,16 +26,15 @@ namespace System.Web.UI.WebControls
                private string      imageUrl;\r
                private string      navigateUrl;\r
 \r
-               public AdCreatedEventArgs(IDictionary adProperties)\r
+               public AdCreatedEventArgs(IDictionary adProperties): base()\r
                {\r
-                       super();\r
                        Initialize();\r
                        this.adProperties = adProperties;\r
                        if(adProperties!=null)\r
                        {\r
-                               imageUrl = (string)adProperties.Item["ImageUrl"];\r
-                               navigateUrl = (string)adProperties.Item["NavigateUrl"];\r
-                               alternateText = (string)adProperties.Item["AlternateText"];\r
+                               imageUrl = (string)adProperties["ImageUrl"];\r
+                               navigateUrl = (string)adProperties["NavigateUrl"];\r
+                               alternateText = (string)adProperties["AlternateText"];\r
                        }\r
                }\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 a0ca3341b95b4c4a4c83e610715a0b1b35a06b19..28e229313effabcb1b605e766d81c9d6b44ee5bc 100755 (executable)
--- a/mcs/class/System.Web/System.Web.UI.WebControls/DataList.cs
+++ b/mcs/class/System.Web/System.Web.UI.WebControls/DataList.cs
@@ -12,6 +12,7 @@
  */\r
 \r
 using System;\r
+using System.Collections;\r
 using System.Web;\r
 using System.Web.UI;\r
 \r
@@ -22,7 +23,7 @@ namespace System.Web.UI.WebControls
                //\r
                public const string CancelCommandName = "Cancel";\r
                public const string DeleteCommandName = "Delete";\r
-               public const string EditCommandName = "Edit";\r
+               public const string EditCommandName   = "Edit";\r
                public const string SelectCommandName = "Select";\r
                public const string UpdateCommandName = "Update";\r
 \r
@@ -40,6 +41,8 @@ namespace System.Web.UI.WebControls
                private int editItemIndex;\r
                private bool extractTemplateRows;\r
                \r
+               private ArrayList itemsArray;\r
+               \r
                public DataList()\r
                {\r
                        alternatingItemStyle = new TableItemStyle();\r
@@ -52,6 +55,8 @@ namespace System.Web.UI.WebControls
                        headerTemplate          = null;\r
                        \r
                        extractTemplateRows = false;\r
+                       \r
+                       itemsArray = null;\r
                }\r
                \r
                public virtual TableItemStyle AlternatingItemStyle\r
@@ -172,11 +177,10 @@ namespace System.Web.UI.WebControls
                        }\r
                }\r
                \r
-               //TODO: To implement the following functions found in the BaseDataList abstract class\r
-               /*\r
-                * PrepareControlHierarchy()\r
-                * CreateControlHeirarchy(bool)\r
-                */\r
+               private DataListItem GetItem(ListItemType itemType, int repeatIndex)\r
+               {\r
+                       throw new NotImplementedException();\r
+               }\r
                \r
                /// <summary>\r
                /// Undocumented\r
@@ -217,5 +221,30 @@ namespace System.Web.UI.WebControls
                                return (separatorTemplate!=null);\r
                        }\r
                }\r
+               \r
+               int IRepeatInfoUser.RepeatedItemCount\r
+               {\r
+                       get\r
+                       {\r
+                               if(itemsArray!=null)\r
+                                       return itemsArray.Count;\r
+                               return 0;\r
+                       }\r
+               }\r
+               \r
+               void IRepeatInfoUser.RenderItem(ListItemType itemType, int repeatIndex, RepeatInfo repeatInfo, HtmlTextWriter writer)\r
+               {\r
+                       DataListItem item = GetItem(itemType, repeatIndex);\r
+                       if(item!=null)\r
+                       {\r
+                               item.RenderItem(writer, extractTemplateRows, repeatInfo.RepeatLayout == RepeatLayout.Table);\r
+                       }\r
+               }\r
+               \r
+               Style IRepeatInfoUser.GetItemStyle(ListItemType itemType, int repeatIndex)\r
+               {\r
+                       if(GetItem(itemType, repeatIndex)!=null && ControlStyleCreated)\r
+                               return ControlStyle;\r
+               }\r
        }\r
 }\r

diff --git a/mcs/class/System.Web/System.Web.UI/Control.cs b/mcs/class/System.Web/System.Web.UI/Control.cs
index 68c0cf438b13a3790a6ff536a713fd4ff885a5db..3ac1f1ff6ae65cba5721ccdf0322f92cbed371a7 100644 (file)
--- a/mcs/class/System.Web/System.Web.UI/Control.cs
+++ b/mcs/class/System.Web/System.Web.UI/Control.cs
@@ -115,7 +115,7 @@ namespace System.Web.UI
 \r
                 public Control()\r
                 {\r
-                        if (this is NamingContainer) isNamingContainer = true;\r
+                        if (this is INamingContainer) _isNamingContainer = true;\r
                 }\r
                 public virtual string ClientID //DIT\r
                 {\r
@@ -150,7 +150,7 @@ namespace System.Web.UI
                 {\r
                         get //DIT\r
                         {\r
-                                return _userID;\r
+                                return _userId;\r
                         }\r
                         set\r
                         {\r
@@ -217,6 +217,7 @@ namespace System.Web.UI
                         {\r
                                 //TODO: Some Naming container methods here. What are they? Why arnt they declared?\r
                                 //Note: Nuked the old stuff here. Was total crap. :)\r
+                                throw new NotImplementedException();\r
                         }\r
                 }\r
                 public virtual bool Visible\r
@@ -262,8 +263,11 @@ namespace System.Web.UI
                 {\r
                         get\r
                         {\r
-                                if (_events != null) return _events;\r
-                                _events = new EventHandlerList();\r
+                                if (_events == null)\r
+                                {\r
+                                       _events = new EventHandlerList();\r
+                                }\r
+                                return _events;\r
                         }\r
                 }\r
                 protected bool HasChildViewState //DIT\r
@@ -278,15 +282,20 @@ namespace System.Web.UI
                 {\r
                         get\r
                         {\r
-                                return _trackingViewState;\r
+                                return _trackViewState;\r
                         }\r
                 }\r
                 protected virtual StateBag ViewState\r
                 {\r
                         get\r
                         {\r
-                                if (_viewState == null) _viewState = new StateBag(ViewStateIgnoreCase);\r
-                                return _viewState;\r
+                               if(_viewState == null)\r
+                               {\r
+                                       _viewState = new StateBag(ViewStateIgnoresCase);\r
+                               if(IsTrackingViewState)\r
+                                               _viewState.TrackViewState();\r
+                               }\r
+                               return _viewState;\r
                         }\r
                 }\r
                 protected virtual bool ViewStateIgnoresCase //DIT\r