Changeset 34475 in osm for applications/editors/josm/plugins/dataimport/src

Timestamp:

2018-08-15T13:29:06+02:00 (7 years ago)

Author:

donvip

Message:

update to JOSM 14153

Location:

applications/editors/josm/plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport

Files:

• DataImportPlugin.java (modified) (1 diff)
• io/TangoGPS.java (modified) (6 diffs)
• io/Tcx.java (modified) (3 diffs)

applications/editors/josm/plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/DataImportPlugin.java

@@ -18 +18 @@
      * Add new File import filter into open dialog
      * @param info plugin information
+     * @throws IOException in case of I/O error
      */
     public DataImportPlugin(PluginInformation info) throws IOException {

applications/editors/josm/plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java

@@ -10 +10 @@
 import java.io.InputStream;
 import java.io.InputStreamReader;
+import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.Collections;
@@ -16 +17 @@
 import javax.swing.JOptionPane;
 
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.actions.ExtensionFileFilter;
 import org.openstreetmap.josm.data.coor.LatLon;
@@ -27 +27 @@
 import org.openstreetmap.josm.gui.layer.markerlayer.MarkerLayer;
 import org.openstreetmap.josm.gui.progress.ProgressMonitor;
+import org.openstreetmap.josm.spi.preferences.Config;
 import org.openstreetmap.josm.tools.Logging;
 
@@ -55 +56 @@
         try (
             InputStream source = new FileInputStream(file);
-            BufferedReader rd = new BufferedReader(new InputStreamReader(source));
+            BufferedReader rd = new BufferedReader(new InputStreamReader(source, StandardCharsets.UTF_8));
          ) {
             String line;
@@ -83 +84 @@
                 GpxLayer gpxLayer = new GpxLayer(data, file.getName());
                 MainApplication.getLayerManager().addLayer(gpxLayer);
-                if (Main.pref.getBoolean("marker.makeautomarkers", true)) {
+                if (Config.getPref().getBoolean("marker.makeautomarkers", true)) {
                     MarkerLayer ml = new MarkerLayer(data, tr("Markers from {0}", file.getName()), file, gpxLayer);
                     if (ml.data.size() > 0) {
@@ -107 +108 @@
         String msg = tr("Coordinates imported: ") + success + " " + tr("Format errors: ") + failure + "\n";
         if (success > 0) {
-            JOptionPane.showMessageDialog(Main.parent, msg, tr("TangoGPS import success"), JOptionPane.INFORMATION_MESSAGE);
+            JOptionPane.showMessageDialog(MainApplication.getMainFrame(), msg, tr("TangoGPS import success"), JOptionPane.INFORMATION_MESSAGE);
         } else {
-            JOptionPane.showMessageDialog(Main.parent, msg, tr("TangoGPS import failure!"), JOptionPane.ERROR_MESSAGE);
+            JOptionPane.showMessageDialog(MainApplication.getMainFrame(), msg, tr("TangoGPS import failure!"), JOptionPane.ERROR_MESSAGE);
         }
     }

applications/editors/josm/plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/Tcx.java

@@ -16 +16 @@
 import javax.xml.datatype.XMLGregorianCalendar;
 
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.actions.ExtensionFileFilter;
 import org.openstreetmap.josm.data.coor.LatLon;
@@ -34 +33 @@
 import org.openstreetmap.josm.plugins.dataimport.io.tcx.TrackpointT;
 import org.openstreetmap.josm.plugins.dataimport.io.tcx.TrainingCenterDatabaseT;
+import org.openstreetmap.josm.spi.preferences.Config;
 
 
@@ -76 +76 @@
         GpxLayer gpxLayer = new GpxLayer(gpxData, tcxFile.getName());
         MainApplication.getLayerManager().addLayer(gpxLayer);
-        if (Main.pref.getBoolean("marker.makeautomarkers", true)) {
+        if (Config.getPref().getBoolean("marker.makeautomarkers", true)) {
             MarkerLayer ml = new MarkerLayer(gpxData, tr("Markers from {0}", tcxFile.getName()), tcxFile, gpxLayer);
             if (ml.data.size() > 0) {