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/10 08:28:14 UTC
svn commit: r1609404 - in /pdfbox/trunk/pdfbox/src:
main/java/org/apache/pdfbox/pdfparser/ main/java/org/apache/pdfbox/pdmodel/
main/java/org/apache/pdfbox/pdmodel/common/
main/java/org/apache/pdfbox/pdmodel/common/function/type4/
main/java/org/apache/...
Author: tilman
Date: Thu Jul 10 06:28:14 2014
New Revision: 1609404
URL: http://svn.apache.org/r1609404
Log:
PDFBOX-2147: Removed unneccesary unboxing
Modified:
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfparser/PDFXrefStreamParser.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/PDPage.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/common/PDNumberTreeNode.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/common/function/type4/ExecutionContext.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/state/PDExtendedGraphicsState.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/form/PDField.java
pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/common/function/type4/Type4Tester.java
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfparser/PDFXrefStreamParser.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfparser/PDFXrefStreamParser.java?rev=1609404&r1=1609403&r2=1609404&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfparser/PDFXrefStreamParser.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfparser/PDFXrefStreamParser.java Thu Jul 10 06:28:14 2014
@@ -145,7 +145,7 @@ public class PDFXrefStreamParser extends
{
genNum += (currLine[i + w0 + w1] & 0x00ff) << ((w2 - i - 1) * 8);
}
- COSObjectKey objKey = new COSObjectKey(objID.intValue(), genNum);
+ COSObjectKey objKey = new COSObjectKey(objID, genNum);
xrefTrailerResolver.setXRef(objKey, offset);
break;
case 2:
@@ -168,7 +168,7 @@ public class PDFXrefStreamParser extends
{
objstmObjNr += (currLine[i + w0] & 0x00ff) << ((w1 - i - 1) * 8);
}
- objKey = new COSObjectKey( objID.intValue(), 0 );
+ objKey = new COSObjectKey( objID, 0 );
xrefTrailerResolver.setXRef( objKey, -objstmObjNr );
break;
default:
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/PDPage.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/PDPage.java?rev=1609404&r1=1609403&r2=1609404&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/PDPage.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/PDPage.java Thu Jul 10 06:28:14 2014
@@ -572,7 +572,7 @@ public class PDPage implements COSObject
Integer rotation = getRotation();
if (rotation != null)
{
- retval = rotation.intValue();
+ retval = rotation;
}
else
{
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/common/PDNumberTreeNode.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/common/PDNumberTreeNode.java?rev=1609404&r1=1609403&r2=1609404&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/common/PDNumberTreeNode.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/common/PDNumberTreeNode.java Thu Jul 10 06:28:14 2014
@@ -311,7 +311,7 @@ public class PDNumberTreeNode implements
}
if ( upper != null)
{
- arr.setInt( 1, upper.intValue() );
+ arr.setInt( 1, upper);
}
else
{
@@ -352,7 +352,7 @@ public class PDNumberTreeNode implements
}
if ( lower != null )
{
- arr.setInt( 0, lower.intValue() );
+ arr.setInt( 0, lower);
}
else
{
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/common/function/type4/ExecutionContext.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/common/function/type4/ExecutionContext.java?rev=1609404&r1=1609403&r2=1609404&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/common/function/type4/ExecutionContext.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/common/function/type4/ExecutionContext.java Thu Jul 10 06:28:14 2014
@@ -73,7 +73,7 @@ public class ExecutionContext
*/
public int popInt()
{
- return ((Integer)stack.pop()).intValue();
+ return ((Integer)stack.pop());
}
/**
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/state/PDExtendedGraphicsState.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/state/PDExtendedGraphicsState.java?rev=1609404&r1=1609403&r2=1609404&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/state/PDExtendedGraphicsState.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/state/PDExtendedGraphicsState.java Thu Jul 10 06:28:14 2014
@@ -127,11 +127,11 @@ public class PDExtendedGraphicsState imp
}
else if( key.equals( COSName.FL ) )
{
- gs.setFlatness( getFlatnessTolerance().floatValue() );
+ gs.setFlatness( getFlatnessTolerance() );
}
else if( key.equals( COSName.SM ) )
{
- gs.setSmoothness( getSmoothnessTolerance().floatValue() );
+ gs.setSmoothness( getSmoothnessTolerance() );
}
else if( key.equals( COSName.SA ) )
{
@@ -139,11 +139,11 @@ public class PDExtendedGraphicsState imp
}
else if( key.equals( COSName.CA ) )
{
- gs.setAlphaConstants( getStrokingAlpaConstant().floatValue() );
+ gs.setAlphaConstants( getStrokingAlpaConstant() );
}
else if( key.equals( COSName.CA_NS ) )
{
- gs.setNonStrokeAlphaConstants(getNonStrokingAlpaConstant().floatValue() );
+ gs.setNonStrokeAlphaConstants(getNonStrokingAlpaConstant() );
}
else if( key.equals( COSName.AIS ) )
{
@@ -599,7 +599,7 @@ public class PDExtendedGraphicsState imp
}
else
{
- graphicsState.setItem( key, new COSFloat( value.floatValue() ) );
+ graphicsState.setItem( key, new COSFloat( value) );
}
}
}
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/form/PDField.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/form/PDField.java?rev=1609404&r1=1609403&r2=1609404&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/form/PDField.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/form/PDField.java Thu Jul 10 06:28:14 2014
@@ -317,7 +317,7 @@ public abstract class PDField implements
Integer ff = fdfField.getFieldFlags();
if (ff != null)
{
- setFieldFlags(ff.intValue());
+ setFieldFlags(ff);
}
else
{
@@ -326,7 +326,7 @@ public abstract class PDField implements
if (setFf != null)
{
- int setFfInt = setFf.intValue();
+ int setFfInt = setFf;
fieldFlags = fieldFlags | setFfInt;
setFieldFlags(fieldFlags);
}
@@ -342,7 +342,7 @@ public abstract class PDField implements
// clrFf = 1101
// clrFfValue = 0010;
// newValue = 1011 & 0010 which is 0010
- int clrFfValue = clrFf.intValue();
+ int clrFfValue = clrFf;
clrFfValue ^= 0xFFFFFFFF;
fieldFlags = fieldFlags & clrFfValue;
setFieldFlags(fieldFlags);
@@ -356,7 +356,7 @@ public abstract class PDField implements
Integer f = fdfField.getWidgetFieldFlags();
if (f != null && widget != null)
{
- widget.setAnnotationFlags(f.intValue());
+ widget.setAnnotationFlags(f);
}
else
{
@@ -364,7 +364,7 @@ public abstract class PDField implements
Integer setF = fdfField.getSetWidgetFieldFlags();
if (setF != null)
{
- annotFlags = annotFlags | setF.intValue();
+ annotFlags = annotFlags | setF;
widget.setAnnotationFlags(annotFlags);
}
@@ -379,7 +379,7 @@ public abstract class PDField implements
// clrF = 1101
// clrFValue = 0010;
// newValue = 1011 & 0010 which is 0010
- int clrFValue = clrF.intValue();
+ int clrFValue = clrF;
clrFValue ^= 0xFFFFFFFFL;
annotFlags = annotFlags & clrFValue;
widget.setAnnotationFlags(annotFlags);
Modified: pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/common/function/type4/Type4Tester.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/common/function/type4/Type4Tester.java?rev=1609404&r1=1609403&r2=1609404&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/common/function/type4/Type4Tester.java (original)
+++ pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/common/function/type4/Type4Tester.java Thu Jul 10 06:28:14 2014
@@ -78,7 +78,7 @@ public class Type4Tester
public Type4Tester popReal(float expected, double delta)
{
Float value = (Float)context.getStack().pop();
- Assert.assertEquals(expected, value.floatValue(), delta);
+ Assert.assertEquals(expected, value, delta);
return this;
}