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/07/27 08:15:24 UTC
svn commit: r1613756 - in /pdfbox/trunk/jempbox/src:
main/java/org/apache/jempbox/xmp/ test/java/org/apache/jempbox/xmp/
Author: tilman
Date: Sun Jul 27 06:15:23 2014
New Revision: 1613756
URL: http://svn.apache.org/r1613756
Log:
PDFBOX-2147: Removed unnecessary boxing, unboxing; convert to foreach loop
Modified:
pdfbox/trunk/jempbox/src/main/java/org/apache/jempbox/xmp/XMPMetadata.java
pdfbox/trunk/jempbox/src/main/java/org/apache/jempbox/xmp/XMPSchema.java
pdfbox/trunk/jempbox/src/main/java/org/apache/jempbox/xmp/XMPSchemaPhotoshop.java
pdfbox/trunk/jempbox/src/test/java/org/apache/jempbox/xmp/XMPSchemaTest.java
Modified: pdfbox/trunk/jempbox/src/main/java/org/apache/jempbox/xmp/XMPMetadata.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/jempbox/src/main/java/org/apache/jempbox/xmp/XMPMetadata.java?rev=1613756&r1=1613755&r2=1613756&view=diff
==============================================================================
--- pdfbox/trunk/jempbox/src/main/java/org/apache/jempbox/xmp/XMPMetadata.java (original)
+++ pdfbox/trunk/jempbox/src/main/java/org/apache/jempbox/xmp/XMPMetadata.java Sun Jul 27 06:15:23 2014
@@ -580,8 +580,8 @@ public class XMPMetadata
Thumbnail t = new Thumbnail(metadata);
t.setFormat(Thumbnail.FORMAT_JPEG);
t.setImage("IMAGE_DATA");
- t.setHeight(new Integer(100));
- t.setWidth(new Integer(200));
+ t.setHeight(100);
+ t.setWidth(200);
basic.setThumbnail(t);
basic.setBaseURL("http://www.pdfbox.org/");
@@ -755,10 +755,8 @@ public class XMPMetadata
*/
public void merge(XMPMetadata metadata) throws IOException
{
- List<XMPSchema> schemas2 = metadata.getSchemas();
- for (Iterator<XMPSchema> iterator = schemas2.iterator(); iterator.hasNext();)
+ for (XMPSchema schema2 : metadata.getSchemas())
{
- XMPSchema schema2 = iterator.next();
XMPSchema schema1 = getSchemaByClass(schema2.getClass());
if (schema1 == null)
{
Modified: pdfbox/trunk/jempbox/src/main/java/org/apache/jempbox/xmp/XMPSchema.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/jempbox/src/main/java/org/apache/jempbox/xmp/XMPSchema.java?rev=1613756&r1=1613755&r2=1613756&view=diff
==============================================================================
--- pdfbox/trunk/jempbox/src/main/java/org/apache/jempbox/xmp/XMPSchema.java (original)
+++ pdfbox/trunk/jempbox/src/main/java/org/apache/jempbox/xmp/XMPSchema.java Sun Jul 27 06:15:23 2014
@@ -289,7 +289,7 @@ public class XMPSchema
String value = null;
if (bool != null)
{
- value = bool.booleanValue() ? "True" : "False";
+ value = bool ? "True" : "False";
}
setTextProperty(propertyName, value);
}
@@ -695,9 +695,9 @@ public class XMPSchema
if (strings != null)
{
retval = new ArrayList<Calendar>();
- for (int i = 0; i < strings.size(); i++)
+ for (String string : strings)
{
- retval.add(DateConverter.toCalendar(strings.get(i)));
+ retval.add(DateConverter.toCalendar(string));
}
}
return retval;
Modified: pdfbox/trunk/jempbox/src/main/java/org/apache/jempbox/xmp/XMPSchemaPhotoshop.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/jempbox/src/main/java/org/apache/jempbox/xmp/XMPSchemaPhotoshop.java?rev=1613756&r1=1613755&r2=1613756&view=diff
==============================================================================
--- pdfbox/trunk/jempbox/src/main/java/org/apache/jempbox/xmp/XMPSchemaPhotoshop.java (original)
+++ pdfbox/trunk/jempbox/src/main/java/org/apache/jempbox/xmp/XMPSchemaPhotoshop.java Sun Jul 27 06:15:23 2014
@@ -338,7 +338,7 @@ public class XMPSchemaPhotoshop extends
{
if( s != null )
{
- if( s.intValue() < 1 || s.intValue() > 8 )
+ if( s < 1 || s > 8 )
{
throw new RuntimeException( "Error: photoshop:Urgency must be between 1 and 8. value=" + s );
}
@@ -355,4 +355,4 @@ public class XMPSchemaPhotoshop extends
{
return getIntegerProperty(prefix + ":Urgency");
}
-}
\ No newline at end of file
+}
Modified: pdfbox/trunk/jempbox/src/test/java/org/apache/jempbox/xmp/XMPSchemaTest.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/jempbox/src/test/java/org/apache/jempbox/xmp/XMPSchemaTest.java?rev=1613756&r1=1613755&r2=1613756&view=diff
==============================================================================
--- pdfbox/trunk/jempbox/src/test/java/org/apache/jempbox/xmp/XMPSchemaTest.java (original)
+++ pdfbox/trunk/jempbox/src/test/java/org/apache/jempbox/xmp/XMPSchemaTest.java Sun Jul 27 06:15:23 2014
@@ -28,8 +28,6 @@ import javax.xml.parsers.ParserConfigura
import junit.framework.TestCase;
import org.apache.jempbox.impl.DateConverter;
-import org.apache.jempbox.xmp.XMPMetadata;
-import org.apache.jempbox.xmp.XMPSchema;
import org.w3c.dom.Element;
/**
@@ -119,19 +117,19 @@ public class XMPSchemaTest extends TestC
XMPMetadata xmp = new XMPMetadata();
XMPSchema schema = new XMPSchema(xmp, "test", "http://test.com/test");
- schema.setIntegerProperty("test:intvalue", new Integer(14));
+ schema.setIntegerProperty("test:intvalue", 14);
Element e = schema.getElement();
assertEquals("14", e.getAttribute("test:intvalue"));
- assertEquals(new Integer(14),schema.getIntegerProperty("test:intvalue"));
+ assertEquals(14, (int) schema.getIntegerProperty("test:intvalue"));
- schema.setIntegerProperty("test:intvalue",new Integer(16));
+ schema.setIntegerProperty("test:intvalue", 16);
e = schema.getElement();
assertEquals("16", e.getAttribute("test:intvalue"));
- assertEquals(new Integer(16), schema.getIntegerProperty("test:intvalue"));
+ assertEquals(16, (int) schema.getIntegerProperty("test:intvalue"));
}
/**