Author: gonzalo
Date: 2005-09-27 19:46:56 -0400 (Tue, 27 Sep 2005)
New Revision: 50899
Modified:
trunk/mcs/class/System.Web/System.Web.UI.WebControls/Calendar.cs
trunk/mcs/class/System.Web/System.Web.UI.WebControls/ChangeLog
Log:
2005-09-27 Gonzalo Paniagua Javier <[EMAIL PROTECTED]>
* Calendar.cs: TrackViewState should be called upon creation, not on
every get_XXX call. Cleanup.
Modified: trunk/mcs/class/System.Web/System.Web.UI.WebControls/Calendar.cs
===================================================================
--- trunk/mcs/class/System.Web/System.Web.UI.WebControls/Calendar.cs
2005-09-27 23:36:04 UTC (rev 50898)
+++ trunk/mcs/class/System.Web/System.Web.UI.WebControls/Calendar.cs
2005-09-27 23:46:56 UTC (rev 50899)
@@ -70,15 +70,7 @@
public Calendar ()
{
- dayHeaderStyle = null;
- dayStyle = null;
- nextPrevStyle = null;
- selectedDayStyle = null;
- titleStyle = null;
- todayDayStyle = null;
dateInfo = new DateTimeFormatInfo ();
- selectedDatesCollection = null;
- dateList = null;
}
#if NET_2_0
@@ -155,12 +147,12 @@
[WebCategory ("Style")]
public TableItemStyle DayHeaderStyle {
get {
- if (dayHeaderStyle == null)
+ if (dayHeaderStyle == null) {
dayHeaderStyle = new TableItemStyle ();
+ if (IsTrackingViewState)
+ dayHeaderStyle.TrackViewState
();
+ }
- if (IsTrackingViewState)
- dayHeaderStyle.TrackViewState ();
-
return dayHeaderStyle;
}
}
@@ -179,7 +171,8 @@
set {
if (value != DayNameFormat.FirstLetter && value
!= DayNameFormat.FirstTwoLetters &&
value != DayNameFormat.Full && value !=
DayNameFormat.Short) {
- throw new
ArgumentOutOfRangeException ("The specified day name format is not one of the
DayNameFormat values."); }
+ throw new ArgumentOutOfRangeException
("The specified day name format is not one of the DayNameFormat values.");
+ }
ViewState ["DayNameFormat"] = value;
}
@@ -193,12 +186,12 @@
[WebCategory ("Style")]
public TableItemStyle DayStyle {
get {
- if (dayStyle == null)
+ if (dayStyle == null) {
dayStyle = new TableItemStyle ();
+ if (IsTrackingViewState)
+ dayStyle.TrackViewState ();
+ }
- if (IsTrackingViewState)
- dayStyle.TrackViewState ();
-
return dayStyle;
}
}
@@ -269,12 +262,12 @@
[WebCategory ("Style")]
public TableItemStyle NextPrevStyle {
get {
- if (nextPrevStyle == null)
+ if (nextPrevStyle == null) {
nextPrevStyle = new TableItemStyle ();
+ if (IsTrackingViewState)
+ nextPrevStyle.TrackViewState ();
+ }
- if (IsTrackingViewState)
- nextPrevStyle.TrackViewState ();
-
return nextPrevStyle;
}
}
@@ -287,12 +280,12 @@
[WebCategory ("Style")]
public TableItemStyle OtherMonthDayStyle {
get {
- if (otherMonthDayStyle == null)
+ if (otherMonthDayStyle == null) {
otherMonthDayStyle = new TableItemStyle
();
+ if (IsTrackingViewState)
+
otherMonthDayStyle.TrackViewState ();
+ }
- if (IsTrackingViewState)
- otherMonthDayStyle.TrackViewState ();
-
return otherMonthDayStyle;
}
}
@@ -361,11 +354,11 @@
[WebCategory ("Style")]
public TableItemStyle SelectedDayStyle {
get {
- if (selectedDayStyle == null)
+ if (selectedDayStyle == null) {
selectedDayStyle = new TableItemStyle
();
-
- if (IsTrackingViewState)
- selectedDayStyle.TrackViewState ();
+ if (IsTrackingViewState)
+ selectedDayStyle.TrackViewState
();
+ }
return selectedDayStyle;
}
@@ -417,12 +410,12 @@
[WebCategory ("Style")]
public TableItemStyle SelectorStyle {
get {
- if (selectorStyle == null)
+ if (selectorStyle == null) {
selectorStyle = new TableItemStyle ();
+ if (IsTrackingViewState)
+ selectorStyle.TrackViewState ();
+ }
- if (IsTrackingViewState)
- selectorStyle.TrackViewState ();
-
return selectorStyle;
}
}
@@ -537,12 +530,12 @@
[WebCategory ("Style")]
public TableItemStyle TitleStyle {
get {
- if (titleStyle == null)
+ if (titleStyle == null) {
titleStyle = new TableItemStyle ();
+ if (IsTrackingViewState)
+ titleStyle.TrackViewState ();
+ }
- if (IsTrackingViewState)
- titleStyle.TrackViewState ();
-
return titleStyle;
}
}
@@ -555,12 +548,12 @@
[WebCategory ("Style")]
public TableItemStyle TodayDayStyle {
get {
- if (todayDayStyle == null)
+ if (todayDayStyle == null) {
todayDayStyle = new TableItemStyle ();
+ if (IsTrackingViewState)
+ todayDayStyle.TrackViewState ();
+ }
- if (IsTrackingViewState)
- todayDayStyle.TrackViewState ();
-
return todayDayStyle;
}
}
@@ -628,12 +621,12 @@
[WebCategory ("Style")]
public TableItemStyle WeekendDayStyle {
get {
- if (weekendDayStyle == null)
+ if (weekendDayStyle == null) {
weekendDayStyle = new TableItemStyle ();
+ if (IsTrackingViewState)
+ weekendDayStyle.TrackViewState
();
+ }
- if (IsTrackingViewState)
- weekendDayStyle.TrackViewState ();
-
return weekendDayStyle;
}
}
@@ -642,11 +635,9 @@
// Private properties
private DateTime DisplayDate {
get {
- DateTime dateTime;
- if (VisibleDate == DateTime.MinValue) // If
visibledate is still the default value
+ DateTime dateTime = VisibleDate;
+ if (dateTime == DateTime.MinValue) // If
visibledate is still the default value
dateTime = TodaysDate;
- else
- dateTime = VisibleDate;
return dateTime;
}
@@ -688,12 +679,10 @@
if (arg.Length < 1)
return;
- DateTime dt = dateZenith;
-
if (arg[0] == 'V') { // Goes to Next or Previous month
DateTime prev = VisibleDate;
int days = Int32.Parse (arg.Substring (1));
- dt = GetGlobalCalendar().AddDays (dt, days);
+ DateTime dt = GetGlobalCalendar().AddDays
(dateZenith, days);
VisibleDate = dt;
OnVisibleMonthChanged (VisibleDate, prev);
return;
@@ -704,15 +693,17 @@
num = arg.Substring (1);
days = num.Substring (num.Length - 2, 2);
date = num.Substring (0, num.Length - 2);
- dt = GetGlobalCalendar().AddDays (dt,
Int32.Parse (date));
- SelectDates (dt, Int32.Parse (days));
+ DateTime d = GetGlobalCalendar().AddDays
(dateZenith, Int32.Parse (date));
+ SelectedDates.SelectRange (d, d.AddDays
(Int32.Parse (days)));
+ OnSelectionChanged ();
return;
}
// Selects a single day
int daysFromZenith = Int32.Parse (arg);
- dt = GetGlobalCalendar().AddDays (dt, daysFromZenith);
- SelectDates (dt, 1);
+ DateTime day = GetGlobalCalendar().AddDays (dateZenith,
daysFromZenith);
+ SelectedDates.SelectRange (day, day);
+ OnSelectionChanged ();
}
protected override void LoadViewState (object savedState)
@@ -758,11 +749,9 @@
protected virtual void OnDayRender (TableCell cell, CalendarDay
day)
{
- if (Events != null) {
- DayRenderEventHandler eh =
(DayRenderEventHandler) (Events [DayRenderEvent]);
- if (eh != null)
- eh (this, new DayRenderEventArgs (cell,
day));
- }
+ DayRenderEventHandler eh = (DayRenderEventHandler)
(Events [DayRenderEvent]);
+ if (eh != null)
+ eh (this, new DayRenderEventArgs (cell, day));
}
#if NET_2_0
@@ -777,20 +766,16 @@
protected virtual void OnSelectionChanged ()
{
- if (Events != null) {
- EventHandler eh = (EventHandler) (Events
[SelectionChangedEvent]);
- if (eh != null)
- eh (this, EventArgs.Empty);
- }
+ EventHandler eh = (EventHandler) (Events
[SelectionChangedEvent]);
+ if (eh != null)
+ eh (this, EventArgs.Empty);
}
protected virtual void OnVisibleMonthChanged (DateTime newDate,
DateTime previousDate)
{
- if (Events != null) {
- MonthChangedEventHandler eh =
(MonthChangedEventHandler) (Events [VisibleMonthChangedEvent]);
- if (eh != null)
- eh (this, new MonthChangedEventArgs
(newDate, previousDate));
- }
+ MonthChangedEventHandler eh =
(MonthChangedEventHandler) (Events [VisibleMonthChangedEvent]);
+ if (eh != null)
+ eh (this, new MonthChangedEventArgs (newDate,
previousDate));
}
#if NET_2_0
@@ -1226,12 +1211,7 @@
break;
case NextPrevFormat.CustomText:
default:
- if (next) {
- text = NextMonthText;
- }
- else {
- text = PrevMonthText;
- }
+ text = ((next) ? NextMonthText :
PrevMonthText);
break;
}
@@ -1243,12 +1223,6 @@
return (day == DayOfWeek.Saturday || day ==
DayOfWeek.Sunday);
}
- private void SelectDates (DateTime startDate, int days)
- {
- SelectedDates.SelectRange (startDate,
GetGlobalCalendar().AddDays (startDate, days - 1));
- OnSelectionChanged ();
- }
-
private double GetCellWidth ()
{
return HasWeekSelectors (SelectionMode) ? 100/8 : 100/7;
@@ -1261,8 +1235,7 @@
[WebSysDescription ("")]
[WebCategory ("Action")]
- public event DayRenderEventHandler DayRender
- {
+ public event DayRenderEventHandler DayRender {
add {
Events.AddHandler (DayRenderEvent, value);
}
@@ -1273,9 +1246,9 @@
[WebSysDescription ("")]
[WebCategory ("Action")]
- public event EventHandler SelectionChanged
- {
+ public event EventHandler SelectionChanged {
add {
+ Console.WriteLine ("Adding one");
Events.AddHandler (SelectionChangedEvent,
value);
}
remove {
@@ -1285,8 +1258,7 @@
[WebSysDescription ("")]
[WebCategory ("Action")]
- public event MonthChangedEventHandler VisibleMonthChanged
- {
+ public event MonthChangedEventHandler VisibleMonthChanged {
add {
Events.AddHandler (VisibleMonthChangedEvent,
value);
}
@@ -1294,8 +1266,6 @@
Events.RemoveHandler (VisibleMonthChangedEvent,
value);
}
}
-
}
-
}
Modified: trunk/mcs/class/System.Web/System.Web.UI.WebControls/ChangeLog
===================================================================
--- trunk/mcs/class/System.Web/System.Web.UI.WebControls/ChangeLog
2005-09-27 23:36:04 UTC (rev 50898)
+++ trunk/mcs/class/System.Web/System.Web.UI.WebControls/ChangeLog
2005-09-27 23:46:56 UTC (rev 50899)
@@ -1,5 +1,10 @@
2005-09-27 Gonzalo Paniagua Javier <[EMAIL PROTECTED]>
+ * Calendar.cs: TrackViewState should be called upon creation, not on
+ every get_XXX call. Cleanup.
+
+2005-09-27 Gonzalo Paniagua Javier <[EMAIL PROTECTED]>
+
* DataGrid.cs: fix another test. The ID of the table generated by the
datagrid is set to the one on the datagrid if no one set the ID for the
table.
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches