Changeset 30568 in osm for applications/editors/josm/plugins/opendata/includes/org/jopendocument/model

Timestamp:

2014-08-06T19:33:57+02:00 (12 years ago)

Author:

donvip

Message:

[josm_opendata] add more unit tests, fix Java 7 warnings

Location:

applications/editors/josm/plugins/opendata/includes/org/jopendocument/model

Files:

• office/OfficeBody.java (modified) (1 diff)
• office/OfficeSpreadsheet.java (modified) (1 diff)
• table/TableTable.java (modified) (2 diffs)
• table/TableTableRow.java (modified) (2 diffs)
• text/TextP.java (modified) (1 diff)

applications/editors/josm/plugins/opendata/includes/org/jopendocument/model/office/OfficeBody.java

@@ -24 +24 @@
 public class OfficeBody {
 
-    private final List<OfficeSpreadsheet> officeSpreadsheets = new Vector<OfficeSpreadsheet>();
+    private final List<OfficeSpreadsheet> officeSpreadsheets = new Vector<>();
 
     public void addOfficeSpreadsheet(final OfficeSpreadsheet spread) {

applications/editors/josm/plugins/opendata/includes/org/jopendocument/model/office/OfficeSpreadsheet.java

@@ -22 +22 @@
 
 public class OfficeSpreadsheet {
-    List<TableTable> tables = new Vector<TableTable>();
+    List<TableTable> tables = new Vector<>();
 
     public void addTable(final TableTable table) {

applications/editors/josm/plugins/opendata/includes/org/jopendocument/model/table/TableTable.java

@@ -25 +25 @@
 
     // 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 +35 @@
     private int printStopRow = 0;
 
-    ArrayList<TableTableRow> rows = new ArrayList<TableTableRow>();
+    ArrayList<TableTableRow> rows = new ArrayList<>();
 
     public void addColumn(final TableTableColumn col) {

applications/editors/josm/plugins/opendata/includes/org/jopendocument/model/table/TableTableRow.java

@@ -27 +27 @@
     ArrayList<TableTableCell> allCells;
 
-    Vector<TableTableCell> cells = new Vector<TableTableCell>();
+    Vector<TableTableCell> cells = new Vector<>();
 
     int id = 0;
@@ -47 +47 @@
      */
     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);

applications/editors/josm/plugins/opendata/includes/org/jopendocument/model/text/TextP.java

@@ -24 +24 @@
 public class TextP {
 
-    private final List<TextSpan> textSpans = new Vector<TextSpan>();
+    private final List<TextSpan> textSpans = new Vector<>();
 
     public void addTextSpan(final TextSpan p) {