small improvements

Author: lbalazscs

src/main/java/com/jhlabs/image/BrushedMetalFilter.java

@@ -19,7 +19,7 @@
 import net.jafama.FastMath;
 
 import java.awt.image.BufferedImage;
-import java.util.SplittableRandom;
+import java.util.random.RandomGenerator;
 
 /**
  * A filter which produces an image simulating brushed metal.
@@ -29,8 +29,7 @@ public class BrushedMetalFilter extends AbstractBufferedImageOp {
     private float amount = 0.1f;
     private int color = 0xff888888;
     private float shine = 0.1f;
-    private boolean monochrome = true;
-    private SplittableRandom random;
+    private RandomGenerator random;
 
     /**
      * Constructs a BrushedMetalFilter object.
@@ -42,19 +41,17 @@ public BrushedMetalFilter(String filterName) {
     /**
      * Constructs a BrushedMetalFilter object.
      *
-     * @param color      an int specifying the metal color
-     * @param radius     an int specifying the blur size
-     * @param amount     a float specifying the amount of texture
-     * @param monochrome a boolean -- true for monochrome texture
-     * @param shine      a float specifying the shine to add
+     * @param color  an int specifying the metal color
+     * @param radius an int specifying the blur size
+     * @param amount a float specifying the amount of texture
+     * @param shine  a float specifying the shine to add
      */
-    public BrushedMetalFilter(int color, int radius, float amount, boolean monochrome, float shine, String filterName) {
+    public BrushedMetalFilter(int color, int radius, float amount, float shine, String filterName) {
         super(filterName);
 
         this.color = color;
         this.radius = radius;
         this.amount = amount;
-        this.monochrome = monochrome;
         this.shine = shine;
     }
 
@@ -97,12 +94,8 @@ public BufferedImage filter(BufferedImage src, BufferedImage dst) {
                     tg += f;
                     tb += f;
                 }
-                if (monochrome) {
-                    int n = (int) (255 * (2 * random.nextDouble() - 1) * amount);
-                    inPixels[x] = a | (clamp(tr + n) << 16) | (clamp(tg + n) << 8) | clamp(tb + n);
-                } else {
-                    inPixels[x] = a | (random(tr) << 16) | (random(tg) << 8) | random(tb);
-                }
+                int n = (int) (255 * (2 * random.nextDouble() - 1) * amount);
+                inPixels[x] = a | (clamp(tr + n) << 16) | (clamp(tg + n) << 8) | clamp(tb + n);
             }
 
             if (radius != 0) {
@@ -230,16 +223,7 @@ public void setColor(int color) {
         this.color = color;
     }
 
-    /**
-     * Set the type of noise to add.
-     *
-     * @param monochrome true for monochrome noise
-     */
-    public void setMonochrome(boolean monochrome) {
-        this.monochrome = monochrome;
-    }
-
-    public void setRandom(SplittableRandom random) {
+    public void setRandom(RandomGenerator random) {
         this.random = random;
     }
 

src/main/java/pixelitor/filters/AbstractLights.java

@@ -99,7 +99,7 @@ public String toString() {
     public AbstractLights() {
         super(false);
 
-        // disable hue variation when complexity is 1 (single particle)
+        // disable hue variation when complexity is 1 (two particles)
         complexityParam.setupDisableOtherIf(hueRandomnessParam, value -> value == 1);
 
         // disable hue controls when fully white blend is selected
@@ -197,8 +197,7 @@ private List<Particle> createParticles(int width, int height, Random random, flo
             int x = random.nextInt(width);
             int y = random.nextInt(height);
             Color color = generateParticleColor(random, bri, baseHue, hueRandomness);
-            double rnd = random.nextDouble();
-            double angle = 2 * rnd * Math.PI;
+            double angle = 2 * random.nextDouble() * Math.PI;
 
             switch (type) {
                 case CHAOS, STAR -> particles.add(new Particle(x, y, speed, angle, color, bounce));
@@ -228,13 +227,13 @@ private void connectParticles(List<Particle> particles, int width, int height) {
     }
 
     /**
-     * Connects each particle to the previous one in the list, forming a chain.
+     * Connects particles in a closed chain, where each particle is linked to the previous one.
      */
     private static void connectInChain(List<Particle> particles) {
         int numParticles = particles.size();
         for (int i = 0; i < numParticles; i++) {
-            int siblingIndex = (i > 0) ? i - 1 : numParticles - 1;
-            particles.get(i).sibling = particles.get(siblingIndex);
+            int prevIndex = (i > 0) ? i - 1 : numParticles - 1;
+            particles.get(i).sibling = particles.get(prevIndex);
         }
     }
 

src/main/java/pixelitor/filters/AddNoise.java

@@ -27,7 +27,7 @@
 import java.awt.Color;
 import java.awt.image.BufferedImage;
 import java.io.Serial;
-import java.util.SplittableRandom;
+import java.util.random.RandomGenerator;
 
 import static pixelitor.gui.GUIText.OPACITY;
 import static pixelitor.utils.ImageUtils.isGrayscale;
@@ -69,18 +69,15 @@ public AddNoise() {
 
     @Override
     public BufferedImage transform(BufferedImage src, BufferedImage dest) {
-        SplittableRandom rand = paramSet.getLastSeedSRandom();
+        RandomGenerator rand = paramSet.getLastSeedSRandom();
 
-        if (isGrayscale(src)) {
-            return addNoiseToGray(src, dest, rand);
-        }
-
-        boolean coverageAnim = method.getValue() == METHOD_COVERAGE_ANIM;
-        return addNoiseToRGB(src, dest, coverageAnim, rand);
+        return isGrayscale(src)
+            ? addNoiseToGray(src, dest, rand)
+            : addNoiseToRGB(src, dest, rand);
     }
 
-    private BufferedImage addNoiseToRGB(BufferedImage src, BufferedImage dest,
-                                        boolean coverageAnim, SplittableRandom rand) {
+    private BufferedImage addNoiseToRGB(BufferedImage src, BufferedImage dest, RandomGenerator rand) {
+        boolean coverageAnim = method.getValue() == METHOD_COVERAGE_ANIM;
         int[] srcPixels = ImageUtils.getPixels(src);
         int[] destPixels = ImageUtils.getPixels(dest);
         int numPixels = destPixels.length;
@@ -124,8 +121,8 @@ private BufferedImage addNoiseToRGB(BufferedImage src, BufferedImage dest,
             }
 
             if (!coverageAnim) {
-                // If coverage animation isn't a requirement, then it is faster
-                // to generate the random values only here, for the covered pixels.
+                // if coverage animation isn't a requirement, then it is faster
+                // to generate the random values only here, for the covered pixels
                 randomInt = rand.nextInt();
             }
 
@@ -135,11 +132,11 @@ private BufferedImage addNoiseToRGB(BufferedImage src, BufferedImage dest,
 
                 if (fullOpacity) {
                     // if we have full saturation (the default), then we can
-                    // just use the random pixel as it is - if the opacity is also 100.
+                    // just use the random pixel as it is - if the opacity is also 100
                     destPixels[i] = randomInt;
                 } else {
-                    // ...or mix the random pixel with the source according to
-                    // the opacity
+                    // ...or mix the random pixel with the source
+                    // according to the opacity
                     destPixels[i] = ImageMath.mixColors(opacity, srcRGB, randomInt);
                 }
             } else { // desaturate the random pixel
@@ -167,7 +164,7 @@ private BufferedImage addNoiseToRGB(BufferedImage src, BufferedImage dest,
     }
 
     private BufferedImage addNoiseToGray(BufferedImage src, BufferedImage dest,
-                                         SplittableRandom rand) {
+                                         RandomGenerator rand) {
         byte[] srcPixels = ImageUtils.getGrayPixels(src);
         byte[] destPixels = ImageUtils.getGrayPixels(dest);
 

src/main/java/pixelitor/filters/Canny.java

@@ -19,6 +19,7 @@
 
 import pd.CannyEdgeDetector;
 import pixelitor.filters.gui.BooleanParam;
+import pixelitor.filters.gui.Help;
 import pixelitor.filters.gui.RangeParam;
 import pixelitor.utils.MemoryInfo;
 import pixelitor.utils.Messages;
@@ -64,7 +65,7 @@ public Canny() {
         );
         highThreshold.ensureHigherValueThan(lowThreshold);
 
-        helpURL = "https://en.wikipedia.org/wiki/Canny_edge_detector";
+        help = Help.fromWikiURL("https://en.wikipedia.org/wiki/Canny_edge_detector");
     }
 
     @Override