From 9fef419bc4384bf0cf21b7b021915ac06189e847 Mon Sep 17 00:00:00 2001
From: Francesco Mangiacrapa <francesco.mangiacrapa@isti.cnr.it>
Date: Tue, 6 Oct 2015 10:41:31 +0000
Subject: [PATCH] fixed integration with workspace uploader

git-svn-id: http://svn.d4science-ii.research-infrastructures.eu/gcube/trunk/portlets/user/workspace-tree-widget@119434 82a268e6-3cf1-43bd-a215-b396298e98cf
---
 .../client/AppControllerExplorer.java         |  6 ++----
 .../event/CompletedFileUploadEvent.java       | 19 -------------------
 .../interfaces/SubscriberInterface.java       |  4 ++--
 3 files changed, 4 insertions(+), 25 deletions(-)

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 0bcb61b..f7d3d69 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
@@ -1255,8 +1255,6 @@ public class AppControllerExplorer implements EventHandler, TreeAppControllerInt
 					explorerPanel.getAsycTreePanel().reloadTreeLevelAndExpandFolder(completedFileUploadEvent.getParentId(), isLevelExpanded);
 //					explorerPanel.getAsycTreePanel().addItemIdAndExpandFolder(parent, completedFileUploadEvent.getItemIdentifier(), isLevelExpanded);
 				}
-				
-				completedFileUploadEvent.setParentModel(parent); //SET PARENT
 				doUpdateWorkspaceSize(new UpdateWorkspaceSizeEvent());
 				notifySubscriber(completedFileUploadEvent);
 			}
@@ -1962,13 +1960,13 @@ public class AppControllerExplorer implements EventHandler, TreeAppControllerInt
 
 					CompletedFileUploadEvent fileUpEvent = (CompletedFileUploadEvent) event;
 
-					sub.addedFile(fileUpEvent.getItemIdentifier(), fileUpEvent.getParentModel(), fileUpEvent.getUploadType());
+					sub.addedFile(fileUpEvent.getItemIdentifier(), fileUpEvent.getParentId(), fileUpEvent.getUploadType());
 
 				}else if(event instanceof CreateUrlEvent){
 
 					CreateUrlEvent createUrlEvent = (CreateUrlEvent) event;
 
-					sub.addedFile(createUrlEvent.getItemIdentifier(), createUrlEvent.getParentFileModel(), WS_UPLOAD_TYPE.File);
+					sub.addedFile(createUrlEvent.getItemIdentifier(), createUrlEvent.getParentFileModel().getIdentifier(), WS_UPLOAD_TYPE.File);
 
 				}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 a75921f..8a753ce 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
@@ -20,7 +20,6 @@ public class CompletedFileUploadEvent extends GwtEvent<CompletedFileUploadEventH
 	private String itemIdentifier;
 	private String parentId;
 	private WS_UPLOAD_TYPE uploadType;
-	private FileModel parentModel;
 
 	/**
 	 * Instantiates a new completed file upload event.
@@ -95,24 +94,6 @@ public class CompletedFileUploadEvent extends GwtEvent<CompletedFileUploadEventH
 		this.parentId = parentId;
 	}
 	
-	/**
-	 * Sets the parent model.
-	 *
-	 * @param parent the new parent model
-	 */
-	public void setParentModel(FileModel parent){
-		this.parentModel = parent;
-	}
-
-	/**
-	 * Gets the parent model.
-	 *
-	 * @return the parentModel
-	 */
-	public FileModel getParentModel() {
-		return parentModel;
-	}
-
 	/**
 	 * @return the uploadType
 	 */
diff --git a/src/main/java/org/gcube/portlets/user/workspace/client/interfaces/SubscriberInterface.java b/src/main/java/org/gcube/portlets/user/workspace/client/interfaces/SubscriberInterface.java
index fd77046..652d844 100644
--- a/src/main/java/org/gcube/portlets/user/workspace/client/interfaces/SubscriberInterface.java
+++ b/src/main/java/org/gcube/portlets/user/workspace/client/interfaces/SubscriberInterface.java
@@ -25,10 +25,10 @@ public interface SubscriberInterface {
 	 * Added file.
 	 *
 	 * @param itemIdentifier the item identifier
-	 * @param parent the parent
+	 * @param parentId the parent
 	 * @param file the file
 	 */
-	void addedFile(String itemIdentifier, FileModel parent, WS_UPLOAD_TYPE file);
+	void addedFile(String itemIdentifier, String parentId, WS_UPLOAD_TYPE file);
 
 	/**
 	 * Selected item.