[cvs] expresso commit by lhamel: use addOrUpdate() for permissions rather

[JCorporate Ltd]

Log Message:
-----------
use addOrUpdate() for permissions rather than 'created' marker

Modified Files:
--------------
    expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/core/dbobj:
        RowSecuredDBObject.java

Revision Data
-------------
Index: RowSecuredDBObject.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/core/dbobj/RowSecuredDBObject.java,v
retrieving revision 1.53
retrieving revision 1.54
diff -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/core/dbobj/RowSecuredDBObject.java -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/core/dbobj/RowSecuredDBObject.java -u -r1.53 -r1.54
--- expresso-web/WEB-INF/src/com/jcorporate/expresso/core/dbobj/RowSecuredDBObject.java
+++ expresso-web/WEB-INF/src/com/jcorporate/expresso/core/dbobj/RowSecuredDBObject.java
@@ -118,10 +118,6 @@
  */
 public class RowSecuredDBObject extends SecuredDBObject {
 
-    /**
-     * Flag for getPermission() if it must create new.
-     */
-    private static final String CREATED_NEW = "CREATED_NEW";
     public static final String DEFAULT_PERMISSION_CODE = "DefaultPermissions";
 
 
@@ -372,7 +368,6 @@
 
         // set owner if this is a new set of permissions
         if (!found) {
-            rowPermissions.setAttribute(CREATED_NEW, "1");
             rowPermissions.owner(getRequestingUser().getUid());
         }
 
@@ -1089,12 +1084,7 @@
         RowPermissions rowPermissions = getPermissions();
         rowPermissions.owner(owner);
         rowPermissions.permissions(perm);
-        if (rowPermissions.getAttribute(CREATED_NEW) != null) {
-            rowPermissions.add();
-            rowPermissions.removeAttribute(CREATED_NEW);
-        } else {
-            rowPermissions.update();
-        }
+        rowPermissions.addOrUpdate();
 
         if (group != null) {
             addGroupPerm(group, perm);