PDFBOX-6121: avoid ClassCastException elsewhere

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

Author: THausherr

xmpbox/src/main/java/org/apache/xmpbox/schema/AdobePDFSchema.java

@@ -80,8 +80,7 @@ public AdobePDFSchema(XMPMetadata metadata, String ownPrefix)
      */
     public void setKeywords(String value)
     {
-        TextType keywords;
-        keywords = createTextType(KEYWORDS, value);
+        TextType keywords = createTextType(KEYWORDS, value);
         addProperty(keywords);
     }
 
@@ -104,8 +103,7 @@ public void setKeywordsProperty(TextType keywords)
      */
     public void setPDFVersion(String value)
     {
-        TextType version;
-        version = createTextType(PDF_VERSION, value);
+        TextType version = createTextType(PDF_VERSION, value);
         addProperty(version);
 
     }
@@ -129,8 +127,7 @@ public void setPDFVersionProperty(TextType version)
      */
     public void setProducer(String value)
     {
-        TextType producer;
-        producer = createTextType(PRODUCER, value);
+        TextType producer = createTextType(PRODUCER, value);
         addProperty(producer);
     }
 

xmpbox/src/main/java/org/apache/xmpbox/schema/ExifSchema.java

@@ -295,7 +295,7 @@ public ExifSchema(XMPMetadata metadata, String ownPrefix)
      */
     public ArrayProperty getUserCommentProperty()
     {
-        return (ArrayProperty) getProperty(USER_COMMENT);
+        return getPropertyAs(USER_COMMENT, ArrayProperty.class);
     }
 
     /**

xmpbox/src/main/java/org/apache/xmpbox/schema/PDFAExtensionSchema.java

@@ -63,7 +63,7 @@ public PDFAExtensionSchema(XMPMetadata metadata, String prefix)
      */
     public ArrayProperty getSchemasProperty()
     {
-        return (ArrayProperty) getProperty(SCHEMAS);
+        return getPropertyAs(SCHEMAS, ArrayProperty.class);
     }
 
 }

xmpbox/src/main/java/org/apache/xmpbox/schema/PhotoshopSchema.java

@@ -117,12 +117,12 @@ public PhotoshopSchema(XMPMetadata metadata, String ownPrefix)
 
     public URIType getAncestorIDProperty()
     {
-        return (URIType) getProperty(ANCESTORID);
+        return getPropertyAs(ANCESTORID, URIType.class);
     }
 
     public String getAncestorID()
     {
-        TextType tt = ((TextType) getProperty(ANCESTORID));
+        TextType tt = getAncestorIDProperty();
         return tt == null ? null : tt.getStringValue();
     }
 
@@ -139,12 +139,12 @@ public void setAncestorIDProperty(URIType text)
 
     public TextType getAuthorsPositionProperty()
     {
-        return (TextType) getProperty(AUTHORS_POSITION);
+        return getPropertyAs(AUTHORS_POSITION, TextType.class);
     }
 
     public String getAuthorsPosition()
     {
-        TextType tt = ((TextType) getProperty(AUTHORS_POSITION));
+        TextType tt = getAuthorsPositionProperty();
         return tt == null ? null : tt.getStringValue();
     }
 
@@ -161,12 +161,12 @@ public void setAuthorsPositionProperty(TextType text)
 
     public TextType getCaptionWriterProperty()
     {
-        return (TextType) getProperty(CAPTION_WRITER);
+        return getPropertyAs(CAPTION_WRITER, TextType.class);
     }
 
     public String getCaptionWriter()
     {
-        TextType tt = ((TextType) getProperty(CAPTION_WRITER));
+        TextType tt = getCaptionWriterProperty();
         return tt == null ? null : tt.getStringValue();
     }
 
@@ -183,12 +183,12 @@ public void setCaptionWriterProperty(ProperNameType text)
 
     public TextType getCategoryProperty()
     {
-        return (TextType) getProperty(CATEGORY);
+        return getPropertyAs(CATEGORY, TextType.class);
     }
 
     public String getCategory()
     {
-        TextType tt = ((TextType) getProperty(CATEGORY));
+        TextType tt = getCategoryProperty();
         return tt == null ? null : tt.getStringValue();
     }
 
@@ -205,12 +205,12 @@ public void setCategoryProperty(TextType text)
 
     public TextType getCityProperty()
     {
-        return (TextType) getProperty(CITY);
+        return getPropertyAs(CITY, TextType.class);
     }
 
     public String getCity()
     {
-        TextType tt = ((TextType) getProperty(CITY));
+        TextType tt = getCityProperty();
         return tt == null ? null : tt.getStringValue();
     }
 
@@ -227,12 +227,12 @@ public void setCityProperty(TextType text)
 
     public IntegerType getColorModeProperty()
     {
-        return (IntegerType) getProperty(COLOR_MODE);
+        return getPropertyAs(COLOR_MODE, IntegerType.class);
     }
 
     public Integer getColorMode()
     {
-        IntegerType tt = ((IntegerType) getProperty(COLOR_MODE));
+        IntegerType tt = getColorModeProperty();
         return tt == null ? null : tt.getValue();
     }
 
@@ -249,12 +249,12 @@ public void setColorModeProperty(IntegerType text)
 
     public TextType getCountryProperty()
     {
-        return (TextType) getProperty(COUNTRY);
+        return getPropertyAs(COUNTRY, TextType.class);
     }
 
     public String getCountry()
     {
-        TextType tt = ((TextType) getProperty(COUNTRY));
+        TextType tt = getCountryProperty();
         return tt == null ? null : tt.getStringValue();
     }
 
@@ -271,12 +271,12 @@ public void setCountryProperty(TextType text)
 
     public TextType getCreditProperty()
     {
-        return (TextType) getProperty(CREDIT);
+        return getPropertyAs(CREDIT, TextType.class);
     }
 
     public String getCredit()
     {
-        TextType tt = ((TextType) getProperty(CREDIT));
+        TextType tt = getCreditProperty();
         return tt == null ? null : tt.getStringValue();
     }
 
@@ -293,12 +293,12 @@ public void setCreditProperty(TextType text)
 
     public DateType getDateCreatedProperty()
     {
-        return (DateType) getProperty(DATE_CREATED);
+        return getPropertyAs(DATE_CREATED, DateType.class);
     }
 
     public String getDateCreated()
     {
-        TextType tt = ((TextType) getProperty(DATE_CREATED));
+        TextType tt = ((TextType) getProperty(DATE_CREATED)); //TODO cast looks highly suspicious
         return tt == null ? null : tt.getStringValue();
     }
 
@@ -320,7 +320,7 @@ public void addDocumentAncestors(String text)
 
     public ArrayProperty getDocumentAncestorsProperty()
     {
-        return (ArrayProperty) getProperty(DOCUMENT_ANCESTORS);
+        return getPropertyAs(DOCUMENT_ANCESTORS, ArrayProperty.class);
     }
 
     public List<String> getDocumentAncestors()
@@ -330,12 +330,12 @@ public List<String> getDocumentAncestors()
 
     public TextType getHeadlineProperty()
     {
-        return (TextType) getProperty(HEADLINE);
+        return getPropertyAs(HEADLINE, TextType.class);
     }
 
     public String getHeadline()
     {
-        TextType tt = ((TextType) getProperty(HEADLINE));
+        TextType tt = getHeadlineProperty();
         return tt == null ? null : tt.getStringValue();
     }
 
@@ -352,12 +352,12 @@ public void setHeadlineProperty(TextType text)
 
     public TextType getHistoryProperty()
     {
-        return (TextType) getProperty(HISTORY);
+        return getPropertyAs(HISTORY, TextType.class);
     }
 
     public String getHistory()
     {
-        TextType tt = ((TextType) getProperty(HISTORY));
+        TextType tt = getHistoryProperty();
         return tt == null ? null : tt.getStringValue();
     }
 
@@ -374,12 +374,12 @@ public void setHistoryProperty(TextType text)
 
     public TextType getICCProfileProperty()
     {
-        return (TextType) getProperty(ICC_PROFILE);
+        return getPropertyAs(ICC_PROFILE, TextType.class);
     }
 
     public String getICCProfile()
     {
-        TextType tt = ((TextType) getProperty(ICC_PROFILE));
+        TextType tt = getICCProfileProperty();
         return tt == null ? null : tt.getStringValue();
     }
 
@@ -396,12 +396,12 @@ public void setICCProfileProperty(TextType text)
 
     public TextType getInstructionsProperty()
     {
-        return (TextType) getProperty(INSTRUCTIONS);
+        return getPropertyAs(INSTRUCTIONS, TextType.class);
     }
 
     public String getInstructions()
     {
-        TextType tt = ((TextType) getProperty(INSTRUCTIONS));
+        TextType tt = getInstructionsProperty();
         return tt == null ? null : tt.getStringValue();
     }
 
@@ -419,12 +419,12 @@ public void setInstructionsProperty(TextType text)
 
     public TextType getSourceProperty()
     {
-        return (TextType) getProperty(SOURCE);
+        return getPropertyAs(SOURCE, TextType.class);
     }
 
     public String getSource()
     {
-        TextType tt = ((TextType) getProperty(SOURCE));
+        TextType tt = getSourceProperty();
         return tt == null ? null : tt.getStringValue();
     }
 
@@ -441,12 +441,12 @@ public void setSourceProperty(TextType text)
 
     public TextType getStateProperty()
     {
-        return (TextType) getProperty(STATE);
+        return getPropertyAs(STATE, TextType.class);
     }
 
     public String getState()
     {
-        TextType tt = ((TextType) getProperty(STATE));
+        TextType tt = getStateProperty();
         return tt == null ? null : tt.getStringValue();
     }
 
@@ -463,12 +463,12 @@ public void setStateProperty(TextType text)
 
     public TextType getSupplementalCategoriesProperty()
     {
-        return (TextType) getProperty(SUPPLEMENTAL_CATEGORIES);
+        return getPropertyAs(SUPPLEMENTAL_CATEGORIES, TextType.class);
     }
 
     public String getSupplementalCategories()
     {
-        TextType tt = ((TextType) getProperty(SUPPLEMENTAL_CATEGORIES));
+        TextType tt = getSupplementalCategoriesProperty();
         return tt == null ? null : tt.getStringValue();
     }
 
@@ -522,12 +522,12 @@ public List<LayerType> getTextLayers() throws BadFieldValueException
 
     public TextType getTransmissionReferenceProperty()
     {
-        return (TextType) getProperty(TRANSMISSION_REFERENCE);
+        return getPropertyAs(TRANSMISSION_REFERENCE, TextType.class);
     }
 
     public String getTransmissionReference()
     {
-        TextType tt = ((TextType) getProperty(TRANSMISSION_REFERENCE));
+        TextType tt = getTransmissionReferenceProperty();
         return tt == null ? null : tt.getStringValue();
     }
 
@@ -544,12 +544,12 @@ public void setTransmissionReferenceProperty(TextType text)
 
     public IntegerType getUrgencyProperty()
     {
-        return (IntegerType) getProperty(URGENCY);
+        return getPropertyAs(URGENCY, IntegerType.class);
     }
 
     public Integer getUrgency()
     {
-        IntegerType tt = ((IntegerType) getProperty(URGENCY));
+        IntegerType tt = getUrgencyProperty();
         return tt == null ? null : tt.getValue();
     }
 

xmpbox/src/main/java/org/apache/xmpbox/schema/TiffSchema.java

@@ -126,7 +126,7 @@ public TiffSchema(XMPMetadata metadata, String prefix)
      */
     public ProperNameType getArtistProperty()
     {
-        return (ProperNameType) getProperty(ARTIST);
+        return getPropertyAs(ARTIST, ProperNameType.class);
     }
 
     /**
@@ -136,7 +136,7 @@ public ProperNameType getArtistProperty()
      */
     public String getArtist()
     {
-        ProperNameType tt = (ProperNameType) getProperty(ARTIST);
+        ProperNameType tt = getArtistProperty();
         return tt == null ? null : tt.getStringValue();
     }
 
@@ -157,7 +157,7 @@ public void setArtist(String text)
      */
     public ArrayProperty getImageDescriptionProperty()
     {
-        return (ArrayProperty) getProperty(IMAGE_DESCRIPTION);
+        return getPropertyAs(IMAGE_DESCRIPTION, ArrayProperty.class);
     }
 
     /**
@@ -215,7 +215,7 @@ public void addImageDescription(String lang, String value)
      */
     public ArrayProperty getCopyrightProperty()
     {
-        return (ArrayProperty) getProperty(COPYRIGHT);
+        return getPropertyAs(COPYRIGHT, ArrayProperty.class);
     }
 
     /**