Changeset 11809 in josm for trunk/src/org/openstreetmap/josm/io

Timestamp:

2017-04-01T01:23:56+02:00 (7 years ago)

Author:

Don-vip

Message:

findbugs - BC_UNCONFIRMED_CAST

Location:

trunk/src/org/openstreetmap/josm/io

Files:

• MultiFetchServerObjectReader.java (modified) (1 diff)
• OsmExporter.java (modified) (1 diff)
• remotecontrol/DNSName.java (modified) (1 diff)

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

@@ -211 +211 @@
      */
     public MultiFetchServerObjectReader append(OsmPrimitive primitive) {
-        if (primitive != null) {
-            switch (OsmPrimitiveType.from(primitive)) {
-                case NODE: return appendNode((Node) primitive);
-                case WAY: return appendWay((Way) primitive);
-                case RELATION: return appendRelation((Relation) primitive);
-                default: break;
-            }
+        if (primitive instanceof Node) {
+            return appendNode((Node) primitive);
+        } else if (primitive instanceof Way) {
+            return appendWay((Way) primitive);
+        } else if (primitive instanceof Relation) {
+            return appendRelation((Relation) primitive);
         }
         return this;

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

@@ -64 +64 @@
      */
     public void exportData(File file, Layer layer, boolean noBackup) {
-        checkOsmDataLayer(layer);
+        if (!(layer instanceof OsmDataLayer)) {
+            throw new IllegalArgumentException(
+                    MessageFormat.format("Expected instance of OsmDataLayer. Got ''{0}''.", layer.getClass().getName()));
+        }
         save(file, (OsmDataLayer) layer, noBackup);
-    }
-
-    protected static void checkOsmDataLayer(Layer layer) {
-        if (!(layer instanceof OsmDataLayer)) {
-            throw new IllegalArgumentException(MessageFormat.format("Expected instance of OsmDataLayer. Got ''{0}''.", layer
-                    .getClass().getName()));
-        }
     }
 

trunk/src/org/openstreetmap/josm/io/remotecontrol/DNSName.java

@@ -203 +203 @@
             constraintType = NAME_DIFF_TYPE;
         else {
+            if (!(inputName instanceof DNSName)) {
+                throw new IllegalArgumentException("inputName: " + inputName);
+            }
             String inName =
                 (((DNSName) inputName).getName()).toLowerCase(Locale.ENGLISH);