From dd7461e405a5369a7bae917c2eb04bd45a56910a Mon Sep 17 00:00:00 2001
From: "massimiliano.assante" <massimiliano.assante@isti.cnr.it>
Date: Tue, 1 Dec 2015 16:05:28 +0000
Subject: [PATCH] git-svn-id:
 http://svn.research-infrastructures.eu/public/d4science/gcube/trunk/portlets/user/my-vres@120535
 82a268e6-3cf1-43bd-a215-b396298e98cf

---
 .classpath                                                | 4 ++--
 distro/changelog.xml                                      | 7 ++++++-
 pom.xml                                                   | 2 +-
 .../gcube/portlet/user/my_vres/client/NoVresPanel.ui.xml  | 8 ++++----
 .../org/gcube/portlet/user/my_vres/client/VresPanel.java  | 8 +++++++-
 5 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/.classpath b/.classpath
index da8ee55..94e3ad8 100644
--- a/.classpath
+++ b/.classpath
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="src" output="target/my-vres-1.5.0-SNAPSHOT/WEB-INF/classes" path="src/main/java">
+	<classpathentry kind="src" output="target/my-vres-1.6.0-SNAPSHOT/WEB-INF/classes" path="src/main/java">
 		<attributes>
 			<attribute name="optional" value="true"/>
 			<attribute name="maven.pomderived" value="true"/>
@@ -34,5 +34,5 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="output" path="target/my-vres-1.5.0-SNAPSHOT/WEB-INF/classes"/>
+	<classpathentry kind="output" path="target/my-vres-1.6.0-SNAPSHOT/WEB-INF/classes"/>
 </classpath>
diff --git a/distro/changelog.xml b/distro/changelog.xml
index 1d92991..50a8259 100644
--- a/distro/changelog.xml
+++ b/distro/changelog.xml
@@ -1,7 +1,12 @@
 <ReleaseNotes>
+<Changeset component="org.gcube.portlet.user.my-vres.1-6-0"
+		date="2015-11-22">
+		<Change>Bug #1855, does not show join welcome message to new users anymore</Change>
+		<Change>Feature #861, categorized VREs by virtualGroups</Change>
+	</Changeset>
 	<Changeset component="org.gcube.portlet.user.my-vres.1-5-0"
 		date="2015-10-22">
-		<Change>Feature #861, categorized VREs by virtualGroups</Change>
+		
 	</Changeset>
 	<Changeset component="org.gcube.portlet.user.my-vres.1-4-0"
 		date="2014-10-27">
diff --git a/pom.xml b/pom.xml
index 3d1c1dd..2a5e3b4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -13,7 +13,7 @@
 	<groupId>org.gcube.portlets.user</groupId>
 	<artifactId>my-vres</artifactId>
 	<packaging>war</packaging>
-	<version>1.5.0-SNAPSHOT</version>
+	<version>1.6.0-SNAPSHOT</version>
 	<name>My VREs Portlet</name>
 	<description>
 		gCube My VREs Portlet shows only the VO and VREs a user is member of, divided by category.
diff --git a/src/main/java/org/gcube/portlet/user/my_vres/client/NoVresPanel.ui.xml b/src/main/java/org/gcube/portlet/user/my_vres/client/NoVresPanel.ui.xml
index e2ab2f9..c22d784 100644
--- a/src/main/java/org/gcube/portlet/user/my_vres/client/NoVresPanel.ui.xml
+++ b/src/main/java/org/gcube/portlet/user/my_vres/client/NoVresPanel.ui.xml
@@ -3,10 +3,10 @@
 	xmlns:g="urn:import:com.google.gwt.user.client.ui">
 	<g:HTMLPanel>
 		<div class="NoVresStyle">
-			You are not subscribed to anything, 
-			begin by	
-			<a class="vrelink" href="/group/data-e-infrastructure-gateway/join-new/"><span class="important">joining</span></a> something.	<br /><br />
-			<a class="vrelink" href="/group/data-e-infrastructure-gateway/join-new/"><span class="important">Find out</span></a> the what is available in the infrastructure.
+			You are not subscribed to any environment, 
+			please begin by	
+			<a class="vrelink" href="/group/data-e-infrastructure-gateway/explore-research-environments/"><span class="important">joining</span></a> something.	<br /><br />
+			<a class="vrelink" href="/group/data-e-infrastructure-gateway/explore-research-environments/"><span class="important">Explore</span></a> the research environments available in the infrastructure.
 		</div>
 	</g:HTMLPanel>
 </ui:UiBinder> 
\ No newline at end of file
diff --git a/src/main/java/org/gcube/portlet/user/my_vres/client/VresPanel.java b/src/main/java/org/gcube/portlet/user/my_vres/client/VresPanel.java
index 56bf3fb..441e9c0 100644
--- a/src/main/java/org/gcube/portlet/user/my_vres/client/VresPanel.java
+++ b/src/main/java/org/gcube/portlet/user/my_vres/client/VresPanel.java
@@ -90,13 +90,19 @@ public class VresPanel extends Composite {
 			}
 		}
 
-		if (cachedVREs.isEmpty()) {
+		if (! hasAtLeastOneVRE(cachedVREs)) {
 			mainPanel.add(new NoVresPanel());
 			imagesPanel.clear();
 		}
 
 	}
 
+	private boolean hasAtLeastOneVRE(LinkedHashMap<String, ArrayList<VRE>> cachedVREs) {
+		for (String cat : cachedVREs.keySet()) 
+			if (! cachedVREs.get(cat).isEmpty()) 
+				return true;
+		return false;
+	}