Changeset 29173 in osm for applications/viewer/jmapviewer/src/org/openstreetmap

Timestamp:

2013-01-06T00:01:47+01:00 (12 years ago)

Author:

the111

Message:

Second fix for #josm8321 - JMapViewer does not use parameter downloadThreadCount

Location:

applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer

Files:

• JMapViewer.java (modified) (1 diff)
• JobDispatcher.java (modified) (6 diffs)

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

@@ -106 +106 @@
     public JMapViewer(TileCache tileCache, int downloadThreadCount) {
         super();
-        JobDispatcher.WORKER_THREAD_MAX_COUNT = downloadThreadCount;
+        JobDispatcher.setMaxWorkers(downloadThreadCount);
         tileSource = new OsmTileSource.Mapnik();
         tileController = new TileController(tileSource, tileCache, this);

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

@@ -12 +12 @@
  * A generic class that processes a list of {@link Runnable} one-by-one using
  * one or more {@link Thread}-instances. The number of instances varies between
- * 1 and {@link #WORKER_THREAD_MAX_COUNT} (default: 8). If an instance is idle
- * more than {@link #WORKER_THREAD_TIMEOUT} seconds (default: 30), the instance
+ * 1 and {@link #workerThreadMaxCount} (default: 8). If an instance is idle
+ * more than {@link #workerThreadTimeout} seconds (default: 30), the instance
  * ends itself.
  *
@@ -35 +35 @@
     protected BlockingDeque<TileJob> jobQueue = new LinkedBlockingDeque<TileJob>();
 
-    public static int WORKER_THREAD_MAX_COUNT = 8;
+    protected static int workerThreadMaxCount = 8;
 
     /**
@@ -43 +43 @@
      * ignores the timeout and will never terminate itself.
      */
-    public static int WORKER_THREAD_TIMEOUT = 30;
+    protected static int workerThreadTimeout = 30;
 
     /**
@@ -76 +76 @@
      */
     static public void setMaxWorkers(int workers) {
-        WORKER_THREAD_MAX_COUNT = workers;
+        workerThreadMaxCount = workers;
     }
 
@@ -105 +105 @@
             }
             jobQueue.put(job);
-            if (workerThreadIdleCount == 0 && workerThreadCount < WORKER_THREAD_MAX_COUNT)
+            if (workerThreadIdleCount == 0 && workerThreadCount < workerThreadMaxCount)
                 addWorkerThread();
         } catch (InterruptedException e) {
@@ -149 +149 @@
                             job = jobQueue.takeLast();
                         else
-                            job = jobQueue.pollLast(WORKER_THREAD_TIMEOUT, TimeUnit.SECONDS);
+                            job = jobQueue.pollLast(workerThreadTimeout, TimeUnit.SECONDS);
                     } else {
                         if (firstThread)
                             job = jobQueue.take();
                         else
-                            job = jobQueue.poll(WORKER_THREAD_TIMEOUT, TimeUnit.SECONDS);
+                            job = jobQueue.poll(workerThreadTimeout, TimeUnit.SECONDS);
                     }
                 } catch (InterruptedException e1) {