PDFBOX-5660: refactor

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

Author: THausherr

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

@@ -695,30 +695,27 @@ private AbstractField parseLiElement(XMPMetadata xmp, QName descriptor, Element
             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)