From 81c77001f3209e2860192654128425fb438b5cc9 Mon Sep 17 00:00:00 2001 From: Marc Englund Date: Tue, 23 Oct 2007 06:58:59 +0000 Subject: [PATCH] ICalendar -> demo.reservation svn changeset:2581/svn branch:trunk --- .../toolkit/demo/reservation/gwt/client/WidgetSet.java | 6 ++++++ .../reservation}/gwt/client/ui/CalendarEntry.java | 2 +- .../reservation}/gwt/client/ui/ICalendar.java | 5 ++++- .../toolkit/terminal/gwt/client/DefaultWidgetSet.java | 6 ------ .../toolkit/terminal/gwt/client/ui/CalendarPanel.java | 1 + .../itmill/toolkit/terminal/gwt/client/ui/IDateField.java | 4 ++-- 6 files changed, 14 insertions(+), 10 deletions(-) rename src/com/itmill/toolkit/{terminal => demo/reservation}/gwt/client/ui/CalendarEntry.java (93%) rename src/com/itmill/toolkit/{terminal => demo/reservation}/gwt/client/ui/ICalendar.java (93%) 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 6ab247405a..f5a626017e 100644 --- a/src/com/itmill/toolkit/demo/reservation/gwt/client/WidgetSet.java +++ b/src/com/itmill/toolkit/demo/reservation/gwt/client/WidgetSet.java @@ -2,6 +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.IGoogleMap; import com.itmill.toolkit.terminal.gwt.client.DefaultWidgetSet; import com.itmill.toolkit.terminal.gwt.client.UIDL; @@ -12,6 +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" + .equals(className)) { + return new ICalendar(); } return super.createWidget(uidl); @@ -22,6 +26,8 @@ public class WidgetSet extends DefaultWidgetSet { String tag = uidl.getTag(); 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 super.resolveWidgetTypeName(uidl); diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ui/CalendarEntry.java b/src/com/itmill/toolkit/demo/reservation/gwt/client/ui/CalendarEntry.java similarity index 93% rename from src/com/itmill/toolkit/terminal/gwt/client/ui/CalendarEntry.java rename to src/com/itmill/toolkit/demo/reservation/gwt/client/ui/CalendarEntry.java index 075f68cbf6..424a4ff586 100644 --- a/src/com/itmill/toolkit/terminal/gwt/client/ui/CalendarEntry.java +++ b/src/com/itmill/toolkit/demo/reservation/gwt/client/ui/CalendarEntry.java @@ -1,4 +1,4 @@ -package com.itmill.toolkit.terminal.gwt.client.ui; +package com.itmill.toolkit.demo.reservation.gwt.client.ui; import java.util.Date; diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ui/ICalendar.java b/src/com/itmill/toolkit/demo/reservation/gwt/client/ui/ICalendar.java similarity index 93% rename from src/com/itmill/toolkit/terminal/gwt/client/ui/ICalendar.java rename to src/com/itmill/toolkit/demo/reservation/gwt/client/ui/ICalendar.java index ec429ac4b5..03845a8e22 100644 --- a/src/com/itmill/toolkit/terminal/gwt/client/ui/ICalendar.java +++ b/src/com/itmill/toolkit/demo/reservation/gwt/client/ui/ICalendar.java @@ -1,4 +1,4 @@ -package com.itmill.toolkit.terminal.gwt.client.ui; +package com.itmill.toolkit.demo.reservation.gwt.client.ui; import java.util.ArrayList; import java.util.Date; @@ -15,6 +15,9 @@ import com.google.gwt.user.client.ui.TableListener; import com.itmill.toolkit.terminal.gwt.client.ApplicationConnection; import com.itmill.toolkit.terminal.gwt.client.DateTimeService; import com.itmill.toolkit.terminal.gwt.client.UIDL; +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 { diff --git a/src/com/itmill/toolkit/terminal/gwt/client/DefaultWidgetSet.java b/src/com/itmill/toolkit/terminal/gwt/client/DefaultWidgetSet.java index d62a16122e..311ccc3bf4 100644 --- a/src/com/itmill/toolkit/terminal/gwt/client/DefaultWidgetSet.java +++ b/src/com/itmill/toolkit/terminal/gwt/client/DefaultWidgetSet.java @@ -3,7 +3,6 @@ package com.itmill.toolkit.terminal.gwt.client; import com.google.gwt.core.client.GWT; import com.google.gwt.user.client.ui.Widget; import com.itmill.toolkit.terminal.gwt.client.ui.IButton; -import com.itmill.toolkit.terminal.gwt.client.ui.ICalendar; import com.itmill.toolkit.terminal.gwt.client.ui.ICheckBox; import com.itmill.toolkit.terminal.gwt.client.ui.ICustomLayout; import com.itmill.toolkit.terminal.gwt.client.ui.IDateFieldCalendar; @@ -119,9 +118,6 @@ public class DefaultWidgetSet implements WidgetSet { } else if ("com.itmill.toolkit.terminal.gwt.client.ui.IDateFieldCalendar" .equals(className)) { return new IDateFieldCalendar(); - } else if ("com.itmill.toolkit.terminal.gwt.client.ui.ICalendar" - .equals(className)) { - return new ICalendar(); } else if ("com.itmill.toolkit.terminal.gwt.client.ui.ITextualDate" .equals(className)) { return new ITextualDate(); @@ -237,8 +233,6 @@ public class DefaultWidgetSet implements WidgetSet { } else { return "com.itmill.toolkit.terminal.gwt.client.ui.IPopupCalendar"; } - } else if ("calendarfield".equals(tag)) { - return "com.itmill.toolkit.terminal.gwt.client.ui.ICalendar"; } else if ("slider".equals(tag)) { return "com.itmill.toolkit.terminal.gwt.client.ui.ISlider"; } else if ("form".equals(tag)) { diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ui/CalendarPanel.java b/src/com/itmill/toolkit/terminal/gwt/client/ui/CalendarPanel.java index 0fc60e25dc..6eb7749f26 100644 --- a/src/com/itmill/toolkit/terminal/gwt/client/ui/CalendarPanel.java +++ b/src/com/itmill/toolkit/terminal/gwt/client/ui/CalendarPanel.java @@ -15,6 +15,7 @@ import com.google.gwt.user.client.ui.SourcesMouseEvents; import com.google.gwt.user.client.ui.SourcesTableEvents; import com.google.gwt.user.client.ui.TableListener; import com.google.gwt.user.client.ui.Widget; +import com.itmill.toolkit.demo.reservation.gwt.client.ui.CalendarEntry; import com.itmill.toolkit.terminal.gwt.client.DateTimeService; import com.itmill.toolkit.terminal.gwt.client.LocaleService; diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ui/IDateField.java b/src/com/itmill/toolkit/terminal/gwt/client/ui/IDateField.java index 12635655be..53859ddf6e 100644 --- a/src/com/itmill/toolkit/terminal/gwt/client/ui/IDateField.java +++ b/src/com/itmill/toolkit/terminal/gwt/client/ui/IDateField.java @@ -13,9 +13,9 @@ public class IDateField extends FlowPanel implements Paintable { public static final String CLASSNAME = "i-datefield"; - String id; + protected String id; - ApplicationConnection client; + protected ApplicationConnection client; protected boolean immediate; -- 2.39.5