Rename and merge controllers

[proteocache.git] / server / compbio / controllers / IPDataController.java

diff --git a/server/compbio/controllers/IPDataController.java b/server/compbio/controllers/IPDataController.java
index 690c57e..a7cd7f0 100644 (file)
--- a/server/compbio/controllers/IPDataController.java
+++ b/server/compbio/controllers/IPDataController.java
@@ -33,7 +33,7 @@ public class IPDataController {
                model.put("value", "127.0.0.1");
                return "queryIP";
        }
-       
+
        @RequestMapping(value = "/admin/ip/counts/results", method = RequestMethod.GET)
        public String findIPwithCounter(@RequestParam("JobCounter") String counter, Map<String, Object> model, Principal principal) {
                model.put("username", principal.getName());
@@ -42,7 +42,7 @@ public class IPDataController {
                        model.put("value", counter);
                        return "queryIPStatistics";
                }
-       
+
                int realcounter;
                try {
                        realcounter = Integer.parseInt(counter.trim());
@@ -61,12 +61,12 @@ public class IPDataController {
                final long startTime = System.currentTimeMillis();
                CassandraRequester cr = new CassandraRequester();
                List<TotalByCounterBean> r = cr.readIpByCounter(realcounter);
-               model.put("results", r);
+               model.put("results", r);
                model.put("njobs", 0);
                if (null != r) {
                        model.put("njobs", r.size());
                }
-               final long endTime = System.currentTimeMillis();
+               final long endTime = System.currentTimeMillis();
                model.put("timeExecution", (endTime - startTime));
                model.put("counter", realcounter);
                return "reportIPstatistics";
@@ -78,12 +78,12 @@ public class IPDataController {
                final long startTime = System.currentTimeMillis();
                CassandraRequester cr = new CassandraRequester();
                UserBean r = cr.readIp(ip);
-               model.put("results", r);
+               model.put("results", r);
                model.put("njobs", 0);
                if (null != r) {
                        model.put("njobs", r.getMainInfo().size());
                }
-               final long endTime = System.currentTimeMillis();
+               final long endTime = System.currentTimeMillis();
                model.put("timeExecution", (endTime - startTime));
                model.put("ip", ip);
                return "reportIP";