Merge branch 'packaging' into debian

[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 6b172e6..de6877f 100644 (file)
--- a/src/gr/grnet/pithos/web/client/FolderPermissionsDialog.java
+++ b/src/gr/grnet/pithos/web/client/FolderPermissionsDialog.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
@@ -34,6 +34,7 @@
  */\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
@@ -86,12 +87,12 @@ public class FolderPermissionsDialog extends DialogBox {
         */\r
        public FolderPermissionsDialog(final Pithos app, 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
                        @Override\r
-                       public void onClick(@SuppressWarnings("unused") ClickEvent event) {\r
+                       public void onClick(ClickEvent event) {\r
                                hide();\r
                        }\r
                });\r
@@ -119,36 +120,48 @@ public class FolderPermissionsDialog extends DialogBox {
 \r
         VerticalPanel permPanel = new VerticalPanel();\r
         FilePermissionsDialog.Images images = GWT.create(FilePermissionsDialog.Images.class);\r
-        boolean permsReadonly = folder.getInheritedPermissionsFrom() != null || folder.existChildrenPermissions();\r
-        permList = new PermissionsList(images, folder.getPermissions(), folder.getOwner(), permsReadonly);\r
+        permList = new PermissionsList(images, folder.getPermissions(), folder.getOwner(), false, null);\r
         permPanel.add(permList);\r
 \r
-        if (!permsReadonly) {\r
-            HorizontalPanel permButtons = new HorizontalPanel();\r
-            Button add = new Button("Add Group", new ClickHandler() {\r
-                @Override\r
-                public void onClick(@SuppressWarnings("unused") ClickEvent event) {\r
-                    PermissionsAddDialog dlg = new PermissionsAddDialog(app, app.getAccount().getGroups(), permList, false);\r
-                    dlg.center();\r
-                }\r
-            });\r
-            add.addStyleName("button");\r
-            permButtons.add(add);\r
-            permButtons.setCellHorizontalAlignment(add, HasHorizontalAlignment.ALIGN_CENTER);\r
+        HorizontalPanel permButtons = new HorizontalPanel();\r
+        Button addUser = new Button("Add User", new ClickHandler() {\r
+            @Override\r
+            public void onClick(ClickEvent event) {\r
+                PermissionsAddDialog dlg = new PermissionsAddDialog(app, app.getAccount().getGroups(), permList, true);\r
+                dlg.center();\r
+            }\r
+        });\r
+        addUser.addStyleName("button");\r
+        permButtons.add(addUser);\r
+        permButtons.setCellHorizontalAlignment(addUser, HasHorizontalAlignment.ALIGN_CENTER);\r
+\r
+        Button add = new Button("Add Group", new ClickHandler() {\r
+            @Override\r
+            public void onClick(ClickEvent event) {\r
+               if (app.getAccount().getGroups().isEmpty()) {\r
+                    new GroupCreateDialog(app, new Command() {\r
+                                               \r
+                                               @Override\r
+                                               public void execute() {\r
+                                       if (app.getAccount().getGroups().isEmpty())\r
+                                               return;\r
+                                       PermissionsAddDialog dlg = new PermissionsAddDialog(app, app.getAccount().getGroups(), permList, false);\r
+                                       dlg.center();\r
+                                               }\r
+                                       }).center();\r
+               }\r
+               else {\r
+                       PermissionsAddDialog dlg = new PermissionsAddDialog(app, app.getAccount().getGroups(), permList, false);\r
+                       dlg.center();\r
+               }\r
+            }\r
+        });\r
+        add.addStyleName("button");\r
+        permButtons.add(add);\r
+        permButtons.setCellHorizontalAlignment(add, HasHorizontalAlignment.ALIGN_CENTER);\r
 \r
-            Button addUser = new Button("Add User", new ClickHandler() {\r
-                @Override\r
-                public void onClick(@SuppressWarnings("unused") ClickEvent event) {\r
-                    PermissionsAddDialog dlg = new PermissionsAddDialog(app, app.getAccount().getGroups(), permList, true);\r
-                    dlg.center();\r
-                }\r
-            });\r
-            addUser.addStyleName("button");\r
-            permButtons.add(addUser);\r
-            permButtons.setCellHorizontalAlignment(addUser, HasHorizontalAlignment.ALIGN_CENTER);\r
-            permButtons.setSpacing(8);\r
-            permPanel.add(permButtons);\r
-        }\r
+        permButtons.setSpacing(8);\r
+        permPanel.add(permButtons);\r
 \r
         inner.add(permPanel);\r
 \r
@@ -159,7 +172,7 @@ public class FolderPermissionsDialog extends DialogBox {
                String okLabel = "Update";\r
                final Button ok = new Button(okLabel, new ClickHandler() {\r
                        @Override\r
-                       public void onClick(@SuppressWarnings("unused") ClickEvent event) {\r
+                       public void onClick(ClickEvent event) {\r
                                updateFolder();\r
                                closeDialog();\r
                        }\r
@@ -207,7 +220,7 @@ public class FolderPermissionsDialog extends DialogBox {
             final String path = folder.getParent().getUri() + "/" + newName;\r
             PutRequest newFolder = new PutRequest(app.getApiPath(), folder.getParent().getOwner(), path) {\r
                 @Override\r
-                public void onSuccess(@SuppressWarnings("unused") Resource result) {\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
@@ -216,7 +229,7 @@ public class FolderPermissionsDialog 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.deleteFolder(folder, null);\r
                                     updateMetadata(path + "?update=", perms);\r
                                 }\r
                             });\r
@@ -236,7 +249,7 @@ public class FolderPermissionsDialog extends DialogBox {
                 }\r
 \r
                                @Override\r
-                               protected void onUnauthorized(@SuppressWarnings("unused") Response response) {\r
+                               protected void onUnauthorized(Response response) {\r
                                        app.sessionExpired();\r
                                }\r
             };\r
@@ -254,14 +267,14 @@ public class FolderPermissionsDialog extends DialogBox {
         if (newPermissions != null) {\r
             PostRequest updateFolder = new PostRequest(app.getApiPath(), folder.getOwner(), path) {\r
                 @Override\r
-                public void onSuccess(@SuppressWarnings("unused") Resource result) {\r
+                public void onSuccess(Resource result) {\r
                     app.updateFolder(folder.getParent(), false, new Command() {\r
                                                \r
                                                @Override\r
                                                public void execute() {\r
                                                        app.updateMySharedRoot();\r
                                                }\r
-                                       });\r
+                                       }, true);\r
                 }\r
 \r
                 @Override\r
@@ -273,7 +286,7 @@ public class FolderPermissionsDialog extends DialogBox {
                             final String path1 = folder.getUri();\r
                             PutRequest newFolder = new PutRequest(app.getApiPath(), folder.getOwner(), path1) {\r
                                 @Override\r
-                                public void onSuccess(@SuppressWarnings("unused") Resource result) {\r
+                                public void onSuccess(Resource result) {\r
                                        updateMetadata(path, newPermissions);\r
                                 }\r
 \r
@@ -289,7 +302,7 @@ public class FolderPermissionsDialog extends DialogBox {
                                 }\r
 \r
                                                @Override\r
-                                               protected void onUnauthorized(@SuppressWarnings("unused") Response response) {\r
+                                               protected void onUnauthorized(Response response) {\r
                                                        app.sessionExpired();\r
                                                }\r
                             };\r
@@ -303,14 +316,14 @@ public class FolderPermissionsDialog extends DialogBox {
                                app.displayError("Cannot set permissions. Probably subfolders or files already have permissions set");\r
                        }\r
                        else\r
-                               app.displayError("Wrror modifying folder: " + t.getMessage());\r
+                               app.displayError("Εrror modifying folder: " + t.getMessage());\r
                     }\r
                     else\r
                        app.displayError("System error modifying folder: " + t.getMessage());\r
                 }\r
 \r
                                @Override\r
-                               protected void onUnauthorized(@SuppressWarnings("unused") Response response) {\r
+                               protected void onUnauthorized(Response response) {\r
                                        app.sessionExpired();\r
                                }\r
             };\r
@@ -347,6 +360,6 @@ public class FolderPermissionsDialog extends DialogBox {
                                public void execute() {\r
                                        app.updateMySharedRoot();\r
                                }\r
-                       });\r
+                       }, true);\r
     }\r
 }\r