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 2017/04/11 19:31:28 UTC
svn commit: r1791014 - in
/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfparser:
PDFXRefStream.java XrefTrailerResolver.java
Author: tilman
Date: Tue Apr 11 19:31:28 2017
New Revision: 1791014
URL: http://svn.apache.org/viewvc?rev=1791014&view=rev
Log:
PDFBOX-2852: use JDK7 syntax
Modified:
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfparser/PDFXRefStream.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfparser/XrefTrailerResolver.java
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfparser/PDFXRefStream.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfparser/PDFXRefStream.java?rev=1791014&r1=1791013&r2=1791014&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfparser/PDFXRefStream.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfparser/PDFXRefStream.java Tue Apr 11 19:31:28 2017
@@ -61,8 +61,8 @@ public class PDFXRefStream implements PD
public PDFXRefStream()
{
this.stream = new COSStream();
- streamData = new TreeMap<Long, Object>();
- objectNumbers = new TreeSet<Long>();
+ streamData = new TreeMap<>();
+ objectNumbers = new TreeSet<>();
}
/**
@@ -95,10 +95,11 @@ public class PDFXRefStream implements PD
}
stream.setItem(COSName.W, wAsArray);
- OutputStream outputStream = this.stream.createOutputStream(COSName.FLATE_DECODE);
- writeStreamData(outputStream, wEntry);
- outputStream.flush();
- outputStream.close();
+ try (OutputStream outputStream = this.stream.createOutputStream(COSName.FLATE_DECODE))
+ {
+ writeStreamData(outputStream, wEntry);
+ outputStream.flush();
+ }
Set<COSName> keySet = this.stream.keySet();
for ( COSName cosName : keySet )
@@ -228,10 +229,10 @@ public class PDFXRefStream implements PD
private List<Long> getIndexEntry()
{
- LinkedList<Long> linkedList = new LinkedList<Long>();
+ LinkedList<Long> linkedList = new LinkedList<>();
Long first = null;
Long length = null;
- Set<Long> objNumbers = new TreeSet<Long>();
+ Set<Long> objNumbers = new TreeSet<>();
// add object number 0 to the set
objNumbers.add(0L);
objNumbers.addAll(objectNumbers);
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfparser/XrefTrailerResolver.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfparser/XrefTrailerResolver.java?rev=1791014&r1=1791013&r2=1791014&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfparser/XrefTrailerResolver.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfparser/XrefTrailerResolver.java Tue Apr 11 19:31:28 2017
@@ -65,7 +65,7 @@ public class XrefTrailerResolver
private XRefType xrefType;
- private final Map<COSObjectKey, Long> xrefTable = new HashMap<COSObjectKey, Long>();
+ private final Map<COSObjectKey, Long> xrefTable = new HashMap<>();
/**
* Default constructor.
@@ -96,7 +96,7 @@ public class XrefTrailerResolver
STREAM
}
- private final Map<Long, XrefTrailerObj> bytePosToXrefMap = new HashMap<Long, XrefTrailerObj>();
+ private final Map<Long, XrefTrailerObj> bytePosToXrefMap = new HashMap<>();
private XrefTrailerObj curXrefTrailerObj = null;
private XrefTrailerObj resolvedXrefTrailer = null;
@@ -115,7 +115,7 @@ public class XrefTrailerResolver
return null;
}
Set<Long> offsets = bytePosToXrefMap.keySet();
- SortedSet<Long> sortedOffset = new TreeSet<Long>(offsets);
+ SortedSet<Long> sortedOffset = new TreeSet<>(offsets);
return bytePosToXrefMap.get(sortedOffset.first()).trailer;
}
@@ -131,7 +131,7 @@ public class XrefTrailerResolver
return null;
}
Set<Long> offsets = bytePosToXrefMap.keySet();
- SortedSet<Long> sortedOffset = new TreeSet<Long>(offsets);
+ SortedSet<Long> sortedOffset = new TreeSet<>(offsets);
return bytePosToXrefMap.get(sortedOffset.last()).trailer;
}
@@ -241,7 +241,7 @@ public class XrefTrailerResolver
resolvedXrefTrailer.trailer = new COSDictionary();
XrefTrailerObj curObj = bytePosToXrefMap.get( startxrefBytePosValue );
- List<Long> xrefSeqBytePos = new ArrayList<Long>();
+ List<Long> xrefSeqBytePos = new ArrayList<>();
if ( curObj == null )
{
@@ -339,7 +339,7 @@ public class XrefTrailerResolver
{
return null;
}
- final Set<Long> refObjNrs = new HashSet<Long>();
+ final Set<Long> refObjNrs = new HashSet<>();
final long cmpVal = - objstmObjNr;
for ( Entry<COSObjectKey,Long> xrefEntry : resolvedXrefTrailer.xrefTable.entrySet() )