Index: applications/editors/josm/plugins/pbf/src/org/openstreetmap/josm/plugins/pbf/io/PbfWriter.java
===================================================================
--- applications/editors/josm/plugins/pbf/src/org/openstreetmap/josm/plugins/pbf/io/PbfWriter.java	(revision 35605)
+++ applications/editors/josm/plugins/pbf/src/org/openstreetmap/josm/plugins/pbf/io/PbfWriter.java	(revision 35607)
@@ -9,5 +9,5 @@
 import java.util.Comparator;
 import java.util.List;
-import java.util.Map.Entry;
+import java.util.Map;
 
 import org.openstreetmap.josm.data.DataSource;
@@ -95,5 +95,5 @@
                 StringTable stable = getStringTable();
                 for (T i : contents) {
-                    for (Entry<String, String> tag : i.getKeys().entrySet()) {
+                    for (Map.Entry<String, String> tag : i.getKeys().entrySet()) {
                         stable.incr(tag.getKey());
                         stable.incr(tag.getValue());
@@ -210,5 +210,5 @@
                     // Then we must include tag information.
                     if (doesBlockHaveTags) {
-                        for (Entry<String, String> t : i.getKeys().entrySet()) {
+                        for (Map.Entry<String, String> t : i.getKeys().entrySet()) {
                             bi.addKeysVals(stable.getIndex(t.getKey()));
                             bi.addKeysVals(stable.getIndex(t.getValue()));
@@ -223,6 +223,4 @@
             /**
              * Serialize all nodes in the non-dense format.
-             *
-             * @param parentbuilder Add to this PrimitiveBlock.
              */
             public Osmformat.PrimitiveGroup serializeNonDense() {
@@ -241,5 +239,5 @@
                     bi.setLon(lon);
                     bi.setLat(lat);
-                    for (Entry<String, String> t : i.getKeys().entrySet()) {
+                    for (Map.Entry<String, String> t : i.getKeys().entrySet()) {
                         bi.addKeys(stable.getIndex(t.getKey()));
                         bi.addVals(stable.getIndex(t.getValue()));
@@ -273,5 +271,5 @@
                         lastid = id;
                     }
-                    for (Entry<String, String> t : i.getKeys().entrySet()) {
+                    for (Map.Entry<String, String> t : i.getKeys().entrySet()) {
                         bi.addKeys(stable.getIndex(t.getKey()));
                         bi.addVals(stable.getIndex(t.getValue()));
@@ -328,5 +326,5 @@
                     }
 
-                    for (Entry<String, String> t : i.getKeys().entrySet()) {
+                    for (Map.Entry<String, String> t : i.getKeys().entrySet()) {
                         bi.addKeys(stable.getIndex(t.getKey()));
                         bi.addVals(stable.getIndex(t.getValue()));