diff --git a/src/main/java/com/demcha/compose/document/templates/decorations/AccentStrip.java b/src/main/java/com/demcha/compose/document/templates/core/widgets/AccentStrip.java similarity index 98% rename from src/main/java/com/demcha/compose/document/templates/decorations/AccentStrip.java rename to src/main/java/com/demcha/compose/document/templates/core/widgets/AccentStrip.java index a17e78cea..0fa0ab45d 100644 --- a/src/main/java/com/demcha/compose/document/templates/decorations/AccentStrip.java +++ b/src/main/java/com/demcha/compose/document/templates/core/widgets/AccentStrip.java @@ -1,4 +1,4 @@ -package com.demcha.compose.document.templates.decorations; +package com.demcha.compose.document.templates.core.widgets; import com.demcha.compose.document.node.DocumentNode; import com.demcha.compose.document.node.ShapeNode; diff --git a/src/main/java/com/demcha/compose/document/templates/widgets/CardWidget.java b/src/main/java/com/demcha/compose/document/templates/core/widgets/CardWidget.java similarity index 99% rename from src/main/java/com/demcha/compose/document/templates/widgets/CardWidget.java rename to src/main/java/com/demcha/compose/document/templates/core/widgets/CardWidget.java index c7ec16574..256783d34 100644 --- a/src/main/java/com/demcha/compose/document/templates/widgets/CardWidget.java +++ b/src/main/java/com/demcha/compose/document/templates/core/widgets/CardWidget.java @@ -1,4 +1,4 @@ -package com.demcha.compose.document.templates.widgets; +package com.demcha.compose.document.templates.core.widgets; import com.demcha.compose.document.dsl.PageFlowBuilder; import com.demcha.compose.document.dsl.SectionBuilder; diff --git a/src/main/java/com/demcha/compose/document/templates/decorations/Divider.java b/src/main/java/com/demcha/compose/document/templates/core/widgets/Divider.java similarity index 98% rename from src/main/java/com/demcha/compose/document/templates/decorations/Divider.java rename to src/main/java/com/demcha/compose/document/templates/core/widgets/Divider.java index 7d8bc7fcf..788e3104e 100644 --- a/src/main/java/com/demcha/compose/document/templates/decorations/Divider.java +++ b/src/main/java/com/demcha/compose/document/templates/core/widgets/Divider.java @@ -1,4 +1,4 @@ -package com.demcha.compose.document.templates.decorations; +package com.demcha.compose.document.templates.core.widgets; import com.demcha.compose.document.node.DocumentNode; import com.demcha.compose.document.node.ShapeNode; diff --git a/src/main/java/com/demcha/compose/document/templates/decorations/Spacer.java b/src/main/java/com/demcha/compose/document/templates/core/widgets/Spacer.java similarity index 98% rename from src/main/java/com/demcha/compose/document/templates/decorations/Spacer.java rename to src/main/java/com/demcha/compose/document/templates/core/widgets/Spacer.java index b84d0138a..6dfbffaf8 100644 --- a/src/main/java/com/demcha/compose/document/templates/decorations/Spacer.java +++ b/src/main/java/com/demcha/compose/document/templates/core/widgets/Spacer.java @@ -1,4 +1,4 @@ -package com.demcha.compose.document.templates.decorations; +package com.demcha.compose.document.templates.core.widgets; import com.demcha.compose.document.node.DocumentNode; import com.demcha.compose.document.node.SpacerNode; diff --git a/src/main/java/com/demcha/compose/document/templates/widgets/TableWidget.java b/src/main/java/com/demcha/compose/document/templates/core/widgets/TableWidget.java similarity index 99% rename from src/main/java/com/demcha/compose/document/templates/widgets/TableWidget.java rename to src/main/java/com/demcha/compose/document/templates/core/widgets/TableWidget.java index 3869e5b2a..234080f34 100644 --- a/src/main/java/com/demcha/compose/document/templates/widgets/TableWidget.java +++ b/src/main/java/com/demcha/compose/document/templates/core/widgets/TableWidget.java @@ -1,4 +1,4 @@ -package com.demcha.compose.document.templates.widgets; +package com.demcha.compose.document.templates.core.widgets; import com.demcha.compose.document.dsl.SectionBuilder; import com.demcha.compose.document.style.DocumentColor; diff --git a/src/main/java/com/demcha/compose/document/templates/widgets/TimelineAxisWidget.java b/src/main/java/com/demcha/compose/document/templates/core/widgets/TimelineAxisWidget.java similarity index 99% rename from src/main/java/com/demcha/compose/document/templates/widgets/TimelineAxisWidget.java rename to src/main/java/com/demcha/compose/document/templates/core/widgets/TimelineAxisWidget.java index 3225c3dba..d58dcd463 100644 --- a/src/main/java/com/demcha/compose/document/templates/widgets/TimelineAxisWidget.java +++ b/src/main/java/com/demcha/compose/document/templates/core/widgets/TimelineAxisWidget.java @@ -1,4 +1,4 @@ -package com.demcha.compose.document.templates.widgets; +package com.demcha.compose.document.templates.core.widgets; import com.demcha.compose.document.dsl.SectionBuilder; import com.demcha.compose.document.style.DocumentColor; diff --git a/src/main/java/com/demcha/compose/document/templates/core/widgets/package-info.java b/src/main/java/com/demcha/compose/document/templates/core/widgets/package-info.java new file mode 100644 index 000000000..efe0981ea --- /dev/null +++ b/src/main/java/com/demcha/compose/document/templates/core/widgets/package-info.java @@ -0,0 +1,21 @@ +/** + *
Family-neutral, composable visual building blocks reusable by every + * template family — they make no CV / invoice / proposal assumptions and read + * only the document DSL plus a {@code BrandTheme}'s tokens.
+ * + *Generic widgets that are useful beyond CVs live in - * {@link com.demcha.compose.document.templates.widgets}; for example - * {@link com.demcha.compose.document.templates.widgets.TableWidget} + * {@link com.demcha.compose.document.templates.core.widgets}; for example + * {@link com.demcha.compose.document.templates.core.widgets.TableWidget} * provides configurable fixed-column and grid tables with border, * fill, zebra, padding, and typography options, while - * {@link com.demcha.compose.document.templates.widgets.CardWidget} + * {@link com.demcha.compose.document.templates.core.widgets.CardWidget} * provides a reusable styled card/container shell.
* *Each widget delegates internally to the lower-level renderers diff --git a/src/main/java/com/demcha/compose/document/templates/decorations/package-info.java b/src/main/java/com/demcha/compose/document/templates/decorations/package-info.java deleted file mode 100644 index 1d56a0ed7..000000000 --- a/src/main/java/com/demcha/compose/document/templates/decorations/package-info.java +++ /dev/null @@ -1,29 +0,0 @@ -/** - * Templates v2 decoration library — dividers, accent strips, panels, banners, ornaments. - * - *
Decorations are the visual artefacts (lines, strips, soft panels, - * coloured banners) that templates can attach between modules, around a - * header, or as the start/end of a module body. They are first-class - * components rather than baked-in composer logic, so any preset can mix - * and match them and consumers can reuse them in their own templates.
- * - *This package will be populated during Phase B of the Templates v2 - * migration with at least:
- * - *These widgets sit above the raw document DSL and below - * preset-specific composition. They are deliberately generic: CV, - * proposal, invoice, cover-letter, and future templates can reuse - * them without depending on a CV-only package.
- * - *Current shared widgets include configurable tables - * ({@link com.demcha.compose.document.templates.widgets.TableWidget}) - * and reusable card/container shells - * ({@link com.demcha.compose.document.templates.widgets.CardWidget}).
- */ -package com.demcha.compose.document.templates.widgets; diff --git a/src/test/java/com/demcha/compose/document/templates/decorations/AccentStripTest.java b/src/test/java/com/demcha/compose/document/templates/core/widgets/AccentStripTest.java similarity index 97% rename from src/test/java/com/demcha/compose/document/templates/decorations/AccentStripTest.java rename to src/test/java/com/demcha/compose/document/templates/core/widgets/AccentStripTest.java index 921823090..c53ac512f 100644 --- a/src/test/java/com/demcha/compose/document/templates/decorations/AccentStripTest.java +++ b/src/test/java/com/demcha/compose/document/templates/core/widgets/AccentStripTest.java @@ -1,4 +1,4 @@ -package com.demcha.compose.document.templates.decorations; +package com.demcha.compose.document.templates.core.widgets; import com.demcha.compose.document.node.DocumentNode; import com.demcha.compose.document.node.ShapeNode; diff --git a/src/test/java/com/demcha/compose/document/templates/decorations/DividerTest.java b/src/test/java/com/demcha/compose/document/templates/core/widgets/DividerTest.java similarity index 98% rename from src/test/java/com/demcha/compose/document/templates/decorations/DividerTest.java rename to src/test/java/com/demcha/compose/document/templates/core/widgets/DividerTest.java index afd3a8eae..ca18919c3 100644 --- a/src/test/java/com/demcha/compose/document/templates/decorations/DividerTest.java +++ b/src/test/java/com/demcha/compose/document/templates/core/widgets/DividerTest.java @@ -1,4 +1,4 @@ -package com.demcha.compose.document.templates.decorations; +package com.demcha.compose.document.templates.core.widgets; import com.demcha.compose.document.node.DocumentNode; import com.demcha.compose.document.node.ShapeNode; diff --git a/src/test/java/com/demcha/compose/document/templates/decorations/SpacerTest.java b/src/test/java/com/demcha/compose/document/templates/core/widgets/SpacerTest.java similarity index 97% rename from src/test/java/com/demcha/compose/document/templates/decorations/SpacerTest.java rename to src/test/java/com/demcha/compose/document/templates/core/widgets/SpacerTest.java index e9232900c..56f79cf7b 100644 --- a/src/test/java/com/demcha/compose/document/templates/decorations/SpacerTest.java +++ b/src/test/java/com/demcha/compose/document/templates/core/widgets/SpacerTest.java @@ -1,4 +1,4 @@ -package com.demcha.compose.document.templates.decorations; +package com.demcha.compose.document.templates.core.widgets; import com.demcha.compose.document.node.DocumentNode; import com.demcha.compose.document.node.SpacerNode; diff --git a/src/test/java/com/demcha/compose/document/templates/widgets/TableWidgetTest.java b/src/test/java/com/demcha/compose/document/templates/core/widgets/TableWidgetTest.java similarity index 98% rename from src/test/java/com/demcha/compose/document/templates/widgets/TableWidgetTest.java rename to src/test/java/com/demcha/compose/document/templates/core/widgets/TableWidgetTest.java index 652e13497..e85d854a4 100644 --- a/src/test/java/com/demcha/compose/document/templates/widgets/TableWidgetTest.java +++ b/src/test/java/com/demcha/compose/document/templates/core/widgets/TableWidgetTest.java @@ -1,4 +1,4 @@ -package com.demcha.compose.document.templates.widgets; +package com.demcha.compose.document.templates.core.widgets; import com.demcha.compose.GraphCompose; import com.demcha.compose.document.api.DocumentSession;