Merge branch 'DAO'

[proteocache.git] / server / compbio / statistic / CassandraRequester.java

diff --git a/server/compbio/statistic/CassandraRequester.java b/server/compbio/statistic/CassandraRequester.java
index 892fd8e..ca59844 100755 (executable)
--- a/server/compbio/statistic/CassandraRequester.java
+++ b/server/compbio/statistic/CassandraRequester.java
@@ -9,17 +9,17 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import compbio.cassandra.DateBean;
-import compbio.cassandra.ProteinBean;
+import compbio.beans.DateBean;
+import compbio.beans.JobBean;
+import compbio.beans.ProteinBean;
+import compbio.beans.Total;
+import compbio.beans.TotalByCounterBean;
+import compbio.beans.TotalJobsStatisticBean;
+import compbio.beans.UserBean;
 import compbio.cassandra.CassandraNativeConnector;
 import compbio.cassandra.CassandraReaderOld;
 import compbio.cassandra.DataBase;
 import compbio.cassandra.Pair;
-import compbio.cassandra.JobBean;
-import compbio.cassandra.Total;
-import compbio.cassandra.TotalByCounterBean;
-import compbio.cassandra.TotalJobsStatisticBean;
-import compbio.cassandra.UserBean;
 import compbio.engine.JobStatus;
 
 public class CassandraRequester {
@@ -122,7 +122,7 @@ public class CassandraRequester {
 
        /*
         * query: total number of jobs for the period from date1 till date2
-        */
+       */ 
        public TotalJobsStatisticBean countJobs(String date1, String date2) {
                /*
                 * if (null == date1) { date1 = "1970/1/1"; } if (null == date2) { date1