From b6761fe44e4a4f96239c4aed4a0e81c4190bbc1c Mon Sep 17 00:00:00 2001
From: fstamatelopoulos <devnull@localhost>
Date: Fri, 20 Mar 2009 14:28:58 +0000
Subject: [PATCH] consistent file menus: Upload - Download at the top of the
 menu, Properties is the last option

---
 gss/src/gr/ebs/gss/client/FileContextMenu.java |   11 +++++------
 gss/src/gr/ebs/gss/client/FileMenu.java        |    6 +++---
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/gss/src/gr/ebs/gss/client/FileContextMenu.java b/gss/src/gr/ebs/gss/client/FileContextMenu.java
index edcdd51..8265559 100644
--- a/gss/src/gr/ebs/gss/client/FileContextMenu.java
+++ b/gss/src/gr/ebs/gss/client/FileContextMenu.java
@@ -149,17 +149,16 @@ public class FileContextMenu extends PopupPanel implements ClickListener {
 			trashItem = new MenuItem("<span>" + newImages.emptyTrash().getHTML() + "&nbsp;Move to Trash</span>", true, new ToTrashCommand(this));
 			deleteItem = new MenuItem("<span>" + newImages.delete().getHTML() + "&nbsp;Delete</span>", true, new DeleteCommand(this, images));
 
-			contextMenu.addItem(cutItem);
-			contextMenu.addItem(copyItem);
 			contextMenu.addItem(updateItem);
-
-			contextMenu.addItem(propItem);
-			contextMenu.addItem(trashItem);
-			contextMenu.addItem(deleteItem);
 			String[] link = {"", ""};
 			GSS.get().getTopPanel().getFileMenu().createDownloadLink(link);
 			downloadItem = new MenuItem("<span>" + link[0] + newImages.download().getHTML() + " Download" + link[1] + "</span>", true, downloadCmd);
 			contextMenu.addItem(downloadItem);
+			contextMenu.addItem(cutItem);
+			contextMenu.addItem(copyItem);
+			contextMenu.addItem(trashItem);
+			contextMenu.addItem(deleteItem);
+			contextMenu.addItem(propItem);
 
 		}
 
diff --git a/gss/src/gr/ebs/gss/client/FileMenu.java b/gss/src/gr/ebs/gss/client/FileMenu.java
index 9e3066b..0f4b38d 100644
--- a/gss/src/gr/ebs/gss/client/FileMenu.java
+++ b/gss/src/gr/ebs/gss/client/FileMenu.java
@@ -189,14 +189,14 @@ public class FileMenu extends PopupPanel implements ClickListener {
 		boolean propertiesNotVisible = selectedItem != null && (folders.isTrash(selectedItem) || folders.isMyShares(selectedItem) || folders.isOthersShared(selectedItem) || selectedItem.getUserObject() instanceof GroupUserResource);
 		contextMenu.addItem("<span>" + images.folderNew().getHTML() + "&nbsp;New Folder</span>", true, new NewFolderCommand(this, images));
 		contextMenu.addItem("<span>" + images.fileNew().getHTML() + "&nbsp;Upload</span>", true, new UploadFileCommand(this, images));
-		contextMenu	.addItem("<span>" + images.viewText().getHTML() + "&nbsp;Properties</span>", true, new PropertiesCommand(this, images))
-					.setVisible(!propertiesNotVisible);
-		contextMenu.addItem("<span>" + images.emptyTrash().getHTML() + "&nbsp;Empty Trash</span>", true, new EmptyTrashCommand(this));
 		if (downloadVisible) {
 			String[] link = {"", ""};
 			createDownloadLink(link);
 			contextMenu.addItem("<span>" + link[0] + images.download().getHTML() + "&nbsp;Download" + link[1] + "</span>", true, downloadCmd);
 		}
+		contextMenu.addItem("<span>" + images.emptyTrash().getHTML() + "&nbsp;Empty Trash</span>", true, new EmptyTrashCommand(this));
+		contextMenu	.addItem("<span>" + images.viewText().getHTML() + "&nbsp;Properties</span>", true, new PropertiesCommand(this, images))
+					.setVisible(!propertiesNotVisible);
 		return contextMenu;
 	}
 
-- 
1.7.10.4