Changeset 17913 in josm for trunk/src

Timestamp:

2021-05-25T15:54:33+02:00 (3 years ago)

Author:

simon04

Message:

fix 20239 - GeoJSONImporter: fix JsonException: Cannot auto-detect encoding, not enough chars

File:

• trunk/src/org/openstreetmap/josm/gui/io/importexport/GeoJSONImporter.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/gui/io/importexport/GeoJSONImporter.java

@@ -8 +8 @@
 import java.io.InputStream;
 import java.util.Arrays;
+import java.util.Locale;
 
+import javax.json.JsonException;
 import javax.swing.JOptionPane;
 
@@ -23 +25 @@
 import org.openstreetmap.josm.io.IllegalDataException;
 import org.openstreetmap.josm.tools.Logging;
+import org.openstreetmap.josm.tools.Utils;
 
 /**
@@ -52 +55 @@
             progressMonitor.worked(1);
             MainApplication.getLayerManager().addLayer(new OsmDataLayer(data, file.getName(), file));
-        } catch (IOException | IllegalArgumentException | IllegalDataException e) {
+        } catch (IOException | IllegalArgumentException | IllegalDataException | JsonException e) {
             Logging.error("Error while reading json file!");
             Logging.error(e);
-            GuiHelper.runInEDT(() -> JOptionPane.showMessageDialog(
-                null, tr("Error loading geojson file {0}", file.getAbsolutePath()), tr("Error"), JOptionPane.WARNING_MESSAGE));
+            String message = tr("Error loading geojson file {0}", file.getAbsolutePath())
+                    + tr(" ({0})", Utils.getSizeString(file.length(), Locale.getDefault()));
+            GuiHelper.runInEDT(() -> JOptionPane.showMessageDialog(null, message, tr("Error"), JOptionPane.WARNING_MESSAGE));
         } finally {
             progressMonitor.finishTask();