[cvs] expresso commit by lhamel: cosmetic

[JCorporate Ltd]

Log Message:
-----------
cosmetic

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

Revision Data
-------------
Index: Registration.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/services/controller/Registration.java,v
retrieving revision 1.52
retrieving revision 1.53
diff -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/services/controller/Registration.java -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/services/controller/Registration.java -u -r1.52 -r1.53
--- expresso-web/WEB-INF/src/com/jcorporate/expresso/services/controller/Registration.java
+++ expresso-web/WEB-INF/src/com/jcorporate/expresso/services/controller/Registration.java
@@ -86,10 +86,12 @@
 import com.jcorporate.expresso.core.security.DelayThread;
 import com.jcorporate.expresso.core.security.SuperUser;
 import com.jcorporate.expresso.core.security.User;
+import com.jcorporate.expresso.core.ExpressoSchema;
 import com.jcorporate.expresso.services.dbobj.RegistrationDomain;
 import com.jcorporate.expresso.services.dbobj.RegistrationObjectMap;
 import com.jcorporate.expresso.services.validation.AuthValidationException;
 import com.jcorporate.expresso.services.validation.ValidationEntry;
+import com.jcorporate.expresso.services.validation.LoginEmailValidator;
 import org.apache.log4j.Logger;
 
 /**
@@ -111,8 +113,7 @@
     private static Logger log = Logger.getLogger(Registration.class.getName());
 
     public Registration() {
-        super();
-        this.setSchema(com.jcorporate.expresso.core.ExpressoSchema.class);
+        setSchema(ExpressoSchema.class);
     }
 
 
@@ -162,8 +163,8 @@
      * @throws ControllerException upon error.
      * @throws DBException upon database error.
      */
-    protected boolean checkRegComplete(final ExpressoRequest request, final int uid) throws DBException
-        , ControllerException {
+    protected boolean checkRegComplete(
+            final ExpressoRequest request, final int uid) throws DBException, ControllerException {
         User myUser = new User();
         myUser.setDataContext(request.getDataContext());
         myUser.setUid(uid);
@@ -269,6 +270,7 @@
      *
      * @param fieldName ????
      * @return currently null
+     * @deprecated v5.7; 10/2005 not clear what this is for... remove from clients or comment this superclass
      */
     protected String getDefaultValue(final String fieldName) {
         return null;
@@ -284,8 +286,8 @@
      * @return a built registration domain object
      * @throws ControllerException upon error.
      */
-    protected RegistrationDomain getRegDomain(final ExpressoRequest request
-        , final User user) throws ControllerException {
+    protected RegistrationDomain getRegDomain(
+            final ExpressoRequest request, final User user) throws ControllerException {
         RegistrationDomain rd = null;
 
         try {
@@ -314,8 +316,8 @@
      * @return a fully instantiated SecuredDbObject
      * @throws ControllerException upon error.
      */
-    protected SecuredDBObject loadDBObject(final ExpressoRequest request
-        , final String dbobj) throws ControllerException {
+    protected SecuredDBObject loadDBObject(
+            final ExpressoRequest request, final String dbobj) throws ControllerException {
         SecuredDBObject db = null;
 
         try {
@@ -475,8 +477,8 @@
      * @throws DBException if there's an error mapping the registration domains
      *                     and building the DBObjects.
      */
-    protected DBObject[] getRequiredDBObjects(final ExpressoRequest request, final RegistrationDomain rd
-        , final User user) throws DBException {
+    protected DBObject[] getRequiredDBObjects(
+            final ExpressoRequest request, final RegistrationDomain rd, final User user) throws DBException {
 
         ArrayList dbobjects = new ArrayList();
 
@@ -541,8 +543,7 @@
      * @return The classname of the login controller to use.
      */
     protected String getLoginController(final ExpressoRequest request) {
-        final String defaultController = com.jcorporate.expresso.services.controller
-            .LoginController.class.getName();
+        final String defaultController = LoginController.class.getName();
         boolean defaultValue = false;
         String controller = request.getParameter("login");
         if (controller == null) {
@@ -585,8 +586,10 @@
      * @throws DBException         upon data access error
      * @throws ControllerException for other errors
      */
-    protected void setupEmailValidation(final ExpressoRequest request, final ExpressoResponse response, final User user
-        , final RegistrationDomain rd, final String loginControllerName) throws DBException, ControllerException {
+    protected void setupEmailValidation(
+            final ExpressoRequest request, final ExpressoResponse response,
+            final User user, final RegistrationDomain rd,
+            final String loginControllerName) throws DBException, ControllerException {
 
         String emailAuthCode = user.getEmailAuthCode();
         String loginName = user.getLoginName();
@@ -599,7 +602,7 @@
 
             ValidationEntry ve = new ValidationEntry(request.getDataContext());
             ve.expiresAfter(72, 0, 0); //Expires after 72 hours
-            ve.setValidationHandler(com.jcorporate.expresso.services.validation.LoginEmailValidator.class.getName());
+            ve.setValidationHandler(LoginEmailValidator.class);
             ve.setTitle("Registration Email Validation");
             ve.setDesc("user=" + loginName + ", db=" + request.getDataContext());
             ve.setServer(hreq.getServerName());