Revision 1e413f9b src/gr/grnet/pithos/web/client/EditMenu.java

b/src/gr/grnet/pithos/web/client/EditMenu.java
39 39
import gr.grnet.pithos.web.client.commands.DeleteCommand;
40 40
import gr.grnet.pithos.web.client.commands.PasteCommand;
41 41
import gr.grnet.pithos.web.client.commands.ToTrashCommand;
42
import gr.grnet.pithos.web.client.foldertree.Folder;
42 43
import gr.grnet.pithos.web.client.rest.resource.FileResource;
43 44

  
44 45
import gr.grnet.pithos.web.client.rest.resource.GroupUserResource;
......
195 196
				copyLabel = "Copy Files";
196 197
			}
197 198
		if(GSS.get().getClipboard().getItem() != null)
198
			if(GSS.get().getClipboard().getItem().getFile() != null)
199
				pasteLabel = "Paste File";
200
			else if(GSS.get().getClipboard().getItem().getFiles() != null)
201
				pasteLabel = "Paste Files";
202
			else if(GSS.get().getClipboard().getItem().getRestResourceWrapper() != null)
199
			if(GSS.get().getClipboard().getItem() instanceof List) {
200
                if (((List) GSS.get().getClipboard().getItem()).size() > 1)
201
				    pasteLabel = "Paste Files";
202
                else
203
                    pasteLabel = "Paste File";
204
            }
205
			else if(GSS.get().getClipboard().getItem() instanceof Folder)
203 206
				pasteLabel = "Paste Folder";
204
		MenuItem cutItem = new MenuItem("<span>" + AbstractImagePrototype.create(images.cut()).getHTML() + "&nbsp;"+cutLabel+"</span>", true, new CutCommand(this));
207
		MenuItem cutItem = new MenuItem("<span>" + AbstractImagePrototype.create(images.cut()).getHTML() + "&nbsp;"+cutLabel+"</span>", true, new CutCommand(GSS.get(), this, null));
205 208
		cutItem.getElement().setId("topMenu.edit.cut");
206 209
		contextMenu.addItem(cutItem).setVisible(cutcopyVisible);
207 210
		
208
		MenuItem copyItem = new MenuItem("<span>" + AbstractImagePrototype.create(images.copy()).getHTML() + "&nbsp;"+copyLabel+"</span>", true, new CopyCommand(this));
211
		MenuItem copyItem = new MenuItem("<span>" + AbstractImagePrototype.create(images.copy()).getHTML() + "&nbsp;"+copyLabel+"</span>", true, new CopyCommand(GSS.get(), this, null));
209 212
		copyItem.getElement().setId("topMenu.edit.copy");
210 213
		contextMenu.addItem(copyItem).setVisible(cutcopyVisible);
211 214

  
212
		MenuItem pasteItem = new MenuItem("<span>" + AbstractImagePrototype.create(images.paste()).getHTML() + "&nbsp;"+pasteLabel+"</span>", true, new PasteCommand(this));
215
		MenuItem pasteItem = new MenuItem("<span>" + AbstractImagePrototype.create(images.paste()).getHTML() + "&nbsp;"+pasteLabel+"</span>", true, new PasteCommand(GSS.get(), this, null));
213 216
		pasteItem.getElement().setId("topMenu.edit.paste");
214 217
		if (GSS.get().getClipboard().getItem() != null)
215
			if(GSS.get().isUserListVisible() && GSS.get().getClipboard().getItem().getUser() == null){
216
				contextMenu.addItem(pasteItem);
217
			}
218
			else if(!GSS.get().isUserListVisible() && GSS.get().getClipboard().getItem().getUser() != null){
219
				//do not show paste
220
			}
221
			else if (GSS.get().getTreeView().getSelection() instanceof RestResourceWrapper){
222
				contextMenu.addItem(pasteItem);
223
			}
218
    		contextMenu.addItem(pasteItem);
224 219
		MenuItem moveToTrashItem = new MenuItem("<span>" + AbstractImagePrototype.create(images.emptyTrash()).getHTML() + "&nbsp;Move to Trash</span>", true, new ToTrashCommand(this));
225 220
		moveToTrashItem.getElement().setId("topMenu.edit.moveToTrash");
226 221
		contextMenu	.addItem(moveToTrashItem)

Also available in: Unified diff