Simplify servlets

[proteocache.git] / server / compbio / listeners / ProtServlet.java

diff --git a/server/compbio/listeners/ProtServlet.java b/server/compbio/listeners/ProtServlet.java
index 8ed2d2f..cb74ecc 100644 (file)
--- a/server/compbio/listeners/ProtServlet.java
+++ b/server/compbio/listeners/ProtServlet.java
@@ -1,7 +1,6 @@
 package compbio.listeners;
 
 import java.io.IOException;
-import java.util.List;
 
 import javax.servlet.RequestDispatcher;
 import javax.servlet.ServletException;
@@ -10,7 +9,6 @@ import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import compbio.cassandra.DataBase;
 import compbio.statistic.StatisticsProt;
 
 /**
@@ -24,25 +22,22 @@ public class ProtServlet extends HttpServlet {
         * @see HttpServlet#doGet(HttpServletRequest request, HttpServletResponse
         *      response)
         */
-       protected void doGet(HttpServletRequest request,
-                       HttpServletResponse response) throws ServletException, IOException {
-               List<DataBase> result;
+       protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
                String flag = request.getParameter("protein");
                String prot = request.getParameter("prot");
                String checkbox = request.getParameter("option");
                StatisticsProt sp = new StatisticsProt();
                if (checkbox != null) {
-                       result = sp.readProtID();
+                       request.setAttribute("result", sp.readProtID());
                } else {
                        if (flag.equals("whole"))
-                               result = sp.readProt(prot);
+                               request.setAttribute("result", sp.readProteins(prot));
                        else
-                               result = sp.readPart(prot);
+                               request.setAttribute("result", sp.readPart(prot));
                }
                request.setAttribute("prot", prot);
                request.setAttribute("flag", flag);
                request.setAttribute("checkbox", checkbox);
-               request.setAttribute("result", result);
                RequestDispatcher rd = request.getRequestDispatcher("/ReportProt.jsp");
                rd.forward(request, response);
        }
@@ -51,8 +46,7 @@ public class ProtServlet extends HttpServlet {
         * @see HttpServlet#doPost(HttpServletRequest request, HttpServletResponse
         *      response)
         */
-       protected void doPost(HttpServletRequest request,
-                       HttpServletResponse response) throws ServletException, IOException {
+       protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
                doGet(request, response);
        }