PDFBOX-5288: refactor

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

Author: THausherr

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

@@ -560,33 +560,30 @@ private AbstractField parseLiElement(XMPMetadata xmp, QName descriptor, Element
                 nsFinder.pop();
             }
         }
+        // no child
+        String text = liElement.getTextContent();
+        TypeMapping tm = xmp.getTypeMapping();
+        if (type.isSimple())
+        {
+            AbstractField af = tm.instanciateSimpleProperty(descriptor.getNamespaceURI(),
+                    descriptor.getPrefix(), descriptor.getLocalPart(), text, type);
+            loadAttributes(af, liElement);
+            return af;
+        }
         else
         {
-            // no child
-            String text = liElement.getTextContent();
-            TypeMapping tm = xmp.getTypeMapping();
-            if (type.isSimple())
+            // PDFBOX-4325: assume it is structured
+            AbstractField af;
+            try
             {
-                AbstractField af = tm.instanciateSimpleProperty(descriptor.getNamespaceURI(),
-                        descriptor.getPrefix(), descriptor.getLocalPart(), text, type);
-                loadAttributes(af, liElement);
-                return af;
+                af = tm.instanciateStructuredType(type, descriptor.getLocalPart());
             }
-            else
+            catch (BadFieldValueException ex)
             {
-                // PDFBOX-4325: assume it is structured
-                AbstractField 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);
-                return af;
+                throw new XmpParsingException(ErrorType.InvalidType, "Parsing of structured type failed", ex);
             }
+            loadAttributes(af, liElement);
+            return af;
         }
     }
 
@@ -617,30 +614,30 @@ else if (XmpConstants.DEFAULT_RDF_PREFIX.equals(attr.getPrefix())
         }
     }
 
-    private AbstractStructuredType parseLiDescription(XMPMetadata xmp, QName descriptor, Element liElement)
+    private AbstractStructuredType parseLiDescription(XMPMetadata xmp, QName descriptor, Element liDescriptionElement)
             throws XmpParsingException
     {
         TypeMapping tm = xmp.getTypeMapping();
-        List<Element> elements = DomHelper.getElementChildren(liElement);
-        if (elements.isEmpty())
+        List<Element> liDescriptionElementChildren = DomHelper.getElementChildren(liDescriptionElement);
+        if (liDescriptionElementChildren.isEmpty())
         {
             // The list is empty
             return null;
         }
         // Instantiate abstract structured type with hint from first element
-        Element first = elements.get(0);
-        nsFinder.push(first);
-        PropertyType ctype = checkPropertyDefinition(xmp, DomHelper.getQName(first));
+        Element firstLiDescriptionElementChild = liDescriptionElementChildren.get(0);
+        nsFinder.push(firstLiDescriptionElementChild);
+        PropertyType ctype = checkPropertyDefinition(xmp, DomHelper.getQName(firstLiDescriptionElementChild));
         if (ctype == null)
         {
-            throw new XmpParsingException(ErrorType.NoType, "ctype is null, first: " + first + 
-                    ", DomHelper.getQName(first): " + DomHelper.getQName(first));
+            throw new XmpParsingException(ErrorType.NoType, "ctype is null, first: " + firstLiDescriptionElementChild + 
+                    ", DomHelper.getQName(first): " + DomHelper.getQName(firstLiDescriptionElementChild));
         }
         Types tt = ctype.type();
-        AbstractStructuredType ast = instanciateStructured(tm, tt, descriptor.getLocalPart(), first.getNamespaceURI());
+        AbstractStructuredType ast = instanciateStructured(tm, tt, descriptor.getLocalPart(), firstLiDescriptionElementChild.getNamespaceURI());
 
-        ast.setNamespace(first.getNamespaceURI());
-        ast.setPrefix(first.getPrefix());
+        ast.setNamespace(firstLiDescriptionElementChild.getNamespaceURI());
+        ast.setPrefix(firstLiDescriptionElementChild.getPrefix());
 
         PropertiesDescription pm;
         if (tt.isStructured())
@@ -649,25 +646,25 @@ private AbstractStructuredType parseLiDescription(XMPMetadata xmp, QName descrip
         }
         else
         {
-            pm = tm.getDefinedDescriptionByNamespace(first.getNamespaceURI());
+            pm = tm.getDefinedDescriptionByNamespace(firstLiDescriptionElementChild.getNamespaceURI());
         }
-        for (Element element : elements)
+        for (Element liDescriptionElementChild : liDescriptionElementChildren)
         {
-            String prefix = element.getPrefix();
-            String name = element.getLocalName();
-            String namespace = element.getNamespaceURI();
+            String prefix = liDescriptionElementChild.getPrefix();
+            String name = liDescriptionElementChild.getLocalName();
+            String namespace = liDescriptionElementChild.getNamespaceURI();
             PropertyType type = pm.getPropertyType(name);
             if (type == null)
             {
                 // not defined
                 throw new XmpParsingException(ErrorType.NoType, "Type '" + name + "' not defined in "
-                        + element.getNamespaceURI());
+                        + liDescriptionElementChild.getNamespaceURI());
             }
             else if (type.card().isArray())
             {
                 ArrayProperty array = tm.createArrayProperty(namespace, prefix, name, type.card());
                 ast.getContainer().addProperty(array);
-                Element bagOrSeq = DomHelper.getUniqueElementChild(element);
+                Element bagOrSeq = DomHelper.getUniqueElementChild(liDescriptionElementChild);
                 List<Element> lis = DomHelper.getElementChildren(bagOrSeq);
                 for (Element element2 : lis)
                 {
@@ -681,8 +678,8 @@ else if (type.card().isArray())
             else if (type.type().isSimple())
             {
                 AbstractSimpleProperty sp = tm.instanciateSimpleProperty(namespace, prefix, name,
-                        element.getTextContent(), type.type());
-                loadAttributes(sp, element);
+                        liDescriptionElementChild.getTextContent(), type.type());
+                loadAttributes(sp, liDescriptionElementChild);
                 ast.getContainer().addProperty(sp);
             }
             else if (type.type().isStructured())
@@ -693,13 +690,13 @@ else if (type.type().isStructured())
                 inner.setPrefix(prefix);
                 ast.getContainer().addProperty(inner);
                 ComplexPropertyContainer cpc = inner.getContainer();
-                if (DomHelper.isParseTypeResource(element))
+                if (DomHelper.isParseTypeResource(liDescriptionElementChild))
                 {
-                    parseDescriptionInner(xmp, element, cpc);
+                    parseDescriptionInner(xmp, liDescriptionElementChild, cpc);
                 }
                 else
                 {
-                    Element descElement = DomHelper.getFirstChildElement(element);
+                    Element descElement = DomHelper.getFirstChildElement(liDescriptionElementChild);
                     if (descElement != null)
                     {
                         parseDescriptionInner(xmp, descElement, cpc);
@@ -708,7 +705,7 @@ else if (type.type().isStructured())
             }
             else
             {
-                throw new XmpParsingException(ErrorType.NoType, "Unidentified element to parse " + element + " (type="
+                throw new XmpParsingException(ErrorType.NoType, "Unidentified element to parse " + liDescriptionElementChild + " (type="
                         + type + ")");
             }