[cvs] expresso commit by lhamel: minor refactoring--no functional change

[JCorporate Ltd]

Log Message:
-----------
minor refactoring--no functional change

Modified Files:
--------------
    expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/services/controller:
        SimpleLoginController.java

Revision Data
-------------
Index: SimpleLoginController.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/services/controller/SimpleLoginController.java,v
retrieving revision 1.38
retrieving revision 1.39
diff -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/services/controller/SimpleLoginController.java -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/services/controller/SimpleLoginController.java -u -r1.38 -r1.39
--- expresso-web/WEB-INF/src/com/jcorporate/expresso/services/controller/SimpleLoginController.java
+++ expresso-web/WEB-INF/src/com/jcorporate/expresso/services/controller/SimpleLoginController.java
@@ -425,21 +425,16 @@
         String dbContext = StringUtil.notNull(request.getParameter("dbContext"));
         request.setDataContext(dbContext);
 
-        //
-        //Remove wildcards so that it isn't used in finding users.
-        //
-        String loginName = StringUtil.replaceAll(StringUtil.notNull(request.getParameter("LoginName"))
-                , "%", "");
         int uid = 0;
 
         User loggedInUser = null;
         try {
             loggedInUser = (User)tryLogin(request, response, errors, hreq,
                     hres, session);
-            uid = loggedInUser.getUid();
             if (loggedInUser == null) {
-                throw new NonHandleableException("Assertion Error -- tryLogin returned null user");
+                throw new NonHandleableException("tryLogin returned null user");
             }
+            uid = loggedInUser.getUid();
         } catch (DBException dbe) {
             throw new ControllerException(dbe);
         } finally {
@@ -460,16 +455,7 @@
                 log.debug("good login for uid: " + uid);
             }
 
-            // set locale
-            try {
-                request.getSession().removePersistentAttribute(Messages.LOCALE_KEY);
-                request.getSession().removePersistentAttribute(Globals.ERROR_KEY);
-                Messages.establishLocale(hreq);
-            } catch (ServletException se) {
-                log.error("Cannot manipulate local in session", se);
-
-                // do not abort entire action since this error is recoverable
-            }
+            setLocale(request, hreq);
 
             /* Template method, override in your derived class to do any
 work you may want to accomplish after a successful login */
@@ -566,6 +552,18 @@
         // redirect.jsp actually handles redirect
     }
 
+    private void setLocale(ExpressoRequest request, HttpServletRequest hreq) throws ControllerException {
+        // set locale
+        try {
+            request.getSession().removePersistentAttribute(Messages.LOCALE_KEY);
+            request.getSession().removePersistentAttribute(Globals.ERROR_KEY);
+            Messages.establishLocale(hreq);
+        } catch (ServletException se) {
+            log.error("Cannot manipulate locale in session", se);
+            // do not abort entire action since this error is recoverable
+        }
+    }
+
     /**
      * Logs a user out of the system and invalidates their session.
      *
@@ -1057,6 +1055,15 @@
         //Add a revalidate email link to the login screen if the default
         //registration domain sends validation emails.
         //
+        addResendValidationEmailLink(request, response);
+    }
+
+    //
+    //Add a revalidate email link to the login screen if the default
+    //registration domain sends validation emails.
+    //
+    private void addResendValidationEmailLink(ExpressoRequest request, ExpressoResponse response) throws
+            ControllerException {
         try {
             String regDomain = Setup.getValue(request.getDataContext(), "defaultRegDomain");
             if (regDomain != null && regDomain.length() > 0) {