show popup for FolderResource

[pithos] / src / gr / ebs / gss / client / FileUploadGearsDialog.java

diff --git a/src/gr/ebs/gss/client/FileUploadGearsDialog.java b/src/gr/ebs/gss/client/FileUploadGearsDialog.java
index 3322010..24f6209 100644 (file)
--- a/src/gr/ebs/gss/client/FileUploadGearsDialog.java
+++ b/src/gr/ebs/gss/client/FileUploadGearsDialog.java
@@ -44,7 +44,6 @@ import com.google.gwt.gears.client.httprequest.RequestCallback;
 import com.google.gwt.http.client.URL;
 import com.google.gwt.json.client.JSONObject;
 import com.google.gwt.json.client.JSONString;
-import com.google.gwt.user.client.Command;
 import com.google.gwt.user.client.DeferredCommand;
 import com.google.gwt.user.client.ui.Button;
 import com.google.gwt.user.client.ui.FlexTable;
@@ -101,7 +100,7 @@ public class FileUploadGearsDialog extends FileUploadDialog implements Updateabl
                info.addStyleName("gss-uploadNote");
                panel.add(info);
                // Add an informative label with the folder name.
-               Object selection = GSS.get().getFolders().getCurrent().getUserObject();
+               Object selection = GSS.get().getTreeView().getSelection();
                folder = (FolderResource) selection;
 
                browse = new Button("Browse...");
@@ -141,7 +140,8 @@ public class FileUploadGearsDialog extends FileUploadDialog implements Updateabl
                        @Override
                        public void onClick(ClickEvent event) {
                                canContinue = false;                            
-                               cancelUpload();
+                               cancelUpload();                         
+                               GSS.get().showFileList(true);
                        }
                });
                buttons.add(cancel);
@@ -187,7 +187,7 @@ public class FileUploadGearsDialog extends FileUploadDialog implements Updateabl
        private void cancelUpload() {
                for (HttpRequest request: requests)
                        request.abort();
-               hide();
+               hide();         
        }
 
        /**
@@ -377,12 +377,10 @@ public class FileUploadGearsDialog extends FileUploadDialog implements Updateabl
                                        case 201: // Created falls through to updated.
                                        case 204:
                                                filesRemaining.remove(0);
-                                               if(filesRemaining.isEmpty()){
-                                                       selectedFiles = filesRemaining;
+                                               if(filesRemaining.isEmpty()){                                                   
                                                        finish();
                                                        break;
-                                               }
-                                               selectedFiles = filesRemaining;
+                                               }                                               
                                                doSend(filesRemaining);                         
                                                break;
                                        case 403:
@@ -423,7 +421,6 @@ public class FileUploadGearsDialog extends FileUploadDialog implements Updateabl
         * Perform the final actions after the files are uploaded.
         */
        protected void finish() {
-               if (!selectedFiles.isEmpty()) return;
                hide();
                GSS.get().showFileList(true);
                GSS.get().getStatusPanel().updateStats();