[cvs] expresso commit by lhamel: use string constants

[JCorporate Ltd]

Log Message:
-----------
use string constants

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

Revision Data
-------------
Index: SimpleRegistration.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/services/controller/SimpleRegistration.java,v
retrieving revision 1.46
retrieving revision 1.47
diff -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/services/controller/SimpleRegistration.java -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/services/controller/SimpleRegistration.java -u -r1.46 -r1.47
--- expresso-web/WEB-INF/src/com/jcorporate/expresso/services/controller/SimpleRegistration.java
+++ expresso-web/WEB-INF/src/com/jcorporate/expresso/services/controller/SimpleRegistration.java
@@ -72,6 +72,8 @@
 import com.jcorporate.expresso.core.controller.ControllerException;
 import com.jcorporate.expresso.core.controller.ControllerRequest;
 import com.jcorporate.expresso.core.controller.ErrorCollection;
+import com.jcorporate.expresso.core.controller.ExpressoRequest;
+import com.jcorporate.expresso.core.controller.ExpressoResponse;
 import com.jcorporate.expresso.core.controller.Input;
 import com.jcorporate.expresso.core.controller.NonHandleableException;
 import com.jcorporate.expresso.core.controller.Output;
@@ -86,6 +88,7 @@
 import com.jcorporate.expresso.core.logging.LogException;
 import com.jcorporate.expresso.core.misc.ConfigManager;
 import com.jcorporate.expresso.core.misc.StringUtil;
+import com.jcorporate.expresso.core.security.SuperUser;
 import com.jcorporate.expresso.core.security.User;
 import com.jcorporate.expresso.kernel.util.FastStringBuffer;
 import com.jcorporate.expresso.services.controller.ui.DefaultAutoElement;
@@ -102,9 +105,6 @@
 import java.util.Iterator;
 import java.util.Map;
 import java.util.StringTokenizer;
-import com.jcorporate.expresso.core.security.SuperUser;
-import com.jcorporate.expresso.core.controller.ExpressoRequest;
-import com.jcorporate.expresso.core.controller.ExpressoResponse;
 
 
 /**
@@ -736,9 +736,9 @@
         String groupName = null;
 
         if (rd.getField(RegistrationDomain.FLD_REGREQUIRED).equalsIgnoreCase("Y")) {
-            groupName = "NotReg";
+            groupName = UserGroup.NOT_REG_USERS_GROUP;
         } else {
-            groupName = rd.getField(GroupMembers.GROUP_NAME);
+            groupName = rd.getField(RegistrationDomain.FLD_GROUPNAME);
         }
 
         GroupMembers gm = new GroupMembers();
@@ -881,10 +881,10 @@
             GroupMembers gm = new GroupMembers();
             gm.setDataContext(request.getDataContext());
             gm.setField(GroupMembers.EXPUID, user.getUid());
-            gm.setField(GroupMembers.GROUP_NAME, "NotReg");
+            gm.setField(GroupMembers.GROUP_NAME, UserGroup.NOT_REG_USERS_GROUP);
 
             if (gm.find()) {
-                String groupName = rd.getField(GroupMembers.GROUP_NAME);
+                String groupName = rd.getField(RegistrationDomain.FLD_GROUPNAME);
 
                 if ((groupName == null) || (groupName.equals(StringUtil.EMPTY_STRING))) {
                     groupName = UserGroup.ALL_USERS_GROUP;
@@ -1045,7 +1045,7 @@
                 GroupMembers gm = new GroupMembers();
                 gm.setDataContext(request.getDataContext());
                 gm.setField(GroupMembers.EXPUID, user.getUid());
-                gm.setField(GroupMembers.GROUP_NAME, "NotReg");
+                gm.setField(GroupMembers.GROUP_NAME, UserGroup.NOT_REG_USERS_GROUP);
                 if (gm.find()) {
                     gm.delete();
                 }
@@ -1324,7 +1324,7 @@
                     try {
                         gm.retrieve();
 
-                        String groupName = rd.getField(GroupMembers.GROUP_NAME);
+                        String groupName = rd.getField(RegistrationDomain.FLD_GROUPNAME);
 
                         if ((groupName == null) || (groupName.equals(StringUtil.EMPTY_STRING))) {
                             groupName = UserGroup.ALL_USERS_GROUP;