git://source.jalview.org
/
proteocache.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into servlets
[proteocache.git]
/
server
/
compbio
/
listeners
/
ServletJobsByDate.java
diff --git
a/server/compbio/listeners/ServletJobsByDate.java
b/server/compbio/listeners/ServletJobsByDate.java
index
fe24750
..
8ae389f
100644
(file)
--- a/
server/compbio/listeners/ServletJobsByDate.java
+++ b/
server/compbio/listeners/ServletJobsByDate.java
@@
-1,9
+1,7
@@
package compbio.listeners;
import java.io.IOException;
package compbio.listeners;
import java.io.IOException;
-import java.text.SimpleDateFormat;
import java.util.Calendar;
import java.util.Calendar;
-import java.util.Date;
import java.util.List;
import javax.servlet.RequestDispatcher;
import java.util.List;
import javax.servlet.RequestDispatcher;
@@
-15,6
+13,7
@@
import javax.servlet.http.HttpServletResponse;
import compbio.cassandra.DataBase;
import compbio.statistic.CassandraRequester;
import compbio.cassandra.DataBase;
import compbio.statistic.CassandraRequester;
+import compbio.statistic.StatisticsProt;
@WebServlet("/ServletJobsByDate")
public class ServletJobsByDate extends HttpServlet {
@WebServlet("/ServletJobsByDate")
public class ServletJobsByDate extends HttpServlet {
@@
-31,7
+30,7
@@
public class ServletJobsByDate extends HttpServlet {
CassandraRequester cr = new CassandraRequester();
if (null != request.getParameter("option")) {
Calendar cal = Calendar.getInstance();
CassandraRequester cr = new CassandraRequester();
if (null != request.getParameter("option")) {
Calendar cal = Calendar.getInstance();
- date1 = DateFormatYYMMDD(cr.earliestDate());
+ date1 = StatisticsProt.DateFormatYYMMDD(cr.earliestDate());
date2 = cal.get(Calendar.YEAR) + "/" + (cal.get(Calendar.MONTH) + 1) + "/" + cal.get(Calendar.DAY_OF_MONTH);
}
request.setAttribute("data1", date1);
date2 = cal.get(Calendar.YEAR) + "/" + (cal.get(Calendar.MONTH) + 1) + "/" + cal.get(Calendar.DAY_OF_MONTH);
}
request.setAttribute("data1", date1);
@@
-50,10
+49,4
@@
public class ServletJobsByDate extends HttpServlet {
doGet(request, response);
}
doGet(request, response);
}
- private String DateFormatYYMMDD(long indate) {
- SimpleDateFormat datformat = new SimpleDateFormat("yyyy/MM/dd");
- String dateString = datformat.format(new Date(indate));
- return dateString;
- }
-
}
}