From c9660f7f82ebc392856fad96634f5db957f032cf Mon Sep 17 00:00:00 2001 From: Natasa Kapravelou Date: Mon, 14 Feb 2011 12:54:38 +0200 Subject: [PATCH 1/1] Added ids to the displayed popup items when right click on a folder (FolderContextMenu). --- src/gr/ebs/gss/client/FolderContextMenu.java | 167 ++++++++++++++++++++------ 1 file changed, 132 insertions(+), 35 deletions(-) diff --git a/src/gr/ebs/gss/client/FolderContextMenu.java b/src/gr/ebs/gss/client/FolderContextMenu.java index 21d6ead..7a1eef7 100644 --- a/src/gr/ebs/gss/client/FolderContextMenu.java +++ b/src/gr/ebs/gss/client/FolderContextMenu.java @@ -86,67 +86,164 @@ public class FolderContextMenu extends PopupPanel { if(selectedItem != null) if(selectedItem instanceof MyFolderResource){ - contextMenu.addItem("" + AbstractImagePrototype.create(newImages.folderNew()).getHTML() + " New Folder", true, new NewFolderCommand(this, images)); - contextMenu.addItem("" + AbstractImagePrototype.create(newImages.fileUpdate()).getHTML() + " Upload", true, new UploadFileCommand(this)); + MenuItem newFolder = new MenuItem("" + AbstractImagePrototype.create(newImages.folderNew()).getHTML() + " New Folder", true, new NewFolderCommand(this, images)); + newFolder.getElement().setId("folderContextMenu.newFolder"); + contextMenu.addItem(newFolder); + + MenuItem upload = new MenuItem("" + AbstractImagePrototype.create(newImages.fileUpdate()).getHTML() + " Upload", true, new UploadFileCommand(this)); + upload.getElement().setId("folderContextMenu.upload"); + contextMenu.addItem(upload); + boolean notRootFolder = !GSS.get().getTreeView().getMyFolders().equals(selectedItem); if (notRootFolder) { - // do not show the copy & cut option for the user's root folder - contextMenu.addItem("" + AbstractImagePrototype.create(newImages.cut()).getHTML() + " Cut", true, new CutCommand(this)); - contextMenu.addItem("" + AbstractImagePrototype.create(newImages.copy()).getHTML() + " Copy", true, new CopyCommand(this)); + // do not show the copy & cut option for the user's root folder + MenuItem cut = new MenuItem("" + AbstractImagePrototype.create(newImages.cut()).getHTML() + " Cut", true, new CutCommand(this)); + cut.getElement().setId("folderContextMenu.cut"); + contextMenu.addItem(cut); + + MenuItem copy = new MenuItem("" + AbstractImagePrototype.create(newImages.copy()).getHTML() + " Copy", true, new CopyCommand(this)); + copy.getElement().setId("folderContextMenu.copy"); + contextMenu.addItem(copy); + } contextMenu.addItem(pasteItem); if (notRootFolder) { // do not show delete options for the user's root folder - contextMenu.addItem("" + AbstractImagePrototype.create(newImages.emptyTrash()).getHTML() + " Move to Trash", true, new ToTrashCommand(this)); - contextMenu.addItem("" + AbstractImagePrototype.create(newImages.delete()).getHTML() + " Delete", true, new DeleteCommand(this, newImages)); + MenuItem moveToTrash = new MenuItem("" + AbstractImagePrototype.create(newImages.emptyTrash()).getHTML() + " Move to Trash", true, new ToTrashCommand(this)); + moveToTrash.getElement().setId("folderContextMenu.moveToTrash"); + contextMenu.addItem(moveToTrash); + + MenuItem delete = new MenuItem("" + AbstractImagePrototype.create(newImages.delete()).getHTML() + " Delete", true, new DeleteCommand(this, newImages)); + delete.getElement().setId("folderContextMenu.delete"); + contextMenu.addItem(delete); } - contextMenu.addItem("" + AbstractImagePrototype.create(images.refresh()).getHTML() + " Refresh", true, new RefreshCommand(this, images)); - contextMenu.addItem("" + AbstractImagePrototype.create(newImages.sharing()).getHTML() + " Sharing", true, new PropertiesCommand(this, newImages, 1)); - contextMenu.addItem("" + AbstractImagePrototype.create(newImages.viewText()).getHTML() + " Properties", true, new PropertiesCommand(this, newImages, 0)); + + MenuItem refresh = new MenuItem("" + AbstractImagePrototype.create(images.refresh()).getHTML() + " Refresh", true, new RefreshCommand(this, images)); + refresh.getElement().setId("folderContextMenu.refresh"); + contextMenu.addItem(refresh); + + MenuItem sharing = new MenuItem("" + AbstractImagePrototype.create(newImages.sharing()).getHTML() + " Sharing", true, new PropertiesCommand(this, newImages, 1)); + sharing.getElement().setId("folderContextMenu.sharing"); + contextMenu.addItem(sharing); + + MenuItem properties = new MenuItem("" + AbstractImagePrototype.create(newImages.viewText()).getHTML() + " Properties", true, new PropertiesCommand(this, newImages, 0)); + properties.getElement().setId("folderContextMenu.properties"); + contextMenu.addItem(properties); } + if(selectedItem instanceof SharedFolderResource){ - contextMenu.addItem("" + AbstractImagePrototype.create(newImages.folderNew()).getHTML() + " New Folder", true, new NewFolderCommand(this, images)); - contextMenu.addItem("" + AbstractImagePrototype.create(newImages.fileUpdate()).getHTML() + " Upload", true, new UploadFileCommand(this)); - contextMenu.addItem("" + AbstractImagePrototype.create(newImages.cut()).getHTML() + " Cut", true, new CutCommand(this)); - contextMenu.addItem("" + AbstractImagePrototype.create(newImages.copy()).getHTML() + " Copy", true, new CopyCommand(this)); + MenuItem newFolder = new MenuItem("" + AbstractImagePrototype.create(newImages.folderNew()).getHTML() + " New Folder", true, new NewFolderCommand(this, images)); + newFolder.getElement().setId("folderContextMenu.newFolder"); + contextMenu.addItem(newFolder); + + MenuItem upload = new MenuItem("" + AbstractImagePrototype.create(newImages.fileUpdate()).getHTML() + " Upload", true, new UploadFileCommand(this)); + upload.getElement().setId("folderContextMenu.upload"); + contextMenu.addItem(upload); + + MenuItem cut = new MenuItem("" + AbstractImagePrototype.create(newImages.cut()).getHTML() + " Cut", true, new CutCommand(this)); + cut.getElement().setId("folderContextMenu.cut"); + contextMenu.addItem(cut); + + MenuItem copy = new MenuItem("" + AbstractImagePrototype.create(newImages.copy()).getHTML() + " Copy", true, new CopyCommand(this)); + copy.getElement().setId("folderContextMenu.copy"); + contextMenu.addItem(copy); + contextMenu.addItem(pasteItem); - contextMenu.addItem("" + AbstractImagePrototype.create(newImages.emptyTrash()).getHTML() + " Move to Trash", true, new ToTrashCommand(this)); - contextMenu.addItem("" + AbstractImagePrototype.create(newImages.delete()).getHTML() + " Delete", true, new DeleteCommand(this, newImages)); - contextMenu.addItem("" + AbstractImagePrototype.create(images.refresh()).getHTML() + " Refresh", true, new RefreshCommand(this, images)); - contextMenu.addItem("" + AbstractImagePrototype.create(newImages.sharing()).getHTML() + " Sharing", true, new PropertiesCommand(this, newImages, 1)); - contextMenu.addItem("" + AbstractImagePrototype.create(newImages.viewText()).getHTML() + " Properties", true, new PropertiesCommand(this, newImages, 0)); + + MenuItem moveToTrash = new MenuItem("" + AbstractImagePrototype.create(newImages.emptyTrash()).getHTML() + " Move to Trash", true, new ToTrashCommand(this)); + moveToTrash.getElement().setId("folderContextMenu.moveToTrash"); + contextMenu.addItem(moveToTrash); + + MenuItem delete = new MenuItem("" + AbstractImagePrototype.create(newImages.delete()).getHTML() + " Delete", true, new DeleteCommand(this, newImages)); + delete.getElement().setId("folderContextMenu.delete"); + contextMenu.addItem(delete); + + MenuItem refresh = new MenuItem("" + AbstractImagePrototype.create(images.refresh()).getHTML() + " Refresh", true, new RefreshCommand(this, images)); + refresh.getElement().setId("folderContextMenu.refresh"); + contextMenu.addItem(refresh); + + MenuItem sharing = new MenuItem("" + AbstractImagePrototype.create(newImages.sharing()).getHTML() + " Sharing", true, new PropertiesCommand(this, newImages, 1)); + sharing.getElement().setId("folderContextMenu.sharing"); + contextMenu.addItem(sharing); + + MenuItem properties = new MenuItem("" + AbstractImagePrototype.create(newImages.viewText()).getHTML() + " Properties", true, new PropertiesCommand(this, newImages, 0)); + properties.getElement().setId("folderContextMenu.properties"); + contextMenu.addItem(properties); + } if(selectedItem instanceof TrashFolderResource){ - contextMenu.addItem("" + AbstractImagePrototype.create(newImages.viewText()).getHTML() + " Restore folder and contents", true, new RestoreTrashCommand(this)); - contextMenu.addItem("" + AbstractImagePrototype.create(newImages.delete()).getHTML() + " Delete", true, new DeleteCommand(this, newImages)); - contextMenu.addItem("" + AbstractImagePrototype.create(images.refresh()).getHTML() + " Refresh", true, new RefreshCommand(this, images)); + MenuItem restore = new MenuItem("" + AbstractImagePrototype.create(newImages.viewText()).getHTML() + " Restore folder and contents", true, new RestoreTrashCommand(this)); + restore.getElement().setId("folderContextMenu.restore"); + contextMenu.addItem(restore); + + MenuItem delete = new MenuItem("" + AbstractImagePrototype.create(newImages.delete()).getHTML() + " Delete", true, new DeleteCommand(this, newImages)); + delete.getElement().setId("folderContextMenu.delete"); + contextMenu.addItem(delete); + + MenuItem refresh = new MenuItem("" + AbstractImagePrototype.create(images.refresh()).getHTML() + " Refresh", true, new RefreshCommand(this, images)); + refresh.getElement().setId("folderContextMenu.refresh"); + contextMenu.addItem(refresh); + } - if(selectedItem instanceof OthersFolderResource){ - contextMenu.addItem("" + AbstractImagePrototype.create(newImages.folderNew()).getHTML() + " New Folder", true, new NewFolderCommand(this, images)); - contextMenu.addItem("" + AbstractImagePrototype.create(newImages.fileUpdate()).getHTML() + " Upload", true, new UploadFileCommand(this)); - contextMenu.addItem("" + AbstractImagePrototype.create(newImages.cut()).getHTML() + " Cut", true, new CutCommand(this)); - contextMenu.addItem("" + AbstractImagePrototype.create(newImages.copy()).getHTML() + " Copy", true, new CopyCommand(this)); + if(selectedItem instanceof OthersFolderResource){ + MenuItem newFolder = new MenuItem("" + AbstractImagePrototype.create(newImages.folderNew()).getHTML() + " New Folder", true, new NewFolderCommand(this, images)); + newFolder.getElement().setId("folderContextMenu.newFolder"); + contextMenu.addItem(newFolder); + + MenuItem upload = new MenuItem("" + AbstractImagePrototype.create(newImages.fileUpdate()).getHTML() + " Upload", true, new UploadFileCommand(this)); + upload.getElement().setId("folderContextMenu.upload"); + contextMenu.addItem(upload); + + MenuItem cut = new MenuItem("" + AbstractImagePrototype.create(newImages.cut()).getHTML() + " Cut", true, new CutCommand(this)); + cut.getElement().setId("folderContextMenu.cut"); + contextMenu.addItem(cut); + + MenuItem copy = new MenuItem("" + AbstractImagePrototype.create(newImages.copy()).getHTML() + " Copy", true, new CopyCommand(this)); + copy.getElement().setId("folderContextMenu.copy"); + contextMenu.addItem(copy); + contextMenu.addItem(pasteItem); - contextMenu.addItem("" + AbstractImagePrototype.create(newImages.emptyTrash()).getHTML() + " Move to Trash", true, new ToTrashCommand(this)); - contextMenu.addItem("" + AbstractImagePrototype.create(newImages.delete()).getHTML() + " Delete", true, new DeleteCommand(this, newImages)); - contextMenu.addItem("" + AbstractImagePrototype.create(images.refresh()).getHTML() + " Refresh", true, new RefreshCommand(this, images)); - contextMenu.addItem("" + AbstractImagePrototype.create(newImages.sharing()).getHTML() + " Sharing", true, new PropertiesCommand(this, newImages, 1)); - contextMenu.addItem("" + AbstractImagePrototype.create(newImages.viewText()).getHTML() + " Properties", true, new PropertiesCommand(this, newImages, 0)); + + MenuItem moveToTrash = new MenuItem("" + AbstractImagePrototype.create(newImages.emptyTrash()).getHTML() + " Move to Trash", true, new ToTrashCommand(this)); + moveToTrash.getElement().setId("folderContextMenu.moveToTrash"); + contextMenu.addItem(moveToTrash); + + MenuItem delete = new MenuItem("" + AbstractImagePrototype.create(newImages.delete()).getHTML() + " Delete", true, new DeleteCommand(this, newImages)); + delete.getElement().setId("folderContextMenu.delete"); + contextMenu.addItem(delete); + + MenuItem refresh = new MenuItem("" + AbstractImagePrototype.create(images.refresh()).getHTML() + " Refresh", true, new RefreshCommand(this, images)); + refresh.getElement().setId("folderContextMenu.delete"); + contextMenu.addItem(refresh); + + MenuItem sharing = new MenuItem("" + AbstractImagePrototype.create(newImages.sharing()).getHTML() + " Sharing", true, new PropertiesCommand(this, newImages, 1)); + sharing.getElement().setId("folderContextMenu.sharing"); + contextMenu.addItem(sharing); + + MenuItem properties = new MenuItem("" + AbstractImagePrototype.create(newImages.viewText()).getHTML() + " Properties", true, new PropertiesCommand(this, newImages, 0)); + properties.getElement().setId("folderContextMenu.properties"); + contextMenu.addItem(properties); + } if(selectedItem instanceof TrashResource){ - contextMenu.addItem("" + AbstractImagePrototype.create(newImages.delete()).getHTML() + " Restore Trash", true, new RestoreTrashCommand(this)); + MenuItem restore = new MenuItem("" + AbstractImagePrototype.create(newImages.delete()).getHTML() + " Restore Trash", true, new RestoreTrashCommand(this)); + restore.getElement().setId("folderContextMenu.restore"); + contextMenu.addItem(restore); MenuItem emptyTrash = new MenuItem("" + AbstractImagePrototype.create(newImages.delete()).getHTML() + " Empty Trash", true, new EmptyTrashCommand(this)); emptyTrash.getElement().setId("folderContextMenu.emptyTrash"); contextMenu.addItem(emptyTrash); MenuItem refresh = new MenuItem("" + AbstractImagePrototype.create(images.refresh()).getHTML() + " Refresh", true, new RefreshCommand(this, images)); - emptyTrash.getElement().setId("folderContextMenu.refresh"); + refresh.getElement().setId("folderContextMenu.refresh"); contextMenu.addItem(refresh); } if(selectedItem instanceof SharedResource || selectedItem instanceof OthersResource || selectedItem instanceof OtherUserResource){ - contextMenu.addItem("" + AbstractImagePrototype.create(images.refresh()).getHTML() + " Refresh", true, new RefreshCommand(this, images)); + MenuItem refresh = new MenuItem("" + AbstractImagePrototype.create(images.refresh()).getHTML() + " Refresh", true, new RefreshCommand(this, images)); + refresh.getElement().setId("folderContextMenu.refresh"); + contextMenu.addItem(refresh); + } /* -- 1.7.10.4