Changeset 28042 in osm for applications

Timestamp:

2012-03-11T15:30:19+01:00 (13 years ago)

Author:

oliverw

Message:

• Removed workaround for #6912.
• Inform user when option for importing markers is not set
• Fixed output

File:

• applications/editors/josm/plugins/ColumbusCSV/src/org/openstreetmap/josm/plugins/columbusCSV/ColumbusCSVImporter.java (modified) (2 diffs)

applications/editors/josm/plugins/ColumbusCSV/src/org/openstreetmap/josm/plugins/columbusCSV/ColumbusCSVImporter.java

@@ -59 +59 @@
                 }
 
-                progressMonitor.beginTask(String.format("Importing CSV file %s...",
+                progressMonitor.beginTask(String.format(tr("Importing CSV file '%s'..."),
                                 file.getName(), 4));
                 progressMonitor.setTicksCount(1);
@@ -90 +90 @@
 
                                 if (Main.pref.getBoolean("marker.makeautomarkers", true)) {
-                                        MarkerLayer ml = new MarkerLayer(gpxData, tr(
-                                                        "Markers from {0}", file.getName()), file, gpxLayer);
+                                        MarkerLayer ml = new MarkerLayer(gpxData, String.format(tr("Markers from %s"), file.getName()), file, gpxLayer);
                                         if (ml.data.size() > 0) {
                                                 Main.main.addLayer(ml);
+                                        } else {
+                                                System.err.println("Warning: File contains no markers.");
                                         }
-                                        
-                                        /* WORKAROUND (Bugfix: #6912): Set marker offset to 0.0 to avoid message "This is after the end of the recording" */ 
+                                        /* WORKAROUND (Bugfix: #6912): Set marker offset to 0.0 to avoid message "This is after the end of the recording"  
                                         for (Marker marker : ml.data) {
                                                 marker.offset = 0.0;                                            
-                                        }
+                                        }*/
+                                } else {
+                                        System.err.println("Warning: Option 'marker.makeautomarkers' is not set; audio marker layer is not created.");
                                 }
                         } catch (Exception e) {
                                 // catch and forward exception
+                                e.printStackTrace(System.err);
                                 throw new IllegalDataException(e);
                         } finally { // take care of monitor...