From c39fca8f41b2a7f4a3cda34d1862f6d7bd170fef Mon Sep 17 00:00:00 2001 From: Marc Englund Date: Fri, 5 Dec 2008 10:51:49 +0000 Subject: [PATCH] WindowedDemos and CalendarDemos adjusted slightly. svn changeset:6092/svn branch:trunk --- src/com/itmill/toolkit/demo/WindowedDemos.java | 2 +- .../demo/reservation/gwt/client/ui/ICalendarField.java | 9 +++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/src/com/itmill/toolkit/demo/WindowedDemos.java b/src/com/itmill/toolkit/demo/WindowedDemos.java index 8b4f06ca2d..36a7cfc119 100644 --- a/src/com/itmill/toolkit/demo/WindowedDemos.java +++ b/src/com/itmill/toolkit/demo/WindowedDemos.java @@ -76,7 +76,7 @@ public class WindowedDemos extends com.itmill.toolkit.Application { Window w = (Window) windows.get(demoName); if (w == null) { w = new Window(demoName); - w.setWidth(520); + w.setWidth(560); w.setHeight(500); w.setPositionX(202); w.getLayout().setSizeFull(); diff --git a/src/com/itmill/toolkit/demo/reservation/gwt/client/ui/ICalendarField.java b/src/com/itmill/toolkit/demo/reservation/gwt/client/ui/ICalendarField.java index 6ae47ea05c..57ec7e6756 100644 --- a/src/com/itmill/toolkit/demo/reservation/gwt/client/ui/ICalendarField.java +++ b/src/com/itmill/toolkit/demo/reservation/gwt/client/ui/ICalendarField.java @@ -184,7 +184,8 @@ public class ICalendarField extends IDateField { } // int hour = new Date().getHours()+1; // scroll to current hour - final int hour = this.date.getHours() + 1; // scroll to selected + Date d = (this.date != null ? this.date : new Date()); + final int hour = d.getHours() + 1; // scroll to selected // hour final int h1 = hourPanel.getOffsetHeight() / 2; final int oh = hourTable.getOffsetHeight(); @@ -262,9 +263,13 @@ public class ICalendarField extends IDateField { } public List getEntries(Date date, int resolution) { + final ArrayList res = new ArrayList(); + if (date == null) { + return res; + } final List entries = (List) dates.get(date.getYear() + "" + date.getMonth() + "" + date.getDate()); - final ArrayList res = new ArrayList(); + if (entries == null) { return res; } -- 2.39.5