Index: /trunk/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java	(revision 583)
+++ /trunk/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java	(revision 584)
@@ -21,10 +21,8 @@
 	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)")),
 	};
 
Index: /trunk/src/org/openstreetmap/josm/actions/OpenAction.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/actions/OpenAction.java	(revision 583)
+++ /trunk/src/org/openstreetmap/josm/actions/OpenAction.java	(revision 584)
@@ -73,6 +73,5 @@
 	    	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,5 +84,5 @@
 			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());
 			}
Index: /trunk/src/org/openstreetmap/josm/actions/SaveActionBase.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/actions/SaveActionBase.java	(revision 583)
+++ /trunk/src/org/openstreetmap/josm/actions/SaveActionBase.java	(revision 584)
@@ -150,7 +150,4 @@
 				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,7 +189,4 @@
 					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."));
Index: /trunk/src/org/openstreetmap/josm/gui/MainApplication.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/MainApplication.java	(revision 583)
+++ /trunk/src/org/openstreetmap/josm/gui/MainApplication.java	(revision 584)
@@ -148,5 +148,5 @@
 					"\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"+
Index: unk/src/org/openstreetmap/josm/gui/preferences/CsvPreference.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/preferences/CsvPreference.java	(revision 583)
+++ 	(revision )
@@ -1,38 +1,0 @@
-// License: GPL. Copyright 2007 by Immanuel Scholz and others
-package org.openstreetmap.josm.gui.preferences;
-
-import static org.openstreetmap.josm.tools.I18n.tr;
-
-import javax.swing.JLabel;
-import javax.swing.JTextField;
-
-import org.openstreetmap.josm.Main;
-import org.openstreetmap.josm.tools.GBC;
-
-public class CsvPreference implements PreferenceSetting {
-
-	/**
-	 * Comma seperated import string specifier or <code>null</code> if the first
-	 * data line should be interpreted as one.
-	 */
-	private JTextField csvImportString = new JTextField(20);
-
-	public void addGui(PreferenceDialog gui) {
-		csvImportString.setText(Main.pref.get("csv.importstring"));
-		csvImportString.setToolTipText(tr("<html>Import string specification. lat/lon and time are imported.<br>" +
-				"<b>lat</b>: The latitude coordinate<br>" +
-				"<b>lon</b>: The longitude coordinate<br>" +
-				"<b>time</b>: The measured time as string<br>" +
-				"<b>ignore</b>: Skip this field<br>" +
-				"An example: \"ignore ignore lat lon\" will use ' ' as delimiter, skip the first two values and read then lat/lon.<br>" +
-		"Other example: \"lat,lon\" will just read lat/lon values comma seperated.</html>"));
-
-		gui.connection.add(new JLabel(tr("CSV import specification (empty: read from first line in data)")), GBC.eol());
-		gui.connection.add(csvImportString, GBC.eop().fill(GBC.HORIZONTAL));
-    }
-
-	public void ok() {
-		Main.pref.put("csv.importstring", csvImportString.getText());
-    }
-
-}
Index: /trunk/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java	(revision 583)
+++ /trunk/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java	(revision 584)
@@ -104,5 +104,4 @@
 		settings.add(new MapPaintPreference());
 		settings.add(new ServerAccessPreference());
-		settings.add(new CsvPreference());
 		settings.add(new FilePreferences());
 		settings.add(new ProjectionPreference());