From ec9f6c9d7b9435cfeede2975a51d8979014c06af Mon Sep 17 00:00:00 2001 From: DemchaAV Date: Wed, 1 Jul 2026 20:49:17 +0100 Subject: [PATCH] refactor(theme): move BusinessTheme out of the engine into examples-support MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit BusinessTheme and its token bundle (DocumentPalette / SpacingScale / TextScale / TablePreset) are a Gen-2 design-token surface no template takes anymore — only ~17 examples and 3 visual demo tests used it, as a standalone styling source. Move the whole subsystem into examples.support.theme so the engine's public API sheds it; behaviour is unchanged (same code and values, so example renders are identical). git-mv the 5 types + their 2 unit tests into examples.support.theme and repoint the 17 example imports. The 3 engine visual tests cannot import an examples type, so repoint them onto a small engine-test DemoStyles helper (these tests assert a valid render, not a pixel baseline). Drop document.theme from PublicApiNoEngineLeakTest's scan list and the document.api package-info public-API list, and reword the stale BusinessTheme mentions in the chart, layout, and template-api javadoc. Tests: ./mvnw verify javadoc:javadoc -pl . — 1378 tests, 0 failures, javadoc clean; examples compile + the moved unit tests pass; benchmarks + perf-smoke + examples-generation smoke (85) green. --- .../barcodes/BarcodeShowcaseExample.java | 2 +- .../features/charts/ChartShowcaseExample.java | 2 +- .../features/chrome/PdfChromeExample.java | 2 +- .../navigation/InPdfNavigationExample.java | 2 +- .../shapes/ShapeContainerExample.java | 2 +- .../features/tables/TableAdvancedExample.java | 2 +- .../features/text/EmojiShortcodeExample.java | 2 +- .../features/text/InlineHighlightExample.java | 2 +- .../features/text/InlineShapesExample.java | 2 +- .../features/text/InlineSvgIconExample.java | 2 +- .../text/RichTextShowcaseExample.java | 2 +- .../features/text/SectionPresetsExample.java | 2 +- .../transforms/TransformsExample.java | 2 +- .../flagships/BusinessReportExample.java | 2 +- .../flagships/FeatureCatalogExample.java | 2 +- .../flagships/MasterShowcaseExample.java | 2 +- .../support}/theme/BusinessTheme.java | 2 +- .../support}/theme/DocumentPalette.java | 2 +- .../examples/support}/theme/SpacingScale.java | 2 +- .../examples/support}/theme/TablePreset.java | 2 +- .../examples/support}/theme/TextScale.java | 2 +- .../examples/support/theme/package-info.java | 11 +++++ .../coverletter/CoverLetterFileExample.java | 2 +- .../support}/theme/BusinessThemeTest.java | 2 +- .../theme/DocumentPaletteBuilderTest.java | 2 +- .../compose/document/api/package-info.java | 3 +- .../compose/document/chart/ChartDefaults.java | 2 +- .../compose/document/chart/ChartTheme.java | 2 +- .../compose/document/layout/package-info.java | 2 +- .../templates/api/DocumentTemplate.java | 6 +-- .../compose/document/theme/package-info.java | 11 ----- .../PublicApiNoEngineLeakTest.java | 1 - .../com/demcha/testing/visual/DemoStyles.java | 40 +++++++++++++++++++ .../demcha/testing/visual/DevelopTest.java | 14 +++---- .../testing/visual/LayerStackRowDemoTest.java | 14 +++---- .../visual/UnicodeFallbackDemoTest.java | 10 ++--- 36 files changed, 97 insertions(+), 67 deletions(-) rename {src/main/java/com/demcha/compose/document => examples/src/main/java/com/demcha/examples/support}/theme/BusinessTheme.java (99%) rename {src/main/java/com/demcha/compose/document => examples/src/main/java/com/demcha/examples/support}/theme/DocumentPalette.java (99%) rename {src/main/java/com/demcha/compose/document => examples/src/main/java/com/demcha/examples/support}/theme/SpacingScale.java (98%) rename {src/main/java/com/demcha/compose/document => examples/src/main/java/com/demcha/examples/support}/theme/TablePreset.java (96%) rename {src/main/java/com/demcha/compose/document => examples/src/main/java/com/demcha/examples/support}/theme/TextScale.java (97%) create mode 100644 examples/src/main/java/com/demcha/examples/support/theme/package-info.java rename {src/test/java/com/demcha/compose/document => examples/src/test/java/com/demcha/examples/support}/theme/BusinessThemeTest.java (99%) rename {src/test/java/com/demcha/compose/document => examples/src/test/java/com/demcha/examples/support}/theme/DocumentPaletteBuilderTest.java (99%) delete mode 100644 src/main/java/com/demcha/compose/document/theme/package-info.java create mode 100644 src/test/java/com/demcha/testing/visual/DemoStyles.java diff --git a/examples/src/main/java/com/demcha/examples/features/barcodes/BarcodeShowcaseExample.java b/examples/src/main/java/com/demcha/examples/features/barcodes/BarcodeShowcaseExample.java index 77828f30e..1659a2b13 100644 --- a/examples/src/main/java/com/demcha/examples/features/barcodes/BarcodeShowcaseExample.java +++ b/examples/src/main/java/com/demcha/examples/features/barcodes/BarcodeShowcaseExample.java @@ -10,7 +10,7 @@ import com.demcha.compose.document.style.DocumentInsets; import com.demcha.compose.document.style.DocumentStroke; import com.demcha.compose.document.style.DocumentTextStyle; -import com.demcha.compose.document.theme.BusinessTheme; +import com.demcha.examples.support.theme.BusinessTheme; import com.demcha.compose.font.FontName; import com.demcha.examples.support.ExampleOutputPaths; diff --git a/examples/src/main/java/com/demcha/examples/features/charts/ChartShowcaseExample.java b/examples/src/main/java/com/demcha/examples/features/charts/ChartShowcaseExample.java index 9c3de4160..0e1cd7533 100644 --- a/examples/src/main/java/com/demcha/examples/features/charts/ChartShowcaseExample.java +++ b/examples/src/main/java/com/demcha/examples/features/charts/ChartShowcaseExample.java @@ -19,7 +19,7 @@ import com.demcha.compose.document.style.DocumentCornerRadius; import com.demcha.compose.document.style.DocumentInsets; import com.demcha.compose.document.style.DocumentStroke; -import com.demcha.compose.document.theme.BusinessTheme; +import com.demcha.examples.support.theme.BusinessTheme; import com.demcha.examples.support.ExampleOutputPaths; import java.nio.file.Path; diff --git a/examples/src/main/java/com/demcha/examples/features/chrome/PdfChromeExample.java b/examples/src/main/java/com/demcha/examples/features/chrome/PdfChromeExample.java index 97b8aeac5..268709602 100644 --- a/examples/src/main/java/com/demcha/examples/features/chrome/PdfChromeExample.java +++ b/examples/src/main/java/com/demcha/examples/features/chrome/PdfChromeExample.java @@ -13,7 +13,7 @@ import com.demcha.compose.document.style.DocumentColor; import com.demcha.compose.document.style.DocumentInsets; import com.demcha.compose.document.style.DocumentTextStyle; -import com.demcha.compose.document.theme.BusinessTheme; +import com.demcha.examples.support.theme.BusinessTheme; import com.demcha.compose.font.FontName; import com.demcha.examples.support.ExampleOutputPaths; diff --git a/examples/src/main/java/com/demcha/examples/features/navigation/InPdfNavigationExample.java b/examples/src/main/java/com/demcha/examples/features/navigation/InPdfNavigationExample.java index 297590c44..0ccbe0336 100644 --- a/examples/src/main/java/com/demcha/examples/features/navigation/InPdfNavigationExample.java +++ b/examples/src/main/java/com/demcha/examples/features/navigation/InPdfNavigationExample.java @@ -9,7 +9,7 @@ import com.demcha.compose.document.style.DocumentInsets; import com.demcha.compose.document.style.DocumentTextStyle; import com.demcha.compose.document.style.ShapeOutline; -import com.demcha.compose.document.theme.BusinessTheme; +import com.demcha.examples.support.theme.BusinessTheme; import com.demcha.compose.font.FontName; import com.demcha.examples.support.ExampleOutputPaths; diff --git a/examples/src/main/java/com/demcha/examples/features/shapes/ShapeContainerExample.java b/examples/src/main/java/com/demcha/examples/features/shapes/ShapeContainerExample.java index 4ad72bdb5..d9fd8038c 100644 --- a/examples/src/main/java/com/demcha/examples/features/shapes/ShapeContainerExample.java +++ b/examples/src/main/java/com/demcha/examples/features/shapes/ShapeContainerExample.java @@ -17,7 +17,7 @@ import com.demcha.compose.document.style.DocumentStroke; import com.demcha.compose.document.style.DocumentTextDecoration; import com.demcha.compose.document.style.DocumentTextStyle; -import com.demcha.compose.document.theme.BusinessTheme; +import com.demcha.examples.support.theme.BusinessTheme; import com.demcha.compose.font.FontName; import com.demcha.examples.support.ExampleOutputPaths; diff --git a/examples/src/main/java/com/demcha/examples/features/tables/TableAdvancedExample.java b/examples/src/main/java/com/demcha/examples/features/tables/TableAdvancedExample.java index 9f655ceb6..4e7a5bae6 100644 --- a/examples/src/main/java/com/demcha/examples/features/tables/TableAdvancedExample.java +++ b/examples/src/main/java/com/demcha/examples/features/tables/TableAdvancedExample.java @@ -12,7 +12,7 @@ import com.demcha.compose.document.table.DocumentTableCell; import com.demcha.compose.document.table.DocumentTableColumn; import com.demcha.compose.document.table.DocumentTableStyle; -import com.demcha.compose.document.theme.BusinessTheme; +import com.demcha.examples.support.theme.BusinessTheme; import com.demcha.compose.font.FontName; import com.demcha.examples.support.ExampleOutputPaths; diff --git a/examples/src/main/java/com/demcha/examples/features/text/EmojiShortcodeExample.java b/examples/src/main/java/com/demcha/examples/features/text/EmojiShortcodeExample.java index d72aab13b..7b85ecc73 100644 --- a/examples/src/main/java/com/demcha/examples/features/text/EmojiShortcodeExample.java +++ b/examples/src/main/java/com/demcha/examples/features/text/EmojiShortcodeExample.java @@ -8,7 +8,7 @@ import com.demcha.compose.document.style.DocumentColor; import com.demcha.compose.document.style.DocumentInsets; import com.demcha.compose.document.style.DocumentTextStyle; -import com.demcha.compose.document.theme.BusinessTheme; +import com.demcha.examples.support.theme.BusinessTheme; import com.demcha.compose.font.FontName; import com.demcha.examples.support.ExampleOutputPaths; diff --git a/examples/src/main/java/com/demcha/examples/features/text/InlineHighlightExample.java b/examples/src/main/java/com/demcha/examples/features/text/InlineHighlightExample.java index c983e8ee1..c5f7ad1ba 100644 --- a/examples/src/main/java/com/demcha/examples/features/text/InlineHighlightExample.java +++ b/examples/src/main/java/com/demcha/examples/features/text/InlineHighlightExample.java @@ -8,7 +8,7 @@ import com.demcha.compose.document.style.DocumentColor; import com.demcha.compose.document.style.DocumentInsets; import com.demcha.compose.document.style.DocumentTextStyle; -import com.demcha.compose.document.theme.BusinessTheme; +import com.demcha.examples.support.theme.BusinessTheme; import com.demcha.compose.font.FontName; import com.demcha.examples.support.ExampleOutputPaths; diff --git a/examples/src/main/java/com/demcha/examples/features/text/InlineShapesExample.java b/examples/src/main/java/com/demcha/examples/features/text/InlineShapesExample.java index 9b9b9e431..4a442f515 100644 --- a/examples/src/main/java/com/demcha/examples/features/text/InlineShapesExample.java +++ b/examples/src/main/java/com/demcha/examples/features/text/InlineShapesExample.java @@ -10,7 +10,7 @@ import com.demcha.compose.document.style.DocumentStroke; import com.demcha.compose.document.style.DocumentTextStyle; import com.demcha.compose.document.style.ShapeOutline; -import com.demcha.compose.document.theme.BusinessTheme; +import com.demcha.examples.support.theme.BusinessTheme; import com.demcha.compose.font.FontName; import com.demcha.examples.support.ExampleOutputPaths; diff --git a/examples/src/main/java/com/demcha/examples/features/text/InlineSvgIconExample.java b/examples/src/main/java/com/demcha/examples/features/text/InlineSvgIconExample.java index 3b5f3754e..0f1c775bb 100644 --- a/examples/src/main/java/com/demcha/examples/features/text/InlineSvgIconExample.java +++ b/examples/src/main/java/com/demcha/examples/features/text/InlineSvgIconExample.java @@ -9,7 +9,7 @@ import com.demcha.compose.document.style.DocumentInsets; import com.demcha.compose.document.style.DocumentTextStyle; import com.demcha.compose.document.svg.SvgIcon; -import com.demcha.compose.document.theme.BusinessTheme; +import com.demcha.examples.support.theme.BusinessTheme; import com.demcha.compose.font.FontName; import com.demcha.examples.support.ExampleOutputPaths; diff --git a/examples/src/main/java/com/demcha/examples/features/text/RichTextShowcaseExample.java b/examples/src/main/java/com/demcha/examples/features/text/RichTextShowcaseExample.java index 38b357253..e2635499a 100644 --- a/examples/src/main/java/com/demcha/examples/features/text/RichTextShowcaseExample.java +++ b/examples/src/main/java/com/demcha/examples/features/text/RichTextShowcaseExample.java @@ -8,7 +8,7 @@ import com.demcha.compose.document.style.DocumentStroke; import com.demcha.compose.document.style.DocumentTextStyle; import com.demcha.compose.document.style.ShapeOutline; -import com.demcha.compose.document.theme.BusinessTheme; +import com.demcha.examples.support.theme.BusinessTheme; import com.demcha.compose.font.FontName; import com.demcha.examples.support.ExampleOutputPaths; diff --git a/examples/src/main/java/com/demcha/examples/features/text/SectionPresetsExample.java b/examples/src/main/java/com/demcha/examples/features/text/SectionPresetsExample.java index 9400d63fa..48319f293 100644 --- a/examples/src/main/java/com/demcha/examples/features/text/SectionPresetsExample.java +++ b/examples/src/main/java/com/demcha/examples/features/text/SectionPresetsExample.java @@ -8,7 +8,7 @@ import com.demcha.compose.document.style.DocumentInsets; import com.demcha.compose.document.style.DocumentStroke; import com.demcha.compose.document.style.DocumentTextStyle; -import com.demcha.compose.document.theme.BusinessTheme; +import com.demcha.examples.support.theme.BusinessTheme; import com.demcha.compose.font.FontName; import com.demcha.examples.support.ExampleOutputPaths; diff --git a/examples/src/main/java/com/demcha/examples/features/transforms/TransformsExample.java b/examples/src/main/java/com/demcha/examples/features/transforms/TransformsExample.java index fe1b6152a..b73eb591d 100644 --- a/examples/src/main/java/com/demcha/examples/features/transforms/TransformsExample.java +++ b/examples/src/main/java/com/demcha/examples/features/transforms/TransformsExample.java @@ -13,7 +13,7 @@ import com.demcha.compose.document.style.DocumentStroke; import com.demcha.compose.document.style.DocumentTextDecoration; import com.demcha.compose.document.style.DocumentTextStyle; -import com.demcha.compose.document.theme.BusinessTheme; +import com.demcha.examples.support.theme.BusinessTheme; import com.demcha.compose.font.FontName; import com.demcha.examples.support.ExampleOutputPaths; diff --git a/examples/src/main/java/com/demcha/examples/flagships/BusinessReportExample.java b/examples/src/main/java/com/demcha/examples/flagships/BusinessReportExample.java index f055a95ab..1f74967ab 100644 --- a/examples/src/main/java/com/demcha/examples/flagships/BusinessReportExample.java +++ b/examples/src/main/java/com/demcha/examples/flagships/BusinessReportExample.java @@ -11,7 +11,7 @@ import com.demcha.compose.document.style.*; import com.demcha.compose.document.table.DocumentTableColumn; import com.demcha.compose.document.table.DocumentTableStyle; -import com.demcha.compose.document.theme.BusinessTheme; +import com.demcha.examples.support.theme.BusinessTheme; import com.demcha.compose.font.FontName; import com.demcha.examples.support.ExampleOutputPaths; diff --git a/examples/src/main/java/com/demcha/examples/flagships/FeatureCatalogExample.java b/examples/src/main/java/com/demcha/examples/flagships/FeatureCatalogExample.java index 43a542a8b..d46c1f75b 100644 --- a/examples/src/main/java/com/demcha/examples/flagships/FeatureCatalogExample.java +++ b/examples/src/main/java/com/demcha/examples/flagships/FeatureCatalogExample.java @@ -30,7 +30,7 @@ import com.demcha.compose.document.style.ShapePoint; import com.demcha.compose.document.svg.SvgIcon; import com.demcha.compose.document.svg.SvgPath; -import com.demcha.compose.document.theme.BusinessTheme; +import com.demcha.examples.support.theme.BusinessTheme; import com.demcha.compose.font.FontName; import com.demcha.examples.support.ExampleOutputPaths; diff --git a/examples/src/main/java/com/demcha/examples/flagships/MasterShowcaseExample.java b/examples/src/main/java/com/demcha/examples/flagships/MasterShowcaseExample.java index 08094262a..61c59cc5d 100644 --- a/examples/src/main/java/com/demcha/examples/flagships/MasterShowcaseExample.java +++ b/examples/src/main/java/com/demcha/examples/flagships/MasterShowcaseExample.java @@ -20,7 +20,7 @@ import com.demcha.compose.document.style.DocumentTextStyle; import com.demcha.compose.document.table.DocumentTableColumn; import com.demcha.compose.document.table.DocumentTableStyle; -import com.demcha.compose.document.theme.BusinessTheme; +import com.demcha.examples.support.theme.BusinessTheme; import com.demcha.compose.font.FontName; import com.demcha.examples.support.ExampleOutputPaths; diff --git a/src/main/java/com/demcha/compose/document/theme/BusinessTheme.java b/examples/src/main/java/com/demcha/examples/support/theme/BusinessTheme.java similarity index 99% rename from src/main/java/com/demcha/compose/document/theme/BusinessTheme.java rename to examples/src/main/java/com/demcha/examples/support/theme/BusinessTheme.java index 8dfade051..802723621 100644 --- a/src/main/java/com/demcha/compose/document/theme/BusinessTheme.java +++ b/examples/src/main/java/com/demcha/examples/support/theme/BusinessTheme.java @@ -1,4 +1,4 @@ -package com.demcha.compose.document.theme; +package com.demcha.examples.support.theme; import com.demcha.compose.document.style.*; import com.demcha.compose.document.table.DocumentTableStyle; diff --git a/src/main/java/com/demcha/compose/document/theme/DocumentPalette.java b/examples/src/main/java/com/demcha/examples/support/theme/DocumentPalette.java similarity index 99% rename from src/main/java/com/demcha/compose/document/theme/DocumentPalette.java rename to examples/src/main/java/com/demcha/examples/support/theme/DocumentPalette.java index 3e921ed08..6c53fb398 100644 --- a/src/main/java/com/demcha/compose/document/theme/DocumentPalette.java +++ b/examples/src/main/java/com/demcha/examples/support/theme/DocumentPalette.java @@ -1,4 +1,4 @@ -package com.demcha.compose.document.theme; +package com.demcha.examples.support.theme; import com.demcha.compose.document.style.DocumentColor; diff --git a/src/main/java/com/demcha/compose/document/theme/SpacingScale.java b/examples/src/main/java/com/demcha/examples/support/theme/SpacingScale.java similarity index 98% rename from src/main/java/com/demcha/compose/document/theme/SpacingScale.java rename to examples/src/main/java/com/demcha/examples/support/theme/SpacingScale.java index da5796658..74ccf1e84 100644 --- a/src/main/java/com/demcha/compose/document/theme/SpacingScale.java +++ b/examples/src/main/java/com/demcha/examples/support/theme/SpacingScale.java @@ -1,4 +1,4 @@ -package com.demcha.compose.document.theme; +package com.demcha.examples.support.theme; import com.demcha.compose.document.style.DocumentInsets; diff --git a/src/main/java/com/demcha/compose/document/theme/TablePreset.java b/examples/src/main/java/com/demcha/examples/support/theme/TablePreset.java similarity index 96% rename from src/main/java/com/demcha/compose/document/theme/TablePreset.java rename to examples/src/main/java/com/demcha/examples/support/theme/TablePreset.java index 285a37622..8e4ce38ab 100644 --- a/src/main/java/com/demcha/compose/document/theme/TablePreset.java +++ b/examples/src/main/java/com/demcha/examples/support/theme/TablePreset.java @@ -1,4 +1,4 @@ -package com.demcha.compose.document.theme; +package com.demcha.examples.support.theme; import com.demcha.compose.document.table.DocumentTableStyle; diff --git a/src/main/java/com/demcha/compose/document/theme/TextScale.java b/examples/src/main/java/com/demcha/examples/support/theme/TextScale.java similarity index 97% rename from src/main/java/com/demcha/compose/document/theme/TextScale.java rename to examples/src/main/java/com/demcha/examples/support/theme/TextScale.java index bda53e810..e2ef31e94 100644 --- a/src/main/java/com/demcha/compose/document/theme/TextScale.java +++ b/examples/src/main/java/com/demcha/examples/support/theme/TextScale.java @@ -1,4 +1,4 @@ -package com.demcha.compose.document.theme; +package com.demcha.examples.support.theme; import com.demcha.compose.document.style.DocumentTextStyle; diff --git a/examples/src/main/java/com/demcha/examples/support/theme/package-info.java b/examples/src/main/java/com/demcha/examples/support/theme/package-info.java new file mode 100644 index 000000000..8beb419b9 --- /dev/null +++ b/examples/src/main/java/com/demcha/examples/support/theme/package-info.java @@ -0,0 +1,11 @@ +/** + * A "business document" design-token bundle ({@link BusinessTheme} grouping a + * {@link DocumentPalette}, {@link SpacingScale}, {@link TextScale}, and + * {@link TablePreset}) used by the examples to style feature demos with a + * consistent palette + text scale. + * + *

This is an examples-only styling helper — the shipping template surface + * is the layered {@code templates.core} / {@code *.v2} stack on + * {@code BrandTheme}.

+ */ +package com.demcha.examples.support.theme; diff --git a/examples/src/main/java/com/demcha/examples/templates/coverletter/CoverLetterFileExample.java b/examples/src/main/java/com/demcha/examples/templates/coverletter/CoverLetterFileExample.java index c4f26bcc8..72873ce2a 100644 --- a/examples/src/main/java/com/demcha/examples/templates/coverletter/CoverLetterFileExample.java +++ b/examples/src/main/java/com/demcha/examples/templates/coverletter/CoverLetterFileExample.java @@ -7,7 +7,7 @@ import com.demcha.compose.document.style.DocumentInsets; import com.demcha.compose.document.style.DocumentStroke; import com.demcha.compose.document.style.DocumentTextStyle; -import com.demcha.compose.document.theme.BusinessTheme; +import com.demcha.examples.support.theme.BusinessTheme; import com.demcha.compose.font.FontName; import com.demcha.examples.support.ExampleOutputPaths; diff --git a/src/test/java/com/demcha/compose/document/theme/BusinessThemeTest.java b/examples/src/test/java/com/demcha/examples/support/theme/BusinessThemeTest.java similarity index 99% rename from src/test/java/com/demcha/compose/document/theme/BusinessThemeTest.java rename to examples/src/test/java/com/demcha/examples/support/theme/BusinessThemeTest.java index 428907673..87721f2a2 100644 --- a/src/test/java/com/demcha/compose/document/theme/BusinessThemeTest.java +++ b/examples/src/test/java/com/demcha/examples/support/theme/BusinessThemeTest.java @@ -1,4 +1,4 @@ -package com.demcha.compose.document.theme; +package com.demcha.examples.support.theme; import com.demcha.compose.document.style.DocumentColor; import com.demcha.compose.document.style.DocumentTextDecoration; diff --git a/src/test/java/com/demcha/compose/document/theme/DocumentPaletteBuilderTest.java b/examples/src/test/java/com/demcha/examples/support/theme/DocumentPaletteBuilderTest.java similarity index 99% rename from src/test/java/com/demcha/compose/document/theme/DocumentPaletteBuilderTest.java rename to examples/src/test/java/com/demcha/examples/support/theme/DocumentPaletteBuilderTest.java index 74a0268b8..b5424050f 100644 --- a/src/test/java/com/demcha/compose/document/theme/DocumentPaletteBuilderTest.java +++ b/examples/src/test/java/com/demcha/examples/support/theme/DocumentPaletteBuilderTest.java @@ -1,4 +1,4 @@ -package com.demcha.compose.document.theme; +package com.demcha.examples.support.theme; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; diff --git a/src/main/java/com/demcha/compose/document/api/package-info.java b/src/main/java/com/demcha/compose/document/api/package-info.java index e48a05e80..d3588f6fa 100644 --- a/src/main/java/com/demcha/compose/document/api/package-info.java +++ b/src/main/java/com/demcha/compose/document/api/package-info.java @@ -24,8 +24,7 @@ * *

Types in this package and in {@link com.demcha.compose.document.dsl}, * {@link com.demcha.compose.document.node}, - * {@link com.demcha.compose.document.style}, - * {@link com.demcha.compose.document.theme}, and + * {@link com.demcha.compose.document.style}, and * {@link com.demcha.compose.document.templates.api} are public API and follow * deprecation discipline. Types annotated with * {@link com.demcha.compose.document.api.Internal @Internal} diff --git a/src/main/java/com/demcha/compose/document/chart/ChartDefaults.java b/src/main/java/com/demcha/compose/document/chart/ChartDefaults.java index 0cb781d5e..c1348bf87 100644 --- a/src/main/java/com/demcha/compose/document/chart/ChartDefaults.java +++ b/src/main/java/com/demcha/compose/document/chart/ChartDefaults.java @@ -11,7 +11,7 @@ /** * Built-in, theme-independent defaults for the chart subsystem. * - *

The active {@code BusinessTheme} is baked into nodes at authoring time and + *

The active theme is baked into nodes at authoring time and * is not reachable during the layout pass, so a chart must be able to render * fully styled from these constants alone. A future enhancement can let the DSL * builder resolve a document-matched {@link ChartTheme} at authoring time; until diff --git a/src/main/java/com/demcha/compose/document/chart/ChartTheme.java b/src/main/java/com/demcha/compose/document/chart/ChartTheme.java index 61ffbef88..ff83f8523 100644 --- a/src/main/java/com/demcha/compose/document/chart/ChartTheme.java +++ b/src/main/java/com/demcha/compose/document/chart/ChartTheme.java @@ -10,7 +10,7 @@ /** * Chart-specific design tokens, the TOP tier of the style cascade * ({@code theme → ChartStyle → per-series}). A built-in default lives in - * {@link ChartDefaults#DEFAULT_THEME}; a future {@code BusinessTheme} integration + * {@link ChartDefaults#DEFAULT_THEME}; a future document-theme integration * can supply a document-matched instance at authoring time so a chart authored * with no {@link ChartStyle} still matches the document's palette and typography * automatically. diff --git a/src/main/java/com/demcha/compose/document/layout/package-info.java b/src/main/java/com/demcha/compose/document/layout/package-info.java index fc0698818..7cb270f1f 100644 --- a/src/main/java/com/demcha/compose/document/layout/package-info.java +++ b/src/main/java/com/demcha/compose/document/layout/package-info.java @@ -9,7 +9,7 @@ * because they are implementation detail of the layout pipeline and may * change in any release without notice. Library users should not depend * on these types — build against {@code DocumentSession}, - * {@code DocumentDsl}, {@code BusinessTheme}, the template APIs, or the + * {@code DocumentDsl}, the template APIs, or the * {@link com.demcha.compose.document.backend} SPIs instead.

* *

Architecture-guard tests may inspect this annotation reflectively diff --git a/src/main/java/com/demcha/compose/document/templates/api/DocumentTemplate.java b/src/main/java/com/demcha/compose/document/templates/api/DocumentTemplate.java index a837112f6..f6fc91773 100644 --- a/src/main/java/com/demcha/compose/document/templates/api/DocumentTemplate.java +++ b/src/main/java/com/demcha/compose/document/templates/api/DocumentTemplate.java @@ -14,10 +14,8 @@ *