Changeset 584 in josm

Timestamp:

2008-03-16T01:56:48+01:00 (16 years ago)

Author:

framm

Message:

• be honest about the fact that we don't do CSV anymore. closes #641.

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/ExtensionFileFilter.java (modified) (1 diff)
• actions/OpenAction.java (modified) (2 diffs)
• actions/SaveActionBase.java (modified) (2 diffs)
• gui/MainApplication.java (modified) (1 diff)
• gui/preferences/CsvPreference.java (deleted)
• gui/preferences/PreferenceDialog.java (modified) (1 diff)

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

@@ -21 +21 @@
         public static final int OSM = 0;
         public static final int GPX = 1;
-        public static final int CSV = 2;
         
         public static ExtensionFileFilter[] filters = {
                 new ExtensionFileFilter("osm,xml", "osm", tr("OSM Server Files (.osm .xml)")),
                 new ExtensionFileFilter("gpx,gpx.gz", "gpx", tr("GPX Files (.gpx .gpx.gz)")),
-                new ExtensionFileFilter("csv,txt", "csv", tr("CSV Files (.csv .txt)")),
         };
 

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

@@ -73 +73 @@
                 OsmDataLayer layer = new OsmDataLayer(dataSet, file.getName(), file);
             Main.main.addLayer(layer);
-            } else if (ExtensionFileFilter.filters[ExtensionFileFilter.CSV].acceptName(fn))
-                JOptionPane.showMessageDialog(Main.parent, fn+": "+tr("CSV Data import for non-GPS data is not implemented yet."));
+            }
             else
                 JOptionPane.showMessageDialog(Main.parent, fn+": "+tr("Unknown file extension: {0}", fn.substring(file.getName().lastIndexOf('.')+1)));
@@ -85 +84 @@
                         if (file.getName().endsWith(".gpx.gz")) {
                                 r = new GpxReader(new GZIPInputStream(new FileInputStream(file)), file.getAbsoluteFile().getParentFile());
-                        } else{
+                        } else {
                                 r = new GpxReader(new FileInputStream(file), file.getAbsoluteFile().getParentFile());
                         }

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

@@ -150 +150 @@
                                 if (!Main.pref.getBoolean("save.keepbackup") && (tmpFile != null))
                                         tmpFile.delete();
-                        } else if (ExtensionFileFilter.filters[ExtensionFileFilter.CSV].acceptName(file.getPath())) {
-                                JOptionPane.showMessageDialog(Main.parent, tr("CSV output not supported yet."));
-                                return;
                         } else {
                                 JOptionPane.showMessageDialog(Main.parent, tr("Unknown file extension."));
@@ -192 +189 @@
                                         tmpFile.delete();
                                 }
-                        } else if (ExtensionFileFilter.filters[ExtensionFileFilter.CSV].acceptName(file.getPath())) {
-                                JOptionPane.showMessageDialog(Main.parent, tr("CSV output not supported yet."));
-                                return;
                         } else {
                                 JOptionPane.showMessageDialog(Main.parent, tr("Unknown file extension."));

trunk/src/org/openstreetmap/josm/gui/MainApplication.java

@@ -148 +148 @@
                                         "\t[--download=]minlat,minlon,maxlat,maxlon  "+tr("Download the bounding box")+"\n"+
                                         "\t[--download=]<url>                        "+tr("Download the location at the url (with lat=x&lon=y&zoom=z)")+"\n"+
-                                        "\t[--download=]<filename>                   "+tr("Open file (as raw gps, if .gpx or .csv)")+"\n"+
+                                        "\t[--download=]<filename>                   "+tr("Open file (as raw gps, if .gpx)")+"\n"+
                                         "\t--downloadgps=minlat,minlon,maxlat,maxlon "+tr("Download the bounding box as raw gps")+"\n"+
                                         "\t--selection=<searchstring>                "+tr("Select with the given search")+"\n"+

trunk/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java

@@ -104 +104 @@
                 settings.add(new MapPaintPreference());
                 settings.add(new ServerAccessPreference());
-                settings.add(new CsvPreference());
                 settings.add(new FilePreferences());
                 settings.add(new ProjectionPreference());