[richfaces-svn-commits] JBoss Rich Faces SVN: r2578 - in trunk/samples/calendar-sample/src/main: webapp/pages and 1 other directory.

[richfaces-svn-commits at lists.jboss.org]

Author: nbelaevski
Date: 2007-08-29 10:59:08 -0400 (Wed, 29 Aug 2007)
New Revision: 2578

Modified:
   trunk/samples/calendar-sample/src/main/java/org/richfaces/CalendarDataModelImpl.java
   trunk/samples/calendar-sample/src/main/java/org/richfaces/CalendarDataModelItemImpl.java
   trunk/samples/calendar-sample/src/main/webapp/pages/Calendar.jsp
Log:
CalendarDataModelItem - getDate() removed

Modified: trunk/samples/calendar-sample/src/main/java/org/richfaces/CalendarDataModelImpl.java
===================================================================
--- trunk/samples/calendar-sample/src/main/java/org/richfaces/CalendarDataModelImpl.java	2007-08-29 14:37:52 UTC (rev 2577)
+++ trunk/samples/calendar-sample/src/main/java/org/richfaces/CalendarDataModelImpl.java	2007-08-29 14:59:08 UTC (rev 2578)
@@ -55,7 +55,6 @@
 
 	protected CalendarDataModelItem createDataModelItem(Date date) {
 		CalendarDataModelItemImpl item = new CalendarDataModelItemImpl();
-		item.setDate(date);
 		Map data = new HashMap();
 		DateFormat enFormatter = DateFormat.getDateInstance(DateFormat.MEDIUM, Locale.ENGLISH);
 		DateFormat frFormatter = DateFormat.getDateInstance(DateFormat.MEDIUM, Locale.FRENCH);

Modified: trunk/samples/calendar-sample/src/main/java/org/richfaces/CalendarDataModelItemImpl.java
===================================================================
--- trunk/samples/calendar-sample/src/main/java/org/richfaces/CalendarDataModelItemImpl.java	2007-08-29 14:37:52 UTC (rev 2577)
+++ trunk/samples/calendar-sample/src/main/java/org/richfaces/CalendarDataModelItemImpl.java	2007-08-29 14:59:08 UTC (rev 2578)
@@ -21,8 +21,6 @@
 
 package org.richfaces;
 
-import java.util.Date;
-
 import org.richfaces.model.CalendarDataModelItem;
 
 /**
@@ -33,7 +31,6 @@
 public class CalendarDataModelItemImpl implements CalendarDataModelItem {
 
 	private Object data;
-	private Date date;
 	private String styleClass;
 	private Object toolTip;
 	private boolean enabled = true;
@@ -46,13 +43,6 @@
 	}
 
 	/* (non-Javadoc)
-	 * @see org.richfaces.component.CalendarDataModelItem#getDate()
-	 */
-	public Date getDate() {
-		return date;
-	}
-
-	/* (non-Javadoc)
 	 * @see org.richfaces.component.CalendarDataModelItem#getStyleClass()
 	 */
 	public String getStyleClass() {
@@ -88,13 +78,6 @@
 	}
 
 	/**
-	 * @param date the date to set
-	 */
-	public void setDate(Date date) {
-		this.date = date;
-	}
-
-	/**
 	 * @param styleClass the styleClass to set
 	 */
 	public void setStyleClass(String styleClass) {

Modified: trunk/samples/calendar-sample/src/main/webapp/pages/Calendar.jsp
===================================================================
--- trunk/samples/calendar-sample/src/main/webapp/pages/Calendar.jsp	2007-08-29 14:37:52 UTC (rev 2577)
+++ trunk/samples/calendar-sample/src/main/webapp/pages/Calendar.jsp	2007-08-29 14:59:08 UTC (rev 2578)
@@ -59,11 +59,11 @@
 					
 					<h:panelGrid columns="2">
 						<f:verbatim><span style="padding: 2px;" <%-- class="largeText"--%>>{day}</span></f:verbatim>
-						<%-- h:panelGrid>
+						<h:panelGrid>
 							<h:outputText styleClass="smallText" value="{data.enLabel}" />
 							<h:outputText styleClass="smallText" value="{data.frLabel}" />
 							<h:outputText styleClass="smallText" value="{data.deLabel}" />
-						</h:panelGrid--%>
+						</h:panelGrid>
 					</h:panelGrid>
 				</calendar:calendar>