From 37666d302bccd39a92a8a8c33c359486c5d8a42e Mon Sep 17 00:00:00 2001
From: Marc Englund <marc.englund@itmill.com>
Date: Tue, 23 Oct 2007 07:21:13 +0000
Subject: [PATCH] ICalendar -> ICalendarField (#1017)

svn changeset:2583/svn branch:trunk
---
 .../toolkit/demo/reservation/CalendarField.java      | 12 +++++-------
 .../demo/reservation/gwt/client/WidgetSet.java       |  8 ++++----
 .../ui/{ICalendar.java => ICalendarField.java}       |  4 ++--
 3 files changed, 11 insertions(+), 13 deletions(-)
 rename src/com/itmill/toolkit/demo/reservation/gwt/client/ui/{ICalendar.java => ICalendarField.java} (96%)

diff --git a/src/com/itmill/toolkit/demo/reservation/CalendarField.java b/src/com/itmill/toolkit/demo/reservation/CalendarField.java
index a0c217e443..8cd67500a2 100644
--- a/src/com/itmill/toolkit/demo/reservation/CalendarField.java
+++ b/src/com/itmill/toolkit/demo/reservation/CalendarField.java
@@ -11,12 +11,13 @@ import com.itmill.toolkit.terminal.PaintException;
 import com.itmill.toolkit.terminal.PaintTarget;
 import com.itmill.toolkit.ui.DateField;
 
-// TODO use Calendar
-// TODO lazyLoading
+// TODO send one month at a time, do lazyLoading
 // TODO check date limit when updating variables
 // TODO Allow item selection
 public class CalendarField extends DateField implements Container.Viewer {
 
+	private static final String TAGNAME = "calendarfield";
+	
 	private Date minDate;
 	private Date maxDate;
 
@@ -58,7 +59,7 @@ public class CalendarField extends DateField implements Container.Viewer {
 	 * use the default documentation from implemented interface.
 	 */
 	public String getTag() {
-		return "calendarfield";
+		return TAGNAME;
 	}
 
 	public void init() {
@@ -114,10 +115,7 @@ public class CalendarField extends DateField implements Container.Viewer {
 	}
 
 	private boolean checkDataSource(Container dataSource) {
-		/*
-		 * if (!(dataSource instanceof Container.Sortable)) { // we really want
-		 * the data source to be sortable return false; }
-		 */
+
 		// Check old propertyIds
 		if (this.itemEndPropertyId != null) {
 			Class c = dataSource.getType(this.itemEndPropertyId);
diff --git a/src/com/itmill/toolkit/demo/reservation/gwt/client/WidgetSet.java b/src/com/itmill/toolkit/demo/reservation/gwt/client/WidgetSet.java
index f5a626017e..7920bc3dbc 100644
--- a/src/com/itmill/toolkit/demo/reservation/gwt/client/WidgetSet.java
+++ b/src/com/itmill/toolkit/demo/reservation/gwt/client/WidgetSet.java
@@ -2,7 +2,7 @@ package com.itmill.toolkit.demo.reservation.gwt.client;
 
 import com.google.gwt.core.client.GWT;
 import com.google.gwt.user.client.ui.Widget;
-import com.itmill.toolkit.demo.reservation.gwt.client.ui.ICalendar;
+import com.itmill.toolkit.demo.reservation.gwt.client.ui.ICalendarField;
 import com.itmill.toolkit.demo.reservation.gwt.client.ui.IGoogleMap;
 import com.itmill.toolkit.terminal.gwt.client.DefaultWidgetSet;
 import com.itmill.toolkit.terminal.gwt.client.UIDL;
@@ -13,9 +13,9 @@ public class WidgetSet extends DefaultWidgetSet {
 		if ("com.itmill.toolkit.terminal.gwt.client.ui.IGoogleMap"
 				.equals(className)) {
 			return new IGoogleMap();
-		} else if ("com.itmill.toolkit.terminal.gwt.client.ui.ICalendar"
+		} else if ("com.itmill.toolkit.terminal.gwt.client.ui.ICalendarField"
 				.equals(className)) {
-			return new ICalendar();
+			return new ICalendarField();
 		}
 
 		return super.createWidget(uidl);
@@ -27,7 +27,7 @@ public class WidgetSet extends DefaultWidgetSet {
 		if ("googlemap".equals(tag)) {
 			return "com.itmill.toolkit.terminal.gwt.client.ui.IGoogleMap";
 		} else if ("calendarfield".equals(tag)) {
-			return "com.itmill.toolkit.terminal.gwt.client.ui.ICalendar";
+			return "com.itmill.toolkit.terminal.gwt.client.ui.ICalendarField";
 		}
 
 		return super.resolveWidgetTypeName(uidl);
diff --git a/src/com/itmill/toolkit/demo/reservation/gwt/client/ui/ICalendar.java b/src/com/itmill/toolkit/demo/reservation/gwt/client/ui/ICalendarField.java
similarity index 96%
rename from src/com/itmill/toolkit/demo/reservation/gwt/client/ui/ICalendar.java
rename to src/com/itmill/toolkit/demo/reservation/gwt/client/ui/ICalendarField.java
index 3dadb9a2f6..a036488224 100644
--- a/src/com/itmill/toolkit/demo/reservation/gwt/client/ui/ICalendar.java
+++ b/src/com/itmill/toolkit/demo/reservation/gwt/client/ui/ICalendarField.java
@@ -20,7 +20,7 @@ import com.itmill.toolkit.terminal.gwt.client.ui.CalendarPanel;
 import com.itmill.toolkit.terminal.gwt.client.ui.IDateField;
 import com.itmill.toolkit.terminal.gwt.client.ui.CalendarPanel.CalendarEntrySource;
 
-public class ICalendar extends IDateField {
+public class ICalendarField extends IDateField {
 
 	private CalendarPanel calPanel;
 
@@ -37,7 +37,7 @@ public class ICalendar extends IDateField {
 	private static final String CLASSNAME = IDateField.CLASSNAME
 			+ "-entrycalendar";
 
-	public ICalendar() {
+	public ICalendarField() {
 		super();
 		setStyleName(CLASSNAME);
 		calPanel = new CalendarPanel(this);
-- 
2.39.5