Index: applications/editors/josm/plugins/opendata/includes/org/apache/commons/collections/iterators/AbstractEmptyIterator.java =================================================================== --- applications/editors/josm/plugins/opendata/includes/org/apache/commons/collections/iterators/AbstractEmptyIterator.java (revision 30700) +++ applications/editors/josm/plugins/opendata/includes/org/apache/commons/collections/iterators/AbstractEmptyIterator.java (revision 30737) @@ -21,14 +21,14 @@ import org.apache.commons.collections.ResettableIterator; -/** +/** * Provides an implementation of an empty iterator. * * @since Commons Collections 3.1 * @version $Revision: 646777 $ $Date: 2008-04-10 14:33:15 +0200 (jeu., 10 avr. 2008) $ - * + * * @author Stephen Colebourne */ abstract class AbstractEmptyIterator implements ResettableIterator { - + /** * Constructor. @@ -38,8 +38,10 @@ } + @Override public boolean hasNext() { return false; } + @Override public Object next() { throw new NoSuchElementException("Iterator contains no elements"); @@ -62,14 +64,13 @@ } - @SuppressWarnings("unused") - public void add(Object obj) { + public void add(Object obj) { throw new UnsupportedOperationException("add() not supported for empty Iterator"); } - @SuppressWarnings("unused") - public void set(Object obj) { + public void set(Object obj) { throw new IllegalStateException("Iterator contains no elements"); } + @Override public void remove() { throw new IllegalStateException("Iterator contains no elements"); @@ -84,6 +85,5 @@ } - @SuppressWarnings("unused") - public Object setValue(Object value) { + public Object setValue(Object value) { throw new IllegalStateException("Iterator contains no elements"); } Index: applications/editors/josm/plugins/opendata/includes/org/apache/poi/hpsf/MutablePropertySet.java =================================================================== --- applications/editors/josm/plugins/opendata/includes/org/apache/poi/hpsf/MutablePropertySet.java (revision 30700) +++ applications/editors/josm/plugins/opendata/includes/org/apache/poi/hpsf/MutablePropertySet.java (revision 30737) @@ -68,5 +68,5 @@ /* Initialize the sections. Since property set must have at least * one section it is added right here. */ - sections = new LinkedList
(); + sections = new LinkedList<>(); sections.add(new MutableSection()); } @@ -90,5 +90,5 @@ clearSections(); if (sections == null) - sections = new LinkedList
(); + sections = new LinkedList<>(); for (final Iterator
i = ps.getSections().iterator(); i.hasNext();) { @@ -182,5 +182,5 @@ { if (sections == null) - sections = new LinkedList
(); + sections = new LinkedList<>(); sections.add(section); } Index: applications/editors/josm/plugins/opendata/includes/org/apache/poi/hpsf/MutableSection.java =================================================================== --- applications/editors/josm/plugins/opendata/includes/org/apache/poi/hpsf/MutableSection.java (revision 30700) +++ applications/editors/josm/plugins/opendata/includes/org/apache/poi/hpsf/MutableSection.java (revision 30737) @@ -74,5 +74,5 @@ formatID = null; offset = -1; - preprops = new LinkedList(); + preprops = new LinkedList<>(); } @@ -124,5 +124,5 @@ { this.properties = properties; - preprops = new LinkedList(); + preprops = new LinkedList<>(); for (int i = 0; i < properties.length; i++) preprops.add(properties[i]); @@ -200,4 +200,5 @@ * @return the section's size. */ + @Override public int getSize() { @@ -315,4 +316,5 @@ Collections.sort(preprops, new Comparator() { + @Override public int compare(final Property p1, final Property p2) { @@ -453,4 +455,5 @@ * @return The number of properties in this section */ + @Override public int getPropertyCount() { @@ -465,4 +468,5 @@ * @return this section's properties. */ + @Override public Property[] getProperties() { @@ -479,4 +483,5 @@ * @return The property or null if there is no such property */ + @Override public Object getProperty(final long id) { Index: applications/editors/josm/plugins/opendata/includes/org/apache/poi/hpsf/Property.java =================================================================== --- applications/editors/josm/plugins/opendata/includes/org/apache/poi/hpsf/Property.java (revision 30700) +++ applications/editors/josm/plugins/opendata/includes/org/apache/poi/hpsf/Property.java (revision 30737) @@ -211,5 +211,5 @@ o += LittleEndian.INT_SIZE; - final Map m = new HashMap((int) nrEntries, (float) 1.0); + final Map m = new HashMap<>((int) nrEntries, (float) 1.0); try @@ -298,4 +298,5 @@ * @see Object#equals(java.lang.Object) */ + @Override public boolean equals(final Object o) { @@ -343,4 +344,5 @@ * @see Object#hashCode() */ + @Override public int hashCode() { @@ -360,4 +362,5 @@ * @see Object#toString() */ + @Override public String toString() { Index: applications/editors/josm/plugins/opendata/includes/org/apache/poi/hpsf/PropertySet.java =================================================================== --- applications/editors/josm/plugins/opendata/includes/org/apache/poi/hpsf/PropertySet.java (revision 30700) +++ applications/editors/josm/plugins/opendata/includes/org/apache/poi/hpsf/PropertySet.java (revision 30737) @@ -383,5 +383,5 @@ * exception and is no longer fostered by Microsoft. */ - sections = new ArrayList
(sectionCount); + sections = new ArrayList<>(sectionCount); /* Index: applications/editors/josm/plugins/opendata/includes/org/apache/poi/hpsf/Section.java =================================================================== --- applications/editors/josm/plugins/opendata/includes/org/apache/poi/hpsf/Section.java (revision 30700) +++ applications/editors/josm/plugins/opendata/includes/org/apache/poi/hpsf/Section.java (revision 30737) @@ -209,5 +209,5 @@ /* Pass 1: Read the property list. */ int pass1Offset = o1; - final List propertyList = new ArrayList(propertyCount); + final List propertyList = new ArrayList<>(propertyCount); PropertyListEntry ple; for (int i = 0; i < properties.length; i++) @@ -308,4 +308,5 @@ * @see Comparable#compareTo(java.lang.Object) */ + @Override public int compareTo(final PropertyListEntry o) { @@ -319,4 +320,5 @@ } + @Override public String toString() { @@ -457,4 +459,5 @@ * not */ + @Override public boolean equals(final Object o) { @@ -550,4 +553,5 @@ * @see Object#hashCode() */ + @Override public int hashCode() { @@ -566,4 +570,5 @@ * @see Object#toString() */ + @Override public String toString() { Index: applications/editors/josm/plugins/opendata/includes/org/apache/poi/hpsf/Variant.java =================================================================== --- applications/editors/josm/plugins/opendata/includes/org/apache/poi/hpsf/Variant.java (revision 30700) +++ applications/editors/josm/plugins/opendata/includes/org/apache/poi/hpsf/Variant.java (revision 30737) @@ -136,5 +136,5 @@ { /* Initialize the number-to-name map: */ - Map tm1 = new HashMap(); + Map tm1 = new HashMap<>(); tm1.put(Long.valueOf(0), "VT_EMPTY"); tm1.put(Long.valueOf(1), "VT_NULL"); @@ -177,5 +177,5 @@ tm1.put(Long.valueOf(71), "VT_CF"); tm1.put(Long.valueOf(72), "VT_CLSID"); - Map tm2 = new HashMap(tm1.size(), 1.0F); + Map tm2 = new HashMap<>(tm1.size(), 1.0F); tm2.putAll(tm1); numberToName = Collections.unmodifiableMap(tm2); @@ -223,5 +223,5 @@ tm1.put(Long.valueOf(71), LENGTH_UNKNOWN); tm1.put(Long.valueOf(72), LENGTH_UNKNOWN); - tm2 = new HashMap(tm1.size(), 1.0F); + tm2 = new HashMap<>(tm1.size(), 1.0F); tm2.putAll(tm1); } Index: applications/editors/josm/plugins/opendata/includes/org/apache/poi/hpsf/VariantSupport.java =================================================================== --- applications/editors/josm/plugins/opendata/includes/org/apache/poi/hpsf/VariantSupport.java (revision 30700) +++ applications/editors/josm/plugins/opendata/includes/org/apache/poi/hpsf/VariantSupport.java (revision 30737) @@ -87,5 +87,5 @@ { if (unsupportedMessage == null) - unsupportedMessage = new LinkedList(); + unsupportedMessage = new LinkedList<>(); Long vt = Long.valueOf(ex.getVariantType()); if (!unsupportedMessage.contains(vt)) Index: applications/editors/josm/plugins/opendata/includes/org/apache/poi/hssf/model/InternalSheet.java =================================================================== --- applications/editors/josm/plugins/opendata/includes/org/apache/poi/hssf/model/InternalSheet.java (revision 30700) +++ applications/editors/josm/plugins/opendata/includes/org/apache/poi/hssf/model/InternalSheet.java (revision 30737) @@ -119,5 +119,5 @@ RowRecordsAggregate rra = null; - List records = new ArrayList(128); + List records = new ArrayList<>(128); _records = records; // needed here due to calls to findFirstRecordLocBySid before we're done int dimsloc = -1; @@ -254,5 +254,5 @@ private InternalSheet() { _mergedCellsTable = new MergedCellsTable(); - List records = new ArrayList(32); + List records = new ArrayList<>(32); if (log.check( POILogger.DEBUG )) Index: applications/editors/josm/plugins/opendata/includes/org/apache/poi/hssf/model/InternalWorkbook.java =================================================================== --- applications/editors/josm/plugins/opendata/includes/org/apache/poi/hssf/model/InternalWorkbook.java (revision 30700) +++ applications/editors/josm/plugins/opendata/includes/org/apache/poi/hssf/model/InternalWorkbook.java (revision 30737) @@ -112,11 +112,11 @@ records = new WorkbookRecordList(); - boundsheets = new ArrayList(); - formats = new ArrayList(); - hyperlinks = new ArrayList(); + boundsheets = new ArrayList<>(); + formats = new ArrayList<>(); + hyperlinks = new ArrayList<>(); numxfs = 0; maxformatid = -1; uses1904datewindowing = false; - commentRecords = new LinkedHashMap(); + commentRecords = new LinkedHashMap<>(); } @@ -138,5 +138,5 @@ Integer.valueOf(recs.size())); InternalWorkbook retval = new InternalWorkbook(); - List records = new ArrayList(recs.size() / 3); + List records = new ArrayList<>(recs.size() / 3); retval.records.setRecords(records); Index: applications/editors/josm/plugins/opendata/includes/org/apache/poi/hssf/model/LinkTable.java =================================================================== --- applications/editors/josm/plugins/opendata/includes/org/apache/poi/hssf/model/LinkTable.java (revision 30700) +++ applications/editors/josm/plugins/opendata/includes/org/apache/poi/hssf/model/LinkTable.java (revision 30737) @@ -90,5 +90,5 @@ public ExternalBookBlock(RecordStream rs) { _externalBookRecord = (SupBookRecord) rs.getNext(); - List temp = new ArrayList(); + List temp = new ArrayList<>(); while(rs.peekNextClass() == ExternalNameRecord.class) { temp.add(rs.getNext()); @@ -127,5 +127,5 @@ RecordStream rs = new RecordStream(inputList, startIndex); - List temp = new ArrayList(); + List temp = new ArrayList<>(); while(rs.peekNextClass() == SupBookRecord.class) { temp.add(new ExternalBookBlock(rs)); @@ -148,5 +148,5 @@ } - _definedNames = new ArrayList(); + _definedNames = new ArrayList<>(); // collect zero or more DEFINEDNAMEs id=0x18, // with their comments if present @@ -171,5 +171,5 @@ private static ExternSheetRecord readExtSheetRecord(RecordStream rs) { - List temp = new ArrayList(2); + List temp = new ArrayList<>(2); while(rs.peekNextClass() == ExternSheetRecord.class) { temp.add((ExternSheetRecord) rs.getNext()); Index: applications/editors/josm/plugins/opendata/includes/org/apache/poi/hssf/model/RowBlocksReader.java =================================================================== --- applications/editors/josm/plugins/opendata/includes/org/apache/poi/hssf/model/RowBlocksReader.java (revision 30700) +++ applications/editors/josm/plugins/opendata/includes/org/apache/poi/hssf/model/RowBlocksReader.java (revision 30737) @@ -48,10 +48,10 @@ */ public RowBlocksReader(RecordStream rs) { - List plainRecords = new ArrayList(); - List shFrmRecords = new ArrayList(); - List firstCellRefs = new ArrayList(); - List arrayRecords = new ArrayList(); - List tableRecords = new ArrayList(); - List mergeCellRecords = new ArrayList(); + List plainRecords = new ArrayList<>(); + List shFrmRecords = new ArrayList<>(); + List firstCellRefs = new ArrayList<>(); + List arrayRecords = new ArrayList<>(); + List tableRecords = new ArrayList<>(); + List mergeCellRecords = new ArrayList<>(); Record prevRec = null; Index: applications/editors/josm/plugins/opendata/includes/org/apache/poi/hssf/model/WorkbookRecordList.java =================================================================== --- applications/editors/josm/plugins/opendata/includes/org/apache/poi/hssf/model/WorkbookRecordList.java (revision 30700) +++ applications/editors/josm/plugins/opendata/includes/org/apache/poi/hssf/model/WorkbookRecordList.java (revision 30737) @@ -25,5 +25,5 @@ public final class WorkbookRecordList implements Iterable { - private List records = new ArrayList(); + private List records = new ArrayList<>(); private int protpos = 0; // holds the position of the protect record. Index: applications/editors/josm/plugins/opendata/includes/org/apache/poi/hssf/record/ExternSheetRecord.java =================================================================== --- applications/editors/josm/plugins/opendata/includes/org/apache/poi/hssf/record/ExternSheetRecord.java (revision 30700) +++ applications/editors/josm/plugins/opendata/includes/org/apache/poi/hssf/record/ExternSheetRecord.java (revision 30737) @@ -81,9 +81,9 @@ public ExternSheetRecord() { - _list = new ArrayList(); + _list = new ArrayList<>(); } public ExternSheetRecord(RecordInputStream in) { // NO_UCD - _list = new ArrayList(); + _list = new ArrayList<>(); int nItems = in.readShort(); Index: applications/editors/josm/plugins/opendata/includes/org/apache/poi/hssf/record/ObjRecord.java =================================================================== --- applications/editors/josm/plugins/opendata/includes/org/apache/poi/hssf/record/ObjRecord.java (revision 30700) +++ applications/editors/josm/plugins/opendata/includes/org/apache/poi/hssf/record/ObjRecord.java (revision 30737) @@ -53,5 +53,5 @@ public ObjRecord() { - subrecords = new ArrayList(2); + subrecords = new ArrayList<>(2); // TODO - ensure 2 sub-records (ftCmo 15h, and ftEnd 00h) are always created _uninterpretedData = null; @@ -88,5 +88,5 @@ */ - subrecords = new ArrayList(); + subrecords = new ArrayList<>(); ByteArrayInputStream bais = new ByteArrayInputStream(subRecordData); LittleEndianInputStream subRecStream = new LittleEndianInputStream(bais); Index: applications/editors/josm/plugins/opendata/includes/org/apache/poi/hssf/record/PageBreakRecord.java =================================================================== --- applications/editors/josm/plugins/opendata/includes/org/apache/poi/hssf/record/PageBreakRecord.java (revision 30700) +++ applications/editors/josm/plugins/opendata/includes/org/apache/poi/hssf/record/PageBreakRecord.java (revision 30737) @@ -76,6 +76,6 @@ protected PageBreakRecord() { - _breaks = new ArrayList(); - _breakMap = new HashMap(); + _breaks = new ArrayList<>(); + _breakMap = new HashMap<>(); } @@ -83,6 +83,6 @@ { int nBreaks = in.readShort(); - _breaks = new ArrayList(nBreaks + 2); - _breakMap = new HashMap(); + _breaks = new ArrayList<>(nBreaks + 2); + _breakMap = new HashMap<>(); for(int k = 0; k < nBreaks; k++) { Index: applications/editors/josm/plugins/opendata/includes/org/apache/poi/hssf/record/RecordFactory.java =================================================================== --- applications/editors/josm/plugins/opendata/includes/org/apache/poi/hssf/record/RecordFactory.java (revision 30700) +++ applications/editors/josm/plugins/opendata/includes/org/apache/poi/hssf/record/RecordFactory.java (revision 30737) @@ -245,6 +245,6 @@ */ private static Map recordsToMap(Class [] records) { - Map result = new HashMap(); - Set> uniqueRecClasses = new HashSet>(records.length * 3 / 2); + Map result = new HashMap<>(); + Set> uniqueRecClasses = new HashSet<>(records.length * 3 / 2); for (int i = 0; i < records.length; i++) { @@ -306,5 +306,5 @@ public static List createRecords(InputStream in) throws RecordFormatException { - List records = new ArrayList(NUM_RECORDS); + List records = new ArrayList<>(NUM_RECORDS); RecordFactoryInputStream recStream = new RecordFactoryInputStream(in, true); Index: applications/editors/josm/plugins/opendata/includes/org/apache/poi/hssf/record/RecordFactoryInputStream.java =================================================================== --- applications/editors/josm/plugins/opendata/includes/org/apache/poi/hssf/record/RecordFactoryInputStream.java (revision 30700) +++ applications/editors/josm/plugins/opendata/includes/org/apache/poi/hssf/record/RecordFactoryInputStream.java (revision 30737) @@ -125,5 +125,5 @@ public RecordFactoryInputStream(InputStream in, boolean shouldIncludeContinueRecords) { RecordInputStream rs = new RecordInputStream(in); - List records = new ArrayList(); + List records = new ArrayList<>(); StreamEncryptionInfo sei = new StreamEncryptionInfo(rs, records); Index: applications/editors/josm/plugins/opendata/includes/org/apache/poi/hssf/record/SSTRecord.java =================================================================== --- applications/editors/josm/plugins/opendata/includes/org/apache/poi/hssf/record/SSTRecord.java (revision 30700) +++ applications/editors/josm/plugins/opendata/includes/org/apache/poi/hssf/record/SSTRecord.java (revision 30737) @@ -56,5 +56,5 @@ field_1_num_strings = 0; field_2_num_unique_strings = 0; - field_3_strings = new IntMapper(); + field_3_strings = new IntMapper<>(); } @@ -227,5 +227,5 @@ field_1_num_strings = in.readInt(); field_2_num_unique_strings = in.readInt(); - field_3_strings = new IntMapper(); + field_3_strings = new IntMapper<>(); deserializer = new SSTDeserializer(field_3_strings); deserializer.manufactureStrings( field_2_num_unique_strings, in ); Index: applications/editors/josm/plugins/opendata/includes/org/apache/poi/hssf/record/aggregates/ColumnInfoRecordsAggregate.java =================================================================== --- applications/editors/josm/plugins/opendata/includes/org/apache/poi/hssf/record/aggregates/ColumnInfoRecordsAggregate.java (revision 30700) +++ applications/editors/josm/plugins/opendata/includes/org/apache/poi/hssf/record/aggregates/ColumnInfoRecordsAggregate.java (revision 30737) @@ -53,5 +53,5 @@ */ public ColumnInfoRecordsAggregate() { - records = new ArrayList(); + records = new ArrayList<>(); } public ColumnInfoRecordsAggregate(RecordStream rs) { Index: applications/editors/josm/plugins/opendata/includes/org/apache/poi/hssf/record/aggregates/DataValidityTable.java =================================================================== --- applications/editors/josm/plugins/opendata/includes/org/apache/poi/hssf/record/aggregates/DataValidityTable.java (revision 30700) +++ applications/editors/josm/plugins/opendata/includes/org/apache/poi/hssf/record/aggregates/DataValidityTable.java (revision 30737) @@ -42,5 +42,5 @@ public DataValidityTable(RecordStream rs) { _headerRec = (DVALRecord) rs.getNext(); - List temp = new ArrayList(); + List temp = new ArrayList<>(); while (rs.peekNextClass() == DVRecord.class) { temp.add(rs.getNext()); @@ -51,5 +51,5 @@ public DataValidityTable() { _headerRec = new DVALRecord(); - _validationList = new ArrayList(); + _validationList = new ArrayList<>(); } Index: applications/editors/josm/plugins/opendata/includes/org/apache/poi/hssf/record/aggregates/MergedCellsTable.java =================================================================== --- applications/editors/josm/plugins/opendata/includes/org/apache/poi/hssf/record/aggregates/MergedCellsTable.java (revision 30700) +++ applications/editors/josm/plugins/opendata/includes/org/apache/poi/hssf/record/aggregates/MergedCellsTable.java (revision 30737) @@ -39,5 +39,5 @@ */ public MergedCellsTable() { - _mergedRegions = new ArrayList(); + _mergedRegions = new ArrayList<>(); } Index: applications/editors/josm/plugins/opendata/includes/org/apache/poi/hssf/record/aggregates/RowRecordsAggregate.java =================================================================== --- applications/editors/josm/plugins/opendata/includes/org/apache/poi/hssf/record/aggregates/RowRecordsAggregate.java (revision 30700) +++ applications/editors/josm/plugins/opendata/includes/org/apache/poi/hssf/record/aggregates/RowRecordsAggregate.java (revision 30737) @@ -61,7 +61,7 @@ throw new IllegalArgumentException("SharedValueManager must be provided."); } - _rowRecords = new TreeMap(); + _rowRecords = new TreeMap<>(); _valuesAgg = new ValueRecordsAggregate(); - _unknownRecords = new ArrayList(); + _unknownRecords = new ArrayList<>(); _sharedValueManager = svm; } Index: applications/editors/josm/plugins/opendata/includes/org/apache/poi/hssf/record/aggregates/SharedValueManager.java =================================================================== --- applications/editors/josm/plugins/opendata/includes/org/apache/poi/hssf/record/aggregates/SharedValueManager.java (revision 30700) +++ applications/editors/josm/plugins/opendata/includes/org/apache/poi/hssf/record/aggregates/SharedValueManager.java (revision 30737) @@ -135,5 +135,5 @@ _arrayRecords = toList(arrayRecords); _tableRecords = tableRecords; - Map m = new HashMap(nShF * 3 / 2); + Map m = new HashMap<>(nShF * 3 / 2); for (int i = 0; i < nShF; i++) { SharedFormulaRecord sfr = sharedFormulaRecords[i]; @@ -147,5 +147,5 @@ */ private static List toList(Z[] zz) { - List result = new ArrayList(zz.length); + List result = new ArrayList<>(zz.length); for (int i = 0; i < zz.length; i++) { result.add(zz[i]); Index: applications/editors/josm/plugins/opendata/includes/org/apache/poi/hssf/record/aggregates/ValueRecordsAggregate.java =================================================================== --- applications/editors/josm/plugins/opendata/includes/org/apache/poi/hssf/record/aggregates/ValueRecordsAggregate.java (revision 30700) +++ applications/editors/josm/plugins/opendata/includes/org/apache/poi/hssf/record/aggregates/ValueRecordsAggregate.java (revision 30737) @@ -241,5 +241,5 @@ */ public CellValueRecordInterface[] getValueRecords() { - List temp = new ArrayList(); + List temp = new ArrayList<>(); for (int rowIx = 0; rowIx < records.length; rowIx++) { Index: applications/editors/josm/plugins/opendata/includes/org/apache/poi/hssf/record/common/UnicodeString.java =================================================================== --- applications/editors/josm/plugins/opendata/includes/org/apache/poi/hssf/record/common/UnicodeString.java (revision 30700) +++ applications/editors/josm/plugins/opendata/includes/org/apache/poi/hssf/record/common/UnicodeString.java (revision 30737) @@ -414,5 +414,5 @@ if (isRichText() && (runCount > 0)) { - field_4_format_runs = new ArrayList(runCount); + field_4_format_runs = new ArrayList<>(runCount); for (int i=0;i(); + field_4_format_runs = new ArrayList<>(); } @@ -709,5 +709,5 @@ str.field_3_string = field_3_string; if (field_4_format_runs != null) { - str.field_4_format_runs = new ArrayList(); + str.field_4_format_runs = new ArrayList<>(); for (FormatRun r : field_4_format_runs) { str.field_4_format_runs.add(new FormatRun(r._character, r._fontIndex)); Index: applications/editors/josm/plugins/opendata/includes/org/apache/poi/hssf/record/formula/Ptg.java =================================================================== --- applications/editors/josm/plugins/opendata/includes/org/apache/poi/hssf/record/formula/Ptg.java (revision 30700) +++ applications/editors/josm/plugins/opendata/includes/org/apache/poi/hssf/record/formula/Ptg.java (revision 30737) @@ -50,5 +50,5 @@ */ public static Ptg[] readTokens(int size, LittleEndianInput in) { - List temp = new ArrayList(4 + size / 2); + List temp = new ArrayList<>(4 + size / 2); int pos = 0; boolean hasArrayPtgs = false; @@ -216,5 +216,5 @@ if (ptg instanceof ArrayPtg) { if (arrayPtgs == null) { - arrayPtgs = new ArrayList(5); + arrayPtgs = new ArrayList<>(5); } arrayPtgs.add(ptg); Index: applications/editors/josm/plugins/opendata/includes/org/apache/poi/hssf/record/formula/function/FunctionDataBuilder.java =================================================================== --- applications/editors/josm/plugins/opendata/includes/org/apache/poi/hssf/record/formula/function/FunctionDataBuilder.java (revision 30700) +++ applications/editors/josm/plugins/opendata/includes/org/apache/poi/hssf/record/formula/function/FunctionDataBuilder.java (revision 30737) @@ -38,7 +38,7 @@ public FunctionDataBuilder(int sizeEstimate) { _maxFunctionIndex = -1; - _functionDataByName = new HashMap(sizeEstimate * 3 / 2); - _functionDataByIndex = new HashMap(sizeEstimate * 3 / 2); - _mutatingFunctionIndexes = new HashSet(); + _functionDataByName = new HashMap<>(sizeEstimate * 3 / 2); + _functionDataByIndex = new HashMap<>(sizeEstimate * 3 / 2); + _mutatingFunctionIndexes = new HashSet<>(); } Index: applications/editors/josm/plugins/opendata/includes/org/apache/poi/hssf/record/formula/function/FunctionMetadataReader.java =================================================================== --- applications/editors/josm/plugins/opendata/includes/org/apache/poi/hssf/record/formula/function/FunctionMetadataReader.java (revision 30700) +++ applications/editors/josm/plugins/opendata/includes/org/apache/poi/hssf/record/formula/function/FunctionMetadataReader.java (revision 30737) @@ -51,5 +51,5 @@ "LOG10", "ATAN2", "DAYS360", "SUMXMY2", "SUMX2MY2", "SUMX2PY2", }; - private static final Set DIGIT_ENDING_FUNCTION_NAMES_SET = new HashSet(Arrays.asList(DIGIT_ENDING_FUNCTION_NAMES)); + private static final Set DIGIT_ENDING_FUNCTION_NAMES_SET = new HashSet<>(Arrays.asList(DIGIT_ENDING_FUNCTION_NAMES)); public static FunctionMetadataRegistry createRegistry() { Index: applications/editors/josm/plugins/opendata/includes/org/apache/poi/hssf/usermodel/HSSFDataFormat.java =================================================================== --- applications/editors/josm/plugins/opendata/includes/org/apache/poi/hssf/usermodel/HSSFDataFormat.java (revision 30700) +++ applications/editors/josm/plugins/opendata/includes/org/apache/poi/hssf/usermodel/HSSFDataFormat.java (revision 30737) @@ -50,5 +50,5 @@ private static final String[] _builtinFormats = BuiltinFormats.getAll(); - private final Vector _formats = new Vector(); + private final Vector _formats = new Vector<>(); private boolean _movedBuiltins = false; // Flag to see if need to // check the built in list Index: applications/editors/josm/plugins/opendata/includes/org/apache/poi/hssf/usermodel/HSSFSheet.java =================================================================== --- applications/editors/josm/plugins/opendata/includes/org/apache/poi/hssf/usermodel/HSSFSheet.java (revision 30700) +++ applications/editors/josm/plugins/opendata/includes/org/apache/poi/hssf/usermodel/HSSFSheet.java (revision 30737) @@ -73,5 +73,5 @@ protected HSSFSheet(HSSFWorkbook workbook, InternalSheet sheet) { this._sheet = sheet; - _rows = new TreeMap(); + _rows = new TreeMap<>(); this._workbook = workbook; setPropertiesFromSheet(sheet); @@ -264,5 +264,5 @@ int height = lastRow - firstRow + 1; int width = lastColumn - firstColumn + 1; - List temp = new ArrayList(height*width); + List temp = new ArrayList<>(height*width); for (int rowIn = firstRow; rowIn <= lastRow; rowIn++) { for (int colIn = firstColumn; colIn <= lastColumn; colIn++) { Index: applications/editors/josm/plugins/opendata/includes/org/apache/poi/hssf/usermodel/HSSFWorkbook.java =================================================================== --- applications/editors/josm/plugins/opendata/includes/org/apache/poi/hssf/usermodel/HSSFWorkbook.java (revision 30700) +++ applications/editors/josm/plugins/opendata/includes/org/apache/poi/hssf/usermodel/HSSFWorkbook.java (revision 30737) @@ -94,6 +94,6 @@ super(null); workbook = book; - _sheets = new ArrayList(INITIAL_CAPACITY); - names = new ArrayList(INITIAL_CAPACITY); + _sheets = new ArrayList<>(INITIAL_CAPACITY); + names = new ArrayList<>(INITIAL_CAPACITY); } @@ -182,6 +182,6 @@ } - _sheets = new ArrayList(INITIAL_CAPACITY); - names = new ArrayList(INITIAL_CAPACITY); + _sheets = new ArrayList<>(INITIAL_CAPACITY); + names = new ArrayList<>(INITIAL_CAPACITY); // Grab the data from the workbook stream, however Index: applications/editors/josm/plugins/opendata/includes/org/apache/poi/poifs/filesystem/DirectoryNode.java =================================================================== --- applications/editors/josm/plugins/opendata/includes/org/apache/poi/poifs/filesystem/DirectoryNode.java (revision 30700) +++ applications/editors/josm/plugins/opendata/includes/org/apache/poi/poifs/filesystem/DirectoryNode.java (revision 30737) @@ -81,6 +81,6 @@ } _filesystem = filesystem; - _byname = new HashMap(); - _entries = new ArrayList(); + _byname = new HashMap<>(); + _entries = new ArrayList<>(); Iterator iter = property.getChildren(); Index: applications/editors/josm/plugins/opendata/includes/org/apache/poi/poifs/filesystem/POIFSDocument.java =================================================================== --- applications/editors/josm/plugins/opendata/includes/org/apache/poi/poifs/filesystem/POIFSDocument.java (revision 30700) +++ applications/editors/josm/plugins/opendata/includes/org/apache/poi/poifs/filesystem/POIFSDocument.java (revision 30737) @@ -98,5 +98,5 @@ */ public POIFSDocument(String name, POIFSBigBlockSize bigBlockSize, InputStream stream) throws IOException { - List blocks = new ArrayList(); + List blocks = new ArrayList<>(); _size = 0; Index: applications/editors/josm/plugins/opendata/includes/org/apache/poi/poifs/filesystem/POIFSFileSystem.java =================================================================== --- applications/editors/josm/plugins/opendata/includes/org/apache/poi/poifs/filesystem/POIFSFileSystem.java (revision 30700) +++ applications/editors/josm/plugins/opendata/includes/org/apache/poi/poifs/filesystem/POIFSFileSystem.java (revision 30737) @@ -69,5 +69,5 @@ { _property_table = new PropertyTable(); - _documents = new ArrayList(); + _documents = new ArrayList<>(); _root = null; } Index: applications/editors/josm/plugins/opendata/includes/org/apache/poi/poifs/property/DirectoryProperty.java =================================================================== --- applications/editors/josm/plugins/opendata/includes/org/apache/poi/poifs/property/DirectoryProperty.java (revision 30700) +++ applications/editors/josm/plugins/opendata/includes/org/apache/poi/poifs/property/DirectoryProperty.java (revision 30737) @@ -48,6 +48,6 @@ { super(); - _children = new ArrayList(); - _children_names = new HashSet(); + _children = new ArrayList<>(); + _children_names = new HashSet<>(); setName(name); setSize(0); @@ -68,6 +68,6 @@ { super(index, array, offset); - _children = new ArrayList(); - _children_names = new HashSet(); + _children = new ArrayList<>(); + _children_names = new HashSet<>(); } Index: applications/editors/josm/plugins/opendata/includes/org/apache/poi/poifs/property/PropertyFactory.java =================================================================== --- applications/editors/josm/plugins/opendata/includes/org/apache/poi/poifs/property/PropertyFactory.java (revision 30700) +++ applications/editors/josm/plugins/opendata/includes/org/apache/poi/poifs/property/PropertyFactory.java (revision 30737) @@ -61,5 +61,5 @@ throws IOException { - List properties = new ArrayList(); + List properties = new ArrayList<>(); for (int j = 0; j < blocks.length; j++) Index: applications/editors/josm/plugins/opendata/includes/org/apache/poi/poifs/property/PropertyTable.java =================================================================== --- applications/editors/josm/plugins/opendata/includes/org/apache/poi/poifs/property/PropertyTable.java (revision 30700) +++ applications/editors/josm/plugins/opendata/includes/org/apache/poi/poifs/property/PropertyTable.java (revision 30737) @@ -40,5 +40,5 @@ public PropertyTable() { - _properties = new ArrayList(); + _properties = new ArrayList<>(); addProperty(new RootProperty()); _blocks = null; @@ -111,5 +111,5 @@ return; } - Stack children = new Stack(); + Stack children = new Stack<>(); children.push(_properties.get(index)); Index: applications/editors/josm/plugins/opendata/includes/org/apache/poi/poifs/storage/BlockAllocationTableReader.java =================================================================== --- applications/editors/josm/plugins/opendata/includes/org/apache/poi/poifs/storage/BlockAllocationTableReader.java (revision 30700) +++ applications/editors/josm/plugins/opendata/includes/org/apache/poi/poifs/storage/BlockAllocationTableReader.java (revision 30737) @@ -202,5 +202,5 @@ ListManagedBlock[] fetchBlocks(int startBlock, int headerPropertiesStartBlock, BlockList blockList) throws IOException { - List blocks = new ArrayList(); + List blocks = new ArrayList<>(); int currentBlock = startBlock; boolean firstPass = true; Index: applications/editors/josm/plugins/opendata/includes/org/apache/poi/poifs/storage/RawDataBlockList.java =================================================================== --- applications/editors/josm/plugins/opendata/includes/org/apache/poi/poifs/storage/RawDataBlockList.java (revision 30700) +++ applications/editors/josm/plugins/opendata/includes/org/apache/poi/poifs/storage/RawDataBlockList.java (revision 30737) @@ -50,5 +50,5 @@ throws IOException { - List blocks = new ArrayList(); + List blocks = new ArrayList<>(); while (true) Index: applications/editors/josm/plugins/opendata/includes/org/apache/poi/poifs/storage/SmallDocumentBlock.java =================================================================== --- applications/editors/josm/plugins/opendata/includes/org/apache/poi/poifs/storage/SmallDocumentBlock.java (revision 30700) +++ applications/editors/josm/plugins/opendata/includes/org/apache/poi/poifs/storage/SmallDocumentBlock.java (revision 30737) @@ -147,5 +147,5 @@ int _blocks_per_big_block = getBlocksPerBigBlock(bigBlockSize); - List sdbs = new ArrayList(); + List sdbs = new ArrayList<>(); for (int j = 0; j < blocks.length; j++) Index: applications/editors/josm/plugins/opendata/includes/org/apache/poi/ss/format/CellElapsedFormatter.java =================================================================== --- applications/editors/josm/plugins/opendata/includes/org/apache/poi/ss/format/CellElapsedFormatter.java (revision 30700) +++ applications/editors/josm/plugins/opendata/includes/org/apache/poi/ss/format/CellElapsedFormatter.java (revision 30737) @@ -132,5 +132,5 @@ super(pattern); - specs = new ArrayList(); + specs = new ArrayList<>(); StringBuffer desc = CellFormatPart.parseFormat(pattern, Index: applications/editors/josm/plugins/opendata/includes/org/apache/poi/ss/format/CellNumberFormatter.java =================================================================== --- applications/editors/josm/plugins/opendata/includes/org/apache/poi/ss/format/CellNumberFormatter.java (revision 30700) +++ applications/editors/josm/plugins/opendata/includes/org/apache/poi/ss/format/CellNumberFormatter.java (revision 30737) @@ -246,5 +246,5 @@ scale = 1; - specials = new LinkedList(); + specials = new LinkedList<>(); NumPartHandler partHandler = new NumPartHandler(); @@ -573,5 +573,5 @@ } - Set mods = new TreeSet(); + Set mods = new TreeSet<>(); StringBuffer output = new StringBuffer(desc); Index: applications/editors/josm/plugins/opendata/includes/org/apache/poi/ss/formula/FormulaRenderer.java =================================================================== --- applications/editors/josm/plugins/opendata/includes/org/apache/poi/ss/formula/FormulaRenderer.java (revision 30700) +++ applications/editors/josm/plugins/opendata/includes/org/apache/poi/ss/formula/FormulaRenderer.java (revision 30737) @@ -48,5 +48,5 @@ throw new IllegalArgumentException("ptgs must not be null"); } - Stack stack = new Stack(); + Stack stack = new Stack<>(); for (int i=0 ; i < ptgs.length; i++) { Index: applications/editors/josm/plugins/opendata/includes/org/apache/poi/ss/usermodel/BuiltinFormats.java =================================================================== --- applications/editors/josm/plugins/opendata/includes/org/apache/poi/ss/usermodel/BuiltinFormats.java (revision 30700) +++ applications/editors/josm/plugins/opendata/includes/org/apache/poi/ss/usermodel/BuiltinFormats.java (revision 30737) @@ -75,5 +75,5 @@ static { - List m = new ArrayList(); + List m = new ArrayList<>(); putFormat(m, 0, "General"); putFormat(m, 1, "0"); Index: applications/editors/josm/plugins/opendata/includes/org/apache/poi/ss/util/CellRangeAddressList.java =================================================================== --- applications/editors/josm/plugins/opendata/includes/org/apache/poi/ss/util/CellRangeAddressList.java (revision 30700) +++ applications/editors/josm/plugins/opendata/includes/org/apache/poi/ss/util/CellRangeAddressList.java (revision 30737) @@ -45,5 +45,5 @@ public CellRangeAddressList() { - _list = new ArrayList(); + _list = new ArrayList<>(); } /** Index: applications/editors/josm/plugins/opendata/includes/org/apache/poi/ss/util/SSCellRange.java =================================================================== --- applications/editors/josm/plugins/opendata/includes/org/apache/poi/ss/util/SSCellRange.java (revision 30700) +++ applications/editors/josm/plugins/opendata/includes/org/apache/poi/ss/util/SSCellRange.java (revision 30737) @@ -50,9 +50,9 @@ B[] flattenedArray = (B[]) Array.newInstance(cellClass, nItems); flattenedList.toArray(flattenedArray); - return new SSCellRange(firstRow, firstColumn, height, width, flattenedArray); + return new SSCellRange<>(firstRow, firstColumn, height, width, flattenedArray); } public Iterator iterator() { - return new ArrayIterator(_flattenedArray); + return new ArrayIterator<>(_flattenedArray); } private static final class ArrayIterator implements Iterator { Index: applications/editors/josm/plugins/opendata/includes/org/apache/poi/util/BitFieldFactory.java =================================================================== --- applications/editors/josm/plugins/opendata/includes/org/apache/poi/util/BitFieldFactory.java (revision 30700) +++ applications/editors/josm/plugins/opendata/includes/org/apache/poi/util/BitFieldFactory.java (revision 30737) @@ -29,5 +29,5 @@ public class BitFieldFactory { - private static Map instances = new HashMap(); + private static Map instances = new HashMap<>(); public static BitField getInstance(int mask) { Index: applications/editors/josm/plugins/opendata/includes/org/apache/poi/util/HexRead.java =================================================================== --- applications/editors/josm/plugins/opendata/includes/org/apache/poi/util/HexRead.java (revision 30700) +++ applications/editors/josm/plugins/opendata/includes/org/apache/poi/util/HexRead.java (revision 30737) @@ -38,5 +38,5 @@ int characterCount = 0; byte b = (byte) 0; - List bytes = new ArrayList(); + List bytes = new ArrayList<>(); boolean done = false; while ( !done ) Index: applications/editors/josm/plugins/opendata/includes/org/apache/poi/util/IntMapper.java =================================================================== --- applications/editors/josm/plugins/opendata/includes/org/apache/poi/util/IntMapper.java (revision 30700) +++ applications/editors/josm/plugins/opendata/includes/org/apache/poi/util/IntMapper.java (revision 30737) @@ -56,6 +56,6 @@ public IntMapper(final int initialCapacity) { - elements = new ArrayList(initialCapacity); - valueKeyMap = new HashMap(initialCapacity); + elements = new ArrayList<>(initialCapacity); + valueKeyMap = new HashMap<>(initialCapacity); } Index: applications/editors/josm/plugins/opendata/includes/org/apache/poi/util/POILogFactory.java =================================================================== --- applications/editors/josm/plugins/opendata/includes/org/apache/poi/util/POILogFactory.java (revision 30700) +++ applications/editors/josm/plugins/opendata/includes/org/apache/poi/util/POILogFactory.java (revision 30737) @@ -38,5 +38,5 @@ * Map of POILogger instances, with classes as keys */ - private static Map _loggers = new HashMap(); + private static Map _loggers = new HashMap<>(); /** Index: applications/editors/josm/plugins/opendata/includes/org/apache/poi/util/POILogger.java =================================================================== --- applications/editors/josm/plugins/opendata/includes/org/apache/poi/util/POILogger.java (revision 30700) +++ applications/editors/josm/plugins/opendata/includes/org/apache/poi/util/POILogger.java (revision 30737) @@ -571,5 +571,5 @@ private Object [] flattenArrays(Object [] objects) { - List results = new ArrayList(); + List results = new ArrayList<>(); for (int i = 0; i < objects.length; i++) @@ -582,5 +582,5 @@ private List objectToObjectArray(Object object) { - List results = new ArrayList(); + List results = new ArrayList<>(); if (object instanceof byte [])