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

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/dom

Files:

• ChildCreator.java (modified) (1 diff)
• ImmutableDocStyledNode.java (modified) (1 diff)
• ODMeta.java (modified) (2 diffs)
• ODPackage.java (modified) (2 diffs)
• ODSingleXMLDocument.java (modified) (2 diffs)
• ODXMLDocument.java (modified) (3 diffs)
• StyleDesc.java (modified) (1 diff)
• StyleStyle.java (modified) (1 diff)
• XMLVersion.java (modified) (1 diff)
• spreadsheet/Cell.java (modified) (1 diff)
• spreadsheet/Row.java (modified) (2 diffs)
• spreadsheet/SpreadSheet.java (modified) (1 diff)
• spreadsheet/Table.java (modified) (3 diffs)

applications/editors/josm/plugins/opendata/includes/org/jopendocument/dom/ChildCreator.java

@@ -37 +37 @@
             throw new NullPointerException("null content");
         this.content = content;
-        this.elemsOrder = new ArrayList<Element>(children);
+        this.elemsOrder = new ArrayList<>(children);
     }
 

applications/editors/josm/plugins/opendata/includes/org/jopendocument/dom/ImmutableDocStyledNode.java

@@ -25 +25 @@
 
     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);

applications/editors/josm/plugins/opendata/includes/org/jopendocument/dom/ODMeta.java

@@ -42 +42 @@
     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 +50 @@
         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));

applications/editors/josm/plugins/opendata/includes/org/jopendocument/dom/ODPackage.java

@@ -37 +37 @@
     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 +49 @@
 
     public ODPackage() {
-        this.files = new HashMap<String, ODPackageEntry>();
+        this.files = new HashMap<>();
         this.file = null;
     }

applications/editors/josm/plugins/opendata/includes/org/jopendocument/dom/ODSingleXMLDocument.java

@@ -28 +28 @@
     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 +57 @@
     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);

applications/editors/josm/plugins/opendata/includes/org/jopendocument/dom/ODXMLDocument.java

@@ -41 +41 @@
     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 +48 @@
     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 +63 @@
     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");

applications/editors/josm/plugins/opendata/includes/org/jopendocument/dom/StyleDesc.java

@@ -68 +68 @@
         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);
     }
 

applications/editors/josm/plugins/opendata/includes/org/jopendocument/dom/StyleStyle.java

@@ -37 +37 @@
     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<?>>());

applications/editors/josm/plugins/opendata/includes/org/jopendocument/dom/XMLVersion.java

@@ -81 +81 @@
 
     private XMLVersion(String name, Namespace manifest) {
-        this.nss = new HashMap<String, Namespace>(16);
+        this.nss = new HashMap<>(16);
     }
 

applications/editors/josm/plugins/opendata/includes/org/jopendocument/dom/spreadsheet/Cell.java

@@ -136 +136 @@
      */
     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;

applications/editors/josm/plugins/opendata/includes/org/jopendocument/dom/spreadsheet/Row.java

@@ -44 +44 @@
         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 +59 @@
 
     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);
 

applications/editors/josm/plugins/opendata/includes/org/jopendocument/dom/spreadsheet/SpreadSheet.java

@@ -49 +49 @@
 
         // map Sheet by XML elements so has not to depend on ordering or name
-        this.sheets = new HashMap<Element, Sheet>();
+        this.sheets = new HashMap<>();
     }
 

applications/editors/josm/plugins/opendata/includes/org/jopendocument/dom/spreadsheet/Table.java

@@ -44 +44 @@
         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 +71 @@
 
     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 +128 @@
 
     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()));
     }