Show display name in FilePropertiesDialog

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

diff --git a/src/gr/grnet/pithos/web/client/FolderPropertiesDialog.java b/src/gr/grnet/pithos/web/client/FolderPropertiesDialog.java
index aa5116d..db3393a 100644 (file)
--- a/src/gr/grnet/pithos/web/client/FolderPropertiesDialog.java
+++ b/src/gr/grnet/pithos/web/client/FolderPropertiesDialog.java
@@ -34,14 +34,10 @@
  */\r
 package gr.grnet.pithos.web.client;\r
 \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.PutRequest;\r
 import gr.grnet.pithos.web.client.rest.RestException;\r
 \r
-import java.util.Iterator;\r
-\r
 import com.google.gwt.core.client.GWT;\r
 import com.google.gwt.core.client.Scheduler;\r
 import com.google.gwt.dom.client.NativeEvent;\r
@@ -91,7 +87,7 @@ public class FolderPropertiesDialog extends DialogBox {
         */\r
        public FolderPropertiesDialog(final Pithos app, boolean _create,  Folder selected) {\r
         this.app = app;\r
-               Anchor close = new Anchor();\r
+               Anchor close = new Anchor("close");\r
                close.addStyleName("close");\r
                close.addClickHandler(new ClickHandler() {\r
                        \r
@@ -101,7 +97,6 @@ public class FolderPropertiesDialog extends DialogBox {
                        }\r
                });\r
 \r
-               setAnimationEnabled(true);\r
                setGlassEnabled(true);\r
                setStyleName("pithos-DialogBox");\r
 \r
@@ -144,8 +139,11 @@ public class FolderPropertiesDialog extends DialogBox {
         if (create)\r
             generalTable.setText(1, 1, folder.getName());\r
         else\r
-            generalTable.setText(1, 1, folder.getPrefix());\r
-        generalTable.setText(2, 1, "");\r
+            generalTable.setText(1, 1, folder.getParent().getName());\r
+        if (create)\r
+               generalTable.setText(2, 1, app.getCurrentUserDisplayNameOrID());\r
+        else\r
+               generalTable.setText(2, 1, folder.getOwner());\r
         DateTimeFormat formatter = DateTimeFormat.getFormat("d/M/yyyy h:mm a");\r
         if(folder.getLastModified() != null)\r
             generalTable.setText(3, 1, formatter.format(folder.getLastModified()));\r
@@ -239,6 +237,8 @@ public class FolderPropertiesDialog extends DialogBox {
         */\r
        private void createFolder() {\r
                String name = folderName.getText().trim();\r
+               if (name.length() == 0)\r
+                       return;\r
         String path = folder.getUri() + "/" + name;\r
         PutRequest createFolder = new PutRequest(app.getApiPath(), folder.getOwner(), path) {\r
             @Override\r
@@ -268,7 +268,7 @@ public class FolderPropertiesDialog extends DialogBox {
                                app.sessionExpired();\r
                        }\r
        };\r
-        createFolder.setHeader("X-Auth-Token", app.getToken());\r
+        createFolder.setHeader("X-Auth-Token", app.getUserToken());\r
         createFolder.setHeader("Accept", "*/*");\r
         createFolder.setHeader("Content-Length", "0");\r
         createFolder.setHeader("Content-Type", "application/directory");\r
@@ -290,59 +290,23 @@ public class FolderPropertiesDialog extends DialogBox {
 \r
        private void updateFolder() {\r
         final String newName = folderName.getText().trim();\r
+        if (newName.length() == 0)\r
+               return;\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, new Command() {\r
-                                                                               \r
-                                                                               @Override\r
-                                                                               public void execute() {\r
-                                                   app.updateFolder(folder.getParent(), false, new Command() {\r
-                                                               \r
-                                                               @Override\r
-                                                               public void execute() {\r
-                                                                       app.updateMySharedRoot();\r
-                                                               }\r
-                                                       }, true);\r
-                                                                               }\r
-                                                                       });\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
+            app.copyFolder(folder, folder.getOwner(), path, true, new Command() {\r
+                               \r
                                @Override\r
-                               protected void onUnauthorized(Response response) {\r
-                                       app.sessionExpired();\r
+                               public void execute() {\r
+                    app.updateFolder(folder.getParent(), false, new Command() {\r
+                               \r
+                               @Override\r
+                               public void execute() {\r
+                                       app.updateMySharedRoot();\r
+                               }\r
+                       }, true);\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
         }\r
         else\r
             app.updateFolder(folder.getParent(), false, new Command() {\r