[cvs]
expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/services/dbobj
UserGroup.java
JCorporate Ltd
jcorp at jcorp2.servlets.net
Fri May 28 12:32:45 PDT 2004
Update of /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/services/dbobj
In directory jcorp2.servlets.net:/tmp/cvs-serv32282/expresso-web/WEB-INF/src/com/jcorporate/expresso/services/dbobj
Modified Files:
UserGroup.java
Log Message:
add comments, reformat--cosmetic
Index: UserGroup.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/services/dbobj/UserGroup.java,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** UserGroup.java 28 May 2004 18:58:49 -0000 1.21
--- UserGroup.java 28 May 2004 19:32:43 -0000 1.22
***************
*** 76,86 ****
/**
! * <p>UserGroup.java</p>
! * <p>Copyright 1999-2002 Jcorporate Ltd.</p>
! * <p>UserGroup is a grouping of a number of users for security purposes. Modern
! * terms would call this a <code>Role</code> table. Groups are the equivalant
! * under a different name</p>
*
! * @author Michael Nash
* @since Expresso 1.0
*/
--- 76,83 ----
/**
! * <p>UserGroup is a grouping of a number of users for security purposes.
! * UserGroups are equivalent to 'roles' in other terminology.</p>
*
! * @author Michael Nash
* @since Expresso 1.0
*/
***************
*** 96,99 ****
--- 93,97 ----
* used as default group for all
* users who register and their reg domain has no other group set
+ *
* @see com.jcorporate.expresso.services.controller.SimpleRegistration
*/
***************
*** 110,128 ****
/**
! * @see com.jcorporate.expresso.core.dbobj.SecuredDBObject
*
! * @throws DBException
*/
! public UserGroup()
! throws DBException {
} /* UserGroup() */
/**
* Initializes the usergroup with the permissions of the given user.
* @param uid the User's uid
* @throws DBException upon instantion error
*/
! public UserGroup(int uid)
! throws DBException {
super(uid);
}
--- 108,125 ----
/**
! * construct object with superuser privileges
*
! * @see com.jcorporate.expresso.core.dbobj.SecuredDBObject
*/
! public UserGroup() throws DBException {
} /* UserGroup() */
/**
* Initializes the usergroup with the permissions of the given user.
+ *
* @param uid the User's uid
* @throws DBException upon instantion error
*/
! public UserGroup(int uid) throws DBException {
super(uid);
}
***************
*** 133,149 ****
*
* @param request - The controller request handed to you by the framework.
- * @throws DBException
*/
! public UserGroup(ControllerRequest request)
! throws DBException {
super(request);
}
/**
! * constructor for db transactions
! * @param localConnection the DB connection which should be used, typically because of an ongoing transaction
*/
public UserGroup(DBConnection localConnection) throws DBException {
! if ( localConnection != null ) setConnection(localConnection);
}
--- 130,145 ----
*
* @param request - The controller request handed to you by the framework.
*/
! public UserGroup(ControllerRequest request) throws DBException {
super(request);
}
/**
! * constructor for db transactions; object will have superuser privileges unless you separately call setRequestingUid()
! *
! * @param localConnection the connection which should be used, typically because of an ongoing transaction
*/
public UserGroup(DBConnection localConnection) throws DBException {
! if (localConnection != null) setConnection(localConnection);
}
***************
*** 151,155 ****
* Check referential integrity of objects referring to this object
*
! * @throws DBException If the integrity cannot be verified
*/
protected void checkAllReferredToBy()
--- 147,151 ----
* Check referential integrity of objects referring to this object
*
! * @throws DBException If the integrity cannot be verified
*/
protected void checkAllReferredToBy()
***************
*** 171,182 ****
"This Group (" + getField(GROUP_NAME_FIELD) +
") still has members ");
! referredToBy(new GroupNest(SecuredDBObject.SYSTEM_ACCOUNT),
! GroupNest.FLD_GROUPNAME,
! "This Group (" + getField(GROUP_NAME_FIELD) +
! ") is in use by a Group Member Nesting entry");
! referredToBy(new GroupNest(SecuredDBObject.SYSTEM_ACCOUNT),
! GroupNest.FLD_MEMBEROF,
! "This Group (" + getField(GROUP_NAME_FIELD) +
! ") is in use by a Group Member Nesting entry");
} /* checkAllReferredToBy() */
--- 167,178 ----
"This Group (" + getField(GROUP_NAME_FIELD) +
") still has members ");
! referredToBy(new GroupNest(SecuredDBObject.SYSTEM_ACCOUNT),
! GroupNest.FLD_GROUPNAME,
! "This Group (" + getField(GROUP_NAME_FIELD) +
! ") is in use by a Group Member Nesting entry");
! referredToBy(new GroupNest(SecuredDBObject.SYSTEM_ACCOUNT),
! GroupNest.FLD_MEMBEROF,
! "This Group (" + getField(GROUP_NAME_FIELD) +
! ") is in use by a Group Member Nesting entry");
} /* checkAllReferredToBy() */
***************
*** 185,190 ****
* Extend the super.delete() method to first delete the GroupMembers
* elements that refer to the group being deleted
- *
- * @throws DBException
*/
public void delete()
--- 181,184 ----
***************
*** 208,213 ****
/**
* @see com.jcorporate.expresso.core.dbobj.SecuredDBObject
- *
- * @throws DBException
*/
protected synchronized void setupFields()
--- 202,205 ----
***************
*** 234,238 ****
* to GroupDescriptions
*
- * @throws DBException
* @return a vector of valid values.
*/
--- 226,229 ----
***************
*** 245,250 ****
/**
* Populates the default user groups.
- *
- * @throws DBException
*/
public synchronized void populateDefaultValues()
--- 236,239 ----
***************
*** 272,275 ****
--- 261,265 ----
/**
* convenience method
+ *
* @return name of group
* @throws DBException upon error
***************
*** 281,284 ****
--- 271,275 ----
/**
* convenience method
+ *
* @param groupName the new gropu name
* @throws DBException upon error
***************
*** 289,295 ****
/**
* @return group for this name, or null if not found; uses "default" dbcontext
* @throws DBException upon error
- * @param groupname the new group name
*/
public static UserGroup getGroup(String groupname) throws DBException {
--- 280,286 ----
/**
+ * @param groupname the new group name
* @return group for this name, or null if not found; uses "default" dbcontext
* @throws DBException upon error
*/
public static UserGroup getGroup(String groupname) throws DBException {
***************
*** 309,319 ****
/**
* convenience method
! * @throws DBException upon error
* @return java.lang.String the group description
*/
public String getGroupDescription() throws DBException {
return getField(GROUP_DESCRIPTION);
}
-
} /* UserGroup */
--- 300,310 ----
/**
* convenience method
! *
* @return java.lang.String the group description
+ * @throws DBException upon error
*/
public String getGroupDescription() throws DBException {
return getField(GROUP_DESCRIPTION);
}
} /* UserGroup */
More information about the cvs
mailing list