Changeset 16769 in osm for applications/viewer

Timestamp:

2009-08-02T14:36:37+02:00 (15 years ago)

Author:

guggis

Message:

towards a fix for #3142: JOSM applet class no longer functional

File:

• applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/OsmFileCacheTileLoader.java (modified) (7 diffs)

applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/OsmFileCacheTileLoader.java

@@ -21 +21 @@
 import org.openstreetmap.gui.jmapviewer.interfaces.TileSource;
 import org.openstreetmap.gui.jmapviewer.interfaces.TileSource.TileUpdate;
+import static org.openstreetmap.josm.tools.I18n.tr;
 
 /**
@@ -53 +54 @@
      * @param cacheDir
      */
-    public OsmFileCacheTileLoader(TileLoaderListener map, File cacheDir) {
+    public OsmFileCacheTileLoader(TileLoaderListener map, File cacheDir) throws SecurityException{
         super(map);
-        String tempDir = System.getProperty("java.io.tmpdir");
+        String tempDir = null;
         String userName = System.getProperty("user.name");
         try {
+            tempDir = System.getProperty("java.io.tmpdir");
+        } catch(SecurityException e) {
+            log.warning(tr("Failed to access system property ''{0}'' for security reasons. Exception was: {1}", "java.io.tmpdir", e.toString()));
+            throw e; // rethrow
+        }
+        try {
             if (cacheDir == null) {
-                if (tempDir == null) {
+                if (tempDir == null)
                     throw new IOException("No temp directory set");
-                }
                 String subDirName = "JMapViewerTiles";
                 // On Linux/Unix systems we do not have a per user tmp directory. 
@@ -70 +76 @@
             }
             log.finest("Tile cache directory: " + cacheDir);
-            if (!cacheDir.exists() && !cacheDir.mkdirs()) {
+            if (!cacheDir.exists() && !cacheDir.mkdirs())
                 throw new IOException();
-            }
             cacheDirBase = cacheDir.getAbsolutePath();
         } catch (Exception e) {
@@ -80 +85 @@
 
     /**
-     * Create a OSMFileCacheTileLoader with system property temp dir. 
+     * Create a OSMFileCacheTileLoader with system property temp dir.
      * If not set an IOException will be thrown.
      * @param map
      */
-    public OsmFileCacheTileLoader(TileLoaderListener map) {
+    public OsmFileCacheTileLoader(TileLoaderListener map) throws SecurityException {
         this(map, null);
     }
 
+    @Override
     public Runnable createTileLoaderJob(final TileSource source, final int tilex, final int tiley, final int zoom) {
         return new FileLoadJob(source, tilex, tiley, zoom);
@@ -120 +126 @@
             }
             tileCacheDir = new File(cacheDirBase, source.getName());
-            if (!tileCacheDir.exists())
+            if (!tileCacheDir.exists()) {
                 tileCacheDir.mkdirs();
+            }
             if (loadTileFromFile())
                 return;
@@ -200 +207 @@
                 tile.setImage(Tile.ERROR_IMAGE);
                 listener.tileLoadingFinished(tile, false);
-                if (input == null)
+                if (input == null) {
                     System.err.println("failed loading " + zoom + "/" + tilex + "/" + tiley + " " + e.getMessage());
+                }
             } finally {
                 tile.loading = false;
@@ -249 +257 @@
             do {
                 int read = input.read(buffer);
-                if (read >= 0)
+                if (read >= 0) {
                     bout.write(buffer, 0, read);
-                else
+                } else {
                     finished = true;
+                }
             } while (!finished);
             if (bout.size() == 0)