Changeset 584 in josm for trunk/src/org
- Timestamp:
- 2008-03-16T01:56:48+01:00 (17 years ago)
- Location:
- trunk/src/org/openstreetmap/josm
- Files:
-
- 1 deleted
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java
r298 r584 21 21 public static final int OSM = 0; 22 22 public static final int GPX = 1; 23 public static final int CSV = 2;24 23 25 24 public static ExtensionFileFilter[] filters = { 26 25 new ExtensionFileFilter("osm,xml", "osm", tr("OSM Server Files (.osm .xml)")), 27 26 new ExtensionFileFilter("gpx,gpx.gz", "gpx", tr("GPX Files (.gpx .gpx.gz)")), 28 new ExtensionFileFilter("csv,txt", "csv", tr("CSV Files (.csv .txt)")),29 27 }; 30 28 -
trunk/src/org/openstreetmap/josm/actions/OpenAction.java
r572 r584 73 73 OsmDataLayer layer = new OsmDataLayer(dataSet, file.getName(), file); 74 74 Main.main.addLayer(layer); 75 } else if (ExtensionFileFilter.filters[ExtensionFileFilter.CSV].acceptName(fn)) 76 JOptionPane.showMessageDialog(Main.parent, fn+": "+tr("CSV Data import for non-GPS data is not implemented yet.")); 75 } 77 76 else 78 77 JOptionPane.showMessageDialog(Main.parent, fn+": "+tr("Unknown file extension: {0}", fn.substring(file.getName().lastIndexOf('.')+1))); … … 85 84 if (file.getName().endsWith(".gpx.gz")) { 86 85 r = new GpxReader(new GZIPInputStream(new FileInputStream(file)), file.getAbsoluteFile().getParentFile()); 87 } else {86 } else { 88 87 r = new GpxReader(new FileInputStream(file), file.getAbsoluteFile().getParentFile()); 89 88 } -
trunk/src/org/openstreetmap/josm/actions/SaveActionBase.java
r516 r584 150 150 if (!Main.pref.getBoolean("save.keepbackup") && (tmpFile != null)) 151 151 tmpFile.delete(); 152 } else if (ExtensionFileFilter.filters[ExtensionFileFilter.CSV].acceptName(file.getPath())) {153 JOptionPane.showMessageDialog(Main.parent, tr("CSV output not supported yet."));154 return;155 152 } else { 156 153 JOptionPane.showMessageDialog(Main.parent, tr("Unknown file extension.")); … … 192 189 tmpFile.delete(); 193 190 } 194 } else if (ExtensionFileFilter.filters[ExtensionFileFilter.CSV].acceptName(file.getPath())) {195 JOptionPane.showMessageDialog(Main.parent, tr("CSV output not supported yet."));196 return;197 191 } else { 198 192 JOptionPane.showMessageDialog(Main.parent, tr("Unknown file extension.")); -
trunk/src/org/openstreetmap/josm/gui/MainApplication.java
r486 r584 148 148 "\t[--download=]minlat,minlon,maxlat,maxlon "+tr("Download the bounding box")+"\n"+ 149 149 "\t[--download=]<url> "+tr("Download the location at the url (with lat=x&lon=y&zoom=z)")+"\n"+ 150 "\t[--download=]<filename> "+tr("Open file (as raw gps, if .gpx or .csv)")+"\n"+150 "\t[--download=]<filename> "+tr("Open file (as raw gps, if .gpx)")+"\n"+ 151 151 "\t--downloadgps=minlat,minlon,maxlat,maxlon "+tr("Download the bounding box as raw gps")+"\n"+ 152 152 "\t--selection=<searchstring> "+tr("Select with the given search")+"\n"+ -
trunk/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java
r553 r584 104 104 settings.add(new MapPaintPreference()); 105 105 settings.add(new ServerAccessPreference()); 106 settings.add(new CsvPreference());107 106 settings.add(new FilePreferences()); 108 107 settings.add(new ProjectionPreference());
Note:
See TracChangeset
for help on using the changeset viewer.