From 95f8eb15c9ec9eaffea307253e7f1962fed58121 Mon Sep 17 00:00:00 2001
From: George Kalampokis <gkalampokis@cite.gr>
Date: Mon, 10 May 2021 16:55:44 +0300
Subject: [PATCH] Even more fixes for imports and exports

---
 .../components/commons/datafield/DMPsAutoCompleteData.java  | 1 +
 .../commons/datafield/DatasetsAutoCompleteData.java         | 1 +
 .../commons/datafield/ResearchersAutoCompleteData.java      | 6 +++---
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/dmp-backend/web/src/main/java/eu/eudat/models/data/components/commons/datafield/DMPsAutoCompleteData.java b/dmp-backend/web/src/main/java/eu/eudat/models/data/components/commons/datafield/DMPsAutoCompleteData.java
index cbcfb39e6..025a8c036 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/models/data/components/commons/datafield/DMPsAutoCompleteData.java
+++ b/dmp-backend/web/src/main/java/eu/eudat/models/data/components/commons/datafield/DMPsAutoCompleteData.java
@@ -53,6 +53,7 @@ public class DMPsAutoCompleteData extends InternalDmpEntitiesData<DMPsAutoComple
 		HashMap dataMap = new HashMap();
 		dataMap.put("label", item != null ? item.getAttribute("label") : "");
 		dataMap.put("type", item != null ? item.getAttribute("type") : "dmps");
+		dataMap.put("multiAutoComplete", item != null ? Boolean.parseBoolean(item.getAttribute("multiAutocomplete")) : false);
 
 		return dataMap;
 	}
diff --git a/dmp-backend/web/src/main/java/eu/eudat/models/data/components/commons/datafield/DatasetsAutoCompleteData.java b/dmp-backend/web/src/main/java/eu/eudat/models/data/components/commons/datafield/DatasetsAutoCompleteData.java
index 4ca552c92..67eba665f 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/models/data/components/commons/datafield/DatasetsAutoCompleteData.java
+++ b/dmp-backend/web/src/main/java/eu/eudat/models/data/components/commons/datafield/DatasetsAutoCompleteData.java
@@ -53,6 +53,7 @@ public class DatasetsAutoCompleteData extends InternalDmpEntitiesData<DatasetsAu
 		HashMap dataMap = new HashMap();
 		dataMap.put("label", item != null ? item.getAttribute("label") : "");
 		dataMap.put("type", item != null ? item.getAttribute("type") : "datasets");
+		dataMap.put("multiAutoComplete", item != null ? Boolean.parseBoolean(item.getAttribute("multiAutocomplete")) : false);
 
 		return dataMap;
 	}
diff --git a/dmp-backend/web/src/main/java/eu/eudat/models/data/components/commons/datafield/ResearchersAutoCompleteData.java b/dmp-backend/web/src/main/java/eu/eudat/models/data/components/commons/datafield/ResearchersAutoCompleteData.java
index 74cdff16b..03ddb717f 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/models/data/components/commons/datafield/ResearchersAutoCompleteData.java
+++ b/dmp-backend/web/src/main/java/eu/eudat/models/data/components/commons/datafield/ResearchersAutoCompleteData.java
@@ -19,7 +19,7 @@ public class ResearchersAutoCompleteData extends InternalDmpEntitiesData<Researc
 	@Override
 	public Element toXml(Document doc) {
 		Element root = super.toXml(doc);
-		root.setAttribute("multiAutoComplete", this.multiAutoComplete.toString());
+		root.setAttribute("multiAutoComplete", this.multiAutoComplete != null ? this.multiAutoComplete.toString() : "false");
 
 		return root;
 	}
@@ -36,7 +36,7 @@ public class ResearchersAutoCompleteData extends InternalDmpEntitiesData<Researc
 	public ResearchersAutoCompleteData fromData(Object data) {
 		super.fromData(data);
 		if (data != null) {
-			this.multiAutoComplete = (Boolean) ((Map<Boolean, Object>) data).get("multiAutoComplete");
+			this.multiAutoComplete = Boolean.parseBoolean(((Map<Boolean, Object>) data).get("multiAutoComplete").toString());
 		}
 
 		return this;
@@ -53,7 +53,7 @@ public class ResearchersAutoCompleteData extends InternalDmpEntitiesData<Researc
 		HashMap dataMap = new HashMap();
 		dataMap.put("label", item != null ? item.getAttribute("label") : "");
 		dataMap.put("type", item != null ? item.getAttribute("type") : "researchers");
-
+		dataMap.put("multiAutoComplete", item != null ? Boolean.parseBoolean(item.getAttribute("multiAutocomplete")) : false);
 		return dataMap;
 	}
 }