From 65b1fae2b278833aa2d2eaf8dcd7a238907b3c5c Mon Sep 17 00:00:00 2001 From: Francesco Mangiacrapa Date: Thu, 23 Mar 2017 11:47:14 +0000 Subject: [PATCH] renamed type as "metadatatype" in order to avoid clashing git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-catalogue/gcubedatacatalogue-metadata-discovery@146289 82a268e6-3cf1-43bd-a215-b396298e98cf --- .../bean/jaxb/MetadataFormat.java | 29 +++++++++++++++++-- 1 file changed, 27 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/gcube/datacatalogue/metadatadiscovery/bean/jaxb/MetadataFormat.java b/src/main/java/org/gcube/datacatalogue/metadatadiscovery/bean/jaxb/MetadataFormat.java index 045acdb..f0d6b12 100644 --- a/src/main/java/org/gcube/datacatalogue/metadatadiscovery/bean/jaxb/MetadataFormat.java +++ b/src/main/java/org/gcube/datacatalogue/metadatadiscovery/bean/jaxb/MetadataFormat.java @@ -43,6 +43,9 @@ public class MetadataFormat implements Serializable{ @XmlElement(name = "metadatafield") private List metadataFields; + @XmlElement(name = "metadatatype", required=true) + private String metadataType = ""; + @XmlTransient private String metadataSource = null; @@ -57,6 +60,28 @@ public class MetadataFormat implements Serializable{ return metadataFields; } + /** + * Gets the metadata type. + * + * @return the metadataType + */ + public String getMetadataType() { + + return metadataType; + } + + + /** + * Sets the metadata type. + * + * @param metadataType the new metadata type + */ + public void setMetadataType(String metadataType) { + + this.metadataType = metadataType; + } + + /** @@ -142,8 +167,6 @@ public class MetadataFormat implements Serializable{ this.metadataCategories.add(metadataCategory); } - - /* (non-Javadoc) * @see java.lang.Object#toString() */ @@ -155,6 +178,8 @@ public class MetadataFormat implements Serializable{ builder.append(metadataCategories); builder.append(", metadataFields="); builder.append(metadataFields); + builder.append(", metadataType="); + builder.append(metadataType); builder.append(", metadataSource="); builder.append(metadataSource); builder.append("]");