fix: Made ColorModel property not null (now with default values).

bric3 · Mar 11, 2024 · 54fa280 · 54fa280
1 parent 02eb225
commit 54fa280
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 10 deletions.
diff --git a/fireplace-app/src/main/kotlin/io/github/bric3/fireplace/ui/FlamegraphPane.kt b/fireplace-app/src/main/kotlin/io/github/bric3/fireplace/ui/FlamegraphPane.kt
@@ -42,6 +42,7 @@ import java.util.stream.Collectors.toCollection
 import javax.swing.*
 import javax.swing.Timer
 
+@OptIn(ExperimentalStdlibApi::class)
 class FlamegraphPane : JPanel(BorderLayout()) {
     private var jfrFlamegraphView: FlamegraphView<Node>
     private var dataApplier: Consumer<FlamegraphView<Node>>? = null

diff --git a/fireplace-app/src/main/kotlin/io/github/bric3/fireplace/ui/toolkit/JPanelWithPainter.kt b/fireplace-app/src/main/kotlin/io/github/bric3/fireplace/ui/toolkit/JPanelWithPainter.kt
@@ -9,7 +9,6 @@
  */
 package io.github.bric3.fireplace.ui.toolkit
 
-import io.github.bric3.fireplace.ui.toolkit.Painter
 import java.awt.*
 import javax.swing.JPanel
 

diff --git a/...e-swing/src/main/java/io/github/bric3/fireplace/flamegraph/DimmingFrameColorProvider.java b/...e-swing/src/main/java/io/github/bric3/fireplace/flamegraph/DimmingFrameColorProvider.java
@@ -58,14 +58,14 @@ public class DimmingFrameColorProvider<T> implements FrameColorProvider<@NotNull
     /**
      * Single instance to avoid too many allocations, only for the main canvas.
      */
-    private final ColorModel reusedColorModelForMainCanvas = new ColorModel(null, null);
+    private final ColorModel reusedColorModelForMainCanvas = new ColorModel();
 
     /**
      * Single instance to avoid too many allocations, only for the minimap.
      * Since the minimap generation happens on a different thread, it is necessary
      * to have a separate instance.
      */
-    private final ColorModel reusedColorModelForMinimap = new ColorModel(null, null);
+    private final ColorModel reusedColorModelForMinimap = new ColorModel();
 
     private final ConcurrentHashMap<Color, Color> dimmedColorCache = new ConcurrentHashMap<>();
 
@@ -99,7 +99,10 @@ public ColorModel getColors(@NotNull FrameBox<@NotNull T> frame, int flags) {
 
         if (isMinimapMode(flags)) {
             // Since minimap rendering can happen in a separate thread, we need to use a separate instance
-            return reusedColorModelForMinimap.set(backgroundColor, null);
+            return reusedColorModelForMinimap.set(
+                    backgroundColor,
+                    ColorModel.DEFAULT_FRAME_FOREGROUND_COLOR // fg is unused when rendering minimap
+            );
         }
 
         if (!rootNode && shouldDim(flags)) {

diff --git a/fireplace-swing/src/main/java/io/github/bric3/fireplace/flamegraph/FrameColorProvider.java b/fireplace-swing/src/main/java/io/github/bric3/fireplace/flamegraph/FrameColorProvider.java
@@ -11,8 +11,8 @@
 
 import io.github.bric3.fireplace.core.ui.Colors;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
 
+import javax.swing.*;
 import java.awt.*;
 import java.util.Objects;
 import java.util.function.Function;
@@ -31,18 +31,28 @@
 @FunctionalInterface
 public interface FrameColorProvider<T> {
     class ColorModel {
-        @Nullable
+        public static Color DEFAULT_FRAME_BACKGROUND_COLOR = UIManager.getColor("Button.background");
+        public static Color DEFAULT_FRAME_FOREGROUND_COLOR = UIManager.getColor("Button.foreground");
+
+        @NotNull
         public Color background;
-        @Nullable
+        @NotNull
         public Color foreground;
 
+        /**
+         * Create a color model with the default colors.
+         */
+        public ColorModel() {
+            this(DEFAULT_FRAME_BACKGROUND_COLOR, DEFAULT_FRAME_FOREGROUND_COLOR);
+        }
+
         /**
          * Data-structure that hold the computed colors for a frame.
          *
          * @param background The background color of the frame.
          * @param foreground The foreground color of the frame.
          */
-        public ColorModel(@Nullable Color background, @Nullable Color foreground) {
+        public ColorModel(@NotNull Color background, @NotNull Color foreground) {
             this.background = background;
             this.foreground = foreground;
         }
@@ -55,7 +65,7 @@ public ColorModel(@Nullable Color background, @Nullable Color foreground) {
          * @return this
          */
         @NotNull
-        public ColorModel set(@Nullable Color background, @Nullable Color foreground) {
+        public ColorModel set(@NotNull Color background, @NotNull Color foreground) {
             this.background = background;
             this.foreground = foreground;
             return this;
@@ -90,7 +100,7 @@ public ColorModel copy() {
              */
             private final Color highlightedColor = new Color(0xFFFFE771, true);
 
-            private final ColorModel reusableDataStructure = new ColorModel(null, null);
+            private final ColorModel reusableDataStructure = new ColorModel();
 
             @Override
             @NotNull