diff --git a/src/main/java/org/gcube/portlets/user/workspace/client/AppControllerExplorer.java b/src/main/java/org/gcube/portlets/user/workspace/client/AppControllerExplorer.java index 09f8927..669773b 100644 --- a/src/main/java/org/gcube/portlets/user/workspace/client/AppControllerExplorer.java +++ b/src/main/java/org/gcube/portlets/user/workspace/client/AppControllerExplorer.java @@ -27,8 +27,6 @@ import org.gcube.portlets.user.workspace.client.event.CreateSharedFolderEvent; import org.gcube.portlets.user.workspace.client.event.CreateSharedFolderEventHandler; import org.gcube.portlets.user.workspace.client.event.CreateUrlEvent; import org.gcube.portlets.user.workspace.client.event.CreateUrlEventHandler; -import org.gcube.portlets.user.workspace.client.event.DeleteBulkEvent; -import org.gcube.portlets.user.workspace.client.event.DeleteBulkEventHandler; import org.gcube.portlets.user.workspace.client.event.DeleteItemEvent; import org.gcube.portlets.user.workspace.client.event.DeleteItemEventHandler; import org.gcube.portlets.user.workspace.client.event.DeleteMessageEvent; @@ -1102,24 +1100,23 @@ public class AppControllerExplorer implements EventHandler, TreeAppControllerInt @Override public void onUploadCompleted(String parentId, String itemId) { GWT.log("Upload completed: [parentID: "+parentId+", itemId: "+itemId+", uploadType: "+fileUploadEvent.getUploadType()+"]"); - eventBus.fireEvent(new CompletedFileUploadEvent(parentId, itemId, fileUploadEvent.getUploadType())); + eventBus.fireEvent(new CompletedFileUploadEvent(parentId, itemId, fileUploadEvent.getUploadType(), false)); } @Override public void onUploadAborted(String parentId, String itemId) { GWT.log("Upload Aborted: [parentID: "+parentId+", itemId: "+itemId+"]"); - } @Override public void onError(String parentId, String itemId, Throwable throwable) { - GWT.log("Upload Aborted: [parentID: "+parentId+", itemId: "+itemId+"]"); - + GWT.log("Upload Error: [parentID: "+parentId+", itemId: "+itemId+"]"); } @Override public void onOverwriteCompleted(String parentId, String itemId) { GWT.log("Upload Override Completed: [parentID: "+parentId+", itemId: "+itemId+"]"); + eventBus.fireEvent(new CompletedFileUploadEvent(parentId, itemId, fileUploadEvent.getUploadType(), true)); } }; @@ -1919,13 +1916,13 @@ public class AppControllerExplorer implements EventHandler, TreeAppControllerInt CompletedFileUploadEvent fileUpEvent = (CompletedFileUploadEvent) event; - sub.addedFile(fileUpEvent.getItemIdentifier(), fileUpEvent.getParentId(), fileUpEvent.getUploadType()); + sub.addedFile(fileUpEvent.getItemIdentifier(), fileUpEvent.getParentId(), fileUpEvent.getUploadType(), fileUpEvent.isOverwrite()); }else if(event instanceof CreateUrlEvent){ CreateUrlEvent createUrlEvent = (CreateUrlEvent) event; - sub.addedFile(createUrlEvent.getItemIdentifier(), createUrlEvent.getParentFileModel().getIdentifier(), WS_UPLOAD_TYPE.File); + sub.addedFile(createUrlEvent.getItemIdentifier(), createUrlEvent.getParentFileModel().getIdentifier(), WS_UPLOAD_TYPE.File, false); }else if(event instanceof MoveItemEvent){ diff --git a/src/main/java/org/gcube/portlets/user/workspace/client/event/CompletedFileUploadEvent.java b/src/main/java/org/gcube/portlets/user/workspace/client/event/CompletedFileUploadEvent.java index e041214..60b1ac0 100644 --- a/src/main/java/org/gcube/portlets/user/workspace/client/event/CompletedFileUploadEvent.java +++ b/src/main/java/org/gcube/portlets/user/workspace/client/event/CompletedFileUploadEvent.java @@ -6,34 +6,44 @@ import org.gcube.portlets.user.workspace.client.interfaces.GuiEventInterface; import com.google.gwt.event.shared.GwtEvent; - /** * The Class CompletedFileUploadEvent. * - * @author Francesco Mangiacrapa francesco.mangiacrapa@isti.cnr.it - * Oct 6, 2015 + * @author Francesco Mangiacrapa francesco.mangiacrapa@isti.cnr.it Oct 6, 2015 */ -public class CompletedFileUploadEvent extends GwtEvent implements GuiEventInterface{ +public class CompletedFileUploadEvent extends + GwtEvent implements GuiEventInterface { public static Type TYPE = new Type(); - + private String itemIdentifier; private String parentId; + + /** The upload type. */ private WS_UPLOAD_TYPE uploadType; + private boolean isOverwrite; /** * Instantiates a new completed file upload event. * - * @param parentId the parent id - * @param itemIdentifier the item identifier - * @param uploadType the upload type + * @param parentId + * the parent id + * @param itemIdentifier + * the item identifier + * @param uploadType + * the upload type + * @param isOverwrite */ - public CompletedFileUploadEvent(String parentId, String itemIdentifier, WS_UPLOAD_TYPE uploadType) { + public CompletedFileUploadEvent(String parentId, String itemIdentifier, + WS_UPLOAD_TYPE uploadType, boolean isOverwrite) { this.parentId = parentId; this.itemIdentifier = itemIdentifier; this.uploadType = uploadType; + this.isOverwrite = isOverwrite; } - /* (non-Javadoc) + /* + * (non-Javadoc) + * * @see com.google.gwt.event.shared.GwtEvent#getAssociatedType() */ @Override @@ -41,16 +51,24 @@ public class CompletedFileUploadEvent extends GwtEvent