Changeset 6229 in josm for trunk

Timestamp:

2013-09-11T00:32:31+02:00 (11 years ago)

Author:

Don-vip

Message:

Sonar - Avoid throwing NullPointerException

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/osm/DataSource.java (modified) (1 diff)
• tools/XmlObjectParser.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/data/osm/DataSource.java

@@ -3 +3 @@
 
 import org.openstreetmap.josm.data.Bounds;
+import org.openstreetmap.josm.tools.CheckParameterUtil;
 
+/**
+ * A data source, defined by bounds and textual description for the origin.
+ * @since 247
+ */
 public class DataSource {
+    /**
+     * The bounds of this data source
+     */
     public final Bounds bounds;
+    /**
+     * The textual description of the origin (example: "OpenStreetMap Server")
+     */
     public final String origin;
 
+    /**
+     * Constructs a new {@code DataSource}.
+     * @param bounds The bounds of this data source
+     * @param origin The textual description of the origin (example: "OpenStreetMap Server")
+     * @throws IllegalArgumentException if bounds is {@code null}
+     */
     public DataSource(Bounds bounds, String origin) {
+        CheckParameterUtil.ensureParameterNotNull(bounds, "bounds");
         this.bounds = bounds;
         this.origin = origin;
-        if (bounds == null)
-            throw new NullPointerException();
     }
 }

trunk/src/org/openstreetmap/josm/tools/XmlObjectParser.java

@@ -173 +173 @@
 
         private void setValue(Entry entry, String fieldName, String value) throws SAXException {
-            if (entry == null) {
-                throw new NullPointerException("entry cannot be null");
-            }
+            CheckParameterUtil.ensureParameterNotNull(entry, "entry");
             if (fieldName.equals("class") || fieldName.equals("default") || fieldName.equals("throw") || fieldName.equals("new") || fieldName.equals("null")) {
                 fieldName += "_";