Changeset 14543 in josm for trunk/src

Timestamp:

2018-12-10T00:06:45+01:00 (6 years ago)

Author:

Don-vip

Message:

see #16854 - fix java warning

File:

• trunk/src/org/openstreetmap/josm/io/AbstractReader.java (modified) (4 diffs)

trunk/src/org/openstreetmap/josm/io/AbstractReader.java

@@ -609 +609 @@
     }
 
-    @SuppressWarnings("unchecked")
-    private <T extends OsmPrimitive> T buildPrimitive(PrimitiveData pd) {
+    private OsmPrimitive buildPrimitive(PrimitiveData pd) {
         OsmPrimitive p;
         if (pd.getUniqueId() < AbstractPrimitive.currentUniqueId()) {
@@ -620 +619 @@
         p.load(pd);
         externalIdMap.put(pd.getPrimitiveId(), p);
-        return (T) p;
+        return p;
     }
 
     private Node addNode(NodeData nd, NodeReader nodeReader) throws IllegalDataException {
-        Node n = buildPrimitive(nd);
+        Node n = (Node) buildPrimitive(nd);
         nodeReader.accept(n);
         return n;
@@ -672 +671 @@
         WayData wd = new WayData(0);
         commonReader.accept(wd);
-        Way w = buildPrimitive(wd);
+        Way w = (Way) buildPrimitive(wd);
 
         Collection<Long> nodeIds = new ArrayList<>();
@@ -687 +686 @@
         RelationData rd = new RelationData(0);
         commonReader.accept(rd);
-        Relation r = buildPrimitive(rd);
+        Relation r = (Relation) buildPrimitive(rd);
 
         Collection<RelationMemberData> members = new ArrayList<>();