[cvs] expresso commit by mtraum: make field names constant

[JCorporate Ltd]

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.19
retrieving revision 1.20
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.19 -r1.20
--- expresso-web/WEB-INF/src/com/jcorporate/expresso/services/dbobj/RegistrationDomain.java
+++ expresso-web/WEB-INF/src/com/jcorporate/expresso/services/dbobj/RegistrationDomain.java
@@ -94,6 +94,7 @@
      * Field Names for the REGDOMAIN table
      */
     public static final String FLD_REGDOMID = "RegDomId";
+    public static final String FLD_NAME = "Name";
     public static final String FLD_DESCRIPTION = "Description";
     public static final String FLD_GROUPNAME = "GroupName";
     public static final String FLD_CONTROLLERCLASS = "ControllerClass";
@@ -183,7 +184,7 @@
      * @return Vector of ValidValue objects
      */
     public Vector getValues() throws DBException {
-        return getValuesDefault(FLD_REGDOMID, "Name");
+        return getValuesDefault(FLD_REGDOMID, FLD_NAME);
     }
     /* getValues() */
 
@@ -198,11 +199,11 @@
     public void add() throws com.jcorporate.expresso.core.db.DBException {
         RegistrationDomain rd = new RegistrationDomain();
         rd.setDataContext(getDataContext());
-        rd.setField("Name", this.getField("Name"));
+        rd.setField(FLD_NAME, this.getField(FLD_NAME));
 
         if (rd.find()) {
             throw new DBException("Registration domain \"" +
-                    rd.getField("Name") + "\" already exists.");
+                    rd.getField(FLD_NAME) + "\" already exists.");
         }
 
         if (getField(FLD_REGREQUIRED).equals("")) {
@@ -255,7 +256,7 @@
         String regDomain = Setup.getValueRequired(dbContext, "defaultRegDomain");
         RegistrationDomain rd = new RegistrationDomain(SecuredDBObject.SYSTEM_ACCOUNT);
         rd.setDataContext(dbContext);
-        rd.setField("Name", regDomain);
+        rd.setField(FLD_NAME, regDomain);
 
         if (rd.find()) {
             return rd;
@@ -315,12 +316,12 @@
     public void update() throws com.jcorporate.expresso.core.db.DBException {
         RegistrationDomain rd = new RegistrationDomain();
         rd.setDataContext(getDataContext());
-        rd.setField("Name", this.getField("Name"));
+        rd.setField(FLD_NAME, this.getField(FLD_NAME));
 
         if (rd.find() &&
                 (!rd.getField(FLD_REGDOMID).equals(this.getField(FLD_REGDOMID)))) {
             throw new DBException("Registration domain \"" +
-                    rd.getField("Name") + "\" already exists.");
+                    rd.getField(FLD_NAME) + "\" already exists.");
         }
 
         if (getField(FLD_REGREQUIRED).equals("")) {
@@ -392,7 +393,7 @@
         setDescription("DBregDomain");
         setCharset("ISO-8859-1");
         addField(FLD_REGDOMID, "auto-inc", 0, false, "regDomId");
-        addField("Name", "varchar", 30, false, "name");
+        addField(FLD_NAME, "varchar", 30, false, "name");
         addField(FLD_DESCRIPTION, "varchar", 128, false, "description");
         addField(FLD_GROUPNAME, "char", 10, false, "defaultGroup");
         addField(FLD_CONTROLLERCLASS, "varchar", 128, true, "regControllerClass");
@@ -410,8 +411,8 @@
         //
         //Add a database index to speed up name lookups
         //
-        addIndex("RegDomainName", "Name", true);
-        setStringFilter("Name", "stripFilter");
+        addIndex("RegDomainName", FLD_NAME, true);
+        setStringFilter(FLD_NAME, "stripFilter");
         setStringFilter(FLD_DESCRIPTION, "stripFilter");
         setStringFilter(FLD_CONTROLLERCLASS, "stripFilter");
         setStringFilter(FLD_GROUPNAME, "stripFilter");