Changeset 9547 in josm for trunk/src/org/openstreetmap
- Timestamp:
- 2016-01-20T01:28:07+01:00 (9 years ago)
- Location:
- trunk/src/org/openstreetmap/josm
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java
r9537 r9547 299 299 * @return The constructed filter 300 300 */ 301 public static ExtensionFileFilter newFilterWithArchiveExtensions( 302 String extensions, String defaultExtension, Stringdescription, AddArchiveExtension addArchiveExtension, List<String> archiveExtensions) {301 public static ExtensionFileFilter newFilterWithArchiveExtensions(String extensions, String defaultExtension, 302 String description, AddArchiveExtension addArchiveExtension, List<String> archiveExtensions) { 303 303 final Collection<String> extensionsPlusArchive = new LinkedHashSet<>(); 304 304 final Collection<String> extensionsForDescription = new LinkedHashSet<>(); -
trunk/src/org/openstreetmap/josm/io/OsmImporter.java
r9537 r9547 26 26 */ 27 27 public static final ExtensionFileFilter FILE_FILTER = ExtensionFileFilter.newFilterWithArchiveExtensions( 28 "osm,xml", "osm", tr("OSM Server Files") + " (*.osm, *.osm.gz, *.osm.bz2, *.osm.zip, *.xml)", ExtensionFileFilter.AddArchiveExtension.NONE, Arrays.asList("gz", "bz", "bz2", "zip")); 28 "osm,xml", "osm", tr("OSM Server Files") + " (*.osm, *.osm.gz, *.osm.bz2, *.osm.zip, *.xml)", 29 ExtensionFileFilter.AddArchiveExtension.NONE, Arrays.asList("gz", "bz", "bz2", "zip")); 29 30 30 31 /**
Note:
See TracChangeset
for help on using the changeset viewer.