Changeset 11702 in josm for trunk/src/org/openstreetmap

Timestamp:

2017-03-08T21:18:57+01:00 (8 years ago)

Author:

Don-vip

Message:

more usages of Utils.clamp

Location:

trunk/src/org/openstreetmap/josm

Files:

• gui/layer/gpx/GpxDrawHelper.java (modified) (3 diffs)
• gui/mappaint/styleelement/NodeElement.java (modified) (1 diff)
• io/MultiFetchServerObjectReader.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/gui/layer/gpx/GpxDrawHelper.java

@@ -294 +294 @@
 
         // shrink to range
-        heatMapDrawGain = Math.min(Math.max(-10, heatMapDrawGain), 10);
+        heatMapDrawGain = Utils.clamp(heatMapDrawGain, -10, 10);
 
         neutralColor = getColor(layerName, true);
@@ -732 +732 @@
 
         // adjust global settings
-        final int globalLineWidth = Math.min(Math.max(lineWidth, 1), 20);
+        final int globalLineWidth = Utils.clamp(lineWidth, 1, 20);
 
         // cache scale of view
@@ -1157 +1157 @@
 
         // adjust global settings ( zero = default line width )
-        final int globalLineWidth = (0 == lineWidth) ? 1 : Math.min(Math.max(lineWidth, 1), 20);
+        final int globalLineWidth = (0 == lineWidth) ? 1 : Utils.clamp(lineWidth, 1, 20);
 
         // 1st setup virtual paint area ----------------------------------------

trunk/src/org/openstreetmap/josm/gui/mappaint/styleelement/NodeElement.java

@@ -184 +184 @@
         mapImage.offsetY = Math.round(offsetYF);
 
-        mapImage.alpha = Math.min(255, Math.max(0, Main.pref.getInteger("mappaint.icon-image-alpha", 255)));
+        mapImage.alpha = Utils.clamp(Main.pref.getInteger("mappaint.icon-image-alpha", 255), 0, 255);
         Integer pAlpha = Utils.colorFloat2int(c.get(keys[ICON_OPACITY_IDX], null, float.class));
         if (pAlpha != null) {

trunk/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java

@@ -323 +323 @@
         // we will run up to MAX_DOWNLOAD_THREADS concurrent fetchers.
         int threadsNumber = Main.pref.getInteger("osm.download.threads", OsmApi.MAX_DOWNLOAD_THREADS);
-        threadsNumber = Math.min(Math.max(threadsNumber, 1), OsmApi.MAX_DOWNLOAD_THREADS);
+        threadsNumber = Utils.clamp(threadsNumber, 1, OsmApi.MAX_DOWNLOAD_THREADS);
         final ExecutorService exec = Executors.newFixedThreadPool(
                 threadsNumber, Utils.newThreadFactory(getClass() + "-%d", Thread.NORM_PRIORITY));