svn commit: [jahia] r17836 - /branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/hibernate/model/JahiaAcl.java

[tdraier]

Author: tdraier
Date: Fri Jun 29 15:16:58 2007
New Revision: 17836

URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D17836&repname=
=3Djahia
Log:
changed for faster mapping

Modified:
    branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/hibernate/model/Ja=
hiaAcl.java

Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/hibernate/mo=
del/JahiaAcl.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/java/org/jahia/hibernate/model/JahiaAcl.java&rev=3D17836&r=
epname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/hibernate/model/Ja=
hiaAcl.java (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/hibernate/model/Ja=
hiaAcl.java Fri Jun 29 15:16:58 2007
@@ -64,7 +64,7 @@
 =

     private Map entries;
 =

-    private Boolean hasEntries;
+    private Integer hasEntries;
 =

     private Map groupEntries;
 =

@@ -83,7 +83,7 @@
      */
     public JahiaAcl() {
         entries =3D new FastHashMap(11);
-        hasEntries =3D Boolean.FALSE;
+        hasEntries =3D new Integer(0);
     }
 =

 // --------------------- GETTER / SETTER METHODS ---------------------
@@ -97,7 +97,7 @@
      * @hibernate.collection-index column=3D"target_jahia_acl_entries" typ=
e=3D"string"
      */
     public Map getEntries() {
-        if (hasEntries !=3D null && !hasEntries.booleanValue()) {
+        if (hasEntries !=3D null && hasEntries.intValue()=3D=3D0) {
             this.groupEntries =3D new HashMap();
             this.userEntries =3D new HashMap();
             return new HashMap();
@@ -132,11 +132,11 @@
     public void setUserEntries(Map userEntries) {
         getEntries().keySet().removeAll(this.userEntries.keySet());
         if (!userEntries.isEmpty()) {
-            setHasEntries(Boolean.TRUE);
+            setHasEntries(new Integer(1));
         }
         getEntries().putAll(userEntries);
         if (entries.isEmpty()) {
-            setHasEntries(Boolean.FALSE);
+            setHasEntries(new Integer(0));
         }
         this.userEntries =3D userEntries;
     }
@@ -149,11 +149,11 @@
     public void setGroupEntries(Map groupEntries) {
         getEntries().keySet().removeAll(this.groupEntries.keySet());
         if (!groupEntries.isEmpty()) {
-            setHasEntries(Boolean.TRUE);
+            setHasEntries(new Integer(1));
         }
         getEntries().putAll(groupEntries);
         if (entries.isEmpty()) {
-            setHasEntries(Boolean.FALSE);
+            setHasEntries(new Integer(0));
         }
         this.groupEntries =3D groupEntries;
     }
@@ -187,13 +187,12 @@
 =

     /**
      * @hibernate.property column=3D"hasentries_jahia_acl"
-     * length=3D"11"
      */
-    public Boolean getHasEntries() {
+    public Integer getHasEntries() {
         return hasEntries;
     }
 =

-    public void setHasEntries(Boolean hasEntries) {
+    public void setHasEntries(Integer hasEntries) {
         this.hasEntries =3D hasEntries;
     }
 =

@@ -288,7 +287,7 @@
             groupEntries.clear();
         }
         if (entries.isEmpty()) {
-            setHasEntries(Boolean.FALSE);
+            setHasEntries(new Integer(0));
         }
         return true;
     }
@@ -621,7 +620,7 @@
         getGroupEntries().remove(group.getName());
         entries.remove(group.getName());
         if (entries.isEmpty()) {
-            setHasEntries(Boolean.FALSE);
+            setHasEntries(new Integer(0));
         }
         return true;
     }
@@ -630,7 +629,7 @@
         getUserEntries().remove(user.getName());
         entries.remove(user.getName());
         if (entries.isEmpty()) {
-            setHasEntries(Boolean.FALSE);
+            setHasEntries(new Integer(0));
         }
         return true;
     }
@@ -646,7 +645,7 @@
 =

         } else {
             //Create new jahiaAclEntry to ensure presence of pk
-            setHasEntries(Boolean.TRUE);
+            setHasEntries(new Integer(1));
             current =3D new JahiaAclEntry(
                     new JahiaAclEntryPK(this, new Integer(ACLInfo.GROUP_TY=
PE_ENTRY), group.getName()),
                     entry.getEntryState(), entry.getEntryTri());
@@ -662,7 +661,7 @@
             current.setEntryState(entry.getEntryState());
             current.setEntryTri(entry.getEntryTri());
         } else {
-            setHasEntries(Boolean.TRUE);
+            setHasEntries(new Integer(1));
             current =3D new JahiaAclEntry(
                     new JahiaAclEntryPK(this, new Integer(ACLInfo.USER_TYP=
E_ENTRY),
                     user.getName()),

_______________________________________________
cvs_list mailing list
cvs_list@jahia.org
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list