X-Git-Url: https://code.grnet.gr/git/pithos/blobdiff_plain/e0ba0b0e944b02e08eaff6c148ce4a46c5aa6cb1..05e3858ed0abb6b09b26bd3b24c0e4a6ccf92029:/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 7b97936..24f6209 100644
--- a/src/gr/ebs/gss/client/FileUploadGearsDialog.java
+++ b/src/gr/ebs/gss/client/FileUploadGearsDialog.java
@@ -100,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...");
@@ -140,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);
@@ -186,7 +187,7 @@ public class FileUploadGearsDialog extends FileUploadDialog implements Updateabl
 	private void cancelUpload() {
 		for (HttpRequest request: requests)
 			request.abort();
-		hide();
+		hide();		
 	}
 
 	/**
@@ -376,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:
@@ -422,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();