diff --git a/.classpath b/.classpath index a708ee4..3cce1ed 100644 --- a/.classpath +++ b/.classpath @@ -1,6 +1,6 @@ - + @@ -44,11 +44,11 @@ - + + - diff --git a/.settings/org.eclipse.core.resources.prefs b/.settings/org.eclipse.core.resources.prefs index 160c7b8..29abf99 100644 --- a/.settings/org.eclipse.core.resources.prefs +++ b/.settings/org.eclipse.core.resources.prefs @@ -3,5 +3,4 @@ encoding//src/main/java=UTF-8 encoding//src/main/resources=UTF-8 encoding//src/test/java=UTF-8 encoding//src/test/resources=UTF-8 -encoding//target/generated-sources/gwt=UTF-8 encoding/=UTF-8 diff --git a/pom.xml b/pom.xml index fc9d320..1a9f656 100644 --- a/pom.xml +++ b/pom.xml @@ -22,11 +22,8 @@ 2.7.0 - - 1.7 1.7 - UTF-8 @@ -54,11 +51,13 @@ com.google.gwt gwt-servlet provided + ${gwtVersion} com.google.gwt gwt-user provided + ${gwtVersion} org.gcube.dvos @@ -70,11 +69,11 @@ org.gcube.core common-scope-maps provided - com.google.gwt gwt-dev + ${gwtVersion} provided @@ -107,7 +106,7 @@ org.gcube.data-catalogue ckan-util-library [2.0.0-SNAPSHOT, 3.0.0-SNAPSHOT) - compile + provided org.gcube.common diff --git a/src/main/java/org/gcube/portlets_widgets/catalogue_sharing_widget/client/ShareCatalogueWidget.java b/src/main/java/org/gcube/portlets_widgets/catalogue_sharing_widget/client/ShareCatalogueWidget.java index 5b18bf0..c561122 100644 --- a/src/main/java/org/gcube/portlets_widgets/catalogue_sharing_widget/client/ShareCatalogueWidget.java +++ b/src/main/java/org/gcube/portlets_widgets/catalogue_sharing_widget/client/ShareCatalogueWidget.java @@ -4,8 +4,9 @@ import org.gcube.portlets_widgets.catalogue_sharing_widget.shared.ItemUrls; import com.github.gwtbootstrap.client.ui.AlertBlock; import com.github.gwtbootstrap.client.ui.Form; +import com.github.gwtbootstrap.client.ui.Modal; +import com.github.gwtbootstrap.client.ui.TextBox; import com.github.gwtbootstrap.client.ui.Well; -import com.github.gwtbootstrap.client.ui.base.TextBox; import com.google.gwt.core.client.GWT; import com.google.gwt.uibinder.client.UiBinder; import com.google.gwt.uibinder.client.UiField; @@ -46,10 +47,13 @@ public class ShareCatalogueWidget extends Composite { @UiField TextBox itemLongUrl; - + + @UiField + Modal modalShareLink; public ShareCatalogueWidget(String itemUUID) { initWidget(uiBinder.createAndBindUi(this)); + modalShareLink.show(); ckanServices.getPackageUrl(itemUUID, new AsyncCallback() { @@ -68,6 +72,7 @@ public class ShareCatalogueWidget extends Composite { itemLongUrl.setText(result.getUrl() == null ? "" : result.getUrl()); itemTitle.setText(result.getProductTitle() == null ? "" : result.getProductTitle()); itemName.setText(result.getProductName() == null ? "" : result.getProductName()); + } } diff --git a/src/main/java/org/gcube/portlets_widgets/catalogue_sharing_widget/client/ShareCatalogueWidget.ui.xml b/src/main/java/org/gcube/portlets_widgets/catalogue_sharing_widget/client/ShareCatalogueWidget.ui.xml index 3a463f6..5f8639c 100644 --- a/src/main/java/org/gcube/portlets_widgets/catalogue_sharing_widget/client/ShareCatalogueWidget.ui.xml +++ b/src/main/java/org/gcube/portlets_widgets/catalogue_sharing_widget/client/ShareCatalogueWidget.ui.xml @@ -4,10 +4,9 @@ -
+ - @@ -47,7 +46,7 @@ -
+
\ No newline at end of file diff --git a/src/main/java/org/gcube/portlets_widgets/catalogue_sharing_widget/server/ServerUtils.java b/src/main/java/org/gcube/portlets_widgets/catalogue_sharing_widget/server/ServerUtils.java index f02924e..6f12da0 100644 --- a/src/main/java/org/gcube/portlets_widgets/catalogue_sharing_widget/server/ServerUtils.java +++ b/src/main/java/org/gcube/portlets_widgets/catalogue_sharing_widget/server/ServerUtils.java @@ -3,6 +3,7 @@ package org.gcube.portlets_widgets.catalogue_sharing_widget.server; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpSession; +import org.gcube.common.portal.PortalContext; import org.gcube.common.scope.api.ScopeProvider; import org.gcube.datacatalogue.ckanutillibrary.server.ApplicationProfileScopePerUrlReader; diff --git a/src/main/java/org/gcube/portlets_widgets/catalogue_sharing_widget/shared/ItemUrls.java b/src/main/java/org/gcube/portlets_widgets/catalogue_sharing_widget/shared/ItemUrls.java index 118e747..d67b67a 100644 --- a/src/main/java/org/gcube/portlets_widgets/catalogue_sharing_widget/shared/ItemUrls.java +++ b/src/main/java/org/gcube/portlets_widgets/catalogue_sharing_widget/shared/ItemUrls.java @@ -21,7 +21,6 @@ public class ItemUrls implements Serializable { */ public ItemUrls() { super(); - // TODO Auto-generated constructor stub } /**