Index: applications/editors/josm/plugins/opendata/includes/org/j7zip/SevenZip/Archive/Common/BindInfo.java
===================================================================
--- applications/editors/josm/plugins/opendata/includes/org/j7zip/SevenZip/Archive/Common/BindInfo.java	(revision 30340)
+++ applications/editors/josm/plugins/opendata/includes/org/j7zip/SevenZip/Archive/Common/BindInfo.java	(revision 30568)
@@ -5,6 +5,6 @@
 
 public class BindInfo {
-    public RecordVector<CoderStreamsInfo> Coders = new RecordVector<CoderStreamsInfo>();
-    public RecordVector<BindPair> BindPairs = new RecordVector<BindPair>();
+    public RecordVector<CoderStreamsInfo> Coders = new RecordVector<>();
+    public RecordVector<BindPair> BindPairs = new RecordVector<>();
     public IntVector InStreams = new IntVector();
     public IntVector OutStreams = new IntVector();
Index: applications/editors/josm/plugins/opendata/includes/org/j7zip/SevenZip/Archive/Common/CoderMixer2ST.java
===================================================================
--- applications/editors/josm/plugins/opendata/includes/org/j7zip/SevenZip/Archive/Common/CoderMixer2ST.java	(revision 30340)
+++ applications/editors/josm/plugins/opendata/includes/org/j7zip/SevenZip/Archive/Common/CoderMixer2ST.java	(revision 30568)
@@ -20,5 +20,5 @@
     
     BindInfo _bindInfo = new BindInfo();
-    ObjectVector<STCoderInfo> _coders = new ObjectVector<STCoderInfo>();
+    ObjectVector<STCoderInfo> _coders = new ObjectVector<>();
     
     public CoderMixer2ST() {
@@ -202,6 +202,6 @@
         CoderInfo mainCoder = _coders.get(_mainCoderIndex);
         
-        ObjectVector< java.io.InputStream > seqInStreams = new ObjectVector< java.io.InputStream >(); // CObjectVector< CMyComPtr<ISequentialInStream> >
-        ObjectVector< java.io.OutputStream > seqOutStreams = new ObjectVector< java.io.OutputStream >(); // CObjectVector< CMyComPtr<ISequentialOutStream> >
+        ObjectVector< java.io.InputStream > seqInStreams = new ObjectVector< >(); // CObjectVector< CMyComPtr<ISequentialInStream> >
+        ObjectVector< java.io.OutputStream > seqOutStreams = new ObjectVector< >(); // CObjectVector< CMyComPtr<ISequentialOutStream> >
         int startInIndex = _bindInfo.GetCoderInStreamIndex(_mainCoderIndex);
         int startOutIndex = _bindInfo.GetCoderOutStreamIndex(_mainCoderIndex);
@@ -220,6 +220,6 @@
             seqOutStreams.add(seqOutStream);
         }
-        RecordVector< java.io.InputStream > seqInStreamsSpec = new RecordVector< java.io.InputStream >();
-        RecordVector< java.io.OutputStream > seqOutStreamsSpec = new RecordVector< java.io.OutputStream >();
+        RecordVector< java.io.InputStream > seqInStreamsSpec = new RecordVector< >();
+        RecordVector< java.io.OutputStream > seqOutStreamsSpec = new RecordVector< >();
         for (i = 0; i < mainCoder.NumInStreams; i++)
             seqInStreamsSpec.add(seqInStreams.get(i));
Index: applications/editors/josm/plugins/opendata/includes/org/j7zip/SevenZip/Archive/Common/FilterCoder.java
===================================================================
--- applications/editors/josm/plugins/opendata/includes/org/j7zip/SevenZip/Archive/Common/FilterCoder.java	(revision 30340)
+++ applications/editors/josm/plugins/opendata/includes/org/j7zip/SevenZip/Archive/Common/FilterCoder.java	(revision 30568)
@@ -4,5 +4,4 @@
 import java.io.IOException;
 
-import org.j7zip.SevenZip.HRESULT;
 import org.j7zip.SevenZip.ICompressCoder;
 import org.j7zip.SevenZip.ICompressSetOutStream;
Index: applications/editors/josm/plugins/opendata/includes/org/j7zip/SevenZip/Archive/SevenZip/ArchiveDatabase.java
===================================================================
--- applications/editors/josm/plugins/opendata/includes/org/j7zip/SevenZip/Archive/SevenZip/ArchiveDatabase.java	(revision 30340)
+++ applications/editors/josm/plugins/opendata/includes/org/j7zip/SevenZip/Archive/SevenZip/ArchiveDatabase.java	(revision 30568)
@@ -10,7 +10,7 @@
     public BoolVector PackCRCsDefined = new BoolVector();
     public IntVector PackCRCs = new IntVector();
-    public ObjectVector<Folder> Folders = new ObjectVector<Folder>();
+    public ObjectVector<Folder> Folders = new ObjectVector<>();
     public IntVector NumUnPackStreamsVector = new IntVector();
-    public ObjectVector<FileItem> Files = new ObjectVector<FileItem>();
+    public ObjectVector<FileItem> Files = new ObjectVector<>();
     
     void Clear() {
Index: applications/editors/josm/plugins/opendata/includes/org/j7zip/SevenZip/Archive/SevenZip/BindInfoEx.java
===================================================================
--- applications/editors/josm/plugins/opendata/includes/org/j7zip/SevenZip/Archive/SevenZip/BindInfoEx.java	(revision 30340)
+++ applications/editors/josm/plugins/opendata/includes/org/j7zip/SevenZip/Archive/SevenZip/BindInfoEx.java	(revision 30568)
@@ -7,5 +7,5 @@
 class BindInfoEx extends BindInfo {
     
-    RecordVector<MethodID> CoderMethodIDs = new RecordVector<MethodID>();
+    RecordVector<MethodID> CoderMethodIDs = new RecordVector<>();
     
     public void Clear() {
Index: applications/editors/josm/plugins/opendata/includes/org/j7zip/SevenZip/Archive/SevenZip/CoderInfo.java
===================================================================
--- applications/editors/josm/plugins/opendata/includes/org/j7zip/SevenZip/Archive/SevenZip/CoderInfo.java	(revision 30340)
+++ applications/editors/josm/plugins/opendata/includes/org/j7zip/SevenZip/Archive/SevenZip/CoderInfo.java	(revision 30568)
@@ -7,5 +7,5 @@
     int NumInStreams;
     int NumOutStreams;
-    public ObjectVector<AltCoderInfo> AltCoders = new org.j7zip.Common.ObjectVector<AltCoderInfo>();
+    public ObjectVector<AltCoderInfo> AltCoders = new org.j7zip.Common.ObjectVector<>();
     
     boolean IsSimpleCoder() { return (NumInStreams == 1) && (NumOutStreams == 1); }
Index: applications/editors/josm/plugins/opendata/includes/org/j7zip/SevenZip/Archive/SevenZip/Decoder.java
===================================================================
--- applications/editors/josm/plugins/opendata/includes/org/j7zip/SevenZip/Archive/SevenZip/Decoder.java	(revision 30340)
+++ applications/editors/josm/plugins/opendata/includes/org/j7zip/SevenZip/Archive/SevenZip/Decoder.java	(revision 30568)
@@ -45,5 +45,5 @@
         
         _mixerCoder = null;
-        _decoders = new ObjectVector<Object>();
+        _decoders = new ObjectVector<>();
         
         // #ifndef EXCLUDE_COM -- LoadMethodMap();
@@ -117,5 +117,5 @@
         
         
-        ObjectVector<java.io.InputStream> inStreams = new ObjectVector<java.io.InputStream>(); // CObjectVector< CMyComPtr<ISequentialInStream> >
+        ObjectVector<java.io.InputStream> inStreams = new ObjectVector<>(); // CObjectVector< CMyComPtr<ISequentialInStream> >
         
         LockedInStream lockedInStream = new LockedInStream();
@@ -357,10 +357,10 @@
         if (numCoders == 0)
             return 0;
-        RecordVector<java.io.InputStream> inStreamPointers = new RecordVector<java.io.InputStream>(); // CRecordVector<ISequentialInStream *>
+        RecordVector<java.io.InputStream> inStreamPointers = new RecordVector<>(); // CRecordVector<ISequentialInStream *>
         inStreamPointers.Reserve(inStreams.size());
         for (i = 0; i < inStreams.size(); i++)
             inStreamPointers.add(inStreams.get(i));
 
-        RecordVector<java.io.OutputStream> outStreamPointer = new RecordVector<java.io.OutputStream>();
+        RecordVector<java.io.OutputStream> outStreamPointer = new RecordVector<>();
         outStreamPointer.add(outStream);
         return _mixerCoder.Code(
Index: applications/editors/josm/plugins/opendata/includes/org/j7zip/SevenZip/Archive/SevenZip/Folder.java
===================================================================
--- applications/editors/josm/plugins/opendata/includes/org/j7zip/SevenZip/Archive/SevenZip/Folder.java	(revision 30340)
+++ applications/editors/josm/plugins/opendata/includes/org/j7zip/SevenZip/Archive/SevenZip/Folder.java	(revision 30568)
@@ -11,6 +11,6 @@
 
 class Folder {
-    public RecordVector<CoderInfo> Coders = new RecordVector<CoderInfo>();
-    RecordVector<BindPair> BindPairs = new RecordVector<BindPair>();
+    public RecordVector<CoderInfo> Coders = new RecordVector<>();
+    RecordVector<BindPair> BindPairs = new RecordVector<>();
     IntVector PackStreams = new IntVector();
     LongVector UnPackSizes = new LongVector();
Index: applications/editors/josm/plugins/opendata/includes/org/j7zip/SevenZip/Archive/SevenZip/Handler.java
===================================================================
--- applications/editors/josm/plugins/opendata/includes/org/j7zip/SevenZip/Archive/SevenZip/Handler.java	(revision 30340)
+++ applications/editors/josm/plugins/opendata/includes/org/j7zip/SevenZip/Archive/SevenZip/Handler.java	(revision 30568)
@@ -84,5 +84,5 @@
             return HRESULT.S_OK;
         
-        ObjectVector<ExtractFolderInfo> extractFolderInfoVector = new ObjectVector<ExtractFolderInfo>();
+        ObjectVector<ExtractFolderInfo> extractFolderInfoVector = new ObjectVector<>();
         for(int ii = 0; ii < numItems; ii++) {
             int ref2Index = allFilesMode ? ii : indices[ii];
Index: applications/editors/josm/plugins/opendata/includes/org/j7zip/SevenZip/Archive/SevenZip/InArchive.java
===================================================================
--- applications/editors/josm/plugins/opendata/includes/org/j7zip/SevenZip/Archive/SevenZip/InArchive.java	(revision 30340)
+++ applications/editors/josm/plugins/opendata/includes/org/j7zip/SevenZip/Archive/SevenZip/InArchive.java	(revision 30568)
@@ -32,5 +32,5 @@
     
     public InArchive() {
-        _inByteVector = new ObjectVector<InByte2>();
+        _inByteVector = new ObjectVector<>();
         _inByteBack = new InByte2();
     }
@@ -710,5 +710,5 @@
         IntVector packCRCs = new IntVector(); // CRecordVector<UInt32> packCRCs;
         
-        ObjectVector<Folder> folders = new ObjectVector<Folder>();
+        ObjectVector<Folder> folders = new ObjectVector<>();
         
         IntVector numUnPackStreamsInFolders = new IntVector();
@@ -823,5 +823,5 @@
         streamSwitch.Set(this, buffer2);
         
-        ObjectVector<ByteBuffer> dataVector = new ObjectVector<ByteBuffer>(); // CObjectVector<CByteBuffer> dataVector;
+        ObjectVector<ByteBuffer> dataVector = new ObjectVector<>(); // CObjectVector<CByteBuffer> dataVector;
         
         for (;;) {
@@ -863,5 +863,5 @@
         }
         
-        ObjectVector<ByteBuffer> dataVector = new ObjectVector<ByteBuffer>();
+        ObjectVector<ByteBuffer> dataVector = new ObjectVector<>();
         
         if (type == NID.kAdditionalStreamsInfo) {
Index: applications/editors/josm/plugins/opendata/includes/org/jopendocument/dom/ChildCreator.java
===================================================================
--- applications/editors/josm/plugins/opendata/includes/org/jopendocument/dom/ChildCreator.java	(revision 30340)
+++ applications/editors/josm/plugins/opendata/includes/org/jopendocument/dom/ChildCreator.java	(revision 30568)
@@ -37,5 +37,5 @@
             throw new NullPointerException("null content");
         this.content = content;
-        this.elemsOrder = new ArrayList<Element>(children);
+        this.elemsOrder = new ArrayList<>(children);
     }
 
Index: applications/editors/josm/plugins/opendata/includes/org/jopendocument/dom/ImmutableDocStyledNode.java
===================================================================
--- applications/editors/josm/plugins/opendata/includes/org/jopendocument/dom/ImmutableDocStyledNode.java	(revision 30340)
+++ applications/editors/josm/plugins/opendata/includes/org/jopendocument/dom/ImmutableDocStyledNode.java	(revision 30568)
@@ -25,5 +25,5 @@
 
     private static final Set<Document> getDocuments(final ODPackage pkg) {
-        final Set<Document> res = new HashSet<Document>();
+        final Set<Document> res = new HashSet<>();
         for (final String entry : pkg.getEntries()) {
             final ODPackageEntry e = pkg.getEntry(entry);
Index: applications/editors/josm/plugins/opendata/includes/org/jopendocument/dom/ODMeta.java
===================================================================
--- applications/editors/josm/plugins/opendata/includes/org/jopendocument/dom/ODMeta.java	(revision 30340)
+++ applications/editors/josm/plugins/opendata/includes/org/jopendocument/dom/ODMeta.java	(revision 30568)
@@ -42,5 +42,5 @@
     private static final Map<XMLVersion, List<Element>> ELEMS_ORDER;
     static {
-        ELEMS_ORDER = new HashMap<XMLVersion, List<Element>>(2);
+        ELEMS_ORDER = new HashMap<>(2);
         ELEMS_ORDER.put(XMLVersion.getOOo(), createChildren(XMLVersion.getOOo()));
         ELEMS_ORDER.put(XMLVersion.getOD(), createChildren(XMLVersion.getOD()));
@@ -50,5 +50,5 @@
         final Namespace meta = ins.getMETA();
         final Namespace dc = ins.getNS("dc");
-        final List<Element> res = new ArrayList<Element>(8);
+        final List<Element> res = new ArrayList<>(8);
         res.add(new Element("generator", meta));
         res.add(new Element("title", dc));
Index: applications/editors/josm/plugins/opendata/includes/org/jopendocument/dom/ODPackage.java
===================================================================
--- applications/editors/josm/plugins/opendata/includes/org/jopendocument/dom/ODPackage.java	(revision 30340)
+++ applications/editors/josm/plugins/opendata/includes/org/jopendocument/dom/ODPackage.java	(revision 30568)
@@ -37,5 +37,5 @@
     private static final Set<String> subdocNames;
     static {
-        subdocNames = new HashSet<String>();
+        subdocNames = new HashSet<>();
         // section 2.1 of OpenDocument-v1.1-os.odt
         subdocNames.add("content.xml");
@@ -49,5 +49,5 @@
 
     public ODPackage() {
-        this.files = new HashMap<String, ODPackageEntry>();
+        this.files = new HashMap<>();
         this.file = null;
     }
Index: applications/editors/josm/plugins/opendata/includes/org/jopendocument/dom/ODSingleXMLDocument.java
===================================================================
--- applications/editors/josm/plugins/opendata/includes/org/jopendocument/dom/ODSingleXMLDocument.java	(revision 30340)
+++ applications/editors/josm/plugins/opendata/includes/org/jopendocument/dom/ODSingleXMLDocument.java	(revision 30568)
@@ -28,5 +28,5 @@
     final static Set<String> DONT_PREFIX;
     static {
-        DONT_PREFIX = new HashSet<String>();
+        DONT_PREFIX = new HashSet<>();
         // don't touch to user fields and variables
         // we want them to be the same across the document
@@ -57,6 +57,6 @@
     ODSingleXMLDocument(ODSingleXMLDocument doc, ODPackage p) {
         super(doc);
-        this.stylesNames = new HashSet<String>(doc.stylesNames);
-        this.listStylesNames = new HashSet<String>(doc.listStylesNames);
+        this.stylesNames = new HashSet<>(doc.stylesNames);
+        this.listStylesNames = new HashSet<>(doc.listStylesNames);
         this.pkg = p;
         this.meta = ODMeta.create(this);
Index: applications/editors/josm/plugins/opendata/includes/org/jopendocument/dom/ODXMLDocument.java
===================================================================
--- applications/editors/josm/plugins/opendata/includes/org/jopendocument/dom/ODXMLDocument.java	(revision 30340)
+++ applications/editors/josm/plugins/opendata/includes/org/jopendocument/dom/ODXMLDocument.java	(revision 30568)
@@ -41,5 +41,5 @@
     private static final Map<XMLVersion, List<Element>> ELEMS_ORDER;
     static {
-        ELEMS_ORDER = new HashMap<XMLVersion, List<Element>>(2);
+        ELEMS_ORDER = new HashMap<>(2);
         ELEMS_ORDER.put(XMLVersion.getOOo(), createChildren(XMLVersion.getOOo()));
         ELEMS_ORDER.put(XMLVersion.getOD(), createChildren(XMLVersion.getOD()));
@@ -48,5 +48,5 @@
     private static final List<Element> createChildren(XMLVersion ins) {
         final Namespace ns = ins.getOFFICE();
-        final List<Element> res = new ArrayList<Element>(8);
+        final List<Element> res = new ArrayList<>(8);
         res.add(new Element("meta", ns));
         res.add(new Element("settings", ns));
@@ -63,5 +63,5 @@
     static private final Map<String, String> namePrefixes;
     static {
-        namePrefixes = new HashMap<String, String>();
+        namePrefixes = new HashMap<>();
         namePrefixes.put("table:table", "table");
         namePrefixes.put("text:a", "office");
Index: applications/editors/josm/plugins/opendata/includes/org/jopendocument/dom/StyleDesc.java
===================================================================
--- applications/editors/josm/plugins/opendata/includes/org/jopendocument/dom/StyleDesc.java	(revision 30340)
+++ applications/editors/josm/plugins/opendata/includes/org/jopendocument/dom/StyleDesc.java	(revision 30568)
@@ -68,7 +68,7 @@
         this.family = family;
         this.baseName = baseName;
-        this.refElements = new CollectionMap<String, String>();
+        this.refElements = new CollectionMap<>();
         // 4 since they are not common
-        this.multiRefElements = new CollectionMap<String, String>(4);
+        this.multiRefElements = new CollectionMap<>(4);
     }
 
Index: applications/editors/josm/plugins/opendata/includes/org/jopendocument/dom/StyleStyle.java
===================================================================
--- applications/editors/josm/plugins/opendata/includes/org/jopendocument/dom/StyleStyle.java	(revision 30340)
+++ applications/editors/josm/plugins/opendata/includes/org/jopendocument/dom/StyleStyle.java	(revision 30568)
@@ -37,6 +37,6 @@
     private static boolean descsLoaded = false;
     static {
-        family2Desc = new HashMap<XMLVersion, Map<String, StyleDesc<?>>>();
-        class2Desc = new HashMap<XMLVersion, Map<Class<? extends StyleStyle>, StyleDesc<?>>>();
+        family2Desc = new HashMap<>();
+        class2Desc = new HashMap<>();
         for (final XMLVersion v : XMLVersion.values()) {
             family2Desc.put(v, new HashMap<String, StyleDesc<?>>());
Index: applications/editors/josm/plugins/opendata/includes/org/jopendocument/dom/XMLVersion.java
===================================================================
--- applications/editors/josm/plugins/opendata/includes/org/jopendocument/dom/XMLVersion.java	(revision 30340)
+++ applications/editors/josm/plugins/opendata/includes/org/jopendocument/dom/XMLVersion.java	(revision 30568)
@@ -81,5 +81,5 @@
 
     private XMLVersion(String name, Namespace manifest) {
-        this.nss = new HashMap<String, Namespace>(16);
+        this.nss = new HashMap<>(16);
     }
 
Index: applications/editors/josm/plugins/opendata/includes/org/jopendocument/dom/spreadsheet/Cell.java
===================================================================
--- applications/editors/josm/plugins/opendata/includes/org/jopendocument/dom/spreadsheet/Cell.java	(revision 30340)
+++ applications/editors/josm/plugins/opendata/includes/org/jopendocument/dom/spreadsheet/Cell.java	(revision 30568)
@@ -136,5 +136,5 @@
      */
     public String getTextValue(final boolean ooMode) {
-        final List<String> ps = new ArrayList<String>();
+        final List<String> ps = new ArrayList<>();
         for (final Object o : this.getElement().getChildren()) {
             final Element child = (Element) o;
Index: applications/editors/josm/plugins/opendata/includes/org/jopendocument/dom/spreadsheet/Row.java
===================================================================
--- applications/editors/josm/plugins/opendata/includes/org/jopendocument/dom/spreadsheet/Row.java	(revision 30340)
+++ applications/editors/josm/plugins/opendata/includes/org/jopendocument/dom/spreadsheet/Row.java	(revision 30568)
@@ -44,5 +44,5 @@
         this.parent = parent;
         this.index = index;
-        this.cells = new ArrayList<Cell<D>>();
+        this.cells = new ArrayList<>();
         for (final Element cellElem : this.getCellElements()) {
             addCellElem(cellElem);
@@ -59,5 +59,5 @@
 
     private void addCellElem(final Element cellElem) {
-        final Cell<D> cell = new Cell<D>(this, cellElem);
+        final Cell<D> cell = new Cell<>(this, cellElem);
         this.cells.add(cell);
 
Index: applications/editors/josm/plugins/opendata/includes/org/jopendocument/dom/spreadsheet/SpreadSheet.java
===================================================================
--- applications/editors/josm/plugins/opendata/includes/org/jopendocument/dom/spreadsheet/SpreadSheet.java	(revision 30340)
+++ applications/editors/josm/plugins/opendata/includes/org/jopendocument/dom/spreadsheet/SpreadSheet.java	(revision 30568)
@@ -49,5 +49,5 @@
 
         // map Sheet by XML elements so has not to depend on ordering or name
-        this.sheets = new HashMap<Element, Sheet>();
+        this.sheets = new HashMap<>();
     }
 
Index: applications/editors/josm/plugins/opendata/includes/org/jopendocument/dom/spreadsheet/Table.java
===================================================================
--- applications/editors/josm/plugins/opendata/includes/org/jopendocument/dom/spreadsheet/Table.java	(revision 30340)
+++ applications/editors/josm/plugins/opendata/includes/org/jopendocument/dom/spreadsheet/Table.java	(revision 30568)
@@ -44,6 +44,6 @@
         super(parent, local, TableStyle.class);
 
-        this.rows = new ArrayList<Row<D>>();
-        this.cols = new ArrayList<Column<D>>();
+        this.rows = new ArrayList<>();
+        this.cols = new ArrayList<>();
 
         this.readColumns();
@@ -71,9 +71,9 @@
 
     private final void addCol(Element clone) {
-        this.cols.add(new Column<D>(this, clone));
+        this.cols.add(new Column<>(this, clone));
     }
 
     private Tuple2<List<Element>, Integer> flatten(boolean col) {
-        final List<Element> res = new ArrayList<Element>();
+        final List<Element> res = new ArrayList<>();
         final Element header = this.getElement().getChild("table-header-" + getName(col) + "s", getTABLE());
         if (header != null)
@@ -128,5 +128,5 @@
 
     private synchronized void addRow(Element child) {
-        this.rows.add(new Row<D>(this, child, this.rows.size()));
+        this.rows.add(new Row<>(this, child, this.rows.size()));
     }
 
Index: applications/editors/josm/plugins/opendata/includes/org/jopendocument/io/SaxContentUnmarshaller.java
===================================================================
--- applications/editors/josm/plugins/opendata/includes/org/jopendocument/io/SaxContentUnmarshaller.java	(revision 30340)
+++ applications/editors/josm/plugins/opendata/includes/org/jopendocument/io/SaxContentUnmarshaller.java	(revision 30568)
@@ -40,5 +40,5 @@
 
     public SaxContentUnmarshaller() {
-        this.stack = new Stack<Object>();
+        this.stack = new Stack<>();
     }
 
Index: applications/editors/josm/plugins/opendata/includes/org/jopendocument/model/office/OfficeBody.java
===================================================================
--- applications/editors/josm/plugins/opendata/includes/org/jopendocument/model/office/OfficeBody.java	(revision 30340)
+++ applications/editors/josm/plugins/opendata/includes/org/jopendocument/model/office/OfficeBody.java	(revision 30568)
@@ -24,5 +24,5 @@
 public class OfficeBody {
 
-    private final List<OfficeSpreadsheet> officeSpreadsheets = new Vector<OfficeSpreadsheet>();
+    private final List<OfficeSpreadsheet> officeSpreadsheets = new Vector<>();
 
     public void addOfficeSpreadsheet(final OfficeSpreadsheet spread) {
Index: applications/editors/josm/plugins/opendata/includes/org/jopendocument/model/office/OfficeSpreadsheet.java
===================================================================
--- applications/editors/josm/plugins/opendata/includes/org/jopendocument/model/office/OfficeSpreadsheet.java	(revision 30340)
+++ applications/editors/josm/plugins/opendata/includes/org/jopendocument/model/office/OfficeSpreadsheet.java	(revision 30568)
@@ -22,5 +22,5 @@
 
 public class OfficeSpreadsheet {
-    List<TableTable> tables = new Vector<TableTable>();
+    List<TableTable> tables = new Vector<>();
 
     public void addTable(final TableTable table) {
Index: applications/editors/josm/plugins/opendata/includes/org/jopendocument/model/table/TableTable.java
===================================================================
--- applications/editors/josm/plugins/opendata/includes/org/jopendocument/model/table/TableTable.java	(revision 30340)
+++ applications/editors/josm/plugins/opendata/includes/org/jopendocument/model/table/TableTable.java	(revision 30568)
@@ -25,5 +25,5 @@
 
     // Une colonne ou ligne repeated est dupliquée dans la liste
-    ArrayList<TableTableColumn> columns = new ArrayList<TableTableColumn>();
+    ArrayList<TableTableColumn> columns = new ArrayList<>();
 
     private int printStartCol = 0;
@@ -35,5 +35,5 @@
     private int printStopRow = 0;
 
-    ArrayList<TableTableRow> rows = new ArrayList<TableTableRow>();
+    ArrayList<TableTableRow> rows = new ArrayList<>();
 
     public void addColumn(final TableTableColumn col) {
Index: applications/editors/josm/plugins/opendata/includes/org/jopendocument/model/table/TableTableRow.java
===================================================================
--- applications/editors/josm/plugins/opendata/includes/org/jopendocument/model/table/TableTableRow.java	(revision 30340)
+++ applications/editors/josm/plugins/opendata/includes/org/jopendocument/model/table/TableTableRow.java	(revision 30568)
@@ -27,5 +27,5 @@
     ArrayList<TableTableCell> allCells;
 
-    Vector<TableTableCell> cells = new Vector<TableTableCell>();
+    Vector<TableTableCell> cells = new Vector<>();
 
     int id = 0;
@@ -47,5 +47,5 @@
      */
     void computeAllCells() {
-        this.allCells = new ArrayList<TableTableCell>();
+        this.allCells = new ArrayList<>();
         for (int index = 0; index < this.cells.size(); index++) {
             final TableTableCell c = this.cells.get(index);
Index: applications/editors/josm/plugins/opendata/includes/org/jopendocument/model/text/TextP.java
===================================================================
--- applications/editors/josm/plugins/opendata/includes/org/jopendocument/model/text/TextP.java	(revision 30340)
+++ applications/editors/josm/plugins/opendata/includes/org/jopendocument/model/text/TextP.java	(revision 30568)
@@ -24,5 +24,5 @@
 public class TextP {
 
-    private final List<TextSpan> textSpans = new Vector<TextSpan>();
+    private final List<TextSpan> textSpans = new Vector<>();
 
     public void addTextSpan(final TextSpan p) {
Index: applications/editors/josm/plugins/opendata/includes/org/jopendocument/util/FileUtils.java
===================================================================
--- applications/editors/josm/plugins/opendata/includes/org/jopendocument/util/FileUtils.java	(revision 30340)
+++ applications/editors/josm/plugins/opendata/includes/org/jopendocument/util/FileUtils.java	(revision 30568)
@@ -31,5 +31,5 @@
     private static final Map<String, String> ext2mime;
     static {
-        ext2mime = new HashMap<String, String>();
+        ext2mime = new HashMap<>();
         ext2mime.put(".xml", "text/xml");
         ext2mime.put(".jpg", "image/jpeg");
Index: applications/editors/josm/plugins/opendata/includes/org/jopendocument/util/StringUtils.java
===================================================================
--- applications/editors/josm/plugins/opendata/includes/org/jopendocument/util/StringUtils.java	(revision 30340)
+++ applications/editors/josm/plugins/opendata/includes/org/jopendocument/util/StringUtils.java	(revision 30568)
@@ -47,6 +47,6 @@
             super();
             this.esc = esc;
-            this.substitution = new LinkedHashMap<Character, Character>();
-            this.inv = new HashMap<Character, Character>();
+            this.substitution = new LinkedHashMap<>();
+            this.inv = new HashMap<>();
             this.add(esc, name);
         }
Index: applications/editors/josm/plugins/opendata/includes/org/jopendocument/util/Tuple2.java
===================================================================
--- applications/editors/josm/plugins/opendata/includes/org/jopendocument/util/Tuple2.java	(revision 30340)
+++ applications/editors/josm/plugins/opendata/includes/org/jopendocument/util/Tuple2.java	(revision 30568)
@@ -31,5 +31,5 @@
     // just to make the code shorter
     public static final <A, B> Tuple2<A, B> create(A a, B b) {
-        return new Tuple2<A, B>(a, b);
+        return new Tuple2<>(a, b);
     }
 
Index: applications/editors/josm/plugins/opendata/includes/org/jopendocument/util/cc/Transformer.java
===================================================================
--- applications/editors/josm/plugins/opendata/includes/org/jopendocument/util/cc/Transformer.java	(revision 30340)
+++ applications/editors/josm/plugins/opendata/includes/org/jopendocument/util/cc/Transformer.java	(revision 30568)
@@ -21,5 +21,5 @@
 
     public static final <N> ITransformer<N, N> nopTransformer() {
-        return new ITransformerWrapper<N, N>(TransformerUtils.nopTransformer());
+        return new ITransformerWrapper<>(TransformerUtils.nopTransformer());
     }