Changeset 8602 in josm for trunk/src/org/openstreetmap/josm/tools

Timestamp:

2015-07-14T21:58:01+02:00 (10 years ago)

Author:

wiktorn

Message:

Properly handle file based tile sources.

• move getThreadFactory(String name) to Utils class, so it's easily usable across JOSM
• rollback changes in [8485]
• detect that we are working with filesystem TileSource in AbstractTileSourceLayer and if so, do not use JCS as caching mechanism, as tiles are already local
• change return value of getTileSourceInfo in AbstractTileSourceLayer to AbstractTMSTileSource, as this is anyway - lowest we can work with
• add test data for testing file base tile sources

closes: #11548

File:

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

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

@@ -46 +46 @@
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
+import java.util.concurrent.ThreadFactory;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
@@ -1370 +1371 @@
      * Returns the initial capacity to pass to the HashMap / HashSet constructor
      * when it is initialized with a known number of entries.
-     * 
+     *
      * When a HashMap is filled with entries, the underlying array is copied over
      * to a larger one multiple times. To avoid this process when the number of
@@ -1387 +1388 @@
      * Returns the initial capacity to pass to the HashMap / HashSet constructor
      * when it is initialized with a known number of entries.
-     * 
+     *
      * When a HashMap is filled with entries, the underlying array is copied over
      * to a larger one multiple times. To avoid this process when the number of
@@ -1393 +1394 @@
      * given to the HashMap constructor. This method returns a suitable value
      * that avoids rehashing but doesn't waste memory.
-     * 
+     *
      * Assumes default load factor (0.75).
      * @param nEntries the number of entries expected
@@ -1401 +1402 @@
         return hashMapInitialCapacity(nEntries, 0.75f);
     }
+
+    /**
+     * @param name to be set for the threads
+     * @return Thread Factory returning named threads
+     */
+    public static ThreadFactory getNamedThreadFactory(final String name) {
+        return new ThreadFactory() {
+            @Override
+            public Thread newThread(Runnable r) {
+                Thread t = Executors.defaultThreadFactory().newThread(r);
+                t.setName(name);
+                return t;
+            }
+        };
+    }
 }