Change property types to List/Set of String

veraPDF · May 15, 2024 · cc41c26 · cc41c26
1 parent 392c7ef
commit cc41c26
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 9 deletions.
diff --git a/src/main/java/SALayer.mdl b/src/main/java/SALayer.mdl
@@ -2,13 +2,15 @@ package org.verapdf.model.salayer;
 
 import org.verapdf.model.baselayer.Object;
 
+import java.util.List;
+
 type SAObject extends Object {
     % id of group in format id:<number>
     property structureID: String;
-    % comma separated list of error codes
-    property errorCodes: String;
-    % semicolon separated list of error arguments
-    property errorArguments: String;
+    % list of error codes
+    property errorCodes: List<String>;
+    % list of error arguments
+    property errorArguments: List<List<String>>;
 }
 
 % the class corresponding to the high level PDF document structure

diff --git a/src/main/java/SELayer.mdl b/src/main/java/SELayer.mdl
@@ -6,6 +6,8 @@ import org.verapdf.model.pdlayer.PDStructElem;
 
 import org.verapdf.model.coslayer.CosLang;
 
+import java.util.List;
+
 % the structure element with no mapping to the standard PDF 1.7 or PDF 2.0 tag
 type SENonStandard extends PDStructElem {
     % true, if the struct elem has non-standard type, which is not mapped to a standard type
@@ -189,8 +191,8 @@ type SEMathMLStructElem extends PDStructElem {
 
 % a content item such as text, image, lineart, shading or a form
 type SEContentItem extends Object {
-	% ampersand separated list of tags, associated with parents marked content sequences (first operand of the BMC/BDC operators)
-	property parentsTags: String;
+	% list of tags, associated with parents marked content sequences (first operand of the BMC/BDC operators)
+	property parentsTags: List<String>;
 	% type of the parent structure element for parent marked content sequence
 	property parentStructureTag: String;
 	% true, if parent struct element is a part of the structure tree

diff --git a/src/main/java/XMPLayer.mdl b/src/main/java/XMPLayer.mdl
@@ -1,7 +1,7 @@
 package org.verapdf.model.xmplayer;
 
 import org.verapdf.model.baselayer.Object;
-import java.util.List;
+import java.util.Set;
 
 % Parent type for all XMP objects
 type XMPObject extends Object {
@@ -46,8 +46,8 @@ type MainXMPPackage extends XMPPackage {
     % value of dc:title
     property dc_title: String;
 
-    % comma separated list of declarations
-    property declarations: String;
+    % set of declarations
+    property declarations: Set<String>;
 }
 
 % XMP property