Author: tilman
Date: Wed Jun 18 17:35:59 2014
New Revision: 1603546
URL: http://svn.apache.org/r1603546
Log:
PDFBOX-2147: use foreach loop
Modified:
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/cos/COSDictionary.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfviewer/font/TTFGlyph2D.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfwriter/COSWriter.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/documentinterchange/taggedpdf/PDStandardAttributeObject.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/documentinterchange/taggedpdf/StandardStructureTypes.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/encryption/PDEncryption.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/encryption/PublicKeySecurityHandler.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/fdf/FDFAnnotation.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDTrueTypeFont.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/measurement/PDRectlinearMeasureDictionary.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/util/PDFHighlighter.java
pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/util/TestTextStripper.java
pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/util/TestTextStripperPerformance.java
Modified:
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/cos/COSDictionary.java
URL:
http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/cos/COSDictionary.java?rev=1603546&r1=1603545&r2=1603546&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/cos/COSDictionary.java
(original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/cos/COSDictionary.java
Wed Jun 18 17:35:59 2014
@@ -1440,34 +1440,33 @@ public class COSDictionary extends COSBa
}
}
- /**
- * Nice method, gives you every object you want
- * Arrays works properly too. Try "P/Annots/[k]/Rect"
- * where k means the index of the Annotsarray.
- *
- * @param objPath the relative path to the object.
- * @return the object
- */
- public COSBase getObjectFromPath(String objPath)
- {
- COSBase retval = null;
- String[] path = objPath.split(PATH_SEPARATOR);
- retval = this;
-
- for (int i = 0; i < path.length; i++)
- {
- if(retval instanceof COSArray)
- {
- int idx = new
Integer(path[i].replaceAll("\\[","").replaceAll("\\]","")).intValue();
- retval = ((COSArray)retval).getObject(idx);
- }
- else if (retval instanceof COSDictionary)
- {
- retval =
((COSDictionary)retval).getDictionaryObject( path[i] );
- }
- }
- return retval;
- }
+ /**
+ * Nice method, gives you every object you want
+ * Arrays works properly too. Try "P/Annots/[k]/Rect"
+ * where k means the index of the Annotsarray.
+ *
+ * @param objPath the relative path to the object.
+ * @return the object
+ */
+ public COSBase getObjectFromPath(String objPath)
+ {
+ COSBase retval = null;
+ String[] path = objPath.split(PATH_SEPARATOR);
+ retval = this;
+ for (String pathString : path)
+ {
+ if (retval instanceof COSArray)
+ {
+ int idx = new Integer(pathString.replaceAll("\\[",
"").replaceAll("\\]", "")).intValue();
+ retval = ((COSArray) retval).getObject(idx);
+ }
+ else if (retval instanceof COSDictionary)
+ {
+ retval = ((COSDictionary)
retval).getDictionaryObject(pathString);
+ }
+ }
+ return retval;
+ }
/**
* Returns an unmodifiable view of this dictionary.
Modified:
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfviewer/font/TTFGlyph2D.java
URL:
http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfviewer/font/TTFGlyph2D.java?rev=1603546&r1=1603545&r2=1603546&view=diff
==============================================================================
---
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfviewer/font/TTFGlyph2D.java
(original)
+++
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfviewer/font/TTFGlyph2D.java
Wed Jun 18 17:35:59 2014
@@ -122,24 +122,24 @@ public class TTFGlyph2D implements Glyph
{
// get all relevant CMaps
CMAPEncodingEntry[] cmaps = cmapTable.getCmaps();
- for (int i = 0; i < cmaps.length; i++)
+ for (CMAPEncodingEntry cmap : cmaps)
{
- if (CMAPTable.PLATFORM_WINDOWS == cmaps[i].getPlatformId())
+ if (CMAPTable.PLATFORM_WINDOWS == cmap.getPlatformId())
{
- if (CMAPTable.ENCODING_UNICODE ==
cmaps[i].getPlatformEncodingId())
+ if (CMAPTable.ENCODING_UNICODE ==
cmap.getPlatformEncodingId())
{
- cmapWinUnicode = cmaps[i];
+ cmapWinUnicode = cmap;
}
- else if (CMAPTable.ENCODING_SYMBOL ==
cmaps[i].getPlatformEncodingId())
+ else if (CMAPTable.ENCODING_SYMBOL ==
cmap.getPlatformEncodingId())
{
- cmapWinSymbol = cmaps[i];
+ cmapWinSymbol = cmap;
}
}
- else if (CMAPTable.PLATFORM_MACINTOSH ==
cmaps[i].getPlatformId())
+ else if (CMAPTable.PLATFORM_MACINTOSH == cmap.getPlatformId())
{
- if (CMAPTable.ENCODING_SYMBOL ==
cmaps[i].getPlatformEncodingId())
+ if (CMAPTable.ENCODING_SYMBOL ==
cmap.getPlatformEncodingId())
{
- cmapMacintoshSymbol = cmaps[i];
+ cmapMacintoshSymbol = cmap;
}
}
}
Modified:
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfwriter/COSWriter.java
URL:
http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfwriter/COSWriter.java?rev=1603546&r1=1603545&r2=1603546&view=diff
==============================================================================
---
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfwriter/COSWriter.java
(original)
+++
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfwriter/COSWriter.java
Wed Jun 18 17:35:59 2014
@@ -620,12 +620,11 @@ public class COSWriter implements ICOSVi
writeXrefEntry(COSWriterXRefEntry.getNullEntry());
// write entry for every object
long lastObjectNumber = 0;
- for (Iterator<COSWriterXRefEntry> i = getXRefEntries().iterator();
i.hasNext();)
+ for (COSWriterXRefEntry entry : getXRefEntries())
{
- COSWriterXRefEntry entry = i.next();
while( lastObjectNumber<entry.getKey().getNumber()-1 )
{
- writeXrefEntry(COSWriterXRefEntry.getNullEntry());
+ writeXrefEntry(COSWriterXRefEntry.getNullEntry());
}
lastObjectNumber = entry.getKey().getNumber();
writeXrefEntry(entry);
Modified:
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/documentinterchange/taggedpdf/PDStandardAttributeObject.java
URL:
http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/documentinterchange/taggedpdf/PDStandardAttributeObject.java?rev=1603546&r1=1603545&r2=1603546&view=diff
==============================================================================
---
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/documentinterchange/taggedpdf/PDStandardAttributeObject.java
(original)
+++
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/documentinterchange/taggedpdf/PDStandardAttributeObject.java
Wed Jun 18 17:35:59 2014
@@ -123,9 +123,9 @@ public abstract class PDStandardAttribut
{
COSBase oldBase = this.getCOSDictionary().getDictionaryObject(name);
COSArray array = new COSArray();
- for (int i = 0; i < values.length; i++)
+ for (String value : values)
{
- array.add(new COSString(values[i]));
+ array.add(new COSString(value));
}
this.getCOSDictionary().setItem(name, array);
COSBase newBase = this.getCOSDictionary().getDictionaryObject(name);
@@ -210,9 +210,9 @@ public abstract class PDStandardAttribut
{
COSBase oldBase = this.getCOSDictionary().getDictionaryObject(name);
COSArray array = new COSArray();
- for (int i = 0; i < values.length; i++)
+ for (String value : values)
{
- array.add(COSName.getPDFName(values[i]));
+ array.add(COSName.getPDFName(value));
}
this.getCOSDictionary().setItem(name, array);
COSBase newBase = this.getCOSDictionary().getDictionaryObject(name);
Modified:
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/documentinterchange/taggedpdf/StandardStructureTypes.java
URL:
http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/documentinterchange/taggedpdf/StandardStructureTypes.java?rev=1603546&r1=1603545&r2=1603546&view=diff
==============================================================================
---
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/documentinterchange/taggedpdf/StandardStructureTypes.java
(original)
+++
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/documentinterchange/taggedpdf/StandardStructureTypes.java
Wed Jun 18 17:35:59 2014
@@ -303,19 +303,17 @@ public class StandardStructureTypes
static
{
Field[] fields = StandardStructureTypes.class.getFields();
- for (int i = 0; i < fields.length; i++)
+ for (Field field : fields)
{
- if (Modifier.isFinal(fields[i].getModifiers()))
+ if (Modifier.isFinal(field.getModifiers()))
{
try
{
- types.add(fields[i].get(null).toString());
- }
- catch (IllegalArgumentException e)
+ types.add(field.get(null).toString());
+ }catch (IllegalArgumentException e)
{
LOG.error(e,e);
- }
- catch (IllegalAccessException e)
+ }catch (IllegalAccessException e)
{
LOG.error(e,e);
}
Modified:
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/encryption/PDEncryption.java
URL:
http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/encryption/PDEncryption.java?rev=1603546&r1=1603545&r2=1603546&view=diff
==============================================================================
---
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/encryption/PDEncryption.java
(original)
+++
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/encryption/PDEncryption.java
Wed Jun 18 17:35:59 2014
@@ -425,10 +425,10 @@ public class PDEncryption
public void setRecipients(byte[][] recipients) throws IOException
{
COSArray array = new COSArray();
- for(int i=0; i<recipients.length; i++)
+ for (byte[] recipient : recipients)
{
COSString recip = new COSString();
- recip.append(recipients[i]);
+ recip.append(recipient);
recip.setForceLiteralForm(true);
array.add(recip);
}
Modified:
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/encryption/PublicKeySecurityHandler.java
URL:
http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/encryption/PublicKeySecurityHandler.java?rev=1603546&r1=1603545&r2=1603546&view=diff
==============================================================================
---
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/encryption/PublicKeySecurityHandler.java
(original)
+++
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/encryption/PublicKeySecurityHandler.java
Wed Jun 18 17:35:59 2014
@@ -210,13 +210,11 @@ public final class PublicKeySecurityHand
// put each bytes of the recipients array in the sha1 input
int sha1InputOffset = 20;
- for(int i=0; i<recipientFieldsBytes.length; i++)
- {
- System.arraycopy(
- recipientFieldsBytes[i], 0,
- sha1Input, sha1InputOffset,
recipientFieldsBytes[i].length);
- sha1InputOffset += recipientFieldsBytes[i].length;
- }
+ for (byte[] recipientFieldsByte : recipientFieldsBytes)
+ {
+ System.arraycopy(recipientFieldsByte, 0, sha1Input,
sha1InputOffset, recipientFieldsByte.length);
+ sha1InputOffset += recipientFieldsByte.length;
+ }
MessageDigest md = MessageDigests.getSHA1();
byte[] mdResult = md.digest(sha1Input);
Modified:
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/fdf/FDFAnnotation.java
URL:
http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/fdf/FDFAnnotation.java?rev=1603546&r1=1603545&r2=1603546&view=diff
==============================================================================
---
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/fdf/FDFAnnotation.java
(original)
+++
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/fdf/FDFAnnotation.java
Wed Jun 18 17:35:59 2014
@@ -97,41 +97,41 @@ public abstract class FDFAnnotation impl
if( flags != null )
{
String[] flagTokens = flags.split( "," );
- for( int i=0; i< flagTokens.length; i++ )
+ for (String flagToken : flagTokens)
{
- if( flagTokens[i].equals( "invisible" ) )
+ if (flagToken.equals("invisible"))
{
setInvisible( true );
}
- else if( flagTokens[i].equals( "hidden" ) )
+ else if (flagToken.equals("hidden"))
{
setHidden( true );
}
- else if( flagTokens[i].equals( "print" ) )
+ else if (flagToken.equals("print"))
{
setPrinted( true );
}
- else if( flagTokens[i].equals( "nozoom" ) )
+ else if (flagToken.equals("nozoom"))
{
setNoZoom( true );
}
- else if( flagTokens[i].equals( "norotate" ) )
+ else if (flagToken.equals("norotate"))
{
setNoRotate( true );
}
- else if( flagTokens[i].equals( "noview" ) )
+ else if (flagToken.equals("noview"))
{
setNoView( true );
}
- else if( flagTokens[i].equals( "readonly" ) )
+ else if (flagToken.equals("readonly"))
{
setReadOnly( true );
}
- else if( flagTokens[i].equals( "locked" ) )
+ else if (flagToken.equals("locked"))
{
setLocked( true );
}
- else if( flagTokens[i].equals( "togglenoview" ) )
+ else if (flagToken.equals("togglenoview"))
{
setToggleNoView( true );
}
Modified:
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDTrueTypeFont.java
URL:
http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDTrueTypeFont.java?rev=1603546&r1=1603545&r2=1603546&view=diff
==============================================================================
---
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDTrueTypeFont.java
(original)
+++
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDTrueTypeFont.java
Wed Jun 18 17:35:59 2014
@@ -309,15 +309,14 @@ public class PDTrueTypeFont extends PDSi
CMAPTable cmapTable = ttf.getCMAP();
CMAPEncodingEntry[] cmaps = cmapTable.getCmaps();
CMAPEncodingEntry uniMap = null;
-
- for (int i = 0; i < cmaps.length; i++)
+ for (CMAPEncodingEntry cmapEncodingEntry : cmaps)
{
- if (cmaps[i].getPlatformId() == CMAPTable.PLATFORM_WINDOWS)
+ if (cmapEncodingEntry.getPlatformId() ==
CMAPTable.PLATFORM_WINDOWS)
{
- int platformEncoding = cmaps[i].getPlatformEncodingId();
+ int platformEncoding =
cmapEncodingEntry.getPlatformEncodingId();
if (CMAPTable.ENCODING_UNICODE == platformEncoding)
{
- uniMap = cmaps[i];
+ uniMap = cmapEncodingEntry;
break;
}
}
Modified:
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/measurement/PDRectlinearMeasureDictionary.java
URL:
http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/measurement/PDRectlinearMeasureDictionary.java?rev=1603546&r1=1603545&r2=1603546&view=diff
==============================================================================
---
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/measurement/PDRectlinearMeasureDictionary.java
(original)
+++
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/measurement/PDRectlinearMeasureDictionary.java
Wed Jun 18 17:35:59 2014
@@ -102,9 +102,9 @@ public class PDRectlinearMeasureDictiona
public void setChangeXs(PDNumberFormatDictionary[] changeXs)
{
COSArray array = new COSArray();
- for (int i = 0; i < changeXs.length; i++)
+ for (PDNumberFormatDictionary changeX : changeXs)
{
- array.add(changeXs[i]);
+ array.add(changeX);
}
this.getDictionary().setItem("X", array);
}
@@ -139,9 +139,9 @@ public class PDRectlinearMeasureDictiona
public void setChangeYs(PDNumberFormatDictionary[] changeYs)
{
COSArray array = new COSArray();
- for (int i = 0; i < changeYs.length; i++)
+ for (PDNumberFormatDictionary changeY : changeYs)
{
- array.add(changeYs[i]);
+ array.add(changeY);
}
this.getDictionary().setItem("Y", array);
}
@@ -176,9 +176,9 @@ public class PDRectlinearMeasureDictiona
public void setDistances(PDNumberFormatDictionary[] distances)
{
COSArray array = new COSArray();
- for (int i = 0; i < distances.length; i++)
+ for (PDNumberFormatDictionary distance : distances)
{
- array.add(distances[i]);
+ array.add(distance);
}
this.getDictionary().setItem("D", array);
}
@@ -213,9 +213,9 @@ public class PDRectlinearMeasureDictiona
public void setAreas(PDNumberFormatDictionary[] areas)
{
COSArray array = new COSArray();
- for (int i = 0; i < areas.length; i++)
+ for (PDNumberFormatDictionary area : areas)
{
- array.add(areas[i]);
+ array.add(area);
}
this.getDictionary().setItem(COSName.A, array);
}
@@ -250,9 +250,9 @@ public class PDRectlinearMeasureDictiona
public void setAngles(PDNumberFormatDictionary[] angles)
{
COSArray array = new COSArray();
- for (int i = 0; i < angles.length; i++)
+ for (PDNumberFormatDictionary angle : angles)
{
- array.add(angles[i]);
+ array.add(angle);
}
this.getDictionary().setItem("T", array);
}
@@ -287,9 +287,9 @@ public class PDRectlinearMeasureDictiona
public void setLineSloaps(PDNumberFormatDictionary[] lineSloaps)
{
COSArray array = new COSArray();
- for (int i = 0; i < lineSloaps.length; i++)
+ for (PDNumberFormatDictionary lineSloap : lineSloaps)
{
- array.add(lineSloaps[i]);
+ array.add(lineSloap);
}
this.getDictionary().setItem("S", array);
}
Modified:
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/util/PDFHighlighter.java
URL:
http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/util/PDFHighlighter.java?rev=1603546&r1=1603545&r2=1603546&view=diff
==============================================================================
---
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/util/PDFHighlighter.java
(original)
+++
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/util/PDFHighlighter.java
Wed Jun 18 17:35:59 2014
@@ -120,10 +120,9 @@ public class PDFHighlighter extends PDFT
{
page = page.replaceAll("a[0-9]{1,3}", ".");
}
-
- for (int i = 0; i < searchedWords.length; i++)
+ for (String searchedWord : searchedWords)
{
- Pattern pattern = Pattern.compile(searchedWords[i],
Pattern.CASE_INSENSITIVE);
+ Pattern pattern = Pattern.compile(searchedWord,
Pattern.CASE_INSENSITIVE);
Matcher matcher = pattern.matcher(page);
while( matcher.find() )
{
Modified:
pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/util/TestTextStripper.java
URL:
http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/util/TestTextStripper.java?rev=1603546&r1=1603545&r2=1603546&view=diff
==============================================================================
---
pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/util/TestTextStripper.java
(original)
+++
pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/util/TestTextStripper.java
Wed Jun 18 17:35:59 2014
@@ -336,13 +336,12 @@ public class TestTextStripper extends Te
return (name.endsWith(".pdf"));
}
});
-
- for (int n = 0; n < testFiles.length; n++)
+ for (File testFile : testFiles)
{
//Test without sorting
- doTestFile(testFiles[n], outDir, false, false);
+ doTestFile(testFile, outDir, false, false);
//Test with sorting
- doTestFile(testFiles[n], outDir, false, true);
+ doTestFile(testFile, outDir, false, true);
}
}
Modified:
pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/util/TestTextStripperPerformance.java
URL:
http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/util/TestTextStripperPerformance.java?rev=1603546&r1=1603545&r2=1603546&view=diff
==============================================================================
---
pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/util/TestTextStripperPerformance.java
(original)
+++
pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/util/TestTextStripperPerformance.java
Wed Jun 18 17:35:59 2014
@@ -125,9 +125,9 @@ public class TestTextStripperPerformance
File outDirFile = new File(outDir);
if (outDirFile.mkdirs())
{
- for (int n = 0; n < testFiles.length; n++)
+ for (File testFile : testFiles)
{
- doTestFile(testFiles[n], outDir, false);
+ doTestFile(testFile, outDir, false);
}
}
}
