Added an option for user credentials on user menu

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

diff --git a/src/gr/grnet/pithos/web/client/FilePropertiesDialog.java b/src/gr/grnet/pithos/web/client/FilePropertiesDialog.java
index d5343a8..989d8c9 100644 (file)
--- a/src/gr/grnet/pithos/web/client/FilePropertiesDialog.java
+++ b/src/gr/grnet/pithos/web/client/FilePropertiesDialog.java
@@ -51,8 +51,7 @@ import com.google.gwt.core.client.GWT;
 import com.google.gwt.core.client.Scheduler;\r
 import com.google.gwt.event.dom.client.ClickEvent;\r
 import com.google.gwt.event.dom.client.ClickHandler;\r
-import com.google.gwt.event.logical.shared.SelectionEvent;\r
-import com.google.gwt.event.logical.shared.SelectionHandler;\r
+import com.google.gwt.http.client.Response;\r
 import com.google.gwt.i18n.client.DateTimeFormat;\r
 import com.google.gwt.resources.client.ImageResource;\r
 import com.google.gwt.user.client.Window;\r
@@ -88,7 +87,7 @@ public class FilePropertiesDialog extends AbstractPropertiesDialog {
                @Source("gr/grnet/pithos/resources/edit_user.png")\r
                ImageResource permUser();\r
 \r
-               @Source("gr/grnet/pithos/resources/groupevent.png")\r
+               @Source("gr/grnet/pithos/resources/groups22.png")\r
                ImageResource permGroup();\r
 \r
                @Source("gr/grnet/pithos/resources/editdelete.png")\r
@@ -189,6 +188,11 @@ public class FilePropertiesDialog extends AbstractPropertiesDialog {
                 else\r
                     app.displayError("System error unable to fetch versions: "+t.getMessage());\r
                        }\r
+\r
+                       @Override\r
+                       protected void onUnauthorized(Response response) {\r
+                               app.sessionExpired();\r
+                       }\r
                };\r
                getVersions.setHeader("X-Auth-Token", app.getToken());\r
                Scheduler.get().scheduleDeferred(getVersions);\r
@@ -360,7 +364,7 @@ public class FilePropertiesDialog extends AbstractPropertiesDialog {
         return permPanel;\r
     }\r
 \r
-    private VerticalPanel createVersionPanel(List<Version> versions) {\r
+    VerticalPanel createVersionPanel(List<Version> versions) {\r
         VerticalPanel versionPanel = new VerticalPanel();\r
         VersionsList verList = new VersionsList(app, this, images, file, versions);\r
         versionPanel.add(verList);\r
@@ -390,7 +394,7 @@ public class FilePropertiesDialog extends AbstractPropertiesDialog {
 \r
         String[] tagset = null;\r
                if (!tags.getText().equals(initialTagText))\r
-                       tagset = tags.getText().split(",");\r
+                       tagset = tags.getText().trim().split(",");\r
         final String[] newTags = tagset;\r
 \r
         if (newFilename != null) {\r
@@ -406,6 +410,11 @@ public class FilePropertiesDialog extends AbstractPropertiesDialog {
                     GWT.log("", t);\r
                     app.displayError("System error modifying file:" + t.getMessage());\r
                 }\r
+\r
+                               @Override\r
+                               protected void onUnauthorized(Response response) {\r
+                                       app.sessionExpired();\r
+                               }\r
             };\r
             updateFile.setHeader("X-Auth-Token", app.getToken());\r
             updateFile.setHeader("X-Move-From", file.getUri());\r
@@ -429,11 +438,19 @@ public class FilePropertiesDialog extends AbstractPropertiesDialog {
                     GWT.log("", t);\r
                     app.displayError("System error modifying file:" + t.getMessage());\r
                 }\r
+\r
+                               @Override\r
+                               protected void onUnauthorized(Response response) {\r
+                                       app.sessionExpired();\r
+                               }\r
             };\r
             updateFile.setHeader("X-Auth-Token", app.getToken());\r
             if (newTags != null)\r
                 for (String t : newTags)\r
-                    updateFile.setHeader("X-Object-Meta-" + t.trim(), "true");\r
+                       if (t.length() > 0)\r
+                               updateFile.setHeader("X-Object-Meta-" + t.trim(), "true");\r
+                for (String t : file.getTags())\r
+                       updateFile.setHeader("X-Object-Meta-" + t.trim(), "~");\r
             if (published != null)\r
                 updateFile.setHeader("X-Object-Public", published.toString());\r
             if (newPermissions != null) {\r
@@ -464,7 +481,4 @@ public class FilePropertiesDialog extends AbstractPropertiesDialog {
         else\r
             app.updateFolder(file.getParent(), true, null);\r
     }\r
-\r
-       private void removeAllOldVersions() {\r
-       }\r
 }\r