diff --git a/benchmarks/src/main/java/com/demcha/compose/AllocationRateProbe.java b/benchmarks/src/main/java/com/demcha/compose/AllocationRateProbe.java index 69799a13..a2b4e93f 100644 --- a/benchmarks/src/main/java/com/demcha/compose/AllocationRateProbe.java +++ b/benchmarks/src/main/java/com/demcha/compose/AllocationRateProbe.java @@ -6,7 +6,7 @@ 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; -import com.demcha.compose.document.templates.proposal.v2.presets.ModernProposal; +import com.demcha.compose.document.templates.proposal.presets.ModernProposal; import java.lang.management.GarbageCollectorMXBean; import java.lang.management.ManagementFactory; diff --git a/benchmarks/src/main/java/com/demcha/compose/CurrentSpeedBenchmark.java b/benchmarks/src/main/java/com/demcha/compose/CurrentSpeedBenchmark.java index 07fe44f0..f020c883 100644 --- a/benchmarks/src/main/java/com/demcha/compose/CurrentSpeedBenchmark.java +++ b/benchmarks/src/main/java/com/demcha/compose/CurrentSpeedBenchmark.java @@ -18,7 +18,7 @@ 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; -import com.demcha.compose.document.templates.proposal.v2.presets.ModernProposal; +import com.demcha.compose.document.templates.proposal.presets.ModernProposal; import com.demcha.compose.engine.components.style.Margin; import org.apache.pdfbox.pdmodel.common.PDRectangle; diff --git a/examples/src/main/java/com/demcha/examples/GenerateAllExamples.java b/examples/src/main/java/com/demcha/examples/GenerateAllExamples.java index 1eb41437..def43f32 100644 --- a/examples/src/main/java/com/demcha/examples/GenerateAllExamples.java +++ b/examples/src/main/java/com/demcha/examples/GenerateAllExamples.java @@ -82,7 +82,7 @@ import com.demcha.examples.templates.invoice.ModernInvoiceV2Example; import com.demcha.examples.templates.proposal.CinematicProposalFileExample; import com.demcha.examples.templates.proposal.ProposalCinematicFileExample; -import com.demcha.examples.templates.proposal.v2.ModernProposalV2Example; +import com.demcha.examples.templates.proposal.ModernProposalV2Example; import com.demcha.examples.templates.schedule.WeeklyScheduleFileExample; /** diff --git a/examples/src/main/java/com/demcha/examples/templates/proposal/ProposalCinematicFileExample.java b/examples/src/main/java/com/demcha/examples/templates/proposal/ProposalCinematicFileExample.java index a220c2ef..9f924a14 100644 --- a/examples/src/main/java/com/demcha/examples/templates/proposal/ProposalCinematicFileExample.java +++ b/examples/src/main/java/com/demcha/examples/templates/proposal/ProposalCinematicFileExample.java @@ -6,7 +6,7 @@ import com.demcha.compose.document.templates.api.DocumentTemplate; import com.demcha.compose.document.templates.core.theme.BrandTheme; import com.demcha.compose.document.templates.data.proposal.ProposalDocumentSpec; -import com.demcha.compose.document.templates.proposal.v2.presets.ModernProposal; +import com.demcha.compose.document.templates.proposal.presets.ModernProposal; import com.demcha.examples.support.ExampleDataFactory; import com.demcha.examples.support.ExampleOutputPaths; @@ -14,7 +14,7 @@ /** * Runnable showcase for the cinematic proposal look on the layered - * {@code proposal.v2} surface — {@link ModernProposal} on + * layered proposal surface — {@link ModernProposal} on * {@link BrandTheme#proposalModern()}, rendering the shared * {@link ProposalDocumentSpec} sample on the cream page background. * diff --git a/examples/src/main/java/com/demcha/examples/templates/proposal/v2/ModernProposalV2Example.java b/examples/src/main/java/com/demcha/examples/templates/proposal/v2/ModernProposalV2Example.java index 4936eb2a..a38390fe 100644 --- a/examples/src/main/java/com/demcha/examples/templates/proposal/v2/ModernProposalV2Example.java +++ b/examples/src/main/java/com/demcha/examples/templates/proposal/v2/ModernProposalV2Example.java @@ -1,4 +1,4 @@ -package com.demcha.examples.templates.proposal.v2; +package com.demcha.examples.templates.proposal; import com.demcha.compose.GraphCompose; import com.demcha.compose.document.api.DocumentPageSize; @@ -6,7 +6,7 @@ import com.demcha.compose.document.templates.api.DocumentTemplate; import com.demcha.compose.document.templates.core.theme.BrandTheme; import com.demcha.compose.document.templates.data.proposal.ProposalDocumentSpec; -import com.demcha.compose.document.templates.proposal.v2.presets.ModernProposal; +import com.demcha.compose.document.templates.proposal.presets.ModernProposal; import com.demcha.examples.support.ExampleDataFactory; import com.demcha.examples.support.ExampleOutputPaths; diff --git a/src/main/java/com/demcha/compose/document/templates/data/proposal/package-info.java b/src/main/java/com/demcha/compose/document/templates/data/proposal/package-info.java index aacbda96..81af1175 100644 --- a/src/main/java/com/demcha/compose/document/templates/data/proposal/package-info.java +++ b/src/main/java/com/demcha/compose/document/templates/data/proposal/package-info.java @@ -1,5 +1,5 @@ /** * Shared, render-neutral proposal document specs and supporting data - * records, consumed by the layered {@code proposal.v2} presets. + * records, consumed by the layered {@code proposal.presets} presets. */ package com.demcha.compose.document.templates.data.proposal; diff --git a/src/main/java/com/demcha/compose/document/templates/proposal/package-info.java b/src/main/java/com/demcha/compose/document/templates/proposal/package-info.java index 8f61d2ce..17828b3d 100644 --- a/src/main/java/com/demcha/compose/document/templates/proposal/package-info.java +++ b/src/main/java/com/demcha/compose/document/templates/proposal/package-info.java @@ -1,10 +1,9 @@ /** * Proposal / statement-of-work template family. * - *
The shipping proposal surface is the layered preset stack under - * {@code proposal.v2}, built on the shared {@code templates.core} layer and a - * {@code BrandTheme}. {@code proposal.v2.presets.ModernProposal} is the - * reference preset.
+ *The proposal surface is a layered preset stack built on the shared + * {@code templates.core} layer and a {@code BrandTheme}. + * {@code proposal.presets.ModernProposal} is the reference preset.
* * @since 1.6.0 */ diff --git a/src/main/java/com/demcha/compose/document/templates/proposal/v2/presets/ModernProposal.java b/src/main/java/com/demcha/compose/document/templates/proposal/presets/ModernProposal.java similarity index 99% rename from src/main/java/com/demcha/compose/document/templates/proposal/v2/presets/ModernProposal.java rename to src/main/java/com/demcha/compose/document/templates/proposal/presets/ModernProposal.java index 032231f9..b3ac022e 100644 --- a/src/main/java/com/demcha/compose/document/templates/proposal/v2/presets/ModernProposal.java +++ b/src/main/java/com/demcha/compose/document/templates/proposal/presets/ModernProposal.java @@ -1,4 +1,4 @@ -package com.demcha.compose.document.templates.proposal.v2.presets; +package com.demcha.compose.document.templates.proposal.presets; import com.demcha.compose.document.api.DocumentSession; import com.demcha.compose.document.dsl.TableBuilder; diff --git a/src/main/java/com/demcha/compose/document/templates/proposal/v2/presets/package-info.java b/src/main/java/com/demcha/compose/document/templates/proposal/presets/package-info.java similarity index 91% rename from src/main/java/com/demcha/compose/document/templates/proposal/v2/presets/package-info.java rename to src/main/java/com/demcha/compose/document/templates/proposal/presets/package-info.java index ba223a03..655ef0ec 100644 --- a/src/main/java/com/demcha/compose/document/templates/proposal/v2/presets/package-info.java +++ b/src/main/java/com/demcha/compose/document/templates/proposal/presets/package-info.java @@ -14,4 +14,4 @@ * * @since 2.0.0 */ -package com.demcha.compose.document.templates.proposal.v2.presets; +package com.demcha.compose.document.templates.proposal.presets; diff --git a/src/test/java/com/demcha/compose/document/templates/proposal/v2/presets/ModernProposalSmokeTest.java b/src/test/java/com/demcha/compose/document/templates/proposal/presets/ModernProposalSmokeTest.java similarity index 97% rename from src/test/java/com/demcha/compose/document/templates/proposal/v2/presets/ModernProposalSmokeTest.java rename to src/test/java/com/demcha/compose/document/templates/proposal/presets/ModernProposalSmokeTest.java index e4854737..32d8aa2a 100644 --- a/src/test/java/com/demcha/compose/document/templates/proposal/v2/presets/ModernProposalSmokeTest.java +++ b/src/test/java/com/demcha/compose/document/templates/proposal/presets/ModernProposalSmokeTest.java @@ -1,4 +1,4 @@ -package com.demcha.compose.document.templates.proposal.v2.presets; +package com.demcha.compose.document.templates.proposal.presets; import com.demcha.compose.GraphCompose; import com.demcha.compose.document.api.DocumentPageSize; @@ -13,7 +13,7 @@ import static org.assertj.core.api.Assertions.assertThat; /** - * Smoke test for the layered {@code proposal.v2} pipeline through + * Smoke test for the layered proposal pipeline through * {@link ModernProposal} — proves the preset renders a * {@link ProposalDocumentSpec} end-to-end on a {@link BrandTheme}, via * both factory variants, with any theme, and on an empty proposal. diff --git a/src/test/java/com/demcha/compose/document/templates/proposal/v2/presets/ProposalV2VisualParityTest.java b/src/test/java/com/demcha/compose/document/templates/proposal/presets/ProposalV2VisualParityTest.java similarity index 98% rename from src/test/java/com/demcha/compose/document/templates/proposal/v2/presets/ProposalV2VisualParityTest.java rename to src/test/java/com/demcha/compose/document/templates/proposal/presets/ProposalV2VisualParityTest.java index 20a3dd94..e00057cb 100644 --- a/src/test/java/com/demcha/compose/document/templates/proposal/v2/presets/ProposalV2VisualParityTest.java +++ b/src/test/java/com/demcha/compose/document/templates/proposal/presets/ProposalV2VisualParityTest.java @@ -1,4 +1,4 @@ -package com.demcha.compose.document.templates.proposal.v2.presets; +package com.demcha.compose.document.templates.proposal.presets; import com.demcha.compose.GraphCompose; import com.demcha.compose.document.api.DocumentPageSize;