svn commit: r1652511 - /pdfbox/trunk/xmpbox/src/main/java/org/apache/xmpbox/type/TypeMapping.java

[ti...@apache.org]

Author: tilman
Date: Fri Jan 16 20:00:01 2015
New Revision: 1652511

URL: http://svn.apache.org/r1652511
Log:
PDFBOX-2576: replace map with EnumMap; set fields final; fix javadoc

Modified:
    pdfbox/trunk/xmpbox/src/main/java/org/apache/xmpbox/type/TypeMapping.java

Modified: pdfbox/trunk/xmpbox/src/main/java/org/apache/xmpbox/type/TypeMapping.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/xmpbox/src/main/java/org/apache/xmpbox/type/TypeMapping.java?rev=1652511&r1=1652510&r2=1652511&view=diff
==============================================================================
--- pdfbox/trunk/xmpbox/src/main/java/org/apache/xmpbox/type/TypeMapping.java (original)
+++ pdfbox/trunk/xmpbox/src/main/java/org/apache/xmpbox/type/TypeMapping.java Fri Jan 16 20:00:01 2015
@@ -26,6 +26,7 @@ import java.lang.reflect.Constructor;
 import java.lang.reflect.Field;
 import java.lang.reflect.InvocationTargetException;
 import java.util.Calendar;
+import java.util.EnumMap;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -61,7 +62,7 @@ public final class TypeMapping
 
     private Map<String, PropertiesDescription> definedStructuredMappings;
 
-    private XMPMetadata metadata;
+    private final XMPMetadata metadata;
 
     private Map<String, XMPSchemaFactory> schemaMap;
 
@@ -71,13 +72,13 @@ public final class TypeMapping
         initialize();
     }
 
-    private static Class<?>[] simplePropertyConstParams = new Class<?>[] { XMPMetadata.class, String.class,
+    private static final Class<?>[] simplePropertyConstParams = new Class<?>[] { XMPMetadata.class, String.class,
             String.class, String.class, Object.class };
 
     private void initialize()
     {
         // structured types
-        structuredMappings = new HashMap<Types, PropertiesDescription>();
+        structuredMappings = new EnumMap<Types, PropertiesDescription>(Types.class);
         structuredNamespaces = new HashMap<String, Types>();
         for (Types type : Types.values())
         {
@@ -111,7 +112,6 @@ public final class TypeMapping
         addNameSpace(ExifSchema.class);
         addNameSpace(TiffSchema.class);
         addNameSpace(XMPageTextSchema.class);
-
     }
 
     public void addToDefinedStructuredTypes(String typeName, String ns, PropertiesDescription pm)
@@ -270,6 +270,7 @@ public final class TypeMapping
      *            Metadata to link the new schema
      * @param namespace
      *            The namespace URI
+     * @param prefix The namespace prefix
      * @return Schema representation
      * @throws XmpSchemaException
      *             When Instancing specified Object Schema failed
@@ -317,6 +318,7 @@ public final class TypeMapping
      * @param name
      *            the property Qualified Name
      * @return Property type declared for namespace specified, null if unknown
+     * @throws org.apache.xmpbox.type.BadFieldValueException if the name was not found.
      */
     public PropertyType getSpecifiedPropertyType(QName name) throws BadFieldValueException
     {
@@ -467,16 +469,19 @@ public final class TypeMapping
         return new PropertyType()
         {
 
+            @Override
             public Class<? extends Annotation> annotationType()
             {
                 return null;
             }
 
+            @Override
             public Types type()
             {
                 return type;
             }
 
+            @Override
             public Cardinality card()
             {
                 return card;