Changeset 2344
- Timestamp:
- 09/20/07 07:18:16 (15 months ago)
- Location:
- trunk/src/com/itmill/toolkit/terminal/gwt
- Files:
-
- 4 added
- 3 removed
- 4 modified
- 4 copied
-
client/ui/CalendarEntry.java (added)
-
client/ui/CalendarPanel.java (added)
-
client/ui/ICalendar.java (modified) (6 diffs)
-
client/ui/IDateFieldCalendar.java (modified) (1 diff)
-
client/ui/IPopupCalendar.java (modified) (3 diffs)
-
client/ui/ITextualDate.java (modified) (1 diff)
-
client/ui/Time.java (added)
-
client/ui/calendar (deleted)
-
client/ui/datefield (deleted)
-
client/util (added)
-
client/util/DateLocale.java (copied) (copied from trunk/src/com/itmill/toolkit/terminal/gwt/gwtwidgets/util/DateLocale.java) (1 diff)
-
client/util/Pattern.java (copied) (copied from trunk/src/com/itmill/toolkit/terminal/gwt/gwtwidgets/util/regex/Pattern.java) (1 diff)
-
client/util/SimpleDateFormat.java (copied) (copied from trunk/src/com/itmill/toolkit/terminal/gwt/gwtwidgets/util/SimpleDateFormat.java) (1 diff)
-
client/util/SimpleDateParser.java (copied) (copied from trunk/src/com/itmill/toolkit/terminal/gwt/gwtwidgets/util/SimpleDateParser.java) (1 diff)
-
gwtwidgets (deleted)
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/com/itmill/toolkit/terminal/gwt/client/ui/ICalendar.java
r2160 r2344 15 15 import com.itmill.toolkit.terminal.gwt.client.DateTimeService; 16 16 import com.itmill.toolkit.terminal.gwt.client.UIDL; 17 import com.itmill.toolkit.terminal.gwt.client.ui.calendar.ICalendarEntry;18 import com.itmill.toolkit.terminal.gwt.client.ui.datefield.ICalendarPanel;19 17 20 18 public class ICalendar extends IDateField { 21 19 22 private ICalendarPanel calPanel;20 private CalendarPanel calPanel; 23 21 24 22 private HTMLTable hourTable; … … 36 34 super(); 37 35 setStyleName(CLASSNAME); 38 calPanel = new ICalendarPanel(this);36 calPanel = new CalendarPanel(this); 39 37 add(calPanel); 40 38 this.entrySource = new EntrySource(); … … 115 113 if (entries != null) { 116 114 for (Iterator it = entries.iterator(); it.hasNext();) { 117 ICalendarEntry entry = (ICalendarEntry) it.next();115 CalendarEntry entry = (CalendarEntry) it.next(); 118 116 String title = entry.getTitle(); 119 117 String desc = entry.getDescription(); … … 146 144 } 147 145 148 private class EntrySource implements ICalendarPanel.CalendarEntrySource {146 private class EntrySource implements CalendarPanel.CalendarEntrySource { 149 147 150 148 private HashMap items = new HashMap(); … … 163 161 items.remove(id); 164 162 } 165 items.put(id, new ICalendarEntry(startDate, endDate, title, desc,163 items.put(id, new CalendarEntry(startDate, endDate, title, desc, 166 164 notime)); 167 165 } … … 170 168 ArrayList res = new ArrayList(); 171 169 for (Iterator it = this.items.values().iterator(); it.hasNext();) { 172 ICalendarEntry item = (ICalendarEntry) it.next();170 CalendarEntry item = (CalendarEntry) it.next(); 173 171 if (DateTimeService.isInRange(date, item.getStart(), item 174 172 .getEnd(), resolution)) { -
trunk/src/com/itmill/toolkit/terminal/gwt/client/ui/IDateFieldCalendar.java
r2046 r2344 3 3 import com.itmill.toolkit.terminal.gwt.client.ApplicationConnection; 4 4 import com.itmill.toolkit.terminal.gwt.client.UIDL; 5 import com.itmill.toolkit.terminal.gwt.client.ui.datefield.ICalendarPanel;6 5 7 6 public class IDateFieldCalendar extends IDateField { 8 7 9 private ICalendarPanel date;8 private CalendarPanel date; 10 9 11 10 public IDateFieldCalendar() { 12 11 super(); 13 12 setStyleName(CLASSNAME+"-calendar"); 14 date = new ICalendarPanel(this);13 date = new CalendarPanel(this); 15 14 add(date); 16 15 } -
trunk/src/com/itmill/toolkit/terminal/gwt/client/ui/IPopupCalendar.java
r2046 r2344 8 8 import com.itmill.toolkit.terminal.gwt.client.Paintable; 9 9 import com.itmill.toolkit.terminal.gwt.client.UIDL; 10 import com.itmill.toolkit.terminal.gwt.client.ui.datefield.ICalendarPanel;11 10 12 11 public class IPopupCalendar extends ITextualDate implements Paintable, ClickListener, PopupListener { … … 14 13 private IButton calendarToggle; 15 14 16 private ICalendarPanel calendar;15 private CalendarPanel calendar; 17 16 18 17 private PopupPanel popup; … … 26 25 add(calendarToggle); 27 26 28 calendar = new ICalendarPanel(this);27 calendar = new CalendarPanel(this); 29 28 popup = new PopupPanel(true); 30 29 popup.setStyleName(IDateField.CLASSNAME+"-calendar"); -
trunk/src/com/itmill/toolkit/terminal/gwt/client/ui/ITextualDate.java
r2276 r2344 9 9 import com.itmill.toolkit.terminal.gwt.client.Paintable; 10 10 import com.itmill.toolkit.terminal.gwt.client.UIDL; 11 import com.itmill.toolkit.terminal.gwt. gwtwidgets.util.SimpleDateFormat;11 import com.itmill.toolkit.terminal.gwt.client.util.SimpleDateFormat; 12 12 13 13 public class ITextualDate extends IDateField implements Paintable, ChangeListener { -
trunk/src/com/itmill/toolkit/terminal/gwt/client/util/DateLocale.java
r1828 r2344 1 package com.itmill.toolkit.terminal.gwt. gwtwidgets.util;1 package com.itmill.toolkit.terminal.gwt.client.util; 2 2 3 3 import java.util.Arrays; -
trunk/src/com/itmill/toolkit/terminal/gwt/client/util/Pattern.java
r1828 r2344 14 14 * limitations under the License. 15 15 */ 16 package com.itmill.toolkit.terminal.gwt. gwtwidgets.util.regex;16 package com.itmill.toolkit.terminal.gwt.client.util; 17 17 18 18 import java.util.ArrayList; -
trunk/src/com/itmill/toolkit/terminal/gwt/client/util/SimpleDateFormat.java
r1828 r2344 14 14 * limitations under the License. 15 15 */ 16 package com.itmill.toolkit.terminal.gwt. gwtwidgets.util;16 package com.itmill.toolkit.terminal.gwt.client.util; 17 17 18 18 import java.util.Date; -
trunk/src/com/itmill/toolkit/terminal/gwt/client/util/SimpleDateParser.java
r1906 r2344 1 package com.itmill.toolkit.terminal.gwt. gwtwidgets.util;1 package com.itmill.toolkit.terminal.gwt.client.util; 2 2 3 3 import java.util.Date; 4 4 5 import com.itmill.toolkit.terminal.gwt.gwtwidgets.util.regex.Pattern;6 5 7 6 /**
