[cvs] expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/services/dbobj GroupNest.java

[JCorporate Ltd]

Update of /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/services/dbobj
In directory jcorp2.servlets.net:/tmp/cvs-serv29756/expresso-web/WEB-INF/src/com/jcorporate/expresso/services/dbobj

Modified Files:
	GroupNest.java 
Log Message:
extracted constants


Index: GroupNest.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/services/dbobj/GroupNest.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** GroupNest.java	18 Feb 2004 23:12:02 -0000	1.10
--- GroupNest.java	21 May 2004 20:33:36 -0000	1.11
***************
*** 80,83 ****
--- 80,90 ----
  public class GroupNest
          extends SecurityDBObject {
+         	
+ 	/**
+ 	 * Field Names for the GROUPNEST table
+ 	 */
+ 	public static final String FLD_GROUPNAME = "GroupName";
+ 	public static final String FLD_MEMBEROF = "MemberOf";
+ 	
      /**
       * @see com.jcorporate.expresso.core.dbobj.SecuredDBObject
***************
*** 126,136 ****
          GroupMembers newMember = new GroupMembers(SecuredDBObject.SYSTEM_ACCOUNT);
          newMember.setDataContext(getDataContext());
!         ml.setField("GroupName", getField("GroupName"));
  
          for (Iterator e = ml.searchAndRetrieveList().iterator(); e.hasNext();) {
              oneMember = (GroupMembers) e.next();
              newMember.clear();
!             newMember.setField("ExpUid", oneMember.getField("ExpUid"));
!             newMember.setField("GroupName", getField("MemberOf"));
  
              if (!newMember.find()) {
--- 133,143 ----
          GroupMembers newMember = new GroupMembers(SecuredDBObject.SYSTEM_ACCOUNT);
          newMember.setDataContext(getDataContext());
!         ml.setField(GroupMembers.GROUP_NAME, getField(FLD_GROUPNAME));
  
          for (Iterator e = ml.searchAndRetrieveList().iterator(); e.hasNext();) {
              oneMember = (GroupMembers) e.next();
              newMember.clear();
!             newMember.setField(GroupMembers.EXPUID, oneMember.getField(GroupMembers.EXPUID));
!             newMember.setField(GroupMembers.GROUP_NAME, getField(FLD_MEMBEROF));
  
              if (!newMember.find()) {
***************
*** 151,158 ****
      protected void checkAllRefs()
              throws DBException {
!         checkRef("GroupName", new UserGroup(),
!                 "Invalid " + getString(getMetaData().getDescription("GroupName")));
!         checkRef("MemberOf", new UserGroup(),
!                 "Invalid " + getString(getMetaData().getDescription("MemberOf")));
      } /* checkAllRefs() */
  
--- 158,165 ----
      protected void checkAllRefs()
              throws DBException {
!         checkRef(FLD_GROUPNAME, new UserGroup(),
!                 "Invalid " + getString(getMetaData().getDescription(FLD_GROUPNAME)));
!         checkRef(FLD_MEMBEROF, new UserGroup(),
!                 "Invalid " + getString(getMetaData().getDescription(FLD_MEMBEROF)));
      } /* checkAllRefs() */
  
***************
*** 172,182 ****
          GroupMembers newMember = new GroupMembers(SecuredDBObject.SYSTEM_ACCOUNT);
          newMember.setDataContext(getDataContext());
!         ml.setField("GroupName", getField("GroupName"));
  
          for (Iterator e = ml.searchAndRetrieveList().iterator(); e.hasNext();) {
              oneMember = (GroupMembers) e.next();
              newMember.clear();
!             newMember.setField("ExpUid", oneMember.getField("ExpUid"));
!             newMember.setField("GroupName", getField("MemberOf"));
  
              if (newMember.find()) {
--- 179,189 ----
          GroupMembers newMember = new GroupMembers(SecuredDBObject.SYSTEM_ACCOUNT);
          newMember.setDataContext(getDataContext());
!         ml.setField(GroupMembers.GROUP_NAME, getField(FLD_GROUPNAME));
  
          for (Iterator e = ml.searchAndRetrieveList().iterator(); e.hasNext();) {
              oneMember = (GroupMembers) e.next();
              newMember.clear();
!             newMember.setField(GroupMembers.EXPUID, oneMember.getField(GroupMembers.EXPUID));
!             newMember.setField(GroupMembers.GROUP_NAME, getField(FLD_MEMBEROF));
  
              if (newMember.find()) {
***************
*** 201,216 ****
          setDescription("DBgroupNest");
          setCharset("ISO-8859-1");
!         addField("GroupName", "char", 10, false, "groupName");
!         addField("MemberOf", "char", 10, false, "memberOf");
!         addKey("GroupName");
!         addKey("MemberOf");
!         setStringFilter("GroupName", "stripFilter");
!         setStringFilter("MemberOf", "stripFilter");
!         setMultiValued("GroupName");
!         setMultiValued("MemberOf");
!         setLookupObject("MemberOf",
!                 "com.jcorporate.expresso.services.dbobj.UserGroup");
!         setLookupObject("GroupName",
!                 "com.jcorporate.expresso.services.dbobj.UserGroup");
      } /* setupFields() */
  
--- 208,223 ----
          setDescription("DBgroupNest");
          setCharset("ISO-8859-1");
!         addField(FLD_GROUPNAME, "char", 10, false, "groupName");
!         addField(FLD_MEMBEROF, "char", 10, false, "memberOf");
!         addKey(FLD_GROUPNAME);
!         addKey(FLD_MEMBEROF);
!         setStringFilter(FLD_GROUPNAME, "stripFilter");
!         setStringFilter(FLD_MEMBEROF, "stripFilter");
!         setMultiValued(FLD_GROUPNAME);
!         setMultiValued(FLD_MEMBEROF);
!         setLookupObject(FLD_MEMBEROF,
!                 com.jcorporate.expresso.services.dbobj.UserGroup.class.getName());
!         setLookupObject(FLD_GROUPNAME,
!                 com.jcorporate.expresso.services.dbobj.UserGroup.class.getName());
      } /* setupFields() */