Author: tdraier
Date: Wed Aug  9 14:49:49 2006
New Revision: 14873

URL: https://svndev.jahia.net/websvn/listing.php?sc=1&rev=14873&repname=jahia
Log:
fixed public/private folder

Modified:
    
branches/JAHIA-4-1-BRANCH/src/java/org/jahia/services/webdav/stores/JahiaDescriptorsStore.java

Modified: 
branches/JAHIA-4-1-BRANCH/src/java/org/jahia/services/webdav/stores/JahiaDescriptorsStore.java
URL: 
https://svndev.jahia.net/websvn/diff.php?path=/branches/JAHIA-4-1-BRANCH/src/java/org/jahia/services/webdav/stores/JahiaDescriptorsStore.java&rev=14873&repname=jahia
==============================================================================
--- 
branches/JAHIA-4-1-BRANCH/src/java/org/jahia/services/webdav/stores/JahiaDescriptorsStore.java
 (original)
+++ 
branches/JAHIA-4-1-BRANCH/src/java/org/jahia/services/webdav/stores/JahiaDescriptorsStore.java
 Wed Aug  9 14:49:49 2006
@@ -783,17 +783,19 @@
             }
             subject = new SubjectNode (uri.toString (), children, parents, new 
Vector ());
         } else if (folderName.equals ("public") || folderName.equals 
("private")) {
-//            Vector childrenVector = new Vector ();
-//            Vector linksVector = new Vector ();
-//            getChildren (uri, childrenVector, linksVector);
-//            subject = new SubjectNode (uri.toString (), childrenVector, 
linksVector);
+            Vector childrenVector = new Vector ();
+            Vector linksVector = new Vector ();
             try {
                 subject = (SubjectNode) super.retrieveObject(uri);
+                Vector v = subject.getChildren();
+                for (Iterator iterator = v.iterator(); iterator.hasNext();) {
+                    String s = (String) iterator.next();
+                    s = s.substring(s.lastIndexOf('/')+1);
+                    childrenVector.add(new 
SubjectNode.Binding(s,subject.getBindingUuri(s)));
+                }
             } catch (ObjectNotFoundException e) {
-                Vector childrenVector = new Vector ();
-                Vector linksVector = new Vector ();
-                subject = new SubjectNode (uri.toString (), childrenVector, 
parents, linksVector);
             }
+            subject = new SubjectNode (uri.toString (), childrenVector, 
parents, linksVector);
         } else {
             throw new ObjectNotFoundException (uri);
         }
@@ -915,13 +917,19 @@
                 !JahiaGroupManagerService.GUEST_GROUPNAME.equals (groupName) &&
                 !JahiaGroupManagerService.USERS_GROUPNAME.equals (groupName)) {
             // /groups/groupname/[private|public]
+            Vector childrenVector = new Vector ();
+            Vector linksVector = new Vector ();
             try {
                 subject = (SubjectNode) super.retrieveObject(uri);
+                Vector v = subject.getChildren();
+                for (Iterator iterator = v.iterator(); iterator.hasNext();) {
+                    String s = (String) iterator.next();
+                    s = s.substring(s.lastIndexOf('/')+1);
+                    childrenVector.add(new 
SubjectNode.Binding(s,subject.getBindingUuri(s)));
+                }
             } catch (ObjectNotFoundException e) {
-                Vector childrenVector = new Vector ();
-                Vector linksVector = new Vector ();
-                subject = new SubjectNode (uri.toString (), childrenVector, 
parents, linksVector);
             }
+            subject = new SubjectNode (uri.toString (), childrenVector, 
parents, linksVector);
         } else {
             throw new ObjectNotFoundException (uri);
         }

Reply via email to