Changeset 8895 in josm
- Timestamp:
- 2015-10-18T13:00:40+02:00 (10 years ago)
- Location:
- trunk/src/org/openstreetmap/josm
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java
r8894 r8895 287 287 * @param defaultExtension The default extension 288 288 * @param description A short textual description of the file type without supported extensions in parentheses 289 * @param addArchiveExtensionsToDescription Whether to also add the archive extensions to the description 289 290 * @return The constructed filter 290 291 */ 291 public static ExtensionFileFilter newFilterWithArchiveExtensions(String extensions, String defaultExtension, String description) { 292 public static ExtensionFileFilter newFilterWithArchiveExtensions( 293 String extensions, String defaultExtension, String description, boolean addArchiveExtensionsToDescription) { 292 294 final Collection<String> extensionsPlusArchive = new LinkedHashSet<>(); 293 295 final Collection<String> extensionsForDescription = new LinkedHashSet<>(); … … 297 299 extensionsPlusArchive.add(e + ".bz2"); 298 300 extensionsForDescription.add("*." + e); 299 // intentionally do not add [e].gz and [e].bz2 to extensionsForDescription in order to avoid long texts 301 if (addArchiveExtensionsToDescription) { 302 extensionsForDescription.add("*." + e + ".gz"); 303 extensionsForDescription.add("*." + e + ".bz2"); 304 } 300 305 } 301 306 return new ExtensionFileFilter(Utils.join(",", extensionsPlusArchive), defaultExtension, -
trunk/src/org/openstreetmap/josm/io/GpxImporter.java
r7033 r8895 28 28 * The GPX file filter (*.gpx and *.gpx.gz files). 29 29 */ 30 public static final ExtensionFileFilter FILE_FILTER = newExtensionFileFilter(31 "gpx ,gpx.gz,gpx.bz2", "gpx", tr("GPX Files")+ " (*.gpx *.gpx.gz, *.gpx.bz2)");30 public static final ExtensionFileFilter FILE_FILTER = ExtensionFileFilter.newFilterWithArchiveExtensions( 31 "gpx", "gpx", tr("GPX Files"), true); 32 32 33 33 /** -
trunk/src/org/openstreetmap/josm/io/NMEAImporter.java
r8894 r8895 31 31 */ 32 32 public static final ExtensionFileFilter FILE_FILTER = ExtensionFileFilter.newFilterWithArchiveExtensions( 33 "nmea,nme,nma,log,txt", "nmea", tr("NMEA-0183 Files")); 33 "nmea,nme,nma,log,txt", "nmea", tr("NMEA-0183 Files"), false); 34 34 35 35 /** -
trunk/src/org/openstreetmap/josm/io/NoteImporter.java
r7870 r8895 18 18 19 19 /** 20 * File importer that reads note dump files (*.osn and .osn.bz2) 20 * File importer that reads note dump files (*.osn, .osn.gz and .osn.bz2) 21 21 * @since 7538 22 22 */ 23 23 public class NoteImporter extends FileImporter { 24 24 25 private static final ExtensionFileFilter FILE_FILTER = newExtensionFileFilter(26 "osn ,osn.bz2", "osn", tr("Note Files")+ " (*.osn *.osn.bz2)");25 private static final ExtensionFileFilter FILE_FILTER = ExtensionFileFilter.newFilterWithArchiveExtensions( 26 "osn", "osn", tr("Note Files"), true); 27 27 28 28 /** Create an importer for note dump files */ -
trunk/src/org/openstreetmap/josm/io/OsmChangeImporter.java
r8855 r8895 20 20 public class OsmChangeImporter extends FileImporter { 21 21 22 public static final ExtensionFileFilter FILE_FILTER = newExtensionFileFilter(23 "osc ,osc.bz2,osc.bz,osc.gz", "osc", tr("OsmChange File")+ " (*.osc *.osc.bz2 *.osc.bz *.osc.gz)");22 public static final ExtensionFileFilter FILE_FILTER = ExtensionFileFilter.newFilterWithArchiveExtensions( 23 "osc", "osc", tr("OsmChange File"), true); 24 24 25 25 /**
Note:
See TracChangeset
for help on using the changeset viewer.