Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

MBS-13901: Add collection description element #40

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

MBS-13901: Add collection description element #40

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
71b0ae5
MBS-13901: Add collection description element
mwiencek Jan 13, 2025
fe6c322
Regenerate XSD schema and JAXB classes
mwiencek Jan 13, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 27 additions & 0 deletions brainz-mmd2-jaxb/src/main/java/org/musicbrainz/mmd2/Collection.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
* <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
* <sequence>
* <element ref="{http://musicbrainz.org/ns/mmd-2.0#}name"/>
* <element ref="{http://musicbrainz.org/ns/mmd-2.0#}description" minOccurs="0"/>
* <element name="editor" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
* <element ref="{http://musicbrainz.org/ns/mmd-2.0#}area-list" minOccurs="0"/>
* <element ref="{http://musicbrainz.org/ns/mmd-2.0#}artist-list" minOccurs="0"/>
Expand Down Expand Up @@ -55,6 +56,7 @@
@XmlAccessorType(XmlAccessType.FIELD)
@XmlType(name = "", propOrder = {
"name",
"description",
"editor",
"areaList",
"artistList",
Expand All @@ -74,6 +76,7 @@ public class Collection {

@XmlElement(required = true)
protected String name;
protected String description;
protected String editor;
@XmlElement(name = "area-list")
protected AreaList areaList;
Expand Down Expand Up @@ -135,6 +138,30 @@ public void setName(String value) {
this.name = value;
}

/**
* Gets the value of the description property.
*
* @return
* possible object is
* {@link String }
*
*/
public String getDescription() {
return description;
}

/**
* Sets the value of the description property.
*
* @param value
* allowed object is
* {@link String }
*
*/
public void setDescription(String value) {
this.description = value;
}

/**
* Gets the value of the editor property.
*
Expand Down
3 changes: 2 additions & 1 deletion brainz-mmd2-jaxb/src/main/resources/musicbrainz_mmd-2.0.xsd
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
==================================================================
$Id: 9b44987ba812c058a5e79359a0b6f0f4370a3786 $
$Id: a00eba6318ee46201d4495da0a4608a8f61985e3 $

Relax NG Schema for MusicBrainz XML Metadata Version 2.0

Expand Down Expand Up @@ -784,6 +784,7 @@
<xs:complexType>
<xs:sequence>
<xs:element ref="mmd-2.0:name"/>
<xs:element minOccurs="0" ref="mmd-2.0:description"/>
<xs:element minOccurs="0" name="editor" type="xs:string"/>
<xs:element minOccurs="0" ref="mmd-2.0:area-list"/>
<xs:element minOccurs="0" ref="mmd-2.0:artist-list"/>
Expand Down
5 changes: 5 additions & 0 deletions schema/musicbrainz_mmd-2.0.rng
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1765,6 +1765,11 @@
<element name="name">
<text/>
</element>
<optional>
<element name="description">
<text/>
</element>
</optional>
<optional>
<element name="editor">
<text/>
Expand Down