Added upload alert when droping files in the app and select the uploaded files at...

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

diff --git a/src/gr/grnet/pithos/web/client/FilePublishDialog.java b/src/gr/grnet/pithos/web/client/FilePublishDialog.java
index ee96121..3ea371f 100644 (file)
--- a/src/gr/grnet/pithos/web/client/FilePublishDialog.java
+++ b/src/gr/grnet/pithos/web/client/FilePublishDialog.java
@@ -103,7 +103,7 @@ public class FilePublishDialog extends AbstractPropertiesDialog {
         super(_app);\r
         file = _file;\r
 \r
-               Anchor close = new Anchor();\r
+               Anchor close = new Anchor("close");\r
                close.addStyleName("close");\r
                close.addClickHandler(new ClickHandler() {\r
                        \r
@@ -130,7 +130,7 @@ public class FilePublishDialog extends AbstractPropertiesDialog {
 \r
         outer.add(inner);\r
 \r
-               final Button ok = new Button("Close", new ClickHandler() {\r
+               final Button ok = new Button("OK", new ClickHandler() {\r
                        @Override\r
                        public void onClick(ClickEvent event) {\r
                                closeDialog();\r
@@ -221,15 +221,17 @@ public class FilePublishDialog extends AbstractPropertiesDialog {
     }\r
        /**\r
         * Accepts any change and updates the file\r
+        * @return \r
         *\r
         */\r
        @Override\r
-       protected void accept() {\r
+       protected boolean accept() {\r
         Boolean published = null;\r
                if (readForAll.getValue() != file.isPublished())\r
                        if (file.getOwner().equals(app.getUsername()))\r
                 published = readForAll.getValue();\r
         updateMetaData(app.getApiPath(), app.getUsername(), file.getUri() + "?update=", published);\r
+        return true;\r
        }\r
 \r
        protected void updateMetaData(String api, String owner, final String path, final Boolean published) {\r
@@ -242,13 +244,16 @@ public class FilePublishDialog extends AbstractPropertiesDialog {
                                                @Override\r
                                                public void onSuccess(File _result) {\r
                                                        showLinkIfPublished();\r
-                                   app.updateFolder(file.getParent(), true, new Command() {\r
-                                                               \r
-                                                               @Override\r
-                                                               public void execute() {\r
-                                                                       app.updateMySharedRoot();\r
-                                                               }\r
-                                                       }, true);\r
+                                                       if (!app.isMySharedSelected())\r
+                                           app.updateFolder(file.getParent(), true, new Command() {\r
+                                                                       \r
+                                                                       @Override\r
+                                                                       public void execute() {\r
+                                                                               app.updateMySharedRoot();\r
+                                                                       }\r
+                                                               }, true);\r
+                                                       else\r
+                                                               app.updateSharedFolder(file.getParent(), true);\r
                                                }\r
 \r
                                                @Override\r
@@ -283,7 +288,7 @@ public class FilePublishDialog extends AbstractPropertiesDialog {
             updateFile.setHeader("X-Object-Public", published.toString());\r
             Scheduler.get().scheduleDeferred(updateFile);\r
         }\r
-        else\r
+        else if (!app.isMySharedSelected())\r
             app.updateFolder(file.getParent(), true, new Command() {\r
                                \r
                                @Override\r
@@ -292,6 +297,8 @@ public class FilePublishDialog extends AbstractPropertiesDialog {
                                                app.updateMySharedRoot();\r
                                }\r
                        }, true);\r
+        else\r
+               app.updateSharedFolder(file.getParent(), true);\r
     }\r
 \r
        @Override\r