From 70b4d02a5d267e648b203a7b0f985ce3d45a0a79 Mon Sep 17 00:00:00 2001
From: "francesco.mangiacrapa" <francesco.mangiacrapa@isti.cnr.it>
Date: Mon, 7 Mar 2022 16:42:24 +0100
Subject: [PATCH] Moved to LinkedHashMap

---
 .../client/form/generic/CreateMetadataForm.java            | 3 ++-
 .../widgets/mpformbuilder/shared/GenericDatasetBean.java   | 7 ++++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/main/java/org/gcube/portlets/widgets/mpformbuilder/client/form/generic/CreateMetadataForm.java b/src/main/java/org/gcube/portlets/widgets/mpformbuilder/client/form/generic/CreateMetadataForm.java
index c628922..c0c045d 100644
--- a/src/main/java/org/gcube/portlets/widgets/mpformbuilder/client/form/generic/CreateMetadataForm.java
+++ b/src/main/java/org/gcube/portlets/widgets/mpformbuilder/client/form/generic/CreateMetadataForm.java
@@ -2,6 +2,7 @@ package org.gcube.portlets.widgets.mpformbuilder.client.form.generic;
 
 import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -573,7 +574,7 @@ public class CreateMetadataForm extends Composite implements HasGenericFormListe
 			//Set<String> tags = new HashSet<String>(tagsPanel.getTags());
 			List<OrganizationBean> groups = new ArrayList<OrganizationBean>();
 			List<OrganizationBean> groupsToForceCreation = new ArrayList<OrganizationBean>();
-			Map<String, List<String>> customFieldsMap = new HashMap<String, List<String>>();
+			LinkedHashMap<String, List<String>> customFieldsMap = new LinkedHashMap<String, List<String>>();
 			List<FileUploaded> listFilesUploaded = new ArrayList<FileUploaded>();
 
 			// prepare custom fields
diff --git a/src/main/java/org/gcube/portlets/widgets/mpformbuilder/shared/GenericDatasetBean.java b/src/main/java/org/gcube/portlets/widgets/mpformbuilder/shared/GenericDatasetBean.java
index 7783e47..a2c316f 100644
--- a/src/main/java/org/gcube/portlets/widgets/mpformbuilder/shared/GenericDatasetBean.java
+++ b/src/main/java/org/gcube/portlets/widgets/mpformbuilder/shared/GenericDatasetBean.java
@@ -1,6 +1,7 @@
 package org.gcube.portlets.widgets.mpformbuilder.shared;
 
 import java.io.Serializable;
+import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -25,7 +26,7 @@ public class GenericDatasetBean implements Serializable {
 	private List<MetaDataProfileBean> metadataProfileList;
 	
 	/** The form data entry fields. */
-	private Map<String, List<String>> formDataEntryFields;
+	private LinkedHashMap<String, List<String>> formDataEntryFields;
 	
 	/** The files uploaded. */
 	private List<FileUploaded> filesUploaded;
@@ -44,7 +45,7 @@ public class GenericDatasetBean implements Serializable {
 	 * @param formDataEntryFields the form data entry fields
 	 * @param filesUploaded the files uploaded
 	 */
-	public GenericDatasetBean(List<MetaDataProfileBean> metadataProfileList, Map<String, List<String>> formDataEntryFields,
+	public GenericDatasetBean(List<MetaDataProfileBean> metadataProfileList, LinkedHashMap<String, List<String>> formDataEntryFields,
 			List<FileUploaded> filesUploaded) {
 		super();
 		this.metadataProfileList = metadataProfileList;
@@ -88,7 +89,7 @@ public class GenericDatasetBean implements Serializable {
 	 *
 	 * @param formDataEntryFields the form data entry fields
 	 */
-	public void setFormDataEntryFields(Map<String, List<String>> formDataEntryFields) {
+	public void setFormDataEntryFields(LinkedHashMap<String, List<String>> formDataEntryFields) {
 		this.formDataEntryFields = formDataEntryFields;
 	}