ICalendar -> demo.reservation (part II)

svn changeset:2582/svn branch:trunk

diff --git a/src/com/itmill/toolkit/demo/reservation/gwt/client/ui/CalendarEntry.java b/src/com/itmill/toolkit/demo/reservation/gwt/client/ui/CalendarEntry.java
deleted file mode 100644 (file)
index 424a4ff..0000000
--- a/src/com/itmill/toolkit/demo/reservation/gwt/client/ui/CalendarEntry.java
+++ /dev/null
@@ -1,122 +0,0 @@
-package com.itmill.toolkit.demo.reservation.gwt.client.ui;\r
-\r
-import java.util.Date;\r
-\r
-import com.itmill.toolkit.terminal.gwt.client.DateTimeService;\r
-\r
-public class CalendarEntry {\r
-       private String styleName;\r
-       private Date start;\r
-       private Date end;\r
-       private String title;\r
-       private String description;\r
-       private boolean notime;\r
-\r
-       public CalendarEntry(String styleName, Date start, Date end, String title,\r
-                       String description, boolean notime) {\r
-               this.styleName = styleName;\r
-               if (notime) {\r
-                       Date d = new Date(start.getTime());\r
-                       d.setSeconds(0);\r
-                       d.setMinutes(0);\r
-                       this.start = d;\r
-                       if (end != null) {\r
-                               d = new Date(end.getTime());\r
-                               d.setSeconds(0);\r
-                               d.setMinutes(0);\r
-                               this.end = d;\r
-                       } else {\r
-                               end = start;\r
-                       }\r
-               } else {\r
-                       this.start = start;\r
-                       this.end = end;\r
-               }\r
-               this.title = title;\r
-               this.description = description;\r
-               this.notime = notime;\r
-       }\r
-\r
-       public CalendarEntry(String styleName, Date start, Date end, String title,\r
-                       String description) {\r
-               this(styleName, start, end, title, description, false);\r
-       }\r
-\r
-       public String getStyleName() {\r
-               return styleName;\r
-       }\r
-\r
-       public Date getStart() {\r
-               return start;\r
-       }\r
-\r
-       public void setStart(Date start) {\r
-               this.start = start;\r
-       }\r
-\r
-       public Date getEnd() {\r
-               return end;\r
-       }\r
-\r
-       public void setEnd(Date end) {\r
-               this.end = end;\r
-       }\r
-\r
-       public String getTitle() {\r
-               return title;\r
-       }\r
-\r
-       public void setTitle(String title) {\r
-               this.title = title;\r
-       }\r
-\r
-       public String getDescription() {\r
-               return description;\r
-       }\r
-\r
-       public void setDescription(String description) {\r
-               this.description = description;\r
-       }\r
-\r
-       public boolean isNotime() {\r
-               return notime;\r
-       }\r
-\r
-       public void setNotime(boolean notime) {\r
-               this.notime = notime;\r
-       }\r
-\r
-       public String getStringForDate(Date d) {\r
-               // TODO format from DateTimeService\r
-               String s = "";\r
-               if (!notime) {\r
-                       if (!DateTimeService.isSameDay(d, start)) {\r
-                               s += (start.getYear() + 1900) + "." + (start.getMonth() + 1)\r
-                                               + "." + start.getDate() + " ";\r
-                       }\r
-                       int i = start.getHours();\r
-                       s += (i < 10 ? "0" : "") + i;\r
-                       s += ":";\r
-                       i = start.getMinutes();\r
-                       s += (i < 10 ? "0" : "") + i;\r
-                       if (!start.equals(end)) {\r
-                               s += " - ";\r
-                               if (!DateTimeService.isSameDay(start, end)) {\r
-                                       s += (end.getYear() + 1900) + "." + (end.getMonth() + 1)\r
-                                                       + "." + end.getDate() + " ";\r
-                               }\r
-                               i = end.getHours();\r
-                               s += (i < 10 ? "0" : "") + i;\r
-                               s += ":";\r
-                               i = end.getMinutes();\r
-                               s += (i < 10 ? "0" : "") + i;\r
-                       }\r
-                       s += " ";\r
-               }\r
-               if (title!=null) {\r
-                       s += title;\r
-               }\r
-               return s;\r
-       }\r
-\r
-}
\ No newline at end of file

diff --git a/src/com/itmill/toolkit/demo/reservation/gwt/client/ui/ICalendar.java b/src/com/itmill/toolkit/demo/reservation/gwt/client/ui/ICalendar.java
index 03845a8e2216857f6c34f91aee33e7088bec412d..3dadb9a2f625d62f48e5a5a8db0a57c3ab7238de 100644 (file)
--- a/src/com/itmill/toolkit/demo/reservation/gwt/client/ui/ICalendar.java
+++ b/src/com/itmill/toolkit/demo/reservation/gwt/client/ui/ICalendar.java
@@ -15,6 +15,7 @@ import com.google.gwt.user.client.ui.TableListener;
 import com.itmill.toolkit.terminal.gwt.client.ApplicationConnection;\r
 import com.itmill.toolkit.terminal.gwt.client.DateTimeService;\r
 import com.itmill.toolkit.terminal.gwt.client.UIDL;\r
+import com.itmill.toolkit.terminal.gwt.client.ui.CalendarEntry;\r
 import com.itmill.toolkit.terminal.gwt.client.ui.CalendarPanel;\r
 import com.itmill.toolkit.terminal.gwt.client.ui.IDateField;\r
 import com.itmill.toolkit.terminal.gwt.client.ui.CalendarPanel.CalendarEntrySource;\r

diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ui/CalendarEntry.java b/src/com/itmill/toolkit/terminal/gwt/client/ui/CalendarEntry.java
new file mode 100644 (file)
index 0000000..075f68c
--- /dev/null
+++ b/src/com/itmill/toolkit/terminal/gwt/client/ui/CalendarEntry.java
@@ -0,0 +1,122 @@
+package com.itmill.toolkit.terminal.gwt.client.ui;\r
+\r
+import java.util.Date;\r
+\r
+import com.itmill.toolkit.terminal.gwt.client.DateTimeService;\r
+\r
+public class CalendarEntry {\r
+       private String styleName;\r
+       private Date start;\r
+       private Date end;\r
+       private String title;\r
+       private String description;\r
+       private boolean notime;\r
+\r
+       public CalendarEntry(String styleName, Date start, Date end, String title,\r
+                       String description, boolean notime) {\r
+               this.styleName = styleName;\r
+               if (notime) {\r
+                       Date d = new Date(start.getTime());\r
+                       d.setSeconds(0);\r
+                       d.setMinutes(0);\r
+                       this.start = d;\r
+                       if (end != null) {\r
+                               d = new Date(end.getTime());\r
+                               d.setSeconds(0);\r
+                               d.setMinutes(0);\r
+                               this.end = d;\r
+                       } else {\r
+                               end = start;\r
+                       }\r
+               } else {\r
+                       this.start = start;\r
+                       this.end = end;\r
+               }\r
+               this.title = title;\r
+               this.description = description;\r
+               this.notime = notime;\r
+       }\r
+\r
+       public CalendarEntry(String styleName, Date start, Date end, String title,\r
+                       String description) {\r
+               this(styleName, start, end, title, description, false);\r
+       }\r
+\r
+       public String getStyleName() {\r
+               return styleName;\r
+       }\r
+\r
+       public Date getStart() {\r
+               return start;\r
+       }\r
+\r
+       public void setStart(Date start) {\r
+               this.start = start;\r
+       }\r
+\r
+       public Date getEnd() {\r
+               return end;\r
+       }\r
+\r
+       public void setEnd(Date end) {\r
+               this.end = end;\r
+       }\r
+\r
+       public String getTitle() {\r
+               return title;\r
+       }\r
+\r
+       public void setTitle(String title) {\r
+               this.title = title;\r
+       }\r
+\r
+       public String getDescription() {\r
+               return description;\r
+       }\r
+\r
+       public void setDescription(String description) {\r
+               this.description = description;\r
+       }\r
+\r
+       public boolean isNotime() {\r
+               return notime;\r
+       }\r
+\r
+       public void setNotime(boolean notime) {\r
+               this.notime = notime;\r
+       }\r
+\r
+       public String getStringForDate(Date d) {\r
+               // TODO format from DateTimeService\r
+               String s = "";\r
+               if (!notime) {\r
+                       if (!DateTimeService.isSameDay(d, start)) {\r
+                               s += (start.getYear() + 1900) + "." + (start.getMonth() + 1)\r
+                                               + "." + start.getDate() + " ";\r
+                       }\r
+                       int i = start.getHours();\r
+                       s += (i < 10 ? "0" : "") + i;\r
+                       s += ":";\r
+                       i = start.getMinutes();\r
+                       s += (i < 10 ? "0" : "") + i;\r
+                       if (!start.equals(end)) {\r
+                               s += " - ";\r
+                               if (!DateTimeService.isSameDay(start, end)) {\r
+                                       s += (end.getYear() + 1900) + "." + (end.getMonth() + 1)\r
+                                                       + "." + end.getDate() + " ";\r
+                               }\r
+                               i = end.getHours();\r
+                               s += (i < 10 ? "0" : "") + i;\r
+                               s += ":";\r
+                               i = end.getMinutes();\r
+                               s += (i < 10 ? "0" : "") + i;\r
+                       }\r
+                       s += " ";\r
+               }\r
+               if (title!=null) {\r
+                       s += title;\r
+               }\r
+               return s;\r
+       }\r
+\r
+}
\ No newline at end of file

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 6eb7749f26fba8e5f4c3587af971558b012e0162..0fc60e25dc0b08c655fe879f0897aaba68b5612a 100644 (file)
--- a/src/com/itmill/toolkit/terminal/gwt/client/ui/CalendarPanel.java
+++ b/src/com/itmill/toolkit/terminal/gwt/client/ui/CalendarPanel.java
@@ -15,7 +15,6 @@ import com.google.gwt.user.client.ui.SourcesMouseEvents;
 import com.google.gwt.user.client.ui.SourcesTableEvents;\r
 import com.google.gwt.user.client.ui.TableListener;\r
 import com.google.gwt.user.client.ui.Widget;\r
-import com.itmill.toolkit.demo.reservation.gwt.client.ui.CalendarEntry;\r
 import com.itmill.toolkit.terminal.gwt.client.DateTimeService;\r
 import com.itmill.toolkit.terminal.gwt.client.LocaleService;\r
 \r