refactorings + bugfixes

Author: lbalazscs

src/main/java/pixelitor/Composition.java

@@ -793,7 +793,7 @@ public void deleteInternal(Layer layer) {
 
     @Override
     public void reorderLayerUI(int oldIndex, int newIndex) {
-        view.reorderLayerInUI(oldIndex, newIndex);
+        view.reorderLayerUI(oldIndex, newIndex);
     }
 
     @Override
@@ -905,11 +905,6 @@ public Layer getActiveTopLevelLayer() {
         return activeTopLevelLayer;
     }
 
-    @Override
-    public int getActiveLayerIndex() {
-        return layerList.indexOf(activeTopLevelLayer);
-    }
-
     @Override
     public int indexOf(Layer layer) {
         return layerList.indexOf(layer);
@@ -926,7 +921,7 @@ public boolean listContainsLayer(Layer layer) {
     }
 
     @Override
-    public Stream<? extends Layer> levelStream() {
+    public Stream<? extends Layer> directChildrenStream() {
         return layerList.stream();
     }
 
@@ -954,9 +949,9 @@ public int getNumORAExportableImages() {
     }
 
     /**
-     * Calculates the total number of images in this composition including any mask images.
+     * Counts the total number of images in this composition including any mask images.
      */
-    public int calcNumImages() {
+    public int countImages() {
         int count = 0;
         for (Layer layer : layerList) {
             if (layer instanceof ImageLayer) {
@@ -1368,7 +1363,7 @@ public PixelitorEdit changeSelection(Shape newShape) {
         }
         Shape origShape = selection.getShape();
         selection.setShape(combinator.combine(origShape, newShape));
-        selection.setHidden(false, false);
+        selection.setHidden(false);
 
         return new SelectionShapeChangeEdit("Selection Change", this, origShape);
     }
@@ -1414,7 +1409,6 @@ public void setSelection(Selection selection) {
         this.selection = selection;
         if (isActive()) {
             SelectionActions.update(this);
-            SelectionActions.getShowHide().updateTextFrom(selection);
         }
     }
 

src/main/java/pixelitor/colors/FillType.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2024 Laszlo Balazs-Csiki and Contributors
+ * Copyright 2025 Laszlo Balazs-Csiki and Contributors
  *
  * This file is part of Pixelitor. Pixelitor is free software: you
  * can redistribute it and/or modify it under the terms of the GNU
@@ -72,6 +72,6 @@ public String toString() {
     }
 
     public FilterAction asFillFilterAction() {
-        return new FilterAction(displayName, () -> new Fill(this)).noGUI();
+        return new FilterAction(displayName, () -> new Fill(this)).withoutDialog();
     }
 }

src/main/java/pixelitor/compactions/EnlargeCanvasPanel.java

@@ -106,12 +106,6 @@ private record ListenerSubscription(RangeParam param, ChangeListener listener) {
             param.addChangeListener(listener);
         }
 
-        //        private ListenerSubscription(RangeParam param, ChangeListener listener) {
-//            this.param = param;
-//            this.listener = listener;
-//            param.addChangeListener(listener);
-//        }
-
         void unsubscribe() {
             param.removeChangeListener(listener);
         }
@@ -244,13 +238,8 @@ private void setUnit(ResizeUnit newUnit) {
         String cardName = switch (newUnit) {
             case PIXELS -> PIXEL_CARD;
             case PERCENTAGE -> PERCENT_CARD;
-            case CENTIMETERS -> null;
-            case INCHES -> null;
+            case CENTIMETERS, INCHES -> throw new IllegalArgumentException("newUnit = " + newUnit);
         };
-        if (cardName == null) {
-            // TODO: not supported yet
-            throw new IllegalArgumentException("newUnit = " + newUnit);
-        }
 
         showCard(northCardPanel, cardName);
         showCard(eastCardPanel, cardName);

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

@@ -83,7 +83,7 @@ public AbstractLights() {
 
         CompositeParam advancedParam = new CompositeParam("Advanced",
             hueRandomnessParam, whiteBlendParam, blurParam, speedParam, bounceParam);
-        advancedParam.setRandomizePolicy(IGNORE_RANDOMIZE);
+        advancedParam.setRandomizeMode(IGNORE_RANDOMIZE);
 
         CompositeParam starSettingsParam = new CompositeParam("Star Settings",
             starSizeParam, starCenterParam);

src/main/java/pixelitor/filters/ChannelMixer.java

@@ -257,11 +257,11 @@ public BufferedImage transform(BufferedImage src, BufferedImage dest) {
     // Replace the adjustment listeners with custom versions that
     // change other values before triggering the filter.
     public void replaceAdjustmentListeners() {
-        autoBWParam.setAdjustmentListener(this::updateAutoBW);
-        preserveBrightnessParam.setAdjustmentListener(this::updatePreserveBrightness);
+        autoBWParam.setAdjustmentListener(this::autoBWChanged);
+        preserveBrightnessParam.setAdjustmentListener(this::preserveBrightnessChanged);
     }
 
-    private void updateAutoBW() {
+    private void autoBWChanged() {
         boolean autoBW = autoBWParam.isChecked();
         enablePresets();
 
@@ -296,7 +296,7 @@ private void updateAutoBW() {
         }
     }
 
-    private void updatePreserveBrightness() {
+    private void preserveBrightnessChanged() {
         boolean preserveBrightness = preserveBrightnessParam.isChecked();
         boolean autoBW = autoBWParam.isChecked();
 

src/main/java/pixelitor/filters/ComplexFractal.java

@@ -67,7 +67,7 @@ protected ComplexFractal(int defaultIterations, float zoomX) {
             .min(2)
             .def(defaultIterations)
             .max(998)
-            .randomizePolicy(IGNORE_RANDOMIZE)
+            .randomizeMode(IGNORE_RANDOMIZE)
             .build();
 
         zoomParam.setPresetKey("Zoom");

src/main/java/pixelitor/filters/ConcentricShapes.java

@@ -170,7 +170,7 @@ public ConcentricShapes() {
             distanceParam,
             colorsParam,
             new CompositeParam("Transform", center, scale, rotate),
-            randomnessParam.withAction(reseedAction)
+            randomnessParam.withSideButton(reseedAction)
         ).withAction(FilterButtonModel.createExportSvg(this::exportSVG));
     }
 

src/main/java/pixelitor/filters/Filter.java

@@ -125,7 +125,7 @@ public boolean canBeSmart() {
     }
 
     /**
-     * Returns a string representation of the filter's parameters.
+     * Returns a string representation of the filter's parameters (for debugging).
      */
     public String paramsAsString() {
         return "";
@@ -187,6 +187,7 @@ public DebugNode createDebugNode(String key) {
 
     /**
      * Serialization proxy pattern as described in the "Effective Java" book.
+     * It decouples a filter's serialized form from its internal fields.
      */
     private static class SerializationProxy implements Serializable {
         @Serial

src/main/java/pixelitor/filters/Kuwahara.java

@@ -71,7 +71,7 @@ public BufferedImage transform(BufferedImage src, BufferedImage dest) {
     private static void apply(int[] srcPixels, int[] destPixels, int width, int height, int radius) {
         ProgressTracker pt = new StatusBarProgressTracker(NAME, height + 2);
 
-        // 1. pre-calculate brightness for all pixels
+        // pre-calculate brightness for all pixels
         float[][] brightnesses = new float[height][width];
         for (int y = 0; y < height; y++) {
             for (int x = 0; x < width; x++) {
@@ -80,15 +80,15 @@ private static void apply(int[] srcPixels, int[] destPixels, int width, int heig
         }
         pt.unitDone();
 
-        // 2. pre-compute integral images for sum and sum-of-squares.
+        // pre-compute integral images for sum and sum-of-squares
         double[][] integralSum = new double[height + 1][width + 1];
         double[][] integralSumSq = new double[height + 1][width + 1];
         computeIntegralImages(brightnesses, width, height, integralSum, integralSumSq);
         pt.unitDone();
 
         float[] hsv = new float[3];
 
-        // 3. main filter loop
+        // main filter loop
         for (int y = 0; y < height; y++) {
             for (int x = 0; x < width; x++) {
                 // find the mean brightness of the most homogeneous sub-region around the current pixel

src/main/java/pixelitor/filters/ParamTestFilter.java

@@ -73,7 +73,7 @@ public BufferedImage transform(BufferedImage src, BufferedImage dest) {
         List<String> lines = new ArrayList<>();
         for (FilterParam param : testParams) {
             String name = param.getName();
-            String value = param.getParamValue();
+            String value = param.getValueAsString();
             String line = name + " = " + value;
             lines.add(line);
         }