Changeset 93 in josm for src/org/openstreetmap/josm/io

Timestamp:

2006-04-23T00:41:38+02:00 (19 years ago)

Author:

imi

Message:

• added "insert node into line segment" mapmode
• added direction hint to line segments

Location:

src/org/openstreetmap/josm/io

Files:

• ProgressReader.java (modified) (2 diffs)
• RawCsvReader.java (modified) (3 diffs)

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

@@ -4 +4 @@
 import java.io.InputStreamReader;
 import java.io.Reader;
-import java.net.HttpURLConnection;
+import java.net.URLConnection;
 
 import javax.swing.BoundedRangeModel;
@@ -17 +17 @@
         private final BoundedRangeModel progress;
 
-        public ProgressReader(HttpURLConnection con, BoundedRangeModel progress) throws IOException {
+        public ProgressReader(URLConnection con, BoundedRangeModel progress) throws IOException {
                 this.in = new InputStreamReader(con.getInputStream());
                 this.progress = progress;

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

@@ -31 +31 @@
         public Collection<GpsPoint> parse() throws JDOMException, IOException {
                 Collection<GpsPoint> data = new LinkedList<GpsPoint>();
-                String formatStr = Main.pref.get("csvImportString");
+                String formatStr = Main.pref.get("csv.importstring");
                 if (formatStr == null)
                         formatStr = in.readLine();
@@ -53 +53 @@
                 // test for completness
                 if (!format.contains("lat") || !format.contains("lon")) {
-                        if (Main.pref.get("csvImportString").equals(""))
+                        if (Main.pref.get("csv.importstring").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");
@@ -75 +75 @@
                                                 st.nextToken();
                                         else
-                                                throw new JDOMException("Unknown data type: '"+token+"'."+(Main.pref.get("csvImportString").equals("") ? " Maybe add an format string in preferences." : ""));
+                                                throw new JDOMException("Unknown data type: '"+token+"'."+(Main.pref.get("csv.importstring").equals("") ? " Maybe add an format string in preferences." : ""));
                                 }
                                 data.add(new GpsPoint(new LatLon(lat, lon), time));