Fix view of versioned file

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

diff --git a/src/gr/grnet/pithos/web/client/DeleteFolderDialog.java b/src/gr/grnet/pithos/web/client/DeleteFolderDialog.java
index c4a80aa..9194ea9 100644 (file)
--- a/src/gr/grnet/pithos/web/client/DeleteFolderDialog.java
+++ b/src/gr/grnet/pithos/web/client/DeleteFolderDialog.java
@@ -1,5 +1,5 @@
 /*\r
- * Copyright 2011 GRNET S.A. All rights reserved.\r
+ * Copyright 2011-2013 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,7 +34,7 @@
  */\r
 package gr.grnet.pithos.web.client;\r
 \r
-import com.google.gwt.event.dom.client.KeyDownEvent;\r
+import com.google.gwt.safehtml.shared.SafeHtmlUtils;\r
 import gr.grnet.pithos.web.client.MessagePanel.Images;\r
 import gr.grnet.pithos.web.client.foldertree.Folder;\r
 \r
@@ -42,13 +42,14 @@ import com.google.gwt.dom.client.NativeEvent;
 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.event.dom.client.KeyDownEvent;\r
 import com.google.gwt.user.client.Event.NativePreviewEvent;\r
 import com.google.gwt.user.client.ui.AbstractImagePrototype;\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.DialogBox;\r
 import com.google.gwt.user.client.ui.HTML;\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.VerticalPanel;\r
 \r
 /**\r
@@ -56,8 +57,8 @@ import com.google.gwt.user.client.ui.VerticalPanel;
  */\r
 public class DeleteFolderDialog extends DialogBox {\r
 \r
-    private Pithos app;\r
-    private Folder folder;\r
+       protected Pithos app;\r
+       protected Folder folder;\r
     \r
        /**\r
         * The widget's constructor.\r
@@ -66,46 +67,51 @@ public class DeleteFolderDialog extends DialogBox {
        public DeleteFolderDialog(Pithos _app, Images images, Folder _folder) {\r
         this.app = _app;\r
         this.folder = _folder;\r
+\r
+        Anchor close = new Anchor("close");\r
+               close.addStyleName("close");\r
+               close.addClickHandler(new ClickHandler() {\r
+                       \r
+                       @Override\r
+                       public void onClick(ClickEvent event) {\r
+                               hide();\r
+                       }\r
+               });\r
+\r
                // Set the dialog's caption.\r
                setText("Confirmation");\r
-               setAnimationEnabled(true);\r
+               setGlassEnabled(true);\r
+               setStyleName("pithos-DialogBox");\r
                // Create a VerticalPanel to contain the HTML label and the buttons.\r
                VerticalPanel outer = new VerticalPanel();\r
-               HorizontalPanel buttons = new HorizontalPanel();\r
+               outer.add(close);\r
+               \r
+               VerticalPanel inner = new VerticalPanel();\r
+               inner.addStyleName("inner");\r
+\r
+        final String folderName = folder.getName();\r
+        final String safeFolderName = SafeHtmlUtils.htmlEscape(folderName);\r
 \r
                HTML text = new HTML("<table><tr><td rowspan='2'>" + AbstractImagePrototype.create(images.warn()).getHTML() +\r
-                                       "</td><td>" + "Are you sure you want to <b>permanently</b> delete folder '" + folder.getName() +\r
+                                       "</td><td>" + "Are you sure you want to <b>permanently</b> delete folder '" + safeFolderName +\r
                                        "'?</td></tr></table>");\r
                text.setStyleName("pithos-warnMessage");\r
-               outer.add(text);\r
+               inner.add(text);\r
+               inner.setCellHorizontalAlignment(text, HasHorizontalAlignment.ALIGN_CENTER);\r
 \r
                // Create the 'Delete' button, along with a listener that hides the dialog\r
                // when the button is clicked and deletes the folder.\r
                Button ok = new Button("Delete", new ClickHandler() {\r
                        @Override\r
                        public void onClick(ClickEvent event) {\r
-                               app.deleteFolder(folder);\r
-                               hide();\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 when the button is clicked.\r
-               Button cancel = new Button("Cancel", new ClickHandler() {\r
-                       @Override\r
-                       public void onClick(ClickEvent event) {\r
+                               app.deleteFolder(folder, null);\r
                                hide();\r
                        }\r
                });\r
-               buttons.add(cancel);\r
-               buttons.setCellHorizontalAlignment(cancel, HasHorizontalAlignment.ALIGN_CENTER);\r
-               buttons.setSpacing(8);\r
-               buttons.setStyleName("pithos-warnMessage");\r
-               outer.setStyleName("pithos-warnMessage");\r
-               outer.add(buttons);\r
-               outer.setCellHorizontalAlignment(text, HasHorizontalAlignment.ALIGN_CENTER);\r
-               outer.setCellHorizontalAlignment(buttons, HasHorizontalAlignment.ALIGN_CENTER);\r
+               ok.addStyleName("button");\r
+               inner.add(ok);\r
+               outer.add(inner);\r
+               outer.setCellHorizontalAlignment(inner, HasHorizontalAlignment.ALIGN_CENTER);\r
                setWidget(outer);\r
        }\r
 \r
@@ -120,7 +126,7 @@ public class DeleteFolderDialog extends DialogBox {
                        switch (evt.getKeyCode()) {\r
                                case KeyCodes.KEY_ENTER:\r
                                        hide();\r
-                                       app.deleteFolder(folder);\r
+                                       app.deleteFolder(folder, null);\r
                                        break;\r
                                case KeyCodes.KEY_ESCAPE:\r
                                        hide();\r