Changeset 13647 in josm for trunk/src/org/openstreetmap/josm/tools/RightAndLefthandTraffic.java

Timestamp:

2018-04-19T20:37:16+02:00 (6 years ago)

Author:

Don-vip

Message:

see #16204 - Allow to start and close JOSM in WebStart sandbox mode (where every external access is denied). This was very useful to reproduce some very tricky bugs that occured in real life but were almost impossible to diagnose.

File:

• trunk/src/org/openstreetmap/josm/tools/RightAndLefthandTraffic.java (modified) (5 diffs)

trunk/src/org/openstreetmap/josm/tools/RightAndLefthandTraffic.java

@@ -25 +25 @@
 import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.data.osm.DownloadPolicy;
-import org.openstreetmap.josm.data.osm.UploadPolicy;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.Relation;
 import org.openstreetmap.josm.data.osm.RelationMember;
+import org.openstreetmap.josm.data.osm.UploadPolicy;
 import org.openstreetmap.josm.data.osm.Way;
 import org.openstreetmap.josm.io.IllegalDataException;
@@ -69 +69 @@
         if (optimizedWays.isEmpty()) {
             optimizedWays = computeOptimizedBoundaries();
-            saveOptimizedBoundaries(optimizedWays);
+            try {
+                saveOptimizedBoundaries(optimizedWays);
+            } catch (IOException | SecurityException e) {
+                Logging.log(Logging.LEVEL_ERROR, "Unable to save optimized boundaries", e);
+            }
         }
         rlCache = new GeoPropertyIndex<>(new DefaultGeoProperty(optimizedWays), 24);
@@ -154 +158 @@
     }
 
-    private static void saveOptimizedBoundaries(Collection<Way> optimizedWays) {
+    private static void saveOptimizedBoundaries(Collection<Way> optimizedWays) throws IOException {
         DataSet ds = optimizedWays.iterator().next().getDataSet();
         File file = new File(Config.getDirs().getCacheDirectory(true), "left-right-hand-traffic.osm");
@@ -163 +167 @@
             w.writeContent(ds);
             w.footer();
-        } catch (IOException ex) {
-            throw new JosmRuntimeException(ex);
         }
     }
@@ -172 +174 @@
                 Config.getDirs().getCacheDirectory(false).getPath(), "left-right-hand-traffic.osm"))) {
            return OsmReader.parseDataSet(is, null).getWays();
-        } catch (IllegalDataException | IOException | InvalidPathException ex) {
+        } catch (IllegalDataException | IOException | InvalidPathException | SecurityException ex) {
             Logging.trace(ex);
             return Collections.emptyList();