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/13 19:59:09 UTC
svn commit: r1791301 [2/3] - in /pdfbox/trunk/pdfbox/src:
main/java/org/apache/pdfbox/contentstream/
main/java/org/apache/pdfbox/contentstream/operator/
main/java/org/apache/pdfbox/contentstream/operator/text/
main/java/org/apache/pdfbox/cos/ main/java...
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=1791301&r1=1791300&r2=1791301&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 Thu Apr 13 19:59:07 2017
@@ -115,7 +115,7 @@ public class FDFDictionary implements CO
else if (child.getTagName().equals("fields"))
{
NodeList fields = child.getChildNodes();
- List<FDFField> fieldList = new ArrayList<FDFField>();
+ List<FDFField> fieldList = new ArrayList<>();
for (int f = 0; f < fields.getLength(); f++)
{
Node currentNode = fields.item(f);
@@ -138,7 +138,7 @@ public class FDFDictionary implements CO
else if (child.getTagName().equals("annots"))
{
NodeList annots = child.getChildNodes();
- List<FDFAnnotation> annotList = new ArrayList<FDFAnnotation>();
+ List<FDFAnnotation> annotList = new ArrayList<>();
for (int j = 0; j < annots.getLength(); j++)
{
Node annotNode = annots.item(j);
@@ -337,12 +337,12 @@ public class FDFDictionary implements CO
COSArray fieldArray = (COSArray) fdf.getDictionaryObject(COSName.FIELDS);
if (fieldArray != null)
{
- List<FDFField> fields = new ArrayList<FDFField>();
+ List<FDFField> fields = new ArrayList<>();
for (int i = 0; i < fieldArray.size(); i++)
{
fields.add(new FDFField((COSDictionary) fieldArray.getObject(i)));
}
- retval = new COSArrayList<FDFField>(fields, fieldArray);
+ retval = new COSArrayList<>(fields, fieldArray);
}
return retval;
}
@@ -388,12 +388,12 @@ public class FDFDictionary implements CO
COSArray pageArray = (COSArray) fdf.getDictionaryObject(COSName.PAGES);
if (pageArray != null)
{
- List<FDFPage> pages = new ArrayList<FDFPage>();
+ List<FDFPage> pages = new ArrayList<>();
for (int i = 0; i < pageArray.size(); i++)
{
pages.add(new FDFPage((COSDictionary) pageArray.get(i)));
}
- retval = new COSArrayList<FDFPage>(pages, pageArray);
+ retval = new COSArrayList<>(pages, pageArray);
}
return retval;
}
@@ -449,12 +449,12 @@ public class FDFDictionary implements CO
COSArray annotArray = (COSArray) fdf.getDictionaryObject(COSName.ANNOTS);
if (annotArray != null)
{
- List<FDFAnnotation> annots = new ArrayList<FDFAnnotation>();
+ List<FDFAnnotation> annots = new ArrayList<>();
for (int i = 0; i < annotArray.size(); i++)
{
annots.add(FDFAnnotation.create((COSDictionary) annotArray.getObject(i)));
}
- retval = new COSArrayList<FDFAnnotation>(annots, annotArray);
+ retval = new COSArrayList<>(annots, annotArray);
}
return retval;
}
@@ -524,12 +524,12 @@ public class FDFDictionary implements CO
COSArray embeddedArray = (COSArray) fdf.getDictionaryObject(COSName.EMBEDDED_FDFS);
if (embeddedArray != null)
{
- List<PDFileSpecification> embedded = new ArrayList<PDFileSpecification>();
+ List<PDFileSpecification> embedded = new ArrayList<>();
for (int i = 0; i < embeddedArray.size(); i++)
{
embedded.add(PDFileSpecification.createFS(embeddedArray.get(i)));
}
- retval = new COSArrayList<PDFileSpecification>(embedded, embeddedArray);
+ retval = new COSArrayList<>(embedded, embeddedArray);
}
return retval;
}
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=1791301&r1=1791300&r2=1791301&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 Thu Apr 13 19:59:07 2017
@@ -76,7 +76,7 @@ public class FDFField implements COSObje
this();
this.setPartialFieldName(fieldXML.getAttribute("name"));
NodeList nodeList = fieldXML.getChildNodes();
- List<FDFField> kids = new ArrayList<FDFField>();
+ List<FDFField> kids = new ArrayList<>();
for (int i = 0; i < nodeList.getLength(); i++)
{
Node node = nodeList.item(i);
@@ -165,12 +165,12 @@ public class FDFField implements COSObje
List<FDFField> retval = null;
if (kids != null)
{
- List<FDFField> actuals = new ArrayList<FDFField>();
+ List<FDFField> actuals = new ArrayList<>();
for (int i = 0; i < kids.size(); i++)
{
actuals.add(new FDFField((COSDictionary) kids.getObject(i)));
}
- retval = new COSArrayList<FDFField>(actuals, kids);
+ retval = new COSArrayList<>(actuals, kids);
}
return retval;
}
@@ -655,7 +655,7 @@ public class FDFField implements COSObje
COSArray array = (COSArray) field.getDictionaryObject(COSName.OPT);
if (array != null)
{
- List<Object> objects = new ArrayList<Object>();
+ List<Object> objects = new ArrayList<>();
for (int i = 0; i < array.size(); i++)
{
COSBase next = array.getObject(i);
@@ -669,7 +669,7 @@ public class FDFField implements COSObje
objects.add(new FDFOptionElement(value));
}
}
- retval = new COSArrayList<Object>(objects, array);
+ retval = new COSArrayList<>(objects, array);
}
return retval;
}
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/fdf/FDFJavaScript.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/fdf/FDFJavaScript.java?rev=1791301&r1=1791300&r2=1791301&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/fdf/FDFJavaScript.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/fdf/FDFJavaScript.java Thu Apr 13 19:59:07 2017
@@ -138,7 +138,7 @@ public class FDFJavaScript implements CO
*/
public Map<String, PDActionJavaScript> getDoc()
{
- Map<String, PDActionJavaScript> map = new LinkedHashMap<String, PDActionJavaScript>();
+ Map<String, PDActionJavaScript> map = new LinkedHashMap<>();
COSArray array = (COSArray) dictionary.getDictionaryObject(COSName.DOC);
if (array == null)
{
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/fdf/FDFPage.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/fdf/FDFPage.java?rev=1791301&r1=1791300&r2=1791301&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/fdf/FDFPage.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/fdf/FDFPage.java Thu Apr 13 19:59:07 2017
@@ -74,12 +74,12 @@ public class FDFPage implements COSObjec
COSArray array = (COSArray) page.getDictionaryObject(COSName.TEMPLATES);
if (array != null)
{
- List<FDFTemplate> objects = new ArrayList<FDFTemplate>();
+ List<FDFTemplate> objects = new ArrayList<>();
for (int i = 0; i < array.size(); i++)
{
objects.add(new FDFTemplate((COSDictionary) array.getObject(i)));
}
- retval = new COSArrayList<FDFTemplate>(objects, array);
+ retval = new COSArrayList<>(objects, array);
}
return retval;
}
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/fdf/FDFTemplate.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/fdf/FDFTemplate.java?rev=1791301&r1=1791300&r2=1791301&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/fdf/FDFTemplate.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/fdf/FDFTemplate.java Thu Apr 13 19:59:07 2017
@@ -100,12 +100,12 @@ public class FDFTemplate implements COSO
COSArray array = (COSArray) template.getDictionaryObject(COSName.FIELDS);
if (array != null)
{
- List<FDFField> fields = new ArrayList<FDFField>();
+ List<FDFField> fields = new ArrayList<>();
for (int i = 0; i < array.size(); i++)
{
fields.add(new FDFField((COSDictionary) array.getObject(i)));
}
- retval = new COSArrayList<FDFField>(fields, array);
+ retval = new COSArrayList<>(fields, array);
}
return retval;
}
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDCIDFont.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDCIDFont.java?rev=1791301&r1=1791300&r2=1791301&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDCIDFont.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDCIDFont.java Thu Apr 13 19:59:07 2017
@@ -46,8 +46,8 @@ public abstract class PDCIDFont implemen
private float defaultWidth;
private float averageWidth;
- private final Map<Integer, Float> verticalDisplacementY = new HashMap<Integer, Float>(); // w1y
- private final Map<Integer, Vector> positionVectors = new HashMap<Integer, Vector>(); // v
+ private final Map<Integer, Float> verticalDisplacementY = new HashMap<>(); // w1y
+ private final Map<Integer, Vector> positionVectors = new HashMap<>(); // v
private float[] dw2;
protected final COSDictionary dict;
@@ -68,7 +68,7 @@ public abstract class PDCIDFont implemen
private void readWidths()
{
- widths = new HashMap<Integer, Float>();
+ widths = new HashMap<>();
COSArray widths = (COSArray) dict.getDictionaryObject(COSName.W);
if (widths != null)
{
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDCIDFontType0.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDCIDFontType0.java?rev=1791301&r1=1791300&r2=1791301&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDCIDFontType0.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDCIDFontType0.java Thu Apr 13 19:59:07 2017
@@ -54,7 +54,7 @@ public class PDCIDFontType0 extends PDCI
private final CFFCIDFont cidFont; // Top DICT that uses CIDFont operators
private final FontBoxFont t1Font; // Top DICT that does not use CIDFont operators
- private final Map<Integer, Float> glyphHeights = new HashMap<Integer, Float>();
+ private final Map<Integer, Float> glyphHeights = new HashMap<>();
private final boolean isEmbedded;
private final boolean isDamaged;
private final AffineTransform fontMatrixTransform;
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDCIDFontType2.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDCIDFontType2.java?rev=1791301&r1=1791300&r2=1791301&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDCIDFontType2.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDCIDFontType2.java Thu Apr 13 19:59:07 2017
@@ -238,7 +238,7 @@ public class PDCIDFontType2 extends PDCI
{
return null;
}
- Map<Integer, Integer> inverse = new HashMap<Integer, Integer>(cid2gid.length);
+ Map<Integer, Integer> inverse = new HashMap<>(cid2gid.length);
for (int i = 0; i < cid2gid.length; i++)
{
inverse.put(cid2gid[i], i);
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDCIDFontType2Embedder.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDCIDFontType2Embedder.java?rev=1791301&r1=1791300&r2=1791301&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDCIDFontType2Embedder.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDCIDFontType2Embedder.java Thu Apr 13 19:59:07 2017
@@ -93,7 +93,7 @@ final class PDCIDFontType2Embedder exten
throws IOException
{
// build CID2GIDMap, because the content stream has been written with the old GIDs
- Map<Integer, Integer> cidToGid = new HashMap<Integer, Integer>(gidToCid.size());
+ Map<Integer, Integer> cidToGid = new HashMap<>(gidToCid.size());
for (Map.Entry<Integer, Integer> entry : gidToCid.entrySet())
{
int newGID = entry.getKey();
@@ -267,7 +267,7 @@ final class PDCIDFontType2Embedder exten
COSArray ws = new COSArray();
int prev = Integer.MIN_VALUE;
// Use a sorted list to get an optimal width array
- Set<Integer> keys = new TreeSet<Integer>(cidToGid.keySet());
+ Set<Integer> keys = new TreeSet<>(cidToGid.keySet());
for (int cid : keys)
{
int gid = cidToGid.get(cid);
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDSimpleFont.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDSimpleFont.java?rev=1791301&r1=1791300&r2=1791301&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDSimpleFont.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDSimpleFont.java Thu Apr 13 19:59:07 2017
@@ -46,7 +46,7 @@ public abstract class PDSimpleFont exten
protected Encoding encoding;
protected GlyphList glyphList;
private Boolean isSymbolic;
- private final Set<Integer> noUnicode = new HashSet<Integer>(); // for logging
+ private final Set<Integer> noUnicode = new HashSet<>(); // for logging
/**
* Constructor for embedding.
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=1791301&r1=1791300&r2=1791301&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 Thu Apr 13 19:59:07 2017
@@ -63,7 +63,7 @@ public class PDTrueTypeFont extends PDSi
private static final int START_RANGE_F100 = 0xF100;
private static final int START_RANGE_F200 = 0xF200;
- private static final Map<String, Integer> INVERTED_MACOS_ROMAN = new HashMap<String, Integer>(250);
+ private static final Map<String, Integer> INVERTED_MACOS_ROMAN = new HashMap<>(250);
static
{
Map<Integer, String> codeToName = MacOSRomanEncoding.INSTANCE.getCodeToNameMap();
@@ -263,7 +263,7 @@ public class PDTrueTypeFont extends PDSi
// synthesize an encoding, so that getEncoding() is always usable
PostScriptTable post = ttf.getPostScript();
- Map<Integer, String> codeToName = new HashMap<Integer, String>();
+ Map<Integer, String> codeToName = new HashMap<>();
for (int code = 0; code <= 256; code++)
{
int gid = codeToGID(code);
@@ -422,7 +422,7 @@ public class PDTrueTypeFont extends PDSi
return gidToCode;
}
- gidToCode = new HashMap<Integer, Integer>();
+ gidToCode = new HashMap<>();
for (int code = 0; code <= 255; code++)
{
int gid = codeToGID(code);
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDTrueTypeFontEmbedder.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDTrueTypeFontEmbedder.java?rev=1791301&r1=1791300&r2=1791301&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDTrueTypeFontEmbedder.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDTrueTypeFontEmbedder.java Thu Apr 13 19:59:07 2017
@@ -82,7 +82,7 @@ final class PDTrueTypeFontEmbedder exten
int firstChar = Collections.min(codeToName.keySet());
int lastChar = Collections.max(codeToName.keySet());
- List<Integer> widths = new ArrayList<Integer>(lastChar - firstChar + 1);
+ List<Integer> widths = new ArrayList<>(lastChar - firstChar + 1);
for (int i = 0; i < lastChar - firstChar + 1; i++)
{
widths.add(0);
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDType1CFont.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDType1CFont.java?rev=1791301&r1=1791300&r2=1791301&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDType1CFont.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDType1CFont.java Thu Apr 13 19:59:07 2017
@@ -55,7 +55,7 @@ public class PDType1CFont extends PDSimp
{
private static final Log LOG = LogFactory.getLog(PDType1CFont.class);
- private final Map<String, Float> glyphHeights = new HashMap<String, Float>();
+ private final Map<String, Float> glyphHeights = new HashMap<>();
private final AffineTransform fontMatrixTransform;
private final CFFType1Font cffFont; // embedded font
private final FontBoxFont genericFont; // embedded or system font for rendering
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDType1FontEmbedder.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDType1FontEmbedder.java?rev=1791301&r1=1791300&r2=1791301&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDType1FontEmbedder.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDType1FontEmbedder.java Thu Apr 13 19:59:07 2017
@@ -87,7 +87,7 @@ class PDType1FontEmbedder
dict.setName(COSName.BASE_FONT, type1.getName());
// widths
- List<Integer> widths = new ArrayList<Integer>(256);
+ List<Integer> widths = new ArrayList<>(256);
for (int code = 0; code <= 255; code++)
{
String name = fontEncoding.getName(code);
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDType3CharProc.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDType3CharProc.java?rev=1791301&r1=1791300&r2=1791301&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDType3CharProc.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDType3CharProc.java Thu Apr 13 19:59:07 2017
@@ -93,7 +93,7 @@ public final class PDType3CharProc imple
*/
public PDRectangle getGlyphBBox() throws IOException
{
- List<COSBase> arguments = new ArrayList<COSBase>();
+ List<COSBase> arguments = new ArrayList<>();
PDFStreamParser parser = new PDFStreamParser(this);
Object token = parser.parseNextToken();
while (token != null)
@@ -148,7 +148,7 @@ public final class PDType3CharProc imple
*/
public float getWidth() throws IOException
{
- List<COSBase> arguments = new ArrayList<COSBase>();
+ List<COSBase> arguments = new ArrayList<>();
PDFStreamParser parser = new PDFStreamParser(this);
Object token = parser.parseNextToken();
while (token != null)
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/ToUnicodeWriter.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/ToUnicodeWriter.java?rev=1791301&r1=1791300&r2=1791301&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/ToUnicodeWriter.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/ToUnicodeWriter.java Thu Apr 13 19:59:07 2017
@@ -35,7 +35,7 @@ import org.apache.pdfbox.util.Hex;
*/
final class ToUnicodeWriter
{
- private final Map<Integer, String> cidToUnicode = new TreeMap<Integer, String>();
+ private final Map<Integer, String> cidToUnicode = new TreeMap<>();
private int wMode;
/**
@@ -111,9 +111,9 @@ final class ToUnicodeWriter
writeLine(writer, "endcodespacerange\n");
// CID -> Unicode mappings, we use ranges to generate a smaller CMap
- List<Integer> srcFrom = new ArrayList<Integer>();
- List<Integer> srcTo = new ArrayList<Integer>();
- List<String> dstString = new ArrayList<String>();
+ List<Integer> srcFrom = new ArrayList<>();
+ List<Integer> srcTo = new ArrayList<>();
+ List<String> dstString = new ArrayList<>();
int srcPrev = -1;
String dstPrev = null;
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/encoding/DictionaryEncoding.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/encoding/DictionaryEncoding.java?rev=1791301&r1=1791300&r2=1791301&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/encoding/DictionaryEncoding.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/encoding/DictionaryEncoding.java Thu Apr 13 19:59:07 2017
@@ -34,7 +34,7 @@ public class DictionaryEncoding extends
{
private final COSDictionary encoding;
private final Encoding baseEncoding;
- private final Map<Integer, String> differences = new HashMap<Integer, String>();
+ private final Map<Integer, String> differences = new HashMap<>();
/**
* Creates a new DictionaryEncoding for embedding.
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/encoding/Encoding.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/encoding/Encoding.java?rev=1791301&r1=1791300&r2=1791301&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/encoding/Encoding.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/encoding/Encoding.java Thu Apr 13 19:59:07 2017
@@ -61,8 +61,8 @@ public abstract class Encoding implement
}
}
- protected final Map<Integer, String> codeToName = new HashMap<Integer, String>(250);
- protected final Map<String, Integer> inverted = new HashMap<String, Integer>(250);
+ protected final Map<Integer, String> codeToName = new HashMap<>(250);
+ protected final Map<String, Integer> inverted = new HashMap<>(250);
private Set<String> names;
/**
@@ -141,7 +141,7 @@ public abstract class Encoding implement
synchronized(this)
{
// PDFBOX-3404: avoid possibility that one thread ends up with newly created empty map from other thread
- Set<String> tmpSet = new HashSet<String>(codeToName.values());
+ Set<String> tmpSet = new HashSet<>(codeToName.values());
// make sure that assignment is done after initialisation is complete
names = tmpSet;
// note that it might still happen that 'names' is initialized twice, but this is harmless
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/encoding/GlyphList.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/encoding/GlyphList.java?rev=1791301&r1=1791300&r2=1791301&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/encoding/GlyphList.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/encoding/GlyphList.java Thu Apr 13 19:59:07 2017
@@ -96,7 +96,7 @@ public final class GlyphList
private final Map<String, String> unicodeToName;
// additional read/write cache for uniXXXX names
- private final Map<String, String> uniNameToUnicodeCache = new HashMap<String, String>();
+ private final Map<String, String> uniNameToUnicodeCache = new HashMap<>();
/**
* Creates a new GlyphList from a glyph list file.
@@ -107,8 +107,8 @@ public final class GlyphList
*/
public GlyphList(InputStream input, int numberOfEntries) throws IOException
{
- nameToUnicode = new HashMap<String, String>(numberOfEntries);
- unicodeToName = new HashMap<String, String>(numberOfEntries);
+ nameToUnicode = new HashMap<>(numberOfEntries);
+ unicodeToName = new HashMap<>(numberOfEntries);
loadList(input);
}
@@ -121,8 +121,8 @@ public final class GlyphList
*/
public GlyphList(GlyphList glyphList, InputStream input) throws IOException
{
- nameToUnicode = new HashMap<String, String>(glyphList.nameToUnicode);
- unicodeToName = new HashMap<String, String>(glyphList.unicodeToName);
+ nameToUnicode = new HashMap<>(glyphList.nameToUnicode);
+ unicodeToName = new HashMap<>(glyphList.unicodeToName);
loadList(input);
}
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/blend/BlendMode.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/blend/BlendMode.java?rev=1791301&r1=1791300&r2=1791301&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/blend/BlendMode.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/blend/BlendMode.java Thu Apr 13 19:59:07 2017
@@ -189,7 +189,7 @@ public abstract class BlendMode
private static Map<COSName, BlendMode> createBlendModeMap()
{
- Map<COSName, BlendMode> map = new HashMap<COSName, BlendMode>(13);
+ Map<COSName, BlendMode> map = new HashMap<>(13);
map.put(COSName.NORMAL, BlendMode.NORMAL);
map.put(COSName.COMPATIBLE, BlendMode.COMPATIBLE);
map.put(COSName.MULTIPLY, BlendMode.MULTIPLY);
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/color/PDDeviceNAttributes.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/color/PDDeviceNAttributes.java?rev=1791301&r1=1791300&r2=1791301&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/color/PDDeviceNAttributes.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/color/PDDeviceNAttributes.java Thu Apr 13 19:59:07 2017
@@ -69,7 +69,7 @@ public final class PDDeviceNAttributes
*/
public Map<String, PDSeparation> getColorants() throws IOException
{
- Map<String,PDSeparation> actuals = new HashMap<String, PDSeparation>();
+ Map<String,PDSeparation> actuals = new HashMap<>();
COSDictionary colorants = (COSDictionary)dictionary.getDictionaryObject(COSName.COLORANTS);
if(colorants == null)
{
@@ -81,7 +81,7 @@ public final class PDDeviceNAttributes
COSBase value = colorants.getDictionaryObject(name);
actuals.put(name.getName(), (PDSeparation)PDColorSpace.create(value));
}
- return new COSDictionaryMap<String, PDSeparation>(actuals, colorants);
+ return new COSDictionaryMap<>(actuals, colorants);
}
/**
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/color/PDDeviceNProcess.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/color/PDDeviceNProcess.java?rev=1791301&r1=1791300&r2=1791301&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/color/PDDeviceNProcess.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/color/PDDeviceNProcess.java Thu Apr 13 19:59:07 2017
@@ -81,7 +81,7 @@ public class PDDeviceNProcess
*/
public List<String> getComponents()
{
- List<String> components = new ArrayList<String>();
+ List<String> components = new ArrayList<>();
COSArray cosComponents = (COSArray)dictionary.getDictionaryObject(COSName.COMPONENTS);
if (cosComponents == null)
{
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/color/PDSeparation.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/color/PDSeparation.java?rev=1791301&r1=1791300&r2=1791301&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/color/PDSeparation.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/color/PDSeparation.java Thu Apr 13 19:59:07 2017
@@ -133,7 +133,7 @@ public class PDSeparation extends PDSpec
int height = raster.getHeight();
float[] samples = new float[1];
- Map<Integer, int[]> calculatedValues = new HashMap<Integer, int[]>();
+ Map<Integer, int[]> calculatedValues = new HashMap<>();
Integer hash;
for (int y = 0; y < height; y++)
{
@@ -164,7 +164,7 @@ public class PDSeparation extends PDSpec
WritableRaster rgbRaster = rgbImage.getRaster();
float[] samples = new float[1];
- Map<Integer, int[]> calculatedValues = new HashMap<Integer, int[]>();
+ Map<Integer, int[]> calculatedValues = new HashMap<>();
Integer hash;
for (int y = 0; y < height; y++)
{
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/image/PDImageXObject.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/image/PDImageXObject.java?rev=1791301&r1=1791300&r2=1791301&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/image/PDImageXObject.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/image/PDImageXObject.java Thu Apr 13 19:59:07 2017
@@ -418,7 +418,7 @@ public final class PDImageXObject extend
}
}
- cachedImage = new SoftReference<BufferedImage>(image);
+ cachedImage = new SoftReference<>(image);
return image;
}
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/image/PDInlineImage.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/image/PDInlineImage.java?rev=1791301&r1=1791300&r2=1791301&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/image/PDInlineImage.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/image/PDInlineImage.java Thu Apr 13 19:59:07 2017
@@ -246,7 +246,7 @@ public final class PDInlineImage impleme
if (filters instanceof COSName)
{
COSName name = (COSName) filters;
- names = new COSArrayList<String>(name.getName(), name, parameters, COSName.FILTER);
+ names = new COSArrayList<>(name.getName(), name, parameters, COSName.FILTER);
}
else if (filters instanceof COSArray)
{
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/optionalcontent/PDOptionalContentProperties.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/optionalcontent/PDOptionalContentProperties.java?rev=1791301&r1=1791300&r2=1791301&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/optionalcontent/PDOptionalContentProperties.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/optionalcontent/PDOptionalContentProperties.java Thu Apr 13 19:59:07 2017
@@ -173,7 +173,7 @@ public class PDOptionalContentProperties
*/
public Collection<PDOptionalContentGroup> getOptionalContentGroups()
{
- Collection<PDOptionalContentGroup> coll = new java.util.ArrayList<PDOptionalContentGroup>();
+ Collection<PDOptionalContentGroup> coll = new java.util.ArrayList<>();
COSArray ocgs = getOCGs();
for (COSBase base : ocgs)
{
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/GouraudShadingContext.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/GouraudShadingContext.java?rev=1791301&r1=1791300&r2=1791301&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/GouraudShadingContext.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/GouraudShadingContext.java Thu Apr 13 19:59:07 2017
@@ -45,7 +45,7 @@ abstract class GouraudShadingContext ext
/**
* triangle list.
*/
- private List<ShadedTriangle> triangleList = new ArrayList<ShadedTriangle>();
+ private List<ShadedTriangle> triangleList = new ArrayList<>();
/**
* Constructor creates an instance to be used for fill operations.
@@ -117,7 +117,7 @@ abstract class GouraudShadingContext ext
@Override
protected Map<Point, Integer> calcPixelTable(Rectangle deviceBounds) throws IOException
{
- Map<Point, Integer> map = new HashMap<Point, Integer>();
+ Map<Point, Integer> map = new HashMap<>();
super.calcPixelTable(triangleList, map, deviceBounds);
return map;
}
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/Line.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/Line.java?rev=1791301&r1=1791300&r2=1791301&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/Line.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/Line.java Thu Apr 13 19:59:07 2017
@@ -65,7 +65,7 @@ class Line
*/
private Set<Point> calcLine(int x0, int y0, int x1, int y1)
{
- Set<Point> points = new HashSet<Point>(3);
+ Set<Point> points = new HashSet<>(3);
int dx = Math.abs(x1 - x0);
int dy = Math.abs(y1 - y0);
int sx = x0 < x1 ? 1 : -1;
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/Patch.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/Patch.java?rev=1791301&r1=1791300&r2=1791301&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/Patch.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/Patch.java Thu Apr 13 19:59:07 2017
@@ -174,7 +174,7 @@ abstract class Patch
*/
protected List<ShadedTriangle> getShadedTriangles(CoordinateColorPair[][] patchCC)
{
- List<ShadedTriangle> list = new ArrayList<ShadedTriangle>();
+ List<ShadedTriangle> list = new ArrayList<>();
int szV = patchCC.length;
int szU = patchCC[0].length;
for (int i = 1; i < szV; i++)
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/PatchMeshesShadingContext.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/PatchMeshesShadingContext.java?rev=1791301&r1=1791300&r2=1791301&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/PatchMeshesShadingContext.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/PatchMeshesShadingContext.java Thu Apr 13 19:59:07 2017
@@ -48,7 +48,7 @@ abstract class PatchMeshesShadingContext
/**
* patch list
*/
- private List<Patch> patchList = new ArrayList<Patch>();
+ private List<Patch> patchList = new ArrayList<>();
/**
* Constructor creates an instance to be used for fill operations.
@@ -93,7 +93,7 @@ abstract class PatchMeshesShadingContext
{
colRange[i] = shadingType.getDecodeForParameter(2 + i);
}
- List<Patch> list = new ArrayList<Patch>();
+ List<Patch> list = new ArrayList<>();
long maxSrcCoord = (long) Math.pow(2, bitsPerCoordinate) - 1;
long maxSrcColor = (long) Math.pow(2, bitsPerColorComponent) - 1;
COSStream cosStream = (COSStream) dict;
@@ -260,7 +260,7 @@ abstract class PatchMeshesShadingContext
@Override
protected Map<Point, Integer> calcPixelTable(Rectangle deviceBounds) throws IOException
{
- Map<Point, Integer> map = new HashMap<Point, Integer>();
+ Map<Point, Integer> map = new HashMap<>();
for (Patch it : patchList)
{
super.calcPixelTable(it.listOfTriangles, map, deviceBounds);
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/ShadedTriangle.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/ShadedTriangle.java?rev=1791301&r1=1791300&r2=1791301&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/ShadedTriangle.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/ShadedTriangle.java Thu Apr 13 19:59:07 2017
@@ -100,7 +100,7 @@ class ShadedTriangle
*/
private int calcDeg(Point2D[] p)
{
- Set<Point> set = new HashSet<Point>();
+ Set<Point> set = new HashSet<>();
for (Point2D itp : p)
{
Point np = new Point((int) Math.round(itp.getX() * 1000), (int) Math.round(itp.getY() * 1000));
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/Type4ShadingContext.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/Type4ShadingContext.java?rev=1791301&r1=1791300&r2=1791301&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/Type4ShadingContext.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/Type4ShadingContext.java Thu Apr 13 19:59:07 2017
@@ -76,7 +76,7 @@ class Type4ShadingContext extends Gourau
{
colRange[i] = freeTriangleShadingType.getDecodeForParameter(2 + i);
}
- List<ShadedTriangle> list = new ArrayList<ShadedTriangle>();
+ List<ShadedTriangle> list = new ArrayList<>();
long maxSrcCoord = (long) Math.pow(2, bitsPerCoordinate) - 1;
long maxSrcColor = (long) Math.pow(2, bitsPerColorComponent) - 1;
COSStream stream = (COSStream) dict;
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/Type5ShadingContext.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/Type5ShadingContext.java?rev=1791301&r1=1791300&r2=1791301&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/Type5ShadingContext.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/Type5ShadingContext.java Thu Apr 13 19:59:07 2017
@@ -75,7 +75,7 @@ class Type5ShadingContext extends Gourau
{
colRange[i] = latticeTriangleShadingType.getDecodeForParameter(2 + i);
}
- List<Vertex> vlist = new ArrayList<Vertex>();
+ List<Vertex> vlist = new ArrayList<>();
long maxSrcCoord = (long) Math.pow(2, bitsPerCoordinate) - 1;
long maxSrcColor = (long) Math.pow(2, bitsPerColorComponent) - 1;
COSStream cosStream = (COSStream) cosDictionary;
@@ -104,7 +104,7 @@ class Type5ShadingContext extends Gourau
}
int sz = vlist.size(), rowNum = sz / numPerRow;
Vertex[][] latticeArray = new Vertex[rowNum][numPerRow];
- List<ShadedTriangle> list = new ArrayList<ShadedTriangle>();
+ List<ShadedTriangle> list = new ArrayList<>();
if (rowNum < 2)
{
// must have at least two rows; if not, return empty list
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/action/PDAction.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/action/PDAction.java?rev=1791301&r1=1791300&r2=1791301&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/action/PDAction.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/action/PDAction.java Thu Apr 13 19:59:07 2017
@@ -130,17 +130,17 @@ public abstract class PDAction implement
if( next instanceof COSDictionary )
{
PDAction pdAction = PDActionFactory.createAction( (COSDictionary) next );
- retval = new COSArrayList<PDAction>(pdAction, next, action, COSName.NEXT);
+ retval = new COSArrayList<>(pdAction, next, action, COSName.NEXT);
}
else if( next instanceof COSArray )
{
COSArray array = (COSArray)next;
- List<PDAction> actions = new ArrayList<PDAction>();
+ List<PDAction> actions = new ArrayList<>();
for( int i=0; i<array.size(); i++ )
{
actions.add( PDActionFactory.createAction( (COSDictionary) array.getObject( i )));
}
- retval = new COSArrayList<PDAction>( actions, array );
+ retval = new COSArrayList<>( actions, array );
}
return retval;
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/annotation/PDAppearanceEntry.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/annotation/PDAppearanceEntry.java?rev=1791301&r1=1791300&r2=1791301&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/annotation/PDAppearanceEntry.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/annotation/PDAppearanceEntry.java Thu Apr 13 19:59:07 2017
@@ -98,7 +98,7 @@ public class PDAppearanceEntry implement
}
COSDictionary dict = (COSDictionary) entry;
- Map<COSName, PDAppearanceStream> map = new HashMap<COSName, PDAppearanceStream>();
+ Map<COSName, PDAppearanceStream> map = new HashMap<>();
for (COSName name : dict.keySet())
{
@@ -111,6 +111,6 @@ public class PDAppearanceEntry implement
}
}
- return new COSDictionaryMap<COSName, PDAppearanceStream>(map, dict);
+ return new COSDictionaryMap<>(map, dict);
}
}
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/digitalsignature/PDSeedValue.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/digitalsignature/PDSeedValue.java?rev=1791301&r1=1791300&r2=1791301&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/digitalsignature/PDSeedValue.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/digitalsignature/PDSeedValue.java Thu Apr 13 19:59:07 2017
@@ -275,7 +275,7 @@ public class PDSeedValue implements COSO
if (fields != null)
{
- List<String> actuals = new ArrayList<String>();
+ List<String> actuals = new ArrayList<>();
for ( int i = 0; i < fields.size(); i++ )
{
String element = fields.getName(i);
@@ -284,7 +284,7 @@ public class PDSeedValue implements COSO
actuals.add(element);
}
}
- retval = new COSArrayList<String>(actuals, fields);
+ retval = new COSArrayList<>(actuals, fields);
}
return retval;
}
@@ -315,7 +315,7 @@ public class PDSeedValue implements COSO
if (fields != null)
{
- List<String> actuals = new ArrayList<String>();
+ List<String> actuals = new ArrayList<>();
for ( int i = 0; i < fields.size(); i++ )
{
String element = fields.getName(i);
@@ -324,7 +324,7 @@ public class PDSeedValue implements COSO
actuals.add(element);
}
}
- retval = new COSArrayList<String>(actuals, fields);
+ retval = new COSArrayList<>(actuals, fields);
}
return retval;
}
@@ -404,7 +404,7 @@ public class PDSeedValue implements COSO
if (fields != null)
{
- List<String> actuals = new ArrayList<String>();
+ List<String> actuals = new ArrayList<>();
for ( int i = 0; i < fields.size(); i++ )
{
String element = fields.getString(i);
@@ -413,7 +413,7 @@ public class PDSeedValue implements COSO
actuals.add(element);
}
}
- retval = new COSArrayList<String>(actuals, fields);
+ retval = new COSArrayList<>(actuals, fields);
}
return retval;
}
@@ -521,7 +521,7 @@ public class PDSeedValue implements COSO
if (fields != null)
{
- List<String> actuals = new ArrayList<String>();
+ List<String> actuals = new ArrayList<>();
for ( int i = 0; i < fields.size(); i++ )
{
String element = fields.getString(i);
@@ -530,7 +530,7 @@ public class PDSeedValue implements COSO
actuals.add(element);
}
}
- retval = new COSArrayList<String>(actuals, fields);
+ retval = new COSArrayList<>(actuals, fields);
}
return retval;
}
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/form/FieldUtils.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/form/FieldUtils.java?rev=1791301&r1=1791300&r2=1791301&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/form/FieldUtils.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/form/FieldUtils.java Thu Apr 13 19:59:07 2017
@@ -115,7 +115,7 @@ public final class FieldUtils
*/
static List<KeyValue> toKeyValueList(List<String> key, List<String> value)
{
- List<KeyValue> list = new ArrayList<KeyValue>();
+ List<KeyValue> list = new ArrayList<>();
for(int i =0; i<key.size(); i++)
{
list.add(new FieldUtils.KeyValue(key.get(i),value.get(i)));
@@ -169,7 +169,7 @@ public final class FieldUtils
if (items instanceof COSString)
{
- List<String> array = new ArrayList<String>();
+ List<String> array = new ArrayList<>();
array.add(((COSString) items).getString());
return array;
}
@@ -198,7 +198,7 @@ public final class FieldUtils
*/
private static List<String> getItemsFromPair(COSBase items, int pairIdx)
{
- List<String> exportValues = new ArrayList<String>();
+ List<String> exportValues = new ArrayList<>();
int numItems = ((COSArray) items).size();
for (int i=0;i<numItems;i++)
{
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=1791301&r1=1791300&r2=1791301&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 Thu Apr 13 19:59:07 2017
@@ -145,7 +145,7 @@ public final class PDAcroForm implements
FDFDictionary fdfDict = new FDFDictionary();
catalog.setFDF(fdfDict);
- List<FDFField> fdfFields = new ArrayList<FDFField>();
+ List<FDFField> fdfFields = new ArrayList<>();
List<PDField> fields = getFields();
for (PDField field : fields)
{
@@ -184,7 +184,7 @@ public final class PDAcroForm implements
return;
}
- List<PDField> fields = new ArrayList<PDField>();
+ List<PDField> fields = new ArrayList<>();
for (PDField field: getFieldTree())
{
fields.add(field);
@@ -234,7 +234,7 @@ public final class PDAcroForm implements
{
isContentStreamWrapped = false;
- List<PDAnnotation> annotations = new ArrayList<PDAnnotation>();
+ List<PDAnnotation> annotations = new ArrayList<>();
for (PDAnnotation annotation: page.getAnnotations())
{
@@ -370,7 +370,7 @@ public final class PDAcroForm implements
{
return Collections.emptyList();
}
- List<PDField> pdFields = new ArrayList<PDField>();
+ List<PDField> pdFields = new ArrayList<>();
for (int i = 0; i < cosFields.size(); i++)
{
COSDictionary element = (COSDictionary) cosFields.getObject(i);
@@ -383,7 +383,7 @@ public final class PDAcroForm implements
}
}
}
- return new COSArrayList<PDField>(pdFields, cosFields);
+ return new COSArrayList<>(pdFields, cosFields);
}
/**
@@ -424,7 +424,7 @@ public final class PDAcroForm implements
{
if (cache)
{
- fieldCache = new HashMap<String, PDField>();
+ fieldCache = new HashMap<>();
for (PDField field : getFieldTree())
{
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/form/PDButton.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/form/PDButton.java?rev=1791301&r1=1791300&r2=1791301&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/form/PDButton.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/form/PDButton.java Thu Apr 13 19:59:07 2017
@@ -228,7 +228,7 @@ public abstract class PDButton extends P
if (value instanceof COSString)
{
- List<String> array = new ArrayList<String>();
+ List<String> array = new ArrayList<>();
array.add(((COSString) value).getString());
return array;
}
@@ -299,7 +299,7 @@ public abstract class PDButton extends P
public Set<String> getOnValues()
{
// we need a set as the field can appear multiple times
- Set<String> onValues = new LinkedHashSet<String>();
+ Set<String> onValues = new LinkedHashSet<>();
if (getExportValues().size() > 0)
{
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/form/PDChoice.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/form/PDChoice.java?rev=1791301&r1=1791300&r2=1791301&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/form/PDChoice.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/form/PDChoice.java Thu Apr 13 19:59:07 2017
@@ -454,7 +454,7 @@ public abstract class PDChoice extends P
COSBase value = getCOSObject().getDictionaryObject(name);
if (value instanceof COSString)
{
- List<String> array = new ArrayList<String>();
+ List<String> array = new ArrayList<>();
array.add(((COSString) value).getString());
return array;
}
@@ -477,7 +477,7 @@ public abstract class PDChoice extends P
private void updateSelectedOptionsIndex(List<String> values)
{
List<String> options = getOptions();
- List<Integer> indices = new ArrayList<Integer>();
+ List<Integer> indices = new ArrayList<>();
for (String value : values)
{
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/form/PDDefaultAppearanceString.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/form/PDDefaultAppearanceString.java?rev=1791301&r1=1791300&r2=1791301&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/form/PDDefaultAppearanceString.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/form/PDDefaultAppearanceString.java Thu Apr 13 19:59:07 2017
@@ -93,7 +93,7 @@ class PDDefaultAppearanceString
*/
private void processAppearanceStringOperators(byte[] content) throws IOException
{
- List<COSBase> arguments = new ArrayList<COSBase>();
+ List<COSBase> arguments = new ArrayList<>();
PDFStreamParser parser = new PDFStreamParser(content);
Object token = parser.parseNextToken();
while (token != null)
@@ -105,7 +105,7 @@ class PDDefaultAppearanceString
else if (token instanceof Operator)
{
processOperator((Operator) token, arguments);
- arguments = new ArrayList<COSBase>();
+ arguments = new ArrayList<>();
}
else
{
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/form/PDFieldTree.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/form/PDFieldTree.java?rev=1791301&r1=1791300&r2=1791301&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/form/PDFieldTree.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/form/PDFieldTree.java Thu Apr 13 19:59:07 2017
@@ -58,7 +58,7 @@ public class PDFieldTree implements Iter
*/
private static final class FieldIterator implements Iterator<PDField>
{
- private final Queue<PDField> queue = new ArrayDeque<PDField>();
+ private final Queue<PDField> queue = new ArrayDeque<>();
private FieldIterator(PDAcroForm form)
{
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/form/PDNonTerminalField.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/form/PDNonTerminalField.java?rev=1791301&r1=1791300&r2=1791301&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/form/PDNonTerminalField.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/form/PDNonTerminalField.java Thu Apr 13 19:59:07 2017
@@ -110,7 +110,7 @@ public class PDNonTerminalField extends
fdfField.setValue(getValue());
List<PDField> children = getChildren();
- List<FDFField> fdfChildren = new ArrayList<FDFField>();
+ List<FDFField> fdfChildren = new ArrayList<>();
for (PDField child : children)
{
fdfChildren.add(child.exportFDF());
@@ -131,7 +131,7 @@ public class PDNonTerminalField extends
{
//TODO: why not return a COSArrayList like in PDPage.getAnnotations() ?
- List<PDField> children = new ArrayList<PDField>();
+ List<PDField> children = new ArrayList<>();
COSArray kids = (COSArray)getCOSObject().getDictionaryObject(COSName.KIDS);
for (int i = 0; i < kids.size(); i++)
{
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=1791301&r1=1791300&r2=1791301&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 Thu Apr 13 19:59:07 2017
@@ -100,7 +100,7 @@ public final class PDRadioButton extends
{
Set<String> onValues = getOnValues();
List<String> exportValues = getExportValues();
- List<String> selectedExportValues = new ArrayList<String>();
+ List<String> selectedExportValues = new ArrayList<>();
if (exportValues.isEmpty())
{
selectedExportValues.add(getValue());
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/form/PDSignatureField.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/form/PDSignatureField.java?rev=1791301&r1=1791300&r2=1791301&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/form/PDSignatureField.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/form/PDSignatureField.java Thu Apr 13 19:59:07 2017
@@ -75,7 +75,7 @@ public class PDSignatureField extends PD
private String generatePartialName()
{
String fieldName = "Signature";
- Set<String> sigNames = new HashSet<String>();
+ Set<String> sigNames = new HashSet<>();
// fixme: this ignores non-terminal fields, so will miss any descendant signatures
for (PDField field : getAcroForm().getFields())
{
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/form/PDTerminalField.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/form/PDTerminalField.java?rev=1791301&r1=1791300&r2=1791301&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/form/PDTerminalField.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/form/PDTerminalField.java Thu Apr 13 19:59:07 2017
@@ -164,7 +164,7 @@ public abstract class PDTerminalField ex
@Override
public List<PDAnnotationWidget> getWidgets()
{
- List<PDAnnotationWidget> widgets = new ArrayList<PDAnnotationWidget>();
+ List<PDAnnotationWidget> widgets = new ArrayList<>();
COSArray kids = (COSArray)getCOSObject().getDictionaryObject(COSName.KIDS);
if (kids == null)
{
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/form/PlainText.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/form/PlainText.java?rev=1791301&r1=1791300&r2=1791301&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/form/PlainText.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/form/PlainText.java Thu Apr 13 19:59:07 2017
@@ -52,7 +52,7 @@ class PlainText
PlainText(String textValue)
{
List<String> parts = Arrays.asList(textValue.replaceAll("\t", " ").split("\\r\\n|\\n|\\r|\\u2028|\\u2029"));
- paragraphs = new ArrayList<Paragraph>();
+ paragraphs = new ArrayList<>();
for (String part : parts)
{
// Acrobat prints a space for an empty paragraph
@@ -74,7 +74,7 @@ class PlainText
*/
PlainText(List<String> listValue)
{
- paragraphs = new ArrayList<Paragraph>();
+ paragraphs = new ArrayList<>();
for (String part : listValue)
{
paragraphs.add(new Paragraph(part));
@@ -165,7 +165,7 @@ class PlainText
int end = iterator.next();
float lineWidth = 0;
- List<Line> textLines = new ArrayList<Line>();
+ List<Line> textLines = new ArrayList<>();
Line textLine = new Line();
while (end != BreakIterator.DONE)
@@ -209,7 +209,7 @@ class PlainText
*/
static class Line
{
- private final List<Word> words = new ArrayList<Word>();
+ private final List<Word> words = new ArrayList<>();
private float lineWidth;
float getWidth()
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/rendering/GlyphCache.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/rendering/GlyphCache.java?rev=1791301&r1=1791300&r2=1791301&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/rendering/GlyphCache.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/rendering/GlyphCache.java Thu Apr 13 19:59:07 2017
@@ -36,7 +36,7 @@ final class GlyphCache
private static final Log LOG = LogFactory.getLog(GlyphCache.class);
private final PDVectorFont font;
- private final Map<Integer, GeneralPath> cache = new HashMap<Integer, GeneralPath>();
+ private final Map<Integer, GeneralPath> cache = new HashMap<>();
GlyphCache(PDVectorFont font)
{
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=1791301&r1=1791300&r2=1791301&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 Thu Apr 13 19:59:07 2017
@@ -120,7 +120,7 @@ public class PageDrawer extends PDFGraph
private Area textClippingArea;
// glyph caches
- private final Map<PDFont, GlyphCache> glyphCaches = new HashMap<PDFont, GlyphCache>();
+ private final Map<PDFont, GlyphCache> glyphCaches = new HashMap<>();
private final TilingPaintFactory tilingPaintFactory = new TilingPaintFactory(this);
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/rendering/TilingPaintFactory.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/rendering/TilingPaintFactory.java?rev=1791301&r1=1791300&r2=1791301&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/rendering/TilingPaintFactory.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/rendering/TilingPaintFactory.java Thu Apr 13 19:59:07 2017
@@ -34,7 +34,7 @@ class TilingPaintFactory
{
private final PageDrawer drawer;
private final Map<TilingPaintParameter, TilingPaint> weakCache
- = new WeakHashMap<TilingPaintParameter, TilingPaint>();
+ = new WeakHashMap<>();
TilingPaintFactory(PageDrawer drawer)
{
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/text/PDFMarkedContentExtractor.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/text/PDFMarkedContentExtractor.java?rev=1791301&r1=1791300&r2=1791301&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/text/PDFMarkedContentExtractor.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/text/PDFMarkedContentExtractor.java Thu Apr 13 19:59:07 2017
@@ -40,9 +40,9 @@ import org.apache.pdfbox.contentstream.o
public class PDFMarkedContentExtractor extends LegacyPDFStreamEngine
{
private final boolean suppressDuplicateOverlappingText = true;
- private final List<PDMarkedContent> markedContents = new ArrayList<PDMarkedContent>();
- private final Stack<PDMarkedContent> currentMarkedContents = new Stack<PDMarkedContent>();
- private final Map<String, List<TextPosition>> characterListMapping = new HashMap<String, List<TextPosition>>();
+ private final List<PDMarkedContent> markedContents = new ArrayList<>();
+ private final Stack<PDMarkedContent> currentMarkedContents = new Stack<>();
+ private final Map<String, List<TextPosition>> characterListMapping = new HashMap<>();
/**
* Instantiate a new PDFTextStripper object.
@@ -134,7 +134,7 @@ public class PDFMarkedContentExtractor e
List<TextPosition> sameTextCharacters = this.characterListMapping.get( textCharacter );
if( sameTextCharacters == null )
{
- sameTextCharacters = new ArrayList<TextPosition>();
+ sameTextCharacters = new ArrayList<>();
this.characterListMapping.put( textCharacter, sameTextCharacters );
}
@@ -178,7 +178,7 @@ public class PDFMarkedContentExtractor e
if( showCharacter )
{
- List<TextPosition> textList = new ArrayList<TextPosition>();
+ List<TextPosition> textList = new ArrayList<>();
/* In the wild, some PDF encoded documents put diacritics (accents on
* top of characters) into a separate Tj element. When displaying them
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/text/PDFTextStripper.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/text/PDFTextStripper.java?rev=1791301&r1=1791300&r2=1791301&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/text/PDFTextStripper.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/text/PDFTextStripper.java Thu Apr 13 19:59:07 2017
@@ -192,9 +192,9 @@ public class PDFTextStripper extends Leg
*
* Most PDFs won't have any beads, so charactersByArticle will contain a single entry.
*/
- protected ArrayList<List<TextPosition>> charactersByArticle = new ArrayList<List<TextPosition>>();
+ protected ArrayList<List<TextPosition>> charactersByArticle = new ArrayList<>();
- private Map<String, TreeMap<Float, TreeSet<Float>>> characterListMapping = new HashMap<String, TreeMap<Float, TreeSet<Float>>>();
+ private Map<String, TreeMap<Float, TreeSet<Float>>> characterListMapping = new HashMap<>();
protected PDDocument document;
protected Writer output;
@@ -396,7 +396,7 @@ public class PDFTextStripper extends Leg
private void fillBeadRectangles(PDPage page)
{
- beadRectangles = new ArrayList<PDRectangle>();
+ beadRectangles = new ArrayList<>();
for (PDThreadBead bead : page.getThreadBeads())
{
if (bead == null)
@@ -545,7 +545,7 @@ public class PDFTextStripper extends Leg
// Now cycle through to print the text.
// We queue up a line at a time before we print so that we can convert
// the line from presentation form to logical form (if needed).
- List<LineItem> line = new ArrayList<LineItem>();
+ List<LineItem> line = new ArrayList<>();
Iterator<TextPosition> textIter = textList.iterator();
// PDF files don't always store spaces. We will need to guess where we should add
@@ -820,7 +820,7 @@ public class PDFTextStripper extends Leg
.get(textCharacter);
if (sameTextCharacters == null)
{
- sameTextCharacters = new TreeMap<Float, TreeSet<Float>>();
+ sameTextCharacters = new TreeMap<>();
characterListMapping.put(textCharacter, sameTextCharacters);
}
// RDD - Here we compute the value that represents the end of the rendered
@@ -852,7 +852,7 @@ public class PDFTextStripper extends Leg
TreeSet<Float> ySet = sameTextCharacters.get(textX);
if (ySet == null)
{
- ySet = new TreeSet<Float>();
+ ySet = new TreeSet<>();
sameTextCharacters.put(textX, ySet);
}
ySet.add(textY);
@@ -1686,7 +1686,7 @@ public class PDFTextStripper extends Leg
{
if (listOfPatterns == null)
{
- listOfPatterns = new ArrayList<Pattern>();
+ listOfPatterns = new ArrayList<>();
for (String expression : LIST_ITEM_EXPRESSIONS)
{
Pattern p = Pattern.compile(expression);
@@ -1749,9 +1749,9 @@ public class PDFTextStripper extends Leg
*/
private List<WordWithTextPositions> normalize(List<LineItem> line)
{
- List<WordWithTextPositions> normalized = new LinkedList<WordWithTextPositions>();
+ List<WordWithTextPositions> normalized = new LinkedList<>();
StringBuilder lineBuilder = new StringBuilder();
- List<TextPosition> wordPositions = new ArrayList<TextPosition>();
+ List<TextPosition> wordPositions = new ArrayList<>();
for (LineItem item : line)
{
@@ -1842,7 +1842,7 @@ public class PDFTextStripper extends Leg
return result.toString();
}
- private static Map<Character, Character> MIRRORING_CHAR_MAP = new HashMap<Character, Character>();
+ private static Map<Character, Character> MIRRORING_CHAR_MAP = new HashMap<>();
static
{
@@ -1991,7 +1991,7 @@ public class PDFTextStripper extends Leg
if (item.isWordSeparator())
{
normalized.add(
- createWord(lineBuilder.toString(), new ArrayList<TextPosition>(wordPositions)));
+ createWord(lineBuilder.toString(), new ArrayList<>(wordPositions)));
lineBuilder = new StringBuilder();
wordPositions.clear();
}
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/text/PDFTextStripperByArea.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/text/PDFTextStripperByArea.java?rev=1791301&r1=1791300&r2=1791301&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/text/PDFTextStripperByArea.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/text/PDFTextStripperByArea.java Thu Apr 13 19:59:07 2017
@@ -32,11 +32,11 @@ import org.apache.pdfbox.pdmodel.PDPage;
*/
public class PDFTextStripperByArea extends PDFTextStripper
{
- private final List<String> regions = new ArrayList<String>();
- private final Map<String, Rectangle2D> regionArea = new HashMap<String, Rectangle2D>();
+ private final List<String> regions = new ArrayList<>();
+ private final Map<String, Rectangle2D> regionArea = new HashMap<>();
private final Map<String, ArrayList<List<TextPosition>>> regionCharacterList
- = new HashMap<String, ArrayList<List<TextPosition>>>();
- private final Map<String, StringWriter> regionText = new HashMap<String, StringWriter>();
+ = new HashMap<>();
+ private final Map<String, StringWriter> regionText = new HashMap<>();
/**
* Constructor.
@@ -119,7 +119,7 @@ public class PDFTextStripperByArea exten
//reset the stored text for the region so this class
//can be reused.
String regionName = region;
- ArrayList<List<TextPosition>> regionCharactersByArticle = new ArrayList<List<TextPosition>>();
+ ArrayList<List<TextPosition>> regionCharactersByArticle = new ArrayList<>();
regionCharactersByArticle.add( new ArrayList<TextPosition>() );
regionCharacterList.put( regionName, regionCharactersByArticle );
regionText.put( regionName, new StringWriter() );
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/text/TextPosition.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/text/TextPosition.java?rev=1791301&r1=1791300&r2=1791301&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/text/TextPosition.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/text/TextPosition.java Thu Apr 13 19:59:07 2017
@@ -124,7 +124,7 @@ public final class TextPosition
// normalization.
private static Map<Integer, String> createDiacritics()
{
- Map<Integer, String> map = new HashMap<Integer, String>(31);
+ Map<Integer, String> map = new HashMap<>(31);
map.put(0x0060, "\u0300");
map.put(0x02CB, "\u0300");
map.put(0x0027, "\u0301");
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/util/QuickSort.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/util/QuickSort.java?rev=1791301&r1=1791300&r2=1791301&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/util/QuickSort.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/util/QuickSort.java Thu Apr 13 19:59:07 2017
@@ -71,7 +71,7 @@ public final class QuickSort
private static <T> void quicksort(List<T> list, Comparator<T> cmp)
{
- Deque<Integer> stack = new ArrayDeque<Integer>();
+ Deque<Integer> stack = new ArrayDeque<>();
stack.push(0);
stack.push(list.size());
while (!stack.isEmpty())
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/util/SmallMap.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/util/SmallMap.java?rev=1791301&r1=1791300&r2=1791301&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/util/SmallMap.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/util/SmallMap.java Thu Apr 13 19:59:07 2017
@@ -281,7 +281,7 @@ public class SmallMap<K, V> implements M
return Collections.emptySet();
}
- Set<K> keys = new LinkedHashSet<K>();
+ Set<K> keys = new LinkedHashSet<>();
for (int kIdx = 0; kIdx < mapArr.length; kIdx+=2)
{
keys.add((K)mapArr[kIdx]);
@@ -305,7 +305,7 @@ public class SmallMap<K, V> implements M
return Collections.emptySet();
}
- List<V> values = new ArrayList<V>(mapArr.length >> 1);
+ List<V> values = new ArrayList<>(mapArr.length >> 1);
for (int vIdx = 1; vIdx < mapArr.length; vIdx+=2)
{
values.add((V)mapArr[vIdx]);
@@ -377,7 +377,7 @@ public class SmallMap<K, V> implements M
return Collections.emptySet();
}
- Set<java.util.Map.Entry<K, V>> entries = new LinkedHashSet<java.util.Map.Entry<K, V>>();
+ Set<java.util.Map.Entry<K, V>> entries = new LinkedHashSet<>();
for (int kIdx = 0; kIdx < mapArr.length; kIdx+=2)
{
entries.add(new SmallMapEntry(kIdx));
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/util/filetypedetector/ByteTrie.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/util/filetypedetector/ByteTrie.java?rev=1791301&r1=1791300&r2=1791301&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/util/filetypedetector/ByteTrie.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/util/filetypedetector/ByteTrie.java Thu Apr 13 19:59:07 2017
@@ -39,7 +39,7 @@ class ByteTrie<T>
*/
static class ByteTrieNode<T>
{
- private final Map<Byte, ByteTrieNode<T>> children = new HashMap<Byte, ByteTrieNode<T>>();
+ private final Map<Byte, ByteTrieNode<T>> children = new HashMap<>();
private T value = null;
public void setValue(T value)
@@ -57,7 +57,7 @@ class ByteTrie<T>
}
}
- private final ByteTrieNode<T> root = new ByteTrieNode<T>();
+ private final ByteTrieNode<T> root = new ByteTrieNode<>();
private int maxDepth;
/**
@@ -103,7 +103,7 @@ class ByteTrie<T>
ByteTrieNode<T> child = node.children.get(b);
if (child == null)
{
- child = new ByteTrieNode<T>();
+ child = new ByteTrieNode<>();
node.children.put(b, child);
}
node = child;
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/util/filetypedetector/FileTypeDetector.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/util/filetypedetector/FileTypeDetector.java?rev=1791301&r1=1791300&r2=1791301&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/util/filetypedetector/FileTypeDetector.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/util/filetypedetector/FileTypeDetector.java Thu Apr 13 19:59:07 2017
@@ -38,7 +38,7 @@ public final class FileTypeDetector
static
{
- root = new ByteTrie<FileType>();
+ root = new ByteTrie<>();
root.setDefaultValue(FileType.UNKNOWN);
// https://en.wikipedia.org/wiki/List_of_file_signatures
Modified: pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/cos/PDFDocEncodingTest.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/cos/PDFDocEncodingTest.java?rev=1791301&r1=1791300&r2=1791301&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/cos/PDFDocEncodingTest.java (original)
+++ pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/cos/PDFDocEncodingTest.java Thu Apr 13 19:59:07 2017
@@ -30,7 +30,7 @@ import java.util.List;
public class PDFDocEncodingTest
{
- static List<String> deviations = new ArrayList<String>();
+ static List<String> deviations = new ArrayList<>();
static
{
Modified: pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/encryption/TestSymmetricKeyEncryption.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/encryption/TestSymmetricKeyEncryption.java?rev=1791301&r1=1791300&r2=1791301&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/encryption/TestSymmetricKeyEncryption.java (original)
+++ pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/encryption/TestSymmetricKeyEncryption.java Thu Apr 13 19:59:07 2017
@@ -244,8 +244,8 @@ public class TestSymmetricKeyEncryption
String prefix = "Simple-";
int numSrcPages = document.getNumberOfPages();
PDFRenderer pdfRenderer = new PDFRenderer(document);
- List<BufferedImage> srcImgTab = new ArrayList<BufferedImage>();
- List<byte[]> srcContentStreamTab = new ArrayList<byte[]>();
+ List<BufferedImage> srcImgTab = new ArrayList<>();
+ List<byte[]> srcContentStreamTab = new ArrayList<>();
for (int i = 0; i < numSrcPages; ++i)
{
srcImgTab.add(pdfRenderer.renderImage(i));
Modified: pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/multipdf/MergeAnnotationsTest.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/multipdf/MergeAnnotationsTest.java?rev=1791301&r1=1791300&r2=1791301&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/multipdf/MergeAnnotationsTest.java (original)
+++ pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/multipdf/MergeAnnotationsTest.java Thu Apr 13 19:59:07 2017
@@ -103,7 +103,7 @@ public class MergeAnnotationsTest
*/
private boolean testAnnotationsMatch(List<PDAnnotation> sourceAnnots, List<PDAnnotation> targetAnnots)
{
- Map<String, PDAnnotation> targetAnnotsByName = new HashMap<String, PDAnnotation>();
+ Map<String, PDAnnotation> targetAnnotsByName = new HashMap<>();
COSName destinationName;
// fill the map with the annotations destination name
Modified: pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/PageLayoutTest.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/PageLayoutTest.java?rev=1791301&r1=1791300&r2=1791301&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/PageLayoutTest.java (original)
+++ pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/PageLayoutTest.java Thu Apr 13 19:59:07 2017
@@ -33,7 +33,7 @@ public class PageLayoutTest
public void testValues()
{
Set<PageLayout> pageLayoutSet = EnumSet.noneOf(PageLayout.class);
- Set<String> stringSet = new HashSet<String>();
+ Set<String> stringSet = new HashSet<>();
for (PageLayout pl : PageLayout.values())
{
String s = pl.stringValue();
Modified: pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/common/PDStreamTest.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/common/PDStreamTest.java?rev=1791301&r1=1791300&r2=1791301&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/common/PDStreamTest.java (original)
+++ pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/common/PDStreamTest.java Thu Apr 13 19:59:07 2017
@@ -42,7 +42,7 @@ public class PDStreamTest
InputStream is = new ByteArrayInputStream(new byte[] { 12, 34, 56, 78 });
PDStream pdStream = new PDStream(doc, is, (COSArray) null);
Assert.assertNull(pdStream.getFilters());
- List<String> stopFilters = new ArrayList<String>();
+ List<String> stopFilters = new ArrayList<>();
stopFilters.add(COSName.DCT_DECODE.toString());
stopFilters.add(COSName.DCT_DECODE_ABBREVIATION.toString());
@@ -66,7 +66,7 @@ public class PDStreamTest
InputStream is = new ByteArrayInputStream(new byte[] { 12, 34, 56, 78 });
PDStream pdStream = new PDStream(doc, is, new COSArray());
Assert.assertEquals(0,pdStream.getFilters().size());
- List<String> stopFilters = new ArrayList<String>();
+ List<String> stopFilters = new ArrayList<>();
stopFilters.add(COSName.DCT_DECODE.toString());
stopFilters.add(COSName.DCT_DECODE_ABBREVIATION.toString());
Modified: pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/common/TestPDNameTreeNode.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/common/TestPDNameTreeNode.java?rev=1791301&r1=1791300&r2=1791301&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/common/TestPDNameTreeNode.java (original)
+++ pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/common/TestPDNameTreeNode.java Thu Apr 13 19:59:07 2017
@@ -42,7 +42,7 @@ public class TestPDNameTreeNode extends
protected void setUp() throws Exception
{
this.node5 = new PDIntegerNameTreeNode();
- SortedMap<String, COSObjectable> names = new TreeMap<String, COSObjectable>();
+ SortedMap<String, COSObjectable> names = new TreeMap<>();
names.put("Actinium", COSInteger.get(89));
names.put("Aluminum", COSInteger.get(13));
names.put("Americium", COSInteger.get(95));
@@ -53,7 +53,7 @@ public class TestPDNameTreeNode extends
this.node5.setNames(names);
this.node24 = new PDIntegerNameTreeNode();
- names = new TreeMap<String, COSObjectable>();
+ names = new TreeMap<>();
names.put("Xenon", COSInteger.get(54));
names.put("Ytterbium", COSInteger.get(70));
names.put("Yttrium", COSInteger.get(39));
@@ -65,7 +65,7 @@ public class TestPDNameTreeNode extends
List<PDNameTreeNode> kids = this.node2.getKids();
if (kids == null)
{
- kids = new COSArrayList<PDNameTreeNode>();
+ kids = new COSArrayList<>();
}
kids.add(this.node5);
this.node2.setKids(kids);
@@ -74,7 +74,7 @@ public class TestPDNameTreeNode extends
kids = this.node4.getKids();
if (kids == null)
{
- kids = new COSArrayList<PDNameTreeNode>();
+ kids = new COSArrayList<>();
}
kids.add(this.node24);
this.node4.setKids(kids);
@@ -83,7 +83,7 @@ public class TestPDNameTreeNode extends
kids = this.node1.getKids();
if (kids == null)
{
- kids = new COSArrayList<PDNameTreeNode>();
+ kids = new COSArrayList<>();
}
kids.add(this.node2);
kids.add(this.node4);