2002-03-27 Gaurav Vaish <[email protected]>

* More error corrections....

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

mcs/class/System.Web/System.Web.UI.WebControls/AdRotator.cs

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

mcs/class/System.Web/System.Web.UI.WebControls/CalendarDay.cs

@@ -1,13 +1,13 @@
 /**
  * Namespace: System.Web.UI.WebControls
  * Class:     CalendarDay
- * 
+ *
  * Author:  Gaurav Vaish
  * Maintainer: [email protected]
  * Contact: <[email protected]>, <[email protected]>
  * Implementation: yes
  * Status:  100%
- * 
+ *
  * (C) Gaurav Vaish (2001)
  */
 
@@ -36,7 +36,7 @@ namespace System.Web.UI.WebControls
 			this.isOtherMonth = isOtherMonth;
 			this.dayNumberText = dayNumberText;
 		}
-		
+
 		public DateTime Date
 		{
 			get
@@ -44,7 +44,7 @@ namespace System.Web.UI.WebControls
 				return date;
 			}
 		}
-		
+
 		public string DayNumberText
 		{
 			get
@@ -52,7 +52,7 @@ namespace System.Web.UI.WebControls
 				return dayNumberText;
 			}
 		}
-		
+
 		public bool IsOtherMonth
 		{
 			get
@@ -60,7 +60,7 @@ namespace System.Web.UI.WebControls
 				return isOtherMonth;
 			}
 		}
-		
+
 		public bool IsSelectable
 		{
 			get
@@ -72,41 +72,29 @@ namespace System.Web.UI.WebControls
 				isSelectable = value;
 			}
 		}
-		
+
 		public bool IsSelected
 		{
 			get
 			{
 				return isSelected;
 			}
-			set
-			{
-				isSelected = value;
-			}
 		}
-		
+
 		public bool IsToday
 		{
 			get
 			{
 				return isToday;
 			}
-			set
-			{
-				isToday = value;
-			}
 		}
-		
+
 		public bool IsWeekend
 		{
 			get
 			{
 				return isWeekend;
 			}
-			set
-			{
-				isWeekend = value;
-			}
 		}
 	}
 }

mcs/class/System.Web/System.Web.UI.WebControls/ChangeLog

@@ -1,3 +1,8 @@
+2002-03-27      Gaurav Vaish <[email protected]>
+
+	* Removed extra methods, corrected access modifiers to several
+	  methods.
+
 2002-03-26      Gaurav Vaish <[email protected]>
 
 	* <SeveralFiles>.cs        - Added some attributes

mcs/class/System.Web/System.Web.UI.WebControls/DataGrid.cs

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

mcs/class/System.Web/System.Web.UI.WebControls/DataGridPagerStyle.cs

@@ -21,12 +21,12 @@ namespace System.Web.UI.WebControls
 	{
 		DataGrid owner;
 
-		public static int MODE         = (0x01 << 19);
-		public static int NEXT_PG_TEXT = (0x01 << 20);
-		public static int PG_BTN_COUNT = (0x01 << 21);
-		public static int POSITION     = (0x01 << 22);
-		public static int VISIBLE      = (0x01 << 23);
-		public static int PREV_PG_TEXT = (0x01 << 24);
+		private static int MODE         = (0x01 << 19);
+		private static int NEXT_PG_TEXT = (0x01 << 20);
+		private static int PG_BTN_COUNT = (0x01 << 21);
+		private static int POSITION     = (0x01 << 22);
+		private static int VISIBLE      = (0x01 << 23);
+		private static int PREV_PG_TEXT = (0x01 << 24);
 
 		internal DataGridPagerStyle(DataGrid owner): base()
 		{

mcs/class/System.Web/System.Web.UI.WebControls/DataList.cs

@@ -669,21 +669,21 @@ namespace System.Web.UI.WebControls
 			}
 		}
 
-		protected virtual void OnItemCreated(DataListCommandEventArgs e)
+		protected virtual void OnItemCreated(DataListItemEventArgs e)
 		{
 			if(Events != null)
 			{
-				DataListCommandEventHandler dlceh = (DataListCommandEventHandler)(Events[ItemCreatedEvent]);
+				DataListItemEventHandler dlceh = (DataListItemEventHandler)(Events[ItemCreatedEvent]);
 				if(dlceh != null)
 					dlceh(this, e);
 			}
 		}
 
-		protected virtual void OnItemDataBound(DataListCommandEventArgs e)
+		protected virtual void OnItemDataBound(DataListItemEventArgs e)
 		{
 			if(Events != null)
 			{
-				DataListCommandEventHandler dlceh = (DataListCommandEventHandler)(Events[ItemDataBoundEvent]);
+				DataListItemEventHandler dlceh = (DataListItemEventHandler)(Events[ItemDataBoundEvent]);
 				if(dlceh != null)
 					dlceh(this, e);
 			}
@@ -747,11 +747,8 @@ namespace System.Web.UI.WebControls
 			throw new NotImplementedException();
 		}
 
-		/// <summary>
-		/// Undocumented
-		/// </summary>
 		[MonoTODO]
-		protected DataListItem CreateItem(int itemIndex, ListItemType itemType, bool dataBind, object dataItem)
+		private DataListItem CreateItem(int itemIndex, ListItemType itemType, bool dataBind, object dataItem)
 		{
 			throw new NotImplementedException();
 		}

mcs/class/System.Web/System.Web.UI.WebControls/ImageAlign.cs

@@ -1,13 +1,13 @@
 /**
  * Namespace: System.Web.UI.WebControls
  * Enumeration:     ImageAlign
- * 
+ *
  * Author:  Gaurav Vaish
  * Maintainer: [email protected]
  * Contact: <[email protected]>, <[email protected]>
  * Implementation: yes
  * Status:  100%
- * 
+ *
  * (C) Gaurav Vaish (2001)
  */
 
@@ -18,7 +18,7 @@ namespace System.Web.UI.WebControls
 		NotSet,
 		Left,
 		Right,
-		BaseLine,
+		Baseline,
 		Top,
 		Middle,
 		Bottom,

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()));
 		}
 
-		internal bool IsTrackingViewState
+		bool IsTrackingViewState
 		{
 			get
 			{

mcs/class/System.Web/System.Web.UI.WebControls/PagedDataSource.cs

@@ -276,7 +276,7 @@ namespace System.Web.UI.WebControls
 			return dataSource.GetEnumerator();
 		}
 
-		private class PrivateIEnumeratorEnumerator : IEnumerator
+		class PrivateIEnumeratorEnumerator : IEnumerator
 		{
 			private int index;
 			private int max;
@@ -312,7 +312,7 @@ namespace System.Web.UI.WebControls
 			}
 		}
 
-		private class PrivateICollectionEnumerator : IEnumerator
+		class PrivateICollectionEnumerator : IEnumerator
 		{
 			private int index;
 			private int start;
@@ -364,7 +364,7 @@ namespace System.Web.UI.WebControls
 			}
 		}
 
-		private class PrivateArrayEnumerator : IEnumerator
+		class PrivateArrayEnumerator : IEnumerator
 		{
 			private int index;
 			private int start;
@@ -407,7 +407,7 @@ namespace System.Web.UI.WebControls
 			}
 		}
 
-		private class PrivateListEnumerator : IEnumerator
+		class PrivateListEnumerator : IEnumerator
 		{
 			private int   index;
 			private int   start;

mcs/class/System.Web/System.Web.UI.WebControls/Repeater.cs

@@ -256,11 +256,11 @@ namespace System.Web.UI.WebControls
 			}
 		}
 
-		protected virtual void OnItemCreated(RepeaterCommandEventArgs e)
+		protected virtual void OnItemCreated(RepeaterItemEventArgs e)
 		{
 			if(Events != null)
 			{
-				RepeaterCommandEventHandler rceh = (RepeaterCommandEventHandler)(ViewState[ItemCreatedEvent]);
+				RepeaterItemEventHandler rceh = (RepeaterItemEventHandler)(ViewState[ItemCreatedEvent]);
 				if(rceh != null)
 				{
 					rceh(this, e);
@@ -268,11 +268,11 @@ namespace System.Web.UI.WebControls
 			}
 		}
 
-		protected virtual void OnItemDataBound(RepeaterCommandEventArgs e)
+		protected virtual void OnItemDataBound(RepeaterItemEventArgs e)
 		{
 			if(Events != null)
 			{
-				RepeaterCommandEventHandler rceh = (RepeaterCommandEventHandler)(ViewState[ItemDataBoundEvent]);
+				RepeaterItemEventHandler rceh = (RepeaterItemEventHandler)(ViewState[ItemDataBoundEvent]);
 				if(rceh != null)
 				{
 					rceh(this, e);
@@ -280,4 +280,4 @@ namespace System.Web.UI.WebControls
 			}
 		}
 	}
-}
+}

mcs/class/System.Web/System.Web.UI.WebControls/RepeaterItem.cs

@@ -69,4 +69,4 @@ namespace System.Web.UI.WebControls
 			return false;
 		}
 	}
-}
+}