X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=server%2Fcompbio%2Fcontrollers%2FUserController.java;fp=server%2Fcompbio%2Fcontrollers%2FUserController.java;h=513f5bb7563287128a9a9e3b64e272f46fe97e19;hb=67ee99b3cfa17f03dbe839f5ab3ec215541330d8;hp=94be37740be9e4ab5aa161fe6c92622f1e9928b6;hpb=6b59d49dbcca1616d74c2814d87faf47e3aa7cf2;p=proteocache.git

diff --git a/server/compbio/controllers/UserController.java b/server/compbio/controllers/UserController.java
index 94be377..513f5bb 100644
--- 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);
 	}
 
 }