Automated merge with https://gss.googlecode.com/hg/

[pithos] / src / gr / ebs / gss / client / commands / UploadFileCommand.java

diff --git a/src/gr/ebs/gss/client/commands/UploadFileCommand.java b/src/gr/ebs/gss/client/commands/UploadFileCommand.java
index 2684b25..e50f516 100644 (file)
--- a/src/gr/ebs/gss/client/commands/UploadFileCommand.java
+++ b/src/gr/ebs/gss/client/commands/UploadFileCommand.java
@@ -23,6 +23,8 @@ import gr.ebs.gss.client.GSS;
 import gr.ebs.gss.client.rest.GetCommand;
 import gr.ebs.gss.client.rest.resource.FileResource;
 import gr.ebs.gss.client.rest.resource.FolderResource;
+import gr.ebs.gss.client.rest.resource.RestResource;
+import gr.ebs.gss.client.rest.resource.RestResourceWrapper;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -48,6 +50,7 @@ public class UploadFileCommand implements Command {
                containerPanel = _containerPanel;
        }
 
+       @Override
        public void execute() {
                containerPanel.hide();
                displayNewFile();
@@ -57,7 +60,7 @@ public class UploadFileCommand implements Command {
         * Display the 'new file' dialog for uploading a new file to the system.
         */
        private void displayNewFile() {
-               TreeItem currentFolder = GSS.get().getFolders().getCurrent();
+               RestResource currentFolder = GSS.get().getTreeView().getSelection();
                if (currentFolder == null) {
                        GSS.get().displayError("You have to select the parent folder first");
                        return;
@@ -65,6 +68,7 @@ public class UploadFileCommand implements Command {
                getFileList();
                DeferredCommand.addCommand(new IncrementalCommand() {
 
+                       @Override
                        public boolean execute() {
                                boolean res = canContinue();
                                if (res) {
@@ -86,7 +90,7 @@ public class UploadFileCommand implements Command {
        }
 
        private void getFileList() {
-               GetCommand<FolderResource> eg = new GetCommand<FolderResource>(FolderResource.class,((FolderResource)GSS.get().getFolders().getCurrent().getUserObject()).getUri(), null){
+               GetCommand<FolderResource> eg = new GetCommand<FolderResource>(FolderResource.class,((RestResourceWrapper)GSS.get().getTreeView().getSelection()).getUri(), null){
 
                        @Override
                        public void onComplete() {