Changeset 74 in josm for src/org/openstreetmap/josm/io/RawCsvReader.java

Timestamp:

2006-03-28T23:37:37+02:00 (18 years ago)

Author:

imi

Message:

changed Preferences system to more flexible one.

File:

• src/org/openstreetmap/josm/io/RawCsvReader.java (modified) (3 diffs)

src/org/openstreetmap/josm/io/RawCsvReader.java

@@ -30 +30 @@
         public Collection<LatLon> parse() throws JDOMException, IOException {
                 Collection<LatLon> data = new LinkedList<LatLon>();
-                String formatStr = Main.pref.csvImportString;
+                String formatStr = Main.pref.get("csvImportString");
                 if (formatStr == null)
                         formatStr = in.readLine();
@@ -52 +52 @@
                 // test for completness
                 if (!format.contains("lat") || !format.contains("lon")) {
-                        if (Main.pref.csvImportString != null)
-                                throw new JDOMException("Format string is incomplete. Need at least 'lat' and 'lon' specification");
-                        throw new JDOMException("Format string in data is incomplete or not found. Try setting an manual format string in Preferences.");
+                        if (Main.pref.get("csvImportString").equals(""))
+                                throw new JDOMException("Format string in data is incomplete or not found. Try setting an manual format string in Preferences.");
+                        throw new JDOMException("Format string is incomplete. Need at least 'lat' and 'lon' specification");
                 }
                 
@@ -71 +71 @@
                                                 st.nextToken();
                                         else
-                                                throw new JDOMException("Unknown data type: '"+token+"'."+(Main.pref.csvImportString == null ? " Maybe add an format string in preferences." : ""));
+                                                throw new JDOMException("Unknown data type: '"+token+"'."+(Main.pref.get("csvImportString").equals("") ? " Maybe add an format string in preferences." : ""));
                                 }
                                 data.add(new LatLon(lat, lon));