Implemented single file properties dialog
authorChristos Stathis <chstath@ebs.gr>
Thu, 14 Jul 2011 15:47:48 +0000 (18:47 +0300)
committerChristos Stathis <chstath@ebs.gr>
Thu, 14 Jul 2011 15:47:48 +0000 (18:47 +0300)
web_client/src/gr/grnet/pithos/web/client/AbstractPropertiesDialog.java
web_client/src/gr/grnet/pithos/web/client/EditMenu.java
web_client/src/gr/grnet/pithos/web/client/FileContextMenu.java
web_client/src/gr/grnet/pithos/web/client/FileMenu.java
web_client/src/gr/grnet/pithos/web/client/FilePropertiesDialog.java
web_client/src/gr/grnet/pithos/web/client/commands/DeleteCommand.java
web_client/src/gr/grnet/pithos/web/client/commands/PropertiesCommand.java

index 84dc9b4..e5ab8a4 100644 (file)
@@ -176,5 +176,4 @@ public abstract class AbstractPropertiesDialog extends DialogBox {
                GSS.preventIESelection();\r
                hide();\r
        }\r
-\r
 }\r
index 9769a7e..3b238d2 100644 (file)
@@ -174,17 +174,21 @@ public class EditMenu extends MenuBar {
             else if (selectedFolder != null)
                 cutObject = selectedFolder;
 
-            MenuItem cutItem = new MenuItem("<span>" + AbstractImagePrototype.create(images.cut()).getHTML() + "&nbsp;" + cutLabel + "</span>", true, new CutCommand(_app, null, cutObject));
-            addItem(cutItem);
+            if (selectedFiles.size() != 0 || (selectedFolder != null && !selectedFolder.isContainer())) {
+                MenuItem cutItem = new MenuItem("<span>" + AbstractImagePrototype.create(images.cut()).getHTML() + "&nbsp;" + cutLabel + "</span>", true, new CutCommand(_app, null, cutObject));
+                addItem(cutItem);
+            }
 
             MenuItem copyItem = new MenuItem("<span>" + AbstractImagePrototype.create(images.copy()).getHTML() + "&nbsp;"+copyLabel+"</span>", true, new CopyCommand(_app, null, cutObject));
             addItem(copyItem);
 
-            MenuItem moveToTrashItem = new MenuItem("<span>" + AbstractImagePrototype.create(images.emptyTrash()).getHTML() + "&nbsp;Move to Trash</span>", true, new ToTrashCommand(_app, null, cutObject));
-            addItem(moveToTrashItem);
+            if (selectedFiles.size() != 0 || (selectedFolder != null && !selectedFolder.isContainer())) {
+                MenuItem moveToTrashItem = new MenuItem("<span>" + AbstractImagePrototype.create(images.emptyTrash()).getHTML() + "&nbsp;Move to Trash</span>", true, new ToTrashCommand(_app, null, cutObject));
+                addItem(moveToTrashItem);
 
-            MenuItem deleteItem = new MenuItem("<span>" + AbstractImagePrototype.create(images.delete()).getHTML() + "&nbsp;Delete</span>", true, new DeleteCommand(null, cutObject, images));
-            addItem(deleteItem);
+                MenuItem deleteItem = new MenuItem("<span>" + AbstractImagePrototype.create(images.delete()).getHTML() + "&nbsp;Delete</span>", true, new DeleteCommand(null, cutObject, images));
+                addItem(deleteItem);
+            }
         }
 
         if (selectedFolder != null && !_app.getClipboard().isEmpty()) {
index e9ba939..84337f9 100644 (file)
@@ -170,8 +170,7 @@ public class FileContextMenu extends PopupPanel {
 //                     sharingItem = new MenuItem("<span>" + AbstractImagePrototype.create(newImages.sharing()).getHTML() + "&nbsp;Sharing</span>", true, new PropertiesCommand(this, images, 1));
 //            contextMenu.addItem(sharingItem);
 
-//                     propItem = new MenuItem("<span>" + AbstractImagePrototype.create(newImages.viewText()).getHTML() + "&nbsp;Properties</span>", true, new PropertiesCommand(this, images, 0));
-//            contextMenu.addItem(propItem);
+            contextMenu.addItem(new MenuItem("<span>" + AbstractImagePrototype.create(newImages.viewText()).getHTML() + "&nbsp;Properties</span>", true, new PropertiesCommand(GSS.get(), this, selectedFiles, images, 0)));
 
                        contextMenu.addItem(new MenuItem("<span><a class='hidden-link' href='" + GSS.get().getApiPath() + GSS.get().getUsername() + selectedFiles.get(0).getUri() + "?X-Auth-Token=" + GSS.get().getToken() + "' target='_blank'>" + AbstractImagePrototype.create(newImages.download()).getHTML() + " Download</a></span>", true, (Command) null));
 
index a515180..1da3923 100644 (file)
@@ -131,9 +131,9 @@ public class FileMenu extends MenuBar {
 //        contextMenu.addItem(sharingItem)
 //                       .setVisible(propertiesVisible);
 //
-//        MenuItem propertiesItem = new MenuItem("<span>" + AbstractImagePrototype.create(images.viewText()).getHTML() + "&nbsp;Properties</span>", true, new PropertiesCommand(this, images, 0));
-//        propertiesItem.getElement().setId("topMenu.file.properties");
-//        contextMenu.addItem(propertiesItem)
-//                       .setVisible(propertiesVisible);
+        if (selectedFiles.size() > 0) {
+            MenuItem propertiesItem = new MenuItem("<span>" + AbstractImagePrototype.create(images.viewText()).getHTML() + "&nbsp;Properties</span>", true, new PropertiesCommand(GSS.get(), null, selectedFiles, images, 0));
+            addItem(propertiesItem);
+        }
        }
 }
index 9eb8036..6d63d6e 100644 (file)
  */\r
 package gr.grnet.pithos.web.client;\r
 \r
+import com.google.gwt.core.client.Scheduler;\r
+import gr.grnet.pithos.web.client.foldertree.File;\r
+import gr.grnet.pithos.web.client.foldertree.Resource;\r
 import gr.grnet.pithos.web.client.rest.PostCommand;\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.FileResource;\r
 import gr.grnet.pithos.web.client.rest.resource.GroupResource;\r
@@ -79,7 +84,7 @@ import com.google.gwt.user.client.ui.VerticalPanel;
  */\r
 public class FilePropertiesDialog extends AbstractPropertiesDialog {\r
 \r
-       final PermissionsList permList;\r
+       private PermissionsList permList;\r
 \r
        private CheckBox readForAll;\r
 \r
@@ -111,126 +116,54 @@ public class FilePropertiesDialog extends AbstractPropertiesDialog {
 \r
        private final CheckBox versioned = new CheckBox();\r
 \r
-       final FileResource file;\r
+       final File file;\r
 \r
        private String userFullName;\r
 \r
+    private GSS app;\r
+\r
        /**\r
         * The widget's constructor.\r
-        *\r
-        * @param images the dialog's ImageBundle\r
-        * @param groups\r
-        * @param bodies\r
         */\r
-       public FilePropertiesDialog(final Images images, final List<GroupResource> groups, List<FileResource> bodies, String _userFullName) {\r
+       public FilePropertiesDialog(GSS _app, File _file) {\r
+        app = _app;\r
+        file = _file;\r
 \r
                // Set the dialog's caption.\r
                setText("File properties");\r
 \r
-               file = (FileResource) GSS.get().getCurrentSelection();\r
-               userFullName = _userFullName;\r
-               permList = new PermissionsList(images, file.getPermissions(), file.getOwner());\r
 \r
-               GWT.log("FILE PERMISSIONS:"+file.getPermissions());\r
+//             permList = new PermissionsList(images, file.getPermissions(), file.getOwner());\r
+\r
                // Outer contains inner and buttons.\r
                final VerticalPanel outer = new VerticalPanel();\r
                final FocusPanel focusPanel = new FocusPanel(outer);\r
                // Inner contains generalPanel and permPanel.\r
                inner = new DecoratedTabPanel();\r
                inner.setAnimationEnabled(true);\r
-               final VerticalPanel generalPanel = new VerticalPanel();\r
-               final VerticalPanel permPanel = new VerticalPanel();\r
-               final HorizontalPanel buttons = new HorizontalPanel();\r
-               final HorizontalPanel permButtons = new HorizontalPanel();\r
-               final HorizontalPanel permForAll = new HorizontalPanel();\r
-               final HorizontalPanel pathPanel = new HorizontalPanel();\r
-               final VerticalPanel verPanel = new VerticalPanel();\r
-               final HorizontalPanel vPanel = new HorizontalPanel();\r
-               final HorizontalPanel vPanel2 = new HorizontalPanel();\r
-\r
-               versioned.setValue(file.isVersioned());\r
-               versioned.getElement().setId("filePropertiesDialog.chechBox.versioned");\r
-               inner.add(generalPanel, "General");\r
-               inner.add(permPanel, "Sharing");\r
-               inner.add(verPanel, "Versions");\r
-               inner.selectTab(0);\r
-\r
-               final Label fileNameNote = new Label("Please note that slashes ('/') are not allowed in file names.", true);\r
-               fileNameNote.setVisible(false);\r
-               fileNameNote.setStylePrimaryName("pithos-readForAllNote");\r
-\r
-               final FlexTable generalTable = new FlexTable();\r
-               generalTable.setText(0, 0, "Name");\r
-               generalTable.setText(1, 0, "Folder");\r
-               generalTable.setText(2, 0, "Owner");\r
-               generalTable.setText(3, 0, "Last modified");\r
-               generalTable.setText(4, 0, "Tags");\r
-               name.setWidth("100%");\r
-               name.setText(file.getName());\r
-               name.getElement().setId("filePropertiesDialog.textBox.name");\r
-               generalTable.setWidget(0, 1, name);\r
-               name.addChangeHandler(new ChangeHandler() {\r
 \r
-                       @Override\r
-                       public void onChange(ChangeEvent event) {\r
-                               if(name.getText().contains("/"))\r
-                                       fileNameNote.setVisible(true);\r
-                               else\r
-                                       fileNameNote.setVisible(false);\r
 \r
-                       }\r
-               });\r
+        inner.add(createGeneralPanel(), "General");\r
 \r
-               if(file.getFolderName() != null)\r
-                       generalTable.setText(1, 1, file.getFolderName());\r
-               else\r
-                       generalTable.setText(1, 1, "-");\r
-               generalTable.setWidget(0, 2, fileNameNote);\r
-               generalTable.setText(2, 1,userFullName);\r
+        inner.add(createSharingPanel(), "Sharing");\r
 \r
-               final DateTimeFormat formatter = DateTimeFormat.getFormat("d/M/yyyy h:mm a");\r
-               generalTable.setText(3, 1, formatter.format(file.getModificationDate()));\r
-               // Get the tags.\r
-               StringBuffer tagsBuffer = new StringBuffer();\r
-               Iterator i = file.getTags().iterator();\r
-               while (i.hasNext()) {\r
-                       String tag = (String) i.next();\r
-                       tagsBuffer.append(tag).append(", ");\r
-               }\r
-               if (tagsBuffer.length() > 1)\r
-                       tagsBuffer.delete(tagsBuffer.length() - 2, tagsBuffer.length() - 1);\r
-               initialTagText = tagsBuffer.toString();\r
-               tags.setWidth("100%");\r
-               tags.getElement().setId("filePropertiesDialog.textBox.tags");\r
-               tags.setText(initialTagText);\r
-               generalTable.setWidget(4, 1, tags);\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(4, 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.getFlexCellFormatter().setStyleName(4, 1, "props-values");\r
-               generalTable.setCellSpacing(4);\r
+        inner.add(createVersionPanel(), "Versions");\r
+\r
+        inner.selectTab(0);\r
 \r
+        outer.add(inner);\r
+\r
+               final HorizontalPanel buttons = new HorizontalPanel();\r
                // Create the 'OK' button, along with a listener that hides the dialog\r
                // when the button is clicked.\r
                final Button ok = new Button("OK", new ClickHandler() {\r
                        @Override\r
                        public void onClick(ClickEvent event) {\r
-                               if(name.getText().contains("/"))\r
-                                       fileNameNote.setVisible(true);\r
-                               else{\r
-                                       fileNameNote.setVisible(false);\r
-                                       accept();\r
-                                       closeDialog();\r
-                               }               \r
+                               accept();\r
+                               closeDialog();\r
                        }\r
                });\r
-               ok.getElement().setId("filePropertiesDialog.button.ok");                \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
@@ -241,158 +174,225 @@ public class FilePropertiesDialog extends AbstractPropertiesDialog {
                                closeDialog();\r
                        }\r
                });\r
-               cancel.getElement().setId("filePropertiesDialog.button.cancel");\r
                buttons.add(cancel);\r
                buttons.setCellHorizontalAlignment(cancel, HasHorizontalAlignment.ALIGN_CENTER);\r
                buttons.setSpacing(8);\r
                buttons.addStyleName("pithos-TabPanelBottom");\r
 \r
-               generalPanel.add(generalTable);\r
+        outer.add(buttons);\r
+        outer.setCellHorizontalAlignment(buttons, HasHorizontalAlignment.ALIGN_CENTER);\r
+        outer.addStyleName("pithos-TabPanelBottom");\r
+\r
+        focusPanel.setFocus(true);\r
+        setWidget(outer);\r
 \r
                // Asynchronously retrieve the tags defined by this user.\r
                DeferredCommand.addCommand(new Command() {\r
 \r
                        @Override\r
                        public void execute() {\r
-                               updateTags();\r
-                       }\r
-               });\r
-\r
-               DisclosurePanel allTags = new DisclosurePanel("All tags");\r
-               allTagsContent = new FlowPanel();\r
-               allTagsContent.setWidth("100%");\r
-               allTags.setContent(allTagsContent);\r
-               generalPanel.add(allTags);\r
-               generalPanel.setSpacing(4);\r
-\r
-               final 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("filePropertiesDialog.button.addGroup");\r
-               permButtons.add(add);\r
-               permButtons.setCellHorizontalAlignment(add, HasHorizontalAlignment.ALIGN_CENTER);\r
-\r
-               final 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
-               add.getElement().setId("filePropertiesDialog.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 file will be readable" +\r
-                                       " by everyone. By checking this option, you are certifying that you have the right to " +\r
-                                       "distribute this file 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("filePropertiesDialog.checkBox.public");\r
-               readForAll.setValue(file.isReadForAll());\r
-               readForAll.addClickHandler(new ClickHandler() {\r
-                       @Override\r
-                       public void onClick(ClickEvent event) {\r
-                               readForAllNote.setVisible(readForAll.getValue());\r
-                       }\r
-\r
-               });\r
-\r
-               permPanel.add(permList);\r
-               permPanel.add(permButtons);\r
-               // Only show the read for all permission if the user is the owner.\r
-               if (file.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
-\r
-               TextBox path = new TextBox();\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(file.getUri());\r
-               path.getElement().setId("filePropertiesDialog.textBox.link");\r
-               path.setTitle("Use this link for sharing the file 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
-               VersionsList verList = new VersionsList(this, images, bodies);\r
-               verPanel.add(verList);\r
-\r
-               vPanel.setCellHorizontalAlignment(cancel, HasHorizontalAlignment.ALIGN_CENTER);\r
-               vPanel.setSpacing(8);\r
-               vPanel.addStyleName("pithos-TabPanelBottom");\r
-               vPanel.add(new Label("Versioned"));\r
-\r
-               vPanel.add(versioned);\r
-               verPanel.add(vPanel);\r
-               vPanel2.setCellHorizontalAlignment(cancel, HasHorizontalAlignment.ALIGN_CENTER);\r
-               vPanel2.setSpacing(8);\r
-               vPanel2.addStyleName("pithos-TabPanelBottom");\r
-               Button removeVersionsButton = new Button(AbstractImagePrototype.create(images.delete()).getHTML(), new ClickHandler() {\r
-                       @Override\r
-                       public void onClick(ClickEvent event) {\r
-                               ConfirmationDialog confirm = new ConfirmationDialog("Really " +\r
-                                               "remove all previous versions?", "Remove") {\r
-\r
-                                       @Override\r
-                                       public void cancel() {\r
-                                       }\r
-\r
-                                       @Override\r
-                                       public void confirm() {\r
-                                               FilePropertiesDialog.this.closeDialog();\r
-                                               removeAllOldVersions();\r
-                                       }\r
-\r
-                               };\r
-                               confirm.center();\r
+//                             updateTags();\r
                        }\r
-\r
                });\r
-               HTML removeAllVersion = new HTML("<span>Remove all previous versions?</span>");\r
-               vPanel2.add(removeAllVersion);\r
-               vPanel2.add(removeVersionsButton);\r
-               verPanel.add(vPanel2);\r
-               if(!file.isVersioned())\r
-                       vPanel2.setVisible(false);\r
-               outer.add(inner);\r
-               outer.add(buttons);\r
-               outer.setCellHorizontalAlignment(buttons, HasHorizontalAlignment.ALIGN_CENTER);\r
-               outer.addStyleName("pithos-TabPanelBottom");\r
-\r
-               focusPanel.setFocus(true);\r
-               setWidget(outer);\r
        }\r
 \r
+    private VerticalPanel createGeneralPanel() {\r
+        final VerticalPanel generalPanel = new VerticalPanel();\r
+        final FlexTable generalTable = new FlexTable();\r
+        generalTable.setText(0, 0, "Name");\r
+        generalTable.setText(1, 0, "Folder");\r
+        generalTable.setText(2, 0, "Owner");\r
+        generalTable.setText(3, 0, "Last modified");\r
+//        generalTable.setText(4, 0, "Tags");\r
+\r
+        name.setWidth("100%");\r
+        name.setText(file.getName());\r
+        generalTable.setWidget(0, 1, name);\r
+        if(file.getParent() != null)\r
+            generalTable.setText(1, 1, file.getParent().getName());\r
+        else\r
+            generalTable.setText(1, 1, "-");\r
+        generalTable.setText(2, 1, file.getOwner());\r
+\r
+        final DateTimeFormat formatter = DateTimeFormat.getFormat("d/M/yyyy h:mm a");\r
+        generalTable.setText(3, 1, formatter.format(file.getLastModified()));\r
+\r
+               // Get the tags.\r
+//             StringBuffer tagsBuffer = new StringBuffer();\r
+//             Iterator i = file.getTags().iterator();\r
+//             while (i.hasNext()) {\r
+//                     String tag = (String) i.next();\r
+//                     tagsBuffer.append(tag).append(", ");\r
+//             }\r
+//             if (tagsBuffer.length() > 1)\r
+//                     tagsBuffer.delete(tagsBuffer.length() - 2, tagsBuffer.length() - 1);\r
+//             initialTagText = tagsBuffer.toString();\r
+//             tags.setWidth("100%");\r
+//             tags.getElement().setId("filePropertiesDialog.textBox.tags");\r
+//             tags.setText(initialTagText);\r
+//             generalTable.setWidget(4, 1, tags);\r
+\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(4, 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.getFlexCellFormatter().setStyleName(4, 1, "props-values");\r
+        generalTable.setCellSpacing(4);\r
+\r
+        generalPanel.add(generalTable);\r
+\r
+        DisclosurePanel allTags = new DisclosurePanel("All tags");\r
+        allTagsContent = new FlowPanel();\r
+        allTagsContent.setWidth("100%");\r
+        allTags.setContent(allTagsContent);\r
+        generalPanel.add(allTags);\r
+        generalPanel.setSpacing(4);\r
+        return generalPanel;\r
+    }\r
+\r
+    private VerticalPanel createSharingPanel() {\r
+        VerticalPanel permPanel = new VerticalPanel();\r
+//\r
+//        permList = new PermissionsList(images, file.getPermissions(), file.getOwner());\r
+//        permPanel.add(permList);\r
+//\r
+//        HorizontalPanel permButtons = new HorizontalPanel();\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
+//        permButtons.add(add);\r
+//        permButtons.setCellHorizontalAlignment(add, HasHorizontalAlignment.ALIGN_CENTER);\r
+//\r
+//        final 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
+//        permButtons.add(addUser);\r
+//        permButtons.setCellHorizontalAlignment(addUser, HasHorizontalAlignment.ALIGN_CENTER);\r
+//\r
+//        permButtons.setSpacing(8);\r
+//        permButtons.addStyleName("pithos-TabPanelBottom");\r
+//        permPanel.add(permButtons);\r
+//\r
+//        final Label readForAllNote = new Label("When this option is enabled, the file will be readable" +\r
+//                    " by everyone. By checking this option, you are certifying that you have the right to " +\r
+//                    "distribute this file 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.setValue(file.isReadForAll());\r
+//        readForAll.addClickHandler(new ClickHandler() {\r
+//            @Override\r
+//            public void onClick(ClickEvent event) {\r
+//                readForAllNote.setVisible(readForAll.getValue());\r
+//            }\r
+//\r
+//        });\r
+//\r
+//        // Only show the read for all permission if the user is the owner.\r
+//        if (file.getOwner().equals(app.getUsername())) {\r
+//            final HorizontalPanel permForAll = new HorizontalPanel();\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
+//\r
+//\r
+//        final HorizontalPanel pathPanel = new HorizontalPanel();\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
+//\r
+//        TextBox path = new TextBox();\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
+//        path.setText(file.getUri());\r
+//        path.setTitle("Use this link for sharing the file via e-mail, IM, etc. (crtl-C/cmd-C to copy to system clipboard)");\r
+//        path.setWidth("100%");\r
+//        path.setReadOnly(true);\r
+//        pathPanel.add(path);\r
+//        permPanel.add(pathPanel);\r
+\r
+        return permPanel;\r
+    }\r
+\r
+    private VerticalPanel createVersionPanel() {\r
+        VerticalPanel versionPanel = new VerticalPanel();\r
+\r
+//        VersionsList verList = new VersionsList(this, images, bodies);\r
+//        versionPanel.add(verList);\r
+//\r
+//        HorizontalPanel vPanel = new HorizontalPanel();\r
+//\r
+//             vPanel.setSpacing(8);\r
+//             vPanel.addStyleName("pithos-TabPanelBottom");\r
+//             vPanel.add(new Label("Versioned"));\r
+//\r
+//             versioned.setValue(file.isVersioned());\r
+//             vPanel.add(versioned);\r
+//             versionPanel.add(vPanel);\r
+//\r
+//        HorizontalPanel vPanel2 = new HorizontalPanel();\r
+//             vPanel2.setSpacing(8);\r
+//             vPanel2.addStyleName("pithos-TabPanelBottom");\r
+//\r
+//        HTML removeAllVersion = new HTML("<span>Remove all previous versions?</span>");\r
+//        vPanel2.add(removeAllVersion);\r
+//\r
+//             Button removeVersionsButton = new Button(AbstractImagePrototype.create(images.delete()).getHTML(), new ClickHandler() {\r
+//                     @Override\r
+//                     public void onClick(ClickEvent event) {\r
+//                             ConfirmationDialog confirm = new ConfirmationDialog("Really " +\r
+//                                             "remove all previous versions?", "Remove") {\r
+//\r
+//                                     @Override\r
+//                                     public void cancel() {\r
+//                                     }\r
+//\r
+//                                     @Override\r
+//                                     public void confirm() {\r
+//                                             FilePropertiesDialog.this.closeDialog();\r
+//                                             removeAllOldVersions();\r
+//                                     }\r
+//\r
+//                             };\r
+//                             confirm.center();\r
+//                     }\r
+//\r
+//             });\r
+//             vPanel2.add(removeVersionsButton);\r
+//        if(!file.isVersioned())\r
+//            vPanel2.setVisible(false);\r
+//\r
+//        versionPanel.add(vPanel2);\r
+\r
+        return versionPanel;\r
+    }\r
 \r
        /**\r
         * Accepts any change and updates the file\r
@@ -401,84 +401,75 @@ public class FilePropertiesDialog extends AbstractPropertiesDialog {
        @Override\r
        protected void accept() {\r
                String newFilename = null;\r
-               permList.updatePermissionsAccordingToInput();\r
-               Set<PermissionHolder> perms = permList.getPermissions();\r
-               JSONObject json = new JSONObject();\r
+//             permList.updatePermissionsAccordingToInput();\r
+//             Set<PermissionHolder> perms = permList.getPermissions();\r
+//             JSONObject json = new JSONObject();\r
                if (!name.getText().equals(file.getName())) {\r
                        newFilename = name.getText();\r
-                       json.put("name", new JSONString(newFilename));\r
+//                     json.put("name", new JSONString(newFilename));\r
                }\r
-               if (versioned.getValue() != file.isVersioned())\r
-                       json.put("versioned", JSONBoolean.getInstance(versioned.getValue()));\r
+//             if (versioned.getValue() != file.isVersioned())\r
+//                     json.put("versioned", JSONBoolean.getInstance(versioned.getValue()));\r
                //only update the read for all perm if the user is the owner\r
-               if (readForAll.getValue() != file.isReadForAll())\r
-                       if (file.getOwner().equals(GSS.get().getCurrentUserResource().getUsername()))\r
-                               json.put("readForAll", JSONBoolean.getInstance(readForAll.getValue()));\r
-               int i = 0;\r
-               if (permList.hasChanges()) {\r
-                       GWT.log("Permissions change", null);\r
-                       JSONArray perma = new JSONArray();\r
-\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
-               }\r
-               JSONArray taga = new JSONArray();\r
-               i = 0;\r
-               if (!tags.getText().equals(initialTagText)) {\r
-                       String[] tagset = tags.getText().split(",");\r
-                       for (String t : tagset) {\r
-                               JSONString to = new JSONString(t);\r
-                               taga.set(i, to);\r
-                               i++;\r
-                       }\r
-                       json.put("tags", taga);\r
-               }\r
-               String jsonString = json.toString();\r
-               if(jsonString.equals("{}")){\r
-                       GWT.log("NO CHANGES", null);\r
-                       return;\r
-               }\r
+//             if (readForAll.getValue() != file.isReadForAll())\r
+//                     if (file.getOwner().equals(GSS.get().getCurrentUserResource().getUsername()))\r
+//                             json.put("readForAll", JSONBoolean.getInstance(readForAll.getValue()));\r
+//             int i = 0;\r
+//             if (permList.hasChanges()) {\r
+//                     GWT.log("Permissions change", null);\r
+//                     JSONArray perma = new JSONArray();\r
+//\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
+//             }\r
+//             JSONArray taga = new JSONArray();\r
+//             i = 0;\r
+//             if (!tags.getText().equals(initialTagText)) {\r
+//                     String[] tagset = tags.getText().split(",");\r
+//                     for (String t : tagset) {\r
+//                             JSONString to = new JSONString(t);\r
+//                             taga.set(i, to);\r
+//                             i++;\r
+//                     }\r
+//                     json.put("tags", taga);\r
+//             }\r
+//             String jsonString = json.toString();\r
+//             if(jsonString.equals("{}")){\r
+//                     GWT.log("NO CHANGES", null);\r
+//                     return;\r
+//             }\r
                final String newFilenameFinal = newFilename;\r
-               PostCommand cf = new PostCommand(file.getUri() + "?update=", jsonString, 200) {\r
-\r
-                       @Override\r
-                       public void onComplete() {\r
-                               GSS.get().getTreeView().refreshCurrentNode(false);\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");\r
-                                       else if (statusCode == 404)\r
-                                               GSS.get().displayError("User in permissions does not exist");\r
-                                       else if (statusCode == 409)\r
-                                               GSS.get().displayError("A file with the same name already exists");\r
-                                       else if (statusCode == 413)\r
-                                               GSS.get().displayError("Your quota has been exceeded");\r
-                                       else\r
-                                               GSS.get().displayError("Unable to modify file:" + ((RestException) t).getHttpStatusText());\r
-                               } else\r
-                                       GSS.get().displayError("System error modifying file:" + t.getMessage());\r
-                       }\r
-\r
-               };\r
-               DeferredCommand.addCommand(cf);\r
 \r
+        if (newFilename == null)\r
+            return;\r
+        String path = app.getApiPath() + app.getUsername() + file.getParent().getUri() + "/" + newFilename;\r
+        PutRequest updateFile = new PutRequest(path) {\r
+            @Override\r
+            public void onSuccess(Resource result) {\r
+                app.updateFolder(file.getParent());\r
+            }\r
+\r
+            @Override\r
+            public void onError(Throwable t) {\r
+                GWT.log("", t);\r
+                app.displayError("System error modifying file:" + t.getMessage());\r
+            }\r
+        };\r
+        updateFile.setHeader("X-Auth-Token", app.getToken());\r
+        updateFile.setHeader("X-Move-From", file.getUri());\r
+        updateFile.setHeader("Content-Type", file.getContentType());\r
+        Scheduler.get().scheduleDeferred(updateFile);\r
        }\r
 \r
        private void removeAllOldVersions() {\r
index 4e8ad93..c96ec11 100644 (file)
@@ -76,20 +76,13 @@ public class DeleteCommand implements Command{
        public void execute() {
         if (containerPanel != null)
                containerPanel.hide();
-               displayDelete();
+
+        if (resource instanceof Folder) {
+            DeleteFolderDialog dlg = new DeleteFolderDialog(GSS.get(), newImages, (Folder) resource);
+            dlg.center();
+        } else if (resource instanceof List) {
+            DeleteFileDialog dlg = new DeleteFileDialog(newImages, (List<File>) resource);
+            dlg.center();
+        }
        }
-       /**
-        * Display the delete dialog, according to the selected object.
-        *
-        *
-        */
-       void displayDelete() {
-               if (resource instanceof Folder) {
-                       DeleteFolderDialog dlg = new DeleteFolderDialog(GSS.get(), newImages, (Folder) resource);
-                       dlg.center();
-               } else if (resource instanceof List) {
-                       DeleteFileDialog dlg = new DeleteFileDialog(newImages, (List<File>) resource);
-                       dlg.center();
-               }
-    }
 }
index 85f53af..bada046 100644 (file)
@@ -40,6 +40,8 @@ import gr.grnet.pithos.web.client.FilesPropertiesDialog;
 import gr.grnet.pithos.web.client.FolderPropertiesDialog;
 import gr.grnet.pithos.web.client.GSS;
 import gr.grnet.pithos.web.client.FileMenu.Images;
+import gr.grnet.pithos.web.client.foldertree.File;
+import gr.grnet.pithos.web.client.foldertree.Folder;
 import gr.grnet.pithos.web.client.rest.GetCommand;
 import gr.grnet.pithos.web.client.rest.HeadCommand;
 import gr.grnet.pithos.web.client.rest.MultipleGetCommand;
@@ -60,6 +62,7 @@ import com.google.gwt.user.client.Command;
 import com.google.gwt.user.client.DeferredCommand;
 import com.google.gwt.user.client.IncrementalCommand;
 import com.google.gwt.user.client.ui.PopupPanel;
+import org.w3c.css.sac.ElementSelector;
 
 /**
  * The command that displays the appropriate Properties dialog, according to the
@@ -80,232 +83,46 @@ public class PropertiesCommand implements Command {
 
        private String userName;
 
+    private Object resource;
+
+    private GSS app;
+
        /**
         * @param _containerPanel
         * @param _newImages the images of all the possible delete dialogs
         * @param _tab the tab to switch to
         */
-       public PropertiesCommand(PopupPanel _containerPanel, final FileMenu.Images _newImages, int _tab) {
+       public PropertiesCommand(GSS _app, PopupPanel _containerPanel, Object _resource, final FileMenu.Images _newImages, int _tab) {
                containerPanel = _containerPanel;
                newImages = _newImages;
                tabToShow = _tab;
+        resource = _resource;
+        app = _app;
        }
 
        @Override
        public void execute() {
-               containerPanel.hide();
-               if (GSS.get().getCurrentSelection() instanceof RestResourceWrapper) {
-                       GetCommand<FolderResource> eg = new GetCommand<FolderResource>(FolderResource.class, ((RestResourceWrapper) GSS.get().getCurrentSelection()).getUri(),((RestResourceWrapper) GSS.get().getCurrentSelection()).getResource()) {
-
-                               @Override
-                               public void onComplete() {
-                                       ((RestResourceWrapper) GSS.get().getCurrentSelection()).setResource(getResult());
-                                       initialize();
-                               }
-
-                               @Override
-                               public void onError(Throwable t) {
-
-                               }
-
-                       };
-                       DeferredCommand.addCommand(eg);
-               }
-               else if (GSS.get().getCurrentSelection() instanceof FileResource) {
-                       final String path = ((FileResource) GSS.get().getCurrentSelection()).getUri();
-                       // Needed because firefox caches head requests.
-                       HeadCommand<FileResource> eg = new HeadCommand<FileResource>(FileResource.class, path+"?"+Math.random(), null ) {
-
-                               @Override
-                               public void onComplete() {
-                                       FileResource res = getResult();
-                                       GSS.get().setCurrentSelection(res);
-                                       initialize();
-                               }
-
-                               @Override
-                               public void onError(Throwable t) {
-                                       if(t instanceof RestException)
-                                               GSS.get().displayError("Unable to retrieve file details:"+((RestException)t).getHttpStatusText());
-                               }
-
-                       };
-                       DeferredCommand.addCommand(eg);
-               }
-               else if (GSS.get().getCurrentSelection() instanceof List) {
-                       List<String> paths = new ArrayList<String>();
-                       for (FileResource fr : (List<FileResource>) GSS.get().getCurrentSelection())
-                               paths.add(fr.getUri()+"?"+Math.random());
-                       Cached[] cached = new Cached[paths.size()];
-                       int i=0;
-                       for (FileResource fr : (List<FileResource>) GSS.get().getCurrentSelection()){
-                               Cached c = new Cached();
-                               c.uri=fr.getUri()+"?"+Math.random();
-                               c.cache=fr;
-                               cached[i]=c;
-                               i++;
-                       }
-                       MultipleHeadCommand<FileResource> gv = new MultipleHeadCommand<FileResource>(FileResource.class, paths.toArray(new String[] {}),cached) {
-
-                               @Override
-                               public void onComplete() {
-                                       List<FileResource> res = getResult();
-                                       GSS.get().setCurrentSelection(res);
-                                       FilesPropertiesDialog dlg = new FilesPropertiesDialog(res);
-                                       dlg.selectTab(tabToShow);
-                                       dlg.center();
-                               }
-
-                               @Override
-                               public void onError(Throwable t) {
-                                       GWT.log("", t);
-                                       GSS.get().displayError("Unable to fetch files details");
-                               }
-
-                               @Override
-                               public void onError(String p, Throwable throwable) {
-                                       GWT.log("Path:" + p, throwable);
-                               }
-                       };
-                       DeferredCommand.addCommand(gv);
-               }
-       }
-
-       private void initialize(){
-               getGroups();
-               getVersions();
-               getOwnerFullName();
-               DeferredCommand.addCommand(new IncrementalCommand() {
-
-                       @Override
-                       public boolean execute() {
-                               boolean res = canContinue();
-                               if (res) {
-                                       displayProperties(newImages, GSS.get().findUserFullName(userName));
-                                       return false;
-                               }
-                               return true;
-                       }
-
-               });
-
+        if (containerPanel != null)
+                   containerPanel.hide();
+
+        if (resource instanceof Folder) {
+            Folder folder = (Folder) resource;
+            FolderPropertiesDialog dlg = new FolderPropertiesDialog(app, false, folder);
+            dlg.selectTab(tabToShow);
+            dlg.center();
+        }
+        else if (resource instanceof List) {
+            List<File> files = (List<File>) resource;
+            if (files.size() > 1) {
+//                FilesPropertiesDialog dlg = new FilesPropertiesDialog(files);
+//                dlg.selectTab(tabToShow);
+//                dlg.center();
+            }
+            else {
+                FilePropertiesDialog dlg = new FilePropertiesDialog(app, files.get(0));
+                dlg.selectTab(tabToShow);
+                dlg.center();
+            }
+        }
        }
-
-       private boolean canContinue() {
-               String userFullNameFromMap = GSS.get().findUserFullName(userName);
-               if(groups == null || versions == null || userFullNameFromMap == null)
-                       return false;
-               return true;
-       }
-
-       /**
-        * Display the appropriate Properties dialog, according to the selected
-        * object in the application.
-        *
-        * @param propImages the images of all the possible properties dialogs
-        */
-       void displayProperties(final Images propImages, final String _userName) {
-               if (GSS.get().getCurrentSelection() instanceof RestResourceWrapper) {
-//                     FolderPropertiesDialog dlg = new FolderPropertiesDialog(propImages, false, groups);
-//                     dlg.selectTab(tabToShow);
-//                     dlg.center();
-               } else if (GSS.get().getCurrentSelection() instanceof FileResource) {
-                       FilePropertiesDialog dlg = new FilePropertiesDialog(propImages, groups, versions, _userName);
-                       dlg.selectTab(tabToShow);
-                       dlg.center();
-               }
-       }
-
-       private void getGroups() {
-               GetCommand<GroupsResource> gg = new GetCommand<GroupsResource>(GroupsResource.class, GSS.get().getCurrentUserResource().getGroupsPath(), null) {
-
-                       @Override
-                       public void onComplete() {
-                               GroupsResource res = getResult();
-                               MultipleGetCommand<GroupResource> ga = new MultipleGetCommand<GroupResource>(GroupResource.class, res.getGroupPaths().toArray(new String[] {}), null) {
-
-                                       @Override
-                                       public void onComplete() {
-                                               List<GroupResource> groupList = getResult();
-                                               groups = groupList;
-                                       }
-
-                                       @Override
-                                       public void onError(Throwable t) {
-                                               GWT.log("", t);
-                                               GSS.get().displayError("Unable to fetch groups");
-                                               groups = new ArrayList<GroupResource>();
-                                       }
-
-                                       @Override
-                                       public void onError(String p, Throwable throwable) {
-                                               GWT.log("Path:" + p, throwable);
-                                       }
-                               };
-                               DeferredCommand.addCommand(ga);
-                       }
-
-                       @Override
-                       public void onError(Throwable t) {
-                               GWT.log("", t);
-                               GSS.get().displayError("Unable to fetch groups");
-                               groups = new ArrayList<GroupResource>();
-                       }
-               };
-               DeferredCommand.addCommand(gg);
-       }
-
-       private void getVersions() {
-               if (GSS.get().getCurrentSelection() instanceof FileResource) {
-                       FileResource afile = (FileResource) GSS.get().getCurrentSelection();
-                       GWT.log("File is versioned:" + afile.isVersioned(), null);
-                       if (afile.isVersioned()) {
-                               List<String> paths = new ArrayList<String>();
-                               for (int i = 1; i <= afile.getVersion(); i++)
-                                       paths.add(afile.getUri() + "?version=" + i);
-                               MultipleHeadCommand<FileResource> gv = new MultipleHeadCommand<FileResource>(FileResource.class, paths.toArray(new String[] {}), null) {
-
-                                       @Override
-                                       public void onComplete() {
-                                               versions = getResult();
-                                       }
-
-                                       @Override
-                                       public void onError(Throwable t) {
-                                               GWT.log("", t);
-                                               GSS.get().displayError("Unable to fetch versions");
-                                               versions = new ArrayList<FileResource>();
-                                       }
-
-                                       @Override
-                                       public void onError(String p, Throwable throwable) {
-                                               GWT.log("Path:" + p, throwable);
-                                       }
-                               };
-                               DeferredCommand.addCommand(gv);
-                       } else
-                               versions = new ArrayList<FileResource>();
-               } else
-                       versions = new ArrayList<FileResource>();
-       }
-
-       private void getOwnerFullName() {
-               if(GSS.get().getCurrentSelection() instanceof FileResource){                    
-                       FileResource fileResource = (FileResource) GSS.get().getCurrentSelection();
-                       userName = fileResource.getOwner();
-                       if(GSS.get().findUserFullName(userName) == null){
-                               GetUserCommand gu = new GetUserCommand(userName);
-                               gu.execute();
-                       }
-               }else{                  
-                       FolderResource resource = ((RestResourceWrapper) GSS.get().getCurrentSelection()).getResource();
-                       userName = resource.getOwner();
-                       if(GSS.get().findUserFullName(userName) == null){
-                               GetUserCommand gu = new GetUserCommand(userName);
-                               gu.execute();
-                       }
-               }
-       }
-
-
 }