Author: [EMAIL PROTECTED]
Date: Thu Nov 20 12:45:19 2008
New Revision: 4135
Modified:
branches/1_6_datepicker/user/src/com/google/gwt/user/datepicker/client/DatePicker.java
branches/1_6_datepicker/user/src/com/google/gwt/user/datepicker/client/DefaultCalendarView.java
branches/1_6_datepicker/user/src/com/google/gwt/user/theme/standard/public/gwt/standard/standard.css
Log:
Using value rather then selected terminology.
Modified:
branches/1_6_datepicker/user/src/com/google/gwt/user/datepicker/client/DatePicker.java
==============================================================================
---
branches/1_6_datepicker/user/src/com/google/gwt/user/datepicker/client/DatePicker.java
(original)
+++
branches/1_6_datepicker/user/src/com/google/gwt/user/datepicker/client/DatePicker.java
Thu Nov 20 12:45:19 2008
@@ -80,16 +80,16 @@
return day("Highlighted");
}
- public String dayIsSelected() {
- return day("Selected");
+ public String dayIsToday() {
+ return day("Today");
}
- public String dayIsSelectedAndHighlighted() {
- return dayIsSelected() + "AndHighlighted";
+ public String dayIsValue() {
+ return day("Value");
}
- public String dayIsToday() {
- return day("Today");
+ public String dayIsValueAndHighlighted() {
+ return dayIsValue() + "AndHighlighted";
}
public String dayIsWeekend() {
@@ -190,7 +190,7 @@
private MonthSelector monthSelector;
private CalendarView calendar;
private CalendarModel model;
- private Date selectedDate;
+ private Date value;
private StandardCss css = StandardCss.DEFAULT;
/**
@@ -202,7 +202,7 @@
}
/**
- * Constructor for use by subgetType()s.
+ * Constructor for use by subType()s.
*
* @param monthSelector the month selector
* @param calendarView the calendar view
@@ -318,12 +318,12 @@
}
/**
- * Gets the selected date, if any.
+ * Gets the [EMAIL PROTECTED] DatePicker}'s value.
*
- * @return the selected date
+ * @return the value
*/
public final Date getValue() {
- return selectedDate;
+ return value;
}
/**
@@ -376,13 +376,6 @@
}
/**
- * Selects the current highlighted date.
- */
- public final void selectHighlightedDate() {
- setValue(getHighlightedDate());
- }
-
- /**
* Sets a visible date to be enabled or disabled. This is only set until
the
* next time the DatePicker is refreshed.
*
@@ -417,32 +410,32 @@
}
/**
- * Sets the selected date.
+ * Sets the [EMAIL PROTECTED] DatePicker}'s value.
*
- * @param date the new selected date
+ * @param date the new value
*/
public final void setValue(Date date) {
setValue(date, true);
}
/**
- * Sets the selected date.
+ * Sets the [EMAIL PROTECTED] DatePicker}'s value.
*
- * @param newSelected the new selected date
+ * @param newValue the new value for this date picker
* @param fireEvents should events be fired.
*/
- public final void setValue(Date newSelected, boolean fireEvents) {
- Date oldSelected = selectedDate;
+ public final void setValue(Date newValue, boolean fireEvents) {
+ Date oldSelected = value;
if (oldSelected != null) {
- removeGlobalStyleFromDate(oldSelected, css().dayIsSelected());
+ removeGlobalStyleFromDate(oldSelected, css().dayIsValue());
}
- selectedDate = CalendarUtil.copyDate(newSelected);
- if (selectedDate != null) {
- addGlobalStyleToDate(selectedDate, css().dayIsSelected());
+ value = CalendarUtil.copyDate(newValue);
+ if (value != null) {
+ addGlobalStyleToDate(value, css().dayIsValue());
}
- ValueChangeEvent.fire(this, newSelected);
+ ValueChangeEvent.fire(this, newValue);
}
/**
Modified:
branches/1_6_datepicker/user/src/com/google/gwt/user/datepicker/client/DefaultCalendarView.java
==============================================================================
---
branches/1_6_datepicker/user/src/com/google/gwt/user/datepicker/client/DefaultCalendarView.java
(original)
+++
branches/1_6_datepicker/user/src/com/google/gwt/user/datepicker/client/DefaultCalendarView.java
Thu Nov 20 12:45:19 2008
@@ -113,7 +113,7 @@
accum += " " + css().dayIsHighlighted();
if (isHighlighted() && isSelected()) {
- accum += " " + css().dayIsSelectedAndHighlighted();
+ accum += " " + css().dayIsValueAndHighlighted();
}
}
if (!isEnabled()) {
Modified:
branches/1_6_datepicker/user/src/com/google/gwt/user/theme/standard/public/gwt/standard/standard.css
==============================================================================
---
branches/1_6_datepicker/user/src/com/google/gwt/user/theme/standard/public/gwt/standard/standard.css
(original)
+++
branches/1_6_datepicker/user/src/com/google/gwt/user/theme/standard/public/gwt/standard/standard.css
Thu Nov 20 12:45:19 2008
@@ -1150,10 +1150,14 @@
cursor: hand;
}
-.datePickerDayIsSelected {
+.datePickerDayIsValue {
background: #aaccee;
}
+.datePickerDayIsValueAndHighlighted {
+ background: #bbddff;
+}
+
.datePickerDayIsDisabled {
color: graytext;
}
@@ -1163,9 +1167,6 @@
padding: 0px;
}
-.datePickerDayIsSelectedAndHighlighted {
- background: #bbddff;
-}
/*
* Month selector styles
@@ -1185,9 +1186,9 @@
}
.datePickerPreviousButton {
- text-align: left;
+ text-align: left;
}
.datePickerNextButton {
- text-align: right;
+ text-align: right;
}
--~--~---------~--~----~------------~-------~--~----~
http://groups.google.com/group/Google-Web-Toolkit-Contributors
-~----------~----~----~----~------~----~------~--~---
