From 8a5f9d353687957d4436fd32ef789206fa7b3f42 Mon Sep 17 00:00:00 2001 From: George Kalampokis Date: Tue, 18 May 2021 13:45:41 +0300 Subject: [PATCH] Add support for nested sections --- .../datasetProfileModel/Section.java | 21 +++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/utilities/documents/xml/datasetProfileXml/datasetProfileModel/Section.java b/dmp-backend/web/src/main/java/eu/eudat/logic/utilities/documents/xml/datasetProfileXml/datasetProfileModel/Section.java index 3d3457fb4..7d29c6e7d 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/logic/utilities/documents/xml/datasetProfileXml/datasetProfileModel/Section.java +++ b/dmp-backend/web/src/main/java/eu/eudat/logic/utilities/documents/xml/datasetProfileXml/datasetProfileModel/Section.java @@ -3,6 +3,8 @@ package eu.eudat.logic.utilities.documents.xml.datasetProfileXml.datasetProfileM import javax.xml.bind.annotation.XmlAttribute; import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlRootElement; +import java.util.LinkedList; +import java.util.List; @XmlRootElement(name = "section") public class Section { @@ -15,6 +17,7 @@ public class Section { private String description; private String extendedDescription; private String title; + private List
section; @XmlAttribute(name = "id") public String getId() { @@ -99,6 +102,13 @@ public class Section { public eu.eudat.models.data.admin.components.datasetprofile.Section toAdminCompositeModelSection() { eu.eudat.models.data.admin.components.datasetprofile.Section sectionEntity = new eu.eudat.models.data.admin.components.datasetprofile.Section(); + List sectionsListEntity = new LinkedList<>(); + + if (this.section != null) { + for (Section xmlsection : this.section) { + sectionsListEntity.add(xmlsection.toAdminCompositeModelSection()); + } + } sectionEntity.setId(this.id); sectionEntity.setOrdinal(this.ordinal); sectionEntity.setTitle(this.title); @@ -110,7 +120,18 @@ public class Section { // fieldSetsEntity.add(xmpFieldSets.toAdminCompositeModelSection()); // } sectionEntity.setFieldSets(this.fieldSets.toAdminCompositeModelSection()); + + sectionEntity.setSections(sectionsListEntity); sectionEntity.setDefaultVisibility(this.defaultVisibility); return sectionEntity; } + + @XmlElement(name = "section") + public List
getSection() { + return section; + } + + public void setSection(List
section) { + this.section = section; + } }