Changeset 4038 for ssme/trunk/src/com/kh/ssme/manage/TimeFrameManager.java

Timestamp:

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

Author:

mszopinski

Message:

calendar, simple display

Files:

• ssme/trunk/src/com/kh/ssme/manage/TimeFrameManager.java (modified) (4 diffs)

ssme/trunk/src/com/kh/ssme/manage/TimeFrameManager.java

@@ -23 +23 @@
 package com.kh.ssme.manage;
 
+import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 
@@ -97 +99 @@
         @SuppressWarnings("unchecked")
         public static List<TimeFrame> findEventsInRange(String calendarUuid, long from, long to) {
-                String query = "SELECT t FROM TimeFrame t WHERE t.from_ >=? AND t.to_ <=? AND t.calendar_.uuid_ = ?";
-                
-                java.util.Calendar fromCal = java.util.Calendar.getInstance();
-                fromCal.setTimeInMillis(from);
-                java.util.Calendar toCal = java.util.Calendar.getInstance();
-                toCal.setTimeInMillis(to);
-                
-                List<TimeFrame> result = PersistenceManager.getInstance().performQuery(query, calendarUuid, fromCal, toCal);
+                String query = "SELECT t FROM TimeFrame t WHERE t.to_>? AND t.from_<? AND t.calendar_.uuid_ = ?";
+                                
+                List<TimeFrame> result = PersistenceManager.getInstance().performQuery(query, (new Date(from)), (new Date(to)), calendarUuid);
                 if(result!=null && !result.isEmpty()){
                         return result;
                 }
-                return null;
+                return new ArrayList<TimeFrame>();
         }
 
@@ -120 +117 @@
         public static List<TimeFrame> findAllEvents(String userUuid, long from, long to) {
                 if(from >=0 && to >=0){         
-                        String query = "SELECT t FROM TimeFrame t WHERE t.calendar_.user_.uuid_=? AND t.from_ >=? AND t.to_ <=?";       
-                        
-                        java.util.Calendar fromCal = java.util.Calendar.getInstance();
-                        fromCal.setTimeInMillis(from);
-                        java.util.Calendar toCal = java.util.Calendar.getInstance();
-                        toCal.setTimeInMillis(to);      
-                        
-                        List<TimeFrame> result = PersistenceManager.getInstance().performQuery(query, userUuid, fromCal, toCal);
+                        String query = "SELECT t FROM TimeFrame t WHERE t.calendar_.user_.uuid_=? AND t.to_ >? AND t.from_<?";  
+                                                
+                        List<TimeFrame> result = PersistenceManager.getInstance().performQuery(query, userUuid, (new Date(from)), (new Date(to)));
                         if(result!=null && !result.isEmpty()){
                                 return result;
@@ -139 +131 @@
                         }                       
                 }
-                return null;            
+                return new ArrayList<TimeFrame>();              
         }                       
 }