Changeset 32780 in osm for applications/editors/josm/plugins

Timestamp:

2016-08-08T00:05:00+02:00 (9 years ago)

Author:

donvip

Message:

fix some error-prone warnings

File:

• applications/editors/josm/plugins/CommandLine/src/CommandLine/CommandLine.java (modified) (4 diffs)

applications/editors/josm/plugins/CommandLine/src/CommandLine/CommandLine.java

@@ -458 +458 @@
     }
 
-    private class ToolProcess {
+    private static class ToolProcess {
         public Process process;
         public volatile boolean running;
@@ -517 +517 @@
                     while ((len = errStream.read(buffer)) > 0) {
                         synchronized (debugstr) {
-                            debugstr.append(new String(buffer, 0, len));
+                            debugstr.append(new String(buffer, 0, len, StandardCharsets.UTF_8));
                         }
                         System.err.write(buffer, 0, len);
@@ -551 +551 @@
                         bbox.addPrimitive(primitive, 0.0);
                 }
-                osmWriter.writeNodes(new SubclassFilteredCollection<OsmPrimitive, Node>(contents, OsmPrimitive.nodePredicate));
-                osmWriter.writeWays(new SubclassFilteredCollection<OsmPrimitive, Way>(contents, OsmPrimitive.wayPredicate));
-                osmWriter.writeRelations(new SubclassFilteredCollection<OsmPrimitive, Relation>(contents, OsmPrimitive.relationPredicate));
+                osmWriter.writeNodes(new SubclassFilteredCollection<OsmPrimitive, Node>(contents, Node.class::isInstance));
+                osmWriter.writeWays(new SubclassFilteredCollection<OsmPrimitive, Way>(contents, Way.class::isInstance));
+                osmWriter.writeRelations(new SubclassFilteredCollection<OsmPrimitive, Relation>(contents, Relation.class::isInstance));
                 osmWriter.footer();
                 osmWriter.flush();
@@ -570 +570 @@
                             bbox.addPrimitive(primitive, 0.0);
                     }
-                    osmWriter.writeNodes(new SubclassFilteredCollection<OsmPrimitive, Node>(contents, OsmPrimitive.nodePredicate));
-                    osmWriter.writeWays(new SubclassFilteredCollection<OsmPrimitive, Way>(contents, OsmPrimitive.wayPredicate));
-                    osmWriter.writeRelations(new SubclassFilteredCollection<OsmPrimitive, Relation>(contents, OsmPrimitive.relationPredicate));
+                    osmWriter.writeNodes(new SubclassFilteredCollection<OsmPrimitive, Node>(contents, Node.class::isInstance));
+                    osmWriter.writeWays(new SubclassFilteredCollection<OsmPrimitive, Way>(contents, Way.class::isInstance));
+                    osmWriter.writeRelations(new SubclassFilteredCollection<OsmPrimitive, Relation>(contents, Relation.class::isInstance));
                     osmWriter.footer();
                     osmWriter.flush();