Author: tilman
Date: Thu Jan 1 14:03:21 2026
New Revision: 1931035
Log:
PDFBOX-5660: refactor
Modified:
pdfbox/trunk/xmpbox/src/main/java/org/apache/xmpbox/xml/DomXmpParser.java
Modified:
pdfbox/trunk/xmpbox/src/main/java/org/apache/xmpbox/xml/DomXmpParser.java
==============================================================================
--- pdfbox/trunk/xmpbox/src/main/java/org/apache/xmpbox/xml/DomXmpParser.java
Thu Jan 1 14:03:17 2026 (r1931034)
+++ pdfbox/trunk/xmpbox/src/main/java/org/apache/xmpbox/xml/DomXmpParser.java
Thu Jan 1 14:03:21 2026 (r1931035)
@@ -695,30 +695,27 @@ public class DomXmpParser
loadAttributes(af, liElement);
return af;
}
+ // PDFBOX-4325: assume it is structured
+ AbstractStructuredType af;
+ try
+ {
+ af = tm.instanciateStructuredType(type, descriptor.getLocalPart());
+ }
+ catch (BadFieldValueException ex)
+ {
+ throw new XmpParsingException(ErrorType.InvalidType, "Parsing of
structured type failed", ex);
+ }
+ loadAttributes(af, liElement);
+ PropertiesDescription pm;
+ if (type.isStructured())
+ {
+ pm = tm.getStructuredPropMapping(type);
+ }
else
{
- // PDFBOX-4325: assume it is structured
- AbstractStructuredType af;
- try
- {
- af = tm.instanciateStructuredType(type,
descriptor.getLocalPart());
- }
- catch (BadFieldValueException ex)
- {
- throw new XmpParsingException(ErrorType.InvalidType, "Parsing
of structured type failed", ex);
- }
- loadAttributes(af, liElement);
- PropertiesDescription pm;
- if (type.isStructured())
- {
- pm = tm.getStructuredPropMapping(type);
- }
- else
- {
- pm =
tm.getDefinedDescriptionByNamespace(liElement.getNamespaceURI(),
liElement.getLocalName());
- }
- return tryParseAttributesAsProperties(tm, liElement, af, pm, null);
+ pm =
tm.getDefinedDescriptionByNamespace(liElement.getNamespaceURI(),
liElement.getLocalName());
}
+ return tryParseAttributesAsProperties(tm, liElement, af, pm, null);
}
private void loadAttributes(AbstractField sp, Element element)
