Fixed content type for marker objects (folders)

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

diff --git a/web_client/src/gr/grnet/pithos/web/client/FolderPropertiesDialog.java b/web_client/src/gr/grnet/pithos/web/client/FolderPropertiesDialog.java
index fa07817..f03390c 100644 (file)
--- a/web_client/src/gr/grnet/pithos/web/client/FolderPropertiesDialog.java
+++ b/web_client/src/gr/grnet/pithos/web/client/FolderPropertiesDialog.java
@@ -52,6 +52,7 @@ import com.google.gwt.event.dom.client.KeyCodes;
 import com.google.gwt.http.client.Response;\r
 import com.google.gwt.i18n.client.DateTimeFormat;\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.DecoratedTabPanel;\r
 import com.google.gwt.user.client.ui.DialogBox;\r
@@ -93,7 +94,19 @@ 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
+               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
                Pithos.enableIESelection();\r
@@ -110,9 +123,12 @@ 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
+               inner.addStyleName("inner");\r
+               inner.getDeckPanel().addStyleName("pithos-TabPanelBottom");\r
 \r
                VerticalPanel generalPanel = new VerticalPanel();\r
         FlexTable generalTable = new FlexTable();\r
@@ -159,6 +175,7 @@ public class FolderPropertiesDialog extends DialogBox {
                     dlg.center();\r
                 }\r
             });\r
+            add.addStyleName("button");\r
             permButtons.add(add);\r
             permButtons.setCellHorizontalAlignment(add, HasHorizontalAlignment.ALIGN_CENTER);\r
 \r
@@ -169,11 +186,10 @@ public class FolderPropertiesDialog extends DialogBox {
                     dlg.center();\r
                 }\r
             });\r
-            addUser.getElement().setId("folderPropertiesDialog.button.addUser");\r
+            addUser.addStyleName("button");\r
             permButtons.add(addUser);\r
             permButtons.setCellHorizontalAlignment(addUser, HasHorizontalAlignment.ALIGN_CENTER);\r
             permButtons.setSpacing(8);\r
-            permButtons.addStyleName("gss-TabPanelBottom");\r
             permPanel.add(permButtons);\r
         }\r
 \r
@@ -183,7 +199,6 @@ public class FolderPropertiesDialog extends DialogBox {
 \r
         outer.add(inner);\r
 \r
-        HorizontalPanel buttons = new HorizontalPanel();\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
                String okLabel;\r
@@ -198,24 +213,9 @@ public class FolderPropertiesDialog extends DialogBox {
                                closeDialog();\r
                        }\r
                });\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(@SuppressWarnings("unused") ClickEvent event) {\r
-                               closeDialog();\r
-                       }\r
-               });\r
-               buttons.add(cancel);\r
-               buttons.setCellHorizontalAlignment(cancel, HasHorizontalAlignment.ALIGN_CENTER);\r
-               buttons.setSpacing(8);\r
-               buttons.addStyleName("pithos-TabPanelBottom");\r
-        outer.add(buttons);\r
-        outer.setCellHorizontalAlignment(buttons, HasHorizontalAlignment.ALIGN_CENTER);\r
-        outer.addStyleName("pithos-TabPanelBottom");\r
+               ok.addStyleName("button");\r
+               outer.add(ok);\r
+        outer.setCellHorizontalAlignment(inner, HasHorizontalAlignment.ALIGN_CENTER);\r
 \r
         setWidget(outer);\r
        }\r
@@ -264,7 +264,13 @@ public class FolderPropertiesDialog extends DialogBox {
         PutRequest createFolder = new PutRequest(app.getApiPath(), folder.getOwner(), path) {\r
             @Override\r
             public void onSuccess(@SuppressWarnings("unused") Resource result) {\r
-                app.updateFolder(folder, true, null);\r
+                app.updateFolder(folder, true, new Command() {\r
+                                       \r
+                                       @Override\r
+                                       public void execute() {\r
+                                               app.updateStatistics();\r
+                                       }\r
+                               });\r
             }\r
 \r
             @Override\r
@@ -276,11 +282,16 @@ public class FolderPropertiesDialog extends DialogBox {
                                else\r
                                        app.displayError("System error creating folder:" + t.getMessage());\r
             }\r
-        };\r
+\r
+                       @Override\r
+                       protected void onUnauthorized(Response response) {\r
+                               app.sessionExpired();\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/folder");\r
+        createFolder.setHeader("Content-Type", "application/directory");\r
         Scheduler.get().scheduleDeferred(createFolder);\r
        }\r
 \r
@@ -330,6 +341,11 @@ public class FolderPropertiesDialog extends DialogBox {
                     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
@@ -362,14 +378,19 @@ public class FolderPropertiesDialog extends DialogBox {
                                 }\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
+                                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
+                                        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
@@ -377,10 +398,20 @@ public class FolderPropertiesDialog extends DialogBox {
                             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
             };\r
             updateFolder.setHeader("X-Auth-Token", app.getToken());\r
             String readPermHeader = "read=";\r