You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pdfbox.apache.org by ti...@apache.org on 2014/11/08 00:01:15 UTC
svn commit: r1637480 - in
/pdfbox/trunk/xmpbox/src/main/java/org/apache/xmpbox/type: BooleanType.java
DateType.java IntegerType.java RealType.java TextType.java
Author: tilman
Date: Fri Nov 7 23:01:15 2014
New Revision: 1637480
URL: http://svn.apache.org/r1637480
Log:
PDFBOX-2485: improve error messages, minor clean up code in package
Modified:
pdfbox/trunk/xmpbox/src/main/java/org/apache/xmpbox/type/BooleanType.java
pdfbox/trunk/xmpbox/src/main/java/org/apache/xmpbox/type/DateType.java
pdfbox/trunk/xmpbox/src/main/java/org/apache/xmpbox/type/IntegerType.java
pdfbox/trunk/xmpbox/src/main/java/org/apache/xmpbox/type/RealType.java
pdfbox/trunk/xmpbox/src/main/java/org/apache/xmpbox/type/TextType.java
Modified: pdfbox/trunk/xmpbox/src/main/java/org/apache/xmpbox/type/BooleanType.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/xmpbox/src/main/java/org/apache/xmpbox/type/BooleanType.java?rev=1637480&r1=1637479&r2=1637480&view=diff
==============================================================================
--- pdfbox/trunk/xmpbox/src/main/java/org/apache/xmpbox/type/BooleanType.java (original)
+++ pdfbox/trunk/xmpbox/src/main/java/org/apache/xmpbox/type/BooleanType.java Fri Nov 7 23:01:15 2014
@@ -62,6 +62,7 @@ public class BooleanType extends Abstrac
*
* @return boolean the property value
*/
+ @Override
public Boolean getValue()
{
return booleanValue;
@@ -74,11 +75,12 @@ public class BooleanType extends Abstrac
* The value to set
*
*/
+ @Override
public void setValue(Object value)
{
if (value instanceof Boolean)
{
- booleanValue = ((Boolean) value).booleanValue();
+ booleanValue = (Boolean) value;
}
else if (value instanceof String)
{
Modified: pdfbox/trunk/xmpbox/src/main/java/org/apache/xmpbox/type/DateType.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/xmpbox/src/main/java/org/apache/xmpbox/type/DateType.java?rev=1637480&r1=1637479&r2=1637480&view=diff
==============================================================================
--- pdfbox/trunk/xmpbox/src/main/java/org/apache/xmpbox/type/DateType.java (original)
+++ pdfbox/trunk/xmpbox/src/main/java/org/apache/xmpbox/type/DateType.java Fri Nov 7 23:01:15 2014
@@ -74,6 +74,7 @@ public class DateType extends AbstractSi
*
* @return boolean
*/
+ @Override
public Calendar getValue()
{
return dateValue;
@@ -113,11 +114,14 @@ public class DateType extends AbstractSi
* @param value
* The value to set
*/
+ @Override
public void setValue(Object value)
{
if (!isGoodType(value))
{
- throw new IllegalArgumentException("Value given is not allowed for the Date type : " + value.getClass());
+ throw new IllegalArgumentException(
+ "Value given is not allowed for the Date type: "
+ + value.getClass() + ", value: " + value);
}
else
{
@@ -136,6 +140,7 @@ public class DateType extends AbstractSi
}
+ @Override
public String getStringValue()
{
return DateConverter.toISO8601(dateValue);
Modified: pdfbox/trunk/xmpbox/src/main/java/org/apache/xmpbox/type/IntegerType.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/xmpbox/src/main/java/org/apache/xmpbox/type/IntegerType.java?rev=1637480&r1=1637479&r2=1637480&view=diff
==============================================================================
--- pdfbox/trunk/xmpbox/src/main/java/org/apache/xmpbox/type/IntegerType.java (original)
+++ pdfbox/trunk/xmpbox/src/main/java/org/apache/xmpbox/type/IntegerType.java Fri Nov 7 23:01:15 2014
@@ -59,6 +59,7 @@ public class IntegerType extends Abstrac
*
* @return the property value
*/
+ @Override
public Integer getValue()
{
return integerValue;
@@ -70,11 +71,12 @@ public class IntegerType extends Abstrac
* @param value
* The value to set
*/
+ @Override
public void setValue(Object value)
{
if (value instanceof Integer)
{
- integerValue = ((Integer) value).intValue();
+ integerValue = (Integer) value;
}
else if (value instanceof String)
{
@@ -84,7 +86,7 @@ public class IntegerType extends Abstrac
else
{
// invalid type of value
- throw new IllegalArgumentException("Value given is not allowed for the Integer type.");
+ throw new IllegalArgumentException("Value given is not allowed for the Integer type: " + value);
}
}
Modified: pdfbox/trunk/xmpbox/src/main/java/org/apache/xmpbox/type/RealType.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/xmpbox/src/main/java/org/apache/xmpbox/type/RealType.java?rev=1637480&r1=1637479&r2=1637480&view=diff
==============================================================================
--- pdfbox/trunk/xmpbox/src/main/java/org/apache/xmpbox/type/RealType.java (original)
+++ pdfbox/trunk/xmpbox/src/main/java/org/apache/xmpbox/type/RealType.java Fri Nov 7 23:01:15 2014
@@ -59,6 +59,7 @@ public class RealType extends AbstractSi
*
* @return float the property value
*/
+ @Override
public Float getValue()
{
return realValue;
@@ -70,11 +71,12 @@ public class RealType extends AbstractSi
* @param value
* The value to set
*/
+ @Override
public void setValue(Object value)
{
if (value instanceof Float)
{
- realValue = ((Float) value).floatValue();
+ realValue = (Float) value;
}
else if (value instanceof String)
{
@@ -84,7 +86,7 @@ public class RealType extends AbstractSi
else
{
// invalid type of value
- throw new IllegalArgumentException("Value given is not allowed for the Real type.");
+ throw new IllegalArgumentException("Value given is not allowed for the Real type: " + value);
}
}
Modified: pdfbox/trunk/xmpbox/src/main/java/org/apache/xmpbox/type/TextType.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/xmpbox/src/main/java/org/apache/xmpbox/type/TextType.java?rev=1637480&r1=1637479&r2=1637480&view=diff
==============================================================================
--- pdfbox/trunk/xmpbox/src/main/java/org/apache/xmpbox/type/TextType.java (original)
+++ pdfbox/trunk/xmpbox/src/main/java/org/apache/xmpbox/type/TextType.java Fri Nov 7 23:01:15 2014
@@ -60,6 +60,7 @@ public class TextType extends AbstractSi
* @param value
* The value to set
*/
+ @Override
public void setValue(Object value)
{
if (!(value instanceof String))