From f7c3220623ac456c37e0bac4ccf0136343a70118 Mon Sep 17 00:00:00 2001
From: Francesco Mangiacrapa <francesco.mangiacrapa@isti.cnr.it>
Date: Wed, 12 Apr 2017 12:52:03 +0000
Subject: [PATCH] Task #8070: added file version in grid colum

git-svn-id: http://svn.d4science-ii.research-infrastructures.eu/gcube/trunk/portlets/user/workspace-tree-widget@146817 82a268e6-3cf1-43bd-a215-b396298e98cf
---
 distro/changelog.xml                          |  7 ++++++-
 pom.xml                                       |  2 +-
 .../workspace/client/model/FileGridModel.java | 20 +++++++++++++++++++
 .../workspace/server/GWTWorkspaceBuilder.java |  9 +++++++++
 4 files changed, 36 insertions(+), 2 deletions(-)

diff --git a/distro/changelog.xml b/distro/changelog.xml
index 2156eda..0a393b8 100644
--- a/distro/changelog.xml
+++ b/distro/changelog.xml
@@ -1,8 +1,13 @@
 <ReleaseNotes>
+	<Changeset component="org.gcube.portlets-user.workspace-portlet-tree.6-16-2"
+		date="2017-04-12">
+		<Change>Task #8070: file versiong shown in workspace grid column </Change>
+	</Changeset>
 	<Changeset component="org.gcube.portlets-user.workspace-portlet-tree.6-16-1"
 		date="2017-04-11">
 		<Change>Quick fix to set folder as public</Change>
-		<Change>Updated messages to history including version of file if it is present</Change>
+		<Change>Updated messages to history including version of file if it is
+			present</Change>
 	</Changeset>
 	<Changeset component="org.gcube.portlets-user.workspace-portlet-tree.6-16-0"
 		date="2017-03-03">
diff --git a/pom.xml b/pom.xml
index a0304b5..7d4fc28 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
 
 	<groupId>org.gcube.portlets.user</groupId>
 	<artifactId>workspace-tree-widget</artifactId>
-	<version>6.16.1-SNAPSHOT</version>
+	<version>6.16.2-SNAPSHOT</version>
 	<name>gCube Workspace Tree Widget</name>
 	<description>
 		gCube Workspace Tree Widget is a widget to navigate and interact with gCube Workspace 
diff --git a/src/main/java/org/gcube/portlets/user/workspace/client/model/FileGridModel.java b/src/main/java/org/gcube/portlets/user/workspace/client/model/FileGridModel.java
index 8b78e19..3101e46 100644
--- a/src/main/java/org/gcube/portlets/user/workspace/client/model/FileGridModel.java
+++ b/src/main/java/org/gcube/portlets/user/workspace/client/model/FileGridModel.java
@@ -21,6 +21,7 @@ public class FileGridModel extends FileModel {
 	public static final String SIZE = "Size";
 	public static final String GRIDCOLUMNCREATIONDATE = "Creation Date";
 	public static final String EMPTY = "EMPTY";
+	public static final String VERSION = "Version";
 
 	/**
 	 * Instantiates a new file grid model.
@@ -123,6 +124,25 @@ public class FileGridModel extends FileModel {
 
 	}
 
+
+	/**
+	 * Sets the version name.
+	 *
+	 * @param version the new version name
+	 */
+	public void setVersionName(String version){
+		set(FileGridModel.VERSION, version);
+	}
+
+	/**
+	 * Gets the version name.
+	 *
+	 * @return the version name
+	 */
+	public String getVersionName(){
+		 return (String) get(FileGridModel.VERSION);
+	}
+
 	/*
 	 * (non-Javadoc)
 	 *
diff --git a/src/main/java/org/gcube/portlets/user/workspace/server/GWTWorkspaceBuilder.java b/src/main/java/org/gcube/portlets/user/workspace/server/GWTWorkspaceBuilder.java
index 1f60979..edd618e 100644
--- a/src/main/java/org/gcube/portlets/user/workspace/server/GWTWorkspaceBuilder.java
+++ b/src/main/java/org/gcube/portlets/user/workspace/server/GWTWorkspaceBuilder.java
@@ -883,6 +883,15 @@ public class GWTWorkspaceBuilder {
 				FolderItem folderItem = (FolderItem) item;
 				fileGridModel = new FileGridModel(item.getId(), item.getName(), toDate(item.getLastModificationTime()), parentFileModel, folderItem.getLength(), false, false);
 				fileGridModel = (FileGridModel) setFolderItemType(fileGridModel, folderItem);
+
+				//ADDING VERSION NAME
+//				if (folderItem instanceof ExternalFile){
+//
+//					ExternalFile extFile = (ExternalFile) folderItem;
+//					WorkspaceVersion version = extFile.getCurrentVersion();
+//					fileGridModel.setVersionName(version!=null?version.getName():null);
+//				}
+
 				break;
 
 			case SHARED_FOLDER: