Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFSlideShowEncrypted.java URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFSlideShowEncrypted.java?rev=1808516&r1=1808515&r2=1808516&view=diff ============================================================================== --- poi/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFSlideShowEncrypted.java (original) +++ poi/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFSlideShowEncrypted.java Sat Sep 16 08:27:23 2017 @@ -409,9 +409,9 @@ public class HSLFSlideShowEncrypted impl UserEditAtom uea = null; PersistPtrHolder pph = null; - TreeMap<Integer,Integer> slideLocations = new TreeMap<Integer,Integer>(); - TreeMap<Integer,Record> recordMap = new TreeMap<Integer,Record>(); - List<Integer> obsoleteOffsets = new ArrayList<Integer>(); + TreeMap<Integer,Integer> slideLocations = new TreeMap<>(); + TreeMap<Integer,Record> recordMap = new TreeMap<>(); + List<Integer> obsoleteOffsets = new ArrayList<>(); int duplicatedCount = 0; for (Record r : records) { assert(r instanceof PositionDependentRecord); @@ -468,7 +468,7 @@ public class HSLFSlideShowEncrypted impl int deaOffset = -1; PersistPtrHolder ptr = null; UserEditAtom uea = null; - List<Record> recordList = new ArrayList<Record>(); + List<Record> recordList = new ArrayList<>(); for (Record r : records) { if (r instanceof DocumentEncryptionAtom) { deaOffset = ((DocumentEncryptionAtom)r).getLastOnDiskOffset(); @@ -490,7 +490,7 @@ public class HSLFSlideShowEncrypted impl return records; } - TreeMap<Integer,Integer> tm = new TreeMap<Integer,Integer>(ptr.getSlideLocationsLookup()); + TreeMap<Integer,Integer> tm = new TreeMap<>(ptr.getSlideLocationsLookup()); ptr.clear(); int maxSlideId = -1; for (Map.Entry<Integer,Integer> me : tm.entrySet()) {
Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFSlideShowImpl.java URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFSlideShowImpl.java?rev=1808516&r1=1808515&r2=1808516&view=diff ============================================================================== --- poi/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFSlideShowImpl.java (original) +++ poi/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFSlideShowImpl.java Sat Sep 16 08:27:23 2017 @@ -250,8 +250,8 @@ public final class HSLFSlideShowImpl ext private Record[] read(byte[] docstream, int usrOffset) throws IOException { //sort found records by offset. //(it is not necessary but SlideShow.findMostRecentCoreRecords() expects them sorted) - NavigableMap<Integer, Record> records = new TreeMap<Integer, Record>(); // offset -> record - Map<Integer, Integer> persistIds = new HashMap<Integer, Integer>(); // offset -> persistId + NavigableMap<Integer, Record> records = new TreeMap<>(); // offset -> record + Map<Integer, Integer> persistIds = new HashMap<>(); // offset -> persistId initRecordOffsets(docstream, usrOffset, records, persistIds); HSLFSlideShowEncrypted decryptData = new HSLFSlideShowEncrypted(docstream, records); @@ -347,7 +347,7 @@ public final class HSLFSlideShowImpl ext * This is lazily called as and when we want to touch pictures. */ private void readPictures() throws IOException { - _pictures = new ArrayList<HSLFPictureData>(); + _pictures = new ArrayList<>(); // if the presentation doesn't contain pictures - will use a null set instead if (!getDirectory().hasEntry("Pictures")) { @@ -460,7 +460,7 @@ public final class HSLFSlideShowImpl ext // For position dependent records, hold where they were and now are // As we go along, update, and hand over, to any Position Dependent // records we happen across - Map<Integer, Integer> oldToNewPositions = new HashMap<Integer, Integer>(); + Map<Integer, Integer> oldToNewPositions = new HashMap<>(); // First pass - figure out where all the position dependent // records are going to end up, in the new scheme @@ -505,7 +505,7 @@ public final class HSLFSlideShowImpl ext throw new HSLFException("UserEditAtom or PersistPtr can't be determined."); } - Map<Integer, Integer> persistIds = new HashMap<Integer, Integer>(); + Map<Integer, Integer> persistIds = new HashMap<>(); for (Map.Entry<Integer, Integer> entry : ptr.getSlideLocationsLookup().entrySet()) { persistIds.put(oldToNewPositions.get(entry.getValue()), entry.getKey()); } @@ -667,7 +667,7 @@ public final class HSLFSlideShowImpl ext _records = encryptedSS.updateEncryptionRecord(_records); // The list of entries we've written out - List<String> writtenEntries = new ArrayList<String>(1); + List<String> writtenEntries = new ArrayList<>(1); // Write out the Property Streams writeProperties(outFS, writtenEntries); @@ -830,7 +830,7 @@ public final class HSLFSlideShowImpl ext */ public HSLFObjectData[] getEmbeddedObjects() { if (_objects == null) { - List<HSLFObjectData> objects = new ArrayList<HSLFObjectData>(); + List<HSLFObjectData> objects = new ArrayList<>(); for (Record r : _records) { if (r instanceof ExOleObjStg) { objects.add(new HSLFObjectData((ExOleObjStg) r)); Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFSoundData.java URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFSoundData.java?rev=1808516&r1=1808515&r2=1808516&view=diff ============================================================================== --- poi/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFSoundData.java (original) +++ poi/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFSoundData.java Sat Sep 16 08:27:23 2017 @@ -75,7 +75,7 @@ public final class HSLFSoundData { * @return the array with the sound data */ public static HSLFSoundData[] find(Document document){ - ArrayList<HSLFSoundData> lst = new ArrayList<HSLFSoundData>(); + ArrayList<HSLFSoundData> lst = new ArrayList<>(); Record[] ch = document.getChildRecords(); for (int i = 0; i < ch.length; i++) { if(ch[i].getRecordType() == RecordTypes.SoundCollection.typeID){ Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFTable.java URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFTable.java?rev=1808516&r1=1808515&r2=1808516&view=diff ============================================================================== --- poi/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFTable.java (original) +++ poi/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFTable.java Sat Sep 16 08:27:23 2017 @@ -156,7 +156,7 @@ implements HSLFShapeContainer, TableShap protected void afterInsert(HSLFSheet sh){ super.afterInsert(sh); - Set<HSLFLine> lineSet = new HashSet<HSLFLine>(); + Set<HSLFLine> lineSet = new HashSet<>(); for (HSLFTableCell row[] : cells) { for (HSLFTableCell c : row) { addShape(c); @@ -176,7 +176,7 @@ implements HSLFShapeContainer, TableShap } private void cellListToArray() { - List<HSLFTableCell> htc = new ArrayList<HSLFTableCell>(); + List<HSLFTableCell> htc = new ArrayList<>(); for (HSLFShape h : getShapes()) { if (h instanceof HSLFTableCell) { htc.add((HSLFTableCell)h); @@ -187,8 +187,8 @@ implements HSLFShapeContainer, TableShap throw new IllegalStateException("HSLFTable without HSLFTableCells"); } - SortedSet<Double> colSet = new TreeSet<Double>(); - SortedSet<Double> rowSet = new TreeSet<Double>(); + SortedSet<Double> colSet = new TreeSet<>(); + SortedSet<Double> rowSet = new TreeSet<>(); // #1 pass - determine cols and rows for (HSLFTableCell sh : htc) { @@ -198,8 +198,8 @@ implements HSLFShapeContainer, TableShap } cells = new HSLFTableCell[rowSet.size()][colSet.size()]; - List<Double> colLst = new ArrayList<Double>(colSet); - List<Double> rowLst = new ArrayList<Double>(rowSet); + List<Double> colLst = new ArrayList<>(colSet); + List<Double> rowLst = new ArrayList<>(rowSet); // #2 pass - assign shape to table cells for (HSLFTableCell sh : htc) { @@ -254,7 +254,7 @@ implements HSLFShapeContainer, TableShap } private void fitLinesToCells() { - List<LineRect> lines = new ArrayList<LineRect>(); + List<LineRect> lines = new ArrayList<>(); for (HSLFShape h : getShapes()) { if (h instanceof HSLFLine) { lines.add(new LineRect((HSLFLine)h)); Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFTextParagraph.java URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFTextParagraph.java?rev=1808516&r1=1808515&r2=1808516&view=diff ============================================================================== --- poi/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFTextParagraph.java (original) +++ poi/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFTextParagraph.java Sat Sep 16 08:27:23 2017 @@ -96,7 +96,7 @@ public final class HSLFTextParagraph imp private TextPropCollection _masterStyle; protected TextRulerAtom _ruler; - protected final List<HSLFTextRun> _runs = new ArrayList<HSLFTextRun>(); + protected final List<HSLFTextRun> _runs = new ArrayList<>(); protected HSLFTextShape _parentShape; private HSLFSheet _sheet; private int shapeId; @@ -1251,7 +1251,7 @@ public final class HSLFTextParagraph imp * For a given PPDrawing, grab all the TextRuns */ public static List<List<HSLFTextParagraph>> findTextParagraphs(PPDrawing ppdrawing, HSLFSheet sheet) { - List<List<HSLFTextParagraph>> runsV = new ArrayList<List<HSLFTextParagraph>>(); + List<List<HSLFTextParagraph>> runsV = new ArrayList<>(); for (EscherTextboxWrapper wrapper : ppdrawing.getTextboxWrappers()) { List<HSLFTextParagraph> p = findTextParagraphs(wrapper, sheet); if (p != null) { @@ -1299,7 +1299,7 @@ public final class HSLFTextParagraph imp } else { // create a new container // TODO: ... is this case really happening? - rv = new ArrayList<HSLFTextParagraph>(rv); + rv = new ArrayList<>(rv); rv.addAll(r); } } @@ -1352,7 +1352,7 @@ public final class HSLFTextParagraph imp * @param records the records to build from */ protected static List<List<HSLFTextParagraph>> findTextParagraphs(Record[] records) { - List<List<HSLFTextParagraph>> paragraphCollection = new ArrayList<List<HSLFTextParagraph>>(); + List<List<HSLFTextParagraph>> paragraphCollection = new ArrayList<>(); int[] recordIdx = { 0 }; @@ -1397,7 +1397,7 @@ public final class HSLFTextParagraph imp String rawText = (tchars != null) ? tchars.getText() : tbytes.getText(); StyleTextPropAtom styles = findStyleAtomPresent(header, rawText.length()); - List<HSLFTextParagraph> paragraphs = new ArrayList<HSLFTextParagraph>(); + List<HSLFTextParagraph> paragraphs = new ArrayList<>(); paragraphCollection.add(paragraphs); // split, but keep delimiter Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFTextShape.java URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFTextShape.java?rev=1808516&r1=1808515&r2=1808516&view=diff ============================================================================== --- poi/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFTextShape.java (original) +++ poi/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFTextShape.java Sat Sep 16 08:27:23 2017 @@ -133,7 +133,7 @@ implements TextShape<HSLFShape,HSLFTextP /** * TextRun object which holds actual text and format data */ - private List<HSLFTextParagraph> _paragraphs = new ArrayList<HSLFTextParagraph>(); + private List<HSLFTextParagraph> _paragraphs = new ArrayList<>(); /** * Escher container which holds text attributes such as @@ -934,7 +934,7 @@ implements TextShape<HSLFShape,HSLFTextP * @return null, if there's no alternative representation, otherwise the text shape */ public TextShape<?,? extends TextParagraph<?,?,? extends TextRun>> getMetroShape() { - HSLFMetroShape<TextShape<?,? extends TextParagraph<?,?,? extends TextRun>>> mbs = new HSLFMetroShape<TextShape<?,? extends TextParagraph<?,?,? extends TextRun>>>(this); + HSLFMetroShape<TextShape<?,? extends TextParagraph<?,?,? extends TextRun>>> mbs = new HSLFMetroShape<>(this); return mbs.getShape(); } } \ No newline at end of file Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFTitleMaster.java URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFTitleMaster.java?rev=1808516&r1=1808515&r2=1808516&view=diff ============================================================================== --- poi/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFTitleMaster.java (original) +++ poi/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFTitleMaster.java Sat Sep 16 08:27:23 2017 @@ -27,7 +27,7 @@ import org.apache.poi.hslf.record.SlideA * Title masters define the design template for slides with a Title Slide layout. */ public final class HSLFTitleMaster extends HSLFMasterSheet { - private final List<List<HSLFTextParagraph>> _paragraphs = new ArrayList<List<HSLFTextParagraph>>(); + private final List<List<HSLFTextParagraph>> _paragraphs = new ArrayList<>(); /** * Constructs a TitleMaster Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hsmf/MAPIMessage.java URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hsmf/MAPIMessage.java?rev=1808516&r1=1808515&r2=1808516&view=diff ============================================================================== --- poi/trunk/src/scratchpad/src/org/apache/poi/hsmf/MAPIMessage.java (original) +++ poi/trunk/src/scratchpad/src/org/apache/poi/hsmf/MAPIMessage.java Sat Sep 16 08:27:23 2017 @@ -149,8 +149,8 @@ public class MAPIMessage extends POIRead ChunkGroup[] chunkGroups = POIFSChunkParser.parse(poifsDir); // Grab interesting bits - ArrayList<AttachmentChunks> attachments = new ArrayList<AttachmentChunks>(); - ArrayList<RecipientChunks> recipients = new ArrayList<RecipientChunks>(); + ArrayList<AttachmentChunks> attachments = new ArrayList<>(); + ArrayList<RecipientChunks> recipients = new ArrayList<>(); for(ChunkGroup group : chunkGroups) { // Should only ever be one of each of these if(group instanceof Chunks) { Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hsmf/datatypes/AttachmentChunks.java URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hsmf/datatypes/AttachmentChunks.java?rev=1808516&r1=1808515&r2=1808516&view=diff ============================================================================== --- poi/trunk/src/scratchpad/src/org/apache/poi/hsmf/datatypes/AttachmentChunks.java (original) +++ poi/trunk/src/scratchpad/src/org/apache/poi/hsmf/datatypes/AttachmentChunks.java Sat Sep 16 08:27:23 2017 @@ -62,7 +62,7 @@ public class AttachmentChunks implements private String poifsName; /** Holds all the chunks that were found. */ - private List<Chunk> allChunks = new ArrayList<Chunk>(); + private List<Chunk> allChunks = new ArrayList<>(); public AttachmentChunks(String poifsName) { this.poifsName = poifsName; Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hsmf/datatypes/Chunks.java URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hsmf/datatypes/Chunks.java?rev=1808516&r1=1808515&r2=1808516&view=diff ============================================================================== --- poi/trunk/src/scratchpad/src/org/apache/poi/hsmf/datatypes/Chunks.java (original) +++ poi/trunk/src/scratchpad/src/org/apache/poi/hsmf/datatypes/Chunks.java Sat Sep 16 08:27:23 2017 @@ -44,7 +44,7 @@ public final class Chunks implements Chu * Normally a property will have zero chunks (fixed sized) or one chunk * (variable size), but in some cases (eg Unknown) you may get more. */ - private Map<MAPIProperty, List<Chunk>> allChunks = new HashMap<MAPIProperty, List<Chunk>>(); + private Map<MAPIProperty, List<Chunk>> allChunks = new HashMap<>(); /** Type of message that the MSG represents (ie. IPM.Note) */ private StringChunk messageClass; @@ -106,7 +106,7 @@ public final class Chunks implements Chu @Override public Chunk[] getChunks() { - ArrayList<Chunk> chunks = new ArrayList<Chunk>(allChunks.size()); + ArrayList<Chunk> chunks = new ArrayList<>(allChunks.size()); for (List<Chunk> c : allChunks.values()) { chunks.addAll(c); } @@ -240,7 +240,7 @@ public final class Chunks implements Chu // And add to the main list if (allChunks.get(prop) == null) { - allChunks.put(prop, new ArrayList<Chunk>()); + allChunks.put(prop, new ArrayList<>()); } allChunks.get(prop).add(chunk); } Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hsmf/datatypes/MAPIProperty.java URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hsmf/datatypes/MAPIProperty.java?rev=1808516&r1=1808515&r2=1808516&view=diff ============================================================================== --- poi/trunk/src/scratchpad/src/org/apache/poi/hsmf/datatypes/MAPIProperty.java (original) +++ poi/trunk/src/scratchpad/src/org/apache/poi/hsmf/datatypes/MAPIProperty.java Sat Sep 16 08:27:23 2017 @@ -44,7 +44,7 @@ import org.apache.poi.hsmf.datatypes.Typ * http://msdn.microsoft.com/en-us/library/ms526356%28v=exchg.10%29.aspx */ public class MAPIProperty { - private static Map<Integer, MAPIProperty> attributes = new HashMap<Integer, MAPIProperty>(); + private static Map<Integer, MAPIProperty> attributes = new HashMap<>(); public static final MAPIProperty AB_DEFAULT_DIR = new MAPIProperty(0x3d06, BINARY, "AbDefaultDir", "PR_AB_DEFAULT_DIR"); Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hsmf/datatypes/NameIdChunks.java URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hsmf/datatypes/NameIdChunks.java?rev=1808516&r1=1808515&r2=1808516&view=diff ============================================================================== --- poi/trunk/src/scratchpad/src/org/apache/poi/hsmf/datatypes/NameIdChunks.java (original) +++ poi/trunk/src/scratchpad/src/org/apache/poi/hsmf/datatypes/NameIdChunks.java Sat Sep 16 08:27:23 2017 @@ -27,7 +27,7 @@ public final class NameIdChunks implemen public static final String NAME = "__nameid_version1.0"; /** Holds all the chunks that were found. */ - private List<Chunk> allChunks = new ArrayList<Chunk>(); + private List<Chunk> allChunks = new ArrayList<>(); public Chunk[] getAll() { return allChunks.toArray(new Chunk[allChunks.size()]); Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hsmf/datatypes/PropertiesChunk.java URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hsmf/datatypes/PropertiesChunk.java?rev=1808516&r1=1808515&r2=1808516&view=diff ============================================================================== --- poi/trunk/src/scratchpad/src/org/apache/poi/hsmf/datatypes/PropertiesChunk.java (original) +++ poi/trunk/src/scratchpad/src/org/apache/poi/hsmf/datatypes/PropertiesChunk.java Sat Sep 16 08:27:23 2017 @@ -58,7 +58,7 @@ public abstract class PropertiesChunk ex * Holds properties, indexed by type. If a property is multi-valued, or * variable length, it will be held via a {@link ChunkBasedPropertyValue}. */ - private Map<MAPIProperty, PropertyValue> properties = new HashMap<MAPIProperty, PropertyValue>(); + private Map<MAPIProperty, PropertyValue> properties = new HashMap<>(); /** * The ChunkGroup that these properties apply to. Used when matching chunks @@ -95,7 +95,7 @@ public abstract class PropertiesChunk ex */ public Map<MAPIProperty, List<PropertyValue>> getProperties() { Map<MAPIProperty, List<PropertyValue>> props = - new HashMap<MAPIProperty, List<PropertyValue>>(properties.size()); + new HashMap<>(properties.size()); for (MAPIProperty prop : properties.keySet()) { props.put(prop, getValues(prop)); } @@ -135,7 +135,7 @@ public abstract class PropertiesChunk ex protected void matchVariableSizedPropertiesToChunks() { // Index the Parent Group chunks for easy lookup // TODO Is this the right way? - Map<Integer, Chunk> chunks = new HashMap<Integer, Chunk>(); + Map<Integer, Chunk> chunks = new HashMap<>(); for (Chunk chunk : parentGroup.getChunks()) { chunks.put(chunk.getChunkId(), chunk); } Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hsmf/datatypes/RecipientChunks.java URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hsmf/datatypes/RecipientChunks.java?rev=1808516&r1=1808515&r2=1808516&view=diff ============================================================================== --- poi/trunk/src/scratchpad/src/org/apache/poi/hsmf/datatypes/RecipientChunks.java (original) +++ poi/trunk/src/scratchpad/src/org/apache/poi/hsmf/datatypes/RecipientChunks.java Sat Sep 16 08:27:23 2017 @@ -160,7 +160,7 @@ public final class RecipientChunks imple } /** Holds all the chunks that were found. */ - private List<Chunk> allChunks = new ArrayList<Chunk>(); + private List<Chunk> allChunks = new ArrayList<>(); @Override public Map<MAPIProperty, List<PropertyValue>> getProperties() { Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hsmf/datatypes/Types.java URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hsmf/datatypes/Types.java?rev=1808516&r1=1808515&r2=1808516&view=diff ============================================================================== --- poi/trunk/src/scratchpad/src/org/apache/poi/hsmf/datatypes/Types.java (original) +++ poi/trunk/src/scratchpad/src/org/apache/poi/hsmf/datatypes/Types.java Sat Sep 16 08:27:23 2017 @@ -26,8 +26,8 @@ import java.util.Map; * http://msdn.microsoft.com/en-us/library/microsoft.exchange.data.contenttypes.tnef.tnefpropertytype%28v=EXCHG.140%29.aspx */ public final class Types { - private static Map<Integer, MAPIType> builtInTypes = new HashMap<Integer, MAPIType>(); - private static Map<Integer, MAPIType> customTypes = new HashMap<Integer, Types.MAPIType>(); + private static Map<Integer, MAPIType> builtInTypes = new HashMap<>(); + private static Map<Integer, MAPIType> customTypes = new HashMap<>(); /** Unspecified */ public static final MAPIType UNSPECIFIED = new MAPIType(0x0000, Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hsmf/dev/TypesLister.java URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hsmf/dev/TypesLister.java?rev=1808516&r1=1808515&r2=1808516&view=diff ============================================================================== --- poi/trunk/src/scratchpad/src/org/apache/poi/hsmf/dev/TypesLister.java (original) +++ poi/trunk/src/scratchpad/src/org/apache/poi/hsmf/dev/TypesLister.java Sat Sep 16 08:27:23 2017 @@ -31,7 +31,7 @@ public class TypesLister { public TypesLister() {} public void listByName(PrintStream out) { - ArrayList<MAPIProperty> all = new ArrayList<MAPIProperty>(MAPIProperty.getAll()); + ArrayList<MAPIProperty> all = new ArrayList<>(MAPIProperty.getAll()); Collections.sort(all, new Comparator<MAPIProperty>() { public int compare(MAPIProperty a, MAPIProperty b) { return a.name.compareTo(b.name); @@ -40,7 +40,7 @@ public class TypesLister { list(all, out); } public void listById(PrintStream out) { - ArrayList<MAPIProperty> all = new ArrayList<MAPIProperty>(MAPIProperty.getAll()); + ArrayList<MAPIProperty> all = new ArrayList<>(MAPIProperty.getAll()); Collections.sort(all, new Comparator<MAPIProperty>() { public int compare(MAPIProperty a, MAPIProperty b) { if(a.id < b.id) return -1; Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hsmf/parsers/POIFSChunkParser.java URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hsmf/parsers/POIFSChunkParser.java?rev=1808516&r1=1808515&r2=1808516&view=diff ============================================================================== --- poi/trunk/src/scratchpad/src/org/apache/poi/hsmf/parsers/POIFSChunkParser.java (original) +++ poi/trunk/src/scratchpad/src/org/apache/poi/hsmf/parsers/POIFSChunkParser.java Sat Sep 16 08:27:23 2017 @@ -58,7 +58,7 @@ public final class POIFSChunkParser { public static ChunkGroup[] parse(DirectoryNode node) throws IOException { Chunks mainChunks = new Chunks(); - ArrayList<ChunkGroup> groups = new ArrayList<ChunkGroup>(); + ArrayList<ChunkGroup> groups = new ArrayList<>(); groups.add(mainChunks); // Find our top level children Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hssf/converter/ExcelToFoConverter.java URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hssf/converter/ExcelToFoConverter.java?rev=1808516&r1=1808515&r2=1808516&view=diff ============================================================================== --- poi/trunk/src/scratchpad/src/org/apache/poi/hssf/converter/ExcelToFoConverter.java (original) +++ poi/trunk/src/scratchpad/src/org/apache/poi/hssf/converter/ExcelToFoConverter.java Sat Sep 16 08:27:23 2017 @@ -528,7 +528,7 @@ public class ExcelToFoConverter extends return 0; } - final List<Element> emptyCells = new ArrayList<Element>( maxColIx ); + final List<Element> emptyCells = new ArrayList<>(maxColIx); if ( isOutputRowNumbers() ) { @@ -659,8 +659,8 @@ public class ExcelToFoConverter extends final CellRangeAddress[][] mergedRanges = ExcelToHtmlUtils .buildMergedRangesMap( sheet ); - final List<Element> emptyRowElements = new ArrayList<Element>( - physicalNumberOfRows ); + final List<Element> emptyRowElements = new ArrayList<>( + physicalNumberOfRows); int maxSheetColumns = 1; for ( int r = sheet.getFirstRowNum(); r <= sheet.getLastRowNum(); r++ ) { Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hssf/converter/ExcelToHtmlConverter.java URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hssf/converter/ExcelToHtmlConverter.java?rev=1808516&r1=1808515&r2=1808516&view=diff ============================================================================== --- poi/trunk/src/scratchpad/src/org/apache/poi/hssf/converter/ExcelToHtmlConverter.java (original) +++ poi/trunk/src/scratchpad/src/org/apache/poi/hssf/converter/ExcelToHtmlConverter.java Sat Sep 16 08:27:23 2017 @@ -170,7 +170,7 @@ public class ExcelToHtmlConverter extend private String cssClassPrefixTable = "t"; - private Map<Short, String> excelStyleToClass = new LinkedHashMap<Short, String>(); + private Map<Short, String> excelStyleToClass = new LinkedHashMap<>(); private final HtmlDocumentFacade htmlDocumentFacade; @@ -542,7 +542,7 @@ public class ExcelToHtmlConverter extend if ( maxColIx <= 0 ) return 0; - final List<Element> emptyCells = new ArrayList<Element>( maxColIx ); + final List<Element> emptyCells = new ArrayList<>(maxColIx); if ( isOutputRowNumbers() ) { @@ -667,8 +667,8 @@ public class ExcelToHtmlConverter extend final CellRangeAddress[][] mergedRanges = ExcelToHtmlUtils .buildMergedRangesMap( sheet ); - final List<Element> emptyRowElements = new ArrayList<Element>( - physicalNumberOfRows ); + final List<Element> emptyRowElements = new ArrayList<>( + physicalNumberOfRows); int maxSheetColumns = 1; for ( int r = sheet.getFirstRowNum(); r <= sheet.getLastRowNum(); r++ ) { Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hssf/usermodel/HSSFChart.java URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hssf/usermodel/HSSFChart.java?rev=1808516&r1=1808515&r2=1808516&view=diff ============================================================================== --- poi/trunk/src/scratchpad/src/org/apache/poi/hssf/usermodel/HSSFChart.java (original) +++ poi/trunk/src/scratchpad/src/org/apache/poi/hssf/usermodel/HSSFChart.java Sat Sep 16 08:27:23 2017 @@ -85,11 +85,11 @@ public final class HSSFChart { @SuppressWarnings("unused") private ChartTitleFormatRecord chartTitleFormat; private SeriesTextRecord chartTitleText; - private List<ValueRangeRecord> valueRanges = new ArrayList<ValueRangeRecord>(); + private List<ValueRangeRecord> valueRanges = new ArrayList<>(); private HSSFChartType type = HSSFChartType.Unknown; - private List<HSSFSeries> series = new ArrayList<HSSFSeries>(); + private List<HSSFSeries> series = new ArrayList<>(); public enum HSSFChartType { Area { @@ -146,7 +146,7 @@ public final class HSSFChart { public void createBarChart( HSSFWorkbook workbook, HSSFSheet parentSheet ) { - List<Record> records = new ArrayList<Record>(); + List<Record> records = new ArrayList<>(); records.add( createMSDrawingObjectRecord() ); records.add( createOBJRecord() ); records.add( createBOFRecord() ); @@ -218,7 +218,7 @@ public final class HSSFChart { * these charts yet, as this is very limited support */ public static HSSFChart[] getSheetCharts(HSSFSheet sheet) { - List<HSSFChart> charts = new ArrayList<HSSFChart>(); + List<HSSFChart> charts = new ArrayList<>(); HSSFChart lastChart = null; HSSFSeries lastSeries = null; // Find records of interest @@ -1136,7 +1136,7 @@ public final class HSSFChart { return null; } - List<Ptg> ptgList = new ArrayList<Ptg>(); + List<Ptg> ptgList = new ArrayList<>(); int rowCount = (range.getLastRow() - range.getFirstRow()) + 1; int colCount = (range.getLastColumn() - range.getFirstColumn()) + 1; @@ -1181,7 +1181,7 @@ public final class HSSFChart { } public HSSFSeries createSeries() throws Exception { - ArrayList<RecordBase> seriesTemplate = new ArrayList<RecordBase>(); + ArrayList<RecordBase> seriesTemplate = new ArrayList<>(); boolean seriesTemplateFilled = false; int idx = 0; @@ -1245,7 +1245,7 @@ public final class HSSFChart { HSSFSeries newSeries = null; /* duplicate record of the template series */ - ArrayList<RecordBase> clonedRecords = new ArrayList<RecordBase>(); + ArrayList<RecordBase> clonedRecords = new ArrayList<>(); for(final RecordBase record : seriesTemplate) { Record newRecord = null; Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hwmf/draw/HwmfGraphics.java URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hwmf/draw/HwmfGraphics.java?rev=1808516&r1=1808515&r2=1808516&view=diff ============================================================================== --- poi/trunk/src/scratchpad/src/org/apache/poi/hwmf/draw/HwmfGraphics.java (original) +++ poi/trunk/src/scratchpad/src/org/apache/poi/hwmf/draw/HwmfGraphics.java Sat Sep 16 08:27:23 2017 @@ -54,9 +54,9 @@ public class HwmfGraphics { private static final Charset DEFAULT_CHARSET = LocaleUtil.CHARSET_1252; private final Graphics2D graphicsCtx; - private final List<HwmfDrawProperties> propStack = new LinkedList<HwmfDrawProperties>(); + private final List<HwmfDrawProperties> propStack = new LinkedList<>(); private HwmfDrawProperties prop = new HwmfDrawProperties(); - private List<HwmfObjectTableEntry> objectTable = new ArrayList<HwmfObjectTableEntry>(); + private List<HwmfObjectTableEntry> objectTable = new ArrayList<>(); /** Bounding box from the placeable header */ private final Rectangle2D bbox; private final AffineTransform initialAT; Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hwmf/record/HwmfDraw.java URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hwmf/record/HwmfDraw.java?rev=1808516&r1=1808515&r2=1808516&view=diff ============================================================================== --- poi/trunk/src/scratchpad/src/org/apache/poi/hwmf/record/HwmfDraw.java (original) +++ poi/trunk/src/scratchpad/src/org/apache/poi/hwmf/record/HwmfDraw.java Sat Sep 16 08:27:23 2017 @@ -293,7 +293,7 @@ public class HwmfDraw { */ public static class WmfPolyPolygon implements HwmfRecord { - private List<Path2D> polyList = new ArrayList<Path2D>(); + private List<Path2D> polyList = new ArrayList<>(); @Override public HwmfRecordType getRecordType() { Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hwmf/record/HwmfPalette.java URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hwmf/record/HwmfPalette.java?rev=1808516&r1=1808515&r2=1808516&view=diff ============================================================================== --- poi/trunk/src/scratchpad/src/org/apache/poi/hwmf/record/HwmfPalette.java (original) +++ poi/trunk/src/scratchpad/src/org/apache/poi/hwmf/record/HwmfPalette.java Sat Sep 16 08:27:23 2017 @@ -102,7 +102,7 @@ public class HwmfPalette { */ private int start; - private List<PaletteEntry> palette = new ArrayList<PaletteEntry>(); + private List<PaletteEntry> palette = new ArrayList<>(); @Override public int init(LittleEndianInputStream leis, long recordSize, int recordFunction) throws IOException { @@ -127,7 +127,7 @@ public class HwmfPalette { } protected List<PaletteEntry> getPaletteCopy() { - List<PaletteEntry> newPalette = new ArrayList<PaletteEntry>(); + List<PaletteEntry> newPalette = new ArrayList<>(); for (PaletteEntry et : palette) { newPalette.add(new PaletteEntry(et)); } @@ -169,7 +169,7 @@ public class HwmfPalette { HwmfDrawProperties props = ctx.getProperties(); List<PaletteEntry> palette = props.getPalette(); if (palette == null) { - palette = new ArrayList<PaletteEntry>(); + palette = new ArrayList<>(); } int start = getPaletteStart(); for (int i=palette.size(); i<start; i++) { @@ -220,7 +220,7 @@ public class HwmfPalette { HwmfDrawProperties props = ctx.getProperties(); List<PaletteEntry> palette = props.getPalette(); if (palette == null) { - palette = new ArrayList<PaletteEntry>(); + palette = new ArrayList<>(); } for (int i=palette.size(); i<numberOfEntries; i++) { palette.add(new PaletteEntry()); @@ -303,7 +303,7 @@ public class HwmfPalette { List<PaletteEntry> src = getPaletteCopy(); int start = getPaletteStart(); if (dest == null) { - dest = new ArrayList<PaletteEntry>(); + dest = new ArrayList<>(); } for (int i=dest.size(); i<start; i++) { dest.add(new PaletteEntry()); Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hwmf/usermodel/HwmfPicture.java URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hwmf/usermodel/HwmfPicture.java?rev=1808516&r1=1808515&r2=1808516&view=diff ============================================================================== --- poi/trunk/src/scratchpad/src/org/apache/poi/hwmf/usermodel/HwmfPicture.java (original) +++ poi/trunk/src/scratchpad/src/org/apache/poi/hwmf/usermodel/HwmfPicture.java Sat Sep 16 08:27:23 2017 @@ -45,7 +45,7 @@ import org.apache.poi.util.Units; public class HwmfPicture { private static final POILogger logger = POILogFactory.getLogger(HwmfPicture.class); - final List<HwmfRecord> records = new ArrayList<HwmfRecord>(); + final List<HwmfRecord> records = new ArrayList<>(); final HwmfPlaceableHeader placeableHeader; final HwmfHeader header; Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/converter/AbstractWordConverter.java URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/converter/AbstractWordConverter.java?rev=1808516&r1=1808515&r2=1808516&view=diff ============================================================================== --- poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/converter/AbstractWordConverter.java (original) +++ poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/converter/AbstractWordConverter.java Sat Sep 16 08:27:23 2017 @@ -168,7 +168,7 @@ public abstract class AbstractWordConver structures.add( structure ); } - private final Set<Bookmark> bookmarkStack = new LinkedHashSet<Bookmark>(); + private final Set<Bookmark> bookmarkStack = new LinkedHashSet<>(); private FontReplacer fontReplacer = new DefaultFontReplacer(); @@ -303,7 +303,7 @@ public abstract class AbstractWordConver * should process char-by-char (slow) or find a correct way to * reconstruct the structure of range -- sergey */ - List<Structure> structures = new LinkedList<Structure>(); + List<Structure> structures = new LinkedList<>(); if ( wordDocument instanceof HWPFDocument ) { final HWPFDocument doc = (HWPFDocument) wordDocument; @@ -366,7 +366,7 @@ public abstract class AbstractWordConver } } - structures = new ArrayList<Structure>( structures ); + structures = new ArrayList<>(structures); Collections.sort( structures ); int previous = range.getStartOffset(); @@ -389,7 +389,7 @@ public abstract class AbstractWordConver if ( structure.structure instanceof Bookmark ) { // other bookmarks with same boundaries - List<Bookmark> bookmarks = new LinkedList<Bookmark>(); + List<Bookmark> bookmarks = new LinkedList<>(); for ( Bookmark bookmark : ( (HWPFDocument) wordDocument ) .getBookmarks() .getBookmarksStartedBetween( structure.start, Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/converter/AbstractWordUtils.java URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/converter/AbstractWordUtils.java?rev=1808516&r1=1808515&r2=1808516&view=diff ============================================================================== --- poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/converter/AbstractWordUtils.java (original) +++ poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/converter/AbstractWordUtils.java Sat Sep 16 08:27:23 2017 @@ -67,7 +67,7 @@ public class AbstractWordUtils */ static int[] buildTableCellEdgesArray( Table table ) { - Set<Integer> edges = new TreeSet<Integer>(); + Set<Integer> edges = new TreeSet<>(); for ( int r = 0; r < table.numRows(); r++ ) { @@ -228,7 +228,7 @@ public class AbstractWordUtils public static class NumberingState { - private final Map<String, Integer> levels = new HashMap<String, Integer>(); + private final Map<String, Integer> levels = new HashMap<>(); } Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/converter/HtmlDocumentFacade.java URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/converter/HtmlDocumentFacade.java?rev=1808516&r1=1808515&r2=1808516&view=diff ============================================================================== --- poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/converter/HtmlDocumentFacade.java (original) +++ poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/converter/HtmlDocumentFacade.java Sat Sep 16 08:27:23 2017 @@ -35,7 +35,7 @@ public class HtmlDocumentFacade /** * Map from tag name, to map linking known styles and css class names */ - private Map<String, Map<String, String>> stylesheet = new LinkedHashMap<String, Map<String, String>>(); + private Map<String, Map<String, String>> stylesheet = new LinkedHashMap<>(); private Element stylesheetElement; protected Element title; @@ -251,8 +251,8 @@ public class HtmlDocumentFacade public String getOrCreateCssClass( String classNamePrefix, String style ) { if ( !stylesheet.containsKey( classNamePrefix ) ) - stylesheet.put( classNamePrefix, new LinkedHashMap<String, String>( - 1 ) ); + stylesheet.put( classNamePrefix, new LinkedHashMap<>( + 1) ); Map<String, String> styleToClassName = stylesheet.get( classNamePrefix ); String knownClass = styleToClassName.get( style ); Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/converter/WordToFoConverter.java URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/converter/WordToFoConverter.java?rev=1808516&r1=1808515&r2=1808516&view=diff ============================================================================== --- poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/converter/WordToFoConverter.java (original) +++ poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/converter/WordToFoConverter.java Sat Sep 16 08:27:23 2017 @@ -103,7 +103,7 @@ public class WordToFoConverter extends A return wordToFoConverter.getDocument(); } - private List<Element> endnotes = new ArrayList<Element>( 0 ); + private List<Element> endnotes = new ArrayList<>(0); protected final FoDocumentFacade foDocumentFacade; @@ -111,7 +111,7 @@ public class WordToFoConverter extends A private boolean outputCharactersLanguage; - private Set<String> usedIds = new LinkedHashSet<String>(); + private Set<String> usedIds = new LinkedHashSet<>(); /** * Creates new instance of {@link WordToFoConverter}. Can be used for output Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/converter/WordToHtmlConverter.java URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/converter/WordToHtmlConverter.java?rev=1808516&r1=1808515&r2=1808516&view=diff ============================================================================== --- poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/converter/WordToHtmlConverter.java (original) +++ poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/converter/WordToHtmlConverter.java Sat Sep 16 08:27:23 2017 @@ -82,7 +82,7 @@ public class WordToHtmlConverter extends private static final POILogger logger = POILogFactory.getLogger( WordToHtmlConverter.class ); - private final Deque<BlockProperies> blocksProperies = new LinkedList<BlockProperies>(); + private final Deque<BlockProperies> blocksProperies = new LinkedList<>(); private final HtmlDocumentFacade htmlDocumentFacade; Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/dev/HWPFLister.java URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/dev/HWPFLister.java?rev=1808516&r1=1808515&r2=1808516&view=diff ============================================================================== --- poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/dev/HWPFLister.java (original) +++ poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/dev/HWPFLister.java Sat Sep 16 08:27:23 2017 @@ -324,7 +324,7 @@ public final class HWPFLister private void buildParagraphs() { - paragraphs = new LinkedHashMap<Integer, String>(); + paragraphs = new LinkedHashMap<>(); StringBuilder part = new StringBuilder(); String text = _doc.getDocumentText(); @@ -525,7 +525,7 @@ public final class HWPFLister .getFileInformationBlock().getFcPlcfbtePapx(), doc .getFileInformationBlock().getLcbPlcfbtePapx(), 4 ); - List<PAPX> papxs = new ArrayList<PAPX>(); + List<PAPX> papxs = new ArrayList<>(); int length = binTable.length(); for ( int x = 0; x < length; x++ ) Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/BookmarksTables.java URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/BookmarksTables.java?rev=1808516&r1=1808515&r2=1808516&view=diff ============================================================================== --- poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/BookmarksTables.java (original) +++ poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/BookmarksTables.java Sat Sep 16 08:27:23 2017 @@ -36,7 +36,7 @@ public class BookmarksTables private PlexOfCps descriptorsLim = new PlexOfCps( 0 ); - private List<String> names = new ArrayList<String>( 0 ); + private List<String> names = new ArrayList<>(0); public BookmarksTables( byte[] tableStream, FileInformationBlock fib ) { @@ -118,8 +118,8 @@ public class BookmarksTables int namesLength = fib.getLcbSttbfbkmk(); if ( namesStart != 0 && namesLength != 0 ) - this.names = new ArrayList<String>( Arrays.asList( SttbUtils - .readSttbfBkmk( tableStream, namesStart ) ) ); + this.names = new ArrayList<>(Arrays.asList(SttbUtils + .readSttbfBkmk(tableStream, namesStart))); int firstDescriptorsStart = fib.getFcPlcfbkf(); int firstDescriptorsLength = fib.getLcbPlcfbkf(); Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/CHPBinTable.java URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/CHPBinTable.java?rev=1808516&r1=1808515&r2=1808516&view=diff ============================================================================== --- poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/CHPBinTable.java (original) +++ poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/CHPBinTable.java Sat Sep 16 08:27:23 2017 @@ -53,7 +53,7 @@ public class CHPBinTable .getLogger( CHPBinTable.class ); /** List of character properties.*/ - protected List<CHPX> _textRuns = new ArrayList<CHPX>(); + protected List<CHPX> _textRuns = new ArrayList<>(); public CHPBinTable() { @@ -171,7 +171,7 @@ public class CHPBinTable start = System.currentTimeMillis(); } - List<CHPX> oldChpxSortedByStartPos = new ArrayList<CHPX>( _textRuns ); + List<CHPX> oldChpxSortedByStartPos = new ArrayList<>(_textRuns); Collections.sort( oldChpxSortedByStartPos, PropertyNode.StartComparator.instance ); @@ -179,7 +179,7 @@ public class CHPBinTable Long.valueOf( System.currentTimeMillis() - start ), " ms" ); start = System.currentTimeMillis(); - final Map<CHPX, Integer> chpxToFileOrder = new IdentityHashMap<CHPX, Integer>(); + final Map<CHPX, Integer> chpxToFileOrder = new IdentityHashMap<>(); { int counter = 0; for ( CHPX chpx : _textRuns ) @@ -203,15 +203,15 @@ public class CHPBinTable List<Integer> textRunsBoundariesList; { - Set<Integer> textRunsBoundariesSet = new HashSet<Integer>(); + Set<Integer> textRunsBoundariesSet = new HashSet<>(); for ( CHPX chpx : _textRuns ) { textRunsBoundariesSet.add( Integer.valueOf( chpx.getStart() ) ); textRunsBoundariesSet.add( Integer.valueOf( chpx.getEnd() ) ); } textRunsBoundariesSet.remove( Integer.valueOf( 0 ) ); - textRunsBoundariesList = new ArrayList<Integer>( - textRunsBoundariesSet ); + textRunsBoundariesList = new ArrayList<>( + textRunsBoundariesSet); Collections.sort( textRunsBoundariesList ); } @@ -219,7 +219,7 @@ public class CHPBinTable Long.valueOf( System.currentTimeMillis() - start ), " ms" ); start = System.currentTimeMillis(); - List<CHPX> newChpxs = new LinkedList<CHPX>(); + List<CHPX> newChpxs = new LinkedList<>(); int lastTextRunStart = 0; for ( Integer objBoundary : textRunsBoundariesList ) { @@ -237,7 +237,7 @@ public class CHPBinTable && oldChpxSortedByStartPos.get( startPosition ).getStart() >= boundary ) startPosition--; - List<CHPX> chpxs = new LinkedList<CHPX>(); + List<CHPX> chpxs = new LinkedList<>(); for ( int c = startPosition; c < oldChpxSortedByStartPos.size(); c++ ) { CHPX chpx = oldChpxSortedByStartPos.get( c ); @@ -291,7 +291,7 @@ public class CHPBinTable continue; } - this._textRuns = new ArrayList<CHPX>( newChpxs ); + this._textRuns = new ArrayList<>(newChpxs); logger.log( POILogger.DEBUG, "CHPX rebuilded in ", Long.valueOf( System.currentTimeMillis() - start ), " ms (", Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/CHPFormattedDiskPage.java URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/CHPFormattedDiskPage.java?rev=1808516&r1=1808515&r2=1808516&view=diff ============================================================================== --- poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/CHPFormattedDiskPage.java (original) +++ poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/CHPFormattedDiskPage.java Sat Sep 16 08:27:23 2017 @@ -47,7 +47,7 @@ public final class CHPFormattedDiskPage { private static final int FC_SIZE = 4; - private ArrayList<CHPX> _chpxList = new ArrayList<CHPX>(); + private ArrayList<CHPX> _chpxList = new ArrayList<>(); private ArrayList<CHPX> _overFlow; @@ -193,7 +193,7 @@ public final class CHPFormattedDiskPage // see if we couldn't fit some if ( index != size ) { - _overFlow = new ArrayList<CHPX>(); + _overFlow = new ArrayList<>(); _overFlow.addAll( _chpxList.subList( index, size ) ); } Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/ComplexFileTable.java URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/ComplexFileTable.java?rev=1808516&r1=1808515&r2=1808516&view=diff ============================================================================== --- poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/ComplexFileTable.java (original) +++ poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/ComplexFileTable.java Sat Sep 16 08:27:23 2017 @@ -46,7 +46,7 @@ public class ComplexFileTable { Charset charset) throws IOException { //skips through the prms before we reach the piece table. These contain data //for actual fast saved files - List<SprmBuffer> sprmBuffers = new LinkedList<SprmBuffer>(); + List<SprmBuffer> sprmBuffers = new LinkedList<>(); while (tableStream[offset] == GRPPRL_TYPE) { offset++; int size = LittleEndian.getShort(tableStream, offset); Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/EscherRecordHolder.java URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/EscherRecordHolder.java?rev=1808516&r1=1808515&r2=1808516&view=diff ============================================================================== --- poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/EscherRecordHolder.java (original) +++ poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/EscherRecordHolder.java Sat Sep 16 08:27:23 2017 @@ -37,7 +37,7 @@ public final class EscherRecordHolder { private final ArrayList<EscherRecord> escherRecords; public EscherRecordHolder() { - escherRecords = new ArrayList<EscherRecord>(); + escherRecords = new ArrayList<>(); } public EscherRecordHolder(byte[] data, int offset, int size) { @@ -125,8 +125,8 @@ public final class EscherRecordHolder { public List<? extends EscherContainerRecord> getDgContainers() { - List<EscherContainerRecord> dgContainers = new ArrayList<EscherContainerRecord>( - 1 ); + List<EscherContainerRecord> dgContainers = new ArrayList<>( + 1); for ( EscherRecord escherRecord : getEscherRecords() ) { if ( escherRecord.getRecordId() == (short) 0xF002 ) @@ -139,8 +139,8 @@ public final class EscherRecordHolder { public List<? extends EscherContainerRecord> getDggContainers() { - List<EscherContainerRecord> dggContainers = new ArrayList<EscherContainerRecord>( - 1 ); + List<EscherContainerRecord> dggContainers = new ArrayList<>( + 1); for ( EscherRecord escherRecord : getEscherRecords() ) { if ( escherRecord.getRecordId() == (short) 0xF000 ) @@ -153,8 +153,8 @@ public final class EscherRecordHolder { public List<? extends EscherContainerRecord> getBStoreContainers() { - List<EscherContainerRecord> bStoreContainers = new ArrayList<EscherContainerRecord>( - 1 ); + List<EscherContainerRecord> bStoreContainers = new ArrayList<>( + 1); for ( EscherContainerRecord dggContainer : getDggContainers() ) { for ( EscherRecord escherRecord : dggContainer.getChildRecords() ) @@ -170,8 +170,8 @@ public final class EscherRecordHolder { public List<? extends EscherContainerRecord> getSpgrContainers() { - List<EscherContainerRecord> spgrContainers = new ArrayList<EscherContainerRecord>( - 1 ); + List<EscherContainerRecord> spgrContainers = new ArrayList<>( + 1); for ( EscherContainerRecord dgContainer : getDgContainers() ) { for ( EscherRecord escherRecord : dgContainer.getChildRecords() ) @@ -187,8 +187,8 @@ public final class EscherRecordHolder { public List<? extends EscherContainerRecord> getSpContainers() { - List<EscherContainerRecord> spContainers = new ArrayList<EscherContainerRecord>( - 1 ); + List<EscherContainerRecord> spContainers = new ArrayList<>( + 1); for ( EscherContainerRecord spgrContainer : getSpgrContainers() ) { for ( EscherRecord escherRecord : spgrContainer.getChildRecords() ) Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/FIBFieldHandler.java URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/FIBFieldHandler.java?rev=1808516&r1=1808515&r2=1808516&view=diff ============================================================================== --- poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/FIBFieldHandler.java (original) +++ poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/FIBFieldHandler.java Sat Sep 16 08:27:23 2017 @@ -148,7 +148,7 @@ public final class FIBFieldHandler private static final int FIELD_SIZE = LittleEndian.INT_SIZE * 2; - private Map<Integer, UnhandledDataStructure> _unknownMap = new HashMap<Integer, UnhandledDataStructure>(); + private Map<Integer, UnhandledDataStructure> _unknownMap = new HashMap<>(); private int[] _fields; Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/FSPATable.java URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/FSPATable.java?rev=1808516&r1=1808515&r2=1808516&view=diff ============================================================================== --- poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/FSPATable.java (original) +++ poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/FSPATable.java Sat Sep 16 08:27:23 2017 @@ -33,7 +33,7 @@ import org.apache.poi.util.Internal; public final class FSPATable { - private final Map<Integer, GenericPropertyNode> _byStart = new LinkedHashMap<Integer, GenericPropertyNode>(); + private final Map<Integer, GenericPropertyNode> _byStart = new LinkedHashMap<>(); public FSPATable( byte[] tableStream, FileInformationBlock fib, FSPADocumentPart part ) @@ -79,7 +79,7 @@ public final class FSPATable public FSPA[] getShapes() { - List<FSPA> result = new ArrayList<FSPA>( _byStart.size() ); + List<FSPA> result = new ArrayList<>(_byStart.size()); for ( GenericPropertyNode propertyNode : _byStart.values() ) { result.add( new FSPA( propertyNode.getBytes(), 0 ) ); Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/FieldsTables.java URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/FieldsTables.java?rev=1808516&r1=1808515&r2=1808516&view=diff ============================================================================== --- poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/FieldsTables.java (original) +++ poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/FieldsTables.java Sat Sep 16 08:27:23 2017 @@ -79,10 +79,10 @@ public class FieldsTables private static ArrayList<PlexOfField> toArrayList( PlexOfCps plexOfCps ) { if ( plexOfCps == null ) - return new ArrayList<PlexOfField>(); + return new ArrayList<>(); - ArrayList<PlexOfField> fields = new ArrayList<PlexOfField>( - plexOfCps.length() ); + ArrayList<PlexOfField> fields = new ArrayList<>( + plexOfCps.length()); for ( int i = 0; i < plexOfCps.length(); i++ ) { GenericPropertyNode propNode = plexOfCps.getProperty( i ); @@ -97,8 +97,8 @@ public class FieldsTables public FieldsTables( byte[] tableStream, FileInformationBlock fib ) { - _tables = new HashMap<FieldsDocumentPart, PlexOfCps>( - FieldsDocumentPart.values().length ); + _tables = new HashMap<>( + FieldsDocumentPart.values().length); for ( FieldsDocumentPart part : FieldsDocumentPart.values() ) { Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/FileInformationBlock.java URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/FileInformationBlock.java?rev=1808516&r1=1808515&r2=1808516&view=diff ============================================================================== --- poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/FileInformationBlock.java (original) +++ poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/FileInformationBlock.java Sat Sep 16 08:27:23 2017 @@ -234,7 +234,7 @@ public final class FileInformationBlock * fields FIBFieldHandler will load it content into * UnhandledDataStructure and save them on save. */ - HashSet<Integer> knownFieldSet = new HashSet<Integer>(); + HashSet<Integer> knownFieldSet = new HashSet<>(); knownFieldSet.add( Integer.valueOf( FIBFieldHandler.STSHF ) ); knownFieldSet.add( Integer.valueOf( FIBFieldHandler.CLX ) ); knownFieldSet.add( Integer.valueOf( FIBFieldHandler.DOP ) ); Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/ListTables.java URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/ListTables.java?rev=1808516&r1=1808515&r2=1808516&view=diff ============================================================================== --- poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/ListTables.java (original) +++ poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/ListTables.java Sat Sep 16 08:27:23 2017 @@ -38,7 +38,7 @@ public final class ListTables /** * Both PlfLst and the following LVLs */ - private final LinkedHashMap<Integer, ListData> _listMap = new LinkedHashMap<Integer, ListData>(); + private final LinkedHashMap<Integer, ListData> _listMap = new LinkedHashMap<>(); private PlfLfo _plfLfo; public ListTables() Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/OldFontTable.java URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/OldFontTable.java?rev=1808516&r1=1808515&r2=1808516&view=diff ============================================================================== --- poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/OldFontTable.java (original) +++ poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/OldFontTable.java Sat Sep 16 08:27:23 2017 @@ -42,7 +42,7 @@ public final class OldFontTable { //and it is recorded in the first short. - List<OldFfn> ffns = new ArrayList<OldFfn>(); + List<OldFfn> ffns = new ArrayList<>(); int fontTableLength = LittleEndian.getShort(buf, offset); int endOfTableOffset = offset + length; Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/OldTextPieceTable.java URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/OldTextPieceTable.java?rev=1808516&r1=1808515&r2=1808516&view=diff ============================================================================== --- poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/OldTextPieceTable.java (original) +++ poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/OldTextPieceTable.java Sat Sep 16 08:27:23 2017 @@ -98,7 +98,7 @@ public class OldTextPieceTable extends T // In the interest of our sanity, now sort the text pieces // into order, if they're not already Collections.sort(_textPieces); - _textPiecesFCOrder = new ArrayList<TextPiece>(_textPieces); + _textPiecesFCOrder = new ArrayList<>(_textPieces); Collections.sort(_textPiecesFCOrder, new FCComparator()); } Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/PAPBinTable.java URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/PAPBinTable.java?rev=1808516&r1=1808515&r2=1808516&view=diff ============================================================================== --- poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/PAPBinTable.java (original) +++ poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/PAPBinTable.java Sat Sep 16 08:27:23 2017 @@ -49,7 +49,7 @@ public class PAPBinTable private static final POILogger logger = POILogFactory .getLogger( PAPBinTable.class ); - protected final ArrayList<PAPX> _paragraphs = new ArrayList<PAPX>(); + protected final ArrayList<PAPX> _paragraphs = new ArrayList<>(); public PAPBinTable() { @@ -158,7 +158,7 @@ public class PAPBinTable start = System.currentTimeMillis(); } - List<PAPX> oldPapxSortedByEndPos = new ArrayList<PAPX>( paragraphs ); + List<PAPX> oldPapxSortedByEndPos = new ArrayList<>(paragraphs); Collections.sort( oldPapxSortedByEndPos, PropertyNode.EndComparator.instance ); @@ -166,7 +166,7 @@ public class PAPBinTable Long.valueOf( System.currentTimeMillis() - start ), " ms" ); start = System.currentTimeMillis(); - final Map<PAPX, Integer> papxToFileOrder = new IdentityHashMap<PAPX, Integer>(); + final Map<PAPX, Integer> papxToFileOrder = new IdentityHashMap<>(); { int counter = 0; for ( PAPX papx : paragraphs ) @@ -188,7 +188,7 @@ public class PAPBinTable Long.valueOf( System.currentTimeMillis() - start ), " ms" ); start = System.currentTimeMillis(); - List<PAPX> newPapxs = new LinkedList<PAPX>(); + List<PAPX> newPapxs = new LinkedList<>(); int lastParStart = 0; int lastPapxIndex = 0; for ( int charIndex = 0; charIndex < docText.length(); charIndex++ ) @@ -201,7 +201,7 @@ public class PAPBinTable final int endExclusive = charIndex + 1; boolean broken = false; - List<PAPX> papxs = new LinkedList<PAPX>(); + List<PAPX> papxs = new LinkedList<>(); for ( int papxIndex = lastPapxIndex; papxIndex < oldPapxSortedByEndPos .size(); papxIndex++ ) { Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/PAPFormattedDiskPage.java URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/PAPFormattedDiskPage.java?rev=1808516&r1=1808515&r2=1808516&view=diff ============================================================================== --- poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/PAPFormattedDiskPage.java (original) +++ poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/PAPFormattedDiskPage.java Sat Sep 16 08:27:23 2017 @@ -48,7 +48,7 @@ public final class PAPFormattedDiskPage private static final int BX_SIZE = 13; private static final int FC_SIZE = 4; - private ArrayList<PAPX> _papxList = new ArrayList<PAPX>(); + private ArrayList<PAPX> _papxList = new ArrayList<>(); private ArrayList<PAPX> _overFlow; /** @@ -246,7 +246,7 @@ public final class PAPFormattedDiskPage // see if we couldn't fit some if ( index != size ) { - _overFlow = new ArrayList<PAPX>(); + _overFlow = new ArrayList<>(); _overFlow.addAll( _papxList.subList( index, size ) ); } Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/PICFAndOfficeArtData.java URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/PICFAndOfficeArtData.java?rev=1808516&r1=1808515&r2=1808516&view=diff ============================================================================== --- poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/PICFAndOfficeArtData.java (original) +++ poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/PICFAndOfficeArtData.java Sat Sep 16 08:27:23 2017 @@ -62,7 +62,7 @@ public class PICFAndOfficeArtData escherRecordFactory ); offset += recordSize; - _blipRecords = new LinkedList<EscherRecord>(); + _blipRecords = new LinkedList<>(); while ( ( offset - startOffset ) < _picf.getLcb() ) { EscherRecord nextRecord = escherRecordFactory.createRecord( Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/PicturesTable.java URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/PicturesTable.java?rev=1808516&r1=1808515&r2=1808516&view=diff ============================================================================== --- poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/PicturesTable.java (original) +++ poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/PicturesTable.java Sat Sep 16 08:27:23 2017 @@ -220,7 +220,7 @@ public final class PicturesTable * @return a list of Picture objects found in current document */ public List<Picture> getAllPictures() { - ArrayList<Picture> pictures = new ArrayList<Picture>(); + ArrayList<Picture> pictures = new ArrayList<>(); Range range = _document.getOverallRange(); for (int i = 0; i < range.numCharacterRuns(); i++) { Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/PlexOfCps.java URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/PlexOfCps.java?rev=1808516&r1=1808515&r2=1808516&view=diff ============================================================================== --- poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/PlexOfCps.java (original) +++ poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/PlexOfCps.java Sat Sep 16 08:27:23 2017 @@ -37,7 +37,7 @@ public final class PlexOfCps { private List<GenericPropertyNode> _props; public PlexOfCps(int sizeOfStruct) { - _props = new ArrayList<GenericPropertyNode>(); + _props = new ArrayList<>(); _cbStruct = sizeOfStruct; } @@ -52,7 +52,7 @@ public final class PlexOfCps { _iMac = (cb - 4) / (4 + cbStruct); _cbStruct = cbStruct; - _props = new ArrayList<GenericPropertyNode>(_iMac); + _props = new ArrayList<>(_iMac); for (int x = 0; x < _iMac; x++) { _props.add(getProperty(x, buf, start)); Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/SectionTable.java URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/SectionTable.java?rev=1808516&r1=1808515&r2=1808516&view=diff ============================================================================== --- poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/SectionTable.java (original) +++ poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/SectionTable.java Sat Sep 16 08:27:23 2017 @@ -38,7 +38,7 @@ public class SectionTable private final static POILogger _logger = POILogFactory.getLogger(SectionTable.class); private static final int SED_SIZE = 12; - protected List<SEPX> _sections = new ArrayList<SEPX>(); + protected List<SEPX> _sections = new ArrayList<>(); protected List<TextPiece> _text; /** So we can know if things are unicode or not */ Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/TextPieceTable.java URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/TextPieceTable.java?rev=1808516&r1=1808515&r2=1808516&view=diff ============================================================================== --- poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/TextPieceTable.java (original) +++ poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/TextPieceTable.java Sat Sep 16 08:27:23 2017 @@ -44,8 +44,8 @@ public class TextPieceTable implements C // int _multiple; int _cpMin; - protected ArrayList<TextPiece> _textPieces = new ArrayList<TextPiece>(); - protected ArrayList<TextPiece> _textPiecesFCOrder = new ArrayList<TextPiece>(); + protected ArrayList<TextPiece> _textPieces = new ArrayList<>(); + protected ArrayList<TextPiece> _textPiecesFCOrder = new ArrayList<>(); public TextPieceTable() { } @@ -110,7 +110,7 @@ public class TextPieceTable implements C // In the interest of our sanity, now sort the text pieces // into order, if they're not already Collections.sort(_textPieces); - _textPiecesFCOrder = new ArrayList<TextPiece>(_textPieces); + _textPiecesFCOrder = new ArrayList<>(_textPieces); Collections.sort(_textPiecesFCOrder, new FCComparator()); } @@ -234,7 +234,7 @@ public class TextPieceTable implements C @Override public int[][] getCharIndexRanges(int startBytePosInclusive, int endBytePosExclusive) { - List<int[]> result = new LinkedList<int[]>(); + List<int[]> result = new LinkedList<>(); for (TextPiece textPiece : _textPiecesFCOrder) { final int tpStart = textPiece.getPieceDescriptor() .getFilePosition(); Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/io/HWPFFileSystem.java URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/io/HWPFFileSystem.java?rev=1808516&r1=1808515&r2=1808516&view=diff ============================================================================== --- poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/io/HWPFFileSystem.java (original) +++ poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/io/HWPFFileSystem.java Sat Sep 16 08:27:23 2017 @@ -27,7 +27,7 @@ import org.apache.poi.util.Internal; @Internal public final class HWPFFileSystem { - private Map<String, ByteArrayOutputStream> _streams = new HashMap<String, ByteArrayOutputStream>(); + private Map<String, ByteArrayOutputStream> _streams = new HashMap<>(); public HWPFFileSystem() { Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/sprm/CharacterSprmCompressor.java URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/sprm/CharacterSprmCompressor.java?rev=1808516&r1=1808515&r2=1808516&view=diff ============================================================================== --- poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/sprm/CharacterSprmCompressor.java (original) +++ poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/sprm/CharacterSprmCompressor.java Sat Sep 16 08:27:23 2017 @@ -32,7 +32,7 @@ public final class CharacterSprmCompress } public static byte[] compressCharacterProperty(CharacterProperties newCHP, CharacterProperties oldCHP) { - List<byte[]> sprmList = new ArrayList<byte[]>(); + List<byte[]> sprmList = new ArrayList<>(); int size = 0; if (newCHP.isFRMarkDel() != oldCHP.isFRMarkDel()) Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/sprm/ParagraphSprmCompressor.java URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/sprm/ParagraphSprmCompressor.java?rev=1808516&r1=1808515&r2=1808516&view=diff ============================================================================== --- poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/sprm/ParagraphSprmCompressor.java (original) +++ poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/sprm/ParagraphSprmCompressor.java Sat Sep 16 08:27:23 2017 @@ -37,7 +37,7 @@ public final class ParagraphSprmCompress { // page numbers links to Word97-2007BinaryFileFormat(doc)Specification.pdf, accessible from microsoft.com - List<byte[]> sprmList = new ArrayList<byte[]>(); + List<byte[]> sprmList = new ArrayList<>(); int size = 0; // Page 50 of public specification begins Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/sprm/ParagraphSprmUncompressor.java URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/sprm/ParagraphSprmUncompressor.java?rev=1808516&r1=1808515&r2=1808516&view=diff ============================================================================== --- poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/sprm/ParagraphSprmUncompressor.java (original) +++ poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/sprm/ParagraphSprmUncompressor.java Sat Sep 16 08:27:23 2017 @@ -439,7 +439,7 @@ public final class ParagraphSprmUncompre int[] tabPositions = pap.getRgdxaTab(); TabDescriptor[] tabDescriptors = pap.getRgtbd(); - Map<Integer, TabDescriptor> tabMap = new HashMap<Integer, TabDescriptor>(); + Map<Integer, TabDescriptor> tabMap = new HashMap<>(); for (int x = 0; x < tabPositions.length; x++) { tabMap.put(Integer.valueOf(tabPositions[x]), tabDescriptors[x]); @@ -464,7 +464,7 @@ public final class ParagraphSprmUncompre tabPositions = new int[tabMap.size()]; tabDescriptors = new TabDescriptor[tabPositions.length]; - List<Integer> list = new ArrayList<Integer>(tabMap.keySet()); + List<Integer> list = new ArrayList<>(tabMap.keySet()); Collections.sort(list); for (int x = 0; x < tabPositions.length; x++) Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/sprm/SectionSprmCompressor.java URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/sprm/SectionSprmCompressor.java?rev=1808516&r1=1808515&r2=1808516&view=diff ============================================================================== --- poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/sprm/SectionSprmCompressor.java (original) +++ poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/sprm/SectionSprmCompressor.java Sat Sep 16 08:27:23 2017 @@ -35,7 +35,7 @@ public final class SectionSprmCompressor public static byte[] compressSectionProperty(SectionProperties newSEP) { int size = 0; - List<byte[]> sprmList = new ArrayList<byte[]>(); + List<byte[]> sprmList = new ArrayList<>(); if (newSEP.getCnsPgn() != DEFAULT_SEP.getCnsPgn()) { Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/sprm/TableSprmCompressor.java URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/sprm/TableSprmCompressor.java?rev=1808516&r1=1808515&r2=1808516&view=diff ============================================================================== --- poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/sprm/TableSprmCompressor.java (original) +++ poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/sprm/TableSprmCompressor.java Sat Sep 16 08:27:23 2017 @@ -37,7 +37,7 @@ public final class TableSprmCompressor public static byte[] compressTableProperty(TableProperties newTAP) { int size = 0; - List<byte[]> sprmList = new ArrayList<byte[]>(); + List<byte[]> sprmList = new ArrayList<>(); if (newTAP.getJc() != 0) { Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/usermodel/BookmarksImpl.java URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/usermodel/BookmarksImpl.java?rev=1808516&r1=1808515&r2=1808516&view=diff ============================================================================== --- poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/usermodel/BookmarksImpl.java (original) +++ poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/usermodel/BookmarksImpl.java Sat Sep 16 08:27:23 2017 @@ -165,7 +165,7 @@ public class BookmarksImpl implements Bo if ( nodes == null || nodes.isEmpty() ) return Collections.emptyList(); - List<Bookmark> result = new ArrayList<Bookmark>( nodes.size() ); + List<Bookmark> result = new ArrayList<>(nodes.size()); for ( GenericPropertyNode node : nodes ) { result.add( getBookmark( node ) ); @@ -192,7 +192,7 @@ public class BookmarksImpl implements Bo if ( endLookupIndex < 0 ) endLookupIndex = -( endLookupIndex + 1 ); - Map<Integer, List<Bookmark>> result = new LinkedHashMap<Integer, List<Bookmark>>(); + Map<Integer, List<Bookmark>> result = new LinkedHashMap<>(); for ( int lookupIndex = startLookupIndex; lookupIndex < endLookupIndex; lookupIndex++ ) { int s = sortedStartPositions[lookupIndex]; @@ -225,7 +225,7 @@ public class BookmarksImpl implements Bo if ( sortedDescriptors != null ) return; - Map<Integer, List<GenericPropertyNode>> result = new HashMap<Integer, List<GenericPropertyNode>>(); + Map<Integer, List<GenericPropertyNode>> result = new HashMap<>(); for ( int b = 0; b < bookmarksTables.getDescriptorsFirstCount(); b++ ) { GenericPropertyNode property = bookmarksTables @@ -234,7 +234,7 @@ public class BookmarksImpl implements Bo List<GenericPropertyNode> atPositionList = result.get( positionKey ); if ( atPositionList == null ) { - atPositionList = new LinkedList<GenericPropertyNode>(); + atPositionList = new LinkedList<>(); result.put( positionKey, atPositionList ); } atPositionList.add( property ); @@ -246,8 +246,8 @@ public class BookmarksImpl implements Bo .entrySet() ) { indices[counter++] = entry.getKey().intValue(); - List<GenericPropertyNode> updated = new ArrayList<GenericPropertyNode>( - entry.getValue() ); + List<GenericPropertyNode> updated = new ArrayList<>( + entry.getValue()); Collections.sort( updated, PropertyNode.EndComparator.instance ); entry.setValue( updated ); } Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/usermodel/FieldsImpl.java URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/usermodel/FieldsImpl.java?rev=1808516&r1=1808515&r2=1808516&view=diff ============================================================================== --- poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/usermodel/FieldsImpl.java (original) +++ poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/usermodel/FieldsImpl.java Sat Sep 16 08:27:23 2017 @@ -101,8 +101,8 @@ public class FieldsImpl implements Field public FieldsImpl( FieldsTables fieldsTables ) { - _fieldsByOffset = new HashMap<FieldsDocumentPart, Map<Integer, FieldImpl>>( - FieldsDocumentPart.values().length ); + _fieldsByOffset = new HashMap<>( + FieldsDocumentPart.values().length); for ( FieldsDocumentPart part : FieldsDocumentPart.values() ) { @@ -134,15 +134,15 @@ public class FieldsImpl implements Field List<PlexOfField> plexOfFields ) { if ( plexOfFields == null || plexOfFields.isEmpty() ) - return new HashMap<Integer, FieldImpl>(); + return new HashMap<>(); Collections.sort( plexOfFields, comparator ); - List<FieldImpl> fields = new ArrayList<FieldImpl>( - plexOfFields.size() / 3 + 1 ); + List<FieldImpl> fields = new ArrayList<>( + plexOfFields.size() / 3 + 1); parseFieldStructureImpl( plexOfFields, 0, plexOfFields.size(), fields ); - HashMap<Integer, FieldImpl> result = new HashMap<Integer, FieldImpl>( - fields.size() ); + HashMap<Integer, FieldImpl> result = new HashMap<>( + fields.size()); for ( FieldImpl field : fields ) { result.put( Integer.valueOf( field.getFieldStartOffset() ), field ); Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/usermodel/NotesImpl.java URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/usermodel/NotesImpl.java?rev=1808516&r1=1808515&r2=1808516&view=diff ============================================================================== --- poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/usermodel/NotesImpl.java (original) +++ poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/usermodel/NotesImpl.java Sat Sep 16 08:27:23 2017 @@ -74,7 +74,7 @@ public class NotesImpl implements Notes if ( anchorToIndexMap != null ) return; - Map<Integer, Integer> result = new HashMap<Integer, Integer>(); + Map<Integer, Integer> result = new HashMap<>(); for ( int n = 0; n < notesTables.getDescriptorsCount(); n++ ) { int anchorPosition = notesTables.getDescriptor( n ).getStart(); Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/usermodel/OfficeDrawingsImpl.java URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/usermodel/OfficeDrawingsImpl.java?rev=1808516&r1=1808515&r2=1808516&view=diff ============================================================================== --- poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/usermodel/OfficeDrawingsImpl.java (original) +++ poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/usermodel/OfficeDrawingsImpl.java Sat Sep 16 08:27:23 2017 @@ -305,7 +305,7 @@ public class OfficeDrawingsImpl implemen public Collection<OfficeDrawing> getOfficeDrawings() { - List<OfficeDrawing> result = new ArrayList<OfficeDrawing>(); + List<OfficeDrawing> result = new ArrayList<>(); for ( FSPA fspa : _fspaTable.getShapes() ) { result.add( getOfficeDrawing( fspa ) ); Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/usermodel/PictureRunMapper.java URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/usermodel/PictureRunMapper.java?rev=1808516&r1=1808515&r2=1808516&view=diff ============================================================================== --- poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/usermodel/PictureRunMapper.java (original) +++ poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/usermodel/PictureRunMapper.java Sat Sep 16 08:27:23 2017 @@ -41,7 +41,7 @@ import org.apache.poi.hwpf.model.Picture */ public class PictureRunMapper { private PicturesTable picturesTable; - private Set<Picture> claimed = new HashSet<Picture>(); + private Set<Picture> claimed = new HashSet<>(); private Map<Integer, Picture> lookup; private List<Picture> nonU1based; private List<Picture> all; @@ -52,7 +52,7 @@ public class PictureRunMapper { all = picturesTable.getAllPictures(); // Build the Offset-Picture lookup map - lookup = new HashMap<Integer, Picture>(); + lookup = new HashMap<>(); for (Picture p : all) { lookup.put(p.getStartOffset(), p); } @@ -62,7 +62,7 @@ public class PictureRunMapper { // These are \u0008 escher floating ones, ones // found outside the normal text, and who // knows what else... - nonU1based = new ArrayList<Picture>(); + nonU1based = new ArrayList<>(); nonU1based.addAll(all); Range r = doc.getRange(); for (int i = 0; i < r.numCharacterRuns(); i++) { Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/usermodel/Range.java URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/usermodel/Range.java?rev=1808516&r1=1808515&r2=1808516&view=diff ============================================================================== --- poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/usermodel/Range.java (original) +++ poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/usermodel/Range.java Sat Sep 16 08:27:23 2017 @@ -167,7 +167,7 @@ public class Range { // TODO -instantiab _paragraphs = _doc.getParagraphTable().getParagraphs(); _characters = _doc.getCharacterTable().getTextRuns(); _text = _doc.getText(); - _parent = new WeakReference<Range>(null); + _parent = new WeakReference<>(null); sanityCheckStartEnd(); } @@ -190,7 +190,7 @@ public class Range { // TODO -instantiab _paragraphs = parent._paragraphs; _characters = parent._characters; _text = parent._text; - _parent = new WeakReference<Range>(parent); + _parent = new WeakReference<>(parent); sanityCheckStartEnd(); sanityCheck(); Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/usermodel/Table.java URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/usermodel/Table.java?rev=1808516&r1=1808515&r2=1808516&view=diff ============================================================================== --- poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/usermodel/Table.java (original) +++ poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/usermodel/Table.java Sat Sep 16 08:27:23 2017 @@ -51,7 +51,7 @@ public final class Table extends Range if ( _rowsFound ) return; - _rows = new ArrayList<TableRow>(); + _rows = new ArrayList<>(); int rowStart = 0; int rowEnd = 0; Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/usermodel/TableRow.java URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/usermodel/TableRow.java?rev=1808516&r1=1808515&r2=1808516&view=diff ============================================================================== --- poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/usermodel/TableRow.java (original) +++ poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/usermodel/TableRow.java Sat Sep 16 08:27:23 2017 @@ -126,8 +126,8 @@ public final class TableRow extends Rang final short expectedCellsCount = _tprops.getItcMac(); int lastCellStart = 0; - List<TableCell> cells = new ArrayList<TableCell>( - expectedCellsCount + 1 ); + List<TableCell> cells = new ArrayList<>( + expectedCellsCount + 1); for ( int p = 0; p < numParagraphs(); p++ ) { Paragraph paragraph = getParagraph( p ); --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
