Added a special node for group creation in group tree (issue #2341)

[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 acb6d55..ababa68 100644 (file)
--- a/src/gr/grnet/pithos/web/client/FolderPropertiesDialog.java
+++ b/src/gr/grnet/pithos/web/client/FolderPropertiesDialog.java
@@ -1,5 +1,5 @@
 /*\r
- * Copyright 2011 GRNET S.A. All rights reserved.\r
+ * Copyright 2011-2012 GRNET S.A. All rights reserved.\r
  *\r
  * Redistribution and use in source and binary forms, with or\r
  * without modification, are permitted provided that the following\r
@@ -144,8 +144,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.getUsername());\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 +242,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
@@ -249,7 +254,7 @@ public class FolderPropertiesDialog extends DialogBox {
                                        public void execute() {\r
                                                app.updateStatistics();\r
                                        }\r
-                               });\r
+                               }, true);\r
             }\r
 \r
             @Override\r
@@ -290,6 +295,8 @@ 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
@@ -303,14 +310,19 @@ public class FolderPropertiesDialog extends DialogBox {
                             app.copySubfolders(iterf, folder.getParent().getOwner(), folder.getParent().getUri() + "/" + newName, new Command() {\r
                                 @Override\r
                                 public void execute() {\r
-                                    app.deleteFolder(folder);\r
-                                    app.updateFolder(folder.getParent(), false, new Command() {\r
-                                               \r
-                                               @Override\r
-                                               public void execute() {\r
-                                                       app.updateMySharedRoot();\r
-                                               }\r
-                                       });\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
@@ -346,6 +358,6 @@ public class FolderPropertiesDialog extends DialogBox {
                        public void execute() {\r
                                app.updateMySharedRoot();\r
                        }\r
-               });\r
+               }, true);\r
        }\r
 }\r