Changeset 11287 in josm for trunk

Timestamp:

2016-11-19T16:38:29+01:00 (8 years ago)

Author:

michael2402

Message:

Fix #14004: Check range of thread count and image size.

File:

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

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

@@ -16 +16 @@
 import org.openstreetmap.josm.gui.layer.WMSLayer;
 import org.openstreetmap.josm.tools.GBC;
+import org.openstreetmap.josm.tools.Utils;
 
 /**
@@ -22 +23 @@
  */
 public class WMSSettingsPanel extends JPanel {
+
+    private static final int IMAGE_SIZE_MIN = 1;
+    private static final int IMAGE_SIZE_MAX = 4096;
+    private static final int THREADS_MIN = 1;
+    private static final int THREADS_MAX = 30;
 
     // WMS Settings
@@ -43 +49 @@
         add(Box.createHorizontalGlue(), GBC.eol().fill(GBC.HORIZONTAL));
         JLabel labelSimConn = new JLabel(tr("Simultaneous connections:"));
-        spinSimConn = new JSpinner(new SpinnerNumberModel(WMSCachedTileLoaderJob.THREAD_LIMIT.get().intValue(), 1, 30, 1));
+        int threadLimitValue = Utils.clamp(WMSCachedTileLoaderJob.THREAD_LIMIT.get(), THREADS_MIN, THREADS_MAX);
+        spinSimConn = new JSpinner(new SpinnerNumberModel(threadLimitValue, THREADS_MIN, THREADS_MAX, 1));
         labelSimConn.setLabelFor(spinSimConn);
         add(labelSimConn, GBC.std());
@@ -51 +58 @@
         // Tile size
         JLabel labelTileSize = new JLabel(tr("Tile size:"));
-        tileSize = new JSpinner(new SpinnerNumberModel(WMSLayer.PROP_IMAGE_SIZE.get().intValue(), 1, 4096, 128));
+        int tileSizeValue = Utils.clamp(WMSLayer.PROP_IMAGE_SIZE.get(), IMAGE_SIZE_MIN, IMAGE_SIZE_MAX);
+        tileSize = new JSpinner(new SpinnerNumberModel(tileSizeValue, IMAGE_SIZE_MIN, IMAGE_SIZE_MAX, 128));
         labelTileSize.setLabelFor(tileSize);
         add(labelTileSize, GBC.std());