From: Sasha Sherstnev <a.sherstnev@dundee.ac.uk>
Date: Thu, 19 Dec 2013 12:37:11 +0000 (+0000)
Subject: Add private methods instead of exteranl dependency
X-Git-Url: http://source.jalview.org/gitweb/?p=proteocache.git;a=commitdiff_plain;h=33c3cd8fb94cdf5539f715301da9bf6ba1d56894

Add private methods instead of exteranl dependency
---

diff --git a/server/compbio/listeners/ServletJobsByDate.java b/server/compbio/listeners/ServletJobsByDate.java
index 8ae389f..fe24750 100644
--- a/server/compbio/listeners/ServletJobsByDate.java
+++ b/server/compbio/listeners/ServletJobsByDate.java
@@ -1,7 +1,9 @@
 package compbio.listeners;
 
 import java.io.IOException;
+import java.text.SimpleDateFormat;
 import java.util.Calendar;
+import java.util.Date;
 import java.util.List;
 
 import javax.servlet.RequestDispatcher;
@@ -13,7 +15,6 @@ import javax.servlet.http.HttpServletResponse;
 
 import compbio.cassandra.DataBase;
 import compbio.statistic.CassandraRequester;
-import compbio.statistic.StatisticsProt;
 
 @WebServlet("/ServletJobsByDate")
 public class ServletJobsByDate extends HttpServlet {
@@ -30,7 +31,7 @@ public class ServletJobsByDate extends HttpServlet {
 		CassandraRequester cr = new CassandraRequester();
 		if (null != request.getParameter("option")) {
 			Calendar cal = Calendar.getInstance();
-			date1 = StatisticsProt.DateFormatYYMMDD(cr.earliestDate());
+			date1 = DateFormatYYMMDD(cr.earliestDate());
 			date2 = cal.get(Calendar.YEAR) + "/" + (cal.get(Calendar.MONTH) + 1) + "/" + cal.get(Calendar.DAY_OF_MONTH);
 		}
 		request.setAttribute("data1", date1);
@@ -49,4 +50,10 @@ public class ServletJobsByDate extends HttpServlet {
 		doGet(request, response);
 	}
 
+	private String DateFormatYYMMDD(long indate) {
+		SimpleDateFormat datformat = new SimpleDateFormat("yyyy/MM/dd");
+		String dateString = datformat.format(new Date(indate));
+		return dateString;
+	}
+	
 }
diff --git a/server/compbio/listeners/ServletSequenceProtein.java b/server/compbio/listeners/ServletSequenceProtein.java
index 6d1316d..b631bff 100644
--- a/server/compbio/listeners/ServletSequenceProtein.java
+++ b/server/compbio/listeners/ServletSequenceProtein.java
@@ -12,7 +12,6 @@ import javax.servlet.http.HttpServletResponse;
 
 import compbio.cassandra.DataBase;
 import compbio.statistic.CassandraRequester;
-import compbio.statistic.StatisticsProt;
 
 /**
  * Servlet implementation class ProtServlet
diff --git a/server/compbio/listeners/ServletTimeExecution.java b/server/compbio/listeners/ServletTimeExecution.java
index c380604..93b3faf 100644
--- a/server/compbio/listeners/ServletTimeExecution.java
+++ b/server/compbio/listeners/ServletTimeExecution.java
@@ -1,7 +1,9 @@
 package compbio.listeners;
 
 import java.io.IOException;
+import java.text.SimpleDateFormat;
 import java.util.Calendar;
+import java.util.Date;
 
 import javax.servlet.RequestDispatcher;
 import javax.servlet.ServletException;
@@ -10,7 +12,6 @@ import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import compbio.statistic.StatisticsProt;
 import compbio.statistic.CassandraRequester;
 
 /**
@@ -31,7 +32,7 @@ public class ServletTimeExecution extends HttpServlet {
 		CassandraRequester sp = new CassandraRequester();
 		if (null != request.getParameter("option")) {
 			Calendar cal = Calendar.getInstance();
-			date1 = StatisticsProt.DateFormatYYMMDD(sp.earliestDate());
+			date1 = DateFormatYYMMDD(sp.earliestDate());
 			date2 = cal.get(Calendar.YEAR) + "/" + (cal.get(Calendar.MONTH) + 1) + "/" + cal.get(Calendar.DAY_OF_MONTH);
 		}
 		request.setAttribute("data1", date1);
@@ -51,4 +52,10 @@ public class ServletTimeExecution extends HttpServlet {
 	protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
 		doGet(request, response);
 	}
+
+	private String DateFormatYYMMDD(long indate) {
+		SimpleDateFormat datformat = new SimpleDateFormat("yyyy/MM/dd");
+		String dateString = datformat.format(new Date(indate));
+		return dateString;
+	}
 }