Changeset 30737 in osm for applications/editors/josm/plugins/pbf/src

Timestamp:

2014-10-18T23:07:52+02:00 (10 years ago)

Author:

donvip

Message:

[josm_plugins] fix Java 7 / unused code warnings

Location:

applications/editors/josm/plugins/pbf/src/org/openstreetmap/josm/plugins/pbf/io

Files:

• PbfReader.java (modified) (6 diffs)
• PbfWriter.java (modified) (1 diff)

applications/editors/josm/plugins/pbf/src/org/openstreetmap/josm/plugins/pbf/io/PbfReader.java

@@ -137 +137 @@
                         // Each node's tags are encoded in alternating <key_id> <value_id>.
                         // A single stringid of 0 delimit when the tags of a node ends and the tags of the next node begin.
-                        Map<String, String> keys = new HashMap<String, String>();
+                        Map<String, String> keys = new HashMap<>();
                         while (keyIndex < nodes.getKeysValsCount()) {
                             int key_id = nodes.getKeysVals(keyIndex++);
@@ -172 +172 @@
                         checkTimestamp(info.getTimestamp());
                         node.setTimestamp(getDate(info));
-                        Map<String, String> keys = new HashMap<String, String>();
+                        Map<String, String> keys = new HashMap<>();
                         for (int i=0; i<n.getKeysCount(); i++) {
                             keys.put(getStringById(n.getKeys(i)), getStringById(n.getVals(i)));
@@ -197 +197 @@
                         checkTimestamp(info.getTimestamp());
                         way.setTimestamp(getDate(info));
-                        Map<String, String> keys = new HashMap<String, String>();
+                        Map<String, String> keys = new HashMap<>();
                         for (int i=0; i<w.getKeysCount(); i++) {
                             keys.put(getStringById(w.getKeys(i)), getStringById(w.getVals(i)));
@@ -203 +203 @@
                         way.setKeys(keys);
                         long previousId = 0; // Node ids are delta coded
-                        Collection<Long> nodeIds = new ArrayList<Long>();
+                        Collection<Long> nodeIds = new ArrayList<>();
                         for (Long id : w.getRefsList()) {
                             nodeIds.add(previousId+=id);
@@ -228 +228 @@
                         checkTimestamp(info.getTimestamp());
                         rel.setTimestamp(getDate(info));
-                        Map<String, String> keys = new HashMap<String, String>();
+                        Map<String, String> keys = new HashMap<>();
                         for (int i=0; i<r.getKeysCount(); i++) {
                             keys.put(getStringById(r.getKeys(i)), getStringById(r.getVals(i)));
@@ -234 +234 @@
                         rel.setKeys(keys);
                         long previousId = 0; // Member ids are delta coded
-                        Collection<RelationMemberData> members = new ArrayList<RelationMemberData>();
+                        Collection<RelationMemberData> members = new ArrayList<>();
                         for (int i = 0; i<r.getMemidsCount(); i++) {
                             long id = previousId+=r.getMemids(i);

applications/editors/josm/plugins/pbf/src/org/openstreetmap/josm/plugins/pbf/io/PbfWriter.java

@@ -69 +69 @@
         private abstract class Prim<T extends OsmPrimitive> {
             /** Queue that tracks the list of all primitives. */
-            ArrayList<T> contents = new ArrayList<T>();
+            ArrayList<T> contents = new ArrayList<>();
 
             /**