Changeset 4038 for ssme/trunk/src/com/kh/ssme/business/CalendarService.java

Timestamp:

08/09/10 10:54:07 (22 months ago)

Author:

mszopinski

Message:

calendar, simple display

Files:

• ssme/trunk/src/com/kh/ssme/business/CalendarService.java (modified) (4 diffs)

ssme/trunk/src/com/kh/ssme/business/CalendarService.java

@@ -2 +2 @@
 
 import java.util.List;
-import java.util.Set;
-import java.util.TreeSet;
 
 import org.slf4j.Logger;
@@ -104 +102 @@
          * @return
          */
-        public static Calendar getRange(String uuid, long from, long to) {
-                Calendar origin = get( uuid );
+        public static Calendar getRange(String calendarUuid, long from, long to) {
+                Calendar origin = get( calendarUuid );
                 Calendar clone = new CalendarEntity();
                 clone.setName( origin.getName() );
@@ -112 +110 @@
                 //clone.setEventings( origin.getEventings() );
                 
-                List<TimeFrame> timeframes = TimeFrameManager.findEventsInRange(uuid, from, to);
-                Set<TimeFrame> timeframesSet = new TreeSet<TimeFrame>();
-                timeframesSet.addAll( timeframes );
-                clone.setTimeFrames( timeframesSet );
+                List<TimeFrame> timeframes = TimeFrameManager.findEventsInRange(calendarUuid, from, to);
+                for(TimeFrame tf : timeframes){
+                        clone.getTimeFrames().add( tf );
+                }
+//              Set<TimeFrame> timeframesSet = new TreeSet<TimeFrame>();
+//              timeframesSet.addAll( (timeframes==null) ? timeframes : new ArrayList<TimeFrame>() );
+//              clone.setTimeFrames( timeframesSet );
                 return clone;
         }
@@ -131 +132 @@
                 
                 List<TimeFrame> timeframes = TimeFrameManager.findAllEvents(userUuid, from, to);
-                Set<TimeFrame> timeframesSet = new TreeSet<TimeFrame>();
-                timeframesSet.addAll( timeframes );
-                dummy.setTimeFrames( timeframesSet );           
+                for(TimeFrame tf : timeframes){
+                        dummy.getTimeFrames().add( tf );
+                }               
+//              Set<TimeFrame> timeframesSet = new TreeSet<TimeFrame>();
+//              timeframesSet.addAll( (timeframes==null) ? timeframes : new ArrayList<TimeFrame>() );
+//              dummy.setTimeFrames( timeframesSet );           
                 return dummy;
         }