PDFBOX-6133: refactor

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

Author: THausherr

xmpbox/src/main/java/org/apache/xmpbox/type/TypeMapping.java

@@ -341,22 +341,19 @@ public PropertyType getSpecifiedPropertyType(QName qName, String parentTypeName)
             }
             return null;
         }
-        else
+        // try in defined
+        if (!definedStructuredNamespaces2.containsKey(qName.getNamespaceURI()))
         {
-            // try in defined
-            if (!definedStructuredNamespaces2.containsKey(qName.getNamespaceURI()))
-            {
-                // not found
-                if (factory != null)
-                {
-                    return null; // pre PDFBOX-6133 behavior
-                }
-                throw new BadFieldValueException("No descriptor found for " + qName);
-            }
-            else
+            // not found
+            if (factory != null)
             {
-                return createPropertyType(Types.DefinedType, Cardinality.Simple);
+                return null; // pre PDFBOX-6133 behavior
             }
+            throw new BadFieldValueException("No descriptor found for " + qName);
+        }
+        else
+        {
+            return createPropertyType(Types.DefinedType, Cardinality.Simple);
         }
     }