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/09 23:53:13 UTC
svn commit: r1609322 - in
/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox: pdmodel/common/
pdmodel/fdf/ pdmodel/interactive/form/ rendering/ util/
Author: tilman
Date: Wed Jul 9 21:53:12 2014
New Revision: 1609322
URL: http://svn.apache.org/r1609322
Log:
PDFBOX-2147: replace for with foreach
Modified:
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/common/COSArrayList.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/common/PDNumberTreeNode.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/fdf/FDFDictionary.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/fdf/FDFField.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/form/PDAcroForm.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/form/PDAppearanceString.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/form/PDField.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/form/PDRadioButton.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/rendering/PageDrawer.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/util/PDFCloneUtility.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/util/PDFMarkedContentExtractor.java
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/common/COSArrayList.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/common/COSArrayList.java?rev=1609322&r1=1609321&r2=1609322&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/common/COSArrayList.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/common/COSArrayList.java Wed Jul 9 21:53:12 2014
@@ -372,9 +372,9 @@ public class COSArrayList<E> implements
public static COSArray convertStringListToCOSNameCOSArray( List<String> strings )
{
COSArray retval = new COSArray();
- for( int i=0; i<strings.size(); i++ )
+ for (String string : strings)
{
- retval.add( COSName.getPDFName( strings.get( i ) ) );
+ retval.add(COSName.getPDFName(string));
}
return retval;
}
@@ -390,9 +390,9 @@ public class COSArrayList<E> implements
public static COSArray convertStringListToCOSStringCOSArray( List<String> strings )
{
COSArray retval = new COSArray();
- for( int i=0; i<strings.size(); i++ )
+ for (String string : strings)
{
- retval.add( new COSString( strings.get( i ) ) );
+ retval.add(new COSString(string));
}
return retval;
}
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=1609322&r1=1609321&r2=1609322&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 Wed Jul 9 21:53:12 2014
@@ -259,9 +259,8 @@ public class PDNumberTreeNode implements
List<Integer> keys = new ArrayList<Integer>( numbers.keySet() );
Collections.sort( keys );
COSArray array = new COSArray();
- for( int i=0; i<keys.size(); i++ )
+ for (Integer key : keys)
{
- Integer key = keys.get(i);
array.add( COSInteger.get( key ) );
COSObjectable obj = (COSObjectable)numbers.get( key );
array.add( obj );
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/fdf/FDFDictionary.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/fdf/FDFDictionary.java?rev=1609322&r1=1609321&r2=1609322&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/fdf/FDFDictionary.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/fdf/FDFDictionary.java Wed Jul 9 21:53:12 2014
@@ -166,9 +166,9 @@ public class FDFDictionary implements CO
if( fields != null && fields.size() > 0 )
{
output.write( "<fields>\n" );
- for( int i=0; i<fields.size(); i++ )
+ for (Object field : fields)
{
- ((FDFField)fields.get( i )).writeXML( output );
+ ((FDFField) field).writeXML(output);
}
output.write( "</fields>\n" );
}
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/fdf/FDFField.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/fdf/FDFField.java?rev=1609322&r1=1609321&r2=1609322&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/fdf/FDFField.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/fdf/FDFField.java Wed Jul 9 21:53:12 2014
@@ -135,9 +135,9 @@ public class FDFField implements COSObje
List<FDFField> kids = getKids();
if( kids != null )
{
- for( int i=0; i<kids.size(); i++ )
+ for (FDFField kid : kids)
{
- ((FDFField)kids.get( i ) ).writeXML( output );
+ ((FDFField) kid).writeXML(output);
}
}
output.write( "</field>\n");
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/form/PDAcroForm.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/form/PDAcroForm.java?rev=1609322&r1=1609321&r2=1609322&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/form/PDAcroForm.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/form/PDAcroForm.java Wed Jul 9 21:53:12 2014
@@ -110,9 +110,9 @@ public final class PDAcroForm implements
List fields = fdf.getCatalog().getFDF().getFields();
if( fields != null )
{
- for( int i=0; i<fields.size(); i++ )
+ for (Object field : fields)
{
- FDFField fdfField = (FDFField)fields.get( i );
+ FDFField fdfField = (FDFField) field;
PDField docField = getField( fdfField.getPartialFieldName() );
if( docField != null )
{
@@ -162,9 +162,9 @@ public final class PDAcroForm implements
if( kids != null )
{
- for( int i=0; i<kids.size(); i++ )
+ for (Object kid : kids)
{
- addFieldAndChildren( (PDField)kids.get( i ), childFDFFields );
+ addFieldAndChildren((PDField) kid, childFDFFields);
}
if( childFDFFields.size() > 0 )
{
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/form/PDAppearanceString.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/form/PDAppearanceString.java?rev=1609322&r1=1609321&r2=1609322&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/form/PDAppearanceString.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/form/PDAppearanceString.java Wed Jul 9 21:53:12 2014
@@ -290,12 +290,12 @@ public final class PDAppearanceString
ContentStreamWriter writer = new ContentStreamWriter( output );
float fontSize = calculateFontSize( pdFont, appearanceStream.getBoundingBox(), tokens, null );
boolean foundString = false;
- for( int i=0; i<tokens.size(); i++ )
+ for (Object token : tokens)
{
- if( tokens.get( i ) instanceof COSString )
+ if (token instanceof COSString)
{
foundString = true;
- COSString drawnString =((COSString)tokens.get(i));
+ COSString drawnString = (COSString) token;
drawnString.reset();
drawnString.append( apValue.getBytes("ISO-8859-1") );
}
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=1609322&r1=1609321&r2=1609322&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 Wed Jul 9 21:53:12 2014
@@ -392,9 +392,9 @@ public abstract class PDField implements
{
FDFField fdfChild = fdfKids.get(i);
String fdfName = fdfChild.getPartialFieldName();
- for (int j = 0; j < pdKids.size(); j++)
+ for (COSObjectable pdKid : pdKids)
{
- Object pdChildObj = pdKids.get(j);
+ Object pdChildObj = pdKid;
if (pdChildObj instanceof PDField)
{
PDField pdChild = (PDField) pdChildObj;
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/form/PDRadioButton.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/form/PDRadioButton.java?rev=1609322&r1=1609321&r2=1609322&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/form/PDRadioButton.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/form/PDRadioButton.java Wed Jul 9 21:53:12 2014
@@ -81,13 +81,14 @@ public final class PDRadioButton extends
*
* {@inheritDoc}
*/
+ @Override
public void setValue(String value) throws IOException
{
getDictionary().setString( COSName.V, value );
List kids = getKids();
- for (int i = 0; i < kids.size(); i++)
+ for (Object kid : kids)
{
- PDField field = (PDField)kids.get(i);
+ PDField field = (PDField) kid;
if ( field instanceof PDCheckbox )
{
PDCheckbox btn = (PDCheckbox)field;
@@ -110,16 +111,17 @@ public final class PDRadioButton extends
*
* @throws IOException If there is an error getting the value.
*/
+ @Override
public String getValue() throws IOException
{
String retval = null;
List kids = getKids();
- for (int i = 0; i < kids.size(); i++)
+ for (Object kid : kids)
{
- PDField kid = (PDField)kids.get(i);
- if ( kid instanceof PDCheckbox )
+ PDField field = (PDField) kid;
+ if ( field instanceof PDCheckbox )
{
- PDCheckbox btn = (PDCheckbox)kid;
+ PDCheckbox btn = (PDCheckbox)field;
if( btn.isChecked() )
{
retval = btn.getOnValue();
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/rendering/PageDrawer.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/rendering/PageDrawer.java?rev=1609322&r1=1609321&r2=1609322&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/rendering/PageDrawer.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/rendering/PageDrawer.java Wed Jul 9 21:53:12 2014
@@ -184,9 +184,9 @@ public class PageDrawer extends PDFStrea
}
List<PDAnnotation> annotations = page.getAnnotations();
- for (int i = 0; i < annotations.size(); i++)
+ for (PDAnnotation annotation : annotations)
{
- PDAnnotation annot = (PDAnnotation) annotations.get(i);
+ PDAnnotation annot = (PDAnnotation) annotation;
PDRectangle rect = annot.getRectangle();
String appearanceName = annot.getAppearanceStream();
PDAppearanceDictionary appearDictionary = annot.getAppearance();
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/util/PDFCloneUtility.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/util/PDFCloneUtility.java?rev=1609322&r1=1609321&r2=1609322&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/util/PDFCloneUtility.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/util/PDFCloneUtility.java Wed Jul 9 21:53:12 2014
@@ -83,9 +83,9 @@ public class PDFCloneUtility
{
COSArray array = new COSArray();
List list = (List)base;
- for( int i=0; i<list.size(); i++ )
+ for (Object obj : list)
{
- array.add( cloneForNewDocument( list.get( i ) ) );
+ array.add(cloneForNewDocument(obj));
}
retval = array;
}
@@ -188,9 +188,9 @@ public class PDFCloneUtility
{
COSArray array = new COSArray();
List list = (List)base;
- for( int i = 0; i < list.size(); i++ )
+ for (Object obj : list)
{
- array.add( cloneForNewDocument( list.get( i ) ) );
+ array.add(cloneForNewDocument(obj));
}
((List)target).add(array);
}
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/util/PDFMarkedContentExtractor.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/util/PDFMarkedContentExtractor.java?rev=1609322&r1=1609321&r2=1609322&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/util/PDFMarkedContentExtractor.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/util/PDFMarkedContentExtractor.java Wed Jul 9 21:53:12 2014
@@ -193,14 +193,13 @@ public class PDFMarkedContentExtractor e
//
boolean suppressCharacter = false;
float tolerance = (text.getWidth()/textCharacter.length())/3.0f;
- for( int i=0; i<sameTextCharacters.size(); i++ )
+ for (TextPosition sameTextCharacter : sameTextCharacters)
{
- TextPosition character = (TextPosition)sameTextCharacters.get( i );
+ TextPosition character = (TextPosition) sameTextCharacter;
String charCharacter = character.getUnicode();
float charX = character.getX();
float charY = character.getY();
//only want to suppress
-
if( charCharacter != null &&
//charCharacter.equals( textCharacter ) &&
within( charX, textX, tolerance ) &&