From 4266bccf0426f38ace66797cd4f7c774112d359d Mon Sep 17 00:00:00 2001 From: Jani Laakso Date: Thu, 20 Sep 2007 07:18:16 +0000 Subject: [PATCH] Current convention for client-side components is * store all UI components to single package named com.itmill.toolkit.terminal.gwt.client.ui * start all paintable UI components with letter "I", e.g. IButton * all non-paintable classes must not begin with letter "I" Package com.itmill.toolkit.terminal.gwt.client.util contains client-side utility classes, e.g. date and time conversions, regexp tools. svn changeset:2344/svn branch:trunk --- ...ICalendarEntry.java => CalendarEntry.java} | 8 +++---- ...ICalendarPanel.java => CalendarPanel.java} | 22 ++++++++----------- .../terminal/gwt/client/ui/ICalendar.java | 14 +++++------- .../gwt/client/ui/IDateFieldCalendar.java | 5 ++--- .../gwt/client/ui/IPopupCalendar.java | 5 ++--- .../terminal/gwt/client/ui/ITextualDate.java | 2 +- .../ui/{datefield/ITime.java => Time.java} | 10 +++------ .../util/DateLocale.java | 2 +- .../util/regex => client/util}/Pattern.java | 2 +- .../util/SimpleDateFormat.java | 2 +- .../util/SimpleDateParser.java | 3 +-- 11 files changed, 31 insertions(+), 44 deletions(-) rename src/com/itmill/toolkit/terminal/gwt/client/ui/{calendar/ICalendarEntry.java => CalendarEntry.java} (85%) rename src/com/itmill/toolkit/terminal/gwt/client/ui/{datefield/ICalendarPanel.java => CalendarPanel.java} (91%) rename src/com/itmill/toolkit/terminal/gwt/client/ui/{datefield/ITime.java => Time.java} (91%) rename src/com/itmill/toolkit/terminal/gwt/{gwtwidgets => client}/util/DateLocale.java (94%) rename src/com/itmill/toolkit/terminal/gwt/{gwtwidgets/util/regex => client/util}/Pattern.java (95%) rename src/com/itmill/toolkit/terminal/gwt/{gwtwidgets => client}/util/SimpleDateFormat.java (99%) rename src/com/itmill/toolkit/terminal/gwt/{gwtwidgets => client}/util/SimpleDateParser.java (94%) diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ui/calendar/ICalendarEntry.java b/src/com/itmill/toolkit/terminal/gwt/client/ui/CalendarEntry.java similarity index 85% rename from src/com/itmill/toolkit/terminal/gwt/client/ui/calendar/ICalendarEntry.java rename to src/com/itmill/toolkit/terminal/gwt/client/ui/CalendarEntry.java index 1ffbc0d016..19bb70707f 100644 --- a/src/com/itmill/toolkit/terminal/gwt/client/ui/calendar/ICalendarEntry.java +++ b/src/com/itmill/toolkit/terminal/gwt/client/ui/CalendarEntry.java @@ -1,17 +1,17 @@ -package com.itmill.toolkit.terminal.gwt.client.ui.calendar; +package com.itmill.toolkit.terminal.gwt.client.ui; import java.util.Date; import com.itmill.toolkit.terminal.gwt.client.DateTimeService; -public class ICalendarEntry { +public class CalendarEntry { private Date start; private Date end; private String title; private String description; private boolean notime; - public ICalendarEntry(Date start, Date end, String title, String description, boolean notime) { + public CalendarEntry(Date start, Date end, String title, String description, boolean notime) { if (notime) { Date d = new Date(start.getTime()); d.setSeconds(0); @@ -34,7 +34,7 @@ public class ICalendarEntry { this.notime = notime; } - public ICalendarEntry(Date start, Date end, String title, String description) { + public CalendarEntry(Date start, Date end, String title, String description) { this(start, end, title, description, false); } diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ui/datefield/ICalendarPanel.java b/src/com/itmill/toolkit/terminal/gwt/client/ui/CalendarPanel.java similarity index 91% rename from src/com/itmill/toolkit/terminal/gwt/client/ui/datefield/ICalendarPanel.java rename to src/com/itmill/toolkit/terminal/gwt/client/ui/CalendarPanel.java index 6633f3e18a..d770444102 100644 --- a/src/com/itmill/toolkit/terminal/gwt/client/ui/datefield/ICalendarPanel.java +++ b/src/com/itmill/toolkit/terminal/gwt/client/ui/CalendarPanel.java @@ -1,4 +1,4 @@ -package com.itmill.toolkit.terminal.gwt.client.ui.datefield; +package com.itmill.toolkit.terminal.gwt.client.ui; import java.util.Date; import java.util.Iterator; @@ -17,12 +17,8 @@ import com.google.gwt.user.client.ui.TableListener; import com.google.gwt.user.client.ui.Widget; import com.itmill.toolkit.terminal.gwt.client.DateTimeService; import com.itmill.toolkit.terminal.gwt.client.LocaleService; -import com.itmill.toolkit.terminal.gwt.client.ui.IButton; -import com.itmill.toolkit.terminal.gwt.client.ui.IDateField; -import com.itmill.toolkit.terminal.gwt.client.ui.ITextualDate; -import com.itmill.toolkit.terminal.gwt.client.ui.calendar.ICalendarEntry; -public class ICalendarPanel extends FlexTable implements MouseListener, +public class CalendarPanel extends FlexTable implements MouseListener, ClickListener { private IDateField datefield; @@ -32,7 +28,7 @@ public class ICalendarPanel extends FlexTable implements MouseListener, private IEventButton prevMonth; private IEventButton nextMonth; - private ITime time; + private Time time; private Date minDate = null; private Date maxDate = null; @@ -45,14 +41,14 @@ public class ICalendarPanel extends FlexTable implements MouseListener, /* Needed to identify locale changes */ private String locale = LocaleService.getDefaultLocale(); - public ICalendarPanel(IDateField parent) { + public CalendarPanel(IDateField parent) { datefield = parent; setStyleName(datefield.CLASSNAME + "-calendarpanel"); // buildCalendar(true); addTableListener(new DateClickListener(this)); } - public ICalendarPanel(IDateField parent, Date min, Date max) { + public CalendarPanel(IDateField parent, Date min, Date max) { datefield = parent; setStyleName(datefield.CLASSNAME + "-calendarpanel"); // buildCalendar(true); @@ -177,7 +173,7 @@ public class ICalendarPanel extends FlexTable implements MouseListener, if (entries != null) { for (Iterator it = entries.iterator(); it .hasNext();) { - ICalendarEntry entry = (ICalendarEntry) it + CalendarEntry entry = (CalendarEntry) it .next(); title += (title.length() > 0 ? ", " : "") + entry.getStringForDate(curr); @@ -214,7 +210,7 @@ public class ICalendarPanel extends FlexTable implements MouseListener, private void buildTime(boolean forceRedraw) { if (time == null) { - time = new ITime(datefield); + time = new Time(datefield); setText(8, 0, ""); // Add new row getFlexCellFormatter().setColSpan(8, 0, 7); setWidget(8, 0, time); @@ -345,9 +341,9 @@ public class ICalendarPanel extends FlexTable implements MouseListener, private class DateClickListener implements TableListener { - private ICalendarPanel cal; + private CalendarPanel cal; - public DateClickListener(ICalendarPanel panel) { + public DateClickListener(CalendarPanel panel) { cal = panel; } diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ui/ICalendar.java b/src/com/itmill/toolkit/terminal/gwt/client/ui/ICalendar.java index 9a49ac7978..15eca990a0 100644 --- a/src/com/itmill/toolkit/terminal/gwt/client/ui/ICalendar.java +++ b/src/com/itmill/toolkit/terminal/gwt/client/ui/ICalendar.java @@ -14,12 +14,10 @@ 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.calendar.ICalendarEntry; -import com.itmill.toolkit.terminal.gwt.client.ui.datefield.ICalendarPanel; public class ICalendar extends IDateField { - private ICalendarPanel calPanel; + private CalendarPanel calPanel; private HTMLTable hourTable; @@ -35,7 +33,7 @@ public class ICalendar extends IDateField { public ICalendar() { super(); setStyleName(CLASSNAME); - calPanel = new ICalendarPanel(this); + calPanel = new CalendarPanel(this); add(calPanel); this.entrySource = new EntrySource(); calPanel.setCalendarEntrySource(this.entrySource); @@ -114,7 +112,7 @@ public class ICalendar extends IDateField { String text = ""; if (entries != null) { for (Iterator it = entries.iterator(); it.hasNext();) { - ICalendarEntry entry = (ICalendarEntry) it.next(); + CalendarEntry entry = (CalendarEntry) it.next(); String title = entry.getTitle(); String desc = entry.getDescription(); text += (text == "" ? "" : ", "); @@ -145,7 +143,7 @@ public class ICalendar extends IDateField { } - private class EntrySource implements ICalendarPanel.CalendarEntrySource { + private class EntrySource implements CalendarPanel.CalendarEntrySource { private HashMap items = new HashMap(); @@ -162,14 +160,14 @@ public class ICalendar extends IDateField { if (items.containsKey(id)) { items.remove(id); } - items.put(id, new ICalendarEntry(startDate, endDate, title, desc, + items.put(id, new CalendarEntry(startDate, endDate, title, desc, notime)); } public List getEntries(Date date, int resolution) { ArrayList res = new ArrayList(); for (Iterator it = this.items.values().iterator(); it.hasNext();) { - ICalendarEntry item = (ICalendarEntry) it.next(); + CalendarEntry item = (CalendarEntry) it.next(); if (DateTimeService.isInRange(date, item.getStart(), item .getEnd(), resolution)) { res.add(item); diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ui/IDateFieldCalendar.java b/src/com/itmill/toolkit/terminal/gwt/client/ui/IDateFieldCalendar.java index 949ab1d967..e48f35cd12 100644 --- a/src/com/itmill/toolkit/terminal/gwt/client/ui/IDateFieldCalendar.java +++ b/src/com/itmill/toolkit/terminal/gwt/client/ui/IDateFieldCalendar.java @@ -2,16 +2,15 @@ package com.itmill.toolkit.terminal.gwt.client.ui; import com.itmill.toolkit.terminal.gwt.client.ApplicationConnection; import com.itmill.toolkit.terminal.gwt.client.UIDL; -import com.itmill.toolkit.terminal.gwt.client.ui.datefield.ICalendarPanel; public class IDateFieldCalendar extends IDateField { - private ICalendarPanel date; + private CalendarPanel date; public IDateFieldCalendar() { super(); setStyleName(CLASSNAME+"-calendar"); - date = new ICalendarPanel(this); + date = new CalendarPanel(this); add(date); } diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ui/IPopupCalendar.java b/src/com/itmill/toolkit/terminal/gwt/client/ui/IPopupCalendar.java index acf4ea0827..07b87a80e9 100644 --- a/src/com/itmill/toolkit/terminal/gwt/client/ui/IPopupCalendar.java +++ b/src/com/itmill/toolkit/terminal/gwt/client/ui/IPopupCalendar.java @@ -7,13 +7,12 @@ import com.google.gwt.user.client.ui.Widget; import com.itmill.toolkit.terminal.gwt.client.ApplicationConnection; import com.itmill.toolkit.terminal.gwt.client.Paintable; import com.itmill.toolkit.terminal.gwt.client.UIDL; -import com.itmill.toolkit.terminal.gwt.client.ui.datefield.ICalendarPanel; public class IPopupCalendar extends ITextualDate implements Paintable, ClickListener, PopupListener { private IButton calendarToggle; - private ICalendarPanel calendar; + private CalendarPanel calendar; private PopupPanel popup; @@ -25,7 +24,7 @@ public class IPopupCalendar extends ITextualDate implements Paintable, ClickList calendarToggle.addClickListener(this); add(calendarToggle); - calendar = new ICalendarPanel(this); + calendar = new CalendarPanel(this); popup = new PopupPanel(true); popup.setStyleName(IDateField.CLASSNAME+"-calendar"); popup.setWidget(calendar); diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ui/ITextualDate.java b/src/com/itmill/toolkit/terminal/gwt/client/ui/ITextualDate.java index bd6c605603..8eb768b980 100644 --- a/src/com/itmill/toolkit/terminal/gwt/client/ui/ITextualDate.java +++ b/src/com/itmill/toolkit/terminal/gwt/client/ui/ITextualDate.java @@ -8,7 +8,7 @@ import com.itmill.toolkit.terminal.gwt.client.ApplicationConnection; import com.itmill.toolkit.terminal.gwt.client.DateLocale; import com.itmill.toolkit.terminal.gwt.client.Paintable; import com.itmill.toolkit.terminal.gwt.client.UIDL; -import com.itmill.toolkit.terminal.gwt.gwtwidgets.util.SimpleDateFormat; +import com.itmill.toolkit.terminal.gwt.client.util.SimpleDateFormat; public class ITextualDate extends IDateField implements Paintable, ChangeListener { diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ui/datefield/ITime.java b/src/com/itmill/toolkit/terminal/gwt/client/ui/Time.java similarity index 91% rename from src/com/itmill/toolkit/terminal/gwt/client/ui/datefield/ITime.java rename to src/com/itmill/toolkit/terminal/gwt/client/ui/Time.java index 2b36966172..fae1143600 100644 --- a/src/com/itmill/toolkit/terminal/gwt/client/ui/datefield/ITime.java +++ b/src/com/itmill/toolkit/terminal/gwt/client/ui/Time.java @@ -1,15 +1,11 @@ -package com.itmill.toolkit.terminal.gwt.client.ui.datefield; +package com.itmill.toolkit.terminal.gwt.client.ui; import com.google.gwt.user.client.ui.ChangeListener; import com.google.gwt.user.client.ui.FlowPanel; import com.google.gwt.user.client.ui.ListBox; import com.google.gwt.user.client.ui.Widget; -import com.itmill.toolkit.terminal.gwt.client.ui.IDateField; -import com.itmill.toolkit.terminal.gwt.client.ui.ILabel; -import com.itmill.toolkit.terminal.gwt.client.ui.ISelect; -import com.itmill.toolkit.terminal.gwt.client.ui.ITextualDate; -public class ITime extends FlowPanel implements ChangeListener { +public class Time extends FlowPanel implements ChangeListener { private IDateField datefield; @@ -27,7 +23,7 @@ public class ITime extends FlowPanel implements ChangeListener { private boolean readonly; - public ITime(IDateField parent) { + public Time(IDateField parent) { super(); datefield = parent; setStyleName(IDateField.CLASSNAME+"-time"); diff --git a/src/com/itmill/toolkit/terminal/gwt/gwtwidgets/util/DateLocale.java b/src/com/itmill/toolkit/terminal/gwt/client/util/DateLocale.java similarity index 94% rename from src/com/itmill/toolkit/terminal/gwt/gwtwidgets/util/DateLocale.java rename to src/com/itmill/toolkit/terminal/gwt/client/util/DateLocale.java index bb4cb01e9d..8c5b4c29b8 100644 --- a/src/com/itmill/toolkit/terminal/gwt/gwtwidgets/util/DateLocale.java +++ b/src/com/itmill/toolkit/terminal/gwt/client/util/DateLocale.java @@ -1,4 +1,4 @@ -package com.itmill.toolkit.terminal.gwt.gwtwidgets.util; +package com.itmill.toolkit.terminal.gwt.client.util; import java.util.Arrays; import java.util.List; diff --git a/src/com/itmill/toolkit/terminal/gwt/gwtwidgets/util/regex/Pattern.java b/src/com/itmill/toolkit/terminal/gwt/client/util/Pattern.java similarity index 95% rename from src/com/itmill/toolkit/terminal/gwt/gwtwidgets/util/regex/Pattern.java rename to src/com/itmill/toolkit/terminal/gwt/client/util/Pattern.java index 3a6d0b4e18..eead6832ac 100644 --- a/src/com/itmill/toolkit/terminal/gwt/gwtwidgets/util/regex/Pattern.java +++ b/src/com/itmill/toolkit/terminal/gwt/client/util/Pattern.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.itmill.toolkit.terminal.gwt.gwtwidgets.util.regex; +package com.itmill.toolkit.terminal.gwt.client.util; import java.util.ArrayList; import java.util.List; diff --git a/src/com/itmill/toolkit/terminal/gwt/gwtwidgets/util/SimpleDateFormat.java b/src/com/itmill/toolkit/terminal/gwt/client/util/SimpleDateFormat.java similarity index 99% rename from src/com/itmill/toolkit/terminal/gwt/gwtwidgets/util/SimpleDateFormat.java rename to src/com/itmill/toolkit/terminal/gwt/client/util/SimpleDateFormat.java index 79ce6518fc..e7903c7ee6 100644 --- a/src/com/itmill/toolkit/terminal/gwt/gwtwidgets/util/SimpleDateFormat.java +++ b/src/com/itmill/toolkit/terminal/gwt/client/util/SimpleDateFormat.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.itmill.toolkit.terminal.gwt.gwtwidgets.util; +package com.itmill.toolkit.terminal.gwt.client.util; import java.util.Date; diff --git a/src/com/itmill/toolkit/terminal/gwt/gwtwidgets/util/SimpleDateParser.java b/src/com/itmill/toolkit/terminal/gwt/client/util/SimpleDateParser.java similarity index 94% rename from src/com/itmill/toolkit/terminal/gwt/gwtwidgets/util/SimpleDateParser.java rename to src/com/itmill/toolkit/terminal/gwt/client/util/SimpleDateParser.java index 862356b20d..a3c6b17237 100644 --- a/src/com/itmill/toolkit/terminal/gwt/gwtwidgets/util/SimpleDateParser.java +++ b/src/com/itmill/toolkit/terminal/gwt/client/util/SimpleDateParser.java @@ -1,8 +1,7 @@ -package com.itmill.toolkit.terminal.gwt.gwtwidgets.util; +package com.itmill.toolkit.terminal.gwt.client.util; import java.util.Date; -import com.itmill.toolkit.terminal.gwt.gwtwidgets.util.regex.Pattern; /** * This is a simple regular expression based parser for date notations. -- 2.39.5