diff --git a/.classpath b/.classpath
index 061d6eb..4f3ed90 100644
--- a/.classpath
+++ b/.classpath
@@ -1,12 +1,12 @@
-
+
-
+
@@ -39,5 +39,5 @@
-
+
diff --git a/.settings/org.eclipse.wst.common.component b/.settings/org.eclipse.wst.common.component
index 5f32ca8..8ad38d6 100644
--- a/.settings/org.eclipse.wst.common.component
+++ b/.settings/org.eclipse.wst.common.component
@@ -4,7 +4,7 @@
-
+
uses
diff --git a/distro/changelog.xml b/distro/changelog.xml
index a78d5e5..0ae3d26 100644
--- a/distro/changelog.xml
+++ b/distro/changelog.xml
@@ -1,4 +1,7 @@
+
+ Feature #11434, Explore VREs use preloaders while loading VREs list
+
Added support for optional layout via TabPages and browsing VREs by Organisations and Category
diff --git a/pom.xml b/pom.xml
index 5c405ea..5f96a9f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -13,7 +13,7 @@
org.gcube.portlets.user
join-vre
war
- 3.5.0-SNAPSHOT
+ 3.6.0-SNAPSHOT
gCube Join VRE Portlet
Display the available VRE to Join
@@ -23,7 +23,7 @@
- 2.8.1
+ 2.8.2
distro
1.8
1.8
diff --git a/src/main/java/org/gcube/portlets/user/joinvre/client/JoinVRE.java b/src/main/java/org/gcube/portlets/user/joinvre/client/JoinVRE.java
index 9546f49..aa3e00d 100644
--- a/src/main/java/org/gcube/portlets/user/joinvre/client/JoinVRE.java
+++ b/src/main/java/org/gcube/portlets/user/joinvre/client/JoinVRE.java
@@ -13,7 +13,6 @@ import org.gcube.portlets.user.joinvre.shared.VRE;
import org.gcube.portlets.user.joinvre.shared.VRECategory;
import com.github.gwtbootstrap.client.ui.DropdownTab;
-import com.github.gwtbootstrap.client.ui.Paragraph;
import com.github.gwtbootstrap.client.ui.Tab;
import com.github.gwtbootstrap.client.ui.TabPanel;
import com.github.gwtbootstrap.client.ui.resources.Bootstrap.Tabs;
diff --git a/src/main/java/org/gcube/portlets/user/joinvre/client/responsive/ResponsivePanel.java b/src/main/java/org/gcube/portlets/user/joinvre/client/responsive/ResponsivePanel.java
index 257d3fd..2ade45d 100644
--- a/src/main/java/org/gcube/portlets/user/joinvre/client/responsive/ResponsivePanel.java
+++ b/src/main/java/org/gcube/portlets/user/joinvre/client/responsive/ResponsivePanel.java
@@ -7,6 +7,7 @@ import org.gcube.portlets.user.joinvre.client.JoinService;
import org.gcube.portlets.user.joinvre.client.JoinServiceAsync;
import org.gcube.portlets.user.joinvre.client.ui.AccessVREDialog;
import org.gcube.portlets.user.joinvre.client.ui.AccessViaInviteDialog;
+import org.gcube.portlets.user.joinvre.client.ui.LoadingPanel;
import org.gcube.portlets.user.joinvre.client.ui.RequestMembershipDialog;
import org.gcube.portlets.user.joinvre.client.ui.VreThumbnail;
import org.gcube.portlets.user.joinvre.shared.VRE;
@@ -32,7 +33,9 @@ public class ResponsivePanel extends Composite {
* default constructor (No tabs)
*/
public ResponsivePanel() {
- GWT.log("ResponsivePanel()");
+ GWT.log("loading ResponsivePanel()");
+ mainPanel.add(new LoadingPanel());
+ GWT.log("added loading panel()");
joinService.getVREs(new AsyncCallback>>() {
@Override
public void onSuccess(LinkedHashMap> categories) {
diff --git a/src/main/java/org/gcube/portlets/user/joinvre/client/ui/LoadingPanel.ui.xml b/src/main/java/org/gcube/portlets/user/joinvre/client/ui/LoadingPanel.ui.xml
index 509337b..e7bc382 100644
--- a/src/main/java/org/gcube/portlets/user/joinvre/client/ui/LoadingPanel.ui.xml
+++ b/src/main/java/org/gcube/portlets/user/joinvre/client/ui/LoadingPanel.ui.xml
@@ -4,11 +4,11 @@
.center {
text-align: center;
- color: #999;
+ color: #666;
}
- Loading, just a moment ...
-
+ Loading Virtual Research Environments list ...
+
\ No newline at end of file
diff --git a/src/main/java/org/gcube/portlets/user/joinvre/server/JoinServiceImpl.java b/src/main/java/org/gcube/portlets/user/joinvre/server/JoinServiceImpl.java
index 8cec9f1..33ca4d9 100644
--- a/src/main/java/org/gcube/portlets/user/joinvre/server/JoinServiceImpl.java
+++ b/src/main/java/org/gcube/portlets/user/joinvre/server/JoinServiceImpl.java
@@ -200,6 +200,7 @@ public class JoinServiceImpl extends RemoteServiceServlet implements JoinService
//first method called to get VREs and their categories
@Override
public LinkedHashMap> getVREs() {
+
LinkedHashMap> toReturn = new LinkedHashMap>();
try {
if (isWithinPortal()) {
@@ -717,7 +718,7 @@ public class JoinServiceImpl extends RemoteServiceServlet implements JoinService
else
return (LinkedHashMap>) getThreadLocalRequest().getSession().getAttribute(ALLVRES_SESSION_ATTRIBUTE);
}
- @SuppressWarnings("unchecked")
+
private void setVREsInSession(LinkedHashMap> allVREs) {
getThreadLocalRequest().getSession().setAttribute(ALLVRES_SESSION_ATTRIBUTE, allVREs);
}