Rename and merge controllers

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

diff --git a/server/compbio/controllers/UserController.java b/server/compbio/controllers/UserController.java
index 94be377..513f5bb 100644 (file)
--- a/server/compbio/controllers/UserController.java
+++ b/server/compbio/controllers/UserController.java
@@ -24,8 +24,8 @@ import compbio.cassandra.CassandraUserManager;
 @Controller
 public class UserController {
 
-       //@Inject
-       //JavaMailSender mailSender;
+       // @Inject
+       // JavaMailSender mailSender;
        private final Pattern EMAIL = Pattern.compile("[A-Za-z0-9._%+-]+@[A-Za-z0-9.-]+\\.[A-Za-z]{2,4}");
 
        @RequestMapping(value = "/register/query", method = RequestMethod.GET)
@@ -72,7 +72,7 @@ public class UserController {
                }
 
                user.setRegistrationDate(new Date());
-               UserManager cm = new CassandraUserManager(); 
+               UserManager cm = new CassandraUserManager();
                try {
                        cm.addUser(user);
                } catch (DataIntegrityViolationException e) {
@@ -84,8 +84,8 @@ public class UserController {
                        subscribeToList(user.getEmail());
                }
                /*
-               Account.autoLogin(user, request, authenticationManager);
-               */
+                * Account.autoLogin(user, request, authenticationManager);
+                */
                return "redirect:/index";
        }
 
@@ -95,9 +95,9 @@ public class UserController {
                if (bindingResult.hasErrors()) {
                        return "Register";
                }
-               
+
                user.setRegistrationDate(new Date());
-               UserManager cm = new CassandraUserManager(); 
+               UserManager cm = new CassandraUserManager();
                try {
                        cm.addUser(user);
                } catch (DataIntegrityViolationException e) {
@@ -117,7 +117,7 @@ public class UserController {
                message.setTo("proteocache-discuss-subscribe@compbio.dundee.ac.uk");
                message.setSubject("ProteoCache mailing list subscription");
                message.setText("testing " + email);
-               //mailSender.send(message);
+               // mailSender.send(message);
        }
 
 }