From eec95aaf10105eeff3695ee08b2d52fb2a73f2bc Mon Sep 17 00:00:00 2001
From: "francesco.mangiacrapa" <francesco.mangiacrapa@isti.cnr.it>
Date: Wed, 14 Jul 2021 14:45:16 +0200
Subject: [PATCH] removed gwtbootstrap3 compilation error

---
 .../client/ui/GeonaDataViewMainPanel.ui.xml   |  50 +++++---
 .../ui/dialogs/DialogShareableLink.java       |   2 -
 .../ui/dialogs/DialogShareableLink.ui.xml     | 110 +++++++++---------
 .../products/concessioni/ConcessioneView.java |   1 -
 .../concessioni/ConcessioneView.ui.xml        |   3 +-
 .../concessioni/RelazioneScavoView.ui.xml     |   7 +-
 6 files changed, 95 insertions(+), 78 deletions(-)

diff --git a/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/ui/GeonaDataViewMainPanel.ui.xml b/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/ui/GeonaDataViewMainPanel.ui.xml
index c664cc5..bfb45f7 100644
--- a/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/ui/GeonaDataViewMainPanel.ui.xml
+++ b/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/ui/GeonaDataViewMainPanel.ui.xml
@@ -2,11 +2,13 @@
 <ui:UiBinder xmlns:ui="urn:ui:com.google.gwt.uibinder"
 	xmlns:g="urn:import:com.google.gwt.user.client.ui"
 	xmlns:b="urn:import:org.gwtbootstrap3.client.ui"
+	xmlns:h="urn:import:org.gwtbootstrap3.client.ui.html"
 	xmlns:c="urn:import:org.gcube.portlets.user.geoportaldataviewer.client.ui">
 	<ui:style>
 	.margin-right-10 {
 		margin-right: 10px;
 	}
+	
 	.font-weight-bold {
 		font-weight: bold;
 	}
@@ -15,24 +17,38 @@
 		<g:HTMLPanel ui:field="mainContainerPanel">
 			<g:HTMLPanel ui:field="mainToolBar"
 				addStyleNames="inner-toolbar">
-				<b:DropdownButton type="LINK" text=" " icon="INFO">
-					<g:HTMLPanel ui:field="panelMI"
-						addStyleNames="info-interaction">
-						<g:Label>Map Interactions</g:Label>
-						<b:Paragraph><b:Icon type="CHECK_EMPTY"/> Use <code>Shift+Drag</code> to draw an extent for zoom in the Map</b:Paragraph>
-						<b:Paragraph><b:Icon type="HAND_UP"/> Click on the Points shown on the Map to view their features</b:Paragraph>
+				<b:ButtonGroup>
+					<b:Button type="LINK" text=" " icon="INFO" />
+					<b:DropDownMenu>
+						<g:HTMLPanel ui:field="panelMI"
+							addStyleNames="info-interaction">
+							<g:Label>Map Interactions</g:Label>
+							<h:Span>
+								<b:Icon type="SQUARE_O" />
+								Use
+								<code>Shift+Drag</code>
+								to draw an extent for zoom in the Map
+							</h:Span>
+							<h:Span>
+								<b:Icon type="HAND_O_UP" />
+								Click on the Points shown on the Map to view their features
+							</h:Span>
 						</g:HTMLPanel>
-				</b:DropdownButton>
-				<b:DropdownButton type="LINK" text="Query"
-					visible="false">
-					<!-- <b:ButtonGroup toggle="checkbox" ui:field="buttonGroup"> -->
-					<b:AnchorListItem ui:field="dataPointSelection"
-						addStyleNames="{style.margin-right-10}">Data Point
-						Selection</b:AnchorListItem>
-					<b:AnchorListItem ui:field="dataBoxSelection" visible="false">Data Box
-						Selection</b:AnchorListItem>
-					<!-- </b:ButtonGroup> -->
-				</b:DropdownButton>
+					</b:DropDownMenu>
+				</b:ButtonGroup>
+				<b:ButtonGroup visible="false">
+					<b:Button type="LINK" text="Query" icon="INFO" />
+					<b:DropDownMenu>
+						<!-- <b:ButtonGroup toggle="checkbox" ui:field="buttonGroup"> -->
+						<b:AnchorListItem ui:field="dataPointSelection"
+							addStyleNames="{style.margin-right-10}">Data Point
+							Selection</b:AnchorListItem>
+						<b:AnchorListItem ui:field="dataBoxSelection"
+							visible="false">Data Box
+							Selection</b:AnchorListItem>
+						<!-- </b:ButtonGroup> -->
+					</b:DropDownMenu>
+				</b:ButtonGroup>
 				<b:Button type="LINK" ui:field="removeQuery"
 					text="Remove Query" visible="false"></b:Button>
 			</g:HTMLPanel>
diff --git a/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/ui/dialogs/DialogShareableLink.java b/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/ui/dialogs/DialogShareableLink.java
index 9130992..90d6ed5 100644
--- a/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/ui/dialogs/DialogShareableLink.java
+++ b/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/ui/dialogs/DialogShareableLink.java
@@ -11,7 +11,6 @@ import org.gwtbootstrap3.client.ui.FormGroup;
 import org.gwtbootstrap3.client.ui.Modal;
 import org.gwtbootstrap3.client.ui.ModalFooter;
 import org.gwtbootstrap3.client.ui.TextBox;
-import org.gwtbootstrap3.client.ui.Tooltip;
 
 import com.google.gwt.core.client.GWT;
 import com.google.gwt.dom.client.Element;
@@ -22,7 +21,6 @@ import com.google.gwt.event.dom.client.MouseOverHandler;
 import com.google.gwt.uibinder.client.UiBinder;
 import com.google.gwt.uibinder.client.UiField;
 import com.google.gwt.user.client.Random;
-import com.google.gwt.user.client.Timer;
 import com.google.gwt.user.client.rpc.AsyncCallback;
 import com.google.gwt.user.client.ui.Composite;
 import com.google.gwt.user.client.ui.Label;
diff --git a/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/ui/dialogs/DialogShareableLink.ui.xml b/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/ui/dialogs/DialogShareableLink.ui.xml
index 2c50050..2009d76 100644
--- a/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/ui/dialogs/DialogShareableLink.ui.xml
+++ b/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/ui/dialogs/DialogShareableLink.ui.xml
@@ -45,8 +45,8 @@
 	</ui:style>
 	<g:HTMLPanel>
 		<b:Form type="HORIZONTAL">
-			<b:Alert ui:field="actionAlert" close="false" type="INFO"
-				visible="false">
+			<b:Alert ui:field="actionAlert" dismissable="false"
+				type="INFO" visible="false">
 				<b:Icon type="ROTATE_RIGHT" spin="true" />
 			</b:Alert>
 
@@ -73,38 +73,40 @@
 						<!-- <b:Well ui:field="wellPrivateLinkDescription"> -->
 						<!-- The following Restricted Link for this product -->
 						<!-- is accessible by the users of the VRE. Login required</b:Well> -->
-						<b:ControlLabel>Restricted Link</b:ControlLabel>
-						<b:Controls>
-							<b:InputAddOn prependIcon="LINK"
+						<b:FormLabel>Restricted Link</b:FormLabel>
+						<!-- <b:Controls> -->
+						<b:InputGroup>
+							<b:InputGroupAddon icon="LINK"
 								addStyleNames="my-prepend-width">
-								<b:TextBox ui:field="textPrivateLink" readOnly="true">
-								</b:TextBox>
-								<b:Tooltip text='Copied to clipboard' trigger="MANUAL">
-									<b:Button icon="COPY" ui:field="privateLinkCopyButton"
-										type="PRIMARY"></b:Button>
-								</b:Tooltip>
-							</b:InputAddOn>
-							<b:Button ui:field="showPrivateLongLinkButton"
-								type="LINK" addStyleNames="{style.margin-left-25}">Show as Long URL</b:Button>
-						</b:Controls>
+							</b:InputGroupAddon>
+							<b:TextBox ui:field="textPrivateLink" readOnly="true" />
+							<b:Tooltip text='Copied to clipboard' trigger="MANUAL">
+								<b:Button icon="COPY" ui:field="privateLinkCopyButton"
+									type="PRIMARY"></b:Button>
+							</b:Tooltip>
+						</b:InputGroup>
+						<b:Button ui:field="showPrivateLongLinkButton"
+							type="LINK" addStyleNames="{style.margin-left-25}">Show as Long URL</b:Button>
+						<!-- </b:Controls> -->
 
 					</b:FormGroup>
 
 					<b:FormGroup addStyleNames="my-control-group"
 						ui:field="cgPrivateLongLink" visible="false">
-						<b:ControlLabel></b:ControlLabel>
-						<b:Controls>
-							<b:InputAddOn prependIcon="LINK"
+						<b:FormLabel></b:FormLabel>
+						<!-- <b:Controls> -->
+						<b:InputGroup>
+							<b:InputGroupAddon icon="LINK"
 								addStyleNames="my-prepend-width">
-								<b:TextBox ui:field="textPrivateLongLink"
-									readOnly="true">
-								</b:TextBox>
-								<b:Tooltip text='Copied to clipboard' trigger="MANUAL">
-									<b:Button icon="COPY"
-										ui:field="privateLongLinkCopyButton" type="PRIMARY"></b:Button>
-								</b:Tooltip>
-							</b:InputAddOn>
-						</b:Controls>
+							</b:InputGroupAddon>
+							<b:TextBox ui:field="textPrivateLongLink"
+								readOnly="true" />
+							<b:Tooltip text='Copied to clipboard' trigger="MANUAL">
+								<b:Button icon="COPY"
+									ui:field="privateLongLinkCopyButton" type="PRIMARY"></b:Button>
+							</b:Tooltip>
+						</b:InputGroup>
+						<!-- </b:Controls> -->
 					</b:FormGroup>
 				</g:HTMLPanel>
 			</b:FieldSet>
@@ -129,40 +131,40 @@
 					addStyleNames="my-control-group">
 					<!-- <b:Well ui:field="alertFilePublicLink" visible="true">Anyone with -->
 					<!-- this link can access it, no login is required.</b:Well> -->
-					<b:ControlLabel>Open Link</b:ControlLabel>
-					<b:Controls>
-						<b:InputAddOn prependIcon="GLOBE"
+					<b:FormLabel>Open Link</b:FormLabel>
+					<!-- <b:Controls> -->
+					<b:InputGroup>
+						<b:InputGroupAddon icon="GLOBE"
 							addStyleNames="my-prepend-width">
-							<b:TextBox ui:field="textPublicLink" readOnly="true">
-							</b:TextBox>
-							<b:Tooltip text='Copied to clipboard' trigger="MANUAL">
-								<b:Button icon="COPY" ui:field="publicLinkCopyButton"
-									type="PRIMARY"></b:Button>
-							</b:Tooltip>
-						</b:InputAddOn>
-						<b:Button ui:field="showPublicLongLinkButton" type="LINK"
-							addStyleNames="{style.margin-left-25}">Show as Long URL</b:Button>
-					</b:Controls>
+						</b:InputGroupAddon>
+						<b:TextBox ui:field="textPublicLink" readOnly="true" />
+						<b:Tooltip text='Copied to clipboard' trigger="MANUAL">
+							<b:Button icon="COPY" ui:field="publicLinkCopyButton"
+								type="PRIMARY"></b:Button>
+						</b:Tooltip>
+					</b:InputGroup>
+					<b:Button ui:field="showPublicLongLinkButton" type="LINK"
+						addStyleNames="{style.margin-left-25}">Show as Long URL</b:Button>
+					<!-- </b:Controls> -->
 				</b:FormGroup>
 
 				<b:FormGroup addStyleNames="my-control-group"
 					ui:field="cgPublicLongLink" visible="false">
-					<b:ControlLabel></b:ControlLabel>
-					<b:Controls>
-						<b:InputAddOn prependIcon="GLOBE"
-							addStyleNames="my-prepend-width">
-							<b:TextBox ui:field="textPublicLongLink"
-								readOnly="true">
-							</b:TextBox>
-							<b:Tooltip text='Copied to clipboard' trigger="MANUAL">
-								<b:Button icon="COPY"
-									ui:field="publicLongLinkCopyButton" type="PRIMARY"></b:Button>
-							</b:Tooltip>
-						</b:InputAddOn>
-					</b:Controls>
+					<b:FormLabel></b:FormLabel>
+					<!-- <b:Controls> -->
+					<b:InputGroup>
+						<b:InputGroupAddon icon="GLOBE"
+							addStyleNames="my-prepend-width"></b:InputGroupAddon>
+						<b:TextBox ui:field="textPublicLongLink" readOnly="true" />
+						<b:Tooltip text='Copied to clipboard' trigger="MANUAL">
+							<b:Button icon="COPY"
+								ui:field="publicLongLinkCopyButton" type="PRIMARY"></b:Button>
+						</b:Tooltip>
+					</b:InputGroup>
+					<!-- </b:Controls> -->
 				</b:FormGroup>
 			</b:FieldSet>
-			<b:Alert close="false" ui:field="errorAlert" type="ERROR"
+			<b:Alert dismissable="false" ui:field="errorAlert" type="DANGER"
 				visible="false"></b:Alert>
 		</b:Form>
 	</g:HTMLPanel>
diff --git a/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/ui/products/concessioni/ConcessioneView.java b/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/ui/products/concessioni/ConcessioneView.java
index 82b1df4..62ce785 100644
--- a/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/ui/products/concessioni/ConcessioneView.java
+++ b/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/ui/products/concessioni/ConcessioneView.java
@@ -8,7 +8,6 @@ import org.gcube.portlets.user.geoportaldataviewer.client.GeoportalDataViewerSer
 import org.gcube.portlets.user.geoportaldataviewer.client.gis.MapUtils;
 import org.gcube.portlets.user.geoportaldataviewer.client.ui.ModalWindow;
 import org.gcube.portlets.user.geoportaldataviewer.client.ui.dialogs.DialogShareableLink;
-import org.gcube.portlets.user.geoportaldataviewer.client.ui.images.ThumbnailImageView;
 import org.gcube.portlets.user.geoportaldataviewer.client.ui.map.MapView;
 import org.gcube.portlets.user.geoportaldataviewer.client.ui.util.CustomFlexTable;
 import org.gcube.portlets.user.geoportaldataviewer.shared.products.ConcessioneDV;
diff --git a/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/ui/products/concessioni/ConcessioneView.ui.xml b/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/ui/products/concessioni/ConcessioneView.ui.xml
index bd43e6a..4007e58 100644
--- a/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/ui/products/concessioni/ConcessioneView.ui.xml
+++ b/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/ui/products/concessioni/ConcessioneView.ui.xml
@@ -1,6 +1,7 @@
 <!DOCTYPE ui:UiBinder SYSTEM "http://dl.google.com/gwt/DTD/xhtml.ent">
 <ui:UiBinder xmlns:ui="urn:ui:com.google.gwt.uibinder"
 	xmlns:g="urn:import:com.google.gwt.user.client.ui"
+	xmlns:h="urn:import:org.gwtbootstrap3.client.ui.html"
 	xmlns:b="urn:import:org.gwtbootstrap3.client.ui">
 
 	<ui:style>
@@ -40,7 +41,7 @@
 			<b:Button ui:field="shareButton">Share</b:Button>
 			<b:Button ui:field="viewButton">View</b:Button>
 		</g:HorizontalPanel>
-		<b:Paragraph ui:field="introduzione"></b:Paragraph>
+		<h:Paragraph ui:field="introduzione"></h:Paragraph>
 		<g:VerticalPanel addStyleNames="{style.width-100}">
 			<g:HTMLPanel ui:field="mapViewPanel">
 			</g:HTMLPanel>
diff --git a/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/ui/products/concessioni/RelazioneScavoView.ui.xml b/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/ui/products/concessioni/RelazioneScavoView.ui.xml
index d19c5d5..5bc306f 100644
--- a/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/ui/products/concessioni/RelazioneScavoView.ui.xml
+++ b/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/ui/products/concessioni/RelazioneScavoView.ui.xml
@@ -1,6 +1,7 @@
 <!DOCTYPE ui:UiBinder SYSTEM "http://dl.google.com/gwt/DTD/xhtml.ent">
 <ui:UiBinder xmlns:ui="urn:ui:com.google.gwt.uibinder"
 	xmlns:g="urn:import:com.google.gwt.user.client.ui"
+	xmlns:h="urn:import:org.gwtbootstrap3.client.ui.html"
 	xmlns:b="urn:import:org.gwtbootstrap3.client.ui">
 
 	<ui:style>
@@ -14,8 +15,8 @@
 		addStyleNames="{style.description}">
 		<b:Button ui:field="linkAbstractLanguage" visible="false"
 			type="LINK"></b:Button>
-		<b:Paragraph ui:field="abstractParagraphIta"></b:Paragraph>
-		<b:Paragraph ui:field="abstractParagraphEng"
-			visible="false"></b:Paragraph>
+		<h:Paragraph ui:field="abstractParagraphIta"></h:Paragraph>
+		<h:Paragraph ui:field="abstractParagraphEng"
+			visible="false"></h:Paragraph>
 	</g:HTMLPanel>
 </ui:UiBinder> 
\ No newline at end of file