Changeset 8307 in josm for trunk/src/org/openstreetmap/josm/gui

Timestamp:

2015-05-02T00:38:57+02:00 (9 years ago)

Author:

bastiK

Message:

applied #10902 - TMS simultaneous connections (patch by wiktorn)

File:

• trunk/src/org/openstreetmap/josm/gui/preferences/imagery/TMSSettingsPanel.java (modified) (5 diffs)

trunk/src/org/openstreetmap/josm/gui/preferences/imagery/TMSSettingsPanel.java

@@ -33 +33 @@
     private final JSpinner maxElementsOnDisk;
     private final JSpinner maxConcurrentDownloads;
+    private final JSpinner maxDownloadsPerHost;
 
 
@@ -44 +45 @@
         maxElementsOnDisk = new JSpinner(new SpinnerNumberModel(TMSCachedTileLoader.MAX_OBJECTS_ON_DISK.get().intValue(), 0, Integer.MAX_VALUE, 1));
         maxConcurrentDownloads = new JSpinner(new SpinnerNumberModel(TMSCachedTileLoaderJob.THREAD_LIMIT.get().intValue(), 0, Integer.MAX_VALUE, 1));
+        maxDownloadsPerHost = new JSpinner(new SpinnerNumberModel(TMSCachedTileLoaderJob.HOST_LIMIT.get().intValue(), 0, Integer.MAX_VALUE, 1));
 
         add(new JLabel(tr("Auto zoom by default: ")), GBC.std());
@@ -73 +75 @@
         add(maxConcurrentDownloads, GBC.eol());
 
+        add(new JLabel(tr("Maximum concurrent downloads per host: ")), GBC.std());
+        add(GBC.glue(5, 0), GBC.std());
+        add(maxDownloadsPerHost, GBC.eol());
+
+
         add(new JLabel(tr("Maximum elements in disk cache: ")), GBC.std());
         add(GBC.glue(5, 0), GBC.std());
@@ -91 +98 @@
         this.maxElementsOnDisk.setValue(TMSCachedTileLoader.MAX_OBJECTS_ON_DISK.get());
         this.maxConcurrentDownloads.setValue(TMSCachedTileLoaderJob.THREAD_LIMIT.get());
+        this.maxDownloadsPerHost.setValue(TMSCachedTileLoaderJob.HOST_LIMIT.get());
     }
 
@@ -111 +119 @@
         TMSCachedTileLoader.MAX_OBJECTS_ON_DISK.put((Integer) this.maxElementsOnDisk.getValue());
 
-        if (!TMSCachedTileLoaderJob.THREAD_LIMIT.get().equals(this.maxConcurrentDownloads.getValue())) {
-            restartRequired = true;
-            TMSCachedTileLoaderJob.THREAD_LIMIT.put((Integer) this.maxConcurrentDownloads.getValue());
-        }
+        TMSCachedTileLoaderJob.THREAD_LIMIT.put((Integer) this.maxConcurrentDownloads.getValue());
+        TMSCachedTileLoaderJob.HOST_LIMIT.put((Integer) this.maxDownloadsPerHost.getValue());
+        TMSCachedTileLoaderJob.reconfigureDownloadDispatcher();
 
         if (!TMSLayer.PROP_TILECACHE_DIR.get().equals(this.tilecacheDir.getText())) {