Changeset 2001 in josm for trunk/src/org

Timestamp:

2009-08-29T11:08:38+02:00 (15 years ago)

Author:

Gubaer

Message:

applied #3319: patch by bastiK: "open" dialog now filters "OSM server files" first when 99% people use it for GPX files

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/DiskAccessAction.java (modified) (1 diff)
• actions/ExtensionFileFilter.java (modified) (3 diffs)
• io/OsmBzip2Importer.java (modified) (1 diff)

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

@@ -38 +38 @@
         for (FileImporter imExporter: ExtensionFileFilter.importers) {
             fc.addChoosableFileFilter(imExporter.filter);
-            if (imExporter.filter.defaultExtension.endsWith("osm")) {
+            if (imExporter instanceof ExtensionFileFilter.AllFormatsImporter) {
                 defaultFilter = imExporter.filter;
             }

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

@@ -1 +1 @@
 // License: GPL. Copyright 2007 by Immanuel Scholz and others
 package org.openstreetmap.josm.actions;
+
+import static org.openstreetmap.josm.tools.I18n.tr;
 
 import java.io.File;
@@ -31 +33 @@
     public final String defaultExtension;
 
+    /**
+     * list of supported formats
+     */
     public static ArrayList<FileImporter> importers = new ArrayList<FileImporter>(Arrays.asList(new OsmImporter(),
-            new OsmGzipImporter(), new OsmBzip2Importer(), new GpxImporter(), new NMEAImporter()));
+            new OsmGzipImporter(), new OsmBzip2Importer(), new GpxImporter(), new NMEAImporter(), new AllFormatsImporter()));
 
-    // list of supported export formats
     public static ArrayList<FileExporter> exporters = new ArrayList<FileExporter>(Arrays.asList(new GpxExporter(),
             new OsmExporter(), new OsmGzipExporter(), new OsmBzip2Exporter()));
-
+    
     /**
      * Construct an extension file filter by giving the extension to check after.
-     *
      */
     public ExtensionFileFilter(String extension, String defExt, String description) {
@@ -65 +68 @@
         return description;
     }
+    
+    /**
+     * Dummy importer that adds the "All Formats"-Filter when opening files
+     */
+    public static class AllFormatsImporter extends FileImporter {
+        public AllFormatsImporter() {
+            super(
+                new ExtensionFileFilter("osm,xml,osm.gz,osm.bz2,osm.bz,gpx,gpx.gz,nmea,nme,nma,txt", "", tr("All Formats")
+                        + " (*.gpx *.osm *.nmea ...)"));
+        }
+        @Override public boolean acceptFile(File pathname) {
+            return false;
+        }
+    }
 }

trunk/src/org/openstreetmap/josm/io/OsmBzip2Importer.java

@@ -16 +16 @@
 
     public OsmBzip2Importer() {
-        super(new ExtensionFileFilter("osm.bz2, osm.bz", "osm.bz2", tr("OSM Server Files bzip2 compressed")
+        super(new ExtensionFileFilter("osm.bz2,osm.bz", "osm.bz2", tr("OSM Server Files bzip2 compressed")
                 + " (*.osm.bz2 *.osm.bz)"));
     }