Show display name in FolderPropertiesDialog

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

diff --git a/src/gr/grnet/pithos/web/client/FolderPermissionsDialog.java b/src/gr/grnet/pithos/web/client/FolderPermissionsDialog.java
index de6877f..91550d7 100644 (file)
--- a/src/gr/grnet/pithos/web/client/FolderPermissionsDialog.java
+++ b/src/gr/grnet/pithos/web/client/FolderPermissionsDialog.java
@@ -34,15 +34,11 @@
  */\r
 package gr.grnet.pithos.web.client;\r
 \r
-import gr.grnet.pithos.web.client.commands.CreateGroupCommand;\r
-import gr.grnet.pithos.web.client.foldertree.File;\r
 import gr.grnet.pithos.web.client.foldertree.Folder;\r
-import gr.grnet.pithos.web.client.foldertree.Resource;\r
 import gr.grnet.pithos.web.client.rest.PostRequest;\r
 import gr.grnet.pithos.web.client.rest.PutRequest;\r
 import gr.grnet.pithos.web.client.rest.RestException;\r
 \r
-import java.util.Iterator;\r
 import java.util.Map;\r
 \r
 import com.google.gwt.core.client.GWT;\r
@@ -97,7 +93,6 @@ public class FolderPermissionsDialog extends DialogBox {
                        }\r
                });\r
 \r
-               setAnimationEnabled(true);\r
                setGlassEnabled(true);\r
                setStyleName("pithos-DialogBox");\r
 \r
@@ -120,7 +115,7 @@ public class FolderPermissionsDialog extends DialogBox {
 \r
         VerticalPanel permPanel = new VerticalPanel();\r
         FilePermissionsDialog.Images images = GWT.create(FilePermissionsDialog.Images.class);\r
-        permList = new PermissionsList(images, folder.getPermissions(), folder.getOwner(), false, null);\r
+        permList = new PermissionsList(images, folder.getPermissions(), folder.getOwnerID(), false, null);\r
         permPanel.add(permList);\r
 \r
         HorizontalPanel permButtons = new HorizontalPanel();\r
@@ -215,57 +210,12 @@ public class FolderPermissionsDialog extends DialogBox {
 \r
        void updateFolder() {\r
         final Map<String, Boolean[]> perms = (permList.hasChanges() ? permList.getPermissions() : null);\r
-        final String newName = folderName.getText().trim();\r
-        if (!folder.isContainer() && !folder.getName().equals(newName)) {\r
-            final String path = folder.getParent().getUri() + "/" + newName;\r
-            PutRequest newFolder = new PutRequest(app.getApiPath(), folder.getParent().getOwner(), path) {\r
-                @Override\r
-                public void onSuccess(Resource result) {\r
-                    Iterator<File> iter = folder.getFiles().iterator();\r
-                    app.copyFiles(iter, folder.getParent().getOwner(), folder.getParent().getUri() + "/" + newName, new Command() {\r
-                        @Override\r
-                        public void execute() {\r
-                            Iterator<Folder> iterf = folder.getSubfolders().iterator();\r
-                            app.copySubfolders(iterf, folder.getParent().getOwner(), folder.getParent().getUri() + "/" + newName, new Command() {\r
-                                @Override\r
-                                public void execute() {\r
-                                    app.deleteFolder(folder, null);\r
-                                    updateMetadata(path + "?update=", perms);\r
-                                }\r
-                            });\r
-                        }\r
-                    });\r
-                }\r
-\r
-                @Override\r
-                public void onError(Throwable t) {\r
-                    GWT.log("", t);\r
-                                       app.setError(t);\r
-                    if(t instanceof RestException){\r
-                        app.displayError("Unable to update folder: " + ((RestException) t).getHttpStatusText());\r
-                    }\r
-                    else\r
-                        app.displayError("System error modifying folder: " + t.getMessage());\r
-                }\r
-\r
-                               @Override\r
-                               protected void onUnauthorized(Response response) {\r
-                                       app.sessionExpired();\r
-                               }\r
-            };\r
-            newFolder.setHeader("X-Auth-Token", app.getToken());\r
-            newFolder.setHeader("Content-Type", "application/folder");\r
-            newFolder.setHeader("Accept", "*/*");\r
-            newFolder.setHeader("Content-Length", "0");\r
-            Scheduler.get().scheduleDeferred(newFolder);\r
-        }\r
-        else\r
-            updateMetadata(folder.getUri() + "?update=", perms);\r
+        updateMetadata(folder.getUri() + "?update=", perms);\r
        }\r
 \r
        protected void updateMetadata(final String path, final Map<String, Boolean[]> newPermissions) {\r
         if (newPermissions != null) {\r
-            PostRequest updateFolder = new PostRequest(app.getApiPath(), folder.getOwner(), path) {\r
+            PostRequest updateFolder = new PostRequest(app.getApiPath(), folder.getOwnerID(), path) {\r
                 @Override\r
                 public void onSuccess(Resource result) {\r
                     app.updateFolder(folder.getParent(), false, new Command() {\r
@@ -284,7 +234,7 @@ public class FolderPermissionsDialog extends DialogBox {
                     if (t instanceof RestException) {\r
                        if (((RestException) t).getHttpStatusCode() == Response.SC_NOT_FOUND) { //Probably a virtual folder\r
                             final String path1 = folder.getUri();\r
-                            PutRequest newFolder = new PutRequest(app.getApiPath(), folder.getOwner(), path1) {\r
+                            PutRequest newFolder = new PutRequest(app.getApiPath(), folder.getOwnerID(), path1) {\r
                                 @Override\r
                                 public void onSuccess(Resource result) {\r
                                        updateMetadata(path, newPermissions);\r
@@ -306,7 +256,7 @@ public class FolderPermissionsDialog extends DialogBox {
                                                        app.sessionExpired();\r
                                                }\r
                             };\r
-                            newFolder.setHeader("X-Auth-Token", app.getToken());\r
+                            newFolder.setHeader("X-Auth-Token", app.getUserToken());\r
                             newFolder.setHeader("Content-Type", "application/folder");\r
                             newFolder.setHeader("Accept", "*/*");\r
                             newFolder.setHeader("Content-Length", "0");\r
@@ -327,7 +277,7 @@ public class FolderPermissionsDialog extends DialogBox {
                                        app.sessionExpired();\r
                                }\r
             };\r
-            updateFolder.setHeader("X-Auth-Token", app.getToken());\r
+            updateFolder.setHeader("X-Auth-Token", app.getUserToken());\r
             String readPermHeader = "read=";\r
             String writePermHeader = "write=";\r
             for (String u : newPermissions.keySet()) {\r