From 99bc870ab74193ade1b2642e67074f8883a301b1 Mon Sep 17 00:00:00 2001
From: "francesco.mangiacrapa" <francesco.mangiacrapa@isti.cnr.it>
Date: Tue, 12 Oct 2021 17:26:30 +0200
Subject: [PATCH] merged with commit eb8dceb8ff77611092b0f516645f2b1ff0c70a1d
 on master

---
 .settings/org.eclipse.wst.common.component    | 29 ++++++++++------
 .../client/ui/edit/EditModeRecord.ui.xml      |  6 ++--
 .../client/ui/edit/UpdateFileset.java         |  3 +-
 .../client/ui/utils/StringUtil.java           | 34 +++++++++++++++++++
 4 files changed, 58 insertions(+), 14 deletions(-)
 create mode 100644 src/main/java/org/gcube/portlets/user/geoportaldataentry/client/ui/utils/StringUtil.java

diff --git a/.settings/org.eclipse.wst.common.component b/.settings/org.eclipse.wst.common.component
index 27a98b3..c342780 100644
--- a/.settings/org.eclipse.wst.common.component
+++ b/.settings/org.eclipse.wst.common.component
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0">
-                                                        	
+                                                            	
+    
     
     
     
@@ -14,7 +15,8 @@
     
     
     <wb-module deploy-name="geoportal-data-entry-app-2.0.0-SNAPSHOT">
-                                                                                                                		
+                                                                                                                        		
+        
         
         
         
@@ -29,7 +31,8 @@
         
         
         <wb-resource deploy-path="/" source-path="/target/m2e-wtp/web-resources"/>
-                                                                                                                		
+                                                                                                                        		
+        
         
         
         
@@ -44,7 +47,8 @@
         
         
         <wb-resource deploy-path="/" source-path="/src/main/webapp" tag="defaultRootSource"/>
-                                                                                                                		
+                                                                                                                        		
+        
         
         
         
@@ -59,7 +63,8 @@
         
         
         <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/java"/>
-                                                                                                                		
+                                                                                                                        		
+        
         
         
         
@@ -74,10 +79,11 @@
         
         
         <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/resources"/>
-        <dependent-module archiveName="geoportal-data-common-1.2.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/geoportal-data-common/geoportal-data-common">
+        <dependent-module archiveName="geoportal-data-common-1.2.0.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/geoportal-data-common/geoportal-data-common">
             <dependency-type>uses</dependency-type>
         </dependent-module>
-                                                                                                                        
+                                                                                                                                
+        
         
         
         
@@ -92,7 +98,8 @@
         
         
         <property name="context-root" value="geoportal-data-entry-app"/>
-                                                                                                                		
+                                                                                                                        		
+        
         
         
         
@@ -107,7 +114,8 @@
         
         
         <property name="java-output-path" value="/geoportal-data-entry-app/target/geoportal-data-entry-app-2.0.0-SNAPSHOT/WEB-INF/classes"/>
-                                                                                                                	
+                                                                                                                        	
+    
     
     
     
@@ -122,7 +130,8 @@
     
     
     </wb-module>
-                                                        
+                                                            
+
 
 
 
diff --git a/src/main/java/org/gcube/portlets/user/geoportaldataentry/client/ui/edit/EditModeRecord.ui.xml b/src/main/java/org/gcube/portlets/user/geoportaldataentry/client/ui/edit/EditModeRecord.ui.xml
index a22fb9b..50ffd6b 100644
--- a/src/main/java/org/gcube/portlets/user/geoportaldataentry/client/ui/edit/EditModeRecord.ui.xml
+++ b/src/main/java/org/gcube/portlets/user/geoportaldataentry/client/ui/edit/EditModeRecord.ui.xml
@@ -24,9 +24,9 @@
 			<b:Tab icon="PENCIL" active="true" heading="Edit the Project"
 				ui:field="tabRawUpdate">
 				<b:Heading size="3">Source Project Editor</b:Heading>
-				<b:Label type="INFO">You can update the Source Project by editing
-					its model
-					data displayed in the following Editor.</b:Label>
+				<b:Label type="INFO">You can update the project by editing
+					the
+					model data displayed in the following editor.</b:Label>
 				<g:HTML addStyleNames="{style.info-panel}">
 					<p style='color: #585858'>
 						Be careful not to change the
diff --git a/src/main/java/org/gcube/portlets/user/geoportaldataentry/client/ui/edit/UpdateFileset.java b/src/main/java/org/gcube/portlets/user/geoportaldataentry/client/ui/edit/UpdateFileset.java
index 66de13c..51036f8 100644
--- a/src/main/java/org/gcube/portlets/user/geoportaldataentry/client/ui/edit/UpdateFileset.java
+++ b/src/main/java/org/gcube/portlets/user/geoportaldataentry/client/ui/edit/UpdateFileset.java
@@ -21,6 +21,7 @@ import org.gcube.portlets.user.geoportaldataentry.client.GeoportalDataEntryServi
 import org.gcube.portlets.user.geoportaldataentry.client.events.ActionOnItemEvent;
 import org.gcube.portlets.user.geoportaldataentry.client.ui.utils.DialogConfirm;
 import org.gcube.portlets.user.geoportaldataentry.client.ui.utils.DialogInform;
+import org.gcube.portlets.user.geoportaldataentry.client.ui.utils.StringUtil;
 import org.gcube.portlets.widgets.mpformbuilder.client.form.MetaDataField;
 import org.gcube.portlets.widgets.mpformbuilder.client.ui.metadata.MetaDataFieldSkeleton;
 import org.gcube.portlets.widgets.mpformbuilder.client.ui.upload.DialogUpload;
@@ -326,7 +327,7 @@ public class UpdateFileset extends Composite {
 			}
 
 			for (UploadedImageDV uploadedImageDV : listImmagini) {
-				fillListBoxToBeReplaced(listBoxContentIndex, section, posizIndex, uploadedImageDV.getTitolo(),
+				fillListBoxToBeReplaced(listBoxContentIndex, section, posizIndex, StringUtil.ellipsize(uploadedImageDV.getDidascalia(),30),
 						uploadedImageDV.getListWsContent());
 				posizIndex++;
 			}
diff --git a/src/main/java/org/gcube/portlets/user/geoportaldataentry/client/ui/utils/StringUtil.java b/src/main/java/org/gcube/portlets/user/geoportaldataentry/client/ui/utils/StringUtil.java
new file mode 100644
index 0000000..1859e79
--- /dev/null
+++ b/src/main/java/org/gcube/portlets/user/geoportaldataentry/client/ui/utils/StringUtil.java
@@ -0,0 +1,34 @@
+/**
+ *
+ */
+package org.gcube.portlets.user.geoportaldataentry.client.ui.utils;
+
+/**
+ * The Class StringUtil.
+ *
+ * @author Francesco Mangiacrapa at ISTI-CNR francesco.mangiacrapa@isti.cnr.it
+ * 
+ * Oct 12, 2021
+ */
+public class StringUtil {
+
+	/**
+	 * Ellipsize.
+	 *
+	 * @param input         the input string that may be subjected to shortening
+	 * @param maxCharacters the maximum characters that must be returned for the
+	 *                      input string
+	 * @return the string
+	 */
+	public static String ellipsize(String input, int maxCharacters) {
+
+		if (input == null)
+			return "";
+
+		if (input.length() < maxCharacters)
+			return input;
+
+		return input.substring(0, maxCharacters) + "...";
+	}
+
+}