Fixed permission update on folder to show error message when deep children have alrea...

[pithos-web-client] / src / gr / grnet / pithos / web / client / foldertree / Folder.java

diff --git a/src/gr/grnet/pithos/web/client/foldertree/Folder.java b/src/gr/grnet/pithos/web/client/foldertree/Folder.java
index cb8361d..81bb4b7 100644 (file)
--- a/src/gr/grnet/pithos/web/client/foldertree/Folder.java
+++ b/src/gr/grnet/pithos/web/client/foldertree/Folder.java
@@ -39,7 +39,6 @@ import gr.grnet.pithos.web.client.Pithos;
 
 import java.util.Date;
 import java.util.HashMap;
 
 import java.util.Date;
 import java.util.HashMap;

-import java.util.Iterator;

 import java.util.LinkedHashSet;
 import java.util.Map;
 import java.util.Set;
 import java.util.LinkedHashSet;
 import java.util.Map;
 import java.util.Set;

@@ -97,7 +96,8 @@ public class Folder extends Resource {
         return name;
     }
 
         return name;
     }
 

-    public Date getLastModified() {
+    @Override
+       public Date getLastModified() {

         return lastModified;
     }
 
         return lastModified;
     }
 

@@ -169,11 +169,6 @@ public class Folder extends Resource {
             }
         }
 
             }
         }
 

-        inheritedPermissionsFrom = response.getHeader("X-Object-Shared-By");
-        String rawPermissions = response.getHeader("X-Object-Sharing");
-        if (rawPermissions != null)
-            parsePermissions(rawPermissions);
-

         subfolders.clear(); //This is necessary in case we update a pre-existing Folder so that stale subfolders won't show up
         files.clear();
         JSONValue json = JSONParser.parseStrict(response.getText());
         subfolders.clear(); //This is necessary in case we update a pre-existing Folder so that stale subfolders won't show up
         files.clear();
         JSONValue json = JSONParser.parseStrict(response.getText());

@@ -327,4 +322,11 @@ public class Folder extends Resource {
        public boolean isHome() {
                return isContainer() && name.equals(Pithos.HOME_CONTAINER);
        }
        public boolean isHome() {
                return isContainer() && name.equals(Pithos.HOME_CONTAINER);
        }

+
+       public boolean contains(Folder folder) {
+               for (Folder f : subfolders)
+                       if (f.equals(folder) || f.contains(folder))
+                               return true;
+               return false;
+       }

 }
 }