svnno****@sourc*****
svnno****@sourc*****
2008年 11月 18日 (火) 00:07:37 JST
Revision: 1358
http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=1358
Author: shinsuke
Date: 2008-11-18 00:07:36 +0900 (Tue, 18 Nov 2008)
Log Message:
-----------
cleanup..
Modified Paths:
--------------
scheduler/trunk/src/main/java/jp/sf/pal/scheduler/action/user/CalendarAction.java
-------------- next part --------------
Modified: scheduler/trunk/src/main/java/jp/sf/pal/scheduler/action/user/CalendarAction.java
===================================================================
--- scheduler/trunk/src/main/java/jp/sf/pal/scheduler/action/user/CalendarAction.java 2008-11-17 14:07:31 UTC (rev 1357)
+++ scheduler/trunk/src/main/java/jp/sf/pal/scheduler/action/user/CalendarAction.java 2008-11-17 15:07:36 UTC (rev 1358)
@@ -13,6 +13,7 @@
import javax.servlet.http.HttpServletRequest;
+import jp.sf.pal.scheduler.SchedulerConstants;
import jp.sf.pal.scheduler.common.util.CalendarUtil;
import jp.sf.pal.scheduler.common.util.ConfigUtil;
import jp.sf.pal.scheduler.common.util.DateUtil;
@@ -234,7 +235,6 @@
for (List<Map<String, Object>> events : eventInDayItems) {
if (!events.isEmpty()) {
int idx = events.size() - 1;
- Map<String, Object> lastEvent = events.get(idx);
for (int i = idx; i < maxCols - 1; i++) {
events.add(createEmptyEvent());
}
@@ -293,8 +293,6 @@
for (List<Map<String, Object>> events : eventInDayItems) {
if (!events.isEmpty()) {
int idx = events.size() - 1;
- Map<String, Object> lastEvent = events.get(idx);
- int cols = maxCols - idx;
for (int i = idx; i < maxCols - 1; i++) {
events.add(createEmptyEvent());
}
@@ -1010,11 +1008,11 @@
}
map.put("time", buf.toString());
}
- if (eventSchedule instanceof EventSchedule) {
+ if (SchedulerConstants.ONETIME_SCHEDULE.equals(eventSchedule.getType())) {
+ map.put("repeat", "false");
+ } else {
map.put("repeat", "true");
map.put("type", ((EventSchedule) eventSchedule).getType());
- } else {
- map.put("repeat", "false");
}
return map;