Changeset 11043 in josm for trunk

Timestamp:

2016-09-23T20:27:32+02:00 (8 years ago)

Author:

Don-vip

Message:

see #13683 - display proper error message instead of throwing a RuntimeException

File:

• trunk/src/org/openstreetmap/josm/io/session/SessionReader.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/io/session/SessionReader.java

@@ -292 +292 @@
             return layerDependencies;
         }
+
+        @Override
+        public String toString() {
+            return "ImportSupport [layerName=" + layerName + ", layerIndex=" + layerIndex + ", layerDependencies="
+                    + layerDependencies + ", inZipPath=" + inZipPath + ']';
+        }
     }
 
@@ -489 +495 @@
                 try {
                     layer = imp.load(e, support, progressMonitor.createSubTaskMonitor(1, false));
-                } catch (IllegalDataException | IOException ex) {
+                    if (layer == null) {
+                        throw new IllegalStateException("Importer " + imp + " returned null for " + support);
+                    }
+                } catch (IllegalDataException | IllegalStateException | IOException ex) {
                     exception = ex;
                 }
@@ -511 +520 @@
                 }
 
-                if (layer == null) throw new RuntimeException();
                 layersMap.put(idx, layer);
             }