diff --git a/dmp-backend/web/src/main/java/eu/eudat/models/data/components/commons/datafield/AutoCompleteData.java b/dmp-backend/web/src/main/java/eu/eudat/models/data/components/commons/datafield/AutoCompleteData.java index e4e5fcf94..ca430e294 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/models/data/components/commons/datafield/AutoCompleteData.java +++ b/dmp-backend/web/src/main/java/eu/eudat/models/data/components/commons/datafield/AutoCompleteData.java @@ -95,14 +95,14 @@ public class AutoCompleteData extends ComboBoxData { this.autoCompleteSingleDataList.add(new AutoCompleteSingleData()); this.mapFromXml(item, this.autoCompleteSingleDataList.get(0)); } - this.multiAutoComplete = Boolean.parseBoolean(item.getAttribute("multiAutoComplete")); + this.multiAutoComplete = Boolean.parseBoolean(item.getAttribute("multiAutocomplete")); return this; } private void mapFromXml(Element item, AutoCompleteSingleData singleData) { singleData.url = item.getAttribute("url"); singleData.optionsRoot = item.getAttribute("optionsRoot"); - this.multiAutoComplete = Boolean.parseBoolean(item.getAttribute("multiAutoComplete")); + this.multiAutoComplete = Boolean.parseBoolean(item.getAttribute("multiAutocomplete")); if (item.getAttribute("autoCompleteType") == null || item.getAttribute("autoCompleteType").equals("") ) { singleData.autocompleteType = AutocompleteType.UNCACHED.getValue(); } else { @@ -173,7 +173,7 @@ public class AutoCompleteData extends ComboBoxData { dataMap.put("label", item != null ? item.getAttribute("label") : ""); //dataMap.put("url", item != null ? item.getAttribute("url") : ""); dataMap.put("type", item != null ? item.getAttribute("type") : "autocomplete"); - dataMap.put("multiAutoComplete", item != null ? Boolean.valueOf(item.getAttribute("multiAutoComplete")) : false); + dataMap.put("multiAutoComplete", item != null ? Boolean.valueOf(item.getAttribute("multiAutocomplete")) : false); List> autoCompletes = new ArrayList<>(); NodeList autoCompleteSingles = item.getChildNodes(); for (int i = 0; i < autoCompleteSingles.getLength(); i++) { diff --git a/dmp-backend/web/src/main/java/eu/eudat/models/data/components/commons/datafield/DataRepositoriesData.java b/dmp-backend/web/src/main/java/eu/eudat/models/data/components/commons/datafield/DataRepositoriesData.java index a0f66a751..e4b3dc384 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/models/data/components/commons/datafield/DataRepositoriesData.java +++ b/dmp-backend/web/src/main/java/eu/eudat/models/data/components/commons/datafield/DataRepositoriesData.java @@ -21,7 +21,7 @@ public class DataRepositoriesData extends FieldData { public DataRepositoriesData fromData(Object data) { if (data != null) { this.setLabel((String) ((Map) data).get("label")); - this.setMultiAutoComplete(((Map) data).get("multiAutoComplete") != null ? (Boolean) ((Map) data).get("multiAutoComplete") : false); + this.setMultiAutoComplete(((Map) data).get("multiAutoComplete") != null && !((Map) data).get("multiAutoComplete").toString().isEmpty()? Boolean.parseBoolean(((Map) data).get("multiAutoComplete").toString()) : false); } return this; } @@ -52,7 +52,7 @@ public class DataRepositoriesData extends FieldData { public Map toMap(Element item) { HashMap dataMap = new HashMap(); dataMap.put("label", item != null && item.getAttributes().getLength() > 0? item.getAttribute("label") : ""); - dataMap.put("multiAutoComplete", item != null && item.getAttributes().getLength() > 0 ? item.getAttribute("multiAutoComplete") : false); + dataMap.put("multiAutoComplete", item != null && item.getAttributes().getLength() > 0 ? item.getAttribute("multiAutocomplete") : false); return dataMap; } } diff --git a/dmp-backend/web/src/main/java/eu/eudat/models/data/components/commons/datafield/ExternalDatasetsData.java b/dmp-backend/web/src/main/java/eu/eudat/models/data/components/commons/datafield/ExternalDatasetsData.java index 8448f5ec7..bc43f2d6a 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/models/data/components/commons/datafield/ExternalDatasetsData.java +++ b/dmp-backend/web/src/main/java/eu/eudat/models/data/components/commons/datafield/ExternalDatasetsData.java @@ -21,7 +21,7 @@ public class ExternalDatasetsData extends FieldData { public ExternalDatasetsData fromData(Object data) { if (data != null) { this.setLabel((String) ((Map) data).get("label")); - this.setMultiAutoComplete(((Map) data).get("multiAutoComplete") != null ? (Boolean) ((Map) data).get("multiAutoComplete") : false); + this.setMultiAutoComplete(((Map) data).get("multiAutoComplete") != null && !((Map) data).get("multiAutoComplete").toString().isEmpty()? Boolean.parseBoolean( ((Map) data).get("multiAutoComplete").toString()) : false); } return this; } @@ -52,7 +52,7 @@ public class ExternalDatasetsData extends FieldData { public Map toMap(Element item) { HashMap dataMap = new HashMap(); dataMap.put("label", item != null && item.getAttributes().getLength() > 0? item.getAttribute("label") : ""); - dataMap.put("multiAutoComplete", item != null && item.getAttributes().getLength() > 0? item.getAttribute("multiAutoComplete") : false); + dataMap.put("multiAutoComplete", item != null && item.getAttributes().getLength() > 0? Boolean.parseBoolean(item.getAttribute("multiAutocomplete")) : false); return dataMap; } } diff --git a/dmp-backend/web/src/main/java/eu/eudat/models/data/components/commons/datafield/OrganizationsData.java b/dmp-backend/web/src/main/java/eu/eudat/models/data/components/commons/datafield/OrganizationsData.java index afb0d29a3..0ae171e38 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/models/data/components/commons/datafield/OrganizationsData.java +++ b/dmp-backend/web/src/main/java/eu/eudat/models/data/components/commons/datafield/OrganizationsData.java @@ -21,7 +21,7 @@ public class OrganizationsData extends FieldData { public OrganizationsData fromData(Object data) { if (data != null) { this.setLabel((String) ((Map) data).get("label")); - this.setMultiAutoComplete(((Map) data).get("multiAutoComplete") != null ? (Boolean) ((Map) data).get("multiAutoComplete") : false); + this.setMultiAutoComplete(((Map) data).get("multiAutoComplete") != null && !((Map) data).get("multiAutoComplete").toString().isEmpty()? Boolean.parseBoolean( ((Map) data).get("multiAutoComplete").toString()) : false); } return this; } @@ -52,7 +52,7 @@ public class OrganizationsData extends FieldData { public Map toMap(Element item) { HashMap dataMap = new HashMap(); dataMap.put("label", item != null && item.getAttributes().getLength() > 0? item.getAttribute("label") : ""); - dataMap.put("multiAutoComplete", item != null && item.getAttributes().getLength() > 0? item.getAttribute("multiAutoComplete") : false); + dataMap.put("multiAutoComplete", item != null && item.getAttributes().getLength() > 0? Boolean.parseBoolean(item.getAttribute("multiAutocomplete")) : false); return dataMap; } } diff --git a/dmp-backend/web/src/main/java/eu/eudat/models/data/components/commons/datafield/RegistriesData.java b/dmp-backend/web/src/main/java/eu/eudat/models/data/components/commons/datafield/RegistriesData.java index 03b4761ca..2de478246 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/models/data/components/commons/datafield/RegistriesData.java +++ b/dmp-backend/web/src/main/java/eu/eudat/models/data/components/commons/datafield/RegistriesData.java @@ -21,7 +21,7 @@ public class RegistriesData extends FieldData { public RegistriesData fromData(Object data) { if (data != null) { this.setLabel((String) ((Map) data).get("label")); - this.setMultiAutoComplete((Boolean) ((Map) data).get("multiAutoComplete")); + this.setMultiAutoComplete(((Map) data).get("multiAutoComplete") != null && !((Map) data).get("multiAutoComplete").toString().isEmpty()?Boolean.parseBoolean( ((Map) data).get("multiAutoComplete").toString()): false); } return this; } @@ -52,7 +52,7 @@ public class RegistriesData extends FieldData { public Map toMap(Element item) { HashMap dataMap = new HashMap(); dataMap.put("label", item != null && item.getAttributes().getLength() > 0? item.getAttribute("label") : ""); - dataMap.put("multiAutoComplete", item != null && item.getAttributes().getLength() > 0? item.getAttribute("multiAutoComplete") : false); + dataMap.put("multiAutoComplete", item != null && item.getAttributes().getLength() > 0? Boolean.parseBoolean(item.getAttribute("multiAutocomplete")) : false); return dataMap; } } diff --git a/dmp-backend/web/src/main/java/eu/eudat/models/data/components/commons/datafield/ResearcherData.java b/dmp-backend/web/src/main/java/eu/eudat/models/data/components/commons/datafield/ResearcherData.java index 91e07b5b9..c76260736 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/models/data/components/commons/datafield/ResearcherData.java +++ b/dmp-backend/web/src/main/java/eu/eudat/models/data/components/commons/datafield/ResearcherData.java @@ -21,7 +21,7 @@ public class ResearcherData extends FieldData { public ResearcherData fromData(Object data) { if (data != null) { this.setLabel((String) ((Map) data).get("label")); - this.setMultiAutoComplete(((Map) data).get("multiAutoComplete") != null ? (Boolean) ((Map) data).get("multiAutoComplete") : false); + this.setMultiAutoComplete(((Map) data).get("multiAutoComplete") != null && !((Map) data).get("multiAutoComplete").toString().isEmpty()? Boolean.parseBoolean( ((Map) data).get("multiAutoComplete").toString()) : false); } return this; } @@ -52,7 +52,7 @@ public class ResearcherData extends FieldData { public Map toMap(Element item) { HashMap dataMap = new HashMap(); dataMap.put("label", item != null && item.getAttributes().getLength() > 0 ? item.getAttribute("label") : ""); - dataMap.put("multiAutoComplete", item != null && item.getAttributes().getLength() > 0 ? item.getAttribute("multiAutoComplete") : false); + dataMap.put("multiAutoComplete", item != null && item.getAttributes().getLength() > 0 ? Boolean.parseBoolean(item.getAttribute("multiAutocomplete")) : false); return dataMap; } } diff --git a/dmp-backend/web/src/main/java/eu/eudat/models/data/components/commons/datafield/ServicesData.java b/dmp-backend/web/src/main/java/eu/eudat/models/data/components/commons/datafield/ServicesData.java index a2c614ba1..897f7586e 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/models/data/components/commons/datafield/ServicesData.java +++ b/dmp-backend/web/src/main/java/eu/eudat/models/data/components/commons/datafield/ServicesData.java @@ -21,7 +21,7 @@ public class ServicesData extends FieldData { public ServicesData fromData(Object data) { if (data != null) { this.setLabel((String) ((Map) data).get("label")); - this.setMultiAutoComplete(((Map) data).get("multiAutoComplete") != null ? (Boolean) ((Map) data).get("multiAutoComplete") : false); + this.setMultiAutoComplete(((Map) data).get("multiAutoComplete") != null && !((Map) data).get("multiAutoComplete").toString().isEmpty()? Boolean.parseBoolean( ((Map) data).get("multiAutoComplete").toString()) : false); } return this; } @@ -52,7 +52,7 @@ public class ServicesData extends FieldData { public Map toMap(Element item) { HashMap dataMap = new HashMap(); dataMap.put("label", item != null && item.getAttributes().getLength() > 0? item.getAttribute("label") : ""); - dataMap.put("multiAutoComplete", item != null && item.getAttributes().getLength() > 0? item.getAttribute("multiAutoComplete") : false); + dataMap.put("multiAutoComplete", item != null && item.getAttributes().getLength() > 0? Boolean.parseBoolean(item.getAttribute("multiAutocomplete")) : false); return dataMap; } }