[cvs] expresso commit by mtraum: make field names constant
JCorporate Ltd
jcorp at jcorporate.com
Mon Mar 7 04:05:41 UTC 2005
Log Message:
-----------
make field names constant
Modified Files:
--------------
expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/services/dbobj:
RegistrationDomain.java
Revision Data
-------------
Index: RegistrationDomain.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/services/dbobj/RegistrationDomain.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/services/dbobj/RegistrationDomain.java -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/services/dbobj/RegistrationDomain.java -u -r1.18 -r1.19
--- expresso-web/WEB-INF/src/com/jcorporate/expresso/services/dbobj/RegistrationDomain.java
+++ expresso-web/WEB-INF/src/com/jcorporate/expresso/services/dbobj/RegistrationDomain.java
@@ -89,6 +89,23 @@
* @author Shash Chatterjee
*/
public class RegistrationDomain extends SecuredDBObject {
+
+ /**
+ * Field Names for the REGDOMAIN table
+ */
+ public static final String FLD_REGDOMID = "RegDomId";
+ public static final String FLD_DESCRIPTION = "Description";
+ public static final String FLD_GROUPNAME = "GroupName";
+ public static final String FLD_CONTROLLERCLASS = "ControllerClass";
+ public static final String FLD_REGREQUIRED = "RegRequired";
+ public static final String FLD_APPROVE = "Approve";
+ public static final String FLD_USERPASSWD = "UserPasswd";
+ public static final String FLD_EMAILVALIDATE = "EmailValidate";
+ public static final String FLD_EMAILASLOGIN = "EmailAsLogin";
+ public static final String FLD_APPROVERS = "Approvers";
+ public static final String FLD_NOTREGGRP = "NotRegGrp";
+ public static final String FLD_NOTAPPROVEDGRP = "NotApprovedGrp";
+
/**
* Default constructor
*
@@ -141,10 +158,10 @@
* @throws DBException If the values cannot be retrieved
*/
public Vector getValidValues(String fieldName) throws DBException {
- if (fieldName.equals("RegRequired") || fieldName.equals("Approve") ||
- fieldName.equals("UserPasswd") ||
- fieldName.equals("EmailValidate") ||
- fieldName.equals("EmailAsLogin")) {
+ if (fieldName.equals(FLD_REGREQUIRED) || fieldName.equals(FLD_APPROVE) ||
+ fieldName.equals(FLD_USERPASSWD) ||
+ fieldName.equals(FLD_EMAILVALIDATE) ||
+ fieldName.equals(FLD_EMAILASLOGIN)) {
Vector myValues = new Vector(2);
myValues.addElement(new ValidValue("Y", "Yes"));
myValues.addElement(new ValidValue("N", "No"));
@@ -152,7 +169,7 @@
return myValues;
}
- if (fieldName.equals("NotApprovedGrp")) {
+ if (fieldName.equals(FLD_NOTAPPROVEDGRP)) {
Vector myValues = super.getValidValues(fieldName);
myValues.add(0, new ValidValue("", getString("notSelected")));
return myValues;
@@ -166,7 +183,7 @@
* @return Vector of ValidValue objects
*/
public Vector getValues() throws DBException {
- return getValuesDefault("RegDomId", "Name");
+ return getValuesDefault(FLD_REGDOMID, "Name");
}
/* getValues() */
@@ -188,37 +205,37 @@
rd.getField("Name") + "\" already exists.");
}
- if (getField("RegRequired").equals("")) {
- setField("RegRequired", "Y");
+ if (getField(FLD_REGREQUIRED).equals("")) {
+ setField(FLD_REGREQUIRED, "Y");
}
- if (getField("Approve").equals("")) {
- setField("Approve", "N");
+ if (getField(FLD_APPROVE).equals("")) {
+ setField(FLD_APPROVE, "N");
}
- if (getField("UserPasswd").equals("")) {
- setField("UserPasswd", "N");
+ if (getField(FLD_USERPASSWD).equals("")) {
+ setField(FLD_USERPASSWD, "N");
}
- if (getField("EmailValidate").equals("")) {
- setField("EmailValidate", "Y");
+ if (getField(FLD_EMAILVALIDATE).equals("")) {
+ setField(FLD_EMAILVALIDATE, "Y");
}
- if (getField("EmailAsLogin").equals("")) {
- setField("EmailAsLogin", "Y");
+ if (getField(FLD_EMAILASLOGIN).equals("")) {
+ setField(FLD_EMAILASLOGIN, "Y");
}
- if (getField("NotApprovedGrp").equals("")) {
- setField("NotRegGrp", "NotReg");
+ if (getField(FLD_NOTAPPROVEDGRP).equals("")) {
+ setField(FLD_NOTREGGRP, "NotReg");
}
- if (getField("Approve").equals("Y")) {
- if (getField("Approvers").equals("")) {
- setField("Approvers", User.ADMIN_USER);
+ if (getField(FLD_APPROVE).equals("Y")) {
+ if (getField(FLD_APPROVERS).equals("")) {
+ setField(FLD_APPROVERS, User.ADMIN_USER);
}
- if (getField("NotApprovedGrp").equals("")) {
- setField("NotApprovedGrp", "NotReg");
+ if (getField(FLD_NOTAPPROVEDGRP).equals("")) {
+ setField(FLD_NOTAPPROVEDGRP, "NotReg");
}
}
@@ -255,11 +272,11 @@
* @throws DBException upon error
*/
public Controller getRegistrationObject() throws DBException {
- StringUtil.assertNotBlank(this.getField("ControllerClass"),
+ StringUtil.assertNotBlank(this.getField(FLD_CONTROLLERCLASS),
"Invalid Registration ControllerClassname for this object");
try {
- return ConfigManager.getControllerFactory().getController(this.getField("ControllerClass"));
+ return ConfigManager.getControllerFactory().getController(this.getField(FLD_CONTROLLERCLASS));
} catch (com.jcorporate.expresso.core.controller.ControllerException ce) {
throw new DBException("Error creating Registration controller", ce);
}
@@ -277,7 +294,7 @@
public void delete() throws com.jcorporate.expresso.core.db.DBException {
RegistrationObjectMap rom = new RegistrationObjectMap();
rom.setDataContext(getDataContext());
- rom.setField("RegDomId", this.getField("RegDomId"));
+ rom.setField(FLD_REGDOMID, this.getField(FLD_REGDOMID));
RegistrationObjectMap oneRom = null;
@@ -301,46 +318,46 @@
rd.setField("Name", this.getField("Name"));
if (rd.find() &&
- (!rd.getField("RegDomId").equals(this.getField("RegDomId")))) {
+ (!rd.getField(FLD_REGDOMID).equals(this.getField(FLD_REGDOMID)))) {
throw new DBException("Registration domain \"" +
rd.getField("Name") + "\" already exists.");
}
- if (getField("RegRequired").equals("")) {
- setField("RegRequired", "Y");
+ if (getField(FLD_REGREQUIRED).equals("")) {
+ setField(FLD_REGREQUIRED, "Y");
}
- if (getField("RegRequired").equals("")) {
- setField("RegRequired", "Y");
+ if (getField(FLD_REGREQUIRED).equals("")) {
+ setField(FLD_REGREQUIRED, "Y");
}
- if (getField("Approve").equals("")) {
- setField("Approve", "N");
+ if (getField(FLD_APPROVE).equals("")) {
+ setField(FLD_APPROVE, "N");
}
- if (getField("UserPasswd").equals("")) {
- setField("UserPasswd", "N");
+ if (getField(FLD_USERPASSWD).equals("")) {
+ setField(FLD_USERPASSWD, "N");
}
- if (getField("EmailValidate").equals("")) {
- setField("EmailValidate", "Y");
+ if (getField(FLD_EMAILVALIDATE).equals("")) {
+ setField(FLD_EMAILVALIDATE, "Y");
}
- if (getField("EmailAsLogin").equals("")) {
- setField("EmailAsLogin", "Y");
+ if (getField(FLD_EMAILASLOGIN).equals("")) {
+ setField(FLD_EMAILASLOGIN, "Y");
}
- if (getField("NotApprovedGrp").equals("")) {
- setField("NotRegGrp", "NotReg");
+ if (getField(FLD_NOTAPPROVEDGRP).equals("")) {
+ setField(FLD_NOTREGGRP, "NotReg");
}
- if (getField("Approve").equals("Y")) {
- if (getField("Approvers").equals("")) {
- setField("Approvers", User.ADMIN_USER);
+ if (getField(FLD_APPROVE).equals("Y")) {
+ if (getField(FLD_APPROVERS).equals("")) {
+ setField(FLD_APPROVERS, User.ADMIN_USER);
}
- if (getField("NotApprovedGrp").equals("")) {
- setField("NotApprovedGrp", "NotReg");
+ if (getField(FLD_NOTAPPROVEDGRP).equals("")) {
+ setField(FLD_NOTAPPROVEDGRP, "NotReg");
}
}
@@ -355,8 +372,8 @@
* @throws DBException If there is a problem checking the integrity
*/
protected void checkAllRefs() throws DBException {
- checkRef("GroupName", new UserGroup(SecuredDBObject.SYSTEM_ACCOUNT),
- "Invalid " + getString(getMetaData().getDescription("GroupName")));
+ checkRef(FLD_GROUPNAME, new UserGroup(SecuredDBObject.SYSTEM_ACCOUNT),
+ "Invalid " + getString(getMetaData().getDescription(FLD_GROUPNAME)));
}
/* checkAllRefs() */
@@ -374,47 +391,47 @@
setTargetTable("REGDOMAIN");
setDescription("DBregDomain");
setCharset("ISO-8859-1");
- addField("RegDomId", "auto-inc", 0, false, "regDomId");
+ addField(FLD_REGDOMID, "auto-inc", 0, false, "regDomId");
addField("Name", "varchar", 30, false, "name");
- addField("Description", "varchar", 128, false, "description");
- addField("GroupName", "char", 10, false, "defaultGroup");
- addField("ControllerClass", "varchar", 128, true, "regControllerClass");
- addField("RegRequired", "char", 1, true, "regRequired");
- addField("Approve", "char", 1, true, "approvalRequired");
- addField("UserPasswd", "char", 1, true, "userPassword");
- addField("EmailValidate", "char", 1, true, "emailValidate");
- addField("EmailAsLogin", "char", 1, true, "emailAsLogin");
- addField("Approvers", "text", 0, true, "loginNamesForApprovers");
- addField("NotRegGrp", "char", 10, true, "groupBeforeRegistration");
- addField("NotApprovedGrp", "char", 10, true, "groupBeforeApproval");
- addKey("RegDomId");
- setReadOnly("RegDomId");
+ addField(FLD_DESCRIPTION, "varchar", 128, false, "description");
+ addField(FLD_GROUPNAME, "char", 10, false, "defaultGroup");
+ addField(FLD_CONTROLLERCLASS, "varchar", 128, true, "regControllerClass");
+ addField(FLD_REGREQUIRED, "char", 1, true, "regRequired");
+ addField(FLD_APPROVE, "char", 1, true, "approvalRequired");
+ addField(FLD_USERPASSWD, "char", 1, true, "userPassword");
+ addField(FLD_EMAILVALIDATE, "char", 1, true, "emailValidate");
+ addField(FLD_EMAILASLOGIN, "char", 1, true, "emailAsLogin");
+ addField(FLD_APPROVERS, "text", 0, true, "loginNamesForApprovers");
+ addField(FLD_NOTREGGRP, "char", 10, true, "groupBeforeRegistration");
+ addField(FLD_NOTAPPROVEDGRP, "char", 10, true, "groupBeforeApproval");
+ addKey(FLD_REGDOMID);
+ setReadOnly(FLD_REGDOMID);
//
//Add a database index to speed up name lookups
//
addIndex("RegDomainName", "Name", true);
setStringFilter("Name", "stripFilter");
- setStringFilter("Description", "stripFilter");
- setStringFilter("ControllerClass", "stripFilter");
- setStringFilter("GroupName", "stripFilter");
- setStringFilter("Approvers", "stripFilter");
- setMultiValued("RegRequired");
- setMultiValued("Approve");
- setMultiValued("UserPasswd");
- setMultiValued("EmailValidate");
- setMultiValued("EmailAsLogin");
- setMultiValued("GroupName");
- setMultiValued("NotRegGrp");
- setMultiValued("NotApprovedGrp");
- setLookupObject("GroupName",
+ setStringFilter(FLD_DESCRIPTION, "stripFilter");
+ setStringFilter(FLD_CONTROLLERCLASS, "stripFilter");
+ setStringFilter(FLD_GROUPNAME, "stripFilter");
+ setStringFilter(FLD_APPROVERS, "stripFilter");
+ setMultiValued(FLD_REGREQUIRED);
+ setMultiValued(FLD_APPROVE);
+ setMultiValued(FLD_USERPASSWD);
+ setMultiValued(FLD_EMAILVALIDATE);
+ setMultiValued(FLD_EMAILASLOGIN);
+ setMultiValued(FLD_GROUPNAME);
+ setMultiValued(FLD_NOTREGGRP);
+ setMultiValued(FLD_NOTAPPROVEDGRP);
+ setLookupObject(FLD_GROUPNAME,
"com.jcorporate.expresso.services.dbobj.UserGroup");
- setLookupObject("NotRegGrp",
+ setLookupObject(FLD_NOTREGGRP,
"com.jcorporate.expresso.services.dbobj.UserGroup");
- setLookupObject("NotApprovedGrp",
+ setLookupObject(FLD_NOTAPPROVEDGRP,
"com.jcorporate.expresso.services.dbobj.UserGroup");
addDetail("com.jcorporate.expresso.services.dbobj.RegistrationObjectMap",
- "RegDomId", "RegDomId");
+ FLD_REGDOMID, FLD_REGDOMID);
}
/* setupFields() */
}
More information about the cvs
mailing list