Changeset 7865 in josm


Ignore:
Timestamp:
2014-12-20T23:07:36+01:00 (5 years ago)
Author:
Don-vip
Message:

fix NPE, typo

Location:
trunk/src/org/openstreetmap/josm
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/org/openstreetmap/josm/actions/OpenFileAction.java

    r7859 r7865  
    199199             */
    200200            FileImporter chosenImporter = null;
    201             for (FileImporter importer : ExtensionFileFilter.importers) {
    202                 if (fileFilter.equals(importer.filter)) {
    203                     chosenImporter = importer;
     201            if (fileFilter != null) {
     202                for (FileImporter importer : ExtensionFileFilter.importers) {
     203                    if (fileFilter.equals(importer.filter)) {
     204                        chosenImporter = importer;
     205                    }
    204206                }
    205207            }
  • trunk/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java

    r7864 r7865  
    5353    /**
    5454     * Determines the OSM primitive type of the given object.
    55      * @param obj the S object to inspect
     55     * @param obj the OSM object to inspect
    5656     * @return the OSM primitive type of {@code obj}
    5757     * @throws IllegalArgumentException if {@code obj} is null or of unknown type
Note: See TracChangeset for help on using the changeset viewer.