Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,15 @@
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;

import java.nio.file.Path;

/**
* 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.
*
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
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;
import com.demcha.compose.document.api.DocumentSession;
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;

Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
/**
* Proposal / statement-of-work template family.
*
* <p>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.</p>
* <p>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.</p>
*
* @since 1.6.0
*/
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -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.
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Loading