Revision 31840568
| b/src/gr/ebs/gss/client/EditMenu.java | ||
|---|---|---|
| 185 | 185 |
pasteLabel = "Paste File"; |
| 186 | 186 |
else if(GSS.get().getClipboard().getItem().getFiles() != null) |
| 187 | 187 |
pasteLabel = "Paste Files"; |
| 188 |
else if(GSS.get().getClipboard().getItem().getFolderResource() != null)
|
|
| 188 |
else if(GSS.get().getClipboard().getItem().getRestResourceWrapper() != null)
|
|
| 189 | 189 |
pasteLabel = "Paste Folder"; |
| 190 | 190 |
contextMenu.addItem("<span>" + AbstractImagePrototype.create(images.cut()).getHTML() + " "+cutLabel+"</span>", true, new CutCommand(this)).setVisible(cutcopyVisible);
|
| 191 | 191 |
contextMenu.addItem("<span>" + AbstractImagePrototype.create(images.copy()).getHTML() + " "+copyLabel+"</span>", true, new CopyCommand(this)).setVisible(cutcopyVisible);
|
| b/src/gr/ebs/gss/client/clipboard/ClipboardItem.java | ||
|---|---|---|
| 19 | 19 |
package gr.ebs.gss.client.clipboard; |
| 20 | 20 |
|
| 21 | 21 |
import gr.ebs.gss.client.rest.resource.FileResource; |
| 22 |
import gr.ebs.gss.client.rest.resource.FolderResource;
|
|
| 22 |
import gr.ebs.gss.client.rest.resource.RestResourceWrapper;
|
|
| 23 | 23 |
import gr.ebs.gss.client.rest.resource.GroupUserResource; |
| 24 | 24 |
|
| 25 | 25 |
import java.io.Serializable; |
| ... | ... | |
| 34 | 34 |
private int operation; |
| 35 | 35 |
private FileResource file; |
| 36 | 36 |
private List<FileResource> files; |
| 37 |
private FolderResource folderResource;
|
|
| 37 |
private RestResourceWrapper folderResource;
|
|
| 38 | 38 |
private GroupUserResource user; |
| 39 | 39 |
|
| 40 | 40 |
public ClipboardItem(){}
|
| ... | ... | |
| 49 | 49 |
file = aFile; |
| 50 | 50 |
} |
| 51 | 51 |
|
| 52 |
public ClipboardItem(int anOperation, FolderResource folder){
|
|
| 52 |
public ClipboardItem(int anOperation, RestResourceWrapper folder){
|
|
| 53 | 53 |
operation = anOperation; |
| 54 | 54 |
folderResource = folder; |
| 55 | 55 |
} |
| ... | ... | |
| 73 | 73 |
file = aFile; |
| 74 | 74 |
} |
| 75 | 75 |
|
| 76 |
public ClipboardItem(FolderResource folder){
|
|
| 76 |
public ClipboardItem(RestResourceWrapper folder){
|
|
| 77 | 77 |
operation = Clipboard.COPY; |
| 78 | 78 |
folderResource = folder; |
| 79 | 79 |
} |
| ... | ... | |
| 170 | 170 |
* |
| 171 | 171 |
* @return the folderResource |
| 172 | 172 |
*/ |
| 173 |
public FolderResource getFolderResource() {
|
|
| 173 |
public RestResourceWrapper getRestResourceWrapper() {
|
|
| 174 | 174 |
return folderResource; |
| 175 | 175 |
} |
| 176 | 176 |
|
| ... | ... | |
| 179 | 179 |
* |
| 180 | 180 |
* @param aFolder the folderResource to set |
| 181 | 181 |
*/ |
| 182 |
public void setFolderResource(FolderResource aFolder) {
|
|
| 182 |
public void setRestResourceWrapper(RestResourceWrapper aFolder) {
|
|
| 183 | 183 |
folderResource = aFolder; |
| 184 | 184 |
} |
| 185 | 185 |
} |
| b/src/gr/ebs/gss/client/commands/CopyCommand.java | ||
|---|---|---|
| 23 | 23 |
import gr.ebs.gss.client.rest.resource.FileResource; |
| 24 | 24 |
import gr.ebs.gss.client.rest.resource.FolderResource; |
| 25 | 25 |
import gr.ebs.gss.client.rest.resource.GroupUserResource; |
| 26 |
import gr.ebs.gss.client.rest.resource.RestResourceWrapper; |
|
| 26 | 27 |
|
| 27 | 28 |
import java.util.List; |
| 28 | 29 |
|
| ... | ... | |
| 48 | 49 |
if (selection == null) |
| 49 | 50 |
return; |
| 50 | 51 |
|
| 51 |
if (selection instanceof FolderResource) {
|
|
| 52 |
ClipboardItem clipboardItem = new ClipboardItem((FolderResource) selection);
|
|
| 52 |
if (selection instanceof RestResourceWrapper) {
|
|
| 53 |
ClipboardItem clipboardItem = new ClipboardItem((RestResourceWrapper) selection);
|
|
| 53 | 54 |
GSS.get().getClipboard().setItem(clipboardItem); |
| 54 | 55 |
} else if (selection instanceof FileResource) {
|
| 55 | 56 |
ClipboardItem clipboardItem = new ClipboardItem((FileResource) selection); |
| b/src/gr/ebs/gss/client/commands/CutCommand.java | ||
|---|---|---|
| 24 | 24 |
import gr.ebs.gss.client.rest.resource.FileResource; |
| 25 | 25 |
import gr.ebs.gss.client.rest.resource.FolderResource; |
| 26 | 26 |
import gr.ebs.gss.client.rest.resource.GroupUserResource; |
| 27 |
import gr.ebs.gss.client.rest.resource.RestResourceWrapper; |
|
| 27 | 28 |
|
| 28 | 29 |
import java.util.List; |
| 29 | 30 |
|
| ... | ... | |
| 51 | 52 |
if (selection == null) |
| 52 | 53 |
return; |
| 53 | 54 |
GWT.log("selection: " + selection.toString(), null);
|
| 54 |
if (selection instanceof FolderResource) {
|
|
| 55 |
ClipboardItem clipboardItem = new ClipboardItem(Clipboard.CUT, (FolderResource) selection);
|
|
| 55 |
if (selection instanceof RestResourceWrapper) {
|
|
| 56 |
ClipboardItem clipboardItem = new ClipboardItem(Clipboard.CUT, (RestResourceWrapper) selection);
|
|
| 56 | 57 |
GSS.get().getClipboard().setItem(clipboardItem); |
| 57 | 58 |
} else if (selection instanceof FileResource) {
|
| 58 | 59 |
ClipboardItem clipboardItem = new ClipboardItem(Clipboard.CUT, (FileResource) selection); |
| b/src/gr/ebs/gss/client/commands/PasteCommand.java | ||
|---|---|---|
| 26 | 26 |
import gr.ebs.gss.client.rest.resource.FileResource; |
| 27 | 27 |
import gr.ebs.gss.client.rest.resource.FolderResource; |
| 28 | 28 |
import gr.ebs.gss.client.rest.resource.GroupResource; |
| 29 |
import gr.ebs.gss.client.rest.resource.RestResourceWrapper; |
|
| 29 | 30 |
|
| 30 | 31 |
import java.util.ArrayList; |
| 31 | 32 |
import java.util.List; |
| ... | ... | |
| 90 | 91 |
} |
| 91 | 92 |
} |
| 92 | 93 |
FolderResource selectedFolder = null; |
| 93 |
if(selection != null && selection instanceof FolderResource)
|
|
| 94 |
selectedFolder = (FolderResource)selection;
|
|
| 94 |
if(selection != null && selection instanceof RestResourceWrapper)
|
|
| 95 |
selectedFolder = ((RestResourceWrapper)selection).getResource();
|
|
| 95 | 96 |
//TODO:CELLTREE |
| 96 | 97 |
/* |
| 97 | 98 |
else if(GSS.get().getFolders().getCurrent() != null && ((DnDTreeItem)GSS.get().getFolders().getCurrent()).getFolderResource() != null) |
| ... | ... | |
| 99 | 100 |
*/ |
| 100 | 101 |
if (selectedFolder != null) {
|
| 101 | 102 |
final ClipboardItem citem = GSS.get().getClipboard().getItem(); |
| 102 |
if (citem != null && citem.getFolderResource() != null) {
|
|
| 103 |
if (citem != null && citem.getRestResourceWrapper() != null) {
|
|
| 103 | 104 |
String target = selectedFolder.getUri(); |
| 104 | 105 |
target = target.endsWith("/") ? target : target + '/';
|
| 105 |
target = target + URL.encodeComponent(citem.getFolderResource().getName());
|
|
| 106 |
target = target + URL.encodeComponent(citem.getRestResourceWrapper().getResource().getName());
|
|
| 106 | 107 |
if (citem.getOperation() == Clipboard.COPY) {
|
| 107 |
PostCommand cf = new PostCommand(citem.getFolderResource().getUri() + "?copy=" + target, "", 200) {
|
|
| 108 |
PostCommand cf = new PostCommand(citem.getRestResourceWrapper().getUri() + "?copy=" + target, "", 200) {
|
|
| 108 | 109 |
|
| 109 | 110 |
@Override |
| 110 | 111 |
public void onComplete() {
|
| 111 | 112 |
//TODO:CELLTREE |
| 112 | 113 |
//GSS.get().getFolders().updateFolder((DnDTreeItem) GSS.get().getFolders().getCurrent()); |
| 114 |
GSS.get().getTreeView().updateNodeChildren(GSS.get().getTreeView().getSelection()); |
|
| 113 | 115 |
GSS.get().getStatusPanel().updateStats(); |
| 114 | 116 |
GSS.get().getClipboard().setItem(null); |
| 115 | 117 |
} |
| ... | ... | |
| 135 | 137 |
}; |
| 136 | 138 |
DeferredCommand.addCommand(cf); |
| 137 | 139 |
} else if (citem.getOperation() == Clipboard.CUT) {
|
| 138 |
PostCommand cf = new PostCommand(citem.getFolderResource().getUri() + "?move=" + target, "", 200) {
|
|
| 140 |
PostCommand cf = new PostCommand(citem.getRestResourceWrapper().getUri() + "?move=" + target, "", 200) {
|
|
| 139 | 141 |
|
| 140 | 142 |
@Override |
| 141 | 143 |
public void onComplete() {
|
| ... | ... | |
| 147 | 149 |
GSS.get().getFolders().updateFolder((DnDTreeItem) item.getParentItem()); |
| 148 | 150 |
GSS.get().getFolders().updateFolder((DnDTreeItem) GSS.get().getFolders().getCurrent()); |
| 149 | 151 |
*/ |
| 152 |
GSS.get().getTreeView().updateNodeChildren(GSS.get().getTreeView().getSelection()); |
|
| 153 |
GSS.get().getTreeView().updateNodeChildren(citem.getRestResourceWrapper().getResource().getParentURI()); |
|
| 150 | 154 |
GSS.get().getStatusPanel().updateStats(); |
| 151 | 155 |
GSS.get().getClipboard().setItem(null); |
| 152 | 156 |
} |
Also available in: Unified diff