Changeset 7865 in josm

Timestamp:

2014-12-20T23:07:36+01:00 (10 years ago)

Author:

Don-vip

Message:

fix NPE, typo

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/OpenFileAction.java (modified) (1 diff)
• data/osm/OsmPrimitiveType.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/actions/OpenFileAction.java

@@ -199 +199 @@
              */
             FileImporter chosenImporter = null;
-            for (FileImporter importer : ExtensionFileFilter.importers) {
-                if (fileFilter.equals(importer.filter)) {
-                    chosenImporter = importer;
+            if (fileFilter != null) {
+                for (FileImporter importer : ExtensionFileFilter.importers) {
+                    if (fileFilter.equals(importer.filter)) {
+                        chosenImporter = importer;
+                    }
                 }
             }

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

@@ -53 +53 @@
     /**
      * Determines the OSM primitive type of the given object.
-     * @param obj the S object to inspect
+     * @param obj the OSM object to inspect
      * @return the OSM primitive type of {@code obj}
      * @throws IllegalArgumentException if {@code obj} is null or of unknown type