refactor: renamed Component(s) to Widget(s)

quintesse · quintesse · commit f6f151e163a5 · 2025-12-18T14:01:23.000+01:00
diff --git a/twinkle-ansi/src/main/java/org/codejive/twinkle/ansi/Style.java b/twinkle-ansi/src/main/java/org/codejive/twinkle/ansi/Style.java
@@ -73,9 +73,9 @@ public class Style {
      * Bits 1-8: Color index
      *
      * If color mode is RGB:
-     * Bits 1-8: Red component
-     * Bits 9-16: Green component
-     * Bits 17-24: Blue component
+     * Bits 1-8: Red widget
+     * Bits 9-16: Green widget
+     * Bits 17-24: Blue widget
      */
 
     private static final int SHIFT_FG_COLOR = 14;
diff --git a/twinkle-chart/src/main/java/org/codejive/twinkle/widgets/graphs/bar/Bar.java b/twinkle-chart/src/main/java/org/codejive/twinkle/widgets/graphs/bar/Bar.java
@@ -1,7 +1,7 @@
-package org.codejive.twinkle.components.graphs.bar;
+package org.codejive.twinkle.widgets.graphs.bar;
 
-import org.codejive.twinkle.core.component.Canvas;
-import org.codejive.twinkle.core.component.Renderable;
+import org.codejive.twinkle.core.widget.Canvas;
+import org.codejive.twinkle.core.widget.Renderable;
 
 public class Bar implements Renderable {
     private final FracBarRenderer renderer;
diff --git a/twinkle-chart/src/main/java/org/codejive/twinkle/widgets/graphs/bar/BarConfig.java b/twinkle-chart/src/main/java/org/codejive/twinkle/widgets/graphs/bar/BarConfig.java
@@ -1,4 +1,4 @@
-package org.codejive.twinkle.components.graphs.bar;
+package org.codejive.twinkle.widgets.graphs.bar;
 
 public class BarConfig {
     private Number minValue;
diff --git a/twinkle-chart/src/main/java/org/codejive/twinkle/widgets/graphs/bar/FracBarConfig.java b/twinkle-chart/src/main/java/org/codejive/twinkle/widgets/graphs/bar/FracBarConfig.java
@@ -1,4 +1,4 @@
-package org.codejive.twinkle.components.graphs.bar;
+package org.codejive.twinkle.widgets.graphs.bar;
 
 public class FracBarConfig extends BarConfig {
     private Design design;
diff --git a/twinkle-chart/src/main/java/org/codejive/twinkle/widgets/graphs/bar/FracBarRenderer.java b/twinkle-chart/src/main/java/org/codejive/twinkle/widgets/graphs/bar/FracBarRenderer.java
@@ -1,10 +1,10 @@
-package org.codejive.twinkle.components.graphs.bar;
+package org.codejive.twinkle.widgets.graphs.bar;
 
 import org.codejive.twinkle.ansi.Style;
-import org.codejive.twinkle.components.graphs.bar.BarConfig.*;
-import org.codejive.twinkle.components.graphs.bar.FracBarConfig.*;
-import org.codejive.twinkle.core.component.Canvas;
-import org.codejive.twinkle.core.component.Size;
+import org.codejive.twinkle.core.widget.Canvas;
+import org.codejive.twinkle.core.widget.Size;
+import org.codejive.twinkle.widgets.graphs.bar.BarConfig.*;
+import org.codejive.twinkle.widgets.graphs.bar.FracBarConfig.*;
 
 public class FracBarRenderer {
     private final FracBarConfig config;
diff --git a/twinkle-chart/src/main/java/org/codejive/twinkle/widgets/graphs/plot/MathPlot.java b/twinkle-chart/src/main/java/org/codejive/twinkle/widgets/graphs/plot/MathPlot.java
@@ -1,13 +1,13 @@
-package org.codejive.twinkle.components.graphs.plot;
+package org.codejive.twinkle.widgets.graphs.plot;
 
 import java.util.function.Function;
 import org.codejive.twinkle.ansi.Style;
-import org.codejive.twinkle.core.component.Canvas;
-import org.codejive.twinkle.core.component.Component;
-import org.codejive.twinkle.core.component.Size;
+import org.codejive.twinkle.core.widget.Canvas;
+import org.codejive.twinkle.core.widget.Size;
+import org.codejive.twinkle.core.widget.Widget;
 import org.jspecify.annotations.NonNull;
 
-public class MathPlot implements Component {
+public class MathPlot implements Widget {
     private final Plot plot;
     private Origin origin;
     private Number minXValue;
diff --git a/twinkle-chart/src/main/java/org/codejive/twinkle/widgets/graphs/plot/Plot.java b/twinkle-chart/src/main/java/org/codejive/twinkle/widgets/graphs/plot/Plot.java
@@ -1,13 +1,13 @@
-package org.codejive.twinkle.components.graphs.plot;
+package org.codejive.twinkle.widgets.graphs.plot;
 
 import org.codejive.twinkle.ansi.Style;
-import org.codejive.twinkle.core.component.Canvas;
-import org.codejive.twinkle.core.component.Component;
-import org.codejive.twinkle.core.component.Panel;
-import org.codejive.twinkle.core.component.Size;
+import org.codejive.twinkle.core.widget.Canvas;
+import org.codejive.twinkle.core.widget.Panel;
+import org.codejive.twinkle.core.widget.Size;
+import org.codejive.twinkle.core.widget.Widget;
 import org.jspecify.annotations.NonNull;
 
-public class Plot implements Component {
+public class Plot implements Widget {
     private final Canvas canvas;
     private final int cOrgX;
     private final int cOrgY;
diff --git a/twinkle-chart/src/test/java/examples/BarDemo.java b/twinkle-chart/src/test/java/examples/BarDemo.java
@@ -1,10 +1,10 @@
 package examples;
 
-import org.codejive.twinkle.components.graphs.bar.Bar;
-import org.codejive.twinkle.components.graphs.bar.BarConfig;
-import org.codejive.twinkle.components.graphs.bar.FracBarConfig;
-import org.codejive.twinkle.core.component.Canvas;
-import org.codejive.twinkle.core.component.Panel;
+import org.codejive.twinkle.core.widget.Canvas;
+import org.codejive.twinkle.core.widget.Panel;
+import org.codejive.twinkle.widgets.graphs.bar.Bar;
+import org.codejive.twinkle.widgets.graphs.bar.BarConfig;
+import org.codejive.twinkle.widgets.graphs.bar.FracBarConfig;
 
 public class BarDemo {
     public static void main(String[] args) {
diff --git a/twinkle-chart/src/test/java/examples/MathPlotDemo.java b/twinkle-chart/src/test/java/examples/MathPlotDemo.java
@@ -1,7 +1,7 @@
 package examples;
 
-import org.codejive.twinkle.components.graphs.plot.MathPlot;
-import org.codejive.twinkle.core.component.Panel;
+import org.codejive.twinkle.core.widget.Panel;
+import org.codejive.twinkle.widgets.graphs.plot.MathPlot;
 
 public class MathPlotDemo {
     public static void main(String[] args) {
diff --git a/twinkle-core/src/main/java/org/codejive/twinkle/core/component/Component.java b/twinkle-core/src/main/java/org/codejive/twinkle/core/component/Component.java
diff --git a/twinkle-core/src/main/java/org/codejive/twinkle/core/widget/Canvas.java b/twinkle-core/src/main/java/org/codejive/twinkle/core/widget/Canvas.java
@@ -1,4 +1,4 @@
-package org.codejive.twinkle.core.component;
+package org.codejive.twinkle.core.widget;
 
 import org.codejive.twinkle.ansi.Style;
 import org.codejive.twinkle.core.text.StyledCharSequence;
diff --git a/twinkle-core/src/main/java/org/codejive/twinkle/core/widget/FlexRect.java b/twinkle-core/src/main/java/org/codejive/twinkle/core/widget/FlexRect.java
@@ -1,4 +1,4 @@
-package org.codejive.twinkle.core.component;
+package org.codejive.twinkle.core.widget;
 
 import org.jspecify.annotations.NonNull;
 
diff --git a/twinkle-core/src/main/java/org/codejive/twinkle/core/widget/Panel.java b/twinkle-core/src/main/java/org/codejive/twinkle/core/widget/Panel.java
@@ -1,4 +1,4 @@
-package org.codejive.twinkle.core.component;
+package org.codejive.twinkle.core.widget;
 
 import org.codejive.twinkle.ansi.Style;
 import org.codejive.twinkle.core.text.StyledBuffer;
diff --git a/twinkle-core/src/main/java/org/codejive/twinkle/core/widget/PanelView.java b/twinkle-core/src/main/java/org/codejive/twinkle/core/widget/PanelView.java
@@ -1,4 +1,4 @@
-package org.codejive.twinkle.core.component;
+package org.codejive.twinkle.core.widget;
 
 public interface PanelView extends Panel {
     PanelView moveTo(int x, int y);
diff --git a/twinkle-core/src/main/java/org/codejive/twinkle/core/widget/Rect.java b/twinkle-core/src/main/java/org/codejive/twinkle/core/widget/Rect.java
@@ -1,4 +1,4 @@
-package org.codejive.twinkle.core.component;
+package org.codejive.twinkle.core.widget;
 
 import org.jspecify.annotations.NonNull;
 
diff --git a/twinkle-core/src/main/java/org/codejive/twinkle/core/widget/Rectangular.java b/twinkle-core/src/main/java/org/codejive/twinkle/core/widget/Rectangular.java
@@ -1,4 +1,4 @@
-package org.codejive.twinkle.core.component;
+package org.codejive.twinkle.core.widget;
 
 import org.jspecify.annotations.NonNull;
 
diff --git a/twinkle-core/src/main/java/org/codejive/twinkle/core/widget/Renderable.java b/twinkle-core/src/main/java/org/codejive/twinkle/core/widget/Renderable.java
@@ -1,4 +1,4 @@
-package org.codejive.twinkle.core.component;
+package org.codejive.twinkle.core.widget;
 
 public interface Renderable {
     void render(Canvas canvas);
diff --git a/twinkle-core/src/main/java/org/codejive/twinkle/core/widget/Size.java b/twinkle-core/src/main/java/org/codejive/twinkle/core/widget/Size.java
@@ -1,4 +1,4 @@
-package org.codejive.twinkle.core.component;
+package org.codejive.twinkle.core.widget;
 
 import java.util.Objects;
 import org.jspecify.annotations.NonNull;
diff --git a/twinkle-core/src/main/java/org/codejive/twinkle/core/widget/Sized.java b/twinkle-core/src/main/java/org/codejive/twinkle/core/widget/Sized.java
@@ -1,4 +1,4 @@
-package org.codejive.twinkle.core.component;
+package org.codejive.twinkle.core.widget;
 
 import org.jspecify.annotations.NonNull;
 
diff --git a/twinkle-core/src/main/java/org/codejive/twinkle/core/widget/StyledBufferPanel.java b/twinkle-core/src/main/java/org/codejive/twinkle/core/widget/StyledBufferPanel.java
@@ -1,4 +1,4 @@
-package org.codejive.twinkle.core.component;
+package org.codejive.twinkle.core.widget;
 
 import static org.codejive.twinkle.core.text.StyledBuffer.REPLACEMENT_CHAR;
 
diff --git a/twinkle-core/src/main/java/org/codejive/twinkle/core/widget/Widget.java b/twinkle-core/src/main/java/org/codejive/twinkle/core/widget/Widget.java
@@ -0,0 +1,5 @@
+package org.codejive.twinkle.core.widget;
+
+public interface Widget extends Sized {
+    void render();
+}
diff --git a/twinkle-core/src/main/java/org/codejive/twinkle/widgets/Frame.java b/twinkle-core/src/main/java/org/codejive/twinkle/widgets/Frame.java
@@ -1,12 +1,12 @@
-package org.codejive.twinkle.core.components;
+package org.codejive.twinkle.widgets;
 
-import org.codejive.twinkle.core.component.Canvas;
-import org.codejive.twinkle.core.component.Component;
-import org.codejive.twinkle.core.component.Panel;
-import org.codejive.twinkle.core.component.Size;
+import org.codejive.twinkle.core.widget.Canvas;
+import org.codejive.twinkle.core.widget.Panel;
+import org.codejive.twinkle.core.widget.Size;
+import org.codejive.twinkle.core.widget.Widget;
 import org.jspecify.annotations.NonNull;
 
-public class Frame implements Component {
+public class Frame implements Widget {
     private final Canvas canvas;
     private final Canvas innerCanvas;
 
diff --git a/twinkle-core/src/test/java/org/codejive/twinkle/core/text/TestPanel.java b/twinkle-core/src/test/java/org/codejive/twinkle/core/text/TestPanel.java
@@ -4,10 +4,10 @@
 
 import org.codejive.twinkle.ansi.Color;
 import org.codejive.twinkle.ansi.Style;
-import org.codejive.twinkle.core.component.Canvas;
-import org.codejive.twinkle.core.component.Panel;
-import org.codejive.twinkle.core.component.PanelView;
-import org.codejive.twinkle.core.component.Size;
+import org.codejive.twinkle.core.widget.Canvas;
+import org.codejive.twinkle.core.widget.Panel;
+import org.codejive.twinkle.core.widget.PanelView;
+import org.codejive.twinkle.core.widget.Size;
 import org.junit.jupiter.api.Test;
 
 public class TestPanel {
diff --git a/twinkle-tui/src/main/java/examples/FullPanel.java b/twinkle-tui/src/main/java/examples/FullPanel.java
@@ -6,7 +6,7 @@
 
 import java.io.IOException;
 import java.util.Collections;
-import org.codejive.twinkle.core.component.Canvas;
+import org.codejive.twinkle.core.widget.Canvas;
 import org.codejive.twinkle.tui.render.BorderRenderer;
 import org.codejive.twinkle.tui.render.Box;
 import org.codejive.twinkle.tui.terminal.Screen;
diff --git a/twinkle-tui/src/main/java/org/codejive/twinkle/tui/events/ResizeEvent.java b/twinkle-tui/src/main/java/org/codejive/twinkle/tui/events/ResizeEvent.java
@@ -1,6 +1,6 @@
 package org.codejive.twinkle.tui.events;
 
-import org.codejive.twinkle.core.component.Size;
+import org.codejive.twinkle.core.widget.Size;
 
 public class ResizeEvent<T> implements Event<T> {
     private final T target;
diff --git a/twinkle-tui/src/main/java/org/codejive/twinkle/tui/render/BorderRenderer.java b/twinkle-tui/src/main/java/org/codejive/twinkle/tui/render/BorderRenderer.java
@@ -1,7 +1,7 @@
 package org.codejive.twinkle.tui.render;
 
-import org.codejive.twinkle.core.component.Canvas;
-import org.codejive.twinkle.core.component.Rect;
+import org.codejive.twinkle.core.widget.Canvas;
+import org.codejive.twinkle.core.widget.Rect;
 import org.codejive.twinkle.tui.util.Util;
 import org.jline.utils.AttributedString;
 
diff --git a/twinkle-tui/src/main/java/org/codejive/twinkle/tui/render/Box.java b/twinkle-tui/src/main/java/org/codejive/twinkle/tui/render/Box.java
@@ -1,8 +1,8 @@
 package org.codejive.twinkle.tui.render;
 
 import java.util.List;
-import org.codejive.twinkle.core.component.Rect;
-import org.codejive.twinkle.core.component.Rectangular;
+import org.codejive.twinkle.core.widget.Rect;
+import org.codejive.twinkle.core.widget.Rectangular;
 import org.codejive.twinkle.tui.styles.Property;
 import org.codejive.twinkle.tui.styles.Style;
 import org.jline.utils.AttributedString;
diff --git a/twinkle-tui/src/main/java/org/codejive/twinkle/tui/render/BoxRenderer.java b/twinkle-tui/src/main/java/org/codejive/twinkle/tui/render/BoxRenderer.java
@@ -1,6 +1,6 @@
 package org.codejive.twinkle.tui.render;
 
-import org.codejive.twinkle.core.component.Canvas;
+import org.codejive.twinkle.core.widget.Canvas;
 import org.jline.utils.AttributedString;
 
 public class BoxRenderer {
diff --git a/twinkle-tui/src/main/java/org/codejive/twinkle/tui/terminal/Resizeable.java b/twinkle-tui/src/main/java/org/codejive/twinkle/tui/terminal/Resizeable.java
@@ -1,6 +1,6 @@
 package org.codejive.twinkle.tui.terminal;
 
-import org.codejive.twinkle.core.component.Size;
+import org.codejive.twinkle.core.widget.Size;
 
 public interface Resizeable {
     void onResize(Size newSize);
diff --git a/twinkle-tui/src/main/java/org/codejive/twinkle/tui/terminal/Screen.java b/twinkle-tui/src/main/java/org/codejive/twinkle/tui/terminal/Screen.java
@@ -1,6 +1,6 @@
 package org.codejive.twinkle.tui.terminal;
 
-import org.codejive.twinkle.core.component.Canvas;
+import org.codejive.twinkle.core.widget.Canvas;
 import org.codejive.twinkle.tui.events.EventTarget;
 
 public interface Screen extends Canvas, EventTarget, Resizeable {
diff --git a/twinkle-tui/src/main/java/org/codejive/twinkle/tui/terminal/Term.java b/twinkle-tui/src/main/java/org/codejive/twinkle/tui/terminal/Term.java
@@ -2,7 +2,7 @@
 
 import java.io.Flushable;
 import java.io.IOException;
-import org.codejive.twinkle.core.component.Size;
+import org.codejive.twinkle.core.widget.Size;
 import org.codejive.twinkle.tui.terminal.impl.JlineTerm;
 
 public interface Term extends Flushable, AutoCloseable, Resizeable {
diff --git a/twinkle-tui/src/main/java/org/codejive/twinkle/tui/terminal/impl/BufferedScreen.java b/twinkle-tui/src/main/java/org/codejive/twinkle/tui/terminal/impl/BufferedScreen.java
@@ -3,9 +3,9 @@
 import java.util.Arrays;
 import java.util.List;
 import java.util.stream.Collectors;
-import org.codejive.twinkle.core.component.FlexRect;
-import org.codejive.twinkle.core.component.Rect;
-import org.codejive.twinkle.core.component.Size;
+import org.codejive.twinkle.core.widget.FlexRect;
+import org.codejive.twinkle.core.widget.Rect;
+import org.codejive.twinkle.core.widget.Size;
 import org.codejive.twinkle.tui.events.EventEmitter;
 import org.codejive.twinkle.tui.events.ResizeEvent;
 import org.codejive.twinkle.terminal.*;
diff --git a/twinkle-tui/src/main/java/org/codejive/twinkle/tui/terminal/impl/JlineTerm.java b/twinkle-tui/src/main/java/org/codejive/twinkle/tui/terminal/impl/JlineTerm.java
@@ -1,7 +1,7 @@
 package org.codejive.twinkle.tui.terminal.impl;
 
 import java.io.IOException;
-import org.codejive.twinkle.core.component.Size;
+import org.codejive.twinkle.core.widget.Size;
 import org.codejive.twinkle.tui.events.EventEmitter;
 import org.codejive.twinkle.tui.events.EventTarget;
 import org.codejive.twinkle.tui.events.ResizeEvent;

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package org.codejive.twinkle.components.graphs.bar;`
	`1`	`+package org.codejive.twinkle.widgets.graphs.bar;`
`2`	`2`
`3`	`3`	`public class BarConfig {`
`4`	`4`	`private Number minValue;`