Author: akushunin
Date: 2007-07-26 11:16:41 -0400 (Thu, 26 Jul 2007)
New Revision: 1870
Modified:
trunk/sandbox/ui/calendar/src/main/java/org/richfaces/component/UICalendar.java
trunk/sandbox/ui/calendar/src/main/templates/org/richfaces/htmlCalendar.jspx
Log:
Modified: trunk/sandbox/ui/calendar/src/main/java/org/richfaces/component/UICalendar.java
===================================================================
---
trunk/sandbox/ui/calendar/src/main/java/org/richfaces/component/UICalendar.java 2007-07-26
15:01:49 UTC (rev 1869)
+++
trunk/sandbox/ui/calendar/src/main/java/org/richfaces/component/UICalendar.java 2007-07-26
15:16:41 UTC (rev 1870)
@@ -92,26 +92,33 @@
public abstract void setData(CalendarDataModel dataModel);
public abstract String getDatePattern();
+
public abstract void setDatePattern(String pattern);
-
+
public abstract Object getMonthLabels();
+
public abstract void setMonthLabels(Object labels);
-
+
public abstract Object getMonthLabelsShort();
+
public abstract void setMonthLabelsShort(Object labels);
-
+
public abstract Object getWeekDayLabels();
+
public abstract void setWeekDayLabels(Object labels);
public abstract Object getWeekDayLabelsShort();
+
public abstract void setWeekDayLabelsShort(Object labels);
-
+
public abstract String getJointPoint();
+
public abstract void setJointPoint(String jointPoint);
+
public abstract String getDirection();
+
public abstract void setDirection(String direction);
-
-
+
// currentDate processing -------------------------------------------------
public String getValueAsString(FacesContext context, UIComponent component)
@@ -120,51 +127,53 @@
Date valueString = calendar.getCurrentDate();
return valueString.toString();
}
-
+
public Calendar getCalendar() {
return Calendar.getInstance(getTimeZone(), getLocale());
}
- public Converter getDateConverter(){
+
+ public Converter getDateConverter() {
DateTimeConverter datetime = new DateTimeConverter();
return datetime;
-
}
-
+
public Date getConvertedValue(FacesContext context, String currentDateString)
throws ConverterException {
-
+
DateTimeConverter datetime = new DateTimeConverter();
datetime.setPattern("MM/yyyy");
Date newCurrentDate = (Date) datetime.getAsObject(context, this,
currentDateString);
return newCurrentDate;
}
-
+
protected void validateValue(FacesContext context, Object newValue) {
setSubmittedValue(newValue);
super.validateValue(context, newValue);
}
-
+
public void updateCurrentDate(FacesContext context, Date currentDate) {
if (context == null) {
throw new NullPointerException();
}
- try{
- ValueBinding vb = getValueBinding("currentDate");
- if (vb != null) {
- vb.setValue(context, currentDate);
- return;
- }else{ setCurrentDate(currentDate);}
- }catch (Exception e) {
-
+ try {
+ ValueBinding vb = getValueBinding("currentDate");
+ if (vb != null) {
+ vb.setValue(context, currentDate);
+ return;
+ } else {
+ setCurrentDate(currentDate);
+ }
+ } catch (Exception e) {
+
String messageString = e.getMessage();
FacesMessage message = new FacesMessage(messageString);
message.setSeverity(FacesMessage.SEVERITY_ERROR);
context.addMessage(getClientId(context), message);
}
}
-
+
public Date getCurrentDateOrDefault() {
Date date = getCurrentDate();
if (date != null) {
@@ -176,6 +185,17 @@
}
}
+ public Object getTooltip(Date date){
+
+ CalendarDataModel calendarDM = (CalendarDataModel) getData();
+ if (calendarDM != null) {
+ return calendarDM.getToolTip(date);
+ }else{
+ return null;
+ }
+
+ }
+
protected Date getDefaultPreloadBegin(Date date) {
Calendar calendar = Calendar.getInstance(getTimeZone(), getLocale());
calendar.setTime(date);
@@ -187,6 +207,7 @@
return calendar.getTime();
}
+
protected Date getDefaultPreloadEnd(Date date) {
Calendar calendar = Calendar.getInstance(getTimeZone(), getLocale());
calendar.setTime(date);
@@ -228,32 +249,37 @@
if (event instanceof CurrentDateChangeEvent) {
FacesContext facesContext = FacesContext.getCurrentInstance();
CurrentDateChangeEvent dateChangeEvent = (CurrentDateChangeEvent) event;
- String currentDateString = dateChangeEvent.getCurrentDateString();
+ String currentDateString = dateChangeEvent
+ .getCurrentDateString();
if (currentDateString != null) {
- // if currentDateString is not null then event cames from apply request phase
+ // if currentDateString is not null then event cames from
+ // apply request phase
try {
- Date currentDate = getConvertedValue(facesContext, currentDateString);
- CurrentDateChangeEvent newDateChangeEvent = new CurrentDateChangeEvent(this,
currentDate);
+ Date currentDate = getConvertedValue(facesContext,
+ currentDateString);
+ CurrentDateChangeEvent newDateChangeEvent = new CurrentDateChangeEvent(
+ this, currentDate);
newDateChangeEvent.queue();
} catch (Exception e) {
String messageString = e.getMessage();
FacesMessage message = new FacesMessage(messageString);
message.setSeverity(FacesMessage.SEVERITY_ERROR);
- facesContext.addMessage(getClientId(facesContext), message);
- }
-
- }
- else{
+ facesContext.addMessage(getClientId(facesContext),
+ message);
+ }
+
+ } else {
Date currentDate1 = dateChangeEvent.getCurrentDate();
Date currentDate2 = getCurrentDate();
- if(!currentDate1.equals(currentDate2)){
+ if (!currentDate1.equals(currentDate2)) {
updateCurrentDate(facesContext, currentDate1);
- ValueChangeEvent changeEvent = new
ValueChangeEvent(this,currentDate2,currentDate1);
+ ValueChangeEvent changeEvent = new ValueChangeEvent(
+ this, currentDate2, currentDate1);
changeEvent.queue();
-
+
}
-
+
}
} else {
super.broadcast(event);
Modified: trunk/sandbox/ui/calendar/src/main/templates/org/richfaces/htmlCalendar.jspx
===================================================================
---
trunk/sandbox/ui/calendar/src/main/templates/org/richfaces/htmlCalendar.jspx 2007-07-26
15:01:49 UTC (rev 1869)
+++
trunk/sandbox/ui/calendar/src/main/templates/org/richfaces/htmlCalendar.jspx 2007-07-26
15:16:41 UTC (rev 1870)
@@ -30,6 +30,7 @@
datePattern: '#{component.datePattern}',
jointPoint: '#{component.jointPoint}',
direction: '#{component.direction}',
+ popup: '#{component.popup}',
<f:call name="writeSymbols" />,
firstWeekDay: #{this:getFirstWeekDay(context, component)},
minDaysInFirstWeek: #{this:getMinDaysInFirstWeek(context, component)},