Fixed content type for marker objects (folders)
[pithos] / web_client / src / gr / grnet / pithos / web / client / FolderPropertiesDialog.java
index a1131e6..f03390c 100644 (file)
@@ -1,71 +1,76 @@
 /*\r
- * Copyright 2007, 2008, 2009, 2010 Electronic Business Systems Ltd.\r
+ * Copyright 2011 GRNET S.A. All rights reserved.\r
  *\r
- * This file is part of GSS.\r
+ * Redistribution and use in source and binary forms, with or\r
+ * without modification, are permitted provided that the following\r
+ * conditions are met:\r
  *\r
- * GSS is free software: you can redistribute it and/or modify\r
- * it under the terms of the GNU General Public License as published by\r
- * the Free Software Foundation, either version 3 of the License, or\r
- * (at your option) any later version.\r
+ *   1. Redistributions of source code must retain the above\r
+ *      copyright notice, this list of conditions and the following\r
+ *      disclaimer.\r
  *\r
- * GSS is distributed in the hope that it will be useful,\r
- * but WITHOUT ANY WARRANTY; without even the implied warranty of\r
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\r
- * GNU General Public License for more details.\r
+ *   2. Redistributions in binary form must reproduce the above\r
+ *      copyright notice, this list of conditions and the following\r
+ *      disclaimer in the documentation and/or other materials\r
+ *      provided with the distribution.\r
  *\r
- * You should have received a copy of the GNU General Public License\r
- * along with GSS.  If not, see <http://www.gnu.org/licenses/>.\r
+ * THIS SOFTWARE IS PROVIDED BY GRNET S.A. ``AS IS'' AND ANY EXPRESS\r
+ * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED\r
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR\r
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL GRNET S.A OR\r
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,\r
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT\r
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF\r
+ * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED\r
+ * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT\r
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN\r
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE\r
+ * POSSIBILITY OF SUCH DAMAGE.\r
+ *\r
+ * The views and conclusions contained in the software and\r
+ * documentation are those of the authors and should not be\r
+ * interpreted as representing official policies, either expressed\r
+ * or implied, of GRNET S.A.\r
  */\r
 package gr.grnet.pithos.web.client;\r
 \r
-import gr.grnet.pithos.web.client.FilePropertiesDialog.Images;\r
-import gr.grnet.pithos.web.client.rest.PostCommand;\r
+import com.google.gwt.core.client.Scheduler;\r
+import com.google.gwt.event.dom.client.KeyDownEvent;\r
+import com.google.gwt.user.client.Command;\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
-import gr.grnet.pithos.web.client.rest.resource.FolderResource;\r
-import gr.grnet.pithos.web.client.rest.resource.GroupResource;\r
-import gr.grnet.pithos.web.client.rest.resource.PermissionHolder;\r
-import gr.grnet.pithos.web.client.rest.resource.RestResourceWrapper;\r
-\r
-import java.util.List;\r
-import java.util.Set;\r
 \r
 import com.google.gwt.core.client.GWT;\r
 import com.google.gwt.dom.client.NativeEvent;\r
-import com.google.gwt.event.dom.client.ChangeEvent;\r
-import com.google.gwt.event.dom.client.ChangeHandler;\r
 import com.google.gwt.event.dom.client.ClickEvent;\r
 import com.google.gwt.event.dom.client.ClickHandler;\r
 import com.google.gwt.event.dom.client.KeyCodes;\r
-import com.google.gwt.http.client.URL;\r
+import com.google.gwt.http.client.Response;\r
 import com.google.gwt.i18n.client.DateTimeFormat;\r
-import com.google.gwt.json.client.JSONArray;\r
-import com.google.gwt.json.client.JSONBoolean;\r
-import com.google.gwt.json.client.JSONObject;\r
-import com.google.gwt.json.client.JSONString;\r
-import com.google.gwt.user.client.DeferredCommand;\r
 import com.google.gwt.user.client.Event.NativePreviewEvent;\r
+import com.google.gwt.user.client.ui.Anchor;\r
 import com.google.gwt.user.client.ui.Button;\r
-import com.google.gwt.user.client.ui.CheckBox;\r
 import com.google.gwt.user.client.ui.DecoratedTabPanel;\r
 import com.google.gwt.user.client.ui.DialogBox;\r
 import com.google.gwt.user.client.ui.FlexTable;\r
 import com.google.gwt.user.client.ui.HasHorizontalAlignment;\r
 import com.google.gwt.user.client.ui.HorizontalPanel;\r
-import com.google.gwt.user.client.ui.Label;\r
 import com.google.gwt.user.client.ui.TabPanel;\r
 import com.google.gwt.user.client.ui.TextBox;\r
 import com.google.gwt.user.client.ui.VerticalPanel;\r
+import java.util.Iterator;\r
+import java.util.Map;\r
 \r
 /**\r
  * The 'Folder properties' dialog box implementation.\r
  */\r
 public class FolderPropertiesDialog extends DialogBox {\r
 \r
-       private List<GroupResource> groups = null;\r
-\r
-       final PermissionsList permList;\r
-\r
-       private CheckBox readForAll;\r
+    protected Pithos app;\r
 \r
        /**\r
         * The widget that holds the folderName of the folder.\r
@@ -78,29 +83,37 @@ public class FolderPropertiesDialog extends DialogBox {
         */\r
        private final boolean create;\r
 \r
-       final FolderResource folder;\r
+       protected PermissionsList permList;\r
+\r
+       final Folder folder;\r
 \r
        final TabPanel inner;\r
 \r
        /**\r
         * The widget's constructor.\r
-        *\r
-        * @param images the image icons from the file properties dialog\r
-        * @param _create true if the dialog is displayed for creating a new\r
-        *            sub-folder of the selected folder, false if it is displayed\r
-        *            for modifying the selected folder\r
         */\r
-       public FolderPropertiesDialog(Images images, boolean _create,  final List<GroupResource> _groups) {\r
+       public FolderPropertiesDialog(final Pithos app, boolean _create,  Folder selected) {\r
+        this.app = app;\r
+               Anchor close = new Anchor();\r
+               close.addStyleName("close");\r
+               close.addClickHandler(new ClickHandler() {\r
+                       \r
+                       @Override\r
+                       public void onClick(ClickEvent event) {\r
+                               hide();\r
+                       }\r
+               });\r
+\r
                setAnimationEnabled(true);\r
+               setGlassEnabled(true);\r
+               setStyleName("pithos-DialogBox");\r
 \r
                // Enable IE selection for the dialog (must disable it upon closing it)\r
-               GSS.enableIESelection();\r
+               Pithos.enableIESelection();\r
 \r
                create = _create;\r
                \r
-               folder = ((RestResourceWrapper) GSS.get().getTreeView().getSelection()).getResource();\r
-               permList = new PermissionsList(images, folder.getPermissions(), folder.getOwner());\r
-               groups = _groups;\r
+               folder = selected;\r
 \r
                // Use this opportunity to set the dialog's caption.\r
                if (create)\r
@@ -110,66 +123,81 @@ public class FolderPropertiesDialog extends DialogBox {
 \r
                // Outer contains inner and buttons\r
                VerticalPanel outer = new VerticalPanel();\r
+               outer.add(close);\r
                // Inner contains generalPanel and permPanel\r
                inner = new DecoratedTabPanel();\r
                inner.setAnimationEnabled(true);\r
-               VerticalPanel generalPanel = new VerticalPanel();\r
-               VerticalPanel permPanel = new VerticalPanel();\r
-               final HorizontalPanel permForAll = new HorizontalPanel();\r
-               final HorizontalPanel pathPanel = new HorizontalPanel();\r
-               HorizontalPanel buttons = new HorizontalPanel();\r
-               HorizontalPanel permButtons = new HorizontalPanel();\r
-\r
-               inner.add(generalPanel, "General");\r
-               if (!create)\r
-                       inner.add(permPanel, "Sharing");\r
-               inner.selectTab(0);\r
-\r
-               final Label folderNameNote = new Label("Please note that slashes ('/') are not allowed in folder names.", true);\r
-               folderNameNote.setVisible(false);\r
-               folderNameNote.setStylePrimaryName("pithos-readForAllNote");\r
-\r
-               FlexTable generalTable = new FlexTable();\r
-               generalTable.setText(0, 0, "Name");\r
-               generalTable.setText(1, 0, "Parent");\r
-               generalTable.setText(2, 0, "Creator");\r
-               generalTable.setText(3, 0, "Last modified");\r
-               folderName.setText(create ? "" : folder.getName());\r
-               folderName.getElement().setId("folderPropertiesDialog.textBox.name");\r
-               generalTable.setWidget(0, 1, folderName);\r
-               folderName.addChangeHandler(new ChangeHandler() {\r
-                       \r
-                       @Override\r
-                       public void onChange(ChangeEvent event) {\r
-                               if(folderName.getText().contains("/"))\r
-                                       folderNameNote.setVisible(true);\r
-                               else\r
-                                       folderNameNote.setVisible(false);                               \r
-                               \r
-                       }\r
-               });\r
+               inner.addStyleName("inner");\r
+               inner.getDeckPanel().addStyleName("pithos-TabPanelBottom");\r
 \r
-\r
-               if (create)\r
-                       generalTable.setText(1, 1, folder.getName());\r
-               else if(folder.getParentName() == null)\r
-                       generalTable.setText(1, 1, "-");\r
-               else\r
-                       generalTable.setText(1, 1, folder.getParentName());\r
-               generalTable.setWidget(0, 2, folderNameNote);\r
-               generalTable.setText(2, 1, folder.getOwner());\r
-               DateTimeFormat formatter = DateTimeFormat.getFormat("d/M/yyyy h:mm a");\r
-               if(folder.getModificationDate() != null)\r
-                       generalTable.setText(3, 1, formatter.format(folder.getModificationDate()));\r
-               generalTable.getFlexCellFormatter().setStyleName(0, 0, "props-labels");\r
-               generalTable.getFlexCellFormatter().setStyleName(1, 0, "props-labels");\r
-               generalTable.getFlexCellFormatter().setStyleName(2, 0, "props-labels");\r
-               generalTable.getFlexCellFormatter().setStyleName(3, 0, "props-labels");\r
-               generalTable.getFlexCellFormatter().setStyleName(0, 1, "props-values");\r
-               generalTable.getFlexCellFormatter().setStyleName(1, 1, "props-values");\r
-               generalTable.getFlexCellFormatter().setStyleName(2, 1, "props-values");\r
-               generalTable.getFlexCellFormatter().setStyleName(3, 1, "props-values");\r
-               generalTable.setCellSpacing(4);\r
+               VerticalPanel generalPanel = new VerticalPanel();\r
+        FlexTable generalTable = new FlexTable();\r
+        generalTable.setText(0, 0, "Name");\r
+        generalTable.setText(1, 0, "Parent");\r
+        generalTable.setText(2, 0, "Creator");\r
+        generalTable.setText(3, 0, "Last modified");\r
+        folderName.setText(create ? "" : folder.getName());\r
+        folderName.setReadOnly(folder.isContainer() && !create);\r
+        generalTable.setWidget(0, 1, folderName);\r
+\r
+        if (create)\r
+            generalTable.setText(1, 1, folder.getName());\r
+        else\r
+            generalTable.setText(1, 1, folder.getPrefix());\r
+        generalTable.setText(2, 1, "");\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
+        generalTable.getFlexCellFormatter().setStyleName(0, 0, "props-labels");\r
+        generalTable.getFlexCellFormatter().setStyleName(1, 0, "props-labels");\r
+        generalTable.getFlexCellFormatter().setStyleName(2, 0, "props-labels");\r
+        generalTable.getFlexCellFormatter().setStyleName(3, 0, "props-labels");\r
+        generalTable.getFlexCellFormatter().setStyleName(0, 1, "props-values");\r
+        generalTable.getFlexCellFormatter().setStyleName(1, 1, "props-values");\r
+        generalTable.getFlexCellFormatter().setStyleName(2, 1, "props-values");\r
+        generalTable.getFlexCellFormatter().setStyleName(3, 1, "props-values");\r
+        generalTable.setCellSpacing(4);\r
+        generalPanel.add(generalTable);\r
+        inner.add(generalPanel, "General");\r
+\r
+        VerticalPanel permPanel = new VerticalPanel();\r
+        FilePropertiesDialog.Images images = GWT.create(FilePropertiesDialog.Images.class);\r
+        boolean permsReadonly = folder.getInheritedPermissionsFrom() != null || folder.existChildrenPermissions();\r
+        permList = new PermissionsList(images, folder.getPermissions(), folder.getOwner(), permsReadonly);\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
+\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
+\r
+        if (!create)\r
+            inner.add(permPanel, "Sharing");\r
+        inner.selectTab(0);\r
+\r
+        outer.add(inner);\r
 \r
                // Create the 'Create/Update' button, along with a listener that hides the dialog\r
                // when the button is clicked and quits the application.\r
@@ -180,126 +208,16 @@ public class FolderPropertiesDialog extends DialogBox {
                        okLabel = "Update";\r
                Button ok = new Button(okLabel, new ClickHandler() {\r
                        @Override\r
-                       public void onClick(ClickEvent event) {                         \r
-                               if(folderName.getText().contains("/"))\r
-                                       folderNameNote.setVisible(true);\r
-                               else {\r
-                                       folderNameNote.setVisible(false);\r
-                                       createOrUpdateFolder();\r
-                                       closeDialog();\r
-                               }\r
-\r
-                       }\r
-               });\r
-               ok.getElement().setId("folderPropertiesDialog.button.ok");\r
-               buttons.add(ok);\r
-               buttons.setCellHorizontalAlignment(ok, HasHorizontalAlignment.ALIGN_CENTER);\r
-               // Create the 'Cancel' button, along with a listener that hides the\r
-               // dialog\r
-               // when the button is clicked.\r
-               Button cancel = new Button("Cancel", new ClickHandler() {\r
-                       @Override\r
-                       public void onClick(ClickEvent event) {\r
+                       public void onClick(@SuppressWarnings("unused") ClickEvent event) {\r
+                               createOrUpdateFolder();\r
                                closeDialog();\r
                        }\r
                });\r
-               cancel.getElement().setId("folderPropertiesDialog.button.cancel");\r
-               buttons.add(cancel);\r
-               buttons.setCellHorizontalAlignment(cancel, HasHorizontalAlignment.ALIGN_CENTER);\r
-               buttons.setSpacing(8);\r
-               buttons.addStyleName("pithos-TabPanelBottom");\r
-\r
-               Button add = new Button("Add Group", new ClickHandler() {\r
-                       @Override\r
-                       public void onClick(ClickEvent event) {\r
-                               PermissionsAddDialog dlg = new PermissionsAddDialog(groups, permList, false);\r
-                               dlg.center();\r
-                       }\r
-               });\r
-               add.getElement().setId("folderPropertiesDialog.button.addGroup");\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(ClickEvent event) {\r
-                               PermissionsAddDialog dlg = new PermissionsAddDialog(groups, permList, true);\r
-                               dlg.center();\r
-                       }\r
-               });\r
-               addUser.getElement().setId("folderPropertiesDialog.button.addUser");\r
-               permButtons.add(addUser);\r
-               permButtons.setCellHorizontalAlignment(addUser, HasHorizontalAlignment.ALIGN_CENTER);\r
-\r
-               permButtons.setCellHorizontalAlignment(cancel, HasHorizontalAlignment.ALIGN_CENTER);\r
-               permButtons.setSpacing(8);\r
-               permButtons.addStyleName("pithos-TabPanelBottom");\r
-\r
-               final Label readForAllNote = new Label("When this option is enabled, the folder will be readable" +\r
-                                       " by everyone. By checking this option, you are certifying that you have the right to " +\r
-                                       "distribute this folder's contents and that it does not violate the Terms of Use.", true);\r
-               readForAllNote.setVisible(false);\r
-               readForAllNote.setStylePrimaryName("pithos-readForAllNote");\r
-\r
-               readForAll = new CheckBox();\r
-               readForAll.getElement().setId("folderPropertiesDialog.checkBox.public");\r
-               readForAll.setValue(folder.isReadForAll());\r
-               readForAll.addClickHandler(new ClickHandler() {\r
-                       @Override\r
-                       public void onClick(ClickEvent event) {\r
-                               readForAllNote.setVisible(readForAll.getValue());\r
-                       }\r
-\r
-               });\r
+               ok.addStyleName("button");\r
+               outer.add(ok);\r
+        outer.setCellHorizontalAlignment(inner, HasHorizontalAlignment.ALIGN_CENTER);\r
 \r
-               generalPanel.add(generalTable);\r
-               permPanel.add(permList);\r
-               permPanel.add(permButtons);\r
-\r
-               // Only show the read for all permission if the user is the owner.\r
-               if (folder.getOwner().equals(GSS.get().getCurrentUserResource().getUsername())) {\r
-                       permForAll.add(new Label("Public"));\r
-                       permForAll.add(readForAll);\r
-                       permForAll.setSpacing(8);\r
-                       permForAll.addStyleName("pithos-TabPanelBottom");\r
-                       permForAll.add(readForAllNote);\r
-                       permPanel.add(permForAll);\r
-               }\r
-               TextBox path = new TextBox();\r
-               path.getElement().setId("folderPropertiesDialog.textBox.link");\r
-               path.setWidth("100%");\r
-               path.addClickHandler(new ClickHandler() {\r
-                       @Override\r
-                       public void onClick(ClickEvent event) {\r
-                               GSS.enableIESelection();\r
-                               ((TextBox) event.getSource()).selectAll();\r
-                               GSS.preventIESelection();\r
-                       }\r
-\r
-               });\r
-               path.setText(folder.getUri());\r
-               path.setTitle("Use this link for sharing the folder via e-mail, IM, etc. (crtl-C/cmd-C to copy to system clipboard)");\r
-               path.setWidth("100%");\r
-               path.setReadOnly(true);\r
-               pathPanel.setWidth("100%");\r
-               pathPanel.setHorizontalAlignment(HasHorizontalAlignment.ALIGN_LEFT);\r
-               pathPanel.add(new Label("Link"));\r
-               pathPanel.setSpacing(8);\r
-               pathPanel.addStyleName("pithos-TabPanelBottom");\r
-               pathPanel.add(path);\r
-               permPanel.add(pathPanel);\r
-\r
-               outer.add(inner);\r
-               outer.add(buttons);\r
-               outer.setCellHorizontalAlignment(buttons, HasHorizontalAlignment.ALIGN_CENTER);\r
-               outer.addStyleName("pithos-TabPanelBottom");\r
-\r
-               setWidget(outer);\r
-\r
-               /*if (create)\r
-                       folderName.setFocus(true);\r
-               else\r
-                       ok.setFocus(true);*/\r
+        setWidget(outer);\r
        }\r
 \r
        @Override\r
@@ -313,13 +231,13 @@ public class FolderPropertiesDialog extends DialogBox {
                super.onPreviewNativeEvent(preview);\r
 \r
                NativeEvent evt = preview.getNativeEvent();\r
-               if (evt.getType().equals("keydown"))\r
+               if (evt.getType().equals(KeyDownEvent.getType().getName()))\r
                        // Use the popup's key preview hooks to close the dialog when either\r
                        // enter or escape is pressed.\r
                        switch (evt.getKeyCode()) {\r
                                case KeyCodes.KEY_ENTER:\r
-                                       closeDialog();\r
                                        createOrUpdateFolder();\r
+                    closeDialog();\r
                                        break;\r
                                case KeyCodes.KEY_ESCAPE:\r
                                        closeDialog();\r
@@ -333,69 +251,56 @@ public class FolderPropertiesDialog extends DialogBox {
         * (we disable the prevention on creation of the dialog)\r
         */\r
        public void closeDialog() {\r
-               GSS.preventIESelection();\r
+               Pithos.preventIESelection();\r
                hide();\r
        }\r
 \r
        /**\r
         * Generate an RPC request to create a new folder.\r
-        *\r
-        * @param userId the ID of the user whose namespace will be searched for\r
-        *            folders\r
-        * @param _folderName the name of the folder to create\r
         */\r
        private void createFolder() {\r
                String name = folderName.getText();\r
-               if (!GSS.isValidResourceName(name)) {\r
-                       GSS.get().displayError("The folder name '" + name + "' is invalid");\r
-                       return;\r
-               }\r
-               PostCommand ep = new PostCommand(folder.getUri() + "?new=" +\r
-                               URL.encodeComponent(name), "", 201) {\r
+        String path = folder.getUri() + "/" + name;\r
+        PutRequest createFolder = new PutRequest(app.getApiPath(), folder.getOwner(), path) {\r
+            @Override\r
+            public void onSuccess(@SuppressWarnings("unused") Resource result) {\r
+                app.updateFolder(folder, true, new Command() {\r
+                                       \r
+                                       @Override\r
+                                       public void execute() {\r
+                                               app.updateStatistics();\r
+                                       }\r
+                               });\r
+            }\r
 \r
-                       @Override\r
-                       public void onComplete() {\r
-                               //TODO:CELLTREE\r
-                               if(folder.getUri().equals(GSS.get().getTreeView().getMyFolders().getUri())){\r
-                                       GSS.get().getTreeView().updateRootNode();\r
+            @Override\r
+            public void onError(Throwable t) {\r
+                               GWT.log("", t);\r
+                               if (t instanceof RestException) {\r
+                                       app.displayError("Unable to create folder:" + ((RestException) t).getHttpStatusText());\r
                                }\r
                                else\r
-                                       GSS.get().getTreeView().updateNodeChildren((RestResourceWrapper) GSS.get().getTreeView().getSelection());\r
-                               //GSS.get().getFolders().updateFolder((DnDTreeItem) GSS.get().getFolders().getCurrent());\r
-                       }\r
+                                       app.displayError("System error creating folder:" + t.getMessage());\r
+            }\r
 \r
                        @Override\r
-                       public void onError(Throwable t) {\r
-                               GWT.log("", t);\r
-                               if(t instanceof RestException){\r
-                                       int statusCode = ((RestException)t).getHttpStatusCode();\r
-                                       if(statusCode == 405)\r
-                                               GSS.get().displayError("You don't have the necessary" +\r
-                                                               " permissions or a folder with same name " +\r
-                                                               "already exists");\r
-                                       else if(statusCode == 404)\r
-                                               GSS.get().displayError("Resource not found");\r
-                                       else\r
-                                               GSS.get().displayError("Unable to create folder:" +\r
-                                                               ((RestException)t).getHttpStatusText());\r
-                               }\r
-                               else\r
-                                       GSS.get().displayError("System error creating folder:" +\r
-                                                       t.getMessage());\r
+                       protected void onUnauthorized(Response response) {\r
+                               app.sessionExpired();\r
                        }\r
-               };\r
-               DeferredCommand.addCommand(ep);\r
-\r
+       };\r
+        createFolder.setHeader("X-Auth-Token", app.getToken());\r
+        createFolder.setHeader("Accept", "*/*");\r
+        createFolder.setHeader("Content-Length", "0");\r
+        createFolder.setHeader("Content-Type", "application/directory");\r
+        Scheduler.get().scheduleDeferred(createFolder);\r
        }\r
 \r
        /**\r
         * Upon closing the dialog by clicking OK or pressing ENTER this method does\r
         * the actual work of modifying folder properties or creating a new Folder\r
         * depending on the value of the create field\r
-        *\r
-        * @param userId\r
         */\r
-       private void createOrUpdateFolder() {\r
+       protected void createOrUpdateFolder() {\r
                if (create)\r
                        createFolder();\r
                else\r
@@ -404,87 +309,139 @@ public class FolderPropertiesDialog extends DialogBox {
        }\r
 \r
        private void updateFolder() {\r
-               permList.updatePermissionsAccordingToInput();\r
-               Set<PermissionHolder> perms = permList.getPermissions();\r
-               JSONObject json = new JSONObject();\r
-               if(!folder.getName().equals(folderName.getText()))\r
-                       json.put("name", new JSONString(folderName.getText()));\r
-               //only update the read for all perm if the user is the owner\r
-               if (readForAll.getValue() != folder.isReadForAll())\r
-                       if (folder.getOwner().equals(GSS.get().getCurrentUserResource().getUsername()))\r
-                               json.put("readForAll", JSONBoolean.getInstance(readForAll.getValue()));\r
-               if (permList.hasChanges()) {\r
-                       JSONArray perma = new JSONArray();\r
-                       int i=0;\r
-                       for(PermissionHolder p : perms){\r
-                               JSONObject po = new JSONObject();\r
-                               if(p.getUser() != null)\r
-                                       po.put("user", new JSONString(p.getUser()));\r
-                               if(p.getGroup() != null)\r
-                                       po.put("group", new JSONString(p.getGroup()));\r
-                               po.put("read", JSONBoolean.getInstance(p.isRead()));\r
-                               po.put("write", JSONBoolean.getInstance(p.isWrite()));\r
-                               po.put("modifyACL", JSONBoolean.getInstance(p.isModifyACL()));\r
-                               perma.set(i,po);\r
-                               i++;\r
-                       }\r
-                       json.put("permissions", perma);\r
-                       GWT.log(json.toString(), null);\r
-               }\r
-               PostCommand ep = new PostCommand(folder.getUri()+"?update=", json.toString(), 200){\r
-\r
-                       @Override\r
-                       public void onComplete() {\r
-                               //TODO:CELLTREE\r
-                               \r
-                               if(getPostBody() != null && !"".equals(getPostBody().trim())){\r
-                                       \r
-                                       \r
-                                       FolderResource fres = ((RestResourceWrapper) GSS.get().getTreeView().getSelection()).getResource();\r
-                                       String initialPath = fres.getUri();\r
-                                       String newPath =  getPostBody().trim();\r
-                                       fres.setUri(newPath);\r
-                                       ((RestResourceWrapper) GSS.get().getTreeView().getSelection()).getResource().setUri(newPath);\r
-                                       ((RestResourceWrapper) GSS.get().getTreeView().getSelection()).setUri(newPath);\r
-                                       GSS.get().getTreeView().updateNodeChildren(fres.getParentURI());\r
-                                       if (permList.hasChanges()) {\r
-                                               GSS.get().getTreeView().updateMySharedNode();\r
-                                       }\r
-                                       /*\r
-                                       if(folderItem.getParentItem() != null && ((DnDTreeItem)folderItem.getParentItem()).getFolderResource() != null){\r
-                                               ((DnDTreeItem)folderItem.getParentItem()).getFolderResource().removeSubfolderPath(initialPath);\r
-                                               ((DnDTreeItem)folderItem.getParentItem()).getFolderResource().getSubfolderPaths().add(newPath);\r
-                                       }*/\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(@SuppressWarnings("unused") 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);\r
+                                    updateMetadata(path + "?update=", perms);\r
+                                }\r
+                            });\r
+                        }\r
+                    });\r
+                }\r
+\r
+                @Override\r
+                public void onError(Throwable t) {\r
+                    GWT.log("", 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
-                               //GSS.get().getFolders().updateFolder( (DnDTreeItem) GSS.get().getFolders().getCurrent());\r
-                               \r
-                               GSS.get().showFileList(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
+        else\r
+            updateMetadata(folder.getUri() + "?update=", perms);\r
+       }\r
 \r
-                       @Override\r
-                       public void onError(Throwable t) {\r
-                               GWT.log("", t);\r
-                               if(t instanceof RestException){\r
-                                       int statusCode = ((RestException)t).getHttpStatusCode();\r
-                                       if(statusCode == 405)\r
-                                               GSS.get().displayError("You don't have the necessary permissions or" +\r
-                                                               " a folder with same name already exists");\r
-                                       else if(statusCode == 404)\r
-                                               GSS.get().displayError("Resource not found, or user specified in sharing does not exist");\r
-                                       else\r
-                                               GSS.get().displayError("Unable to update folder: "+((RestException)t).getHttpStatusText());\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
+                @Override\r
+                public void onSuccess(@SuppressWarnings("unused") Resource result) {\r
+                    app.updateFolder(folder.getParent(), false, null);\r
+                }\r
+\r
+                @Override\r
+                public void onError(Throwable t) {\r
+                    GWT.log("", t);\r
+                    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
+                                @Override\r
+                                public void onSuccess(@SuppressWarnings("unused") Resource result) {\r
+                                       updateMetadata(path, newPermissions);\r
+                                }\r
+\r
+                                @Override\r
+                                public void onError(Throwable _t) {\r
+                                    GWT.log("", _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 if (((RestException) t).getHttpStatusCode() == Response.SC_CONFLICT) {\r
+                               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
+                    }\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
-                               else\r
-                                       GSS.get().displayError("System error moifying file: "+t.getMessage());\r
-                               //TODO:CELLTREE\r
-                               //GSS.get().getFolders().updateFolder( (DnDTreeItem) GSS.get().getFolders().getCurrent());\r
-                       }\r
-               };\r
-               DeferredCommand.addCommand(ep);\r
-       }\r
+            };\r
+            updateFolder.setHeader("X-Auth-Token", app.getToken());\r
+            String readPermHeader = "read=";\r
+            String writePermHeader = "write=";\r
+            for (String u : newPermissions.keySet()) {\r
+                Boolean[] p = newPermissions.get(u);\r
+                if (p[0] != null && p[0])\r
+                    readPermHeader += u + ",";\r
+                if (p[1] != null && p[1])\r
+                    writePermHeader += u + ",";\r
+            }\r
+            if (readPermHeader.endsWith("="))\r
+                readPermHeader = "";\r
+            else if (readPermHeader.endsWith(","))\r
+                readPermHeader = readPermHeader.substring(0, readPermHeader.length() - 1);\r
+            if (writePermHeader.endsWith("="))\r
+                writePermHeader = "";\r
+            else if (writePermHeader.endsWith(","))\r
+                writePermHeader = writePermHeader.substring(0, writePermHeader.length() - 1);\r
+            String permHeader = readPermHeader +  ((readPermHeader.length()  > 0 && writePermHeader.length() > 0) ?  ";" : "") + writePermHeader;\r
+            if (permHeader.length() == 0)\r
+                permHeader="~";\r
+            updateFolder.setHeader("X-Object-Sharing", permHeader);\r
+            Scheduler.get().scheduleDeferred(updateFolder);\r
+        }\r
+        else\r
+            app.updateFolder(folder.getParent(), false, null);\r
+    }\r
 \r
        public void selectTab(int _tab) {\r
                inner.selectTab(_tab);\r
        }\r
-\r
 }\r