From ce6d54085692b8ccf2386292868ee0ca25727dcd Mon Sep 17 00:00:00 2001 From: DemchaAV Date: Wed, 1 Jul 2026 22:48:39 +0100 Subject: [PATCH] refactor(templates): drop the v2 suffix from the cv package MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Last of the four per-family suffix drops. Move the cv.v2 sub-packages (components, data, presets, widgets), AUTHORS.md, and the author-guide package-info up to templates.cv, and rewrite every engine import and doc reference across the engine, tests, examples, and benchmarks. The two package-info files are merged: the short cv stub is dropped and the rich cv.v2 author guide is promoted, with its stale note about a now-removed Gen-2 cv.* stack cut. Pure rename — the visual parity test passes against the unchanged committed baselines, so every cv preset renders identically. The examples module keeps its own examples.templates.cv.v2 package (its source directory is unchanged); only its engine imports are repointed. Tests: ./mvnw verify javadoc:javadoc -pl . — 1378 tests, 0 failures, javadoc clean; examples + benchmarks compile; perf-smoke + examples-generation smoke (85) green. --- CONTRIBUTING.md | 2 +- .../compose/CanonicalBenchmarkSupport.java | 2 +- .../demcha/compose/CurrentSpeedBenchmark.java | 4 +- .../compose/jmh/ColdStartJmhBenchmark.java | 4 +- .../compose/jmh/TemplateCvJmhBenchmark.java | 4 +- docs/api-stability.md | 2 +- docs/recipes/themes.md | 4 +- docs/templates/v2-layered/README.md | 4 +- .../templates/v2-layered/authoring-presets.md | 2 +- .../templates/v2-layered/contributor-guide.md | 2 +- docs/templates/v2-layered/quickstart.md | 4 +- docs/templates/which-template-system.md | 6 +- .../examples/support/ExampleDataFactory.java | 18 +- .../examples/templates/cv/CvFileExample.java | 4 +- .../cv/CvTemplateGalleryFileExample.java | 34 +-- .../templates/cv/v2/CvBlueBannerExample.java | 4 +- .../templates/cv/v2/CvBoxedV2Example.java | 4 +- .../cv/v2/CvCenteredHeadlineExample.java | 4 +- .../cv/v2/CvClassicSerifExample.java | 4 +- .../templates/cv/v2/CvCompactMonoExample.java | 4 +- .../cv/v2/CvEditorialBlueExample.java | 4 +- .../cv/v2/CvEngineeringResumeExample.java | 4 +- .../templates/cv/v2/CvExecutiveExample.java | 4 +- .../cv/v2/CvMinimalUnderlinedExample.java | 4 +- .../cv/v2/CvMintEditorialCustomExample.java | 4 +- .../cv/v2/CvMintEditorialExample.java | 4 +- .../templates/cv/v2/CvModernV2Example.java | 4 +- .../cv/v2/CvMonogramSidebarExample.java | 4 +- .../templates/cv/v2/CvNordicCleanExample.java | 4 +- .../templates/cv/v2/CvPanelExample.java | 4 +- .../cv/v2/CvSidebarPortraitExample.java | 4 +- .../cv/v2/CvTimelineMinimalExample.java | 4 +- .../templates/core/theme/BrandTheme.java | 2 +- .../templates/core/theme/Typography.java | 2 +- .../coverletter/data/CoverLetterDocument.java | 2 +- .../coverletter/data/package-info.java | 2 +- .../coverletter/presets/BlueBannerLetter.java | 2 +- .../presets/BoxedSectionsLetter.java | 2 +- .../presets/CenteredHeadlineLetter.java | 4 +- .../presets/ClassicSerifLetter.java | 4 +- .../presets/CompactMonoLetter.java | 4 +- .../presets/EditorialBlueLetter.java | 2 +- .../presets/EngineeringResumeLetter.java | 4 +- .../coverletter/presets/ExecutiveLetter.java | 4 +- .../presets/MintEditorialLetter.java | 4 +- .../presets/ModernProfessionalLetter.java | 2 +- .../presets/MonogramSidebarLetter.java | 4 +- .../presets/NordicCleanLetter.java | 4 +- .../coverletter/presets/PanelLetter.java | 4 +- .../presets/SidebarPortraitLetter.java | 2 +- .../presets/TimelineMinimalLetter.java | 6 +- .../document/templates/cv/{v2 => }/AUTHORS.md | 4 +- .../components/EntryCompactRenderer.java | 4 +- .../cv/{v2 => }/components/EntryRenderer.java | 4 +- .../components/LabelValueRenderer.java | 2 +- .../components/ParagraphPrimitive.java | 2 +- .../components/ParagraphRenderer.java | 2 +- .../cv/{v2 => }/components/ProjectLabel.java | 2 +- .../{v2 => }/components/ProjectRenderer.java | 4 +- .../cv/{v2 => }/components/RowRenderer.java | 6 +- .../components/SectionDispatcher.java | 6 +- .../cv/{v2 => }/components/SectionLookup.java | 4 +- .../components/SkillLineRenderer.java | 4 +- .../components/SkillTableRenderer.java | 4 +- .../{v2 => }/components/SkillsRenderer.java | 6 +- .../cv/{v2 => }/components/package-info.java | 8 +- .../cv/{v2 => }/data/CvDocument.java | 2 +- .../templates/cv/{v2 => }/data/CvEntry.java | 2 +- .../cv/{v2 => }/data/CvIdentity.java | 2 +- .../templates/cv/{v2 => }/data/CvName.java | 2 +- .../templates/cv/{v2 => }/data/CvRow.java | 2 +- .../templates/cv/{v2 => }/data/CvSection.java | 2 +- .../templates/cv/{v2 => }/data/CvSkill.java | 2 +- .../cv/{v2 => }/data/EntriesSection.java | 2 +- .../cv/{v2 => }/data/ParagraphSection.java | 2 +- .../templates/cv/{v2 => }/data/RowStyle.java | 2 +- .../cv/{v2 => }/data/RowsSection.java | 2 +- .../cv/{v2 => }/data/SkillGroup.java | 2 +- .../cv/{v2 => }/data/SkillsSection.java | 2 +- .../templates/cv/{v2 => }/data/Slot.java | 4 +- .../cv/{v2 => }/data/package-info.java | 28 +-- .../document/templates/cv/package-info.java | 202 ++++++++++++++++- .../cv/{v2 => }/presets/BlueBanner.java | 8 +- .../cv/{v2 => }/presets/BoxedSections.java | 14 +- .../cv/{v2 => }/presets/CenteredHeadline.java | 12 +- .../cv/{v2 => }/presets/ClassicSerif.java | 8 +- .../cv/{v2 => }/presets/CompactMono.java | 10 +- .../cv/{v2 => }/presets/EditorialBlue.java | 8 +- .../{v2 => }/presets/EngineeringResume.java | 8 +- .../cv/{v2 => }/presets/Executive.java | 8 +- .../{v2 => }/presets/MinimalUnderlined.java | 14 +- .../cv/{v2 => }/presets/MintEditorial.java | 10 +- .../{v2 => }/presets/ModernProfessional.java | 12 +- .../cv/{v2 => }/presets/MonogramSidebar.java | 6 +- .../cv/{v2 => }/presets/NordicClean.java | 10 +- .../templates/cv/{v2 => }/presets/Panel.java | 6 +- .../cv/{v2 => }/presets/SidebarPortrait.java | 10 +- .../cv/{v2 => }/presets/TimelineMinimal.java | 6 +- .../cv/{v2 => }/presets/package-info.java | 12 +- .../templates/cv/v2/package-info.java | 204 ------------------ .../{v2 => }/widgets/FlowSectionHeader.java | 2 +- .../cv/{v2 => }/widgets/IconTextRow.java | 4 +- .../cv/{v2 => }/widgets/ProfileBand.java | 2 +- .../cv/{v2 => }/widgets/SectionHeader.java | 2 +- .../cv/{v2 => }/widgets/SectionModule.java | 2 +- .../cv/{v2 => }/widgets/SkillBar.java | 6 +- .../cv/{v2 => }/widgets/package-info.java | 12 +- .../invoice/presets/ModernInvoice.java | 2 +- .../invoice/presets/package-info.java | 2 +- .../presets/CoverLetterV2SmokeTest.java | 2 +- .../CoverLetterV2VisualParityTest.java | 2 +- .../components/CvV2ComponentUtilityTest.java | 12 +- .../{v2 => }/components/ProjectLabelTest.java | 2 +- .../components/SectionLookupTest.java | 4 +- .../cv/{v2 => }/data/CvDocumentSlotTest.java | 2 +- .../cv/{v2 => }/data/CvIdentityTest.java | 2 +- .../cv/{v2 => }/data/CvNameTest.java | 2 +- .../cv/{v2 => }/data/SkillsSectionTest.java | 2 +- .../{v2 => }/presets/BlueBannerSmokeTest.java | 14 +- .../presets/BoxedSectionsSmokeTest.java | 18 +- .../presets/ClassicSerifSmokeTest.java | 16 +- .../presets/CompactMonoSmokeTest.java | 16 +- .../presets/CvV2VisualParityTest.java | 18 +- .../presets/EditorialBlueSmokeTest.java | 16 +- .../presets/EngineeringResumeSmokeTest.java | 6 +- .../{v2 => }/presets/ExecutiveSmokeTest.java | 18 +- .../presets/MinimalUnderlinedSmokeTest.java | 12 +- .../presets/MintEditorialSmokeTest.java | 18 +- .../presets/ModernProfessionalSmokeTest.java | 12 +- .../presets/MonogramSidebarSmokeTest.java | 16 +- .../presets/NordicCleanSmokeTest.java | 16 +- .../cv/{v2 => }/presets/PanelSmokeTest.java | 18 +- .../presets/SidebarPortraitSmokeTest.java | 16 +- .../presets/TimelineMinimalSmokeTest.java | 16 +- .../cv/{v2 => }/widgets/WidgetSmokeTest.java | 10 +- .../java/com/demcha/mock/CvDataFixtures.java | 16 +- 136 files changed, 618 insertions(+), 630 deletions(-) rename src/main/java/com/demcha/compose/document/templates/cv/{v2 => }/AUTHORS.md (99%) rename src/main/java/com/demcha/compose/document/templates/cv/{v2 => }/components/EntryCompactRenderer.java (99%) rename src/main/java/com/demcha/compose/document/templates/cv/{v2 => }/components/EntryRenderer.java (96%) rename src/main/java/com/demcha/compose/document/templates/cv/{v2 => }/components/LabelValueRenderer.java (97%) rename src/main/java/com/demcha/compose/document/templates/cv/{v2 => }/components/ParagraphPrimitive.java (98%) rename src/main/java/com/demcha/compose/document/templates/cv/{v2 => }/components/ParagraphRenderer.java (94%) rename src/main/java/com/demcha/compose/document/templates/cv/{v2 => }/components/ProjectLabel.java (98%) rename src/main/java/com/demcha/compose/document/templates/cv/{v2 => }/components/ProjectRenderer.java (98%) rename src/main/java/com/demcha/compose/document/templates/cv/{v2 => }/components/RowRenderer.java (95%) rename src/main/java/com/demcha/compose/document/templates/cv/{v2 => }/components/SectionDispatcher.java (95%) rename src/main/java/com/demcha/compose/document/templates/cv/{v2 => }/components/SectionLookup.java (96%) rename src/main/java/com/demcha/compose/document/templates/cv/{v2 => }/components/SkillLineRenderer.java (94%) rename src/main/java/com/demcha/compose/document/templates/cv/{v2 => }/components/SkillTableRenderer.java (92%) rename src/main/java/com/demcha/compose/document/templates/cv/{v2 => }/components/SkillsRenderer.java (89%) rename src/main/java/com/demcha/compose/document/templates/cv/{v2 => }/components/package-info.java (80%) rename src/main/java/com/demcha/compose/document/templates/cv/{v2 => }/data/CvDocument.java (99%) rename src/main/java/com/demcha/compose/document/templates/cv/{v2 => }/data/CvEntry.java (96%) rename src/main/java/com/demcha/compose/document/templates/cv/{v2 => }/data/CvIdentity.java (99%) rename src/main/java/com/demcha/compose/document/templates/cv/{v2 => }/data/CvName.java (97%) rename src/main/java/com/demcha/compose/document/templates/cv/{v2 => }/data/CvRow.java (95%) rename src/main/java/com/demcha/compose/document/templates/cv/{v2 => }/data/CvSection.java (95%) rename src/main/java/com/demcha/compose/document/templates/cv/{v2 => }/data/CvSkill.java (97%) rename src/main/java/com/demcha/compose/document/templates/cv/{v2 => }/data/EntriesSection.java (98%) rename src/main/java/com/demcha/compose/document/templates/cv/{v2 => }/data/ParagraphSection.java (93%) rename src/main/java/com/demcha/compose/document/templates/cv/{v2 => }/data/RowStyle.java (95%) rename src/main/java/com/demcha/compose/document/templates/cv/{v2 => }/data/RowsSection.java (98%) rename src/main/java/com/demcha/compose/document/templates/cv/{v2 => }/data/SkillGroup.java (98%) rename src/main/java/com/demcha/compose/document/templates/cv/{v2 => }/data/SkillsSection.java (98%) rename src/main/java/com/demcha/compose/document/templates/cv/{v2 => }/data/Slot.java (89%) rename src/main/java/com/demcha/compose/document/templates/cv/{v2 => }/data/package-info.java (72%) rename src/main/java/com/demcha/compose/document/templates/cv/{v2 => }/presets/BlueBanner.java (97%) rename src/main/java/com/demcha/compose/document/templates/cv/{v2 => }/presets/BoxedSections.java (91%) rename src/main/java/com/demcha/compose/document/templates/cv/{v2 => }/presets/CenteredHeadline.java (95%) rename src/main/java/com/demcha/compose/document/templates/cv/{v2 => }/presets/ClassicSerif.java (98%) rename src/main/java/com/demcha/compose/document/templates/cv/{v2 => }/presets/CompactMono.java (97%) rename src/main/java/com/demcha/compose/document/templates/cv/{v2 => }/presets/EditorialBlue.java (98%) rename src/main/java/com/demcha/compose/document/templates/cv/{v2 => }/presets/EngineeringResume.java (99%) rename src/main/java/com/demcha/compose/document/templates/cv/{v2 => }/presets/Executive.java (97%) rename src/main/java/com/demcha/compose/document/templates/cv/{v2 => }/presets/MinimalUnderlined.java (89%) rename src/main/java/com/demcha/compose/document/templates/cv/{v2 => }/presets/MintEditorial.java (99%) rename src/main/java/com/demcha/compose/document/templates/cv/{v2 => }/presets/ModernProfessional.java (94%) rename src/main/java/com/demcha/compose/document/templates/cv/{v2 => }/presets/MonogramSidebar.java (99%) rename src/main/java/com/demcha/compose/document/templates/cv/{v2 => }/presets/NordicClean.java (98%) rename src/main/java/com/demcha/compose/document/templates/cv/{v2 => }/presets/Panel.java (99%) rename src/main/java/com/demcha/compose/document/templates/cv/{v2 => }/presets/SidebarPortrait.java (99%) rename src/main/java/com/demcha/compose/document/templates/cv/{v2 => }/presets/TimelineMinimal.java (99%) rename src/main/java/com/demcha/compose/document/templates/cv/{v2 => }/presets/package-info.java (59%) delete mode 100644 src/main/java/com/demcha/compose/document/templates/cv/v2/package-info.java rename src/main/java/com/demcha/compose/document/templates/cv/{v2 => }/widgets/FlowSectionHeader.java (99%) rename src/main/java/com/demcha/compose/document/templates/cv/{v2 => }/widgets/IconTextRow.java (97%) rename src/main/java/com/demcha/compose/document/templates/cv/{v2 => }/widgets/ProfileBand.java (99%) rename src/main/java/com/demcha/compose/document/templates/cv/{v2 => }/widgets/SectionHeader.java (99%) rename src/main/java/com/demcha/compose/document/templates/cv/{v2 => }/widgets/SectionModule.java (98%) rename src/main/java/com/demcha/compose/document/templates/cv/{v2 => }/widgets/SkillBar.java (96%) rename src/main/java/com/demcha/compose/document/templates/cv/{v2 => }/widgets/package-info.java (89%) rename src/test/java/com/demcha/compose/document/templates/cv/{v2 => }/components/CvV2ComponentUtilityTest.java (87%) rename src/test/java/com/demcha/compose/document/templates/cv/{v2 => }/components/ProjectLabelTest.java (98%) rename src/test/java/com/demcha/compose/document/templates/cv/{v2 => }/components/SectionLookupTest.java (87%) rename src/test/java/com/demcha/compose/document/templates/cv/{v2 => }/data/CvDocumentSlotTest.java (98%) rename src/test/java/com/demcha/compose/document/templates/cv/{v2 => }/data/CvIdentityTest.java (96%) rename src/test/java/com/demcha/compose/document/templates/cv/{v2 => }/data/CvNameTest.java (96%) rename src/test/java/com/demcha/compose/document/templates/cv/{v2 => }/data/SkillsSectionTest.java (97%) rename src/test/java/com/demcha/compose/document/templates/cv/{v2 => }/presets/BlueBannerSmokeTest.java (85%) rename src/test/java/com/demcha/compose/document/templates/cv/{v2 => }/presets/BoxedSectionsSmokeTest.java (88%) rename src/test/java/com/demcha/compose/document/templates/cv/{v2 => }/presets/ClassicSerifSmokeTest.java (87%) rename src/test/java/com/demcha/compose/document/templates/cv/{v2 => }/presets/CompactMonoSmokeTest.java (88%) rename src/test/java/com/demcha/compose/document/templates/cv/{v2 => }/presets/CvV2VisualParityTest.java (96%) rename src/test/java/com/demcha/compose/document/templates/cv/{v2 => }/presets/EditorialBlueSmokeTest.java (86%) rename src/test/java/com/demcha/compose/document/templates/cv/{v2 => }/presets/EngineeringResumeSmokeTest.java (98%) rename src/test/java/com/demcha/compose/document/templates/cv/{v2 => }/presets/ExecutiveSmokeTest.java (85%) rename src/test/java/com/demcha/compose/document/templates/cv/{v2 => }/presets/MinimalUnderlinedSmokeTest.java (86%) rename src/test/java/com/demcha/compose/document/templates/cv/{v2 => }/presets/MintEditorialSmokeTest.java (95%) rename src/test/java/com/demcha/compose/document/templates/cv/{v2 => }/presets/ModernProfessionalSmokeTest.java (87%) rename src/test/java/com/demcha/compose/document/templates/cv/{v2 => }/presets/MonogramSidebarSmokeTest.java (90%) rename src/test/java/com/demcha/compose/document/templates/cv/{v2 => }/presets/NordicCleanSmokeTest.java (89%) rename src/test/java/com/demcha/compose/document/templates/cv/{v2 => }/presets/PanelSmokeTest.java (85%) rename src/test/java/com/demcha/compose/document/templates/cv/{v2 => }/presets/SidebarPortraitSmokeTest.java (87%) rename src/test/java/com/demcha/compose/document/templates/cv/{v2 => }/presets/TimelineMinimalSmokeTest.java (87%) rename src/test/java/com/demcha/compose/document/templates/cv/{v2 => }/widgets/WidgetSmokeTest.java (97%) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 9597ea0cc..5395019c3 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -265,7 +265,7 @@ the canonical layered architecture documented in [**docs/templates/v2-layered/contributor-guide.md**](./docs/templates/v2-layered/contributor-guide.md). Five sub-packages (`data/` / `theme/` / `components/` / `widgets/` / `presets/`), each with a clear contract. CV v2 -(`com.demcha.compose.document.templates.cv.v2`) is the reference +(`com.demcha.compose.document.templates.cv`) is the reference implementation; read it before starting yours. **For a new preset inside an existing v1-classic family** (a new CV diff --git a/benchmarks/src/main/java/com/demcha/compose/CanonicalBenchmarkSupport.java b/benchmarks/src/main/java/com/demcha/compose/CanonicalBenchmarkSupport.java index 4e2edfbbc..2217f11f3 100644 --- a/benchmarks/src/main/java/com/demcha/compose/CanonicalBenchmarkSupport.java +++ b/benchmarks/src/main/java/com/demcha/compose/CanonicalBenchmarkSupport.java @@ -6,7 +6,7 @@ import com.demcha.compose.document.style.DocumentInsets; import com.demcha.compose.document.style.DocumentTextDecoration; import com.demcha.compose.document.style.DocumentTextStyle; -import com.demcha.compose.document.templates.cv.v2.data.CvDocument; +import com.demcha.compose.document.templates.cv.data.CvDocument; import com.demcha.compose.document.templates.data.invoice.InvoiceDocumentSpec; import com.demcha.compose.document.templates.data.proposal.ProposalDocumentSpec; import com.demcha.compose.engine.components.style.Margin; diff --git a/benchmarks/src/main/java/com/demcha/compose/CurrentSpeedBenchmark.java b/benchmarks/src/main/java/com/demcha/compose/CurrentSpeedBenchmark.java index f020c8835..c55914397 100644 --- a/benchmarks/src/main/java/com/demcha/compose/CurrentSpeedBenchmark.java +++ b/benchmarks/src/main/java/com/demcha/compose/CurrentSpeedBenchmark.java @@ -13,8 +13,8 @@ import com.demcha.compose.document.style.DocumentTextStyle; import com.demcha.compose.document.svg.SvgIcon; import com.demcha.compose.document.templates.api.DocumentTemplate; -import com.demcha.compose.document.templates.cv.v2.data.CvDocument; -import com.demcha.compose.document.templates.cv.v2.presets.ModernProfessional; +import com.demcha.compose.document.templates.cv.data.CvDocument; +import com.demcha.compose.document.templates.cv.presets.ModernProfessional; import com.demcha.compose.document.templates.data.invoice.InvoiceDocumentSpec; import com.demcha.compose.document.templates.data.proposal.ProposalDocumentSpec; import com.demcha.compose.document.templates.invoice.presets.ModernInvoice; diff --git a/benchmarks/src/main/java/com/demcha/compose/jmh/ColdStartJmhBenchmark.java b/benchmarks/src/main/java/com/demcha/compose/jmh/ColdStartJmhBenchmark.java index 4a152173b..5cfe593a8 100644 --- a/benchmarks/src/main/java/com/demcha/compose/jmh/ColdStartJmhBenchmark.java +++ b/benchmarks/src/main/java/com/demcha/compose/jmh/ColdStartJmhBenchmark.java @@ -5,8 +5,8 @@ import com.demcha.compose.document.api.DocumentPageSize; import com.demcha.compose.document.api.DocumentSession; import com.demcha.compose.document.style.DocumentInsets; -import com.demcha.compose.document.templates.cv.v2.data.CvDocument; -import com.demcha.compose.document.templates.cv.v2.presets.ModernProfessional; +import com.demcha.compose.document.templates.cv.data.CvDocument; +import com.demcha.compose.document.templates.cv.presets.ModernProfessional; import com.demcha.compose.document.templates.data.invoice.InvoiceDocumentSpec; import com.demcha.compose.document.templates.invoice.presets.ModernInvoice; import com.demcha.compose.document.templates.api.DocumentTemplate; diff --git a/benchmarks/src/main/java/com/demcha/compose/jmh/TemplateCvJmhBenchmark.java b/benchmarks/src/main/java/com/demcha/compose/jmh/TemplateCvJmhBenchmark.java index 87d546513..aca98c5c5 100644 --- a/benchmarks/src/main/java/com/demcha/compose/jmh/TemplateCvJmhBenchmark.java +++ b/benchmarks/src/main/java/com/demcha/compose/jmh/TemplateCvJmhBenchmark.java @@ -6,8 +6,8 @@ import com.demcha.compose.document.api.DocumentSession; import com.demcha.compose.document.style.DocumentInsets; import com.demcha.compose.document.templates.api.DocumentTemplate; -import com.demcha.compose.document.templates.cv.v2.data.CvDocument; -import com.demcha.compose.document.templates.cv.v2.presets.ModernProfessional; +import com.demcha.compose.document.templates.cv.data.CvDocument; +import com.demcha.compose.document.templates.cv.presets.ModernProfessional; import org.openjdk.jmh.annotations.Benchmark; import org.openjdk.jmh.annotations.BenchmarkMode; import org.openjdk.jmh.annotations.Fork; diff --git a/docs/api-stability.md b/docs/api-stability.md index 225e81cf8..81617433e 100644 --- a/docs/api-stability.md +++ b/docs/api-stability.md @@ -192,7 +192,7 @@ Javadoc per element. | `com.demcha.compose.document.dsl` | **Stable** | All builder types (`RowBuilder`, `SectionBuilder`, `ParagraphBuilder`, etc.). | | `com.demcha.compose.document.node` | **Stable** | Node records (`RowNode`, `SectionNode`, `ParagraphNode`, ...). Sealed where relevant — see § 2. | | `com.demcha.compose.document.style` | **Stable** | `DocumentColor`, `DocumentInsets`, `DocumentTextStyle`, `DocumentTransform`, ... | -| `com.demcha.compose.document.templates.cv.v2.*` | **Stable** | Layered CV presets, `CvDocument`, `BrandTheme`. Recommended template surface. | +| `com.demcha.compose.document.templates.cv.*` | **Stable** | Layered CV presets, `CvDocument`, `BrandTheme`. Recommended template surface. | | `com.demcha.compose.document.templates.coverletter.v2.*` | **Stable** | Layered cover-letter presets. | | `com.demcha.compose.document.templates.builtins` | **Stable** | `InvoiceTemplateV2`, `ProposalTemplateV2`, `BusinessTheme`. | | `com.demcha.compose.document.templates.cv.presets.*` | **Stable but Supported** | The "classic" v1.6 rebuild surface. See [`which-template-system.md`](templates/which-template-system.md). Supported through 1.x; removed in 2.0. | diff --git a/docs/recipes/themes.md b/docs/recipes/themes.md index 8103db77e..829cc044b 100644 --- a/docs/recipes/themes.md +++ b/docs/recipes/themes.md @@ -111,8 +111,8 @@ factory: ```java import com.demcha.compose.document.templates.api.DocumentTemplate; -import com.demcha.compose.document.templates.cv.v2.data.CvDocument; -import com.demcha.compose.document.templates.cv.v2.presets.ModernProfessional; +import com.demcha.compose.document.templates.cv.data.CvDocument; +import com.demcha.compose.document.templates.cv.presets.ModernProfessional; DocumentTemplate cv = ModernProfessional.create(); cv.compose(session, cvDocument); diff --git a/docs/templates/v2-layered/README.md b/docs/templates/v2-layered/README.md index 2cbdd8b53..075d29405 100644 --- a/docs/templates/v2-layered/README.md +++ b/docs/templates/v2-layered/README.md @@ -3,7 +3,7 @@ > ⚠️ **Naming clarification.** This is the **layered** template > architecture (data / theme / components / widgets / presets), the > going-forward canonical pattern. Package: -> `com.demcha.compose.document.templates.cv.v2`. +> `com.demcha.compose.document.templates.cv`. > > **Not to be confused with** the older v1.6 "Templates v2" surface > (`CvSpec`, `CvBuilder`, presets with `BusinessTheme`) — that lives @@ -12,7 +12,7 @@ The **canonical going-forward pattern** for building business documents on GraphCompose. CV is the reference implementation today -(`com.demcha.compose.document.templates.cv.v2`); invoice, cover-letter, +(`com.demcha.compose.document.templates.cv`); invoice, cover-letter, proposal, and any new template family will follow the same shape as they're migrated. diff --git a/docs/templates/v2-layered/authoring-presets.md b/docs/templates/v2-layered/authoring-presets.md index 712fb6ff9..d5636bee2 100644 --- a/docs/templates/v2-layered/authoring-presets.md +++ b/docs/templates/v2-layered/authoring-presets.md @@ -64,7 +64,7 @@ The neutral header widgets — `Headline`, `Subheadline`, `ContactLine`, `Masthead`, `SvgGlyph` — live in `com.demcha.compose.document.templates.core.identity`. The CV-specific section widgets (`SectionHeader` and friends) stay in -`com.demcha.compose.document.templates.cv.v2.widgets`. The generic +`com.demcha.compose.document.templates.cv.widgets`. The generic `CardWidget` / `TableWidget` / `TimelineAxisWidget` reusable by CVs, proposals, invoices, and cover letters live in `com.demcha.compose.document.templates.core.widgets`. Each has a small diff --git a/docs/templates/v2-layered/contributor-guide.md b/docs/templates/v2-layered/contributor-guide.md index 0abe53786..f994fd342 100644 --- a/docs/templates/v2-layered/contributor-guide.md +++ b/docs/templates/v2-layered/contributor-guide.md @@ -406,7 +406,7 @@ Compare to cv/v2 baseline (PR #45) which was 2082 lines including ## See also - The **CV v2** package - (`com.demcha.compose.document.templates.cv.v2`) is the reference + (`com.demcha.compose.document.templates.cv`) is the reference implementation. Read it end-to-end before starting a new family — every convention listed here is visible there. - [authoring-presets.md](authoring-presets.md) — how preset authors diff --git a/docs/templates/v2-layered/quickstart.md b/docs/templates/v2-layered/quickstart.md index 03c6f2349..30db32f76 100644 --- a/docs/templates/v2-layered/quickstart.md +++ b/docs/templates/v2-layered/quickstart.md @@ -37,8 +37,8 @@ import com.demcha.compose.GraphCompose; import com.demcha.compose.document.api.DocumentPageSize; import com.demcha.compose.document.api.DocumentSession; import com.demcha.compose.document.templates.api.DocumentTemplate; -import com.demcha.compose.document.templates.cv.v2.data.*; -import com.demcha.compose.document.templates.cv.v2.presets.BoxedSections; +import com.demcha.compose.document.templates.cv.data.*; +import com.demcha.compose.document.templates.cv.presets.BoxedSections; import java.nio.file.Path; diff --git a/docs/templates/which-template-system.md b/docs/templates/which-template-system.md index cf96a6204..aec7efb5b 100644 --- a/docs/templates/which-template-system.md +++ b/docs/templates/which-template-system.md @@ -2,7 +2,7 @@ **Short answer.** For any **new** code on GraphCompose 1.6.x and later, use the [**layered**](v2-layered/README.md) template surface -(`com.demcha.compose.document.templates.cv.v2.*`, paired with +(`com.demcha.compose.document.templates.cv.*`, paired with `*Letter` cover-letter presets in `…coverletter.v2.*`). The older [**classic**](v1-classic/README.md) surface still ships, still works, and stays supported through the 1.x line, but **the layered surface is @@ -23,7 +23,7 @@ The two surfaces have collided naming because the *codebase* and the | What you'll see | Where it lives | What it actually is | |---|---|---| -| **"Templates v2" (in commit messages, ADR 0011, package names like `cv.v2`)** | `com.demcha.compose.document.templates.cv.v2.*` | The **layered** architecture — *data / theme / components / widgets / presets*, paired with `CvDocument` builder. Recommended. | +| **"Templates v2" (in commit messages, ADR 0011, package names like `cv.v2`)** | `com.demcha.compose.document.templates.cv.*` | The **layered** architecture — *data / theme / components / widgets / presets*, paired with `CvDocument` builder. Recommended. | | **"Templates v1.6" / "templates rebuild"** | `com.demcha.compose.document.templates.cv.presets.*` | The 1.6 rebuilt canonical surface — `CvSpec` + `CvBuilder` + presets + `BusinessTheme`. Still supported. | | **Folder `docs/templates/v1-classic/`** | docs only | Documents the **non-layered** surface (`cv.presets.*`). The doc folder name is *not* the same axis as the package's `v2` suffix. | | **Folder `docs/templates/v2-layered/`** | docs only | Documents the layered surface (`cv.v2.*`). | @@ -103,7 +103,7 @@ plus a theme + data-record swap (introduced below): ```diff -import com.demcha.compose.document.templates.cv.presets.NordicClean; -+import com.demcha.compose.document.templates.cv.v2.presets.NordicClean; ++import com.demcha.compose.document.templates.cv.presets.NordicClean; -// before: CvSpec + BusinessTheme -NordicClean.create(BusinessTheme.nordicClean()).render(session, cvSpec); diff --git a/examples/src/main/java/com/demcha/examples/support/ExampleDataFactory.java b/examples/src/main/java/com/demcha/examples/support/ExampleDataFactory.java index 1347c75bc..4ab8455be 100644 --- a/examples/src/main/java/com/demcha/examples/support/ExampleDataFactory.java +++ b/examples/src/main/java/com/demcha/examples/support/ExampleDataFactory.java @@ -1,14 +1,14 @@ package com.demcha.examples.support; import com.demcha.compose.document.templates.coverletter.data.CoverLetterDocument; -import com.demcha.compose.document.templates.cv.v2.data.CvDocument; -import com.demcha.compose.document.templates.cv.v2.data.CvIdentity; -import com.demcha.compose.document.templates.cv.v2.data.CvSkill; -import com.demcha.compose.document.templates.cv.v2.data.EntriesSection; -import com.demcha.compose.document.templates.cv.v2.data.ParagraphSection; -import com.demcha.compose.document.templates.cv.v2.data.RowStyle; -import com.demcha.compose.document.templates.cv.v2.data.RowsSection; -import com.demcha.compose.document.templates.cv.v2.data.SkillsSection; +import com.demcha.compose.document.templates.cv.data.CvDocument; +import com.demcha.compose.document.templates.cv.data.CvIdentity; +import com.demcha.compose.document.templates.cv.data.CvSkill; +import com.demcha.compose.document.templates.cv.data.EntriesSection; +import com.demcha.compose.document.templates.cv.data.ParagraphSection; +import com.demcha.compose.document.templates.cv.data.RowStyle; +import com.demcha.compose.document.templates.cv.data.RowsSection; +import com.demcha.compose.document.templates.cv.data.SkillsSection; import com.demcha.compose.document.templates.data.invoice.InvoiceDocumentSpec; import com.demcha.compose.document.templates.data.proposal.ProposalDocumentSpec; import com.demcha.compose.document.templates.data.schedule.ScheduleSlot; @@ -233,7 +233,7 @@ public static CoverLetterDocument sampleCoverLetterDocumentV2() { * Returns a sample {@code CvDocument} for the v2 CV pipeline — * the canonical Jordan Rivera content expressed in the v2 * sealed section hierarchy - * ({@link com.demcha.compose.document.templates.cv.v2.data.ParagraphSection}, + * ({@link com.demcha.compose.document.templates.cv.data.ParagraphSection}, * {@link SkillsSection}, * {@link RowsSection}, * {@link EntriesSection}). diff --git a/examples/src/main/java/com/demcha/examples/templates/cv/CvFileExample.java b/examples/src/main/java/com/demcha/examples/templates/cv/CvFileExample.java index b90ec1165..f570c342e 100644 --- a/examples/src/main/java/com/demcha/examples/templates/cv/CvFileExample.java +++ b/examples/src/main/java/com/demcha/examples/templates/cv/CvFileExample.java @@ -4,8 +4,8 @@ import com.demcha.compose.document.api.DocumentPageSize; import com.demcha.compose.document.api.DocumentSession; import com.demcha.compose.document.templates.api.DocumentTemplate; -import com.demcha.compose.document.templates.cv.v2.data.CvDocument; -import com.demcha.compose.document.templates.cv.v2.presets.ModernProfessional; +import com.demcha.compose.document.templates.cv.data.CvDocument; +import com.demcha.compose.document.templates.cv.presets.ModernProfessional; import com.demcha.examples.support.ExampleDataFactory; import com.demcha.examples.support.ExampleOutputPaths; diff --git a/examples/src/main/java/com/demcha/examples/templates/cv/CvTemplateGalleryFileExample.java b/examples/src/main/java/com/demcha/examples/templates/cv/CvTemplateGalleryFileExample.java index 8fc69c7a9..0f6419237 100644 --- a/examples/src/main/java/com/demcha/examples/templates/cv/CvTemplateGalleryFileExample.java +++ b/examples/src/main/java/com/demcha/examples/templates/cv/CvTemplateGalleryFileExample.java @@ -4,23 +4,23 @@ import com.demcha.compose.document.api.DocumentPageSize; import com.demcha.compose.document.api.DocumentSession; import com.demcha.compose.document.templates.api.DocumentTemplate; -import com.demcha.compose.document.templates.cv.v2.data.CvDocument; -import com.demcha.compose.document.templates.cv.v2.presets.BlueBanner; -import com.demcha.compose.document.templates.cv.v2.presets.BoxedSections; -import com.demcha.compose.document.templates.cv.v2.presets.CenteredHeadline; -import com.demcha.compose.document.templates.cv.v2.presets.ClassicSerif; -import com.demcha.compose.document.templates.cv.v2.presets.CompactMono; -import com.demcha.compose.document.templates.cv.v2.presets.EditorialBlue; -import com.demcha.compose.document.templates.cv.v2.presets.EngineeringResume; -import com.demcha.compose.document.templates.cv.v2.presets.Executive; -import com.demcha.compose.document.templates.cv.v2.presets.MinimalUnderlined; -import com.demcha.compose.document.templates.cv.v2.presets.MintEditorial; -import com.demcha.compose.document.templates.cv.v2.presets.ModernProfessional; -import com.demcha.compose.document.templates.cv.v2.presets.MonogramSidebar; -import com.demcha.compose.document.templates.cv.v2.presets.NordicClean; -import com.demcha.compose.document.templates.cv.v2.presets.Panel; -import com.demcha.compose.document.templates.cv.v2.presets.SidebarPortrait; -import com.demcha.compose.document.templates.cv.v2.presets.TimelineMinimal; +import com.demcha.compose.document.templates.cv.data.CvDocument; +import com.demcha.compose.document.templates.cv.presets.BlueBanner; +import com.demcha.compose.document.templates.cv.presets.BoxedSections; +import com.demcha.compose.document.templates.cv.presets.CenteredHeadline; +import com.demcha.compose.document.templates.cv.presets.ClassicSerif; +import com.demcha.compose.document.templates.cv.presets.CompactMono; +import com.demcha.compose.document.templates.cv.presets.EditorialBlue; +import com.demcha.compose.document.templates.cv.presets.EngineeringResume; +import com.demcha.compose.document.templates.cv.presets.Executive; +import com.demcha.compose.document.templates.cv.presets.MinimalUnderlined; +import com.demcha.compose.document.templates.cv.presets.MintEditorial; +import com.demcha.compose.document.templates.cv.presets.ModernProfessional; +import com.demcha.compose.document.templates.cv.presets.MonogramSidebar; +import com.demcha.compose.document.templates.cv.presets.NordicClean; +import com.demcha.compose.document.templates.cv.presets.Panel; +import com.demcha.compose.document.templates.cv.presets.SidebarPortrait; +import com.demcha.compose.document.templates.cv.presets.TimelineMinimal; import com.demcha.examples.support.ExampleDataFactory; import com.demcha.examples.support.ExampleOutputPaths; diff --git a/examples/src/main/java/com/demcha/examples/templates/cv/v2/CvBlueBannerExample.java b/examples/src/main/java/com/demcha/examples/templates/cv/v2/CvBlueBannerExample.java index e4e24f2cb..be3bc3932 100644 --- a/examples/src/main/java/com/demcha/examples/templates/cv/v2/CvBlueBannerExample.java +++ b/examples/src/main/java/com/demcha/examples/templates/cv/v2/CvBlueBannerExample.java @@ -4,8 +4,8 @@ import com.demcha.compose.document.api.DocumentPageSize; import com.demcha.compose.document.api.DocumentSession; import com.demcha.compose.document.templates.api.DocumentTemplate; -import com.demcha.compose.document.templates.cv.v2.data.CvDocument; -import com.demcha.compose.document.templates.cv.v2.presets.BlueBanner; +import com.demcha.compose.document.templates.cv.data.CvDocument; +import com.demcha.compose.document.templates.cv.presets.BlueBanner; import com.demcha.examples.support.ExampleDataFactory; import com.demcha.examples.support.ExampleOutputPaths; diff --git a/examples/src/main/java/com/demcha/examples/templates/cv/v2/CvBoxedV2Example.java b/examples/src/main/java/com/demcha/examples/templates/cv/v2/CvBoxedV2Example.java index a209a796e..87e8ae8a1 100644 --- a/examples/src/main/java/com/demcha/examples/templates/cv/v2/CvBoxedV2Example.java +++ b/examples/src/main/java/com/demcha/examples/templates/cv/v2/CvBoxedV2Example.java @@ -4,8 +4,8 @@ import com.demcha.compose.document.api.DocumentPageSize; import com.demcha.compose.document.api.DocumentSession; import com.demcha.compose.document.templates.api.DocumentTemplate; -import com.demcha.compose.document.templates.cv.v2.data.CvDocument; -import com.demcha.compose.document.templates.cv.v2.presets.BoxedSections; +import com.demcha.compose.document.templates.cv.data.CvDocument; +import com.demcha.compose.document.templates.cv.presets.BoxedSections; import com.demcha.examples.support.ExampleDataFactory; import com.demcha.examples.support.ExampleOutputPaths; diff --git a/examples/src/main/java/com/demcha/examples/templates/cv/v2/CvCenteredHeadlineExample.java b/examples/src/main/java/com/demcha/examples/templates/cv/v2/CvCenteredHeadlineExample.java index 3de1c4006..90b3e9794 100644 --- a/examples/src/main/java/com/demcha/examples/templates/cv/v2/CvCenteredHeadlineExample.java +++ b/examples/src/main/java/com/demcha/examples/templates/cv/v2/CvCenteredHeadlineExample.java @@ -4,8 +4,8 @@ import com.demcha.compose.document.api.DocumentPageSize; import com.demcha.compose.document.api.DocumentSession; import com.demcha.compose.document.templates.api.DocumentTemplate; -import com.demcha.compose.document.templates.cv.v2.data.CvDocument; -import com.demcha.compose.document.templates.cv.v2.presets.CenteredHeadline; +import com.demcha.compose.document.templates.cv.data.CvDocument; +import com.demcha.compose.document.templates.cv.presets.CenteredHeadline; import com.demcha.examples.support.ExampleDataFactory; import com.demcha.examples.support.ExampleOutputPaths; diff --git a/examples/src/main/java/com/demcha/examples/templates/cv/v2/CvClassicSerifExample.java b/examples/src/main/java/com/demcha/examples/templates/cv/v2/CvClassicSerifExample.java index 4ca5e88c9..cdcc46643 100644 --- a/examples/src/main/java/com/demcha/examples/templates/cv/v2/CvClassicSerifExample.java +++ b/examples/src/main/java/com/demcha/examples/templates/cv/v2/CvClassicSerifExample.java @@ -4,8 +4,8 @@ import com.demcha.compose.document.api.DocumentPageSize; import com.demcha.compose.document.api.DocumentSession; import com.demcha.compose.document.templates.api.DocumentTemplate; -import com.demcha.compose.document.templates.cv.v2.data.CvDocument; -import com.demcha.compose.document.templates.cv.v2.presets.ClassicSerif; +import com.demcha.compose.document.templates.cv.data.CvDocument; +import com.demcha.compose.document.templates.cv.presets.ClassicSerif; import com.demcha.examples.support.ExampleDataFactory; import com.demcha.examples.support.ExampleOutputPaths; diff --git a/examples/src/main/java/com/demcha/examples/templates/cv/v2/CvCompactMonoExample.java b/examples/src/main/java/com/demcha/examples/templates/cv/v2/CvCompactMonoExample.java index 8df7a32ee..66efe5648 100644 --- a/examples/src/main/java/com/demcha/examples/templates/cv/v2/CvCompactMonoExample.java +++ b/examples/src/main/java/com/demcha/examples/templates/cv/v2/CvCompactMonoExample.java @@ -4,8 +4,8 @@ import com.demcha.compose.document.api.DocumentPageSize; import com.demcha.compose.document.api.DocumentSession; import com.demcha.compose.document.templates.api.DocumentTemplate; -import com.demcha.compose.document.templates.cv.v2.data.CvDocument; -import com.demcha.compose.document.templates.cv.v2.presets.CompactMono; +import com.demcha.compose.document.templates.cv.data.CvDocument; +import com.demcha.compose.document.templates.cv.presets.CompactMono; import com.demcha.examples.support.ExampleDataFactory; import com.demcha.examples.support.ExampleOutputPaths; diff --git a/examples/src/main/java/com/demcha/examples/templates/cv/v2/CvEditorialBlueExample.java b/examples/src/main/java/com/demcha/examples/templates/cv/v2/CvEditorialBlueExample.java index 7558c1971..e2d2a450d 100644 --- a/examples/src/main/java/com/demcha/examples/templates/cv/v2/CvEditorialBlueExample.java +++ b/examples/src/main/java/com/demcha/examples/templates/cv/v2/CvEditorialBlueExample.java @@ -4,8 +4,8 @@ import com.demcha.compose.document.api.DocumentPageSize; import com.demcha.compose.document.api.DocumentSession; import com.demcha.compose.document.templates.api.DocumentTemplate; -import com.demcha.compose.document.templates.cv.v2.data.CvDocument; -import com.demcha.compose.document.templates.cv.v2.presets.EditorialBlue; +import com.demcha.compose.document.templates.cv.data.CvDocument; +import com.demcha.compose.document.templates.cv.presets.EditorialBlue; import com.demcha.examples.support.ExampleDataFactory; import com.demcha.examples.support.ExampleOutputPaths; diff --git a/examples/src/main/java/com/demcha/examples/templates/cv/v2/CvEngineeringResumeExample.java b/examples/src/main/java/com/demcha/examples/templates/cv/v2/CvEngineeringResumeExample.java index 4742fe4a0..8dac56467 100644 --- a/examples/src/main/java/com/demcha/examples/templates/cv/v2/CvEngineeringResumeExample.java +++ b/examples/src/main/java/com/demcha/examples/templates/cv/v2/CvEngineeringResumeExample.java @@ -4,8 +4,8 @@ import com.demcha.compose.document.api.DocumentPageSize; import com.demcha.compose.document.api.DocumentSession; import com.demcha.compose.document.templates.api.DocumentTemplate; -import com.demcha.compose.document.templates.cv.v2.data.CvDocument; -import com.demcha.compose.document.templates.cv.v2.presets.EngineeringResume; +import com.demcha.compose.document.templates.cv.data.CvDocument; +import com.demcha.compose.document.templates.cv.presets.EngineeringResume; import com.demcha.examples.support.ExampleDataFactory; import com.demcha.examples.support.ExampleOutputPaths; diff --git a/examples/src/main/java/com/demcha/examples/templates/cv/v2/CvExecutiveExample.java b/examples/src/main/java/com/demcha/examples/templates/cv/v2/CvExecutiveExample.java index 5ce0d8a02..69bd6d578 100644 --- a/examples/src/main/java/com/demcha/examples/templates/cv/v2/CvExecutiveExample.java +++ b/examples/src/main/java/com/demcha/examples/templates/cv/v2/CvExecutiveExample.java @@ -4,8 +4,8 @@ import com.demcha.compose.document.api.DocumentPageSize; import com.demcha.compose.document.api.DocumentSession; import com.demcha.compose.document.templates.api.DocumentTemplate; -import com.demcha.compose.document.templates.cv.v2.data.CvDocument; -import com.demcha.compose.document.templates.cv.v2.presets.Executive; +import com.demcha.compose.document.templates.cv.data.CvDocument; +import com.demcha.compose.document.templates.cv.presets.Executive; import com.demcha.examples.support.ExampleDataFactory; import com.demcha.examples.support.ExampleOutputPaths; diff --git a/examples/src/main/java/com/demcha/examples/templates/cv/v2/CvMinimalUnderlinedExample.java b/examples/src/main/java/com/demcha/examples/templates/cv/v2/CvMinimalUnderlinedExample.java index 9b85bb619..68b1e9f29 100644 --- a/examples/src/main/java/com/demcha/examples/templates/cv/v2/CvMinimalUnderlinedExample.java +++ b/examples/src/main/java/com/demcha/examples/templates/cv/v2/CvMinimalUnderlinedExample.java @@ -4,8 +4,8 @@ import com.demcha.compose.document.api.DocumentPageSize; import com.demcha.compose.document.api.DocumentSession; import com.demcha.compose.document.templates.api.DocumentTemplate; -import com.demcha.compose.document.templates.cv.v2.data.CvDocument; -import com.demcha.compose.document.templates.cv.v2.presets.MinimalUnderlined; +import com.demcha.compose.document.templates.cv.data.CvDocument; +import com.demcha.compose.document.templates.cv.presets.MinimalUnderlined; import com.demcha.examples.support.ExampleDataFactory; import com.demcha.examples.support.ExampleOutputPaths; diff --git a/examples/src/main/java/com/demcha/examples/templates/cv/v2/CvMintEditorialCustomExample.java b/examples/src/main/java/com/demcha/examples/templates/cv/v2/CvMintEditorialCustomExample.java index fd2a9e79e..8f9b4a260 100644 --- a/examples/src/main/java/com/demcha/examples/templates/cv/v2/CvMintEditorialCustomExample.java +++ b/examples/src/main/java/com/demcha/examples/templates/cv/v2/CvMintEditorialCustomExample.java @@ -5,8 +5,8 @@ import com.demcha.compose.document.api.DocumentSession; import com.demcha.compose.document.style.DocumentColor; import com.demcha.compose.document.templates.api.DocumentTemplate; -import com.demcha.compose.document.templates.cv.v2.data.CvDocument; -import com.demcha.compose.document.templates.cv.v2.presets.MintEditorial; +import com.demcha.compose.document.templates.cv.data.CvDocument; +import com.demcha.compose.document.templates.cv.presets.MintEditorial; import com.demcha.examples.support.ExampleDataFactory; import com.demcha.examples.support.ExampleOutputPaths; diff --git a/examples/src/main/java/com/demcha/examples/templates/cv/v2/CvMintEditorialExample.java b/examples/src/main/java/com/demcha/examples/templates/cv/v2/CvMintEditorialExample.java index 8cd244ad8..575d59e62 100644 --- a/examples/src/main/java/com/demcha/examples/templates/cv/v2/CvMintEditorialExample.java +++ b/examples/src/main/java/com/demcha/examples/templates/cv/v2/CvMintEditorialExample.java @@ -4,9 +4,9 @@ import com.demcha.compose.document.api.DocumentPageSize; import com.demcha.compose.document.api.DocumentSession; import com.demcha.compose.document.templates.api.DocumentTemplate; -import com.demcha.compose.document.templates.cv.v2.data.CvDocument; +import com.demcha.compose.document.templates.cv.data.CvDocument; import com.demcha.compose.document.exceptions.DocumentRenderingException; -import com.demcha.compose.document.templates.cv.v2.presets.MintEditorial; +import com.demcha.compose.document.templates.cv.presets.MintEditorial; import com.demcha.examples.support.ExampleDataFactory; import com.demcha.examples.support.ExampleOutputPaths; diff --git a/examples/src/main/java/com/demcha/examples/templates/cv/v2/CvModernV2Example.java b/examples/src/main/java/com/demcha/examples/templates/cv/v2/CvModernV2Example.java index a3e234796..f8ea378c7 100644 --- a/examples/src/main/java/com/demcha/examples/templates/cv/v2/CvModernV2Example.java +++ b/examples/src/main/java/com/demcha/examples/templates/cv/v2/CvModernV2Example.java @@ -4,8 +4,8 @@ import com.demcha.compose.document.api.DocumentPageSize; import com.demcha.compose.document.api.DocumentSession; import com.demcha.compose.document.templates.api.DocumentTemplate; -import com.demcha.compose.document.templates.cv.v2.data.CvDocument; -import com.demcha.compose.document.templates.cv.v2.presets.ModernProfessional; +import com.demcha.compose.document.templates.cv.data.CvDocument; +import com.demcha.compose.document.templates.cv.presets.ModernProfessional; import com.demcha.examples.support.ExampleDataFactory; import com.demcha.examples.support.ExampleOutputPaths; diff --git a/examples/src/main/java/com/demcha/examples/templates/cv/v2/CvMonogramSidebarExample.java b/examples/src/main/java/com/demcha/examples/templates/cv/v2/CvMonogramSidebarExample.java index a50ea1f5f..21079753d 100644 --- a/examples/src/main/java/com/demcha/examples/templates/cv/v2/CvMonogramSidebarExample.java +++ b/examples/src/main/java/com/demcha/examples/templates/cv/v2/CvMonogramSidebarExample.java @@ -4,8 +4,8 @@ import com.demcha.compose.document.api.DocumentPageSize; import com.demcha.compose.document.api.DocumentSession; import com.demcha.compose.document.templates.api.DocumentTemplate; -import com.demcha.compose.document.templates.cv.v2.data.CvDocument; -import com.demcha.compose.document.templates.cv.v2.presets.MonogramSidebar; +import com.demcha.compose.document.templates.cv.data.CvDocument; +import com.demcha.compose.document.templates.cv.presets.MonogramSidebar; import com.demcha.examples.support.ExampleDataFactory; import com.demcha.examples.support.ExampleOutputPaths; diff --git a/examples/src/main/java/com/demcha/examples/templates/cv/v2/CvNordicCleanExample.java b/examples/src/main/java/com/demcha/examples/templates/cv/v2/CvNordicCleanExample.java index 95ec0e7a0..12526e26c 100644 --- a/examples/src/main/java/com/demcha/examples/templates/cv/v2/CvNordicCleanExample.java +++ b/examples/src/main/java/com/demcha/examples/templates/cv/v2/CvNordicCleanExample.java @@ -4,8 +4,8 @@ import com.demcha.compose.document.api.DocumentPageSize; import com.demcha.compose.document.api.DocumentSession; import com.demcha.compose.document.templates.api.DocumentTemplate; -import com.demcha.compose.document.templates.cv.v2.data.CvDocument; -import com.demcha.compose.document.templates.cv.v2.presets.NordicClean; +import com.demcha.compose.document.templates.cv.data.CvDocument; +import com.demcha.compose.document.templates.cv.presets.NordicClean; import com.demcha.examples.support.ExampleDataFactory; import com.demcha.examples.support.ExampleOutputPaths; diff --git a/examples/src/main/java/com/demcha/examples/templates/cv/v2/CvPanelExample.java b/examples/src/main/java/com/demcha/examples/templates/cv/v2/CvPanelExample.java index 688c4ba0c..1c8df9511 100644 --- a/examples/src/main/java/com/demcha/examples/templates/cv/v2/CvPanelExample.java +++ b/examples/src/main/java/com/demcha/examples/templates/cv/v2/CvPanelExample.java @@ -4,8 +4,8 @@ import com.demcha.compose.document.api.DocumentPageSize; import com.demcha.compose.document.api.DocumentSession; import com.demcha.compose.document.templates.api.DocumentTemplate; -import com.demcha.compose.document.templates.cv.v2.data.CvDocument; -import com.demcha.compose.document.templates.cv.v2.presets.Panel; +import com.demcha.compose.document.templates.cv.data.CvDocument; +import com.demcha.compose.document.templates.cv.presets.Panel; import com.demcha.examples.support.ExampleDataFactory; import com.demcha.examples.support.ExampleOutputPaths; diff --git a/examples/src/main/java/com/demcha/examples/templates/cv/v2/CvSidebarPortraitExample.java b/examples/src/main/java/com/demcha/examples/templates/cv/v2/CvSidebarPortraitExample.java index 01c6460c0..a9dab68f9 100644 --- a/examples/src/main/java/com/demcha/examples/templates/cv/v2/CvSidebarPortraitExample.java +++ b/examples/src/main/java/com/demcha/examples/templates/cv/v2/CvSidebarPortraitExample.java @@ -4,8 +4,8 @@ import com.demcha.compose.document.api.DocumentPageSize; import com.demcha.compose.document.api.DocumentSession; import com.demcha.compose.document.templates.api.DocumentTemplate; -import com.demcha.compose.document.templates.cv.v2.data.CvDocument; -import com.demcha.compose.document.templates.cv.v2.presets.SidebarPortrait; +import com.demcha.compose.document.templates.cv.data.CvDocument; +import com.demcha.compose.document.templates.cv.presets.SidebarPortrait; import com.demcha.examples.support.ExampleDataFactory; import com.demcha.examples.support.ExampleOutputPaths; diff --git a/examples/src/main/java/com/demcha/examples/templates/cv/v2/CvTimelineMinimalExample.java b/examples/src/main/java/com/demcha/examples/templates/cv/v2/CvTimelineMinimalExample.java index 884018c93..a3e031cc3 100644 --- a/examples/src/main/java/com/demcha/examples/templates/cv/v2/CvTimelineMinimalExample.java +++ b/examples/src/main/java/com/demcha/examples/templates/cv/v2/CvTimelineMinimalExample.java @@ -4,8 +4,8 @@ import com.demcha.compose.document.api.DocumentPageSize; import com.demcha.compose.document.api.DocumentSession; import com.demcha.compose.document.templates.api.DocumentTemplate; -import com.demcha.compose.document.templates.cv.v2.data.CvDocument; -import com.demcha.compose.document.templates.cv.v2.presets.TimelineMinimal; +import com.demcha.compose.document.templates.cv.data.CvDocument; +import com.demcha.compose.document.templates.cv.presets.TimelineMinimal; import com.demcha.examples.support.ExampleDataFactory; import com.demcha.examples.support.ExampleOutputPaths; diff --git a/src/main/java/com/demcha/compose/document/templates/core/theme/BrandTheme.java b/src/main/java/com/demcha/compose/document/templates/core/theme/BrandTheme.java index eb9aa07cd..64743a6e1 100644 --- a/src/main/java/com/demcha/compose/document/templates/core/theme/BrandTheme.java +++ b/src/main/java/com/demcha/compose/document/templates/core/theme/BrandTheme.java @@ -9,7 +9,7 @@ /** * Aggregate cosmetic theme — palette + typography + spacing — passed - * to every component renderer in {@code cv/v2/components}. + * to every component renderer in {@code cv/components}. * *

This is the only place a CV preset reads colour, * font, size, or spacing values from. Renderers never inline literal diff --git a/src/main/java/com/demcha/compose/document/templates/core/theme/Typography.java b/src/main/java/com/demcha/compose/document/templates/core/theme/Typography.java index 3190ec344..7e0b5eda9 100644 --- a/src/main/java/com/demcha/compose/document/templates/core/theme/Typography.java +++ b/src/main/java/com/demcha/compose/document/templates/core/theme/Typography.java @@ -93,7 +93,7 @@ public static Typography modernProfessional() { * 8-9pt for a classic-resume density. * *

{@code sizeBanner} feeds the - * {@link com.demcha.compose.document.templates.cv.v2.widgets.SectionHeader#flatSpacedCaps} + * {@link com.demcha.compose.document.templates.cv.widgets.SectionHeader#flatSpacedCaps} * variant — small bold spaced-caps title in the soft palette * tone.

* diff --git a/src/main/java/com/demcha/compose/document/templates/coverletter/data/CoverLetterDocument.java b/src/main/java/com/demcha/compose/document/templates/coverletter/data/CoverLetterDocument.java index 9b6d72fd3..b0b492986 100644 --- a/src/main/java/com/demcha/compose/document/templates/coverletter/data/CoverLetterDocument.java +++ b/src/main/java/com/demcha/compose/document/templates/coverletter/data/CoverLetterDocument.java @@ -1,6 +1,6 @@ package com.demcha.compose.document.templates.coverletter.data; -import com.demcha.compose.document.templates.cv.v2.data.CvIdentity; +import com.demcha.compose.document.templates.cv.data.CvIdentity; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/com/demcha/compose/document/templates/coverletter/data/package-info.java b/src/main/java/com/demcha/compose/document/templates/coverletter/data/package-info.java index 3fa0ace28..43d0cefec 100644 --- a/src/main/java/com/demcha/compose/document/templates/coverletter/data/package-info.java +++ b/src/main/java/com/demcha/compose/document/templates/coverletter/data/package-info.java @@ -3,7 +3,7 @@ * *

{@link com.demcha.compose.document.templates.coverletter.data.CoverLetterDocument} * is the single input type — it reuses - * {@link com.demcha.compose.document.templates.cv.v2.data.CvIdentity} + * {@link com.demcha.compose.document.templates.cv.data.CvIdentity} * for the masthead so a CV and its paired letter share one identity * object and render identical headers.

*/ diff --git a/src/main/java/com/demcha/compose/document/templates/coverletter/presets/BlueBannerLetter.java b/src/main/java/com/demcha/compose/document/templates/coverletter/presets/BlueBannerLetter.java index d35ac4827..745a2af67 100644 --- a/src/main/java/com/demcha/compose/document/templates/coverletter/presets/BlueBannerLetter.java +++ b/src/main/java/com/demcha/compose/document/templates/coverletter/presets/BlueBannerLetter.java @@ -15,7 +15,7 @@ * v2 cover-letter pair for the {@code BlueBanner} CV preset. * *

Renders the identical masthead as - * {@link com.demcha.compose.document.templates.cv.v2.presets.BlueBanner} + * {@link com.demcha.compose.document.templates.cv.presets.BlueBanner} * — a centred PT-Serif spaced-caps name over a compact centred contact * row — then a single-column letter body via the shared * {@link LetterBody}. Both documents read everything from diff --git a/src/main/java/com/demcha/compose/document/templates/coverletter/presets/BoxedSectionsLetter.java b/src/main/java/com/demcha/compose/document/templates/coverletter/presets/BoxedSectionsLetter.java index f31f40443..8dbaa459a 100644 --- a/src/main/java/com/demcha/compose/document/templates/coverletter/presets/BoxedSectionsLetter.java +++ b/src/main/java/com/demcha/compose/document/templates/coverletter/presets/BoxedSectionsLetter.java @@ -15,7 +15,7 @@ * v2 cover-letter pair for the {@code BoxedSections} CV preset. * *

Renders the identical masthead as - * {@link com.demcha.compose.document.templates.cv.v2.presets.BoxedSections} + * {@link com.demcha.compose.document.templates.cv.presets.BoxedSections} * — a centred letter-spaced PT-Serif name with a thin rule beneath it, * then a centred pipe-separated contact line with its own rule beneath * — then a single-column letter body via the shared {@link LetterBody}. diff --git a/src/main/java/com/demcha/compose/document/templates/coverletter/presets/CenteredHeadlineLetter.java b/src/main/java/com/demcha/compose/document/templates/coverletter/presets/CenteredHeadlineLetter.java index c0c0b1548..09b10378c 100644 --- a/src/main/java/com/demcha/compose/document/templates/coverletter/presets/CenteredHeadlineLetter.java +++ b/src/main/java/com/demcha/compose/document/templates/coverletter/presets/CenteredHeadlineLetter.java @@ -10,7 +10,7 @@ import com.demcha.compose.document.templates.coverletter.components.LetterBody; import com.demcha.compose.document.templates.coverletter.data.CoverLetterDocument; import com.demcha.compose.document.templates.core.text.TextStyles; -import com.demcha.compose.document.templates.cv.v2.data.CvIdentity; +import com.demcha.compose.document.templates.cv.data.CvIdentity; import com.demcha.compose.document.templates.core.theme.BrandTheme; import com.demcha.compose.document.templates.core.identity.ContactLine; import com.demcha.compose.document.templates.core.identity.Headline; @@ -22,7 +22,7 @@ * v2 cover-letter pair for the {@code CenteredHeadline} CV preset. * *

Renders the identical masthead as - * {@link com.demcha.compose.document.templates.cv.v2.presets.CenteredHeadline} + * {@link com.demcha.compose.document.templates.cv.presets.CenteredHeadline} * — a centred letter-spaced Poppins name, a small spaced-caps * subheadline, and a centred contact line framed by thin full-width * rules — then a single-column letter body via the shared diff --git a/src/main/java/com/demcha/compose/document/templates/coverletter/presets/ClassicSerifLetter.java b/src/main/java/com/demcha/compose/document/templates/coverletter/presets/ClassicSerifLetter.java index 822c4fd1e..50737ed2f 100644 --- a/src/main/java/com/demcha/compose/document/templates/coverletter/presets/ClassicSerifLetter.java +++ b/src/main/java/com/demcha/compose/document/templates/coverletter/presets/ClassicSerifLetter.java @@ -10,7 +10,7 @@ import com.demcha.compose.document.templates.coverletter.components.LetterBody; import com.demcha.compose.document.templates.coverletter.data.CoverLetterDocument; import com.demcha.compose.document.templates.core.text.TextStyles; -import com.demcha.compose.document.templates.cv.v2.data.CvIdentity; +import com.demcha.compose.document.templates.cv.data.CvIdentity; import com.demcha.compose.document.templates.core.theme.BrandTheme; import com.demcha.compose.document.templates.core.identity.ContactLine; import com.demcha.compose.document.templates.core.identity.Headline; @@ -21,7 +21,7 @@ * v2 cover-letter pair for the {@code ClassicSerif} CV preset. * *

Renders the identical masthead as - * {@link com.demcha.compose.document.templates.cv.v2.presets.ClassicSerif} + * {@link com.demcha.compose.document.templates.cv.presets.ClassicSerif} * — a centred letter-spaced PT-Serif name, a thin tan rule, and a * centred contact line with tan-accent underlined links — then a * single-column letter body via the shared {@link LetterBody}. Both diff --git a/src/main/java/com/demcha/compose/document/templates/coverletter/presets/CompactMonoLetter.java b/src/main/java/com/demcha/compose/document/templates/coverletter/presets/CompactMonoLetter.java index 34d7f19e9..24a09715b 100644 --- a/src/main/java/com/demcha/compose/document/templates/coverletter/presets/CompactMonoLetter.java +++ b/src/main/java/com/demcha/compose/document/templates/coverletter/presets/CompactMonoLetter.java @@ -10,7 +10,7 @@ import com.demcha.compose.document.templates.coverletter.components.LetterBody; import com.demcha.compose.document.templates.coverletter.data.CoverLetterDocument; import com.demcha.compose.document.templates.core.text.TextStyles; -import com.demcha.compose.document.templates.cv.v2.data.CvIdentity; +import com.demcha.compose.document.templates.cv.data.CvIdentity; import com.demcha.compose.document.templates.core.theme.BrandTheme; import com.demcha.compose.document.templates.core.identity.ContactLine; import com.demcha.compose.document.templates.core.identity.Headline; @@ -24,7 +24,7 @@ * into the letter: a near-black rounded band holding the UPPERCASE * left-aligned name over a left-aligned contact line with cyan links and * grey separators — the same header as - * {@link com.demcha.compose.document.templates.cv.v2.presets.CompactMono}. + * {@link com.demcha.compose.document.templates.cv.presets.CompactMono}. * Below it, a single-column letter body via the shared * {@link LetterBody}. Body palette / typography come from * {@link BrandTheme#compactMono()}.

diff --git a/src/main/java/com/demcha/compose/document/templates/coverletter/presets/EditorialBlueLetter.java b/src/main/java/com/demcha/compose/document/templates/coverletter/presets/EditorialBlueLetter.java index 9c7a6d2bc..0508de223 100644 --- a/src/main/java/com/demcha/compose/document/templates/coverletter/presets/EditorialBlueLetter.java +++ b/src/main/java/com/demcha/compose/document/templates/coverletter/presets/EditorialBlueLetter.java @@ -20,7 +20,7 @@ * v2 cover-letter pair for the {@code EditorialBlue} CV preset. * *

Renders the identical masthead as - * {@link com.demcha.compose.document.templates.cv.v2.presets.EditorialBlue} + * {@link com.demcha.compose.document.templates.cv.presets.EditorialBlue} * — a centred navy Helvetica name (with the job-title subtitle), centred * contact metadata, and blue underlined profile links, via the shared * {@link Masthead#centered} widget — then a single-column letter body diff --git a/src/main/java/com/demcha/compose/document/templates/coverletter/presets/EngineeringResumeLetter.java b/src/main/java/com/demcha/compose/document/templates/coverletter/presets/EngineeringResumeLetter.java index bb5e30bda..064801c15 100644 --- a/src/main/java/com/demcha/compose/document/templates/coverletter/presets/EngineeringResumeLetter.java +++ b/src/main/java/com/demcha/compose/document/templates/coverletter/presets/EngineeringResumeLetter.java @@ -13,7 +13,7 @@ import com.demcha.compose.document.templates.coverletter.data.CoverLetterDocument; import com.demcha.compose.document.templates.core.text.TextStyles; import com.demcha.compose.document.templates.core.text.MarkdownInline; -import com.demcha.compose.document.templates.cv.v2.data.CvIdentity; +import com.demcha.compose.document.templates.cv.data.CvIdentity; import com.demcha.compose.document.templates.core.theme.BrandTheme; import java.util.ArrayList; @@ -29,7 +29,7 @@ * accent strip beneath) holding the UPPERCASE name + role subtitle on * the left and a right-aligned contact stack with cyan-green underlined * links — the same masthead as - * {@link com.demcha.compose.document.templates.cv.v2.presets.EngineeringResume}. + * {@link com.demcha.compose.document.templates.cv.presets.EngineeringResume}. * Below the band, a single-column letter body via the shared * {@link LetterBody}. Body palette / typography come from * {@link BrandTheme#engineeringResume()}.

diff --git a/src/main/java/com/demcha/compose/document/templates/coverletter/presets/ExecutiveLetter.java b/src/main/java/com/demcha/compose/document/templates/coverletter/presets/ExecutiveLetter.java index 7d43308cc..40486b572 100644 --- a/src/main/java/com/demcha/compose/document/templates/coverletter/presets/ExecutiveLetter.java +++ b/src/main/java/com/demcha/compose/document/templates/coverletter/presets/ExecutiveLetter.java @@ -16,7 +16,7 @@ import com.demcha.compose.document.templates.coverletter.data.CoverLetterDocument; import com.demcha.compose.document.templates.core.text.TextStyles; import com.demcha.compose.document.templates.core.text.TextOrnaments; -import com.demcha.compose.document.templates.cv.v2.data.CvIdentity; +import com.demcha.compose.document.templates.cv.data.CvIdentity; import com.demcha.compose.document.templates.core.theme.BrandTheme; import com.demcha.compose.document.templates.core.identity.Headline; import com.demcha.compose.font.FontName; @@ -27,7 +27,7 @@ * v2 cover-letter pair for the {@code Executive} CV preset. * *

Renders the identical masthead as - * {@link com.demcha.compose.document.templates.cv.v2.presets.Executive} + * {@link com.demcha.compose.document.templates.cv.presets.Executive} * — UPPERCASE name in deep slate, a {@code address | phone} meta line, a * bronze-underlined link row, and a thin full-width muted rule — then a * single-column letter body (greeting, paragraphs, closing) via the diff --git a/src/main/java/com/demcha/compose/document/templates/coverletter/presets/MintEditorialLetter.java b/src/main/java/com/demcha/compose/document/templates/coverletter/presets/MintEditorialLetter.java index 742de5ec0..0d6d4ffaf 100644 --- a/src/main/java/com/demcha/compose/document/templates/coverletter/presets/MintEditorialLetter.java +++ b/src/main/java/com/demcha/compose/document/templates/coverletter/presets/MintEditorialLetter.java @@ -14,7 +14,7 @@ import com.demcha.compose.document.templates.coverletter.data.CoverLetterDocument; import com.demcha.compose.document.templates.core.text.TextStyles; import com.demcha.compose.document.templates.core.text.TextOrnaments; -import com.demcha.compose.document.templates.cv.v2.data.CvIdentity; +import com.demcha.compose.document.templates.cv.data.CvIdentity; import com.demcha.compose.document.templates.core.theme.BrandTheme; import com.demcha.compose.document.templates.core.identity.Headline; import com.demcha.compose.document.templates.core.identity.Subheadline; @@ -35,7 +35,7 @@ * letter.

* *

The same {@link Options} colour knobs as the paired - * {@link com.demcha.compose.document.templates.cv.v2.presets.MintEditorial} + * {@link com.demcha.compose.document.templates.cv.presets.MintEditorial} * preset recolour the letter masthead (accent, rule, name, optional header * band), with identical defaults so the matched set stays in sync.

*/ diff --git a/src/main/java/com/demcha/compose/document/templates/coverletter/presets/ModernProfessionalLetter.java b/src/main/java/com/demcha/compose/document/templates/coverletter/presets/ModernProfessionalLetter.java index 5988c0ce9..aacedf52f 100644 --- a/src/main/java/com/demcha/compose/document/templates/coverletter/presets/ModernProfessionalLetter.java +++ b/src/main/java/com/demcha/compose/document/templates/coverletter/presets/ModernProfessionalLetter.java @@ -20,7 +20,7 @@ * v2 cover-letter pair for the {@code ModernProfessional} CV preset. * *

Renders the identical masthead as - * {@link com.demcha.compose.document.templates.cv.v2.presets.ModernProfessional} + * {@link com.demcha.compose.document.templates.cv.presets.ModernProfessional} * — a right-aligned slate-blue Helvetica display name over a two-row, * right-aligned contact stack with royal-blue underlined links and a * bottom accent rule — then a single-column letter body via the shared diff --git a/src/main/java/com/demcha/compose/document/templates/coverletter/presets/MonogramSidebarLetter.java b/src/main/java/com/demcha/compose/document/templates/coverletter/presets/MonogramSidebarLetter.java index e3b4c818e..0fc1fce11 100644 --- a/src/main/java/com/demcha/compose/document/templates/coverletter/presets/MonogramSidebarLetter.java +++ b/src/main/java/com/demcha/compose/document/templates/coverletter/presets/MonogramSidebarLetter.java @@ -12,8 +12,8 @@ import com.demcha.compose.document.templates.coverletter.data.CoverLetterDocument; import com.demcha.compose.document.templates.core.text.TextStyles; import com.demcha.compose.document.templates.core.text.TextOrnaments; -import com.demcha.compose.document.templates.cv.v2.data.CvIdentity; -import com.demcha.compose.document.templates.cv.v2.data.CvName; +import com.demcha.compose.document.templates.cv.data.CvIdentity; +import com.demcha.compose.document.templates.cv.data.CvName; import com.demcha.compose.document.templates.core.theme.BrandTheme; import com.demcha.compose.document.templates.core.identity.ContactLine; import com.demcha.compose.font.FontName; diff --git a/src/main/java/com/demcha/compose/document/templates/coverletter/presets/NordicCleanLetter.java b/src/main/java/com/demcha/compose/document/templates/coverletter/presets/NordicCleanLetter.java index da6dfd347..0dc797842 100644 --- a/src/main/java/com/demcha/compose/document/templates/coverletter/presets/NordicCleanLetter.java +++ b/src/main/java/com/demcha/compose/document/templates/coverletter/presets/NordicCleanLetter.java @@ -11,7 +11,7 @@ import com.demcha.compose.document.templates.coverletter.data.CoverLetterDocument; import com.demcha.compose.document.templates.core.text.TextStyles; import com.demcha.compose.document.templates.core.text.MarkdownInline; -import com.demcha.compose.document.templates.cv.v2.data.CvIdentity; +import com.demcha.compose.document.templates.cv.data.CvIdentity; import com.demcha.compose.document.templates.core.theme.BrandTheme; import com.demcha.compose.document.templates.core.identity.ContactLine; import com.demcha.compose.document.templates.core.identity.Headline; @@ -26,7 +26,7 @@ * Barlow name with a short teal accent bar beneath it * and an UPPERCASE role sub-line, balanced by a right-aligned stacked * contact list with teal links — the same masthead as - * {@link com.demcha.compose.document.templates.cv.v2.presets.NordicClean}. + * {@link com.demcha.compose.document.templates.cv.presets.NordicClean}. * Below it, a single-column letter body via the shared * {@link LetterBody}. Body palette / typography come from * {@link BrandTheme#nordicClean()}; the CV's tinted profile band is a diff --git a/src/main/java/com/demcha/compose/document/templates/coverletter/presets/PanelLetter.java b/src/main/java/com/demcha/compose/document/templates/coverletter/presets/PanelLetter.java index fe142d3d2..8f42999d4 100644 --- a/src/main/java/com/demcha/compose/document/templates/coverletter/presets/PanelLetter.java +++ b/src/main/java/com/demcha/compose/document/templates/coverletter/presets/PanelLetter.java @@ -13,7 +13,7 @@ import com.demcha.compose.document.templates.coverletter.data.CoverLetterDocument; import com.demcha.compose.document.templates.core.text.TextStyles; import com.demcha.compose.document.templates.core.text.TextOrnaments; -import com.demcha.compose.document.templates.cv.v2.data.CvIdentity; +import com.demcha.compose.document.templates.cv.data.CvIdentity; import com.demcha.compose.document.templates.core.theme.BrandTheme; import com.demcha.compose.document.templates.core.widgets.CardWidget; import com.demcha.compose.font.FontName; @@ -28,7 +28,7 @@ * into the letter: a full-width rounded card (thin teal stroke) holding * the centred UPPERCASE Poppins name, job title, centred meta line, and * a centred link row with teal accent links — the same header card as - * {@link com.demcha.compose.document.templates.cv.v2.presets.Panel}. + * {@link com.demcha.compose.document.templates.cv.presets.Panel}. * Below it, a single-column letter body via the shared * {@link LetterBody}. Card shell + body palette come from * {@link BrandTheme#panel()}.

diff --git a/src/main/java/com/demcha/compose/document/templates/coverletter/presets/SidebarPortraitLetter.java b/src/main/java/com/demcha/compose/document/templates/coverletter/presets/SidebarPortraitLetter.java index ef18a8467..916212883 100644 --- a/src/main/java/com/demcha/compose/document/templates/coverletter/presets/SidebarPortraitLetter.java +++ b/src/main/java/com/demcha/compose/document/templates/coverletter/presets/SidebarPortraitLetter.java @@ -11,7 +11,7 @@ import com.demcha.compose.document.templates.coverletter.data.CoverLetterDocument; import com.demcha.compose.document.templates.core.text.TextStyles; import com.demcha.compose.document.templates.core.text.TextOrnaments; -import com.demcha.compose.document.templates.cv.v2.data.CvIdentity; +import com.demcha.compose.document.templates.cv.data.CvIdentity; import com.demcha.compose.document.templates.core.theme.BrandTheme; import com.demcha.compose.document.templates.core.identity.ContactLine; diff --git a/src/main/java/com/demcha/compose/document/templates/coverletter/presets/TimelineMinimalLetter.java b/src/main/java/com/demcha/compose/document/templates/coverletter/presets/TimelineMinimalLetter.java index b12c7abe9..f8aceb090 100644 --- a/src/main/java/com/demcha/compose/document/templates/coverletter/presets/TimelineMinimalLetter.java +++ b/src/main/java/com/demcha/compose/document/templates/coverletter/presets/TimelineMinimalLetter.java @@ -16,9 +16,9 @@ import com.demcha.compose.document.templates.coverletter.components.LetterBody; import com.demcha.compose.document.templates.coverletter.data.CoverLetterDocument; import com.demcha.compose.document.templates.core.text.TextStyles; -import com.demcha.compose.document.templates.cv.v2.components.SectionLookup; +import com.demcha.compose.document.templates.cv.components.SectionLookup; import com.demcha.compose.document.templates.core.text.TextOrnaments; -import com.demcha.compose.document.templates.cv.v2.data.CvIdentity; +import com.demcha.compose.document.templates.cv.data.CvIdentity; import com.demcha.compose.document.templates.core.theme.BrandTheme; import com.demcha.compose.document.templates.core.identity.SvgGlyph; @@ -32,7 +32,7 @@ * where each line ends with its recolorable SVG glyph icon (LinkedIn / GitHub / * location / phone / email), all under a thin full-width rule — the same * header as - * {@link com.demcha.compose.document.templates.cv.v2.presets.TimelineMinimal}. + * {@link com.demcha.compose.document.templates.cv.presets.TimelineMinimal}. * Below it, a single-column letter body via the shared {@link LetterBody}. * Palette / typography come from {@link BrandTheme#timelineMinimal()}; the * CV's three-column timeline axis is a body element and is not part of diff --git a/src/main/java/com/demcha/compose/document/templates/cv/v2/AUTHORS.md b/src/main/java/com/demcha/compose/document/templates/cv/AUTHORS.md similarity index 99% rename from src/main/java/com/demcha/compose/document/templates/cv/v2/AUTHORS.md rename to src/main/java/com/demcha/compose/document/templates/cv/AUTHORS.md index 316ad85a6..ad16d701b 100644 --- a/src/main/java/com/demcha/compose/document/templates/cv/v2/AUTHORS.md +++ b/src/main/java/com/demcha/compose/document/templates/cv/AUTHORS.md @@ -319,7 +319,7 @@ When you build a preset, you compose your `compose()` method from `ContactLine`, `Masthead`, `SvgGlyph`) live in `com.demcha.compose.document.templates.core.identity`; the CV-specific section widgets (`SectionHeader` and friends) live in -`com.demcha.compose.document.templates.cv.v2.widgets`. Each widget +`com.demcha.compose.document.templates.cv.widgets`. Each widget captures one visual idea, with named variants per visual style. This means your preset reads as a sequence of visual decisions, not @@ -458,7 +458,7 @@ variant or add a parameter to an existing one. Don't pre-extract. |---|---| | 1 preset only | Inline. Leave it alone. | | 2 presets | Add a new factory method to an existing widget, OR add a parameter. | -| 3+ presets | It's its own widget. New class in `cv/v2/widgets/`. | +| 3+ presets | It's its own widget. New class in `cv/widgets/`. | ### Examples of widgets we could add (not done yet) diff --git a/src/main/java/com/demcha/compose/document/templates/cv/v2/components/EntryCompactRenderer.java b/src/main/java/com/demcha/compose/document/templates/cv/components/EntryCompactRenderer.java similarity index 99% rename from src/main/java/com/demcha/compose/document/templates/cv/v2/components/EntryCompactRenderer.java rename to src/main/java/com/demcha/compose/document/templates/cv/components/EntryCompactRenderer.java index 543157952..9d3666a9d 100644 --- a/src/main/java/com/demcha/compose/document/templates/cv/v2/components/EntryCompactRenderer.java +++ b/src/main/java/com/demcha/compose/document/templates/cv/components/EntryCompactRenderer.java @@ -1,4 +1,4 @@ -package com.demcha.compose.document.templates.cv.v2.components; +package com.demcha.compose.document.templates.cv.components; import com.demcha.compose.document.templates.core.text.MarkdownInline; import com.demcha.compose.document.templates.core.text.RichParagraphRenderer; @@ -7,7 +7,7 @@ import com.demcha.compose.document.node.TextAlign; import com.demcha.compose.document.style.DocumentInsets; import com.demcha.compose.document.style.DocumentTextStyle; -import com.demcha.compose.document.templates.cv.v2.data.CvEntry; +import com.demcha.compose.document.templates.cv.data.CvEntry; import java.util.Locale; diff --git a/src/main/java/com/demcha/compose/document/templates/cv/v2/components/EntryRenderer.java b/src/main/java/com/demcha/compose/document/templates/cv/components/EntryRenderer.java similarity index 96% rename from src/main/java/com/demcha/compose/document/templates/cv/v2/components/EntryRenderer.java rename to src/main/java/com/demcha/compose/document/templates/cv/components/EntryRenderer.java index 049cc9d15..869bcc1b0 100644 --- a/src/main/java/com/demcha/compose/document/templates/cv/v2/components/EntryRenderer.java +++ b/src/main/java/com/demcha/compose/document/templates/cv/components/EntryRenderer.java @@ -1,10 +1,10 @@ -package com.demcha.compose.document.templates.cv.v2.components; +package com.demcha.compose.document.templates.cv.components; import com.demcha.compose.document.dsl.SectionBuilder; import com.demcha.compose.document.node.TextAlign; import com.demcha.compose.document.style.DocumentInsets; import com.demcha.compose.document.style.DocumentTextStyle; -import com.demcha.compose.document.templates.cv.v2.data.CvEntry; +import com.demcha.compose.document.templates.cv.data.CvEntry; import com.demcha.compose.document.templates.core.theme.BrandTheme; /** diff --git a/src/main/java/com/demcha/compose/document/templates/cv/v2/components/LabelValueRenderer.java b/src/main/java/com/demcha/compose/document/templates/cv/components/LabelValueRenderer.java similarity index 97% rename from src/main/java/com/demcha/compose/document/templates/cv/v2/components/LabelValueRenderer.java rename to src/main/java/com/demcha/compose/document/templates/cv/components/LabelValueRenderer.java index be1fbf89d..4f22f901a 100644 --- a/src/main/java/com/demcha/compose/document/templates/cv/v2/components/LabelValueRenderer.java +++ b/src/main/java/com/demcha/compose/document/templates/cv/components/LabelValueRenderer.java @@ -1,4 +1,4 @@ -package com.demcha.compose.document.templates.cv.v2.components; +package com.demcha.compose.document.templates.cv.components; import com.demcha.compose.document.templates.core.text.MarkdownInline; diff --git a/src/main/java/com/demcha/compose/document/templates/cv/v2/components/ParagraphPrimitive.java b/src/main/java/com/demcha/compose/document/templates/cv/components/ParagraphPrimitive.java similarity index 98% rename from src/main/java/com/demcha/compose/document/templates/cv/v2/components/ParagraphPrimitive.java rename to src/main/java/com/demcha/compose/document/templates/cv/components/ParagraphPrimitive.java index 344da4403..ccc07ff11 100644 --- a/src/main/java/com/demcha/compose/document/templates/cv/v2/components/ParagraphPrimitive.java +++ b/src/main/java/com/demcha/compose/document/templates/cv/components/ParagraphPrimitive.java @@ -1,4 +1,4 @@ -package com.demcha.compose.document.templates.cv.v2.components; +package com.demcha.compose.document.templates.cv.components; import com.demcha.compose.document.templates.core.text.MarkdownInline; diff --git a/src/main/java/com/demcha/compose/document/templates/cv/v2/components/ParagraphRenderer.java b/src/main/java/com/demcha/compose/document/templates/cv/components/ParagraphRenderer.java similarity index 94% rename from src/main/java/com/demcha/compose/document/templates/cv/v2/components/ParagraphRenderer.java rename to src/main/java/com/demcha/compose/document/templates/cv/components/ParagraphRenderer.java index 1a3a5796f..b35c793ac 100644 --- a/src/main/java/com/demcha/compose/document/templates/cv/v2/components/ParagraphRenderer.java +++ b/src/main/java/com/demcha/compose/document/templates/cv/components/ParagraphRenderer.java @@ -1,4 +1,4 @@ -package com.demcha.compose.document.templates.cv.v2.components; +package com.demcha.compose.document.templates.cv.components; import com.demcha.compose.document.dsl.SectionBuilder; import com.demcha.compose.document.templates.core.theme.BrandTheme; diff --git a/src/main/java/com/demcha/compose/document/templates/cv/v2/components/ProjectLabel.java b/src/main/java/com/demcha/compose/document/templates/cv/components/ProjectLabel.java similarity index 98% rename from src/main/java/com/demcha/compose/document/templates/cv/v2/components/ProjectLabel.java rename to src/main/java/com/demcha/compose/document/templates/cv/components/ProjectLabel.java index 896dc0773..74c80f620 100644 --- a/src/main/java/com/demcha/compose/document/templates/cv/v2/components/ProjectLabel.java +++ b/src/main/java/com/demcha/compose/document/templates/cv/components/ProjectLabel.java @@ -1,4 +1,4 @@ -package com.demcha.compose.document.templates.cv.v2.components; +package com.demcha.compose.document.templates.cv.components; import com.demcha.compose.document.templates.core.text.MarkdownInline; diff --git a/src/main/java/com/demcha/compose/document/templates/cv/v2/components/ProjectRenderer.java b/src/main/java/com/demcha/compose/document/templates/cv/components/ProjectRenderer.java similarity index 98% rename from src/main/java/com/demcha/compose/document/templates/cv/v2/components/ProjectRenderer.java rename to src/main/java/com/demcha/compose/document/templates/cv/components/ProjectRenderer.java index e0c6990c9..cd762cf14 100644 --- a/src/main/java/com/demcha/compose/document/templates/cv/v2/components/ProjectRenderer.java +++ b/src/main/java/com/demcha/compose/document/templates/cv/components/ProjectRenderer.java @@ -1,4 +1,4 @@ -package com.demcha.compose.document.templates.cv.v2.components; +package com.demcha.compose.document.templates.cv.components; import com.demcha.compose.document.templates.core.text.MarkdownInline; import com.demcha.compose.document.templates.core.text.RichParagraphRenderer; @@ -7,7 +7,7 @@ import com.demcha.compose.document.node.TextAlign; import com.demcha.compose.document.style.DocumentInsets; import com.demcha.compose.document.style.DocumentTextStyle; -import com.demcha.compose.document.templates.cv.v2.data.CvRow; +import com.demcha.compose.document.templates.cv.data.CvRow; /** * Renders project rows that carry a title and optional technology diff --git a/src/main/java/com/demcha/compose/document/templates/cv/v2/components/RowRenderer.java b/src/main/java/com/demcha/compose/document/templates/cv/components/RowRenderer.java similarity index 95% rename from src/main/java/com/demcha/compose/document/templates/cv/v2/components/RowRenderer.java rename to src/main/java/com/demcha/compose/document/templates/cv/components/RowRenderer.java index 08b8ba9c8..c52daff12 100644 --- a/src/main/java/com/demcha/compose/document/templates/cv/v2/components/RowRenderer.java +++ b/src/main/java/com/demcha/compose/document/templates/cv/components/RowRenderer.java @@ -1,10 +1,10 @@ -package com.demcha.compose.document.templates.cv.v2.components; +package com.demcha.compose.document.templates.cv.components; import com.demcha.compose.document.dsl.SectionBuilder; import com.demcha.compose.document.style.DocumentInsets; import com.demcha.compose.document.style.DocumentTextStyle; -import com.demcha.compose.document.templates.cv.v2.data.CvRow; -import com.demcha.compose.document.templates.cv.v2.data.RowStyle; +import com.demcha.compose.document.templates.cv.data.CvRow; +import com.demcha.compose.document.templates.cv.data.RowStyle; import com.demcha.compose.document.templates.core.theme.BrandTheme; /** diff --git a/src/main/java/com/demcha/compose/document/templates/cv/v2/components/SectionDispatcher.java b/src/main/java/com/demcha/compose/document/templates/cv/components/SectionDispatcher.java similarity index 95% rename from src/main/java/com/demcha/compose/document/templates/cv/v2/components/SectionDispatcher.java rename to src/main/java/com/demcha/compose/document/templates/cv/components/SectionDispatcher.java index 9d059abee..c2280c71a 100644 --- a/src/main/java/com/demcha/compose/document/templates/cv/v2/components/SectionDispatcher.java +++ b/src/main/java/com/demcha/compose/document/templates/cv/components/SectionDispatcher.java @@ -1,7 +1,7 @@ -package com.demcha.compose.document.templates.cv.v2.components; +package com.demcha.compose.document.templates.cv.components; import com.demcha.compose.document.dsl.SectionBuilder; -import com.demcha.compose.document.templates.cv.v2.data.*; +import com.demcha.compose.document.templates.cv.data.*; import com.demcha.compose.document.templates.core.theme.BrandTheme; /** @@ -47,7 +47,7 @@ public static void renderBody(SectionBuilder host, CvSection section, BrandTheme // collapse into a wall of text. Single-line styles (PLAIN, // BULLETED) already breathe via paragraphMarginTop. boolean stackedNeedsSeparator = - r.style() == com.demcha.compose.document.templates.cv.v2.data.RowStyle.BULLETED_STACKED; + r.style() == com.demcha.compose.document.templates.cv.data.RowStyle.BULLETED_STACKED; for (int i = 0; i < r.rows().size(); i++) { if (i > 0 && stackedNeedsSeparator) { host.spacer(0, theme.spacing().entrySeparation()); diff --git a/src/main/java/com/demcha/compose/document/templates/cv/v2/components/SectionLookup.java b/src/main/java/com/demcha/compose/document/templates/cv/components/SectionLookup.java similarity index 96% rename from src/main/java/com/demcha/compose/document/templates/cv/v2/components/SectionLookup.java rename to src/main/java/com/demcha/compose/document/templates/cv/components/SectionLookup.java index 727c203a2..c116eb34f 100644 --- a/src/main/java/com/demcha/compose/document/templates/cv/v2/components/SectionLookup.java +++ b/src/main/java/com/demcha/compose/document/templates/cv/components/SectionLookup.java @@ -1,6 +1,6 @@ -package com.demcha.compose.document.templates.cv.v2.components; +package com.demcha.compose.document.templates.cv.components; -import com.demcha.compose.document.templates.cv.v2.data.*; +import com.demcha.compose.document.templates.cv.data.*; import java.util.List; diff --git a/src/main/java/com/demcha/compose/document/templates/cv/v2/components/SkillLineRenderer.java b/src/main/java/com/demcha/compose/document/templates/cv/components/SkillLineRenderer.java similarity index 94% rename from src/main/java/com/demcha/compose/document/templates/cv/v2/components/SkillLineRenderer.java rename to src/main/java/com/demcha/compose/document/templates/cv/components/SkillLineRenderer.java index fb0dad185..d5a551f2a 100644 --- a/src/main/java/com/demcha/compose/document/templates/cv/v2/components/SkillLineRenderer.java +++ b/src/main/java/com/demcha/compose/document/templates/cv/components/SkillLineRenderer.java @@ -1,4 +1,4 @@ -package com.demcha.compose.document.templates.cv.v2.components; +package com.demcha.compose.document.templates.cv.components; import com.demcha.compose.document.templates.core.text.MarkdownInline; @@ -6,7 +6,7 @@ import com.demcha.compose.document.node.TextAlign; import com.demcha.compose.document.style.DocumentInsets; import com.demcha.compose.document.style.DocumentTextStyle; -import com.demcha.compose.document.templates.cv.v2.data.SkillGroup; +import com.demcha.compose.document.templates.cv.data.SkillGroup; import java.util.List; diff --git a/src/main/java/com/demcha/compose/document/templates/cv/v2/components/SkillTableRenderer.java b/src/main/java/com/demcha/compose/document/templates/cv/components/SkillTableRenderer.java similarity index 92% rename from src/main/java/com/demcha/compose/document/templates/cv/v2/components/SkillTableRenderer.java rename to src/main/java/com/demcha/compose/document/templates/cv/components/SkillTableRenderer.java index a5c672cfe..b93c56a15 100644 --- a/src/main/java/com/demcha/compose/document/templates/cv/v2/components/SkillTableRenderer.java +++ b/src/main/java/com/demcha/compose/document/templates/cv/components/SkillTableRenderer.java @@ -1,7 +1,7 @@ -package com.demcha.compose.document.templates.cv.v2.components; +package com.demcha.compose.document.templates.cv.components; import com.demcha.compose.document.dsl.SectionBuilder; -import com.demcha.compose.document.templates.cv.v2.data.SkillGroup; +import com.demcha.compose.document.templates.cv.data.SkillGroup; import com.demcha.compose.document.templates.core.widgets.TableWidget; import java.util.ArrayList; diff --git a/src/main/java/com/demcha/compose/document/templates/cv/v2/components/SkillsRenderer.java b/src/main/java/com/demcha/compose/document/templates/cv/components/SkillsRenderer.java similarity index 89% rename from src/main/java/com/demcha/compose/document/templates/cv/v2/components/SkillsRenderer.java rename to src/main/java/com/demcha/compose/document/templates/cv/components/SkillsRenderer.java index 589979761..f59d2d036 100644 --- a/src/main/java/com/demcha/compose/document/templates/cv/v2/components/SkillsRenderer.java +++ b/src/main/java/com/demcha/compose/document/templates/cv/components/SkillsRenderer.java @@ -1,10 +1,10 @@ -package com.demcha.compose.document.templates.cv.v2.components; +package com.demcha.compose.document.templates.cv.components; import com.demcha.compose.document.dsl.SectionBuilder; import com.demcha.compose.document.style.DocumentInsets; import com.demcha.compose.document.style.DocumentTextStyle; -import com.demcha.compose.document.templates.cv.v2.data.SkillGroup; -import com.demcha.compose.document.templates.cv.v2.data.SkillsSection; +import com.demcha.compose.document.templates.cv.data.SkillGroup; +import com.demcha.compose.document.templates.cv.data.SkillsSection; import com.demcha.compose.document.templates.core.theme.BrandTheme; /** diff --git a/src/main/java/com/demcha/compose/document/templates/cv/v2/components/package-info.java b/src/main/java/com/demcha/compose/document/templates/cv/components/package-info.java similarity index 80% rename from src/main/java/com/demcha/compose/document/templates/cv/v2/components/package-info.java rename to src/main/java/com/demcha/compose/document/templates/cv/components/package-info.java index deece6d3f..775c1ff11 100644 --- a/src/main/java/com/demcha/compose/document/templates/cv/v2/components/package-info.java +++ b/src/main/java/com/demcha/compose/document/templates/cv/components/package-info.java @@ -3,7 +3,7 @@ * *

Every class here is a static helper that takes a host * {@link com.demcha.compose.document.dsl.SectionBuilder}, a - * {@code cv/v2/data} record, and a + * {@code cv/data} record, and a * {@link com.demcha.compose.document.templates.core.theme.BrandTheme}, * and draws the data into the host using the theme's tokens.

* @@ -20,10 +20,10 @@ * * *

The dispatch hub is - * {@link com.demcha.compose.document.templates.cv.v2.components.SectionDispatcher} + * {@link com.demcha.compose.document.templates.cv.components.SectionDispatcher} * — it pattern-matches on the sealed - * {@link com.demcha.compose.document.templates.cv.v2.data.CvSection} + * {@link com.demcha.compose.document.templates.cv.data.CvSection} * subtype and delegates to one of the row / entry / paragraph * renderers.

*/ -package com.demcha.compose.document.templates.cv.v2.components; +package com.demcha.compose.document.templates.cv.components; diff --git a/src/main/java/com/demcha/compose/document/templates/cv/v2/data/CvDocument.java b/src/main/java/com/demcha/compose/document/templates/cv/data/CvDocument.java similarity index 99% rename from src/main/java/com/demcha/compose/document/templates/cv/v2/data/CvDocument.java rename to src/main/java/com/demcha/compose/document/templates/cv/data/CvDocument.java index d9f7574da..a773f4c79 100644 --- a/src/main/java/com/demcha/compose/document/templates/cv/v2/data/CvDocument.java +++ b/src/main/java/com/demcha/compose/document/templates/cv/data/CvDocument.java @@ -1,4 +1,4 @@ -package com.demcha.compose.document.templates.cv.v2.data; +package com.demcha.compose.document.templates.cv.data; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/com/demcha/compose/document/templates/cv/v2/data/CvEntry.java b/src/main/java/com/demcha/compose/document/templates/cv/data/CvEntry.java similarity index 96% rename from src/main/java/com/demcha/compose/document/templates/cv/v2/data/CvEntry.java rename to src/main/java/com/demcha/compose/document/templates/cv/data/CvEntry.java index 8b7f44354..7e915cc72 100644 --- a/src/main/java/com/demcha/compose/document/templates/cv/v2/data/CvEntry.java +++ b/src/main/java/com/demcha/compose/document/templates/cv/data/CvEntry.java @@ -1,4 +1,4 @@ -package com.demcha.compose.document.templates.cv.v2.data; +package com.demcha.compose.document.templates.cv.data; import java.util.Objects; diff --git a/src/main/java/com/demcha/compose/document/templates/cv/v2/data/CvIdentity.java b/src/main/java/com/demcha/compose/document/templates/cv/data/CvIdentity.java similarity index 99% rename from src/main/java/com/demcha/compose/document/templates/cv/v2/data/CvIdentity.java rename to src/main/java/com/demcha/compose/document/templates/cv/data/CvIdentity.java index cd866ecc3..4ae2135bd 100644 --- a/src/main/java/com/demcha/compose/document/templates/cv/v2/data/CvIdentity.java +++ b/src/main/java/com/demcha/compose/document/templates/cv/data/CvIdentity.java @@ -1,4 +1,4 @@ -package com.demcha.compose.document.templates.cv.v2.data; +package com.demcha.compose.document.templates.cv.data; import com.demcha.compose.document.templates.core.identity.Contact; import com.demcha.compose.document.templates.core.identity.Link; diff --git a/src/main/java/com/demcha/compose/document/templates/cv/v2/data/CvName.java b/src/main/java/com/demcha/compose/document/templates/cv/data/CvName.java similarity index 97% rename from src/main/java/com/demcha/compose/document/templates/cv/v2/data/CvName.java rename to src/main/java/com/demcha/compose/document/templates/cv/data/CvName.java index c1a26951a..fdafbbbc6 100644 --- a/src/main/java/com/demcha/compose/document/templates/cv/v2/data/CvName.java +++ b/src/main/java/com/demcha/compose/document/templates/cv/data/CvName.java @@ -1,4 +1,4 @@ -package com.demcha.compose.document.templates.cv.v2.data; +package com.demcha.compose.document.templates.cv.data; import java.util.Objects; import java.util.Optional; diff --git a/src/main/java/com/demcha/compose/document/templates/cv/v2/data/CvRow.java b/src/main/java/com/demcha/compose/document/templates/cv/data/CvRow.java similarity index 95% rename from src/main/java/com/demcha/compose/document/templates/cv/v2/data/CvRow.java rename to src/main/java/com/demcha/compose/document/templates/cv/data/CvRow.java index 3a12cc6a7..a97ce2e38 100644 --- a/src/main/java/com/demcha/compose/document/templates/cv/v2/data/CvRow.java +++ b/src/main/java/com/demcha/compose/document/templates/cv/data/CvRow.java @@ -1,4 +1,4 @@ -package com.demcha.compose.document.templates.cv.v2.data; +package com.demcha.compose.document.templates.cv.data; import java.util.Objects; diff --git a/src/main/java/com/demcha/compose/document/templates/cv/v2/data/CvSection.java b/src/main/java/com/demcha/compose/document/templates/cv/data/CvSection.java similarity index 95% rename from src/main/java/com/demcha/compose/document/templates/cv/v2/data/CvSection.java rename to src/main/java/com/demcha/compose/document/templates/cv/data/CvSection.java index d4843e396..e3da6bbe7 100644 --- a/src/main/java/com/demcha/compose/document/templates/cv/v2/data/CvSection.java +++ b/src/main/java/com/demcha/compose/document/templates/cv/data/CvSection.java @@ -1,4 +1,4 @@ -package com.demcha.compose.document.templates.cv.v2.data; +package com.demcha.compose.document.templates.cv.data; /** * Sealed top of the v2 CV section hierarchy. Each concrete subtype diff --git a/src/main/java/com/demcha/compose/document/templates/cv/v2/data/CvSkill.java b/src/main/java/com/demcha/compose/document/templates/cv/data/CvSkill.java similarity index 97% rename from src/main/java/com/demcha/compose/document/templates/cv/v2/data/CvSkill.java rename to src/main/java/com/demcha/compose/document/templates/cv/data/CvSkill.java index b1797e64c..6ab5e3b28 100644 --- a/src/main/java/com/demcha/compose/document/templates/cv/v2/data/CvSkill.java +++ b/src/main/java/com/demcha/compose/document/templates/cv/data/CvSkill.java @@ -1,4 +1,4 @@ -package com.demcha.compose.document.templates.cv.v2.data; +package com.demcha.compose.document.templates.cv.data; import java.util.Objects; import java.util.OptionalDouble; diff --git a/src/main/java/com/demcha/compose/document/templates/cv/v2/data/EntriesSection.java b/src/main/java/com/demcha/compose/document/templates/cv/data/EntriesSection.java similarity index 98% rename from src/main/java/com/demcha/compose/document/templates/cv/v2/data/EntriesSection.java rename to src/main/java/com/demcha/compose/document/templates/cv/data/EntriesSection.java index 326751850..eb00c1cac 100644 --- a/src/main/java/com/demcha/compose/document/templates/cv/v2/data/EntriesSection.java +++ b/src/main/java/com/demcha/compose/document/templates/cv/data/EntriesSection.java @@ -1,4 +1,4 @@ -package com.demcha.compose.document.templates.cv.v2.data; +package com.demcha.compose.document.templates.cv.data; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/com/demcha/compose/document/templates/cv/v2/data/ParagraphSection.java b/src/main/java/com/demcha/compose/document/templates/cv/data/ParagraphSection.java similarity index 93% rename from src/main/java/com/demcha/compose/document/templates/cv/v2/data/ParagraphSection.java rename to src/main/java/com/demcha/compose/document/templates/cv/data/ParagraphSection.java index 87e100721..61afa300d 100644 --- a/src/main/java/com/demcha/compose/document/templates/cv/v2/data/ParagraphSection.java +++ b/src/main/java/com/demcha/compose/document/templates/cv/data/ParagraphSection.java @@ -1,4 +1,4 @@ -package com.demcha.compose.document.templates.cv.v2.data; +package com.demcha.compose.document.templates.cv.data; import java.util.Objects; diff --git a/src/main/java/com/demcha/compose/document/templates/cv/v2/data/RowStyle.java b/src/main/java/com/demcha/compose/document/templates/cv/data/RowStyle.java similarity index 95% rename from src/main/java/com/demcha/compose/document/templates/cv/v2/data/RowStyle.java rename to src/main/java/com/demcha/compose/document/templates/cv/data/RowStyle.java index 640b054c3..b44c4a1ee 100644 --- a/src/main/java/com/demcha/compose/document/templates/cv/v2/data/RowStyle.java +++ b/src/main/java/com/demcha/compose/document/templates/cv/data/RowStyle.java @@ -1,4 +1,4 @@ -package com.demcha.compose.document.templates.cv.v2.data; +package com.demcha.compose.document.templates.cv.data; /** * Visual decoration toggle for a {@link RowsSection}. Selects how diff --git a/src/main/java/com/demcha/compose/document/templates/cv/v2/data/RowsSection.java b/src/main/java/com/demcha/compose/document/templates/cv/data/RowsSection.java similarity index 98% rename from src/main/java/com/demcha/compose/document/templates/cv/v2/data/RowsSection.java rename to src/main/java/com/demcha/compose/document/templates/cv/data/RowsSection.java index 3a1860859..267364499 100644 --- a/src/main/java/com/demcha/compose/document/templates/cv/v2/data/RowsSection.java +++ b/src/main/java/com/demcha/compose/document/templates/cv/data/RowsSection.java @@ -1,4 +1,4 @@ -package com.demcha.compose.document.templates.cv.v2.data; +package com.demcha.compose.document.templates.cv.data; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/com/demcha/compose/document/templates/cv/v2/data/SkillGroup.java b/src/main/java/com/demcha/compose/document/templates/cv/data/SkillGroup.java similarity index 98% rename from src/main/java/com/demcha/compose/document/templates/cv/v2/data/SkillGroup.java rename to src/main/java/com/demcha/compose/document/templates/cv/data/SkillGroup.java index 50021ffb2..551407548 100644 --- a/src/main/java/com/demcha/compose/document/templates/cv/v2/data/SkillGroup.java +++ b/src/main/java/com/demcha/compose/document/templates/cv/data/SkillGroup.java @@ -1,4 +1,4 @@ -package com.demcha.compose.document.templates.cv.v2.data; +package com.demcha.compose.document.templates.cv.data; import java.util.ArrayList; import java.util.Arrays; diff --git a/src/main/java/com/demcha/compose/document/templates/cv/v2/data/SkillsSection.java b/src/main/java/com/demcha/compose/document/templates/cv/data/SkillsSection.java similarity index 98% rename from src/main/java/com/demcha/compose/document/templates/cv/v2/data/SkillsSection.java rename to src/main/java/com/demcha/compose/document/templates/cv/data/SkillsSection.java index ed3487cd6..931d54f5b 100644 --- a/src/main/java/com/demcha/compose/document/templates/cv/v2/data/SkillsSection.java +++ b/src/main/java/com/demcha/compose/document/templates/cv/data/SkillsSection.java @@ -1,4 +1,4 @@ -package com.demcha.compose.document.templates.cv.v2.data; +package com.demcha.compose.document.templates.cv.data; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/com/demcha/compose/document/templates/cv/v2/data/Slot.java b/src/main/java/com/demcha/compose/document/templates/cv/data/Slot.java similarity index 89% rename from src/main/java/com/demcha/compose/document/templates/cv/v2/data/Slot.java rename to src/main/java/com/demcha/compose/document/templates/cv/data/Slot.java index 5faf7740b..9a8204357 100644 --- a/src/main/java/com/demcha/compose/document/templates/cv/v2/data/Slot.java +++ b/src/main/java/com/demcha/compose/document/templates/cv/data/Slot.java @@ -1,4 +1,4 @@ -package com.demcha.compose.document.templates.cv.v2.data; +package com.demcha.compose.document.templates.cv.data; /** * Logical placement region inside a {@link CvDocument}. Presets read @@ -6,7 +6,7 @@ * appear — main column, sidebar, or footer. * *

Single-column presets like - * {@code com.demcha.compose.document.templates.cv.v2.presets.BoxedSections} + * {@code com.demcha.compose.document.templates.cv.presets.BoxedSections} * iterate only {@link #MAIN} sections; sections placed in * {@link #SIDEBAR} or {@link #FOOTER} are silently dropped by such * presets. Multi-column presets (two-column sidebar, magazine diff --git a/src/main/java/com/demcha/compose/document/templates/cv/v2/data/package-info.java b/src/main/java/com/demcha/compose/document/templates/cv/data/package-info.java similarity index 72% rename from src/main/java/com/demcha/compose/document/templates/cv/v2/data/package-info.java rename to src/main/java/com/demcha/compose/document/templates/cv/data/package-info.java index ea8e75950..f5ff77798 100644 --- a/src/main/java/com/demcha/compose/document/templates/cv/v2/data/package-info.java +++ b/src/main/java/com/demcha/compose/document/templates/cv/data/package-info.java @@ -18,25 +18,25 @@ * *

Section catalog

* - *

The sealed {@link com.demcha.compose.document.templates.cv.v2.data.CvSection} + *

The sealed {@link com.demcha.compose.document.templates.cv.data.CvSection} * hierarchy intentionally has a small set of concrete * shapes — one per genuinely-different structural pattern, not one * per visual flavour:

* *