PDFBOX-5660: refactor

git-svn-id: https://svn.apache.org/repos/asf/pdfbox/trunk@1930966 13f79535-47bb-0310-9956-ffa450edef68

Author: THausherr

xmpbox/src/main/java/org/apache/xmpbox/xml/DomXmpParser.java

@@ -700,7 +700,7 @@ private AbstractField parseLiElement(XMPMetadata xmp, QName descriptor, Element
         else
         {
             // PDFBOX-4325: assume it is structured
-            AbstractField af;
+            AbstractStructuredType af;
             try
             {
                 af = tm.instanciateStructuredType(type, descriptor.getLocalPart());
@@ -710,20 +710,16 @@ private AbstractField parseLiElement(XMPMetadata xmp, QName descriptor, Element
                 throw new XmpParsingException(ErrorType.InvalidType, "Parsing of structured type failed", ex);
             }
             loadAttributes(af, liElement);
-            if (af instanceof AbstractStructuredType)
+            PropertiesDescription pm;
+            if (type.isStructured())
             {
-                PropertiesDescription pm;
-                if (type.isStructured())
-                {
-                    pm = tm.getStructuredPropMapping(type);
-                }
-                else
-                {
-                    pm = tm.getDefinedDescriptionByNamespace(liElement.getNamespaceURI(), liElement.getLocalName());
-                }
-                af = tryParseAttributesAsProperties(tm, liElement, (AbstractStructuredType) af, pm, null);
+                pm = tm.getStructuredPropMapping(type);
             }
-            return af;
+            else
+            {
+                pm = tm.getDefinedDescriptionByNamespace(liElement.getNamespaceURI(), liElement.getLocalName());
+            }
+            return tryParseAttributesAsProperties(tm, liElement, af, pm, null);
         }
     }