From d45222d31b2bec588d243a95c54a9eab50e16ffc Mon Sep 17 00:00:00 2001 From: Luca Frosini Date: Tue, 3 Mar 2015 16:13:12 +0000 Subject: [PATCH] Converting VREMember Portlet to JoinVRE needs git-svn-id: https://svn.research-infrastructures.eu/d4science/gcube/trunk/portlets/user/join-vre@112332 82a268e6-3cf1-43bd-a215-b396298e98cf --- .gwt/.gwt-log | 0 pom.xml | 5 ++++ .../user/joinvre/client/JoinService.java | 2 +- .../portlets/user/joinvre/client/JoinVRE.java | 25 ++++++++----------- .../joinvre/client/panels/JoinVREPanel.java | 24 ++++++++++-------- .../user/joinvre/client/ui/DisplayVRE.java | 17 +++++-------- .../portlets/user/joinvre/JoinVRE.gwt.xml | 1 - src/main/webapp/WEB-INF/web.xml | 16 +++--------- 8 files changed, 38 insertions(+), 52 deletions(-) create mode 100644 .gwt/.gwt-log diff --git a/.gwt/.gwt-log b/.gwt/.gwt-log new file mode 100644 index 0000000..e69de29 diff --git a/pom.xml b/pom.xml index 57b1365..f643f64 100644 --- a/pom.xml +++ b/pom.xml @@ -109,6 +109,11 @@ org.slf4j slf4j-api + + junit + junit + 4.8 + diff --git a/src/main/java/org/gcube/portlets/user/joinvre/client/JoinService.java b/src/main/java/org/gcube/portlets/user/joinvre/client/JoinService.java index 86d1c80..3d22550 100644 --- a/src/main/java/org/gcube/portlets/user/joinvre/client/JoinService.java +++ b/src/main/java/org/gcube/portlets/user/joinvre/client/JoinService.java @@ -12,7 +12,7 @@ import com.google.gwt.user.client.rpc.RemoteServiceRelativePath; * @author Massimiliano Assante, ISTI-CNR - massimiliano.assante@isti.cnr.it * @author Luca Frosini (ISTI - CNR) http://www.lucafrosini.com/ */ -@RemoteServiceRelativePath("memberservice") +@RemoteServiceRelativePath("JoinService") public interface JoinService extends RemoteService { ArrayList getVREs(); 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 c2bccd2..b2ba68b 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 @@ -1,12 +1,11 @@ package org.gcube.portlets.user.joinvre.client; -import org.gcube.portlets.user.gcubewidgets.client.ClientScopeHelper; import org.gcube.portlets.user.joinvre.client.panels.JoinVREPanel; import com.google.gwt.core.client.EntryPoint; -import com.google.gwt.user.client.Window.Location; -import com.google.gwt.user.client.rpc.AsyncCallback; +import com.google.gwt.core.client.GWT; import com.google.gwt.user.client.ui.RootPanel; +import com.google.gwt.user.client.ui.VerticalPanel; /** * Entry point classes define onModuleLoad(). @@ -15,18 +14,14 @@ import com.google.gwt.user.client.ui.RootPanel; */ public class JoinVRE implements EntryPoint { + public static final String loading = GWT.getModuleBaseURL() + "../images/vre-loader.gif"; + public void onModuleLoad() { - - ClientScopeHelper.getService().setScope(Location.getHref(), new AsyncCallback() { - @Override - public void onSuccess(Boolean result) { - // TODO - RootPanel.get("JoinVRE-Container").add(new JoinVREPanel()); - } - @Override - public void onFailure(Throwable caught) { - } - }); - + VerticalPanel mainPanel = new VerticalPanel(); + + RootPanel.get("JoinVRE-Container").add(mainPanel); + mainPanel.add(new JoinVREPanel(mainPanel)); } + + } diff --git a/src/main/java/org/gcube/portlets/user/joinvre/client/panels/JoinVREPanel.java b/src/main/java/org/gcube/portlets/user/joinvre/client/panels/JoinVREPanel.java index 83adbc3..7f7bb9c 100644 --- a/src/main/java/org/gcube/portlets/user/joinvre/client/panels/JoinVREPanel.java +++ b/src/main/java/org/gcube/portlets/user/joinvre/client/panels/JoinVREPanel.java @@ -26,17 +26,16 @@ public class JoinVREPanel extends Composite { * Create a remote service proxy to talk to the server-side Greeting service. */ private final JoinServiceAsync joinService = GWT.create(JoinService.class); - - public static final String loading = GWT.getModuleBaseURL() + "../images/members-loader.gif"; - - private Image loadingImage; - - private VerticalPanel mainPanel = new VerticalPanel(); - public JoinVREPanel() { + public static final String loading = GWT.getModuleBaseURL() + "../images/vre-loader.gif"; + + private VerticalPanel mainPanel; + + public JoinVREPanel(final VerticalPanel verticalPanel) { super(); - loadingImage = new Image(loading); - mainPanel.add(loadingImage); + GWT.log("JoinVREPanel"); + this.mainPanel = new VerticalPanel(); showLoader(); + joinService.getVREs(new AsyncCallback>() { @Override @@ -46,7 +45,8 @@ public class JoinVREPanel extends Composite { mainPanel.setVerticalAlignment(HasVerticalAlignment.ALIGN_TOP); - // TODO + // TODO
+ if (vres == null || vres.isEmpty()) { mainPanel.add(new HTML("
Ops, something went wrong. Please reload this page.
")); @@ -71,7 +71,6 @@ public class JoinVREPanel extends Composite { } }); initWidget(mainPanel); - } @@ -81,6 +80,9 @@ public class JoinVREPanel extends Composite { mainPanel.setHeight("300px"); mainPanel.setHorizontalAlignment(HasAlignment.ALIGN_CENTER); mainPanel.setVerticalAlignment(HasVerticalAlignment.ALIGN_MIDDLE); + + Image loadingImage = new Image(loading); mainPanel.add(loadingImage); } + } diff --git a/src/main/java/org/gcube/portlets/user/joinvre/client/ui/DisplayVRE.java b/src/main/java/org/gcube/portlets/user/joinvre/client/ui/DisplayVRE.java index 25f6e8d..1b59ee7 100644 --- a/src/main/java/org/gcube/portlets/user/joinvre/client/ui/DisplayVRE.java +++ b/src/main/java/org/gcube/portlets/user/joinvre/client/ui/DisplayVRE.java @@ -15,31 +15,25 @@ import com.google.gwt.user.client.ui.Widget; /** * @author Massimiliano Assante, ISTI-CNR - massimiliano.assante@isti.cnr.it * @author Luca Frosini (ISTI - CNR) http://www.lucafrosini.com/ - * */ public class DisplayVRE extends Composite { - protected final static String HEADLINE_TEXT = "Professional Headline"; - protected final static String ISTI_TEXT = "Company"; - - private static DisplayBadgeUiBinder uiBinder = GWT.create(DisplayBadgeUiBinder.class); - - interface DisplayBadgeUiBinder extends UiBinder {} + interface DisplayVREUiBinder extends UiBinder {} + private static DisplayVREUiBinder uiBinder = GWT.create(DisplayVREUiBinder.class); + public static final String vreDefault = GWT.getModuleBaseURL() + "../images/vre-default.png"; - public static final String loading = GWT.getModuleBaseURL() + "../images/vre-image-loader.gif"; @UiField HTMLPanel mainPanel; @UiField Image vreImage; - @UiField AnchorElement vreName; public DisplayVRE(VRE vre) { - vreImage.setUrl(loading); + Widget widget = uiBinder.createAndBindUi(this); - initWidget(uiBinder.createAndBindUi(this)); vreImage.setUrl(loading); + mainPanel.addStyleName("profile-section"); vreImage.setUrl(vre.getImageURL()); vreImage.setTitle(vre.getName()); @@ -48,6 +42,7 @@ public class DisplayVRE extends Composite { vreName.setHref(vre.getFriendlyURL()); vreName.setInnerText(vre.getName()); + initWidget(widget); } public void showError(String message) { diff --git a/src/main/resources/org/gcube/portlets/user/joinvre/JoinVRE.gwt.xml b/src/main/resources/org/gcube/portlets/user/joinvre/JoinVRE.gwt.xml index 7938bf1..c018c12 100644 --- a/src/main/resources/org/gcube/portlets/user/joinvre/JoinVRE.gwt.xml +++ b/src/main/resources/org/gcube/portlets/user/joinvre/JoinVRE.gwt.xml @@ -6,7 +6,6 @@ - diff --git a/src/main/webapp/WEB-INF/web.xml b/src/main/webapp/WEB-INF/web.xml index 13b3c16..2180c3e 100644 --- a/src/main/webapp/WEB-INF/web.xml +++ b/src/main/webapp/WEB-INF/web.xml @@ -7,23 +7,13 @@ - greetServlet + JoinVRE org.gcube.portlets.user.joinvre.server.JoinServiceImpl - - scopeService - org.gcube.portlets.user.gcubewidgets.server.ScopeServiceImpl - - - greetServlet - /joinvre/joinservice - - - - scopeService - /joinvre/scopeService + JoinVRE + /JoinVRE/JoinService